From: Alexander Monakov <amonakov@gmail.com>
Date: Fri, 7 Jan 2011 19:41:38 +0000 (+0300)
Subject: Minor Loadlevel cleanup
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=ce5a0f8dd7372931070554e6a963d6e715ea69b7;p=lugaru.git

Minor Loadlevel cleanup
---

diff --git a/Source/Game.h b/Source/Game.h
index d09474a..63bb0a6 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -246,7 +246,7 @@ class Game
 		void TickOnceAfter();
 		void SetUpLighting();
 		void Loadlevel(int which);
-		void Loadlevel(char *name);
+		void Loadlevel(const char *name);
 		void Setenvironment(int which);
 		GLvoid ReSizeGLScene(float fov, float near);
 		int findPathDist(int start,int end);
diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 3281f6b..e6a810a 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -1425,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;