X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=9afacced235878340de42e6afb33737a163ae2db;hb=f38eb24f446b94d592d97b24b315bb44bed7b12c;hp=8646111176e950a827c514798411ad1fa4c6ae86;hpb=757fd9c1ec8d263225df90ef486051712f448483;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 8646111..9afacce 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -254,8 +254,8 @@ const char *rabbitskin[] = {
 
 const char *wolfskin[] = {
     "Textures/Wolf.jpg",
-    "Textures/Darkwolf.jpg",
-    "Textures/Snowwolf.jpg"
+    "Textures/DarkWolf.jpg",
+    "Textures/SnowWolf.jpg"
 };
 
 const char **creatureskin[] = {rabbitskin, wolfskin};
@@ -602,29 +602,29 @@ void Setenvironment(int which)
         if (ambientsound)
             emit_stream_np(stream_wind);
 
-        objects.treetextureptr.load("Textures/snowtree.png", 0);
-        objects.bushtextureptr.load("Textures/bushsnow.png", 0);
-        objects.rocktextureptr.load("Textures/bouldersnow.jpg", 1);
-        objects.boxtextureptr.load("Textures/snowbox.jpg", 1);
+        objects.treetextureptr.load("Textures/SnowTree.png", 0);
+        objects.bushtextureptr.load("Textures/BushSnow.png", 0);
+        objects.rocktextureptr.load("Textures/BoulderSnow.jpg", 1);
+        objects.boxtextureptr.load("Textures/SnowBox.jpg", 1);
 
         footstepsound = footstepsn1;
         footstepsound2 = footstepsn2;
         footstepsound3 = footstepst1;
         footstepsound4 = footstepst2;
 
-        terraintexture.load("Textures/snow.jpg", 1);
-        terraintexture2.load("Textures/rock.jpg", 1);
+        terraintexture.load("Textures/Snow.jpg", 1);
+        terraintexture2.load("Textures/Rock.jpg", 1);
 
 
         temptexdetail = texdetail;
         if (texdetail > 1)
             texdetail = 4;
-        skybox->load(   "Textures/Skybox(snow):Front.jpg",
-                        "Textures/Skybox(snow):Left.jpg",
-                        "Textures/Skybox(snow):Back.jpg",
-                        "Textures/Skybox(snow):Right.jpg",
-                        "Textures/Skybox(snow):Up.jpg",
-                        "Textures/Skybox(snow):Down.jpg");
+        skybox->load(   "Textures/Skybox(snow)/Front.jpg",
+                        "Textures/Skybox(snow)/Left.jpg",
+                        "Textures/Skybox(snow)/Back.jpg",
+                        "Textures/Skybox(snow)/Right.jpg",
+                        "Textures/Skybox(snow)/Up.jpg",
+                        "Textures/Skybox(snow)/Down.jpg");
 
 
 
@@ -633,10 +633,10 @@ void Setenvironment(int which)
     } else if (environment == desertenvironment) {
         windvector = 0;
         windvector.z = 2;
-        objects.treetextureptr.load("Textures/deserttree.png", 0);
-        objects.bushtextureptr.load("Textures/bushdesert.png", 0);
-        objects.rocktextureptr.load("Textures/boulderdesert.jpg", 1);
-        objects.boxtextureptr.load("Textures/desertbox.jpg", 1);
+        objects.treetextureptr.load("Textures/DesertTree.png", 0);
+        objects.bushtextureptr.load("Textures/BushDesert.png", 0);
+        objects.rocktextureptr.load("Textures/BoulderDesert.jpg", 1);
+        objects.boxtextureptr.load("Textures/DesertBox.jpg", 1);
 
 
         if (ambientsound)
@@ -647,19 +647,19 @@ void Setenvironment(int which)
         footstepsound3 = footstepsn1;
         footstepsound4 = footstepsn2;
 
-        terraintexture.load("Textures/sand.jpg", 1);
-        terraintexture2.load("Textures/sandslope.jpg", 1);
+        terraintexture.load("Textures/Sand.jpg", 1);
+        terraintexture2.load("Textures/SandSlope.jpg", 1);
 
 
         temptexdetail = texdetail;
         if (texdetail > 1)
             texdetail = 4;
-        skybox->load(   "Textures/Skybox(sand):Front.jpg",
-                        "Textures/Skybox(sand):Left.jpg",
-                        "Textures/Skybox(sand):Back.jpg",
-                        "Textures/Skybox(sand):Right.jpg",
-                        "Textures/Skybox(sand):Up.jpg",
-                        "Textures/Skybox(sand):Down.jpg");
+        skybox->load(   "Textures/Skybox(sand)/Front.jpg",
+                        "Textures/Skybox(sand)/Left.jpg",
+                        "Textures/Skybox(sand)/Back.jpg",
+                        "Textures/Skybox(sand)/Right.jpg",
+                        "Textures/Skybox(sand)/Up.jpg",
+                        "Textures/Skybox(sand)/Down.jpg");
 
 
 
@@ -668,10 +668,10 @@ void Setenvironment(int which)
     } else if (environment == grassyenvironment) {
         windvector = 0;
         windvector.z = 2;
-        objects.treetextureptr.load("Textures/tree.png", 0);
-        objects.bushtextureptr.load("Textures/bush.png", 0);
-        objects.rocktextureptr.load("Textures/boulder.jpg", 1);
-        objects.boxtextureptr.load("Textures/grassbox.jpg", 1);
+        objects.treetextureptr.load("Textures/Tree.png", 0);
+        objects.bushtextureptr.load("Textures/Bush.png", 0);
+        objects.rocktextureptr.load("Textures/Boulder.jpg", 1);
+        objects.boxtextureptr.load("Textures/GrassBox.jpg", 1);
 
         if (ambientsound)
             emit_stream_np(stream_wind, 100.);
@@ -681,19 +681,19 @@ void Setenvironment(int which)
         footstepsound3 = footstepst1;
         footstepsound4 = footstepst2;
 
-        terraintexture.load("Textures/grassdirt.jpg", 1);
-        terraintexture2.load("Textures/mossrock.jpg", 1);
+        terraintexture.load("Textures/GrassDirt.jpg", 1);
+        terraintexture2.load("Textures/MossRock.jpg", 1);
 
 
         temptexdetail = texdetail;
         if (texdetail > 1)
             texdetail = 4;
-        skybox->load(   "Textures/Skybox(grass):Front.jpg",
-                        "Textures/Skybox(grass):Left.jpg",
-                        "Textures/Skybox(grass):Back.jpg",
-                        "Textures/Skybox(grass):Right.jpg",
-                        "Textures/Skybox(grass):Up.jpg",
-                        "Textures/Skybox(grass):Down.jpg");
+        skybox->load(   "Textures/Skybox(grass)/Front.jpg",
+                        "Textures/Skybox(grass)/Left.jpg",
+                        "Textures/Skybox(grass)/Back.jpg",
+                        "Textures/Skybox(grass)/Right.jpg",
+                        "Textures/Skybox(grass)/Up.jpg",
+                        "Textures/Skybox(grass)/Down.jpg");
 
 
 
@@ -701,7 +701,7 @@ void Setenvironment(int which)
     }
     temptexdetail = texdetail;
     texdetail = 1;
