X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=e6a810a651969e8f4fb032abf0f04d2af5f3f8f3;hb=ce5a0f8dd7372931070554e6a963d6e715ea69b7;hp=383052eedb45b72dbeb79c6377b10059082dade9;hpb=75fca769413e46462a498e27b7eb1c931af13e55;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 383052e..e6a810a 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -1332,9 +1332,7 @@ void	Game::Setenvironment(int which)
 			":Data:Textures:Skybox(snow):Back.jpg",
 			":Data:Textures:Skybox(snow):Right.jpg",
 			":Data:Textures:Skybox(snow):Up.jpg",
-			":Data:Textures:Skybox(snow):Down.jpg",
-			":Data:Textures:Skybox(snow):Cloud.jpg",
-			":Data:Textures:Skybox(snow):Reflect.jpg");
+			":Data:Textures:Skybox(snow):Down.jpg");
 
 
 
@@ -1373,9 +1371,7 @@ void	Game::Setenvironment(int which)
 			":Data:Textures:Skybox(sand):Back.jpg",
 			":Data:Textures:Skybox(sand):Right.jpg",
 			":Data:Textures:Skybox(sand):Up.jpg",
-			":Data:Textures:Skybox(sand):Down.jpg",
-			":Data:Textures:Skybox(sand):Cloud.jpg",
-			":Data:Textures:Skybox(sand):Reflect.jpg");
+			":Data:Textures:Skybox(sand):Down.jpg");
 
 
 
@@ -1413,9 +1409,7 @@ void	Game::Setenvironment(int which)
 			":Data:Textures:Skybox(grass):Back.jpg",
 			":Data:Textures:Skybox(grass):Right.jpg",
 			":Data:Textures:Skybox(grass):Up.jpg",
-			":Data:Textures:Skybox(grass):Down.jpg",
-			":Data:Textures:Skybox(grass):Cloud.jpg",
-			":Data:Textures:Skybox(grass):Reflect.jpg");
+			":Data:Textures:Skybox(grass):Down.jpg");
 
 
 
@@ -1431,30 +1425,24 @@ void	Game::Setenvironment(int which)
 
 void	Game::Loadlevel(int which){
 	stealthloading=0;
-
-	if(which==0)Loadlevel((char *)":Data:Maps:map1");
-	else if(which==1)Loadlevel((char *)":Data:Maps:map2");
-	else if(which==2)Loadlevel((char *)":Data:Maps:map3");
-	else if(which==3)Loadlevel((char *)":Data:Maps:map4");
-	else if(which==4)Loadlevel((char *)":Data:Maps:map5");
-	else if(which==5)Loadlevel((char *)":Data:Maps:map6");
-	else if(which==6)Loadlevel((char *)":Data:Maps:map7");
-	else if(which==7)Loadlevel((char *)":Data:Maps:map8");
-	else if(which==8)Loadlevel((char *)":Data:Maps:map9");
-	else if(which==9)Loadlevel((char *)":Data:Maps:map10");
-	else if(which==10)Loadlevel((char *)":Data:Maps:map11");
-	else if(which==11)Loadlevel((char *)":Data:Maps:map12");
-	else if(which==12)Loadlevel((char *)":Data:Maps:map13");
-	else if(which==13)Loadlevel((char *)":Data:Maps:map14");
-	else if(which==14)Loadlevel((char *)":Data:Maps:map15");
-	else if(which==15)Loadlevel((char *)":Data:Maps:map16");
-	else if(which==-1){tutoriallevel=-1;Loadlevel((char *)":Data:Maps:tutorial");}
-	else Loadlevel((char *)":Data:Maps:mapsave");
-
 	whichlevel=which;
+
+	if (which == -1)
+	  {
+	    tutoriallevel = -1;
+	    Loadlevel(":Data:Maps:tutorial");
+	  }
+	else if (which >= 0 && which <= 15)
+	  {
+	    char buf[32];
+	    snprintf(buf, 32, ":Data:Maps:map%d", which + 1);
+	    Loadlevel(buf);
+	  }
+	else
+	  Loadlevel(":Data:Maps:mapsave");
 }
 
-void	Game::Loadlevel(char *name){
+void	Game::Loadlevel(const char *name){
 	int i,j,k,l,m;
 	static int oldlevel;
 	int templength;
@@ -4149,7 +4137,6 @@ void	Game::Tick()
 
 
 						dialoguetime+=multiplier;
-						skybox.cloudmove+=multiplier;
 						hawkrotation+=multiplier*25;
 						realhawkcoords=0;
 						realhawkcoords.x=25;