X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=2adf41e1ca63093be7c6fdd18a73424c5fe978e5;hb=38615999d550e75a973ce4d5520c9ef117d65cea;hp=f8322fdc7422b3c07540c685e7c28390258586f0;hpb=dbfda93cad232a7f6e9b6f88a0235040f587ab51;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index f8322fd..2adf41e 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "openal_wrapper.h"
 #include "Settings.h"
 #include "Input.h"
+#include "Animation.h"
 
 using namespace std;
 
@@ -49,7 +50,6 @@ extern float texscale;
 extern Terrain terrain;
 extern OPENAL_SAMPLE *samp[100];
 extern int channels[100];
-//extern Sprites sprites;
 extern int kTextureSize;
 extern float screenwidth,screenheight;
 extern float gravity;
@@ -1160,7 +1160,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];
@@ -1173,8 +1173,8 @@ void Screenshot	(void)
 	#else
 	mkdir("Screenshots", S_IRWXU);
 	#endif
-
-	ScreenShot(temp);
+	
+	save_image(temp);
 }
 
 
@@ -1574,26 +1574,6 @@ void	Game::Loadlevel(int which){
 	whichlevel=which;
 }
 
-/*char * Game::MD5_string (unsigned char *string){
-char temp[50];
-char temp2[100];
-
-strcpy(temp2,(const char *)string);
-strcat((char *)temp2,(const char *)"Lugaru");
-sprintf (temp, "%d",strlen((char *)temp2));
-strcat((char *)temp2,temp);
-
-MD5 context;
-unsigned int len = strlen ( (char *)temp2);
-
-context.update   ((unsigned char *)temp2, len);
-context.finalize ();
-
-return context.hex_digest();
-}*/
-
-
-
 void	Game::Loadlevel(char *name){
 	int i,j,k,l,m;
 	static int oldlevel;
@@ -2424,7 +2404,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){
@@ -2460,7 +2440,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();
@@ -2473,8 +2453,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;
@@ -2488,16 +2466,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)
@@ -2759,7 +2727,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();
@@ -2856,36 +2824,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){