]> git.jsancho.org Git - lugaru.git/blobdiff - Source/GameDraw.cpp
major refactor of menu system, part 2
[lugaru.git] / Source / GameDraw.cpp
index ad674461ca94485f982766aecd10cb6d02ad0505..09bdb1699ed8ad1a63d92825b19af98228846e7e 100644 (file)
@@ -76,7 +76,6 @@ extern bool vertexweird[6];
 extern bool velocityblur;
 extern bool debugmode;
 extern int mainmenu;
-extern int oldmainmenu;
 extern int bloodtoggle;
 extern int difficulty;
 extern bool decals;
@@ -583,7 +582,7 @@ int Game::DrawGLScene(StereoSide side)
                glColor4f(.5,.5,.5,1);
                if(!console) {
                        sprintf (string, " ",(int)(fps));
-                       text.glPrint(10,30,string,0,.8,screenwidth,screenheight);
+                       text->glPrint(10,30,string,0,.8,screenwidth,screenheight);
 
                        if(!tutoriallevel)
                                if(bonus>0&&bonustime<1&&!winfreeze&&indialogue==-1/*bonustime<4*/){
@@ -594,15 +593,15 @@ int Game::DrawGLScene(StereoSide side)
                                          bonus_name = "Excellent!"; // When does this happen?
 
                                        glColor4f(0,0,0,1-bonustime);
-                                       text.glPrintOutline(1024/2-10*strlen(bonus_name)-4,768/16-4+768*4/5,bonus_name,1,2.5,1024,768);
+                                       text->glPrintOutline(1024/2-10*strlen(bonus_name)-4,768/16-4+768*4/5,bonus_name,1,2.5,1024,768);
                                        glColor4f(1,0,0,1-bonustime);
-                                       text.glPrint(1024/2-10*strlen(bonus_name),768/16+768*4/5,bonus_name,1,2,1024,768);
+                                       text->glPrint(1024/2-10*strlen(bonus_name),768/16+768*4/5,bonus_name,1,2,1024,768);
 
                                        sprintf (string, "%d",(int)bonusvalue);
                                        glColor4f(0,0,0,1-bonustime);
-                                       text.glPrintOutline(1024/2-10*strlen(string)-4,768/16-4-20+768*4/5,string,1,2.5*.8,1024,768);
+                                       text->glPrintOutline(1024/2-10*strlen(string)-4,768/16-4-20+768*4/5,string,1,2.5*.8,1024,768);
                                        glColor4f(1,0,0,1-bonustime);
-                                       text.glPrint(1024/2-10*strlen(string),768/16-20+768*4/5,string,1,2*.8,1024,768);
+                                       text->glPrint(1024/2-10*strlen(string),768/16-20+768*4/5,string,1,2*.8,1024,768);
                                        glColor4f(.5,.5,.5,1);
                                }
 
@@ -880,26 +879,26 @@ int Game::DrawGLScene(StereoSide side)
                 }
 
                 glColor4f(0,0,0,tutorialopac);
