X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FSettings.cpp;h=6c1c6672f4a6aafb14fe3b6b5c62eda5ad2e3fb4;hb=5509b55dbc13227bdc7b97f2934fa71dad02cc66;hp=ef3cebe22e9f5ead286eff1659636a12d9d2fd93;hpb=fcfe1edb8c85534fc39744821769d6981d31caa7;p=lugaru.git

diff --git a/Source/Settings.cpp b/Source/Settings.cpp
index ef3cebe..6c1c667 100644
--- a/Source/Settings.cpp
+++ b/Source/Settings.cpp
@@ -1,294 +1,322 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+Lugaru is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "Settings.h"
 #include "Game.h"
 #include "Input.h"
 
-void DefaultSettings(Game &game) {
-	detail=1;
-	ismotionblur=0;
-	usermousesensitivity=1;
-	kContextWidth=640;
-	kContextHeight=480;
-	kBitsPerPixel = 32;
-	floatjump=0;
-	autoslomo=1;
-	decals=1;
-	invertmouse=0;
-	bloodtoggle=0;
-	foliage=1;
-	musictoggle=1;
-	trilinear=1;
-	gamespeed=1;
-	difficulty=1;
-	damageeffects=0;
-	texttoggle=1;
-	alwaysblur=0;
-	showpoints=0;
-	showdamagebar=0;
-	immediate=0;
-	velocityblur=0;
-	volume = 0.8f;
-	ambientsound=1;
-	vblsync=1;
-	debugmode=0;
-	
-	game.crouchkey=SDLK_LSHIFT;
-	game.jumpkey=SDLK_SPACE;
-	game.leftkey=SDLK_a;
-	game.forwardkey=SDLK_w;
-	game.backkey=SDLK_s;
-	game.rightkey=SDLK_d;
-	game.drawkey=SDLK_e;
-	game.throwkey=SDLK_q;
-	game.attackkey=MOUSEBUTTON1;
-	game.consolekey=SDLK_BACKQUOTE;
-	game.chatkey=SDLK_t;
+using namespace Game;
+
+void DefaultSettings()
+{
+    detail = 2;
+    ismotionblur = 1;
+    usermousesensitivity = 1;
+    newscreenwidth = kContextWidth = 1024;
+    newscreenheight = kContextHeight = 768;
+    fullscreen = 0;
+    kBitsPerPixel = 32;
+    floatjump = 0;
+    autoslomo = 1;
+    decals = 1;
+    invertmouse = 0;
+    bloodtoggle = 0;
+    foliage = 1;
+    musictoggle = 1;
+    trilinear = 1;
+    gamespeed = 1;
+    difficulty = 1;
+    damageeffects = 0;
+    texttoggle = 1;
+    alwaysblur = 0;
+    showpoints = 0;
+    showdamagebar = 0;
+    immediate = 0;
+    velocityblur = 0;
+    volume = 0.8f;
+    ambientsound = 1;
+    vblsync = 1;
+    debugmode = 0;
+
+    crouchkey = SDL_SCANCODE_LSHIFT;
+    jumpkey = SDL_SCANCODE_SPACE;
+    leftkey = SDL_SCANCODE_A;
+    forwardkey = SDL_SCANCODE_W;
+    backkey = SDL_SCANCODE_S;
+    rightkey = SDL_SCANCODE_D;
+    drawkey = SDL_SCANCODE_E;
+    throwkey = SDL_SCANCODE_Q;
+    attackkey = MOUSEBUTTON1;
+    consolekey = SDL_SCANCODE_GRAVE;
 }
 
-void SaveSettings(Game &game) {
-	if(game.newdetail<0) game.newdetail=0;
-	if(game.newdetail>2) game.newdetail=2;
-	if(game.newscreenwidth>3000) game.newscreenwidth=screenwidth;
-	if(game.newscreenwidth<0) game.newscreenwidth=screenwidth;
-	if(game.newscreenheight>3000) game.newscreenheight=screenheight;
-	if(game.newscreenheight<0) game.newscreenheight=screenheight;
-	ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
-	opstream << "Screenwidth:\n";
-	opstream << game.newscreenwidth;
-	opstream << "\nScreenheight:\n";
-	opstream << game.newscreenheight;
-	opstream << "\nMouse sensitivity:\n";
-	opstream << usermousesensitivity;
-	opstream << "\nBlur(0,1):\n";
-	opstream << ismotionblur;
-	opstream << "\nOverall Detail(0,1,2) higher=better:\n";
-	opstream << game.newdetail;
-	opstream << "\nFloating jump:\n";
-	opstream << floatjump;
-	opstream << "\nMouse jump:\n";
-	opstream << mousejump;
-	opstream << "\nAmbient sound:\n";
-	opstream << ambientsound;
-	opstream << "\nBlood (0,1,2):\n";
-	opstream << bloodtoggle;
-	opstream << "\nAuto slomo:\n";
-	opstream << autoslomo;
-	opstream << "\nFoliage:\n";
-	opstream << foliage;
-	opstream << "\nMusic:\n";
-	opstream << musictoggle;
-	opstream << "\nTrilinear:\n";
-	opstream << trilinear;
-	opstream << "\nDecals(shadows,blood puddles,etc):\n";
-	opstream << decals;
-	opstream << "\nInvert mouse:\n";
-	opstream << invertmouse;
-	opstream << "\nGamespeed:\n";
-	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";
-	opstream << texttoggle;
-	opstream << "\nDebug:\n";
-	opstream << debugmode;
-	opstream << "\nVBL Sync:\n";
-	opstream << vblsync;
-	opstream << "\nShow Points:\n";
-	opstream << showpoints;
-	opstream << "\nAlways Blur:\n";
-	opstream << alwaysblur;
-	opstream << "\nImmediate mode (turn on on G5):\n";
-	opstream << immediate;
-	opstream << "\nVelocity blur:\n";
-	opstream << velocityblur;
-	opstream << "\nVolume:\n";
-	opstream << volume;
-	opstream << "\nForward key:\n";
-	opstream << Input::keyToChar(game.forwardkey);
-	opstream << "\nBack key:\n";
-	opstream << Input::keyToChar(game.backkey);
-	opstream << "\nLeft key:\n";
-	opstream << Input::keyToChar(game.leftkey);
-	opstream << "\nRight key:\n";
-	opstream << Input::keyToChar(game.rightkey);
-	opstream << "\nJump key:\n";
-	opstream << Input::keyToChar(game.jumpkey);
-	opstream << "\nCrouch key:\n";
-	opstream << Input::keyToChar(game.crouchkey);
-	opstream << "\nDraw key:\n";
-	opstream << Input::keyToChar(game.drawkey);
-	opstream << "\nThrow key:\n";
-	opstream << Input::keyToChar(game.throwkey);
-	opstream << "\nAttack key:\n";
-	opstream << Input::keyToChar(game.attackkey);
-	opstream << "\nConsole key:\n";
-	opstream << Input::keyToChar(game.consolekey);
-	opstream << "\nChat key:\n";
-	opstream << Input::keyToChar(game.chatkey);
-	opstream << "\nDamage bar:\n";
-	opstream << showdamagebar;
-	opstream << "\nStereoMode:\n";
-	opstream << stereomode;
-	opstream << "\nStereoSeparation:\n";
-	opstream << stereoseparation;
-	opstream << "\nStereoReverse:\n";
-	opstream << stereoreverse;
-	opstream.close();
+void SaveSettings()
+{
+    if (newdetail < 0)
+        newdetail = 0;
+    if (newdetail > 2)
+        newdetail = 2;
+    if (newscreenwidth > 3000)
+        newscreenwidth = screenwidth;
+    if (newscreenwidth < 0)
+        newscreenwidth = screenwidth;
+    if (newscreenheight > 3000)
+        newscreenheight = screenheight;
+    if (newscreenheight < 0)
+        newscreenheight = screenheight;
+    ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
+    opstream << "Screenwidth:\n";
+    opstream << newscreenwidth;
+    opstream << "\nScreenheight:\n";
+    opstream << newscreenheight;
+    opstream << "\nFullscreen:\n";
+    opstream << fullscreen;
+    opstream << "\nMouse sensitivity:\n";
+    opstream << usermousesensitivity;
+    opstream << "\nBlur(0,1):\n";
+    opstream << ismotionblur;
+    opstream << "\nOverall Detail(0,1,2) higher=better:\n";
+    opstream << newdetail;
+    opstream << "\nFloating jump:\n";
+    opstream << floatjump;
+    opstream << "\nMouse jump:\n";
+    opstream << mousejump;
+    opstream << "\nAmbient sound:\n";
+    opstream << ambientsound;
+    opstream << "\nBlood (0,1,2):\n";
+    opstream << bloodtoggle;
+    opstream << "\nAuto slomo:\n";
+    opstream << autoslomo;
+    opstream << "\nFoliage:\n";
+    opstream << foliage;
+    opstream << "\nMusic:\n";
+    opstream << musictoggle;
+    opstream << "\nTrilinear:\n";
+    opstream << trilinear;
+    opstream << "\nDecals(shadows,blood puddles,etc):\n";
+    opstream << decals;
+    opstream << "\nInvert mouse:\n";
+    opstream << invertmouse;
+    opstream << "\nGamespeed:\n";
+    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";
+    opstream << texttoggle;
+    opstream << "\nDebug:\n";
+    opstream << debugmode;
+    opstream << "\nVBL Sync:\n";
+    opstream << vblsync;
+    opstream << "\nShow Points:\n";
+    opstream << showpoints;
+    opstream << "\nAlways Blur:\n";
+    opstream << alwaysblur;
+    opstream << "\nImmediate mode (turn on on G5):\n";
+    opstream << immediate;
+    opstream << "\nVelocity blur:\n";
+    opstream << velocityblur;
+    opstream << "\nVolume:\n";
+    opstream << volume;
+    opstream << "\nForward key:\n";
+    opstream << forwardkey;
+    opstream << "\nBack key:\n";
+    opstream << backkey;
+    opstream << "\nLeft key:\n";
+    opstream << leftkey;
+    opstream << "\nRight key:\n";
+    opstream << rightkey;
+    opstream << "\nJump key:\n";
+    opstream << jumpkey;
+    opstream << "\nCrouch key:\n";
+    opstream << crouchkey;
+    opstream << "\nDraw key:\n";
+    opstream << drawkey;
+    opstream << "\nThrow key:\n";
+    opstream << throwkey;
+    opstream << "\nAttack key:\n";
+    opstream << attackkey;
+    opstream << "\nConsole key:\n";
+    opstream << consolekey;
+    opstream << "\nDamage bar:\n";
+    opstream << showdamagebar;
+    opstream << "\nStereoMode:\n";
+    opstream << stereomode;
+    opstream << "\nStereoSeparation:\n";
+    opstream << stereoseparation;
+    opstream << "\nStereoReverse:\n";
+    opstream << stereoreverse;
+    opstream.close();
 }
 
-bool LoadSettings(Game &game) {
-	ifstream ipstream(ConvertFileName(":Data:config.txt"), std::ios::in);
-	if ( !ipstream || ipstream.fail() ) {
-		printf("Config file not found\n");
-		return false;
-	}
-	char setting[256];
-	char string[256];
-	
-	printf("Loading config\n");
-	while(!ipstream.eof()) {
-		ipstream.getline( setting, sizeof(setting) );
-		
-		// 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);
+bool LoadSettings()
+{
+    ifstream ipstream(ConvertFileName(":Data:config.txt"), std::ios::in);
+    if ( !ipstream || ipstream.fail() ) {
+        printf("Config file not found\n");
+        return false;
+    }
+    char setting[256];
+    char string[256];
+
+    printf("Loading config\n");
+    while (!ipstream.eof()) {
+        ipstream.getline( setting, sizeof(setting) );
+
+        // 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);
+            ipstream.close();
+            return false;
+        }
+
+
+        if ( !strncmp(setting, "Screenwidth", 11) ) {
+            ipstream >> kContextWidth;
+        } else if ( !strncmp(setting, "Screenheight", 12) ) {
+            ipstream >> kContextHeight;
+        } else if ( !strncmp(setting, "Fullscreen", 10) ) {
+            ipstream >> fullscreen;
+        } else if ( !strncmp(setting, "Mouse sensitivity", 17) ) {
+            ipstream >> usermousesensitivity;
+        } else if ( !strncmp(setting, "Blur", 4) ) {
+            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) ) {
+            ipstream >> mousejump;
+        } else if ( !strncmp(setting, "Ambient sound", 13) ) {
+            ipstream >> ambientsound;
+        } else if ( !strncmp(setting, "Blood ", 6) ) {
+            ipstream >> bloodtoggle;
+        } else if ( !strncmp(setting, "Auto slomo", 10) ) {
+            ipstream >> autoslomo;
+        } else if ( !strncmp(setting, "Foliage", 7) ) {
+            ipstream >> foliage;
+        } else if ( !strncmp(setting, "Music", 5) ) {
+            ipstream >> musictoggle;
+        } else if ( !strncmp(setting, "Trilinear", 9) ) {
+            ipstream >> trilinear;
+        } else if ( !strncmp(setting, "Decals", 6) ) {
+            ipstream >> decals;
+        } else if ( !strncmp(setting, "Invert mouse", 12) ) {
+            ipstream >> invertmouse;
+        } else if ( !strncmp(setting, "Gamespeed", 9) ) {
+            ipstream >> gamespeed;
+            oldgamespeed = gamespeed;
+            if (oldgamespeed == 0) {
+                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, "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) ) {
+            ipstream >> alwaysblur;
+        } else if ( !strncmp(setting, "Immediate mode ", 15) ) {
+            ipstream >> immediate;
+        } else if ( !strncmp(setting, "Velocity blur", 13) ) {
+            ipstream >> velocityblur;
+        } else if ( !strncmp(setting, "Volume", 6) ) {
+            ipstream >> volume;
+        } else if ( !strncmp(setting, "Forward key", 11) ) {
+            ipstream >> forwardkey;
+        } else if ( !strncmp(setting, "Back key", 8) ) {
+            ipstream >> backkey;
+        } else if ( !strncmp(setting, "Left key", 8) ) {
+            ipstream >> leftkey;
+        } else if ( !strncmp(setting, "Right key", 9) ) {
+            ipstream >> rightkey;
+        } else if ( !strncmp(setting, "Jump key", 8) ) {
+            ipstream >> jumpkey;
+        } else if ( !strncmp(setting, "Crouch key", 10) ) {
+            ipstream >> crouchkey;
+        } else if ( !strncmp(setting, "Draw key", 8) ) {
+            ipstream >> drawkey;
+        } else if ( !strncmp(setting, "Throw key", 9) ) {
+            ipstream >> throwkey;
+        } else if ( !strncmp(setting, "Attack key", 10) ) {
+            ipstream >> attackkey;
+        } else if ( !strncmp(setting, "Console key", 11) ) {
+            ipstream >> consolekey;
+        } else if ( !strncmp(setting, "Damage bar", 10) ) {
+            ipstream >> showdamagebar;
+        } else if ( !strncmp(setting, "StereoMode", 10) ) {
+            int i;
+            ipstream >> i;
+            stereomode = (StereoMode)i;
+        } else if ( !strncmp(setting, "StereoSeparation", 16) ) {
+            ipstream >> stereoseparation;
+        } else if ( !strncmp(setting, "StereoReverse", 13) ) {
+            ipstream >> stereoreverse;
+        } else {
+            ipstream >> string;
+            fprintf(stderr, "Unknown config option '%s' with value '%s'. Ignoring.\n", setting, string);
+        }
+
+        if ( ipstream.fail() ) {
+            fprintf(stderr, "Error reading config file: EOF reached when trying to read value for setting '%s'.\n", setting);
+            ipstream.close();
+            return false;
+        }
+
+        if ( ipstream.bad() ) {
+            fprintf(stderr, "Error reading config file: Failed to read value for setting '%s'.\n", setting);
+            ipstream.close();
+            return false;
+        }
+    }
+
+    ipstream.close();
+
+    if (detail > 2)
+        detail = 2;
+    if (detail < 0)
+        detail = 0;
+    if (screenwidth < 0)
+        screenwidth = 1024;
+    if (screenheight < 0)
+        screenheight = 768;
 
-		if ( ipstream.eof() || ipstream.fail() ) {
-			fprintf(stderr, "Error reading config file: Got setting name '%s', but value can't be read\n", setting);
-			ipstream.close();			
-			return false;
-		}
-		
-	
-		if ( !strncmp(setting, "Screenwidth", 11) ) {
-			ipstream >> kContextWidth;
-		} else if ( !strncmp(setting, "Screenheight", 12) ) {
-			ipstream >> kContextHeight;
-		} else if ( !strncmp(setting, "Mouse sensitivity", 17) ) {
-			ipstream >> usermousesensitivity;
-		} else if ( !strncmp(setting, "Blur", 4) ) {
-			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) ) {
-			ipstream >> mousejump;
-		} else if ( !strncmp(setting, "Ambient sound", 13) ) {
-			ipstream >> ambientsound;
-		} else if ( !strncmp(setting, "Blood ", 6) ) {
-			ipstream >> bloodtoggle;
-		} else if ( !strncmp(setting, "Auto slomo", 10) ) {
-			ipstream >> autoslomo;
-		} else if ( !strncmp(setting, "Foliage", 7) ) {
-			ipstream >> foliage;
-		} else if ( !strncmp(setting, "Music", 5) ) {
-			ipstream >> musictoggle;
-		} else if ( !strncmp(setting, "Trilinear", 9) ) {
-			ipstream >> trilinear;
-		} else if ( !strncmp(setting, "Decals", 6) ) {
-			ipstream >> decals;
-		} else if ( !strncmp(setting, "Invert mouse", 12) ) {
-			ipstream >> invertmouse;
-		} else if ( !strncmp(setting, "Gamespeed", 9) ) {
-			ipstream >> gamespeed;
-			oldgamespeed=gamespeed;
-			if(oldgamespeed==0){
-				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, "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) ) {
-			ipstream >> alwaysblur;
-		} else if ( !strncmp(setting, "Immediate mode ", 15) ) {
-			ipstream >> immediate;
-		} else if ( !strncmp(setting, "Velocity blur", 13) ) {
-			ipstream >> velocityblur;
-		} else if ( !strncmp(setting, "Volume", 6) ) {
-			ipstream >> volume;
-		} else if ( !strncmp(setting, "Forward key", 11) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.forwardkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Back key", 8) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.backkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Left key", 8) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.leftkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Right key", 9) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.rightkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Jump key", 8) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.jumpkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Crouch key", 10) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.crouchkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Draw key", 8) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.drawkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Throw key", 9) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.throwkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Attack key", 10) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.attackkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Console key", 11) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.consolekey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Chat key", 8) ) {
-			ipstream.getline( string, sizeof(string) );
-			game.chatkey = Input::CharToKey(string);
-		} else if ( !strncmp(setting, "Damage bar", 10) ) {
-			ipstream >> showdamagebar;
-		} else if ( !strncmp(setting, "StereoMode", 10) ) {
-			int i;
-			ipstream >> i;
-			stereomode = (StereoMode)i;
-		} else if ( !strncmp(setting, "StereoSeparation", 16) ) {
-			ipstream >> stereoseparation;
-		} else if ( !strncmp(setting, "StereoReverse", 13) ) {
-			ipstream >> stereoreverse;
-		} else {
-			ipstream >> string;
-			fprintf(stderr, "Unknown config option '%s' with value '%s'. Ignoring.\n", setting, string);
-		}
-		
-		if ( ipstream.fail() ) {
-			fprintf(stderr, "Error reading config file: EOF reached when trying to read value for setting '%s'.\n", setting);
-			ipstream.close();			
-			return false;
-		}
-		
-		if ( ipstream.bad() ) {
-			fprintf(stderr, "Error reading config file: Failed to read value for setting '%s'.\n", setting);
-			ipstream.close();
-			return false;
-		}
-	}
-	
-	ipstream.close();
-	
-	if(detail>2)detail=2;
-	if(detail<0)detail=0;
-	if(screenwidth<0)screenwidth=640;
-	if(screenheight<0)screenheight=480;
-	
-	return true;
+    return true;
 }