X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FSettings.cpp;h=71b7581bd77ce6683c386e20a582a8100ba79e77;hb=7602f0f320a55597c79cdbee252658d601ca1853;hp=2ee6ad19f00d4ae74764f74ceabe15ad95663082;hpb=5e808c58a6397c2cb1ae08293d2ba1fc91b15a0a;p=lugaru.git diff --git a/Source/Settings.cpp b/Source/Settings.cpp index 2ee6ad1..71b7581 100644 --- a/Source/Settings.cpp +++ b/Source/Settings.cpp @@ -28,7 +28,7 @@ void DefaultSettings(Game &game) { velocityblur=0; volume = 0.8f; ambientsound=1; - vblsync=0; + vblsync=1; debugmode=0; game.crouchkey=SDLK_LSHIFT; @@ -215,34 +215,34 @@ bool LoadSettings(Game &game) { ipstream >> volume; } else if ( !strncmp(setting, "Forward key", 11) ) { ipstream.getline( string, sizeof(string) ); - game.forwardkey = CharToKey(string); + game.forwardkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Back key", 8) ) { ipstream.getline( string, sizeof(string) ); - game.backkey = CharToKey(string); + game.backkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Left key", 8) ) { ipstream.getline( string, sizeof(string) ); - game.leftkey = CharToKey(string); + game.leftkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Right key", 9) ) { ipstream.getline( string, sizeof(string) ); - game.rightkey = CharToKey(string); + game.rightkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Jump key", 8) ) { ipstream.getline( string, sizeof(string) ); - game.jumpkey = CharToKey(string); + game.jumpkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Crouch key", 10) ) { ipstream.getline( string, sizeof(string) ); - game.crouchkey = CharToKey(string); + game.crouchkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Draw key", 8) ) { ipstream.getline( string, sizeof(string) ); - game.drawkey = CharToKey(string); + game.drawkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Throw key", 9) ) { ipstream.getline( string, sizeof(string) ); - game.throwkey = CharToKey(string); + game.throwkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Attack key", 10) ) { ipstream.getline( string, sizeof(string) ); - game.attackkey = CharToKey(string); + game.attackkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Chat key", 8) ) { ipstream.getline( string, sizeof(string) ); - game.chatkey = CharToKey(string); + game.chatkey = Input::CharToKey(string); } else if ( !strncmp(setting, "Damage bar", 10) ) { ipstream >> showdamagebar; } else if ( !strncmp(setting, "StereoMode", 10) ) {