From: Alexander Monakov <amonakov@gmail.com>
Date: Sun, 6 Jun 2010 16:08:55 +0000 (+0400)
Subject: Merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=1994d4975f864a17540733a03a811a962083039a;hp=-c;p=lugaru.git

Merge
---

1994d4975f864a17540733a03a811a962083039a
diff --combined Source/OpenGL_Windows.cpp
index 37ad22f,3699818..4e163eb
--- a/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)