Stopped using Account pointers, and removed general difficulty setting (difficulty...

[lugaru.git] / Source / Settings.cpp

diff --git a/Source/Settings.cpp b/Source/Settings.cpp
index 97cdbb2d665b0f83665c3fd9158da7d950756271..eca9efd0ebe18a68591cd317da6d5fbea849f00d 100644 (file)
--- a/Source/Settings.cpp
+++ b/Source/Settings.cpp
@@ -42,7 +42,6 @@ void DefaultSettings()
     musictoggle = 1;
     trilinear = 1;
     gamespeed = 1;
-    difficulty = 1;
     damageeffects = 0;
     texttoggle = 1;
     alwaysblur = 0;
@@ -52,6 +51,7 @@ void DefaultSettings()
     velocityblur = 0;
     volume = 0.8f;
     ambientsound = 1;
+    devtools = 0;
 
     crouchkey = SDL_SCANCODE_LSHIFT;
     jumpkey = SDL_SCANCODE_SPACE;
@@ -63,6 +63,8 @@ void DefaultSettings()
     throwkey = SDL_SCANCODE_Q;
     attackkey = MOUSEBUTTON1;
     consolekey = SDL_SCANCODE_GRAVE;
+
+    newdetail = detail;
 }
 
 void SaveSettings()
@@ -121,8 +123,6 @@ void SaveSettings()
     if (oldgamespeed == 0)
         oldgamespeed = 1;
     opstream << oldgamespeed;
-    opstream << "\nDifficulty(0,1,2) higher=harder:\n";
-    opstream << difficulty;
     opstream << "\nDamage effects(blackout, doublevision):\n";
     opstream << damageeffects;
     opstream << "\nText:\n";
@@ -165,6 +165,7 @@ void SaveSettings()
     opstream << stereoseparation;
     opstream << "\nStereoReverse:\n";
     opstream << stereoreverse;
+    opstream << "\n";
     opstream.close();
 }
 
@@ -235,12 +236,12 @@ bool LoadSettings()
                 gamespeed = 1;
                 oldgamespeed = 1;
             }
-        } else if ( !strncmp(setting, "Difficulty", 10) ) {
-            ipstream >> difficulty;
         } else if ( !strncmp(setting, "Damage effects", 14) ) {
             ipstream >> damageeffects;
         } else if ( !strncmp(setting, "Text", 4) ) {
             ipstream >> texttoggle;
+        } else if ( !strncmp(setting, "Devtools", 5) ) {
+            ipstream >> devtools;
         } else if ( !strncmp(setting, "Show Points", 11) ) {
             ipstream >> showpoints;
         } else if ( !strncmp(setting, "Always Blur", 11) ) {
@@ -310,5 +311,6 @@ bool LoadSettings()
     if (screenheight < 0)
         screenheight = 768;
 
+    newdetail = detail;
     return true;
 }