From: Alexander Monakov <amonakov@gmail.com>
Date: Sun, 6 Jun 2010 17:10:19 +0000 (+0400)
Subject: Merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=bbebd42229325d9f25a0360074e587dc2cc25e7e;hp=-c;p=lugaru.git

Merge
---

bbebd42229325d9f25a0360074e587dc2cc25e7e
diff --combined Source/GameTick.cpp
index 28a5395,6ea23c2..8790825
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@@ -2403,7 -2403,7 +2403,7 @@@ void	Game::Tick(
  		if(mainmenu&&endgame==1)mainmenu=10;
  		if( (Input::isKeyDown(SDLK_ESCAPE)||(mainmenu==0&&((Input::isKeyDown(jumpkey)||Input::isKeyDown(SDLK_SPACE)||(campaign)))&&!oldjumpkeydown&&campaign&&winfreeze))
  		    && !mainmenutogglekeydown
- 		    && (!mainmenu||gameon||mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||(mainmenu==7&&!entername)||mainmenu==9||mainmenu==11||mainmenu==13||mainmenu==17||mainmenu==10)
+ 		    && (!mainmenu||gameon||mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||(mainmenu==7&&!entername)||mainmenu==9||mainmenu==10)
  		  ) { // go back
  			selected=-1;
  			if(mainmenu==1||mainmenu==2||mainmenu==0){
@@@ -2439,7 -2439,7 +2439,7 @@@
  
  				SaveSettings(*this);
  			}
- 			if(mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==9||mainmenu==13||mainmenu==10||mainmenu==11||mainmenu==100){
+ 			if(mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==9||mainmenu==10||mainmenu==100){
  				fireSound();
  
  				flash();
@@@ -2452,8 -2452,6 +2452,6 @@@
  			if(mainmenu==6)mainmenu=5;
  			if(mainmenu==7)mainmenu=1;
  			if(mainmenu==9)mainmenu=5;
- 			if(mainmenu==11)mainmenu=5;
- 			if(mainmenu==13)mainmenu=12;
  			if(mainmenu==10)mainmenu=5;
  			if(mainmenu==100){
  				mainmenu=5;
@@@ -2467,16 -2465,6 +2465,6 @@@
  		}
  	}
  
- 	/*static bool minimaptogglekeydown;
- 	if(Input::isKeyDown(SDLK_TAB)&&!minimaptogglekeydown){
- 	minimap=1-minimap;
- 	minimaptogglekeydown=1;
- 	}
- 	if(!Input::isKeyDown(SDLK_TAB)){
- 	minimaptogglekeydown=0;
- 	}
- 	*/
- 
  	static bool minimaptogglekeydown;
  	if(Input::isKeyDown(SDLK_TAB)&&!minimaptogglekeydown&&tutoriallevel){
  		if(tutorialstage!=51)
@@@ -2738,7 -2726,7 +2726,7 @@@
  				gameon=1;
  				OPENAL_SetPaused(channels[stream_music3], true);
  			}
 -			if(Input::Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){//selected>=7&&(selected-7<=campaignnumchoices)){
 +			if(Input::Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){
  				fireSound();
  
  				flash();
@@@ -2835,36 -2823,6 +2823,6 @@@
  				mainmenu=5;
  			}
  		}
- 		if(mainmenu==11){
- 			if(Input::Button()&&!oldbutton&&selected<numchallengelevels&&selected>=0&&selected<=accountactive->getProgress()){
- 				fireSound();
- 
- 				flash();
- 
- 				startbonustotal=0;
- 
- 				loading=2;
- 				loadtime=0;
- 				targetlevel=selected;
- 				if(firstload) {
- 					TickOnceAfter();
- 					Loadlevel(selected);
- 				} else
- 					LoadStuff();
- 				campaign=0;
- 
- 				mainmenu=0;
- 				gameon=1;
- 				OPENAL_SetPaused(channels[stream_music3], true);
- 			}
- 			if(Input::Button()&&!oldbutton&&selected==numchallengelevels){
- 				fireSound();
- 
- 				flash();
- 
- 				mainmenu=5;
- 			}
- 		}
  		if(mainmenu==10){
  			endgame=2;
  			if(Input::Button()&&!oldbutton&&selected==3){