bug fix about pause menu

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 6342683c169f6a95c80e17330305e185e87260a9..829a4ad8f3c121ea041fb2e0e974c2045de8d51b 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -2567,7 +2567,11 @@ void Game::DrawMenu() {
                {
                        glColor4f(1,1,1,1);
                        glBlendFunc(GL_SRC_ALPHA,GL_ONE);
-                       glBindTexture( GL_TEXTURE_2D, Mainmenuitems[j]);
+                       if(mainmenu==2 && (j==1 || j == 3)) {
+                               glBindTexture( GL_TEXTURE_2D, Mainmenuitems[(j==1?5:6)]);
+                       } else {
+                               glBindTexture( GL_TEXTURE_2D, Mainmenuitems[j]);
+                       }
                        glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
                        glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
                        glMatrixMode(GL_MODELVIEW);                                                     // Select The Modelview Matrix
@@ -2871,13 +2875,13 @@ void Game::DrawMenu() {
                                                        //glScalef(.25,.25,.25);
                                                        glBegin(GL_QUADS);
                                                        glTexCoord2f(0,0);
-                                                       glVertex3f(-1,          -1,      0.0f);
+                                                       glVertex3f(-1, -1, 0.0f);
                                                        glTexCoord2f(1,0);
-                                                       glVertex3f(1,   -1,      0.0f);
+                                                       glVertex3f(1, -1, 0.0f);
                                                        glTexCoord2f(1,1);
-                                                       glVertex3f(1,   1, 0.0f);
+                                                       glVertex3f(1, 1, 0.0f);
                                                        glTexCoord2f(0,1);
-                                                       glVertex3f(-1,  1, 0.0f);
+                                                       glVertex3f(-1, 1, 0.0f);
                                                        glEnd();
                                                glPopMatrix();
                                        glPopMatrix();

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 65780a0846643a2b98eaeec28519d8005ef5b0f2..b2716e930732d3e76bc56f80e94bc9cb3f6d4045 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -830,6 +830,9 @@ void Game::InitGame()
        LoadTexture(":Data:Textures:Options.png",&Mainmenuitems[2],0,0);
        LoadTexture(":Data:Textures:Quit.png",&Mainmenuitems[3],0,0);
        LoadTexture(":Data:Textures:Eyelid.png",&Mainmenuitems[4],0,1);
+       LoadTexture(":Data:Textures:Resume.png",&Mainmenuitems[5],0,0);
+       LoadTexture(":Data:Textures:Endgame.png",&Mainmenuitems[6],0,0);
+       
        //LoadTexture(":Data:Textures:Eye.jpg",&Mainmenuitems[5],0,1);
        //~ LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0); // LoadCampaign will take care of that
        texdetail=temptexdetail;