merge

[lugaru.git] / Source / Settings.cpp

diff --git a/Source/Settings.cpp b/Source/Settings.cpp
index 9642cb941d04195695d466060758539295249af9..dce0e0ec24951e58038e312765ea6b6bba9676fc 100644 (file)
--- 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;
@@ -145,6 +145,7 @@ bool LoadSettings(Game &game) {
                // skip blank lines
                // assume lines starting with spaces are all blank
                if ( strlen(setting) == 0 || setting[0] == ' ' || setting[0] == '\t') continue;
+               printf("setting : %s\n",setting);
 
                if ( ipstream.eof() || ipstream.fail() ) {
                        fprintf(stderr, "Error reading config file: Got setting name '%s', but value can't be read\n", setting);
@@ -214,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) ) {