merge

[lugaru.git] / Source / GameDraw.cpp

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 015a4d55f2f63c5e1185143c46f899b17216023f..ec4ec3f6e7d96eef6eed0d4d153e60c962c4141b 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -2506,7 +2506,7 @@ int Game::DrawGLScene(void)
                                movex[10]=0;
                                movey[10]=0;
                                
-                               sprintf (menustring[11], "Volume: %d%", (int)(volume*100));
+                               sprintf (menustring[11], "Volume: %d%%", (int)(volume*100));
                                startx[11]=10+60;
                                starty[11]=155;
                                endx[11]=startx[11]+strlen(menustring[11])*10;
@@ -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;