X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=8010f4f265d014dec90a00ff7afec107f47f575c;hb=ca0addc190070545ea6204dfb4132f196d7acd1c;hp=4a055ad600ecbf6bcb5e7958bcffadc474a4808f;hpb=981c1179fab6849d216942a7053a24a36f36078c;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 4a055ad..8010f4f 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <ctime>
 #include "Game.h"
 #include "openal_wrapper.h"
+#include "Settings.h"
 
 using namespace std;
 
@@ -1184,7 +1185,7 @@ void Screenshot	(void)
 	char temp[1024];
 	time_t	t = time(NULL);
 	struct	tm *tme = localtime(&t);
-	sprintf(temp, "Screenshots\\Screenshot_%04d_%02d_%02d--%02d_%02d_%02d.png", tme->tm_year + 1900, tme->tm_mon + 1, tme->tm_mday, tme->tm_hour, tme->tm_min, tme->tm_sec);
+	sprintf(temp, "Screenshots/Screenshot_%04d_%02d_%02d--%02d_%02d_%02d.png", tme->tm_year + 1900, tme->tm_mon + 1, tme->tm_mday, tme->tm_hour, tme->tm_min, tme->tm_sec);
 
 	#if defined(_WIN32)
 	mkdir("Screenshots");
@@ -2787,81 +2788,7 @@ void	Game::Tick()
 				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
-				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
-				opstream << "Screenwidth:\n";
-				opstream << newscreenwidth;
-				opstream << "\nScreenheight:\n";
-				opstream << newscreenheight;
-				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 << KeyToChar(forwardkey);
-				opstream << "\nBack key:\n";
-				opstream << KeyToChar(backkey);
-				opstream << "\nLeft key:\n";
-				opstream << KeyToChar(leftkey);
-				opstream << "\nRight key:\n";
-				opstream << KeyToChar(rightkey);
-				opstream << "\nJump key:\n";
-				opstream << KeyToChar(jumpkey);
-				opstream << "\nCrouch key:\n";
-				opstream << KeyToChar(crouchkey);
-				opstream << "\nDraw key:\n";
-				opstream << KeyToChar(drawkey);
-				opstream << "\nThrow key:\n";
-				opstream << KeyToChar(throwkey);
-				opstream << "\nAttack key:\n";
-				opstream << KeyToChar(attackkey);
-				opstream << "\nChat key:\n";
-				opstream << KeyToChar(chatkey);
-				opstream.close();
+				SaveSettings(*this);
 			}
 			if(mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==9||mainmenu==13||mainmenu==10||mainmenu==11||mainmenu==100){
 				float gLoc[3]={0,0,0};
@@ -3182,82 +3109,7 @@ void	Game::Tick()
 				if(newscreenheight<0)newscreenheight=screenheight;
 
 
-				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
-				opstream << "Screenwidth:\n";
-				opstream << newscreenwidth;
-				opstream << "\nScreenheight:\n";
-				opstream << newscreenheight;
-				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 << KeyToChar(forwardkey);
-				opstream << "\nBack key:\n";
-				opstream << KeyToChar(backkey);
-				opstream << "\nLeft key:\n";
-				opstream << KeyToChar(leftkey);
-				opstream << "\nRight key:\n";
-				opstream << KeyToChar(rightkey);
-				opstream << "\nJump key:\n";
-				opstream << KeyToChar(jumpkey);
-				opstream << "\nCrouch key:\n";
-				opstream << KeyToChar(crouchkey);
-				opstream << "\nDraw key:\n";
-				opstream << KeyToChar(drawkey);
-				opstream << "\nThrow key:\n";
-				opstream << KeyToChar(throwkey);
-				opstream << "\nAttack key:\n";
-				opstream << KeyToChar(attackkey);
-				opstream << "\nChat key:\n";
-				opstream << KeyToChar(chatkey);
-				opstream.close();
-
+				SaveSettings(*this);
 				if(mainmenu==3&&gameon)mainmenu=2;
 				if(mainmenu==3&&!gameon)mainmenu=1;
 			}
@@ -3810,81 +3662,7 @@ void	Game::Tick()
 				if(newscreenwidth<0)newscreenwidth=screenwidth;
 				if(newscreenheight<0)newscreenheight=screenheight;
 
-				ofstream opstream(ConvertFileName(":Data:config.txt", "w"));
-				opstream << "Screenwidth:\n";
-				opstream << newscreenwidth;
-				opstream << "\nScreenheight:\n";
-				opstream << newscreenheight;
-				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 << KeyToChar(forwardkey);
-				opstream << "\nBack key:\n";
-				opstream << KeyToChar(backkey);
-				opstream << "\nLeft key:\n";
-				opstream << KeyToChar(leftkey);
-				opstream << "\nRight key:\n";
-				opstream << KeyToChar(rightkey);
-				opstream << "\nJump key:\n";
-				opstream << KeyToChar(jumpkey);
-				opstream << "\nCrouch key:\n";
-				opstream << KeyToChar(crouchkey);
-				opstream << "\nDraw key:\n";
-				opstream << KeyToChar(drawkey);
-				opstream << "\nThrow key:\n";
-				opstream << KeyToChar(throwkey);
-				opstream << "\nAttack key:\n";
-				opstream << KeyToChar(attackkey);
-				opstream << "\nChat key:\n";
-				opstream << KeyToChar(chatkey);
-				opstream.close();
+				SaveSettings(*this);
 			}
 		}
 
@@ -4319,6 +4097,12 @@ void	Game::Tick()
 				opstream << KeyToChar(attackkey);
 				opstream << "\nChat key:\n";
 				opstream << KeyToChar(chatkey);
+				opstream << "\nStereoMode:\n";
+				opstream << stereomode;
+				opstream << "\nStereoSeparation:\n";
+				opstream << stereoseparation;
+				opstream << "\nStereoReverse:\n";
+				opstream << stereoreverse;
 				opstream.close();
 			}
 		}