X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=700ef1190ca9d70121cfdc638c2bba8471ecb04f;hb=055013bac06c70d04b46bc2e66bde847bdada1d4;hp=e3cd41b028fcc9783ed9f9618a260fad5bcd3e38;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index e3cd41b..700ef11 100644
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -13,11 +13,6 @@ extern float sps;
 extern float viewdistance;
 extern float fadestart;
 extern float screenwidth,screenheight;
-#ifdef WIN32
-extern HDC hDC;
-#else
-extern AGLContext gaglContext;
-#endif
 extern int kTextureSize;
 extern FRUSTUM frustum;
 extern Light light;
@@ -178,14 +173,14 @@ long long Game::MD5_string (char *string){
 		i++;
 	}
 
-	num=abs(num);
+	num=longlongabs(num);
 	if(num==0)num+=1452;
 
-	while(num<5000000000000000){
+	while(num<LONGLONGCONST(5000000000000000)){
 		num*=1.85421521;
 	}
 
-	while(num>9900000000000000){
+	while(num>LONGLONGCONST(9900000000000000)){
 		num/=1.235421521;
 	}
 
@@ -194,7 +189,7 @@ long long Game::MD5_string (char *string){
 	//return 1111111111111111;
 }
 
-int Game::DrawGLScene(GLvoid)									
+int Game::DrawGLScene(void)
 {	
 	static float texcoordwidth,texcoordheight;
 	static float texviewwidth, texviewheight;
@@ -282,7 +277,7 @@ int Game::DrawGLScene(GLvoid)
 			color2.red=0;
 			color2.green=0;
 			color2.blue=0;
-#ifndef WIN32
+#if PLATFORM_MACOSX
 			DSpContext_FadeGamma(NULL,200,&color2);
 #endif
 		}
@@ -1944,7 +1939,7 @@ int Game::DrawGLScene(GLvoid)
 
 		if(drawmode!=normalmode){
 			glEnable(GL_TEXTURE_2D);
-			//glFinish();
+			glFinish();
 			if(!drawtoggle||drawmode!=realmotionblurmode||(drawtoggle==2||change==1)){
 				if(screentexture){
 
@@ -2255,8 +2250,7 @@ int Game::DrawGLScene(GLvoid)
 		}
 		if(lastcheck>.5||oldmainmenu!=mainmenu){
 			if(mainmenu==5){
-				//				ifstream ipstream(":Data:Campaigns:main.txt");	
-				ifstream ipstream("./Data/Campaigns/main.txt");	
+				ifstream ipstream(ConvertFileName(":Data:Campaigns:main.txt"));
 				//campaignnumlevels=0;
 				//accountcampaignchoicesmade[accountactive]=0;
 				ipstream.ignore(256,':');
@@ -3946,11 +3940,14 @@ int Game::DrawGLScene(GLvoid)
 
 	//glFlush();
 	if(drawmode!=motionblurmode||mainmenu){
-#ifdef WIN32
-		if(drawmode!=motionblurmode) SwapBuffers( hDC);
-#else
-		if(drawmode!=motionblurmode)aglSwapBuffers(gaglContext); // send swap command
-#endif // send swap command
+        #if !USE_SDL
+        // this prevents menus from rendering if you hit ESC during
+        //  motion blur sequences...maybe SDL is buffering differently?
+		if(drawmode!=motionblurmode)
+			swap_gl_buffers();
+        #else
+		swap_gl_buffers();
+        #endif
 	}
 
 	//myassert(glGetError() == GL_NO_ERROR);
@@ -3968,3 +3965,4 @@ int Game::DrawGLScene(GLvoid)
 	//Jordan fixed your warning!
 	return 0;
 }
+