]> git.jsancho.org Git - lugaru.git/blobdiff - Source/GameTick.cpp
Some bug fixes. Now the game remember which campaign you were playing last time.
[lugaru.git] / Source / GameTick.cpp
index e59580515b3008bc990985954ad11bb43b84fa9c..86f840f4c574ae10dbb809363e6fee2e0cdd8661 100644 (file)
@@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Animation.h"
 #include "Awards.h"
 
+#include <algorithm>
+
 using namespace std;
 
 // Added more evilness needed for MSVC
@@ -1406,13 +1408,14 @@ void Game::Loadlevel(int which){
            Loadlevel("tutorial");
        }else if(which >= 0 && which <= 15){
            char buf[32];
-           snprintf(buf, 32, "map%d", which + 1);
+           snprintf(buf, 32, "map%d", which + 1); // challenges
            Loadlevel(buf);
        }else
            Loadlevel("mapsave");
 }
 
 void Game::Loadlevel(const char *name){
+       cout << "loading level " << name << "…" << endl;
        int templength;
        float lamefloat;
        static const char *pfx = ":Data:Maps:";
@@ -1524,7 +1527,7 @@ void Game::Loadlevel(const char *name){
                if(console){
                        emit_sound_np(consolesuccesssound);
                        freeze=0;
-                       console=0;
+                       console=false;
                }
 
                if(!stealthloading){
@@ -2113,438 +2116,57 @@ void Game::Loadlevel(const char *name){
        visibleloading=0;
 }
 
-/*
-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
-*/
-    
-void Game::MenuTick(){
-    //menu buttons
-    
-    // some specific case where we do something even if the left mouse button is not pressed.
-       if((mainmenu==5) && (endgame==2)) {
-               accountactive->endGame();
-               endgame=0;
-       }
-       if(mainmenu==10)
-               endgame=2;
-       if( (mainmenu==18) && Input::isKeyPressed(MOUSEBUTTON2) && (selected==1) )
-               stereoseparation-=0.001;
-               
-    if(Input::MouseClicked() && (selected >= 0)) { // handling of the left mouse clic in menus
-               switch(mainmenu) {
-                       case 1:
-                       case 2:
-                               switch(selected) {
-                                       case 1:
-                                               if(gameon) { //resume
-                                                       mainmenu=0;
-                                                       pause_sound(stream_menutheme);
-                                                       resume_stream(leveltheme);
-                                               } else { //new game
-                                                       fireSound(firestartsound);
-                                                       flash();
-                                                       mainmenu=(accountactive?5:7);
-                                                       selected=-1;
-                                               }
-                                               break;
-                                       case 2: //options
-                                               fireSound();
-                                               flash();
-                                               mainmenu=3;
-                                               if(newdetail>2) newdetail=detail;
-                                               if(newdetail<0) newdetail=detail;
-                                               if(newscreenwidth>3000) newscreenwidth=screenwidth;
-                                               if(newscreenwidth<0) newscreenwidth=screenwidth;
-                                               if(newscreenheight>3000) newscreenheight=screenheight;
-                                               if(newscreenheight<0) newscreenheight=screenheight;
-                                               break;
-                                       case 3:
-                                               fireSound();
-                                               flash();
-                                               if(gameon){ //end game
-                                                       gameon=0;
-                                                       mainmenu=1;
-                                               } else { //quit
-                                                       tryquit=1;
-                                                       pause_sound(stream_menutheme);
-                                               }
-                                               break;
-                               }
-                               break;
-                       case 3:
-                               fireSound();
-                               bool isCustomResolution,found;
-                               switch(selected){
-                                       case 0:
-                                               extern SDL_Rect **resolutions;
-                                               isCustomResolution = true;
-                                               found = false;
-                                               for(int i = 0; (!found) && (resolutions[i]); i++) {
-                                                       if((resolutions[i]->w == screenwidth) && (resolutions[i]->h == screenwidth))
-                                                               isCustomResolution = false;
-
-                                                       if((resolutions[i]->w == newscreenwidth) && (resolutions[i]->h == newscreenheight)) {
-                                                               i++;
-                                                               if(resolutions[i] != NULL) {
-                                                                       newscreenwidth = (int) resolutions[i]->w;
-                                                                       newscreenheight = (int) resolutions[i]->h;
-                                                               } else if(isCustomResolution){
-                                                                       if((screenwidth == newscreenwidth) && (screenheight == newscreenheight)) {
-                                                                               newscreenwidth = (int) resolutions[0]->w;
-                                                                               newscreenheight = (int) resolutions[0]->h;
-                                                                       } else {
-                                                                               newscreenwidth = screenwidth;
-                                                                               newscreenheight = screenheight;
-                                                                       }
-                                                               } else {
-                                                                       newscreenwidth = (int) resolutions[0]->w;
-                                                                       newscreenheight = (int) resolutions[0]->h;
-                                                               }
-                                                               found = true;
-                                                       }
-                                               }
-
-                                               if(!found) {
-                                                       newscreenwidth = (int) resolutions[0]->w;
-                                                       newscreenheight = (int) resolutions[0]->h;
-                                               }
-                                               break;
-                                       case 1:
-                                               newdetail++;
-                                               if(newdetail>2) newdetail=0;
-                                               break;
-                                       case 2:
-                                               bloodtoggle++;
-                                               if(bloodtoggle>2) bloodtoggle=0;
-                                               break;
-                                       case 3:
-                                               difficulty++;
-                                               if(difficulty>2) difficulty=0;
-                                               break;
-                                       case 4:
-                                               ismotionblur = !ismotionblur;
-                                               break;
-                                       case 5:
-                                               decals = !decals;
-                                               break;
-                                       case 6:
-                                               musictoggle = !musictoggle;
+void Game::doTutorial(){
+    if(tutorialstagetime>tutorialmaxtime){
+        tutorialstage++;
+        tutorialsuccess=0;
+        if(tutorialstage<=1){
+            canattack=0;
+            cananger=0;
+            reversaltrain=0;
+        }
+        switch(tutorialstage){
+            case 1:
+                tutorialmaxtime=5;
+            break; case 2:
+                tutorialmaxtime=2;
+            break; case 3:
+                tutorialmaxtime=600;
+            break; case 4:
+                tutorialmaxtime=1000;
+            break; case 5:
+                tutorialmaxtime=600;
+            break; case 6:
+                tutorialmaxtime=600;
+            break; case 7:
+                tutorialmaxtime=600;
+            break; case 8:
+                tutorialmaxtime=600;
+            break; case 9:
+                tutorialmaxtime=600;
+            break; case 10:
+                tutorialmaxtime=2;
+            break; case 11:
+                tutorialmaxtime=1000;
+            break; case 12:
+                tutorialmaxtime=1000;
+            break; case 13:
+                tutorialmaxtime=2;
+            break; case 14: {
+                tutorialmaxtime=3;
 
-                                               if(musictoggle) {
-                                                 emit_stream_np(stream_menutheme);
-                                               } else {
-                                                       pause_sound(leveltheme);
-                                                       pause_sound(stream_fighttheme);
-                                                       pause_sound(stream_menutheme);
+                XYZ temp,temp2;
 
-                                                       for(int i=0;i<4;i++){
-                                                               oldmusicvolume[i]=0;
-                                                               musicvolume[i]=0;
-                                                       }
-                                               }
+                temp.x=1011;
+                temp.y=84;
+                temp.z=491;
+                temp2.x=1025;
+                temp2.y=75;
+                temp2.z=447;
 
-                                               break;
-                                       case 7: // controls
-                                               flash();
-                                               mainmenu=4;
-                                               selected=-1;
-                                               keyselect=-1;
-                                               break;
-                                       case 8:
-                                               flash();
-                                               
-                                               SaveSettings(*this);
-                                               mainmenu=gameon?2:1;
-                                               break;
-                                       case 9:
-                                               invertmouse = !invertmouse;
-                                               break;
-                                       case 10:
-                                               usermousesensitivity+=.2;
-                                               if(usermousesensitivity>2) usermousesensitivity=.2;
-                                               break;
-                                       case 11:
-                                               volume+=.1f;
-                                               if(volume>1.0001f) volume=0;
-                                               OPENAL_SetSFXMasterVolume((int)(volume*255));
-                                               break;
-                                       case 12:
-                                               flash();
-                                               
-                                               newstereomode = stereomode;
-                                               mainmenu=18;
-                                               keyselect=-1;
-                                               break;
-                                       case 13:
-                                               showdamagebar = !showdamagebar;
-                                               break;
-                               }
-                               break;
-                       case 4:
-                               if(!waiting) {
-                                       fireSound();
-                                       if(selected<9 && keyselect==-1)
-                                               keyselect=selected;
-                                       if(keyselect!=-1)
-                                               setKeySelected();
-                                       if(selected==9){
-                                               flash();
+                player[1].coords=(temp+temp2)/2;
 
-                                               mainmenu=3;
-                                       }
-                               }
-                               break;
-                       case 5:
-                               fireSound();
-                               flash();
-                               if((selected-7 >= accountactive->getCampaignChoicesMade())) {
-                                       startbonustotal=0;
-
-                                       loading=2;
-                                       loadtime=0;
-                                       targetlevel=7;
-                                       if(firstload)
-                                               TickOnceAfter();
-                                       else
-                                               LoadStuff();
-                                       whichchoice=selected-7-accountactive->getCampaignChoicesMade();
-                                       visibleloading=1;
-                                       stillloading=1;
-                                       Loadlevel(campaignmapname[campaignchoicewhich[selected-7-accountactive->getCampaignChoicesMade()]]);
-                                       campaign=1;
-                                       mainmenu=0;
-                                       gameon=1;
-                                       pause_sound(stream_menutheme);
-                               }
-                               switch(selected){
-                                       case 1:
-                                               startbonustotal=0;
-
-                                               loading=2;
-                                               loadtime=0;
-                                               targetlevel=-1;
-                                               if(firstload) {
-                                                       TickOnceAfter();
-                                                       Loadlevel(-1);
-                                               } else
-                                                       LoadStuff();
-
-                                               mainmenu=0;
-                                               gameon=1;
-                                               pause_sound(stream_menutheme);
-                                               break;
-                                       case 2:
-                                               mainmenu=9;
-                                               break;
-                                       case 3:
-                                               mainmenu=6;
-                                               break;
-                                       case 4:
-                                               mainmenu=(gameon?2:1);
-                                               break;
-                                       case 5:
-                                               mainmenu=7;
-                                               break;
-                               }
-                               break;
-                       case 6:
-                               fireSound();
-                               if(selected==1) {
-                                       flash();
-                                       accountactive = Account::destroy(accountactive);
-                                       mainmenu=7;
-                               } else if(selected==2) {
-                                       flash();
-                                       mainmenu=5;
-                               }
-                               break;
-                       case 7:
-                               fireSound();
-                               if(selected==0 && Account::getNbAccounts()<8){
-                                       entername=1;
-                               } else if (selected < Account::getNbAccounts()+1) {
-                                       flash();
-                                       mainmenu=5;
-                                       accountactive=Account::get(selected-1);
-                               } else if (selected == Account::getNbAccounts()+1) {
-                                       flash();
-                                       mainmenu=5;
-                                       for(int j=0;j<255;j++){
-                                               displaytext[0][j]=0;
-                                       }
-                                       displaychars[0]=0;
-                                       displayselected=0;
-                                       entername=0;
-                               }
-                               break;
-                       case 8:
-                               fireSound();
-                               flash();
-                               if(selected<=2)
-                                       accountactive->setDifficulty(selected);
-                               mainmenu=5;
-                               break;
-                       case 9:
-                               if(selected<numchallengelevels && selected<=accountactive->getProgress()){
-                                       fireSound();
-                                       flash();
-
-                                       startbonustotal=0;
-
-                                       loading=2;
-                                       loadtime=0;
-                                       targetlevel=selected;
-                                       if(firstload)TickOnceAfter();
-                                       if(!firstload)LoadStuff();
-                                       else Loadlevel(selected);
-                                       campaign=0;
-
-                                       mainmenu=0;
-                                       gameon=1;
-                                       pause_sound(stream_menutheme);
-                               }
-                               if(selected==numchallengelevels){
-                                       fireSound();
-                                       flash();
-                                       mainmenu=5;
-                               }
-                               break;
-                       case 10:
-                               if(selected==3){
-                                       fireSound();
-                                       flash();
-                                       mainmenu=5;
-                               }
-                               break;
-                       case 18:
-                               if(selected==1)
-                                       stereoseparation+=0.001;
-                               else {
-                                       fireSound();
-                                       if(selected==0){
-                                               newstereomode = (StereoMode)(newstereomode + 1);
-                                               while(!CanInitStereo(newstereomode)){
-                                                       printf("Failed to initialize mode %s (%i)\n", StereoModeName(newstereomode), newstereomode);
-                                                       newstereomode = (StereoMode)(newstereomode + 1);
-                                                       if(newstereomode >= stereoCount)
-                                                               newstereomode = stereoNone;
-                                               }
-                                       } else if(selected==2) {
-                                               stereoreverse = !stereoreverse;
-                                       } else if(selected==3) {
-                                               flash();
-                                               mainmenu=3;
-
-                                               stereomode = newstereomode;
-                                               InitStereo(stereomode);
-                                       }
-                               }
-                               break;
-               }
-       }
-
-    if(Input::isKeyDown(SDLK_q) && Input::isKeyDown(SDLK_LMETA)){
-        tryquit=1;
-        if(mainmenu==3) {
-            SaveSettings(*this);
-        }
-    }
-
-    OPENAL_SetFrequency(channels[stream_menutheme], 22050);
-
-    if(entername) {
-        inputText(displaytext[0],&displayselected,&displaychars[0]);
-        if(!waiting) { // the input as finished
-            if(displaychars[0]){ // with enter
-                accountactive = Account::add(string(displaytext[0]));
-
-                mainmenu=8;
-
-                flash();
-
-                fireSound(firestartsound);
-
-                for(int i=0;i<255;i++){
-                    displaytext[0][i]=0;
-                }
-                displaychars[0]=0;
-
-                displayselected=0;
-            }
-            entername=0;
-        }
-        
-        displayblinkdelay-=multiplier;
-        if(displayblinkdelay<=0){
-            displayblinkdelay=.3;
-            displayblink=1-displayblink;
-        }
-    }
-}
-
-void Game::doTutorial(){
-    if(tutorialstagetime>tutorialmaxtime){
-        tutorialstage++;
-        tutorialsuccess=0;
-        if(tutorialstage<=1){
-            canattack=0;
-            cananger=0;
-            reversaltrain=0;
-        }
-        switch(tutorialstage){
-            case 1:
-                tutorialmaxtime=5;
-            break; case 2:
-                tutorialmaxtime=2;
-            break; case 3:
-                tutorialmaxtime=600;
-            break; case 4:
-                tutorialmaxtime=1000;
-            break; case 5:
-                tutorialmaxtime=600;
-            break; case 6:
-                tutorialmaxtime=600;
-            break; case 7:
-                tutorialmaxtime=600;
-            break; case 8:
-                tutorialmaxtime=600;
-            break; case 9:
-                tutorialmaxtime=600;
-            break; case 10:
-                tutorialmaxtime=2;
-            break; case 11:
-                tutorialmaxtime=1000;
-            break; case 12:
-                tutorialmaxtime=1000;
-            break; case 13:
-                tutorialmaxtime=2;
-            break; case 14: {
-                tutorialmaxtime=3;
-
-                XYZ temp,temp2;
-
-                temp.x=1011;
-                temp.y=84;
-                temp.z=491;
-                temp2.x=1025;
-                temp2.y=75;
-                temp2.z=447;
-
-                player[1].coords=(temp+temp2)/2;
-
-                emit_sound_at(fireendsound, player[1].coords);
+                emit_sound_at(fireendsound, player[1].coords);
 
                 for(int i=0;i<player[1].skeleton.num_joints;i++){
                     if(Random()%2==0){
@@ -5862,24 +5484,422 @@ void Game::doAI(int i){
     }
 }
 
-void Game::Tick(){
-       static XYZ facing,flatfacing;
-       static int target;
-
-       for(int i=0;i<15;i++){
-               displaytime[i]+=multiplier;
+/*
+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
+*/
+    
+void Game::MenuTick(){
+    //menu buttons
+    
+    // some specific case where we do something even if the left mouse button is not pressed.
+       if((mainmenu==5) && (endgame==2)) {
+               accountactive->endGame();
+               endgame=0;
        }
-
-       keyboardfrozen=0;
-    Input::Tick();
-
-       if(Input::isKeyPressed(SDLK_F6)){
-               if(Input::isKeyDown(SDLK_LSHIFT))
-                       stereoreverse=true;
-               else
-                       stereoreverse=false;
-
-               if(stereoreverse)
+       if(mainmenu==10)
+               endgame=2;
+       if( (mainmenu==18) && Input::isKeyPressed(MOUSEBUTTON2) && (selected==1) )
+               stereoseparation-=0.001;
+               
+    if(Input::MouseClicked() && (selected >= 0)) { // handling of the left mouse clic in menus
+               switch(mainmenu) {
+                       case 1:
+                       case 2:
+                               switch(selected) {
+                                       case 1:
+                                               if(gameon) { //resume
+                                                       mainmenu=0;
+                                                       pause_sound(stream_menutheme);
+                                                       resume_stream(leveltheme);
+                                               } else { //new game
+                                                       fireSound(firestartsound);
+                                                       flash();
+                                                       mainmenu=(accountactive?5:7);
+                                                       selected=-1;
+                                               }
+                                               break;
+                                       case 2: //options
+                                               fireSound();
+                                               flash();
+                                               mainmenu=3;
+                                               if(newdetail>2) newdetail=detail;
+                                               if(newdetail<0) newdetail=detail;
+                                               if(newscreenwidth>3000) newscreenwidth=screenwidth;
+                                               if(newscreenwidth<0) newscreenwidth=screenwidth;
+                                               if(newscreenheight>3000) newscreenheight=screenheight;
+                                               if(newscreenheight<0) newscreenheight=screenheight;
+                                               break;
+                                       case 3:
+                                               fireSound();
+                                               flash();
+                                               if(gameon){ //end game
+                                                       gameon=0;
+                                                       mainmenu=1;
+                                               } else { //quit
+                                                       tryquit=1;
+                                                       pause_sound(stream_menutheme);
+                                               }
+                                               break;
+                               }
+                               break;
+                       case 3:
+                               fireSound();
+                               bool isCustomResolution,found;
+                               switch(selected){
+                                       case 0:
+                                               extern SDL_Rect **resolutions;
+                                               isCustomResolution = true;
+                                               found = false;
+                                               for(int i = 0; (!found) && (resolutions[i]); i++) {
+                                                       if((resolutions[i]->w == screenwidth) && (resolutions[i]->h == screenwidth))
+                                                               isCustomResolution = false;
+
+                                                       if((resolutions[i]->w == newscreenwidth) && (resolutions[i]->h == newscreenheight)) {
+                                                               i++;
+                                                               if(resolutions[i] != NULL) {
+                                                                       newscreenwidth = (int) resolutions[i]->w;
+                                                                       newscreenheight = (int) resolutions[i]->h;
+                                                               } else if(isCustomResolution){
+                                                                       if((screenwidth == newscreenwidth) && (screenheight == newscreenheight)) {
+                                                                               newscreenwidth = (int) resolutions[0]->w;
+                                                                               newscreenheight = (int) resolutions[0]->h;
+                                                                       } else {
+                                                                               newscreenwidth = screenwidth;
+                                                                               newscreenheight = screenheight;
+                                                                       }
+                                                               } else {
+                                                                       newscreenwidth = (int) resolutions[0]->w;
+                                                                       newscreenheight = (int) resolutions[0]->h;
+                                                               }
+                                                               found = true;
+                                                       }
+                                               }
+
+                                               if(!found) {
+                                                       newscreenwidth = (int) resolutions[0]->w;
+                                                       newscreenheight = (int) resolutions[0]->h;
+                                               }
+                                               break;
+                                       case 1:
+                                               newdetail++;
+                                               if(newdetail>2) newdetail=0;
+                                               break;
+                                       case 2:
+                                               bloodtoggle++;
+                                               if(bloodtoggle>2) bloodtoggle=0;
+                                               break;
+                                       case 3:
+                                               difficulty++;
+                                               if(difficulty>2) difficulty=0;
+                                               break;
+                                       case 4:
+                                               ismotionblur = !ismotionblur;
+                                               break;
+                                       case 5:
+                                               decals = !decals;
+                                               break;
+                                       case 6:
+                                               musictoggle = !musictoggle;
+
+                                               if(musictoggle) {
+                                                 emit_stream_np(stream_menutheme);
+                                               } else {
+                                                       pause_sound(leveltheme);
+                                                       pause_sound(stream_fighttheme);
+                                                       pause_sound(stream_menutheme);
+
+                                                       for(int i=0;i<4;i++){
+                                                               oldmusicvolume[i]=0;
+                                                               musicvolume[i]=0;
+                                                       }
+                                               }
+
+                                               break;
+                                       case 7: // controls
+                                               flash();
+                                               mainmenu=4;
+                                               selected=-1;
+                                               keyselect=-1;
+                                               break;
+                                       case 8:
+                                               flash();
+                                               
+                                               SaveSettings(*this);
+                                               mainmenu=gameon?2:1;
+                                               break;
+                                       case 9:
+                                               invertmouse = !invertmouse;
+                                               break;
+                                       case 10:
+                                               usermousesensitivity+=.2;
+                                               if(usermousesensitivity>2) usermousesensitivity=.2;
+                                               break;
+                                       case 11:
+                                               volume+=.1f;
+                                               if(volume>1.0001f) volume=0;
+                                               OPENAL_SetSFXMasterVolume((int)(volume*255));
+                                               break;
+                                       case 12:
+                                               flash();
+                                               
+                                               newstereomode = stereomode;
+                                               mainmenu=18;
+                                               keyselect=-1;
+                                               break;
+                                       case 13:
+                                               showdamagebar = !showdamagebar;
+                                               break;
+                               }
+                               break;
+                       case 4:
+                               if(!waiting) {
+                                       fireSound();
+                                       if(selected<9 && keyselect==-1)
+                                               keyselect=selected;
+                                       if(keyselect!=-1)
+                                               setKeySelected();
+                                       if(selected==9){
+                                               flash();
+
+                                               mainmenu=3;
+                                       }
+                               }
+                               break;
+                       case 5:
+                               fireSound();
+                               flash();
+                               if((selected-NB_CAMPAIGN_MENU_ITEM-1 >= accountactive->getCampaignChoicesMade())) {
+                                       startbonustotal=0;
+
+                                       loading=2;
+                                       loadtime=0;
+                                       targetlevel=7;
+                                       if(firstload)
+                                               TickOnceAfter();
+                                       else
+                                               LoadStuff();
+                                       whichchoice=selected-NB_CAMPAIGN_MENU_ITEM-1-accountactive->getCampaignChoicesMade();
+                                       visibleloading=1;
+                                       stillloading=1;
+                                       Loadlevel(campaignmapname[campaignchoicewhich[whichchoice]]);
+                                       campaign=1;
+                                       mainmenu=0;
+                                       gameon=1;
+                                       pause_sound(stream_menutheme);
+                               }
+                               switch(selected){
+                                       case 1:
+                                               startbonustotal=0;
+
+                                               loading=2;
+                                               loadtime=0;
+                                               targetlevel=-1;
+                                               if(firstload) {
+                                                       TickOnceAfter();
+                                                       Loadlevel(-1);
+                                               } else
+                                                       LoadStuff();
+
+                                               mainmenu=0;
+                                               gameon=1;
+                                               pause_sound(stream_menutheme);
+                                               break;
+                                       case 2:
+                                               mainmenu=9;
+                                               break;
+                                       case 3:
+                                               mainmenu=6;
+                                               break;
+                                       case 4:
+                                               mainmenu=(gameon?2:1);
+                                               break;
+                                       case 5:
+                                               mainmenu=7;
+                                               break;
+                                       case 6:
+                                               vector<string> campaigns = ListCampaigns();
+                                               vector<string>::iterator c;
+                                               if ((c = find(campaigns.begin(),campaigns.end(),accountactive->getCurrentCampaign()))==campaigns.end()) {
+                                                       if(!campaigns.empty())
+                                                               accountactive->setCurrentCampaign(campaigns.front());
+                                               } else {
+                                                       c++;
+                                                       if(c==campaigns.end())
+                                                               c=campaigns.begin();
+                                                       accountactive->setCurrentCampaign(*c);
+                                               }
+                                               if(Mainmenuitems[7])
+                                                       glDeleteTextures(1,&Mainmenuitems[7]); // we delete the world texture so load campaign will reload it
+                                               Mainmenuitems[7] = 0;
+                                               LoadCampaign();
+                                               break;
+                               }
+                               break;
+                       case 6:
+                               fireSound();
+                               if(selected==1) {
+                                       flash();
+                                       accountactive = Account::destroy(accountactive);
+                                       mainmenu=7;
+                               } else if(selected==2) {
+                                       flash();
+                                       mainmenu=5;
+                               }
+                               break;
+                       case 7:
+                               fireSound();
+                               if(selected==0 && Account::getNbAccounts()<8){
+                                       entername=1;
+                               } else if (selected < Account::getNbAccounts()+1) {
+                                       flash();
+                                       mainmenu=5;
+                                       accountactive=Account::get(selected-1);
+                               } else if (selected == Account::getNbAccounts()+1) {
+                                       flash();
+                                       mainmenu=5;
+                                       for(int j=0;j<255;j++){
+                                               displaytext[0][j]=0;
+                                       }
+                                       displaychars[0]=0;
+                                       displayselected=0;
+                                       entername=0;
+                               }
+                               break;
+                       case 8:
+                               fireSound();
+                               flash();
+                               if(selected<=2)
+                                       accountactive->setDifficulty(selected);
+                               mainmenu=5;
+                               break;
+                       case 9:
+                               if(selected<numchallengelevels && selected<=accountactive->getProgress()){
+                                       fireSound();
+                                       flash();
+
+                                       startbonustotal=0;
+
+                                       loading=2;
+                                       loadtime=0;
+                                       targetlevel=selected;
+                                       if(firstload)TickOnceAfter();
+                                       if(!firstload)LoadStuff();
+                                       else Loadlevel(selected);
+                                       campaign=0;
+
+                                       mainmenu=0;
+                                       gameon=1;
+                                       pause_sound(stream_menutheme);
+                               }
+                               if(selected==numchallengelevels){
+                                       fireSound();
+                                       flash();
+                                       mainmenu=5;
+                               }
+                               break;
+                       case 10:
+                               if(selected==3){
+                                       fireSound();
+                                       flash();
+                                       mainmenu=5;
+                               }
+                               break;
+                       case 18:
+                               if(selected==1)
+                                       stereoseparation+=0.001;
+                               else {
+                                       fireSound();
+                                       if(selected==0){
+                                               newstereomode = (StereoMode)(newstereomode + 1);
+                                               while(!CanInitStereo(newstereomode)){
+                                                       printf("Failed to initialize mode %s (%i)\n", StereoModeName(newstereomode), newstereomode);
+                                                       newstereomode = (StereoMode)(newstereomode + 1);
+                                                       if(newstereomode >= stereoCount)
+                                                               newstereomode = stereoNone;
+                                               }
+                                       } else if(selected==2) {
+                                               stereoreverse = !stereoreverse;
+                                       } else if(selected==3) {
+                                               flash();
+                                               mainmenu=3;
+
+                                               stereomode = newstereomode;
+                                               InitStereo(stereomode);
+                                       }
+                               }
+                               break;
+               }
+       }
+
+    if(Input::isKeyDown(SDLK_q) && Input::isKeyDown(SDLK_LMETA)){
+        tryquit=1;
+        if(mainmenu==3) {
+            SaveSettings(*this);
+        }
+    }
+
+    OPENAL_SetFrequency(channels[stream_menutheme], 22050);
+
+    if(entername) {
+        inputText(displaytext[0],&displayselected,&displaychars[0]);
+        if(!waiting) { // the input as finished
+            if(displaychars[0]){ // with enter
+                accountactive = Account::add(string(displaytext[0]));
+
+                mainmenu=8;
+
+                flash();
+
+                fireSound(firestartsound);
+
+                for(int i=0;i<255;i++){
+                    displaytext[0][i]=0;
+                }
+                displaychars[0]=0;
+
+                displayselected=0;
+            }
+            entername=0;
+        }
+        
+        displayblinkdelay-=multiplier;
+        if(displayblinkdelay<=0){
+            displayblinkdelay=.3;
+            displayblink=1-displayblink;
+        }
+    }
+}
+
+void Game::Tick(){
+       static XYZ facing,flatfacing;
+       static int target;
+
+       for(int i=0;i<15;i++){
+               displaytime[i]+=multiplier;
+       }
+
+       keyboardfrozen=false;
+    Input::Tick();
+
+       if(Input::isKeyPressed(SDLK_F6)){
+               if(Input::isKeyDown(SDLK_LSHIFT))
+                       stereoreverse=true;
+               else
+                       stereoreverse=false;
+
+               if(stereoreverse)
                        printf("Stereo reversed\n");
                else
                        printf("Stereo unreversed\n");
@@ -5924,25 +5944,36 @@ void Game::Tick(){
     18 stereo configuration
     */
         
-       if(!console){
+       if(!console) {
         //campaign over?
                if(mainmenu&&endgame==1)
             mainmenu=10;
+        //go to level select after completing a campaign level
+        if(campaign&&winfreeze&&mainmenu==0&&campaignchoosenext[campaignchoicewhich[whichchoice]]==1) {
+            mainmenu=5;
+            gameon=0;
+            winfreeze=0;
+            fireSound();
+            flash();
+            if(musictoggle){
+                OPENAL_SetFrequency(OPENAL_ALL, 0.001);
+                emit_stream_np(stream_menutheme);
+                pause_sound(leveltheme);
+            }
+                       LoadCampaign();
+        }
         //escape key pressed
         //TODO: there must be code somewhere else that handles clicking the Back button, merge it with this
                if(Input::isKeyPressed(SDLK_ESCAPE)&&
-                (gameon||mainmenu==0||(mainmenu>=3&&mainmenu!=8&&!(mainmenu==7&&entername)))){
+                (gameon||mainmenu==0||(mainmenu>=3&&mainmenu!=8&&!(mainmenu==7&&entername)))) {
                        selected=-1;
             if(mainmenu==0&&!winfreeze)
                 mainmenu=2; //pause
-            else if(mainmenu==0&&winfreeze&&campaignchoosenext[campaignchoicewhich[whichchoice]]==1){
-                mainmenu=100; // play menu sound and go to menu 5.
-                gameon=0;
-                winfreeze=0;
-            } else if(mainmenu==1||mainmenu==2)
+            else if(mainmenu==1||mainmenu==2){
                 mainmenu=0; //unpause
+            }
             //play menu theme
-            if(musictoggle&&(mainmenu==1||mainmenu==2||mainmenu==100)){
+            if(musictoggle&&(mainmenu==1||mainmenu==2)){
                 OPENAL_SetFrequency(OPENAL_ALL, 0.001);
                 emit_stream_np(stream_menutheme);
                 pause_sound(leveltheme);
@@ -5967,17 +5998,17 @@ void Game::Tick(){
                     mainmenu=gameon?2:1; break;
                 case 4: case 18:
                     mainmenu=3; break;
-                case 6: case 7: case 9: case 10: case 100:
+                case 6: case 7: case 9: case 10:
                     mainmenu=5; break;
             }
                }
        }
 
-       if(mainmenu){
+       if(mainmenu) {
         MenuTick();
        }
 
-       if(!mainmenu){
+       if(!mainmenu) {
                if(hostile==1)hostiletime+=multiplier;
                else hostiletime=0;
                if(!winfreeze)leveltime+=multiplier;
@@ -6012,10 +6043,10 @@ void Game::Tick(){
                        }
                }
                if(chatting)
-            keyboardfrozen=1;
+            keyboardfrozen=true;
 
                if(Input::isKeyPressed(SDLK_BACKQUOTE)&&debugmode){
-                       console=1-console;
+                       console=!console;
                        if(console){
                                OPENAL_SetFrequency(OPENAL_ALL, 0.001);
                        } else {
@@ -6076,9 +6107,9 @@ void Game::Tick(){
                 winfreeze=0;
                if((Input::isKeyDown(SDLK_ESCAPE))&&!campaign&&gameon){
             if(console){
-                console=0;
+                console=false;
                 freeze=0;
-            }else if(winfreeze){
+            } else if(winfreeze) {
                                mainmenu=9;
                                gameon=0;
                        }
@@ -7720,7 +7751,7 @@ void Game::TickOnceAfter(){
                                killhotspot=0;
                        }
 
-                       if(!editorenabled&&gameon&&!mainmenu){
+                       if(!editorenabled&&gameon&&!mainmenu) {
                                if(changedelay!=-999)
                     changedelay-=multiplier/7;
                                if(player[0].dead)
@@ -7759,17 +7790,16 @@ void Game::TickOnceAfter(){
                         (player[0].dead||
                          (alldead&&maptype==mapkilleveryone)||
                          (winhotspot)||
-                         (killhotspot))&&
-                        !winfreeze)
+                         (killhotspot)))
                     loading=1;
                                if((player[0].dead||
                             (alldead&&maptype==mapkilleveryone)||
                             (winhotspot)||
                             (windialogue)||
                             (killhotspot))&&
-                        changedelay<=0){
-                    if(whichlevel!=-2&&!loading&&!player[0].dead){
-                        winfreeze=1;
+                        changedelay<=0) {
+                    if(whichlevel!=-2&&!loading&&!player[0].dead) {
+                        winfreeze=true;
                         changedelay=-999;
                     }
                     if(player[0].dead)
@@ -7777,15 +7807,16 @@ void Game::TickOnceAfter(){
                                }
                        }
 
-                       if(campaign)
-                               if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1)
+                       if(campaign) {
+                // campaignchoosenext determines what to do when the level is complete:
+                // 0 = load next level
+                // 1 = go back to level select screen
+                // 2 = stealthload next level
+                               if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1){
                                        if(campaignnumnext[campaignchoicewhich[whichchoice]]==0)
                                                endgame=1;
-                               else if(mainmenu==0&&winfreeze){
-                                       if(campaignchoosenext[campaignchoicewhich[whichchoice]]==2)
-                                               stealthloading=1;
-                                       else
-                        stealthloading=0;
+                               } else if(mainmenu==0&&winfreeze) {
+                                       stealthloading = (campaignchoosenext[campaignchoicewhich[whichchoice]]==2);
 
                                        if(!stealthloading){
                                                fireSound(firestartsound);
@@ -7813,6 +7844,7 @@ void Game::TickOnceAfter(){
 
                                        stealthloading=0;
                                }
+            }
 
             if(loading==3)
                 loading=0;