diff --git a/install-all b/install-all index 34f2f6e2..a9791f58 100755 --- a/install-all +++ b/install-all @@ -5,11 +5,13 @@ rm ../install-all # remove install file # # Install base Dependencies # - -sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y -sudo apt update -sudo apt install build-essential git gcc-multilib g++-multilib software-properties-common gcc-snapshot g++-7-multilib gcc-7 g++-7 libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y - +if [ -f "/etc/arch-release" ]; then + sudo pacman -S --needed --noconfirm boost cmake make lib32-openssl lib32-libpng gcc gdb lib32-sdl2 lib32-glew freetype2 +else + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt update + sudo apt install build-essential git gcc-multilib g++-multilib software-properties-common gcc-snapshot g++-7-multilib gcc-7 g++-7 libssl-dev:i386 libboost-all-dev libc6-dev:i386 gdb libsdl2-dev libglew-dev:i386 libglew-dev libfreetype6-dev libfreetype6-dev:i386 cmake libpng-dev libssl-dev cmake gcc-multilib g++-multilib -y +fi # # Update cathook # diff --git a/src/hooks/DispatchUserMessage.cpp b/src/hooks/DispatchUserMessage.cpp index 8d24c146..675a5aee 100644 --- a/src/hooks/DispatchUserMessage.cpp +++ b/src/hooks/DispatchUserMessage.cpp @@ -22,7 +22,7 @@ static CatVar chat_filter(CV_STRING, "chat_censor", "", "Censor words", "said, seperate with commas"); static CatVar chat_filter_enabled(CV_SWITCH, "chat_censor_enabled", "0", "Enable censor", "Censor Words in chat"); -std::string clear = ""; +const std::string clear = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"; std::string lastfilter{}; std::string lastname{}; @@ -177,12 +177,6 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type, break; if (boost::contains(message2, filter)) { - - if (clear == "") - { - for (int i = 0; i < 120; i++) - clear += "\n"; - } *bSendPackets = true; chat_stack::Say(". " + clear, true); retrun = true; @@ -210,12 +204,6 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type, break; if (boost::contains(message2, filter)) { - if (clear == "") - { - clear = ""; - for (int i = 0; i < 120; i++) - clear += "\n"; - } *bSendPackets = true; chat_stack::Say(". " + clear, true); retrun = true; diff --git a/src/visual/drawing.cpp b/src/visual/drawing.cpp index e2024e53..b5657925 100644 --- a/src/visual/drawing.cpp +++ b/src/visual/drawing.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #if EXTERNAL_DRAWING #include "xoverlay.h"