X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=5acb9472fbe72f6ef50b40a58975fe7c5c1ed98c;hb=707e773f788ccd861264b29b7802efdf9e92024e;hp=38d27d4ffc7912ecfea2bf17a711f4dfe78fffc4;hpb=a73463888cc72d596e8afc63c6f0ce5731d5a27e;p=lugaru.git

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 38d27d4..5acb947 100644
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -2240,10 +2240,10 @@ int Game::DrawGLScene(void)
 	}
 
 	if(mainmenu){
-#if USE_SDL
+
         // !!! FIXME: hack: clamp framerate in menu so text input works correctly on fast systems.
         SDL_Delay(15);
-#endif
+
 		glDrawBuffer(GL_BACK);
 		glReadBuffer(GL_BACK);
 		glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
@@ -2688,7 +2688,7 @@ int Game::DrawGLScene(void)
 
 				if(accountcampaignchoicesmade[accountactive])
 					for(i=0;i<accountcampaignchoicesmade[accountactive];i++){
-						sprintf (menustring[7+i], campaigndescription[levelorder[i]]);
+						sprintf (menustring[7+i], "%s", campaigndescription[levelorder[i]]);
 						startx[7+i]=30+120+campaignlocationx[levelorder[i]]*400/512;
 						starty[7+i]=30+30+(512-campaignlocationy[levelorder[i]])*400/512;
 						endx[7+i]=startx[7+i]+10;
@@ -2699,7 +2699,7 @@ int Game::DrawGLScene(void)
 
 					if(campaignchoicenum>0)
 						for(i=accountcampaignchoicesmade[accountactive];i<accountcampaignchoicesmade[accountactive]+campaignchoicenum;i++){
-							sprintf (menustring[7+i], campaigndescription[levelorder[i]]);
+							sprintf (menustring[7+i], "%s", campaigndescription[levelorder[i]]);
 							startx[7+i]=30+120+campaignlocationx[campaignchoicewhich[i-(accountcampaignchoicesmade[accountactive])]]*400/512;
 							starty[7+i]=30+30+(512-campaignlocationy[campaignchoicewhich[i-(accountcampaignchoicesmade[accountactive])]])*400/512;
 							endx[7+i]=startx[7+i]+10;
@@ -3966,15 +3966,9 @@ int Game::DrawGLScene(void)
 
 	//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);
 	glDrawBuffer(GL_BACK);