Remove terraindetail (== 1 anyway)

[lugaru.git] / Source / GameTick.cpp

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 383052eedb45b72dbeb79c6377b10059082dade9..7e231e0a03f508604dec7a56b2936c002da850e2 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -63,7 +63,6 @@ extern Light light;
 extern float texdetail;
 extern GLubyte bloodText[512*512*3];
 extern GLubyte wolfbloodText[512*512*3];
-extern float terraindetail;
 extern float camerashake;
 extern float woozy;
 extern float blackout;
@@ -83,7 +82,6 @@ extern bool autoslomo;
 extern bool keyboardfrozen;
 extern int netdatanew;
 extern bool loadingstuff;
-extern char mapname[256];
 extern XYZ windvector;
 extern bool debugmode;
 static int music1;
@@ -216,9 +214,7 @@ static void ch_quit(Game *game, const char *args)
 
 static void ch_map(Game *game, const char *args)
 {
-  char buf[64];
-  snprintf(buf, 63, ":Data:Maps:%s", args);
-  game->Loadlevel(buf);
+  game->Loadlevel(args);
   game->whichlevel = -2;
   campaign = 0;
 }
@@ -1332,9 +1328,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 +1367,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 +1405,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,35 +1421,31 @@ 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("tutorial");
+         }
+       else if (which >= 0 && which <= 15)
+         {
+           char buf[32];
+           snprintf(buf, 32, "map%d", which + 1);
+           Loadlevel(buf);
+         }
+       else
+         Loadlevel("mapsave");
 }
 
-void   Game::Loadlevel(char *name){
+void   Game::Loadlevel(const char *name){
        int i,j,k,l,m;
        static int oldlevel;
        int templength;
        float lamefloat;
        int lameint;
+       static const char *pfx = ":Data:Maps:";
+       char *buf;
 
        float headprop,legprop,armprop,bodyprop;
 
@@ -1492,7 +1478,9 @@ void      Game::Loadlevel(char *name){
        pause_sound(stream_firesound);
 
        // Change the map filename into something that is os specific
-       char *FixedFN = ConvertFileName(name);
+       buf = (char*) alloca(strlen(pfx) + strlen(name) + 1);
+       sprintf(buf, "%s%s", pfx, name);
+       const char *FixedFN = ConvertFileName(buf);
 
        int mapvers;
        FILE                    *tfile;
@@ -2581,25 +2569,10 @@ void    Game::Tick()
                                targetlevel=7;
                                if(firstload) TickOnceAfter();
                                else LoadStuff();
-                               for(i=0;i<255;i++){
-                                       mapname[i]='\0';
-                               }
-                               mapname[0]=':';
-                               mapname[1]='D';
-                               mapname[2]='a';
-                               mapname[3]='t';
-                               mapname[4]='a';
-                               mapname[5]=':';
-                               mapname[6]='M';
-                               mapname[7]='a';
-                               mapname[8]='p';
-                               mapname[9]='s';
-                               mapname[10]=':';
-                               strcat(mapname,campaignmapname[campaignchoicewhich[selected-7-accountactive->getCampaignChoicesMade()]]);
                                whichchoice=selected-7-accountactive->getCampaignChoicesMade();
                                visibleloading=1;
                                stillloading=1;
-                               Loadlevel(mapname);
+                               Loadlevel(campaignmapname[campaignchoicewhich[selected-7-accountactive->getCampaignChoicesMade()]]);
                                //Loadlevel(campaignmapname[levelorder[selected-7]]);
                                campaign=1;
                                mainmenu=0;
@@ -4149,7 +4122,6 @@ void      Game::Tick()
 
 
                                                dialoguetime+=multiplier;
-                                               skybox.cloudmove+=multiplier;
                                                hawkrotation+=multiplier*25;
                                                realhawkcoords=0;
                                                realhawkcoords.x=25;
@@ -7215,8 +7187,8 @@ void      Game::Tick()
 
                                                        for(k=0;k<numplayers;k++){
                                                                player[k].DoAnimations();
-                                                               player[k].whichpatchx=player[k].coords.x/(terrain.size/subdivision*terrain.scale*terraindetail);
-                                                               player[k].whichpatchz=player[k].coords.z/(terrain.size/subdivision*terrain.scale*terraindetail);
+                                                               player[k].whichpatchx=player[k].coords.x/(terrain.size/subdivision*terrain.scale);
+                                                               player[k].whichpatchz=player[k].coords.z/(terrain.size/subdivision*terrain.scale);
                                                        }
 
                                                        objects.DoStuff();
@@ -7577,22 +7549,7 @@ void     Game::TickOnceAfter(){
 
                                        fireSound(firestartsound);
 
-                                       for(i=0;i<255;i++){
-                                               mapname[i]='\0';
-                                       }
-                                       mapname[0]=':';
-                                       mapname[1]='D';
-                                       mapname[2]='a';
-                                       mapname[3]='t';
-                                       mapname[4]='a';
-                                       mapname[5]=':';
-                                       mapname[6]='M';
-                                       mapname[7]='a';
-                                       mapname[8]='p';
-                                       mapname[9]='s';
-                                       mapname[10]=':';
-                                       strcat(mapname,campaignmapname[levelorder[accountactive->getCampaignChoicesMade()]]);//[campaignchoicewhich[whichchoice]]);
-                                       Loadlevel(mapname);
+                                       Loadlevel(campaignmapname[levelorder[accountactive->getCampaignChoicesMade()]]);
 
                                        fireSound();
 
@@ -7696,29 +7653,11 @@ void    Game::TickOnceAfter(){
                                        loading=2;
                                        loadtime=0;
                                        targetlevel=7;
-                                       //if(firstload)TickOnceAfter();
                                        if(!firstload)LoadStuff();
-                                       //else {
-                                       for(i=0;i<255;i++){
-                                               mapname[i]='\0';
-                                       }
-                                       mapname[0]=':';
-                                       mapname[1]='D';
-                                       mapname[2]='a';
-                                       mapname[3]='t';
-                                       mapname[4]='a';
-                                       mapname[5]=':';
-                                       mapname[6]='M';
-                                       mapname[7]='a';
-                                       mapname[8]='p';
-                                       mapname[9]='s';
-                                       mapname[10]=':';
-
-                                       strcat(mapname,campaignmapname[campaignchoicewhich[0]]);
                                        whichchoice=0;
                                        visibleloading=1;
                                        stillloading=1;
-                                       Loadlevel(mapname);
+                                       Loadlevel(campaignmapname[campaignchoicewhich[0]]);
                                        campaign=1;
                                        mainmenu=0;
                                        gameon=1;