merge

diff --combined Source/GameTick.cpp
index c0d6e9114dccb43ecb0f971c485dc1bd697d2562,ca8b815ca575164ebd5a745d031ad7d84c92a6a9..5b10d585be25f41fc7e5dbe7b2b39aef42d4d2ff
--- 1/Source/GameTick.cpp
--- 2/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@@ -2609,43 -2609,6 +2609,43 @@@ void  Game::Tick(
  
  
        static bool mainmenutogglekeydown;
 +
 +      if (IsKeyDown(theKeyMap, MAC_F6_KEY) && !freezetogglekeydown) {
 +              if (IsKeyDown(theKeyMap, MAC_SHIFT_KEY)) {
 +                      stereoreverse=true;
 +              } else {
 +                      stereoreverse=false;
 +              }
 +
 +              if (stereoreverse) {
 +                      printf("Stereo reversed\n");
 +              } else {
 +                      printf("Stereo unreversed\n");
 +              }
 +              freezetogglekeydown=1;
 +      }
 +
 +      if (IsKeyDown(theKeyMap, MAC_F7_KEY)) {
 +              if (IsKeyDown(theKeyMap, MAC_SHIFT_KEY)) {
 +                      stereoseparation -= 0.001;
 +              } else {
 +                      stereoseparation -= 0.010;
 +              }
 +
 +              printf("Stereo decreased increased to %f\n", stereoseparation);
 +      }
 +
 +      if (IsKeyDown(theKeyMap, MAC_F8_KEY)) {
 +              if (IsKeyDown(theKeyMap, MAC_SHIFT_KEY)) {
 +                      stereoseparation += 0.001;
 +              } else {
 +                      stereoseparation += 0.010;
 +              }
 +
 +              printf("Stereo separation increased to %f\n", stereoseparation);
 +      }
 +
 +
        if(!console){
                if(mainmenu&&endgame==1)mainmenu=10;
                if(IsKeyDown(theKeyMap, MAC_ESCAPE_KEY)&&!mainmenutogglekeydown&&(mainmenu==7&&entername)){
@@@ -3087,17 -3050,6 +3087,17 @@@
                                mainmenu=4;
                                keyselect=-1;
                        }
 +                      if(Button() && !oldbutton && selected == 12) {
 +                              flashr=1;
 +                              flashg=0;
 +                              flashb=0;
 +                              flashamount=1;
 +                              flashdelay=1;
 +                              
 +                              newstereomode = stereomode;
 +                              mainmenu=18;
 +                              keyselect = -1;
 +                      }
                        if(Button()&&!oldbutton&&selected==8){
                                float gLoc[3]={0,0,0};
                                float vel[3]={0,0,0};
@@@ -3660,54 -3612,9 +3660,54 @@@
                        if(Button())oldbutton=1;
                        else oldbutton=0;
                }
 +              if (mainmenu==18) {
 +                      if(Button()&&!oldbutton) {
 +                              printf("Button %i pressed\n", selected);
 +                      }
 +                      
 +                      if(Button()&&!oldbutton&&selected==0) {
 +                              newstereomode = (StereoMode)(newstereomode + 1);
 +                              while(!CanInitStereo(newstereomode)) {
 +                                      printf("Failed to initialize mode %s (%i)\n", StereoModeName(newstereomode), newstereomode);
 +                                      newstereomode = (StereoMode)(newstereomode + 1);
 +                                      if ( newstereomode >= stereoCount ) {
 +                                              newstereomode = stereoNone;
 +                                      }
 +                              }
 +                      }
 +                      
 +                      if(buttons[0]&&!oldbutton&&selected==1) {
 +                              stereoseparation+=0.001;
 +                      }
 +                      if(buttons[1]&&!oldbutton&&selected==1) {
 +                              stereoseparation-=0.001;
 +                      }
 +
 +                      if(Button()&&!oldbutton&&selected==2) {
 +                              stereoreverse =! stereoreverse;
 +                      }
 +                      
 +                      if(Button()&&!oldbutton&&selected==3) {
 +                              flashr=1;
 +                              flashg=0;
 +                              flashb=0;
 +                              flashamount=1;
 +                              flashdelay=1;
 +
 +                              if ( stereomode != newstereomode ) {
 +                                      stereomode = newstereomode;
 +                                      InitStereo(stereomode);
 +                              }
 +                              
 +                              mainmenu=3;
 +                      }
 +                      
 +                      if(Button() || buttons[1])oldbutton=1;
 +                      else oldbutton=0;
 +              }
  
  
 -              if(Button())oldbutton=1;
 +              if(Button()||buttons[1])oldbutton=1;
                else oldbutton=0;
  
                if(IsKeyDown(theKeyMap, MAC_Q_KEY)&&IsKeyDown(theKeyMap, MAC_COMMAND_KEY)){
@@@ -4079,87 -3986,7 +4079,7 @@@
                                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 << "\nStereoMode:\n";
-                               opstream << stereomode;
-                               opstream << "\nStereoSeparation:\n";
-                               opstream << stereoseparation;
-                               opstream << "\nStereoReverse:\n";
-                               opstream << stereoreverse;
-                               opstream.close();
+                               SaveSettings(*this);
                        }
                }