X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=2a22f2599b82ab15119032fb7495ce4e0c98fab6;hb=7a084f44a89054024b83299709c19a2f67fcaea9;hp=4aead8d5b959ea169e0828e75fc82e2e23af1d1f;hpb=ab6914764793b00eb6be0e3a939517636e4b5c3a;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 4aead8d..2a22f25 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -78,7 +78,7 @@ extern bool keyboardfrozen;
 extern bool loadingstuff;
 extern XYZ windvector;
 extern bool debugmode;
-static int music1;
+static int leveltheme;
 extern int mainmenu;
 extern bool visibleloading;
 extern XYZ envsound[30];
@@ -1272,9 +1272,9 @@ void	Game::Setenvironment(int which)
 	float temptexdetail;
 	environment=which;
 
-	pause_sound(stream_music1snow);
-	pause_sound(stream_music1grass);
-	pause_sound(stream_music1desert);
+	pause_sound(stream_snowtheme);
+	pause_sound(stream_grasstheme);
+	pause_sound(stream_deserttheme);
 	pause_sound(stream_wind);
 	pause_sound(stream_desertambient);
 
@@ -2129,389 +2129,383 @@ void Game::Loadlevel(const char *name){
 
 
 
+/*
+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
-    if(mainmenu==1||mainmenu==2){
-        if(Input::MouseClicked()&&selected==1){
-            if(!gameon){
-                fireSound(firestartsound);
-                flash();
-                //new game
-                if(accountactive) {
-                    mainmenu=5;
-                } else {
-                    mainmenu=7;
-                }
-                selected=-1;
-            }else{
-                //resume
-                mainmenu=0;
-                pause_sound(stream_music3);
-                resume_stream(music1);
-            }
-        }
-
-        if(Input::MouseClicked()&&selected==2){
-            fireSound();
-            flash();
-            //options
-            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;
-        }
-
-        if(Input::MouseClicked()&&selected==3){
-            fireSound();
-            flash();
-            if(!gameon){
-                //quit
-                tryquit=1;
-                pause_sound(stream_music3);
-            }else{
-                //end game
-                gameon=0;
-                mainmenu=1;
-            }
-        }
-    }else if(mainmenu==3){
-        if(Input::MouseClicked()){
-
-            if(selected!=-1)
-                fireSound();
-
-            switch(selected){
-                case 0: {
-                    extern SDL_Rect **resolutions;
-                    bool isCustomResolution = true;
-                    bool 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=1-ismotionblur;
-                    break;
-                case 5:
-                    decals=1-decals;
-                    break;
-                case 6:
-                    musictoggle=1-musictoggle;
-
-                    if(!musictoggle){
-                        pause_sound(music1);
-                        pause_sound(stream_music2);
-                        pause_sound(stream_music3);
-
-                        for(int i=0;i<4;i++){
-                            oldmusicvolume[i]=0;
-                            musicvolume[i]=0;
-                        }
-                    }
-
-                    if(musictoggle)
-                      emit_stream_np(stream_music3);
-                    break;
-                case 7:
-                    flash();
-                    //options
-                    mainmenu=4;
-                    selected=-1;
-                    keyselect=-1;
-                    break;
-                case 8:
-                    flash();
+    
+    // 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(newdetail>2)newdetail=detail;
-                    if(newdetail<0)newdetail=detail;
-                    if(newscreenwidth<0)newscreenwidth=screenwidth;
-                    if(newscreenheight<0)newscreenheight=screenheight;
+						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 = 1-ismotionblur;
+						break;
+					case 5:
+						decals = 1-decals;
+						break;
+					case 6:
+						musictoggle = 1-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;
+							}
+						}
 
-                    SaveSettings(*this);
-                    if(mainmenu==3&&gameon)mainmenu=2;
-                    if(mainmenu==3&&!gameon)mainmenu=1;
-                    break;
-                case 9:
-                    invertmouse=1-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;
-            }
-        }
-    }else if(mainmenu==4){
-        if(Input::MouseClicked()&&selected!=-1&&!waiting){
-            fireSound();
-            if(selected<9&&keyselect==-1)
-                keyselect=selected;
-            if(keyselect!=-1)
-                setKeySelected();
-            if(selected==9){
-                flash();
+						break;
+					case 7: // controls
+						flash();
+						mainmenu=4;
+						selected=-1;
+						keyselect=-1;
+						break;
+					case 8:
+						flash();
 
-                mainmenu=3;
+						if(newdetail>2) newdetail=detail;
+						if(newdetail<0) newdetail=detail;
+						if(newscreenwidth<0) newscreenwidth=screenwidth;
+						if(newscreenheight<0) newscreenheight=screenheight;
+
+						SaveSettings(*this);
+						mainmenu=gameon?2:1;
+						break;
+					case 9:
+						invertmouse = 1-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();
 
-                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;
-            }
-        }
-    }else if(mainmenu==5){
+						mainmenu=3;
 
-        if(endgame==2){
-            accountactive->endGame();
-            endgame=0;
-        }
+						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 5:
+				fireSound();
+				flash();
+				if((selected-7 >= accountactive->getCampaignChoicesMade())) {
+					startbonustotal=0;
 
-        if(Input::MouseClicked()){
-            if((selected-7>=accountactive->getCampaignChoicesMade())){
-                fireSound();
-                flash();
-                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()]]);
-                //Loadlevel(campaignmapname[levelorder[selected-7]]);
-                campaign=1;
-                mainmenu=0;
-                gameon=1;
-                pause_sound(stream_music3);
-            }
-            if(selected>=1 && selected<=5){
-                fireSound();
-                flash();
-            }
-            switch(selected){
-                case 1:
-                    startbonustotal=0;
-
-                    loading=2;
-                    loadtime=0;
-                    targetlevel=-1;
-                    if(firstload)TickOnceAfter();
-                    if(!firstload)LoadStuff();
-                    else {
-                        Loadlevel(-1);
-                    }
+					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();
 
-                    mainmenu=0;
-                    gameon=1;
-                    pause_sound(stream_music3);
-                    break;
-                case 2:
-                    mainmenu=9;
-                    break;
-                case 3:
-                    mainmenu=6;
-                    break;
-                case 4:
-                    if(mainmenu==5&&gameon)mainmenu=2;
-                    if(mainmenu==5&&!gameon)mainmenu=1;
-                    break;
-                case 5:
-                    mainmenu=7;
-                    break;
-            }
-        }
-    }else if(mainmenu==9){
-        if(Input::MouseClicked()&&selected<numchallengelevels&&selected>=0&&selected<=accountactive->getProgress()){
-            fireSound();
-            flash();
-
-            startbonustotal=0;
-
-            loading=2;
-            loadtime=0;
-            targetlevel=selected;
-            if(firstload)TickOnceAfter();
-            if(!firstload)LoadStuff();
-            else {
-                Loadlevel(selected);
-            }
-            campaign=0;
+					startbonustotal=0;
 
-            mainmenu=0;
-            gameon=1;
-            pause_sound(stream_music3);
-        }
-        if(Input::MouseClicked()&&selected==numchallengelevels){
-            fireSound();
-            flash();
-            mainmenu=5;
-        }
-    }else if(mainmenu==10){
-        endgame=2;
-        if(Input::MouseClicked()&&selected==3){
-            fireSound();
-            flash();
-            mainmenu=5;
-        }
-    }else if(mainmenu==6){
-        if(Input::MouseClicked()) {
-            if(selected>-1){
-                fireSound();
-                if(selected==1) {
-                    flash();
-                    accountactive = Account::destroy(accountactive);
-                    mainmenu=7;
-                } else if(selected==2) {
-                    flash();
-                    mainmenu=5;
-                }
-            }
-        }
-    }else if(mainmenu==7){
-        if(Input::MouseClicked()) {
-            if(selected!=-1){
-                fireSound();
-                if(selected==0&&Account::getNbAccounts()<8){
-                    entername=1;
-                } else if (selected<Account::getNbAccounts()+1) {
-                    accountactive=Account::get(selected-1);
-                    mainmenu=5;
-                    flash();
-                } else if (selected==Account::getNbAccounts()+1) {
-                    flash();
-
-                    mainmenu=1;
-
-                    for(int j=0;j<255;j++){
-                        displaytext[0][j]=0;
-                    }
-                    displaychars[0]=0;
-                    displayselected=0;
-                    entername=0;
-                }
-            }
-        }
-    }else if(mainmenu==8){
-        if(Input::MouseClicked()&&selected>-1){
-            fireSound();
-            flash();
-            if(selected<=2)
-                accountactive->setDifficulty(selected);
-            mainmenu=5;
-        }
-    }else if(mainmenu==18){			
-        if(Input::MouseClicked()&&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;
-                }
-            }
-        }
-        
-        if(Input::isKeyPressed(MOUSEBUTTON1)&&selected==1)
-            stereoseparation+=0.001;
-        if(Input::isKeyPressed(MOUSEBUTTON2)&&selected==1)
-            stereoseparation-=0.001;
+					loading=2;
+					loadtime=0;
+					targetlevel=selected;
+					if(firstload)TickOnceAfter();
+					if(!firstload)LoadStuff();
+					else Loadlevel(selected);
+					campaign=0;
 
-        if(Input::MouseClicked()&&selected==2) {
-            stereoreverse =! stereoreverse;
-        }
-        
-        if(Input::MouseClicked()&&selected==3) {
-            flash();
+					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);
-            
-            mainmenu=3;
-        }
-    }
+						stereomode = newstereomode;
+						InitStereo(stereomode);
+					}
+				}
+				break;
+		}
+	}
 
-    if(Input::isKeyDown(SDLK_q)&&Input::isKeyDown(SDLK_LMETA)){
+    if(Input::isKeyDown(SDLK_q) && Input::isKeyDown(SDLK_LMETA)){
         tryquit=1;
         if(mainmenu==3){
-            if(newdetail>2)newdetail=detail;
-            if(newdetail<0)newdetail=detail;
-            if(newscreenwidth<0)newscreenwidth=screenwidth;
-            if(newscreenheight<0)newscreenheight=screenheight;
+            if(newdetail>2) newdetail=detail;
+            if(newdetail<0) newdetail=detail;
+            if(newscreenwidth<0) newscreenwidth=screenwidth;
+            if(newscreenheight<0) newscreenheight=screenheight;
 
             SaveSettings(*this);
         }
     }
 
     if(mainmenu==1||mainmenu==2){
-        if(loaddistrib>4)transition+=multiplier/8;
+        if(loaddistrib>4)
+			transition+=multiplier/8;
         if(transition>1){
             transition=0;
             anim++;
-            if(anim>4)anim=0;
+            if(anim>4) anim=0;
             loaddistrib=0;
         }
     }
-    OPENAL_SetFrequency(channels[stream_music3], 22050);
+    OPENAL_SetFrequency(channels[stream_menutheme], 22050);
 
     if(entername) {
         inputText(displaytext[0],&displayselected,&displaychars[0]);
@@ -4631,7 +4625,7 @@ void Game::doAttacks(){
                                                          player[i].skeleton.longdead<300&&
                                                          player[k].lastattack!=spinkickanim&&
                                                          player[i].skeleton.free)&&
-                                                        (!player[i].dead||musictype!=stream_music2)){
+                                                        (!player[i].dead||musictype!=stream_fighttheme)){
                                                     player[k].targetanimation=dropkickanim;
                                                     for(int j=0;j<terrain.numdecals;j++){
                                                         if((terrain.decaltype[j]==blooddecal||terrain.decaltype[j]==blooddecalslow)&&
@@ -5970,60 +5964,76 @@ void Game::Tick(){
 		emit_sound_np(consolefailsound, 128.);
 	}
 
+    /*
+    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(!console){
-		if(mainmenu&&endgame==1)mainmenu=10;
-        // menu back
-		if( (Input::isKeyPressed(SDLK_ESCAPE)
-                    ||(mainmenu==0
-                        &&((Input::isKeyPressed(jumpkey)
-                                ||Input::isKeyPressed(SDLK_SPACE)
-                                ||(campaign)))
-                        &&campaign
-                        &&winfreeze))
-                && (!mainmenu||gameon||mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||(mainmenu==7&&!entername)||mainmenu==9||mainmenu==10)){
+        //campaign over?
+		if(mainmenu&&endgame==1)
+            mainmenu=10;
+        //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)))){
 			selected=-1;
-			if(mainmenu==1||mainmenu==2||mainmenu==0){
-				if(mainmenu==0&&!winfreeze)mainmenu=2;
-				else if(mainmenu==0&&winfreeze&&(campaignchoosenext[campaignchoicewhich[whichchoice]])==1)mainmenu=100;
-				else if(mainmenu==0&&winfreeze){ }
-				else if(mainmenu==1||mainmenu==2)mainmenu=0;
-				if(mainmenu&&musictoggle){
-					if(mainmenu==1||mainmenu==2||mainmenu==100){
-						OPENAL_SetFrequency(OPENAL_ALL, 0.001);
-						emit_stream_np(stream_music3);
-						pause_sound(music1);
-					}
-				}
-				if(!mainmenu){
-					pause_sound(stream_music3);
-					resume_stream(music1);
-				}
-			}
+            if(mainmenu==0&&!winfreeze)
+                mainmenu=2; //pause
+            else if(mainmenu==0&&winfreeze&&campaignchoosenext[campaignchoicewhich[whichchoice]]==1){
+                mainmenu=100;
+                gameon=0;
+                winfreeze=0;
+            }else if(mainmenu==1||mainmenu==2)
+                mainmenu=0; //unpause
+            //play menu theme
+            if(musictoggle&&(mainmenu==1||mainmenu==2||mainmenu==100)){
+                OPENAL_SetFrequency(OPENAL_ALL, 0.001);
+                emit_stream_np(stream_menutheme);
+                pause_sound(leveltheme);
+            }
+            //on resume, play level music
+            if(!mainmenu){
+                pause_sound(stream_menutheme);
+                resume_stream(leveltheme);
+            }
+            //finished with settings menu
 			if(mainmenu==3){
-				if(newdetail>2)newdetail=detail;
-				if(newdetail<0)newdetail=detail;
-				if(newscreenwidth<0)newscreenwidth=screenwidth;
-				if(newscreenheight<0)newscreenheight=screenheight;
+				if(newdetail>2)
+                    newdetail=detail;
+				if(newdetail<0)
+                    newdetail=detail;
+				if(newscreenwidth<0)
+                    newscreenwidth=screenwidth;
+				if(newscreenheight<0)
+                    newscreenheight=screenheight;
 				SaveSettings(*this);
 			}
-			if((mainmenu>=3 && mainmenu<=7)||mainmenu==9||mainmenu==10||mainmenu==100){
+            //effects
+			if(mainmenu>=3&&mainmenu!=8){
 				fireSound();
 				flash();
 			}
-			if(mainmenu==3&&gameon)mainmenu=2;
-			if(mainmenu==3&&!gameon)mainmenu=1;
-			if(mainmenu==5&&gameon)mainmenu=2;
-			if(mainmenu==5&&!gameon)mainmenu=1;
-			if(mainmenu==4)mainmenu=3;
-			if(mainmenu==6)mainmenu=5;
-			if(mainmenu==7)mainmenu=1;
-			if(mainmenu==9)mainmenu=5;
-			if(mainmenu==10)mainmenu=5;
-			if(mainmenu==100){
-				mainmenu=5;
-				gameon=0;
-				winfreeze=0;
-			}
+            //go back
+            switch(mainmenu){
+                case 3: case 5:
+                    mainmenu=gameon?2:1; break;
+                case 4: case 18:
+                    mainmenu=3; break;
+                case 6: case 7: case 9: case 10: case 100:
+                    mainmenu=5; break;
+            }
 		}
 	}
 
@@ -7040,7 +7050,7 @@ void Game::Tick(){
                             player[i].attackkeydown){
                         if(weapons.bloody[player[i].weaponids[player[i].weaponactive]]&&
                                 player[i].onterrain&&
-                                bloodtoggle&&musictype!=stream_music2){
+                                bloodtoggle&&musictype!=stream_fighttheme){
                             if(weapons.type[player[i].weaponids[player[i].weaponactive]]==knife)
                                 setAnimation(i,crouchstabanim);
                             if(weapons.type[player[i].weaponids[player[i].weaponactive]]==sword)
@@ -7481,7 +7491,7 @@ void Game::Tick(){
                         OPENAL_StopSound(OPENAL_ALL);  // hack...OpenAL renderer isn't stopping music after tutorial goes to level menu...
                         OPENAL_SetFrequency(OPENAL_ALL, 0.001);
 
-                        emit_stream_np(stream_music3);
+                        emit_stream_np(stream_menutheme);
 
                         gameon=0;
                         mainmenu=5;
@@ -7605,15 +7615,15 @@ void	Game::TickOnceAfter(){
 	if(!mainmenu){
 
 		if(environment==snowyenvironment)
-            music1=stream_music1snow;
+            leveltheme=stream_snowtheme;
 		if(environment==grassyenvironment)
-            music1=stream_music1grass;
+            leveltheme=stream_grasstheme;
 		if(environment==desertenvironment)
-            music1=stream_music1desert;
+            leveltheme=stream_deserttheme;
 
 		realthreat=0;
 
-		musictype=music1;
+		musictype=leveltheme;
 		for(int i=0;i<numplayers;i++){
 			if((player[i].aitype==attacktypecutoff||
                         player[i].aitype==getweapontype||
@@ -7623,26 +7633,26 @@ void	Game::TickOnceAfter(){
                     (player[i].targetanimation!=sneakattackedanim&&
                      player[i].targetanimation!=knifesneakattackedanim&&
                      player[i].targetanimation!=swordsneakattackedanim)){
-				musictype=stream_music2;
+				musictype=stream_fighttheme;
 				realthreat=1;
 			}
 		}
 		if(player[0].dead)
-            musictype=stream_music3;
+            musictype=stream_menutheme;
 
 
-		if(musictype==stream_music2)
+		if(musictype==stream_fighttheme)
 			unseendelay=1;
 
-		if(oldmusictype==stream_music2&&musictype!=stream_music2){
+		if(oldmusictype==stream_fighttheme&&musictype!=stream_fighttheme){
 			unseendelay-=multiplier;
 			if(unseendelay>0)
-				musictype=stream_music2;
+				musictype=stream_fighttheme;
 		}
 
 
 		if(loading==2){
-			musictype=stream_music3;
+			musictype=stream_menutheme;
 			musicvolume[2]=512;
 			musicvolume[0]=0;
 			musicvolume[1]=0;
@@ -7650,19 +7660,19 @@ void	Game::TickOnceAfter(){
 		}
 
 		if(musictoggle)
-			if(musictype!=oldmusictype&&musictype==stream_music2)
+			if(musictype!=oldmusictype&&musictype==stream_fighttheme)
 				emit_sound_np(alarmsound);
 		musicselected=musictype;
 
-		if(musicselected==music1)
+		if(musicselected==leveltheme)
             musicvolume[0]+=multiplier*450;
 		else
             musicvolume[0]-=multiplier*450;
-		if(musicselected==stream_music2)
+		if(musicselected==stream_fighttheme)
             musicvolume[1]+=multiplier*450;
 		else
             musicvolume[1]-=multiplier*450;
-		if(musicselected==stream_music3)
+		if(musicselected==stream_menutheme)
             musicvolume[2]+=multiplier*450;
 		else
             musicvolume[2]-=multiplier*450;
@@ -7679,31 +7689,31 @@ void	Game::TickOnceAfter(){
 
 		if(musictoggle){
 			if(musicvolume[0]>0&&oldmusicvolume[0]<=0)
-			  emit_stream_np(music1, musicvolume[0]);
+			  emit_stream_np(leveltheme, musicvolume[0]);
 			if(musicvolume[1]>0&&oldmusicvolume[1]<=0)
-			  emit_stream_np(stream_music2, musicvolume[1]);
+			  emit_stream_np(stream_fighttheme, musicvolume[1]);
 			if(musicvolume[2]>0&&oldmusicvolume[2]<=0)
-			  emit_stream_np(stream_music3, musicvolume[2]);
+			  emit_stream_np(stream_menutheme, musicvolume[2]);
 			if(musicvolume[0]<=0&&oldmusicvolume[0]>0)
-				pause_sound(music1);
+				pause_sound(leveltheme);
 			if(musicvolume[1]<=0&&oldmusicvolume[1]>0)
-				pause_sound(stream_music2);
+				pause_sound(stream_fighttheme);
 			if(musicvolume[2]<=0&&oldmusicvolume[2]>0)
-				pause_sound(stream_music3);
+				pause_sound(stream_menutheme);
 
 			if(musicvolume[0]!=oldmusicvolume[0])
-				OPENAL_SetVolume(channels[music1], musicvolume[0]);
+				OPENAL_SetVolume(channels[leveltheme], musicvolume[0]);
 			if(musicvolume[1]!=oldmusicvolume[1])
-				OPENAL_SetVolume(channels[stream_music2], musicvolume[1]);
+				OPENAL_SetVolume(channels[stream_fighttheme], musicvolume[1]);
 			if(musicvolume[2]!=oldmusicvolume[2])
-				OPENAL_SetVolume(channels[stream_music3], musicvolume[2]);
+				OPENAL_SetVolume(channels[stream_menutheme], musicvolume[2]);
 
 			for(int i=0;i<3;i++)
 				oldmusicvolume[i]=musicvolume[i];
 		} else {
-			pause_sound(music1);
-			pause_sound(stream_music2);
-			pause_sound(stream_music3);
+			pause_sound(leveltheme);
+			pause_sound(stream_fighttheme);
+			pause_sound(stream_menutheme);
 
 			for(int i=0;i<4;i++){
 				oldmusicvolume[i]=0;
@@ -7930,7 +7940,8 @@ void	Game::TickOnceAfter(){
 					loading=2;
 					loadtime=0;
 					targetlevel=7;
-					if(!firstload)LoadStuff();
+					if(!firstload)
+						LoadStuff();
 					whichchoice=0;
 					visibleloading=1;
 					stillloading=1;
@@ -7938,7 +7949,7 @@ void	Game::TickOnceAfter(){
 					campaign=1;
 					mainmenu=0;
 					gameon=1;
-					pause_sound(stream_music3);
+					pause_sound(stream_menutheme);
 
 					stealthloading=0;
 				}