DialogBox is protected on Windows, rename to DialogScene

[lugaru.git] / Source / Settings.cpp

diff --git a/Source/Settings.cpp b/Source/Settings.cpp
index a786d7c5a321f353ab391381911149741e6cb5c9..8258becbd1ad9c365433c91e43c39f7f02ded447 100644 (file)
--- a/Source/Settings.cpp
+++ b/Source/Settings.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -31,7 +32,6 @@ void DefaultSettings()
     newscreenwidth = kContextWidth = 1024;
     newscreenheight = kContextHeight = 768;
     fullscreen = 0;
-    kBitsPerPixel = 32;
     floatjump = 0;
     autoslomo = 1;
     decals = 1;
@@ -51,7 +51,6 @@ void DefaultSettings()
     velocityblur = 0;
     volume = 0.8f;
     ambientsound = 1;
-    vblsync = 1;
     debugmode = 0;
 
     crouchkey = SDL_SCANCODE_LSHIFT;
@@ -125,8 +124,6 @@ void SaveSettings()
     opstream << texttoggle;
     opstream << "\nDebug:\n";
     opstream << debugmode;
-    opstream << "\nVBL Sync:\n";
-    opstream << vblsync;
     opstream << "\nShow Points:\n";
     opstream << showpoints;
     opstream << "\nAlways Blur:\n";
@@ -207,10 +204,6 @@ bool LoadSettings()
             ipstream >> ismotionblur;
         } else if ( !strncmp(setting, "Overall Detail", 14) ) {
             ipstream >> detail;
-            if (detail != 0)
-                kBitsPerPixel = 32;
-            else
-                kBitsPerPixel = 16;
         } else if ( !strncmp(setting, "Floating jump", 13) ) {
             ipstream >> floatjump;
         } else if ( !strncmp(setting, "Mouse jump", 10) ) {
@@ -246,8 +239,6 @@ bool LoadSettings()
             ipstream >> texttoggle;
         } else if ( !strncmp(setting, "Debug", 5) ) {
             ipstream >> debugmode;
-        } else if ( !strncmp(setting, "VBL Sync", 8) ) {
-            ipstream >> vblsync;
         } else if ( !strncmp(setting, "Show Points", 11) ) {
             ipstream >> showpoints;
         } else if ( !strncmp(setting, "Always Blur", 11) ) {