-    terrain.load("Textures/heightmap.png");
+    terrain.load("Textures/HeightMap.png");
 
     texdetail = temptexdetail;
 }
@@ -731,9 +731,9 @@ void LoadCampaign()
     }
     ipstream.close();
 
-    ifstream test(Folders::getResourcePath("Textures/" + accountactive->getCurrentCampaign() + ":World.png"));
+    ifstream test(Folders::getResourcePath("Textures/" + accountactive->getCurrentCampaign() + "/World.png"));
     if (test.good()) {
-        Mainmenuitems[7].load("Textures/" + accountactive->getCurrentCampaign() + ":World.png", 0);
+        Mainmenuitems[7].load("Textures/" + accountactive->getCurrentCampaign() + "/World.png", 0);
     } else {
         Mainmenuitems[7].load("Textures/World.png", 0);
     }
@@ -746,11 +746,11 @@ void LoadCampaign()
 
 vector<string> ListCampaigns()
 {
+    errno = 0;
     DIR *campaigns = opendir(Folders::getResourcePath("Campaigns").c_str());
     struct dirent *campaign = NULL;
     if (!campaigns) {
-        perror("Problem while loading campaigns");
-        cerr << "campaign folder was : " << Folders::getResourcePath("Campaigns") << endl;
+        perror(("Problem while loading campaigns from " + Folders::getResourcePath("Campaigns")).c_str());
         exit(EXIT_FAILURE);
     }
     vector<string> campaignNames;
@@ -818,393 +818,380 @@ void Game::Loadlevel(const std::string& name)
 
     int mapvers;
     FILE *tfile;
-    tfile = fopen( Folders::getResourcePath("Maps/"+name).c_str(), "rb" );
-    if (tfile) {
-        pause_sound(stream_firesound);
-        scoreadded = 0;
-        windialogue = false;
-        hostiletime = 0;
-        won = 0;
+    errno = 0;
+    tfile = Folders::openMandatoryFile( Folders::getResourcePath("Maps/"+name), "rb" );
 
-        animation[bounceidleanim].Load((char *)"Idle", middleheight, neutral);
-
-        Dialog::dialogs.clear();
+    pause_sound(stream_firesound);
+    scoreadded = 0;
+    windialogue = false;
+    hostiletime = 0;
+    won = 0;
+
+    animation[bounceidleanim].Load((char *)"Idle", middleheight, neutral);
+
+    Dialog::dialogs.clear();
+
+    Dialog::indialogue = -1;
+    cameramode = 0;
+
+    damagedealt = 0;
+    damagetaken = 0;
+
+    if (accountactive)
+        difficulty = accountactive->getDifficulty();
+
+    numhotspots = 0;
+    currenthotspot = -1;
+    bonustime = 1;
+
+    skyboxtexture = 1;
+    skyboxr = 1;
+    skyboxg = 1;
+    skyboxb = 1;
+
+    freeze = 0;
+    winfreeze = 0;
+
+    for (int i = 0; i < 100; i++)
+        bonusnum[i] = 0;
+
+    numfalls = 0;
+    numflipfail = 0;
+    numseen = 0;
+    numstaffattack = 0;
+    numswordattack = 0;
+    numknifeattack = 0;
+    numunarmedattack = 0;
+    numescaped = 0;
+    numflipped = 0;
+    numwallflipped = 0;
+    numthrowkill = 0;
+    numafterkill = 0;
+    numreversals = 0;
+    numattacks = 0;
+    maxalarmed = 0;
+    numresponded = 0;
+
+    bonustotal = startbonustotal;
+    bonus = 0;
+    gameon = 1;
+    changedelay = 0;
+    if (console) {
+        emit_sound_np(consolesuccesssound);
+        freeze = 0;
+        console = false;
+    }
 
-        Dialog::indialogue = -1;
-        cameramode = 0;
+    if (!stealthloading) {
+        terrain.numdecals = 0;
+        Sprite::deleteSprites();
+        for (int i = 0; i < objects.numobjects; i++)
+            objects.model[i].numdecals = 0;
 
-        damagedealt = 0;
-        damagetaken = 0;
+        int j = objects.numobjects;
+        for (int i = 0; i < j; i++) {
+            objects.DeleteObject(0);
+            if (visibleloading)
+                LoadingScreen();
+        }
 
-        if (accountactive)
-            difficulty = accountactive->getDifficulty();
+        for (int i = 0; i < subdivision; i++)
+            for (int j = 0; j < subdivision; j++)
+                terrain.patchobjectnum[i][j] = 0;
+        if (visibleloading)
+            LoadingScreen();
+    }
 
-        numhotspots = 0;
-        currenthotspot = -1;
-        bonustime = 1;
+    weapons.clear();
+    Person::players.resize(1);
 
+    funpackf(tfile, "Bi", &mapvers);
+    if (mapvers >= 15)
+        funpackf(tfile, "Bi", &indemo);
+    else
+        indemo = 0;
+    if (mapvers >= 5)
+        funpackf(tfile, "Bi", &maptype);
+    else
+        maptype = mapkilleveryone;
+    if (mapvers >= 6)
+        funpackf(tfile, "Bi", &hostile);
+    else
+        hostile = 1;
+    if (mapvers >= 4)
+        funpackf(tfile, "Bf Bf", &viewdistance, &fadestart);
+    else {
+        viewdistance = 100;
+        fadestart = .6;
+    }
+    if (mapvers >= 2)
+        funpackf(tfile, "Bb Bf Bf Bf", &skyboxtexture, &skyboxr, &skyboxg, &skyboxb);
+    else {
         skyboxtexture = 1;
         skyboxr = 1;
         skyboxg = 1;
         skyboxb = 1;
-
-        freeze = 0;
-        winfreeze = 0;
-
-        for (int i = 0; i < 100; i++)
-            bonusnum[i] = 0;
-
-        numfalls = 0;
-        numflipfail = 0;
-        numseen = 0;
-        numstaffattack = 0;
-        numswordattack = 0;
-        numknifeattack = 0;
-        numunarmedattack = 0;
-        numescaped = 0;
-        numflipped = 0;
-        numwallflipped = 0;
-        numthrowkill = 0;
-        numafterkill = 0;
-        numreversals = 0;
-        numattacks = 0;
-        maxalarmed = 0;
-        numresponded = 0;
-
-        bonustotal = startbonustotal;
-        bonus = 0;
-        gameon = 1;
-        changedelay = 0;
-        if (console) {
-            emit_sound_np(consolesuccesssound);
-            freeze = 0;
-            console = false;
+    }
+    if (mapvers >= 10)
+        funpackf(tfile, "Bf Bf Bf", &skyboxlightr, &skyboxlightg, &skyboxlightb);
+    else {
+        skyboxlightr = skyboxr;
+        skyboxlightg = skyboxg;
+        skyboxlightb = skyboxb;
+    }
+    /* TODO - This should be done in an other way so that we can rebuild main player as well (so coords would need to be copied from old ones after rebuilding) */
+    if (stealthloading) {
+        funpackf(tfile, "Bf Bf Bf Bf Bf Bi", &lamefloat, &lamefloat, &lamefloat, &lamefloat, &lamefloat, &Person::players[0]->num_weapons);
+    } else {
+        funpackf(tfile, "Bf Bf Bf Bf Bf Bi", &Person::players[0]->coords.x, &Person::players[0]->coords.y, &Person::players[0]->coords.z, &Person::players[0]->yaw, &Person::players[0]->targetyaw, &Person::players[0]->num_weapons);
+    }
+    if (Person::players[0]->num_weapons > 0 && Person::players[0]->num_weapons < 5)
+        for (int j = 0; j < Person::players[0]->num_weapons; j++) {
+            Person::players[0]->weaponids[j] = weapons.size();
+            int type;
+            funpackf(tfile, "Bi", &type);
+            weapons.push_back(Weapon(type, 0));
         }
 
-        if (!stealthloading) {
-            terrain.numdecals = 0;
-            Sprite::deleteSprites();
-            for (int i = 0; i < objects.numobjects; i++)
-                objects.model[i].numdecals = 0;
-
-            int j = objects.numobjects;
-            for (int i = 0; i < j; i++) {
-                objects.DeleteObject(0);
-                if (visibleloading)
-                    LoadingScreen();
-            }
+    if (visibleloading)
+        LoadingScreen();
 
-            for (int i = 0; i < subdivision; i++)
-                for (int j = 0; j < subdivision; j++)
-                    terrain.patchobjectnum[i][j] = 0;
-            if (visibleloading)
-                LoadingScreen();
-        }
+    funpackf(tfile, "Bf Bf Bf", &Person::players[0]->armorhead, &Person::players[0]->armorhigh, &Person::players[0]->armorlow);
+    funpackf(tfile, "Bf Bf Bf", &Person::players[0]->protectionhead, &Person::players[0]->protectionhigh, &Person::players[0]->protectionlow);
+    funpackf(tfile, "Bf Bf Bf", &Person::players[0]->metalhead, &Person::players[0]->metalhigh, &Person::players[0]->metallow);
+    funpackf(tfile, "Bf Bf", &Person::players[0]->power, &Person::players[0]->speedmult);
 
-        weapons.clear();
-        Person::players.resize(1);
+    funpackf(tfile, "Bi", &Person::players[0]->numclothes);
 
-        funpackf(tfile, "Bi", &mapvers);
-        if (mapvers >= 15)
-            funpackf(tfile, "Bi", &indemo);
-        else
-            indemo = 0;
-        if (mapvers >= 5)
-            funpackf(tfile, "Bi", &maptype);
-        else
-            maptype = mapkilleveryone;
-        if (mapvers >= 6)
-            funpackf(tfile, "Bi", &hostile);
-        else
-            hostile = 1;
-        if (mapvers >= 4)
-            funpackf(tfile, "Bf Bf", &viewdistance, &fadestart);
-        else {
-            viewdistance = 100;
-            fadestart = .6;
-        }
-        if (mapvers >= 2)
-            funpackf(tfile, "Bb Bf Bf Bf", &skyboxtexture, &skyboxr, &skyboxg, &skyboxb);
-        else {
-            skyboxtexture = 1;
-            skyboxr = 1;
-            skyboxg = 1;
-            skyboxb = 1;
-        }
-        if (mapvers >= 10)
-            funpackf(tfile, "Bf Bf Bf", &skyboxlightr, &skyboxlightg, &skyboxlightb);
-        else {
-            skyboxlightr = skyboxr;
-            skyboxlightg = skyboxg;
-            skyboxlightb = skyboxb;
-        }
-        if (!stealthloading)
-            funpackf(tfile, "Bf Bf Bf Bf Bf Bi", &Person::players[0]->coords.x, &Person::players[0]->coords.y, &Person::players[0]->coords.z, &Person::players[0]->yaw, &Person::players[0]->targetyaw, &Person::players[0]->num_weapons);
-        if (stealthloading)
-            funpackf(tfile, "Bf Bf Bf Bf Bf Bi", &lamefloat, &lamefloat, &lamefloat, &lamefloat, &lamefloat, &Person::players[0]->num_weapons);
-        if (Person::players[0]->num_weapons > 0 && Person::players[0]->num_weapons < 5)
-            for (int j = 0; j < Person::players[0]->num_weapons; j++) {
-                Person::players[0]->weaponids[j] = weapons.size();
-                int type;
-                funpackf(tfile, "Bi", &type);
-                weapons.push_back(Weapon(type, 0));
-            }
-
-        if (visibleloading)
-            LoadingScreen();
+    if (mapvers >= 9)
+        funpackf(tfile, "Bi Bi", &Person::players[0]->whichskin, &Person::players[0]->creature);
+    else {
+        Person::players[0]->whichskin = 0;
+        Person::players[0]->creature = rabbittype;
+    }
 
-        funpackf(tfile, "Bf Bf Bf", &Person::players[0]->armorhead, &Person::players[0]->armorhigh, &Person::players[0]->armorlow);
-        funpackf(tfile, "Bf Bf Bf", &Person::players[0]->protectionhead, &Person::players[0]->protectionhigh, &Person::players[0]->protectionlow);
-        funpackf(tfile, "Bf Bf Bf", &Person::players[0]->metalhead, &Person::players[0]->metalhigh, &Person::players[0]->metallow);
-        funpackf(tfile, "Bf Bf", &Person::players[0]->power, &Person::players[0]->speedmult);
+    Person::players[0]->lastattack = -1;
+    Person::players[0]->lastattack2 = -1;
+    Person::players[0]->lastattack3 = -1;
 
-        funpackf(tfile, "Bi", &Person::players[0]->numclothes);
+    //dialogues
+    if (mapvers >= 8) {
+        Dialog::loadDialogs(tfile);
+    }
 
-        if (mapvers >= 9)
-            funpackf(tfile, "Bi Bi", &Person::players[0]->whichskin, &Person::players[0]->creature);
-        else {
-            Person::players[0]->whichskin = 0;
-            Person::players[0]->creature = rabbittype;
-        }
+    for (int k = 0; k < Person::players[0]->numclothes; k++) {
+        funpackf(tfile, "Bi", &templength);
+        for (int l = 0; l < templength; l++)
+            funpackf(tfile, "Bb", &Person::players[0]->clothes[k][l]);
+        Person::players[0]->clothes[k][templength] = '\0';
+        funpackf(tfile, "Bf Bf Bf", &Person::players[0]->clothestintr[k], &Person::players[0]->clothestintg[k], &Person::players[0]->clothestintb[k]);
+    }
 
-        Person::players[0]->lastattack = -1;
-        Person::players[0]->lastattack2 = -1;
-        Person::players[0]->lastattack3 = -1;
+    funpackf(tfile, "Bi", &environment);
 
-        //dialogues
-        if (mapvers >= 8) {
-            Dialog::loadDialogs(tfile);
-        }
+    funpackf(tfile, "Bi", &objects.numobjects);
+    for (int i = 0; i < objects.numobjects; i++) {
+        funpackf(tfile, "Bi Bf Bf Bf Bf Bf Bf", &objects.type[i], &objects.yaw[i], &objects.pitch[i], &objects.position[i].x, &objects.position[i].y, &objects.position[i].z, &objects.scale[i]);
+        if (objects.type[i] == treeleavestype)
+            objects.scale[i] = objects.scale[i - 1];
+    }
 
-        for (int k = 0; k < Person::players[0]->numclothes; k++) {
+    if (mapvers >= 7) {
+        funpackf(tfile, "Bi", &numhotspots);
+        for (int i = 0; i < numhotspots; i++) {
+            funpackf(tfile, "Bi Bf Bf Bf Bf", &hotspottype[i], &hotspotsize[i], &hotspot[i].x, &hotspot[i].y, &hotspot[i].z);
             funpackf(tfile, "Bi", &templength);
-            for (int l = 0; l < templength; l++)
-                funpackf(tfile, "Bb", &Person::players[0]->clothes[k][l]);
-            Person::players[0]->clothes[k][templength] = '\0';
-            funpackf(tfile, "Bf Bf Bf", &Person::players[0]->clothestintr[k], &Person::players[0]->clothestintg[k], &Person::players[0]->clothestintb[k]);
+            if (templength)
+                for (int l = 0; l < templength; l++)
+                    funpackf(tfile, "Bb", &hotspottext[i][l]);
+            hotspottext[i][templength] = '\0';
+            if (hotspottype[i] == -111)
+                indemo = 1;
         }
+    } else
+        numhotspots = 0;
 
-        funpackf(tfile, "Bi", &environment);
+    if (visibleloading)
+        LoadingScreen();
 
-        funpackf(tfile, "Bi", &objects.numobjects);
-        for (int i = 0; i < objects.numobjects; i++) {
-            funpackf(tfile, "Bi Bf Bf Bf Bf Bf Bf", &objects.type[i], &objects.yaw[i], &objects.pitch[i], &objects.position[i].x, &objects.position[i].y, &objects.position[i].z, &objects.scale[i]);
-            if (objects.type[i] == treeleavestype)
-                objects.scale[i] = objects.scale[i - 1];
-        }
+    if (!stealthloading) {
+        objects.center = 0;
+        for (int i = 0; i < objects.numobjects; i++)
+            objects.center += objects.position[i];
+        objects.center /= objects.numobjects;
 
-        if (mapvers >= 7) {
-            funpackf(tfile, "Bi", &numhotspots);
-            for (int i = 0; i < numhotspots; i++) {
-                funpackf(tfile, "Bi Bf Bf Bf Bf", &hotspottype[i], &hotspotsize[i], &hotspot[i].x, &hotspot[i].y, &hotspot[i].z);
-                funpackf(tfile, "Bi", &templength);
-                if (templength)
-                    for (int l = 0; l < templength; l++)
-                        funpackf(tfile, "Bb", &hotspottext[i][l]);
-                hotspottext[i][templength] = '\0';
-                if (hotspottype[i] == -111)
-                    indemo = 1;
-            }
-        } else
-            numhotspots = 0;
 
         if (visibleloading)
             LoadingScreen();
 
-        if (!stealthloading) {
-            objects.center = 0;
-            for (int i = 0; i < objects.numobjects; i++)
-                objects.center += objects.position[i];
-            objects.center /= objects.numobjects;
-
-
-            if (visibleloading)
-                LoadingScreen();
-
-            float maxdistance = 0;
-            float tempdist;
-            for (int i = 0; i < objects.numobjects; i++) {
-                tempdist = distsq(&objects.center, &objects.position[i]);
-                if (tempdist > maxdistance) {
-                    maxdistance = tempdist;
-                }
+        float maxdistance = 0;
+        float tempdist;
+        for (int i = 0; i < objects.numobjects; i++) {
+            tempdist = distsq(&objects.center, &objects.position[i]);
+            if (tempdist > maxdistance) {
+                maxdistance = tempdist;
             }
-            objects.radius = fast_sqrt(maxdistance);
         }
+        objects.radius = fast_sqrt(maxdistance);
+    }
 
-        if (visibleloading)
-            LoadingScreen();
+    if (visibleloading)
+        LoadingScreen();
 
-        int numplayers;
-        funpackf(tfile, "Bi", &numplayers);
-        if (numplayers > maxplayers) {
-            cout << "Warning: this level contains more players than allowed" << endl;
-        }
-        for (int i = 1; i < numplayers; i++) {
-            unsigned j = 1;
-            try {
-                Person::players.push_back(shared_ptr<Person>(new Person(tfile, mapvers, j)));
-                j++;
-            } catch (InvalidPersonException e) {
-            }
+    int numplayers;
+    funpackf(tfile, "Bi", &numplayers);
+    if (numplayers > maxplayers) {
+        cout << "Warning: this level contains more players than allowed" << endl;
+    }
+    for (int i = 1; i < numplayers; i++) {
+        unsigned j = 1;
+        try {
+            Person::players.push_back(shared_ptr<Person>(new Person(tfile, mapvers, j)));
+            j++;
+        } catch (InvalidPersonException e) {
         }
-        if (visibleloading)
-            LoadingScreen();
-
-        funpackf(tfile, "Bi", &numpathpoints);
-        if (numpathpoints > 30 || numpathpoints < 0)
-            numpathpoints = 0;
-        for (int j = 0; j < numpathpoints; j++) {
-            funpackf(tfile, "Bf Bf Bf Bi", &pathpoint[j].x, &pathpoint[j].y, &pathpoint[j].z, &numpathpointconnect[j]);
-            for (int k = 0; k < numpathpointconnect[j]; k++) {
-                funpackf(tfile, "Bi", &pathpointconnect[j][k]);
-            }
+    }
+    if (visibleloading)
+        LoadingScreen();
+
+    funpackf(tfile, "Bi", &numpathpoints);
+    if (numpathpoints > 30 || numpathpoints < 0)
+        numpathpoints = 0;
+    for (int j = 0; j < numpathpoints; j++) {
+        funpackf(tfile, "Bf Bf Bf Bi", &pathpoint[j].x, &pathpoint[j].y, &pathpoint[j].z, &numpathpointconnect[j]);
+        for (int k = 0; k < numpathpointconnect[j]; k++) {
+            funpackf(tfile, "Bi", &pathpointconnect[j][k]);
         }
-        if (visibleloading)
-            LoadingScreen();
+    }
+    if (visibleloading)
+        LoadingScreen();
 
-        funpackf(tfile, "Bf Bf Bf Bf", &mapcenter.x, &mapcenter.y, &mapcenter.z, &mapradius);
+    funpackf(tfile, "Bf Bf Bf Bf", &mapcenter.x, &mapcenter.y, &mapcenter.z, &mapradius);
 
-        SetUpLighting();
-        if (environment != oldenvironment)
-            Setenvironment(environment);
-        oldenvironment = environment;
-
-        if (!stealthloading) {
-            int j = objects.numobjects;
-            objects.numobjects = 0;
-            for (int i = 0; i < j; i++) {
-                objects.MakeObject(objects.type[i], objects.position[i], objects.yaw[i], objects.pitch[i], objects.scale[i]);
-                if (visibleloading)
-                    LoadingScreen();
-            }
+    SetUpLighting();
+    if (environment != oldenvironment)
+        Setenvironment(environment);
+    oldenvironment = environment;
 
-            terrain.DoShadows();
-            if (visibleloading)
-                LoadingScreen();
-            objects.DoShadows();
+    if (!stealthloading) {
+        int j = objects.numobjects;
+        objects.numobjects = 0;
+        for (int i = 0; i < j; i++) {
+            objects.MakeObject(objects.type[i], objects.position[i], objects.yaw[i], objects.pitch[i], objects.scale[i]);
             if (visibleloading)
                 LoadingScreen();
         }
 
-        fclose(tfile);
+        terrain.DoShadows();
+        if (visibleloading)
+            LoadingScreen();
+        objects.DoShadows();
+        if (visibleloading)
+            LoadingScreen();
+    }
 
-        for (unsigned i = 0; i < Person::players.size(); i++) {
-            if (visibleloading)
-                LoadingScreen();
+    fclose(tfile);
+
+    for (unsigned i = 0; i < Person::players.size(); i++) {
+        if (visibleloading)
+            LoadingScreen();
+        if (i == 0) {
             Person::players[i]->burnt = 0;
             Person::players[i]->bled = 0;
             Person::players[i]->onfire = 0;
-            if (i == 0 || Person::players[i]->scale < 0)
-                Person::players[i]->scale = .2;
-            Person::players[i]->skeleton.free = 0;
-            Person::players[i]->skeleton.id = i;
-            if (i == 0 && mapvers < 9)
-                Person::players[i]->creature = rabbittype;
-            if (Person::players[i]->creature != wolftype) {
-                Person::players[i]->skeleton.Load(
-                    (char *)"Skeleton/Basic Figure",
-                    (char *)"Skeleton/Basic Figurelow",
-                    (char *)"Skeleton/Rabbitbelt",
-                    (char *)"Models/Body.solid",
-                    (char *)"Models/Body2.solid",
-                    (char *)"Models/Body3.solid",
-                    (char *)"Models/Body4.solid",
-                    (char *)"Models/Body5.solid",
-                    (char *)"Models/Body6.solid",
-                    (char *)"Models/Body7.solid",
-                    (char *)"Models/Bodylow.solid",
-                    (char *)"Models/Belt.solid", 0);
-            } else {
-                if (Person::players[i]->creature != wolftype) {
-                    Person::players[i]->skeleton.Load(
-                        (char *)"Skeleton/Basic Figure",
-                        (char *)"Skeleton/Basic Figurelow",
-                        (char *)"Skeleton/Rabbitbelt",
-                        (char *)"Models/Body.solid",
-                        (char *)"Models/Body2.solid",
-                        (char *)"Models/Body3.solid",
-                        (char *)"Models/Body4.solid",
-                        (char *)"Models/Body5.solid",
-                        (char *)"Models/Body6.solid",
-                        (char *)"Models/Body7.solid",
-                        (char *)"Models/Bodylow.solid",
-                        (char *)"Models/Belt.solid", 1);
-                    Person::players[i]->skeleton.drawmodelclothes.textureptr.load("Textures/Belt.png", 1);
-                }
-                if (Person::players[i]->creature == wolftype) {
-                    Person::players[i]->skeleton.Load(
-                        (char *)"Skeleton/Basic Figure Wolf",
-                        (char *)"Skeleton/Basic Figure Wolf Low",
-                        (char *)"Skeleton/Rabbitbelt",
-                        (char *)"Models/Wolf.solid",
-                        (char *)"Models/Wolf2.solid",
-                        (char *)"Models/Wolf3.solid",
-                        (char *)"Models/Wolf4.solid",
-                        (char *)"Models/Wolf5.solid",
-                        (char *)"Models/Wolf6.solid",
-                        (char *)"Models/Wolf7.solid",
-                        (char *)"Models/Wolflow.solid",
-                        (char *)"Models/Belt.solid", 0);
-                }
-            }
+            Person::players[i]->scale = .2;
+        }
+        Person::players[i]->skeleton.free = 0;
+        Person::players[i]->skeleton.id = i;
+        if (i == 0 && mapvers < 9) {
+            Person::players[i]->creature = rabbittype;
+        }
+        if (Person::players[i]->creature != wolftype) {
+            Person::players[i]->skeleton.Load(
+                (char *)"Skeleton/BasicFigure",
+                (char *)"Skeleton/BasicFigureLow",
+                (char *)"Skeleton/RabbitBelt",
+                (char *)"Models/Body.solid",
+                (char *)"Models/Body2.solid",
+                (char *)"Models/Body3.solid",
+                (char *)"Models/Body4.solid",
+                (char *)"Models/Body5.solid",
+                (char *)"Models/Body6.solid",
+                (char *)"Models/Body7.solid",
+                (char *)"Models/BodyLow.solid",
+                (char *)"Models/Belt.solid", 0);
+        } else {
+            Person::players[i]->skeleton.Load(
+                (char *)"Skeleton/BasicFigureWolf",
+                (char *)"Skeleton/BasicFigureWolfLow",
+                (char *)"Skeleton/RabbitBelt",
+                (char *)"Models/Wolf.solid",
+                (char *)"Models/Wolf2.solid",
+                (char *)"Models/Wolf3.solid",
+                (char *)"Models/Wolf4.solid",
+                (char *)"Models/Wolf5.solid",
+                (char *)"Models/Wolf6.solid",
+                (char *)"Models/Wolf7.solid",
+                (char *)"Models/WolfLow.solid",
+                (char *)"Models/Belt.solid", 0);
+        }
 
-            Person::players[i]->skeleton.drawmodel.textureptr.load(creatureskin[Person::players[i]->creature][Person::players[i]->whichskin], 1, &Person::players[i]->skeleton.skinText[0], &Person::players[i]->skeleton.skinsize);
+        Person::players[i]->skeleton.drawmodel.textureptr.load(creatureskin[Person::players[i]->creature][Person::players[i]->whichskin], 1, &Person::players[i]->skeleton.skinText[0], &Person::players[i]->skeleton.skinsize);
 
-            Person::players[i]->addClothes();
+        Person::players[i]->addClothes();
 
+        if (i == 0) {
             Person::players[i]->animCurrent = bounceidleanim;
             Person::players[i]->animTarget = bounceidleanim;
             Person::players[i]->frameCurrent = 0;
             Person::players[i]->frameTarget = 1;
             Person::players[i]->target = 0;
-            Person::players[i]->speed = 1 + (float)(Random() % 100) / 1000;
-            if (difficulty == 0)
-                Person::players[i]->speed -= .2;
-            if (difficulty == 1)
-                Person::players[i]->speed -= .1;
+        }
+        Person::players[i]->speed = 1 + (float)(Random() % 100) / 1000;
+        if (difficulty == 0)
+            Person::players[i]->speed -= .2;
+        if (difficulty == 1)
+            Person::players[i]->speed -= .1;
 
+        if (i == 0) {
             Person::players[i]->velocity = 0;
             Person::players[i]->oldcoords = Person::players[i]->coords;
             Person::players[i]->realoldcoords = Person::players[i]->coords;
 
             Person::players[i]->id = i;
-            Person::players[i]->skeleton.id = i;
             Person::players[i]->updatedelay = 0;
             Person::players[i]->normalsupdatedelay = 0;
 
-            Person::players[i]->aitype = passivetype;
-
-            if (i == 0) {
-                Person::players[i]->proportionhead = 1.2;
-                Person::players[i]->proportionbody = 1.05;
-                Person::players[i]->proportionarms = 1.00;
-                Person::players[i]->proportionlegs = 1.1;
-                Person::players[i]->proportionlegs.y = 1.05;
-            }
+            Person::players[i]->proportionhead = 1.2;
+            Person::players[i]->proportionbody = 1.05;
+            Person::players[i]->proportionarms = 1.00;
+            Person::players[i]->proportionlegs = 1.1;
+            Person::players[i]->proportionlegs.y = 1.05;
             Person::players[i]->headless = 0;
             Person::players[i]->currentoffset = 0;
             Person::players[i]->targetoffset = 0;
-
-            Person::players[i]->damagetolerance = 200;
-
             if (Person::players[i]->creature == wolftype) {
-                if (i == 0 || Person::players[i]->scale < 0)
-                    Person::players[i]->scale = .23;
+                Person::players[i]->scale = .23;
                 Person::players[i]->damagetolerance = 300;
+            } else {
+                Person::players[i]->damagetolerance = 200;
             }
+        }
 
-            if (visibleloading)
-                LoadingScreen();
-            if (cellophane) {
-                Person::players[i]->proportionhead.z = 0;
-                Person::players[i]->proportionbody.z = 0;
-                Person::players[i]->proportionarms.z = 0;
-                Person::players[i]->proportionlegs.z = 0;
-            }
 
-            Person::players[i]->tempanimation.Load((char *)"Tempanim", 0, 0);
+        if (visibleloading)
+            LoadingScreen();
+
+        if (cellophane) {
+            Person::players[i]->proportionhead.z = 0;
+            Person::players[i]->proportionbody.z = 0;
+            Person::players[i]->proportionarms.z = 0;
+            Person::players[i]->proportionlegs.z = 0;
+        }
 
+        Person::players[i]->tempanimation.Load((char *)"Tempanim", 0, 0);
+
+        if (i == 0) {
             Person::players[i]->headmorphness = 0;
             Person::players[i]->targetheadmorphness = 1;
             Person::players[i]->headmorphstart = 0;
@@ -1237,53 +1224,51 @@ void Game::Loadlevel(const std::string& name)
             Person::players[i]->hasvictim = 0;
             Person::players[i]->wentforweapon = 0;
         }
+    }
 
-        Person::players[0]->aitype = playercontrolled;
-        Person::players[0]->weaponactive = -1;
-
-        if (difficulty == 1) {
-            Person::players[0]->power = 1 / .9;
-            Person::players[0]->damagetolerance = 250;
-        } else if (difficulty == 0) {
-            Person::players[0]->power = 1 / .8;
-            Person::players[0]->damagetolerance = 300;
-            Person::players[0]->armorhead *= 1.5;
-            Person::players[0]->armorhigh *= 1.5;
-            Person::players[0]->armorlow *= 1.5;
-        }
+    Person::players[0]->aitype = playercontrolled;
+
+    if (difficulty == 1) {
+        Person::players[0]->power = 1 / .9;
+        Person::players[0]->damagetolerance = 250;
+    } else if (difficulty == 0) {
+        Person::players[0]->power = 1 / .8;
+        Person::players[0]->damagetolerance = 300;
+        Person::players[0]->armorhead *= 1.5;
+        Person::players[0]->armorhigh *= 1.5;
+        Person::players[0]->armorlow *= 1.5;
+    }
 
-        cameraloc = Person::players[0]->coords;
-        cameraloc.y += 5;
-        yaw = Person::players[0]->yaw;
+    cameraloc = Person::players[0]->coords;
+    cameraloc.y += 5;
+    yaw = Person::players[0]->yaw;
 
-        hawkcoords = Person::players[0]->coords;
-        hawkcoords.y += 30;
+    hawkcoords = Person::players[0]->coords;
+    hawkcoords.y += 30;
 
-        if (visibleloading)
-            LoadingScreen();
+    if (visibleloading)
+        LoadingScreen();
 
-        LOG("Starting background music...");
+    LOG("Starting background music...");
 
-        OPENAL_StopSound(OPENAL_ALL);
-        if (ambientsound) {
-            if (environment == snowyenvironment) {
-                emit_stream_np(stream_wind);
-            } else if (environment == desertenvironment) {
-                emit_stream_np(stream_desertambient);
-            } else if (environment == grassyenvironment) {
-                emit_stream_np(stream_wind, 100.);
-            }
+    OPENAL_StopSound(OPENAL_ALL);
+    if (ambientsound) {
+        if (environment == snowyenvironment) {
+            emit_stream_np(stream_wind);
+        } else if (environment == desertenvironment) {
+            emit_stream_np(stream_desertambient);
+        } else if (environment == grassyenvironment) {
+            emit_stream_np(stream_wind, 100.);
         }
-        oldmusicvolume[0] = 0;
-        oldmusicvolume[1] = 0;
-        oldmusicvolume[2] = 0;
-        oldmusicvolume[3] = 0;
-
-        if (!firstload)
-            firstload = 1;
-    } else {
-        perror("Problem");
     }
+    oldmusicvolume[0] = 0;
+    oldmusicvolume[1] = 0;
+    oldmusicvolume[2] = 0;
+    oldmusicvolume[3] = 0;
+
+    if (!firstload)
+        firstload = 1;
+
     leveltime = 0;
     visibleloading = 0;
 }
@@ -1920,7 +1905,7 @@ void doDebugKeys()
 
                 if (Person::players[closest]->creature == rabbittype) {
                     Person::players[closest]->skeleton.id = closest;
-                    Person::players[closest]->skeleton.Load((char *)"Skeleton/Basic Figure Wolf", (char *)"Skeleton/Basic Figure Wolf Low", (char *)"Skeleton/Rabbitbelt", (char *)"Models/Wolf.solid", (char *)"Models/Wolf2.solid", (char *)"Models/Wolf3.solid", (char *)"Models/Wolf4.solid", (char *)"Models/Wolf5.solid", (char *)"Models/Wolf6.solid", (char *)"Models/Wolf7.solid", (char *)"Models/Wolflow.solid", (char *)"Models/Belt.solid", 0);
+                    Person::players[closest]->skeleton.Load((char *)"Skeleton/BasicFigureWolf", (char *)"Skeleton/BasicFigureWolfLow", (char *)"Skeleton/RabbitBelt", (char *)"Models/Wolf.solid", (char *)"Models/Wolf2.solid", (char *)"Models/Wolf3.solid", (char *)"Models/Wolf4.solid", (char *)"Models/Wolf5.solid", (char *)"Models/Wolf6.solid", (char *)"Models/Wolf7.solid", (char *)"Models/WolfLow.solid", (char *)"Models/Belt.solid", 0);
                     Person::players[closest]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[closest]->skeleton.skinText[0], &Person::players[closest]->skeleton.skinsize);
                     Person::players[closest]->whichskin = 0;
                     Person::players[closest]->creature = wolftype;
@@ -1935,7 +1920,7 @@ void doDebugKeys()
                     Person::players[closest]->damagetolerance = 300;
                 } else {
                     Person::players[closest]->skeleton.id = closest;
-                    Person::players[closest]->skeleton.Load((char *)"Skeleton/Basic Figure", (char *)"Skeleton/Basic Figurelow", (char *)"Skeleton/Rabbitbelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/Bodylow.solid", (char *)"Models/Belt.solid", 1);
+                    Person::players[closest]->skeleton.Load((char *)"Skeleton/BasicFigure", (char *)"Skeleton/BasicFigureLow", (char *)"Skeleton/RabbitBelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/BodyLow.solid", (char *)"Models/Belt.solid", 1);
                     Person::players[closest]->skeleton.drawmodel.textureptr.load("Textures/Fur3.jpg", 1, &Person::players[closest]->skeleton.skinText[0], &Person::players[closest]->skeleton.skinsize);
                     Person::players[closest]->whichskin = 0;
                     Person::players[closest]->creature = rabbittype;
@@ -2228,7 +2213,7 @@ void doDebugKeys()
                 Person::players.back()->creature = rabbittype;
                 Person::players.back()->howactive = editoractive;
                 Person::players.back()->skeleton.id = Person::players.size()-1;
-                Person::players.back()->skeleton.Load((char *)"Skeleton/Basic Figure", (char *)"Skeleton/Basic Figurelow", (char *)"Skeleton/Rabbitbelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/Bodylow.solid", (char *)"Models/Belt.solid", 1);
+                Person::players.back()->skeleton.Load((char *)"Skeleton/BasicFigure", (char *)"Skeleton/BasicFigureLow", (char *)"Skeleton/RabbitBelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/BodyLow.solid", (char *)"Models/Belt.solid", 1);
 
                 int k = abs(Random() % 2) + 1;
                 if (k == 0) {