X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=879082529777acd783620e0a525430de9a9ec49d;hb=bbebd42229325d9f25a0360074e587dc2cc25e7e;hp=2e3cd8303aff75a4b43154f37f172671104dc70a;hpb=4ee4eeed40f5f6a5e1811608ca53b2b8bdae5926;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 2e3cd83..8790825 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -1159,7 +1159,7 @@ static void cmd_dispatch(Game *game, const char *cmd)
 }
 
 /********************> Tick() <*****/
-extern void ScreenShot(const char * fname);
+extern bool save_image(const char * fname);
 void Screenshot	(void)
 {
 	char temp[1024];
@@ -1172,8 +1172,8 @@ void Screenshot	(void)
 	#else
 	mkdir("Screenshots", S_IRWXU);
 	#endif
-
-	ScreenShot(temp);
+	
+	save_image(temp);
 }
 
 
@@ -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 @@ void	Game::Tick()
 
 				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 @@ void	Game::Tick()
 			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 @@ void	Game::Tick()
 		}
 	}
 
-	/*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 @@ void	Game::Tick()
 				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 @@ void	Game::Tick()
 				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){