X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUser%2FSettings.cpp;h=49a1aa79f27f486e364ce1476fab724828dcbea2;hb=31d30780ae8b49ab026779e6a1e4987724698eb1;hp=9948e636c6ee40ae327da93d4573a22d69689f24;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git diff --git a/Source/User/Settings.cpp b/Source/User/Settings.cpp index 9948e63..49a1aa7 100644 --- a/Source/User/Settings.cpp +++ b/Source/User/Settings.cpp @@ -18,10 +18,11 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Game.h" -#include "User/Settings.h" -#include "Utils/Folders.h" -#include "Utils/Input.h" +#include "User/Settings.hpp" + +#include "Game.hpp" +#include "Utils/Folders.hpp" +#include "Utils/Input.hpp" using namespace Game; @@ -61,7 +62,7 @@ void DefaultSettings() rightkey = SDL_SCANCODE_D; drawkey = SDL_SCANCODE_E; throwkey = SDL_SCANCODE_Q; - attackkey = MOUSEBUTTON1; + attackkey = MOUSEBUTTON_LEFT; consolekey = SDL_SCANCODE_GRAVE; newdetail = detail; @@ -215,7 +216,7 @@ bool LoadSettings() ipstream >> mousejump; } else if ( !strncmp(setting, "Ambient sound", 13) ) { ipstream >> ambientsound; - } else if ( !strncmp(setting, "Blood ", 6) ) { + } else if ( !strncmp(setting, "Blood", 5) ) { ipstream >> bloodtoggle; } else if ( !strncmp(setting, "Auto slomo", 10) ) { ipstream >> autoslomo; @@ -240,7 +241,7 @@ bool LoadSettings() ipstream >> damageeffects; } else if ( !strncmp(setting, "Text", 4) ) { ipstream >> texttoggle; - } else if ( !strncmp(setting, "Devtools", 5) ) { + } else if ( !strncmp(setting, "Devtools", 8) ) { ipstream >> devtools; } else if ( !strncmp(setting, "Show Points", 11) ) { ipstream >> showpoints;