Merge

diff --combined Source/OpenGL_Windows.cpp
index 37ad22fa433718097152721b9e28cc14cf621a65,36998186c323d4351157336184096481115cedd5..4e163eb85f89637e779feb428a680dd4df02fa96
--- 1/Source/OpenGL_Windows.cpp
--- 2/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@@ -230,6 -230,8 +230,6 @@@ Boolean SetUp (Game & game
  
        LOGFUNC;
  
 -      randSeed = UpTime().lo;
 -
        osx = 0;
        cellophane=0;
        texdetail=4;
@@@ -413,7 -415,7 +413,7 @@@
  static void DoMouse(Game & game)
  {
  
-       if(mainmenu||(abs(game.deltah)<10*realmultiplier*1000&&abs(game.deltav)<10*realmultiplier*1000))
+       if(mainmenu|| ( (abs(game.deltah)<10*realmultiplier*1000) && (abs(game.deltav)<10*realmultiplier*1000) ))
        {
                game.deltah *= usermousesensitivity;
                game.deltav *= usermousesensitivity;
@@@ -480,7 -482,6 +480,6 @@@ void DoUpdate (Game & game
  
        count = multiplier*sps;
        if(count<2)count=2;
-       //if(count>10)count=10;
  
        realmultiplier=multiplier;
        multiplier*=gamespeed;
@@@ -488,9 -489,7 +487,7 @@@
        if(difficulty==0)multiplier*=.8;
  
        if(game.loading==4)multiplier*=.00001;
-       //multiplier*.9;
        if(slomo&&!mainmenu)multiplier*=slomospeed;
-       //if(freeze)multiplier*=0.00001;
        oldmult=multiplier;
        multiplier/=(float)count;
  
@@@ -773,7 -772,7 +770,7 @@@ int main(int argc, char **argv
                pgame = 0;
  
                CleanUp ();
 -              
 +
                return 0;
        }
        catch (const std::exception& error)