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

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index d35125e..700ef11 100644
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -189,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;
@@ -1939,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){
 
@@ -2250,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,':');
@@ -3941,8 +3940,14 @@ int Game::DrawGLScene(GLvoid)
 
 	//glFlush();
 	if(drawmode!=motionblurmode||mainmenu){
+        #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);