-                text.glPrintOutline(screenwidth/2-7.6*strlen(string)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
-                text.glPrintOutline(screenwidth/2-7.6*strlen(string2)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5-20*screenwidth/1024,string2,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
-                text.glPrintOutline(screenwidth/2-7.6*strlen(string3)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5-40*screenwidth/1024,string3,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
+                text->glPrintOutline(screenwidth/2-7.6*strlen(string)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
+                text->glPrintOutline(screenwidth/2-7.6*strlen(string2)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5-20*screenwidth/1024,string2,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
+                text->glPrintOutline(screenwidth/2-7.6*strlen(string3)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5-40*screenwidth/1024,string3,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
                 glColor4f(1,1,1,tutorialopac);
-                text.glPrint(screenwidth/2-7.6*strlen(string)*screenwidth/1024,screenheight/16+screenheight*4/5,string,1,1.5*screenwidth/1024,screenwidth,screenheight);
-                text.glPrint(screenwidth/2-7.6*strlen(string2)*screenwidth/1024,screenheight/16+screenheight*4/5-20*screenwidth/1024,string2,1,1.5*screenwidth/1024,screenwidth,screenheight);
-                text.glPrint(screenwidth/2-7.6*strlen(string3)*screenwidth/1024,screenheight/16+screenheight*4/5-40*screenwidth/1024,string3,1,1.5*screenwidth/1024,screenwidth,screenheight);
+                text->glPrint(screenwidth/2-7.6*strlen(string)*screenwidth/1024,screenheight/16+screenheight*4/5,string,1,1.5*screenwidth/1024,screenwidth,screenheight);
+                text->glPrint(screenwidth/2-7.6*strlen(string2)*screenwidth/1024,screenheight/16+screenheight*4/5-20*screenwidth/1024,string2,1,1.5*screenwidth/1024,screenwidth,screenheight);
+                text->glPrint(screenwidth/2-7.6*strlen(string3)*screenwidth/1024,screenheight/16+screenheight*4/5-40*screenwidth/1024,string3,1,1.5*screenwidth/1024,screenwidth,screenheight);
 
                 sprintf (string, "Press 'tab' to skip to the next item.",Input::keyToChar(jumpkey));
                 sprintf (string2, "Press escape at any time to");
                 sprintf (string3, "pause or exit the tutorial.");
 
                 glColor4f(0,0,0,1);
-                text.glPrintOutline(screenwidth/2-7.6*strlen(string)*screenwidth/1024*.8-4,0-4+screenheight*1/10,string,1,1.5*1.25*screenwidth/1024*.8,screenwidth,screenheight);
-                text.glPrintOutline(screenwidth/2-7.6*strlen(string2)*screenwidth/1024*.8-4,0-4+screenheight*1/10-20*.8*screenwidth/1024,string2,1,1.5*1.25*screenwidth/1024*.8,screenwidth,screenheight);
-                text.glPrintOutline(screenwidth/2-7.6*strlen(string3)*screenwidth/1024*.8-4,0-4+screenheight*1/10-40*.8*screenwidth/1024,string3,1,1.5*1.25*screenwidth/1024*.8,screenwidth,screenheight);
+                text->glPrintOutline(screenwidth/2-7.6*strlen(string)*screenwidth/1024*.8-4,0-4+screenheight*1/10,string,1,1.5*1.25*screenwidth/1024*.8,screenwidth,screenheight);
+                text->glPrintOutline(screenwidth/2-7.6*strlen(string2)*screenwidth/1024*.8-4,0-4+screenheight*1/10-20*.8*screenwidth/1024,string2,1,1.5*1.25*screenwidth/1024*.8,screenwidth,screenheight);
+                text->glPrintOutline(screenwidth/2-7.6*strlen(string3)*screenwidth/1024*.8-4,0-4+screenheight*1/10-40*.8*screenwidth/1024,string3,1,1.5*1.25*screenwidth/1024*.8,screenwidth,screenheight);
                 glColor4f(0.5,0.5,0.5,1);
-                text.glPrint(screenwidth/2-7.6*strlen(string)*screenwidth/1024*.8,0+screenheight*1/10,string,1,1.5*screenwidth/1024*.8,screenwidth,screenheight);
-                text.glPrint(screenwidth/2-7.6*strlen(string2)*screenwidth/1024*.8,0+screenheight*1/10-20*.8*screenwidth/1024,string2,1,1.5*screenwidth/1024*.8,screenwidth,screenheight);
-                text.glPrint(screenwidth/2-7.6*strlen(string3)*screenwidth/1024*.8,0+screenheight*1/10-40*.8*screenwidth/1024,string3,1,1.5*screenwidth/1024*.8,screenwidth,screenheight);
+                text->glPrint(screenwidth/2-7.6*strlen(string)*screenwidth/1024*.8,0+screenheight*1/10,string,1,1.5*screenwidth/1024*.8,screenwidth,screenheight);
+                text->glPrint(screenwidth/2-7.6*strlen(string2)*screenwidth/1024*.8,0+screenheight*1/10-20*.8*screenwidth/1024,string2,1,1.5*screenwidth/1024*.8,screenwidth,screenheight);
+                text->glPrint(screenwidth/2-7.6*strlen(string3)*screenwidth/1024*.8,0+screenheight*1/10-40*.8*screenwidth/1024,string3,1,1.5*screenwidth/1024*.8,screenwidth,screenheight);
             }
             //Hot spots        
 
@@ -937,9 +936,9 @@ int Game::DrawGLScene(StereoSide side)
                         while(!done){
                             if(string[i]=='\n'||string[i]>'z'||string[i]<' '||string[i]=='\0'){
                                 glColor4f(0,0,0,tutorialopac);
-                                text.glPrintOutline(screenwidth/2-7.6*(i-lastline)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5-20*screenwidth/1024*line,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight,lastline,i);
+                                text->glPrintOutline(screenwidth/2-7.6*(i-lastline)*screenwidth/1024-4,screenheight/16-4+screenheight*4/5-20*screenwidth/1024*line,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight,lastline,i);
                                 glColor4f(1,1,1,tutorialopac);
-                                text.glPrint(screenwidth/2-7.6*(i-lastline)*screenwidth/1024,screenheight/16+screenheight*4/5-20*screenwidth/1024*line,string,1,1.5*screenwidth/1024,screenwidth,screenheight,lastline,i);
+                                text->glPrint(screenwidth/2-7.6*(i-lastline)*screenwidth/1024,screenheight/16+screenheight*4/5-20*screenwidth/1024*line,string,1,1.5*screenwidth/1024,screenwidth,screenheight,lastline,i);
                                 lastline=i+1;
                                 line++;
                                 if(string[i]=='\0')done=1;
@@ -1055,14 +1054,14 @@ int Game::DrawGLScene(StereoSide side)
 
                 if(dialogueboxcolor[whichdialogue][indialogue][0]+dialogueboxcolor[whichdialogue][indialogue][1]+dialogueboxcolor[whichdialogue][indialogue][2]<1.5){
                     glColor4f(0,0,0,tutorialopac);
-                    text.glPrintOutline(startx-2*7.6*strlen(string)*screenwidth/1024-4,starty-4,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
+                    text->glPrintOutline(startx-2*7.6*strlen(string)*screenwidth/1024-4,starty-4,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
                     glColor4f(0.7,0.7,0.7,tutorialopac);
-                    text.glPrint(startx-2*7.6*strlen(string)*screenwidth/1024,starty,string,1,1.5*screenwidth/1024,screenwidth,screenheight);
+                    text->glPrint(startx-2*7.6*strlen(string)*screenwidth/1024,starty,string,1,1.5*screenwidth/1024,screenwidth,screenheight);
                 }
                 else
                 {
                     glColor4f(0,0,0,tutorialopac);
-                    text.glPrintOutline(startx-2*7.6*strlen(string)*screenwidth/1024-4,starty-4,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
+                    text->glPrintOutline(startx-2*7.6*strlen(string)*screenwidth/1024-4,starty-4,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight);
                 }
 
                 tempnum=0;
@@ -1081,14 +1080,14 @@ int Game::DrawGLScene(StereoSide side)
                     if(string[i]=='\n'||string[i]>'z'||string[i]<' '||string[i]=='\0'){
                         if(dialogueboxcolor[whichdialogue][indialogue][0]+dialogueboxcolor[whichdialogue][indialogue][1]+dialogueboxcolor[whichdialogue][indialogue][2]<1.5){
                             glColor4f(0,0,0,tutorialopac);
-                            text.glPrintOutline(startx/*-7.6*(i-lastline)*screenwidth/1024*/-4,starty-4-20*screenwidth/1024*line,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight,lastline,i);
+                            text->glPrintOutline(startx/*-7.6*(i-lastline)*screenwidth/1024*/-4,starty-4-20*screenwidth/1024*line,string,1,1.5*1.25*screenwidth/1024,screenwidth,screenheight,lastline,i);
                             glColor4f(1,1,1,tutorialopac);
-                            text.glPrint(startx/*-7.6*(i-lastline)*screenwidth/1024*/,starty-20*screenwidth/1024*line,string,1,1.5*screenwidth/1024,screenwidth,screenheight,lastline,i);
+                            text->glPrint(startx/*-7.6*(i-lastline)*screenwidth/1024*/,starty-20*screenwidth/1024*line,string,1,1.5*screenwidth/1024,screenwidth,screenheight,lastline,i);
                         }
                         else
                         {
                             glColor4f(0,0,0,tutorialopac);
-                            text.glPrint(startx/*-7.6*(i-lastline)*screenwidth/1024*/,starty-20*screenwidth/1024*line,string,1,1.5*screenwidth/1024,screenwidth,screenheight,lastline,i);
+                            text->glPrint(startx/*-7.6*(i-lastline)*screenwidth/1024*/,starty-20*screenwidth/1024*line,string,1,1.5*screenwidth/1024,screenwidth,screenheight,lastline,i);
                         }
                         lastline=i+1;
                         line++;
@@ -1108,9 +1107,9 @@ int Game::DrawGLScene(StereoSide side)
                 }
                 if(!campaign)sprintf (string, "Score: %d", (int)bonustotal);
                 glColor4f(0,0,0,1);
-                text.glPrintOutline(1024/40-4,768/16-4+768*14/16,string,1,1.5*1.25,1024,768);
+                text->glPrintOutline(1024/40-4,768/16-4+768*14/16,string,1,1.5*1.25,1024,768);
                 glColor4f(1,0,0,1);
-                text.glPrint(1024/40,768/16+768*14/16,string,1,1.5,1024,768);
+                text->glPrint(1024/40,768/16+768*14/16,string,1,1.5,1024,768);
                 if(showdamagebar) {
                     glDisable(GL_DEPTH_TEST);                                                  // Disables Depth Testing
                     glDisable(GL_CULL_FACE);
@@ -1191,9 +1190,9 @@ int Game::DrawGLScene(StereoSide side)
                     // writing the numbers : 
                     sprintf (string, "Damages : %d/%d (%d)",(int)(player[0].damage),(int)(player[0].damagetolerance),(int)(player[0].bloodloss));
                     glColor4f(0,0,0,1);
-                    text.glPrintOutline(1024/40-4,768/16-4+768*14/16-40,string,1,1.5*1.25,1024,768);
+                    text->glPrintOutline(1024/40-4,768/16-4+768*14/16-40,string,1,1.5*1.25,1024,768);
                     glColor4f(1,0,0,1);
-                    text.glPrint(1024/40,768/16+768*14/16-40,string,1,1.5,1024,768);
+                    text->glPrint(1024/40,768/16+768*14/16-40,string,1,1.5,1024,768);
                 }
             }
 
@@ -1202,28 +1201,28 @@ int Game::DrawGLScene(StereoSide side)
 
             if((texttoggle||editorenabled)&&debugmode&&!mainmenu){
                 sprintf (string, "The framespersecond is %d.",(int)(fps));
-                text.glPrint(10,30,string,0,.8,1024,768);
+                text->glPrint(10,30,string,0,.8,1024,768);
 
                 sprintf (string, "Name: %s", registrationname);
-                text.glPrint(10,260,string,0,.8,1024,768);
+                text->glPrint(10,260,string,0,.8,1024,768);
 
 
                 if(editorenabled)
                     sprintf (string, "Map editor enabled.");
                 else
                     sprintf (string, "Map editor disabled.");
-                text.glPrint(10,60,string,0,.8,1024,768);
+                text->glPrint(10,60,string,0,.8,1024,768);
                 if(editorenabled){
                     sprintf (string, "Object size: %f",editorsize);
-                    text.glPrint(10,75,string,0,.8,1024,768);
+                    text->glPrint(10,75,string,0,.8,1024,768);
                     if(editorrotation>=0)sprintf (string, "Object rotation: %f",editorrotation);
                     else sprintf (string, "Object rotation: Random");
-                    text.glPrint(10,90,string,0,.8,1024,768);
+                    text->glPrint(10,90,string,0,.8,1024,768);
                     if(editorrotation2>=0)sprintf (string, "Object rotation2: %f",editorrotation2);
                     else sprintf (string, "Object rotation2: Random");
-                    text.glPrint(10,105,string,0,.8,1024,768);
+                    text->glPrint(10,105,string,0,.8,1024,768);
                     sprintf (string, "Object type: %d",editortype);
-                    text.glPrint(10,120,string,0,.8,1024,768);
+                    text->glPrint(10,120,string,0,.8,1024,768);
                     switch(editortype) {
                         case boxtype: 
                             sprintf (string, "(box)");
@@ -1262,15 +1261,15 @@ int Game::DrawGLScene(StereoSide side)
                             sprintf (string, "(fire)");
                             break;
                     }
-                    text.glPrint(130,120,string,0,.8,1024,768);
+                    text->glPrint(130,120,string,0,.8,1024,768);
 
                     sprintf (string, "Numplayers: %d",numplayers);
-                    text.glPrint(10,155,string,0,.8,1024,768);
+                    text->glPrint(10,155,string,0,.8,1024,768);
                     sprintf (string, "Player %d: numwaypoints: %d",numplayers,player[numplayers-1].numwaypoints);
-                    text.glPrint(10,140,string,0,.8,1024,768);
+                    text->glPrint(10,140,string,0,.8,1024,768);
                 }
                 sprintf (string, "Difficulty: %d",difficulty);
-                text.glPrint(10,240,string,0,.8,1024,768);
+                text->glPrint(10,240,string,0,.8,1024,768);
 
             }
                }
@@ -1397,10 +1396,10 @@ int Game::DrawGLScene(StereoSide side)
                        glColor4f(1,1,1,1);
                        if(chatting){
                                sprintf (string, " ]");
-                               text.glPrint(10,30+screenheight-330,string,0,1,screenwidth,screenheight);
+                               text->glPrint(10,30+screenheight-330,string,0,1,screenwidth,screenheight);
                                if(displayblink){
                                        sprintf (string, "_");
-                                       text.glPrint(30+(float)(displayselected)*10,30+(screenheight-330),string,0,1,screenwidth,screenheight);
+                                       text->glPrint(30+(float)(displayselected)*10,30+(screenheight-330),string,0,1,screenwidth,screenheight);
                                }
                        }
                        for(i=0;i<15;i++)
@@ -1409,7 +1408,7 @@ int Game::DrawGLScene(StereoSide side)
                                                glColor4f(1,1,1,4-displaytime[i]);
                                                if(j<displaychars[i]) {
                                                        sprintf (string, "%c",displaytext[i][j]);
-                                                       text.glPrint(30+j*10,30+i*20+(screenheight-330),string,0,1,screenwidth,screenheight);
+                                                       text->glPrint(30+j*10,30+i*20+(screenheight-330),string,0,1,screenwidth,screenheight);
                                                }
                                        }
                }
@@ -1643,7 +1642,7 @@ int Game::DrawGLScene(StereoSide side)
                                glEnable(GL_TEXTURE_2D);
                                glColor4f(1,1,1,1);
                                sprintf (string, "Loading...");
-                               text.glPrint(1024/2-90,768/2,string,1,2,1024,768);
+                               text->glPrint(1024/2-90,768/2,string,1,2,1024,768);
                        }
                        loading=2;
                        //if(ismotionblur)drawmode=motionblurmode;
@@ -1693,16 +1692,16 @@ int Game::DrawGLScene(StereoSide side)
                        glEnable(GL_TEXTURE_2D);
                        glColor4f(1,1,1,1);
                        sprintf (string, "Level Cleared!");
-                       text.glPrintOutlined(1024/2-strlen(string)*10,768*7/8,string,1,2,1024,768);
+                       text->glPrintOutlined(1024/2-strlen(string)*10,768*7/8,string,1,2,1024,768);
 
                        sprintf (string, "Score:     %d",(int)(bonustotal-startbonustotal));
-                       text.glPrintOutlined(1024/30,768*6/8,string,1,2,1024,768);
+                       text->glPrintOutlined(1024/30,768*6/8,string,1,2,1024,768);
 
                        if(campaign)
                                sprintf (string, "Press Escape or Space to continue");
                        else
                                sprintf (string, "Press Escape to return to menu or Space to continue");
-                       text.glPrintOutlined(640/2-strlen(string)*5,480*1/16,string,1,1,640,480);
+                       text->glPrintOutlined(640/2-strlen(string)*5,480*1/16,string,1,1,640,480);
 
                        char temp[255];
 
@@ -1712,14 +1711,14 @@ int Game::DrawGLScene(StereoSide side)
                        if((int)(leveltime)%60<10)strcat(string,"0");
                        sprintf (temp, "%d",(int)(leveltime)%60);
                        strcat(string,temp);
-                       text.glPrintOutlined(1024/30,768*6/8-40,string,1,2,1024,768);
+                       text->glPrintOutlined(1024/30,768*6/8-40,string,1,2,1024,768);
 
                        //Awards
                        int awards[award_count];
                        int numawards = award_awards(awards);
 
                        for (i = 0; i < numawards && i < 6; i++)
-                         text.glPrintOutlined(1024/30,768*6/8-90-40*i,award_names[awards[i]],1,2,1024,768);
+                         text->glPrintOutlined(1024/30,768*6/8-90-40*i,award_names[awards[i]],1,2,1024,768);
                }
 
                if(drawmode!=normalmode){
@@ -1977,17 +1976,17 @@ int Game::DrawGLScene(StereoSide side)
                        if(consoleselected>=60)
                                offset=consoleselected-60;
                        sprintf (string, " ]");
-                       text.glPrint(10,30,string,0,1,1024,768);
+                       text->glPrint(10,30,string,0,1,1024,768);
                        if(consoleblink){
                                sprintf (string, "_");
-                               text.glPrint(30+(float)(consoleselected)*10-offset*10,30,string,0,1,1024,768);
+                               text->glPrint(30+(float)(consoleselected)*10-offset*10,30,string,0,1,1024,768);
                        }
                        for(i=0;i<15;i++)
                                for(j=0;j<consolechars[i];j++){
                                        glColor4f(1,1,1,1-(float)(i)/16);
                                        if(j<consolechars[i]){
                                                sprintf (string, "%c",consoletext[i][j]);
-                                               text.glPrint(30+j*10-offset*10,30+i*20,string,0,1,1024,768);
+                                               text->glPrint(30+j*10-offset*10,30+i*20,string,0,1,1024,768);
                                        }
                                }
                }
@@ -2076,7 +2075,6 @@ void Game::LoadCampaign() {
                accountactive->setCampaignScore(0);
                accountactive->resetFasttime();
        }
-    oldmainmenu=0; //reload menu
 }
 
 void Game::DrawMenu() {
@@ -2088,12 +2086,6 @@ void Game::DrawMenu() {
        glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
        ReSizeGLScene(90,.1f);
 
-       if(oldmainmenu!=mainmenu){
-               if(mainmenu==5){
-                       LoadCampaign();
-               }
-       }
-
     //draw menu background
        glClear(GL_DEPTH_BUFFER_BIT);
        glEnable(GL_ALPHA_TEST);
@@ -2147,257 +2139,7 @@ void Game::DrawMenu() {
        glPopMatrix();
        glMatrixMode(GL_MODELVIEW);                                                     // Select The Modelview Matrix
 
-    /*
-    Values of mainmenu :
-    1 Main menu
-    2 Menu pause (resume/end game)
-    3 Option menu
-    4 Controls configuration menu
-    5 Main game menu (choose level or challenge)
-    6 Deleting user menu
-    7 User managment menu (select/add)
-    8 Choose difficulty menu
-    9 Challenge level selection menu
-    10 End of the campaign congratulation (is that really a menu?)
-    11 Same that 9 ??? => unused
-    18 stereo configuration
-    */
-
-    if(oldmainmenu!=mainmenu)
-        Menu::clearMenu();
-
-    switch(mainmenu) {
-               case 1:
-               case 2:{
-            if(oldmainmenu!=mainmenu){
-                Menu::addImage(0,Mainmenuitems[0],150,480-128,256,128);
-                Menu::addImageButton(1,Mainmenuitems[mainmenu==1?1:5],NULL,18,480-152-32,128,32);
-                Menu::addImageButton(2,Mainmenuitems[2],NULL,18,480-228-32,112,32);
-                Menu::addImageButton(3,Mainmenuitems[mainmenu==1?3:6],NULL,18,480-306-32,mainmenu==1?68:132,32);
-            }
-               }
-               break;
-               case 3: {
-            if(oldmainmenu!=mainmenu){
-                Menu::addButton( 0,"",NULL,10+20,440,-1,-1);
-                Menu::addButton( 1,"",NULL,10+60,405,-1,-1);
-                Menu::addButton( 2,"",NULL,10+70,370,-1,-1);
-                Menu::addButton( 3,"",NULL,10+20-1000,335-1000,-1,-1);
-                Menu::addButton( 4,"",NULL,10   ,335,-1,-1);
-                Menu::addButton( 5,"",NULL,10+60,300,-1,-1);
-                Menu::addButton( 6,"",NULL,10+70,265,-1,-1);
-                Menu::addButton( 9,"",NULL,10   ,230,-1,-1);
-                Menu::addButton(10,"",NULL,20   ,195,-1,-1);
-                Menu::addButton(11,"",NULL,10+60,160,-1,-1);
-                Menu::addButton(13,"",NULL,30   ,125,-1,-1);
-                Menu::addButton( 7,"",NULL,10+15, 90,-1,-1);
-                Menu::addButton(12,"",NULL,10+15, 55,-1,-1);
-                Menu::addButton(8,"Back",NULL,10,10,-1,-1);
-            }
-                       if((float)newscreenwidth>(float)newscreenheight*1.61||(float)newscreenwidth<(float)newscreenheight*1.59)
-                sprintf (menustring[0], "Resolution: %d*%d",(int)newscreenwidth,(int)newscreenheight);
-                       else
-                sprintf (menustring[0], "Resolution: %d*%d (widescreen)",(int)newscreenwidth,(int)newscreenheight);
-
-                       if(newdetail==2)                sprintf (menustring[1], "Detail: High");
-                       else if(newdetail==1)   sprintf (menustring[1], "Detail: Medium");
-                       else                                    sprintf (menustring[1], "Detail: Low");
-
-                       if(bloodtoggle==2) sprintf (menustring[2], "Blood: On, high detail (slower)");
-                       if(bloodtoggle==1) sprintf (menustring[2], "Blood: On, low detail");
-                       if(bloodtoggle==0) sprintf (menustring[2], "Blood: Off");
-
-                       if(difficulty==2) sprintf (menustring[3], "Difficulty: Insane");
-                       if(difficulty==1) sprintf (menustring[3], "Difficulty: Difficult");
-                       if(difficulty==0) sprintf (menustring[3], "Difficulty: Easier");
-
-                       if(ismotionblur==1) sprintf (menustring[4], "Blur Effects: Enabled (less compatible)");
-                       if(ismotionblur==0) sprintf (menustring[4], "Blur Effects: Disabled (more compatible)");
-
-                       if(decals==1) sprintf (menustring[5], "Decals: Enabled (slower)");
-                       if(decals==0) sprintf (menustring[5], "Decals: Disabled");
-
-                       if(musictoggle==1) sprintf (menustring[6], "Music: Enabled");
-                       if(musictoggle==0) sprintf (menustring[6], "Music: Disabled");
-
-                       if(invertmouse==1) sprintf (menustring[9], "Invert mouse: Yes");
-                       if(invertmouse==0) sprintf (menustring[9], "Invert mouse: No");
-
-                       sprintf (menustring[10], "Mouse Speed: %d", (int)(usermousesensitivity*5));
-                       
-                       sprintf (menustring[11], "Volume: %d%%", (int)(volume*100));
-                       
-                       sprintf (menustring[13], "Damage Bar: %s",(showdamagebar?"on":"off"));
-                       
-                       sprintf (menustring[7], "-Configure Controls-");
-
-                       sprintf (menustring[12], "-Configure Stereo -");
-                       
-                       if(newdetail==detail&&newscreenheight==(int)screenheight&&newscreenwidth==(int)screenwidth)sprintf (menustring[8], "Back");
-                       else sprintf (menustring[8], "Back (some changes take effect next time Lugaru is opened)");
-
-            for(int i=0;i<=13;i++)
-                Menu::setButtonText(i,menustring[i]);
-               }
-               break;
-               case 4: {
-            if(oldmainmenu!=mainmenu){
-                Menu::addButton(0,"",NULL,10   ,400,-1,-1);
-                Menu::addButton(1,"",NULL,10+40,360,-1,-1);
-                Menu::addButton(2,"",NULL,10+40,320,-1,-1);
-                Menu::addButton(3,"",NULL,10+30,280,-1,-1);
-                Menu::addButton(4,"",NULL,10+20,240,-1,-1);
-                Menu::addButton(5,"",NULL,10+40,200,-1,-1);
-                Menu::addButton(6,"",NULL,10+40,160,-1,-1);
-                Menu::addButton(7,"",NULL,10+30,120,-1,-1);
-                Menu::addButton(8,"",NULL,10+20,80,-1,-1);
-                if(debugmode)
-                    Menu::addButton(9,"",NULL,10+10,40,-1,-1);
-                Menu::addButton(debugmode?10:9,"Back",NULL,10,10,-1,-1);
-            }
-            Menu::setButtonText(0,(string)"Forwards: "+(keyselect==0?"_":Input::keyToChar(forwardkey)));
-            Menu::setButtonText(1,(string)"Back: "    +(keyselect==1?"_":Input::keyToChar(backkey)));
-            Menu::setButtonText(2,(string)"Left: "    +(keyselect==2?"_":Input::keyToChar(leftkey)));
-            Menu::setButtonText(3,(string)"Right: "   +(keyselect==3?"_":Input::keyToChar(rightkey)));
-            Menu::setButtonText(4,(string)"Crouch: "  +(keyselect==4?"_":Input::keyToChar(crouchkey)));
-            Menu::setButtonText(5,(string)"Jump: "    +(keyselect==5?"_":Input::keyToChar(jumpkey)));
-            Menu::setButtonText(6,(string)"Draw: "    +(keyselect==6?"_":Input::keyToChar(drawkey)));
-            Menu::setButtonText(7,(string)"Throw: "   +(keyselect==7?"_":Input::keyToChar(throwkey)));
-            Menu::setButtonText(8,(string)"Attack: "  +(keyselect==8?"_":Input::keyToChar(attackkey)));
-            if(debugmode)
-                Menu::setButtonText(9,(string)"Console: "+(keyselect==9?"_":Input::keyToChar(consolekey)));
-               }
-               break;
-               case 5: {                       
-            if(oldmainmenu!=mainmenu){
-                Menu::addLabel(-1,accountactive->getName(),5,400);
-                Menu::addButton(1,"Tutorial",NULL,5,300,-1,-1);
-                Menu::addButton(2,"Challenge",NULL,5,240,-1,-1);
-                Menu::addButton(3,"Delete User",NULL,400,10,-1,-1);
-                Menu::addButton(4,"Main Menu",NULL,5,10,-1,-1);
-                Menu::addButton(5,"Change User",NULL,5,180,-1,-1);
-                Menu::addButton(6,"Campaign : "+accountactive->getCurrentCampaign(),NULL,200,420,-1,-1);
-
-                //show campaign map
-                //with (2,-5) offset from old code
-                Menu::addImage(-1,Mainmenuitems[7],150+2,60-5,400,400);
-                //show levels
-                int numlevels = accountactive->getCampaignChoicesMade();
-                numlevels += numlevels>0 ? campaignlevels[numlevels-1].nextlevel.size() : 1;
-                for(int i=0;i<numlevels;i++){
-                                       XYZ midpoint=campaignlevels[i].getCenter();
-                    float itemsize=campaignlevels[i].getWidth();
-                    const bool active=i>=accountactive->getCampaignChoicesMade();
-                    if(!active)
-                        itemsize/=2;
-
-                    if(i>=1){
-                        XYZ start=campaignlevels[i-1].getCenter();
-                        Menu::addMapLine(start.x,start.y,midpoint.x-start.x,midpoint.y-start.y,0.5,active?1:0.5,active?1:0.5,0,0);
-                    }
-                    Menu::addMapMarker(NB_CAMPAIGN_MENU_ITEM+i, Mapcircletexture, NULL,
-                            midpoint.x-itemsize/2, midpoint.y-itemsize/2, itemsize, itemsize, active?1:0.5, 0, 0);
-
-                    if(active){
-                        Menu::addLabel(-2,campaignlevels[i].description,
-                                campaignlevels[i].getStartX()+10,
-                                campaignlevels[i].getStartY()-4);
-                        Menu::setMapItem(-2);
-                    }
-                }
-            }
-               }
-               break;
-               case 6: {                       
-            if(oldmainmenu!=mainmenu){
-                Menu::addLabel(-1,"Are you sure you want to delete this user?",10,400);
-                Menu::addButton(1,"Yes",NULL,10,360,-1,-1);
-                Menu::addButton(2,"No",NULL,10,320,-1,-1);
-            }
-               }
-               break;
-               case 7: {       
-            if(oldmainmenu!=mainmenu){
-                Menu::addButton(0,Account::getNbAccounts()<8?"New User":"No More Users",NULL,10,400,-1,-1);
-                Menu::addLabel(-2,"",20,400);
-                Menu::addButton(Account::getNbAccounts()+1,"Back",NULL,10,10,-1,-1);
-                for(int i=0;i<Account::getNbAccounts();i++)
-                    Menu::addButton(i+1,Account::get(i)->getName(),NULL,10,340-20*(i+1),-1,-1);
-            }
-            if(entername){
-                Menu::setButtonText(0,displaytext[0],20,400,-1,-1);
-                Menu::setButtonText(-2,displayblink?"_":"",20+displayselected*10,400,-1,-1);
-            }
-               }
-               break;
-               case 8: {                       
-            if(oldmainmenu!=mainmenu){
-                Menu::addButton(0,"Easier",NULL,10,400,-1,-1);
-                Menu::addButton(1,"Difficult",NULL,10,360,-1,-1);
-                Menu::addButton(2,"Insane",NULL,10,320,-1,-1);
-            }
-               }
-               break;
-               case 9: {                       
-            if(oldmainmenu!=mainmenu){
-                for(int i=0;i<numchallengelevels;i++){
-                    char temp[255];
-                    string name="";
-                    sprintf (temp, "Level %d",i+1);
-                    for(int j=strlen(temp);j<17;j++)
-                            strcat(temp," ");
-                    name+=temp;
-                    sprintf (temp, "%d",(int)accountactive->getHighScore(i));
-                    for(int j=strlen(temp);j<(32-17);j++)
-                            strcat(temp," ");
-                    name+=temp;
-                    sprintf (temp, "%d:",(int)(((int)accountactive->getFastTime(i)-(int)(accountactive->getFastTime(i))%60)/60));
-                    if((int)(accountactive->getFastTime(i))%60<10)strcat(temp,"0");
-                    name+=temp;
-                    sprintf (temp, "%d",(int)(accountactive->getFastTime(i))%60);
-                    name+=temp;
-
-                    Menu::addButton(i,name,NULL,10,400-i*25,-1,-1,i>accountactive->getProgress()?0.5:1,0,0);
-                }
-
-                Menu::addButton(-1,"             High Score      Best Time",NULL,10,440,-1,-1);
-                Menu::addButton(numchallengelevels,"Back",NULL,10,10,-1,-1);
-            }
-               }
-               break;
-               case 10: {                      
-            if(oldmainmenu!=mainmenu){
-                Menu::addLabel(0,"Congratulations!",220,330);
-                Menu::addLabel(1,"You have avenged your family and",140,300);
-                Menu::addLabel(2,"restored peace to the island of Lugaru.",110,270);
-                Menu::addButton(3,"Back",NULL,10,10,-1,-1);
-                sprintf(menustring[4],"Your score:         %d",(int)accountactive->getCampaignScore());
-                sprintf(menustring[5],"Highest score:      %d",(int)accountactive->getCampaignHighScore());
-                Menu::addLabel(4,menustring[4],190,200);
-                Menu::addLabel(5,menustring[5],190,180);
-            }
-               }
-               break;
-               case 18: {
-            if(oldmainmenu!=mainmenu){
-                Menu::addButton(0,"",NULL,70,400,-1,-1);
-                Menu::addButton(1,"",NULL,10,360,-1,-1);
-                Menu::addButton(2,"",NULL,40,320,-1,-1);
-                Menu::addButton(3,"Back",NULL,10,10,-1,-1);
-            }
-                       sprintf(menustring[0], "Stereo mode: %s", StereoModeName(newstereomode));
-                       sprintf(menustring[1], "Stereo separation: %.3f", stereoseparation);
-                       sprintf(menustring[2], "Reverse stereo: %s", stereoreverse ? "Yes" : "No");
-            Menu::setButtonText(0,menustring[0]);
-            Menu::setButtonText(1,menustring[1]);
-            Menu::setButtonText(2,menustring[2]);
-               }
-       }
-
-       oldmainmenu=mainmenu;
 
-    selected=Menu::getSelected(mousecoordh*640/screenwidth,480-mousecoordv*480/screenheight);
-    Menu::GUITick(this);
 
        glMatrixMode(GL_PROJECTION);                                            // Select The Projection Matrix
        glPushMatrix();                                                                         // Store The Projection Matrix
@@ -2408,7 +2150,7 @@ void Game::DrawMenu() {
        glLoadIdentity();                                                               // Reset The Modelview Matrix
        glEnable(GL_TEXTURE_2D);
        
-    Menu::drawItems(this);
+    Menu::drawItems();
 
     //draw mouse cursor
        glMatrixMode(GL_PROJECTION);                                            // Select The Projection Matrix