X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FDevtools%2FConsoleCmds.cpp;h=38e160086961755246857e07931af50f55d2363b;hb=ce51a88a16d2e7af222929546d250eba4acb299d;hp=57e9f4a8b78150eaefd7fa4b2469bdff77db183f;hpb=d177a567280631cd91a677debafada8cef7e0413;p=lugaru.git

diff --git a/Source/Devtools/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp
index 57e9f4a..38e1600 100644
--- a/Source/Devtools/ConsoleCmds.cpp
+++ b/Source/Devtools/ConsoleCmds.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -23,19 +23,19 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Game.hpp"
 #include "Level/Dialog.hpp"
 #include "Level/Hotspot.hpp"
-#include "Utils/Folders.hpp"
 #include "Tutorial.hpp"
+#include "Utils/Folders.hpp"
 
-const char *cmd_names[cmd_count] = {
+const char* cmd_names[cmd_count] = {
 #define DECLARE_COMMAND(cmd) #cmd,
 #include "ConsoleCmds.def"
-#undef  DECLARE_COMMAND
+#undef DECLARE_COMMAND
 };
 
 console_handler cmd_handlers[cmd_count] = {
 #define DECLARE_COMMAND(cmd) ch_##cmd,
 #include "ConsoleCmds.def"
-#undef  DECLARE_COMMAND
+#undef DECLARE_COMMAND
 };
 
 using namespace Game;
@@ -73,109 +73,140 @@ float tintr = 1, tintg = 1, tintb = 1;
 /* Helpers used in console commands */
 
 /* Return true if PFX is a prefix of STR (case-insensitive).  */
-static bool stripfx(const char *str, const char *pfx)
+static bool stripfx(const char* str, const char* pfx)
 {
     return !strncasecmp(str, pfx, strlen(pfx));
 }
 
-static void set_proportion(int pnum, const char *args)
+static void set_proportion(int pnum, const char* args)
 {
     float headprop, bodyprop, armprop, legprop;
 
     sscanf(args, "%f%f%f%f", &headprop, &bodyprop, &armprop, &legprop);
 
-    if (Person::players[pnum]->creature == wolftype) {
-        Person::players[pnum]->proportionhead = 1.1 * headprop;
-        Person::players[pnum]->proportionbody = 1.1 * bodyprop;
-        Person::players[pnum]->proportionarms = 1.1 * armprop;
-        Person::players[pnum]->proportionlegs = 1.1 * legprop;
-    } else if (Person::players[pnum]->creature == rabbittype) {
-        Person::players[pnum]->proportionhead = 1.2 * headprop;
-        Person::players[pnum]->proportionbody = 1.05 * bodyprop;
-        Person::players[pnum]->proportionarms = 1.00 * armprop;
-        Person::players[pnum]->proportionlegs = 1.1 * legprop;
-        Person::players[pnum]->proportionlegs.y = 1.05 * legprop;
-    }
+    Person::players[pnum]->setProportions(headprop, bodyprop, armprop, legprop);
 }
 
-static void set_protection(int pnum, const char *args)
+static void set_protection(int pnum, const char* args)
 {
     float head, high, low;
     sscanf(args, "%f%f%f", &head, &high, &low);
 
     Person::players[pnum]->protectionhead = head;
     Person::players[pnum]->protectionhigh = high;
-    Person::players[pnum]->protectionlow  = low;
+    Person::players[pnum]->protectionlow = low;
 }
 
-static void set_armor(int pnum, const char *args)
+static void set_armor(int pnum, const char* args)
 {
     float head, high, low;
     sscanf(args, "%f%f%f", &head, &high, &low);
 
     Person::players[pnum]->armorhead = head;
     Person::players[pnum]->armorhigh = high;
-    Person::players[pnum]->armorlow  = low;
+    Person::players[pnum]->armorlow = low;
 }
 
-static void set_metal(int pnum, const char *args)
+static void set_metal(int pnum, const char* args)
 {
     float head, high, low;
     sscanf(args, "%f%f%f", &head, &high, &low);
 
     Person::players[pnum]->metalhead = head;
     Person::players[pnum]->metalhigh = high;
-    Person::players[pnum]->metallow  = low;
+    Person::players[pnum]->metallow = low;
 }
 
-static void set_noclothes(int pnum, const char *args)
+static void set_noclothes(int pnum, const char*)
 {
     Person::players[pnum]->numclothes = 0;
     Person::players[pnum]->skeleton.drawmodel.textureptr.load(
-        creatureskin[Person::players[pnum]->creature][Person::players[pnum]->whichskin], 1,
+        PersonType::types[Person::players[pnum]->creature].skins[Person::players[pnum]->whichskin], 1,
         &Person::players[pnum]->skeleton.skinText[0], &Person::players[pnum]->skeleton.skinsize);
 }
 
-static void set_clothes(int pnum, const char *args)
+static void set_clothes(int pnum, const char* args)
 {
     char buf[64];
     snprintf(buf, 63, "Textures/%s.png", args);
 
+    const std::string file_path = Folders::getResourcePath(buf);
+    FILE* tfile;
+    tfile = fopen(file_path.c_str(), "rb");
+    if (tfile == NULL) {
+        perror((std::string("Couldn't find file ") + file_path + " to assign as clothes").c_str());
+
+        // FIXME: Reduce code duplication with GameTick (should come from a Console class)
+        for (int k = 14; k >= 1; k--) {
+            consoletext[k] = consoletext[k - 1];
+        }
+        consoletext[0] = std::string("Could not load the requested texture '") + args + "', aborting.";
+        consoleselected = 0;
+
+        return;
+    }
+
     int id = Person::players[pnum]->numclothes;
-    strcpy(Person::players[pnum]->clothes[id], buf);
+    strncpy(Person::players[pnum]->clothes[id], buf, 64);
     Person::players[pnum]->clothestintr[id] = tintr;
     Person::players[pnum]->clothestintg[id] = tintg;
     Person::players[pnum]->clothestintb[id] = tintb;
     Person::players[pnum]->numclothes++;
 
-    if (!Person::players[pnum]->addClothes(id))
+    if (!Person::players[pnum]->addClothes(id)) {
         return;
+    }
 
     Person::players[pnum]->DoMipmaps();
 }
 
+static void list_clothes(int pnum)
+{
+    printf("Clothes from player %d:\n", pnum);
+    for (int i = 0; i < Person::players[pnum]->numclothes; i++) {
+        printf("%s (%f %f %f)\n",
+               Person::players[pnum]->clothes[i],
+               Person::players[pnum]->clothestintr[i],
+               Person::players[pnum]->clothestintg[i],
+               Person::players[pnum]->clothestintb[i]);
+    }
+}
+
 /* Console commands themselves */
 
-void ch_quit(const char *args)
+void ch_quit(const char*)
 {
     tryquit = 1;
 }
 
-void ch_map(const char *args)
+void ch_map(const char* args)
 {
-    Loadlevel(args);
+    if (!LoadLevel(args)) {
+        // FIXME: Reduce code duplication with GameTick (should come from a Console class)
+        for (int k = 14; k >= 1; k--) {
+            consoletext[k] = consoletext[k - 1];
+        }
+        consoletext[0] = std::string("Could not load the requested level '") + args + "', aborting.";
+        consoleselected = 0;
+    }
     whichlevel = -2;
     campaign = 0;
 }
 
-void ch_save(const char *args)
+void ch_save(const char* args)
 {
-    std::string map_path = Folders::getUserDataPath() + "/Maps/" + args;
+    std::string map_path = Folders::getUserDataPath() + "/Maps";
+    Folders::makeDirectory(map_path);
+    map_path = map_path + "/" + args;
 
     int mapvers = 12;
 
-    FILE *tfile;
-    tfile = fopen( map_path.c_str(), "wb" );
+    FILE* tfile;
+    tfile = fopen(map_path.c_str(), "wb");
+    if (tfile == NULL) {
+        perror((std::string("Couldn't open file ") + map_path + " for saving").c_str());
+        return;
+    }
     fpackf(tfile, "Bi", mapvers);
     fpackf(tfile, "Bi", maptype);
     fpackf(tfile, "Bi", hostile);
@@ -184,9 +215,11 @@ void ch_save(const char *args)
     fpackf(tfile, "Bf Bf Bf", skyboxlightr, skyboxlightg, skyboxlightb);
     fpackf(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++)
+    if (Person::players[0]->num_weapons > 0 && Person::players[0]->num_weapons < 5) {
+        for (int j = 0; j < Person::players[0]->num_weapons; j++) {
             fpackf(tfile, "Bi", weapons[Person::players[0]->weaponids[j]].getType());
+        }
+    }
 
     fpackf(tfile, "Bf Bf Bf", Person::players[0]->armorhead, Person::players[0]->armorhigh, Person::players[0]->armorlow);
     fpackf(tfile, "Bf Bf Bf", Person::players[0]->protectionhead, Person::players[0]->protectionhigh, Person::players[0]->protectionlow);
@@ -202,8 +235,9 @@ void ch_save(const char *args)
     for (int k = 0; k < Person::players[0]->numclothes; k++) {
         int templength = strlen(Person::players[0]->clothes[k]);
         fpackf(tfile, "Bi", templength);
-        for (int l = 0; l < templength; l++)
+        for (int l = 0; l < templength; l++) {
             fpackf(tfile, "Bb", Person::players[0]->clothes[k][l]);
+        }
         fpackf(tfile, "Bf Bf Bf", Person::players[0]->clothestintr[k], Person::players[0]->clothestintg[k], Person::players[0]->clothestintb[k]);
     }
 
@@ -211,17 +245,19 @@ void ch_save(const char *args)
 
     fpackf(tfile, "Bi", Object::objects.size());
 
-    for (int k = 0; k < Object::objects.size(); k++)
+    for (unsigned int k = 0; k < Object::objects.size(); k++) {
         fpackf(tfile, "Bi Bf Bf Bf Bf Bf Bf", Object::objects[k]->type, Object::objects[k]->yaw, Object::objects[k]->pitch,
                Object::objects[k]->position.x, Object::objects[k]->position.y, Object::objects[k]->position.z, Object::objects[k]->scale);
+    }
 
     fpackf(tfile, "Bi", Hotspot::hotspots.size());
     for (unsigned i = 0; i < Hotspot::hotspots.size(); i++) {
         fpackf(tfile, "Bi Bf Bf Bf Bf", Hotspot::hotspots[i].type, Hotspot::hotspots[i].size, Hotspot::hotspots[i].position.x, Hotspot::hotspots[i].position.y, Hotspot::hotspots[i].position.z);
         int templength = strlen(Hotspot::hotspots[i].text);
         fpackf(tfile, "Bi", templength);
-        for (int l = 0; l < templength; l++)
+        for (int l = 0; l < templength; l++) {
             fpackf(tfile, "Bb", Hotspot::hotspots[i].text[l]);
+        }
     }
 
     fpackf(tfile, "Bi", Person::players.size());
@@ -232,9 +268,11 @@ void ch_save(const char *args)
         fpackf(tfile, "Bi Bi Bf Bf Bf Bi Bi Bf Bb Bf", Person::players[j]->whichskin, Person::players[j]->creature,
                Person::players[j]->coords.x, Person::players[j]->coords.y, Person::players[j]->coords.z,
                Person::players[j]->num_weapons, Person::players[j]->howactive, Person::players[j]->scale, Person::players[j]->immobile, Person::players[j]->yaw);
-        if (Person::players[j]->num_weapons < 5)
-            for (int k = 0; k < Person::players[j]->num_weapons; k++)
+        if (Person::players[j]->num_weapons < 5) {
+            for (int k = 0; k < Person::players[j]->num_weapons; k++) {
                 fpackf(tfile, "Bi", weapons[Person::players[j]->weaponids[k]].getType());
+            }
+        }
         if (Person::players[j]->numwaypoints < 30) {
             fpackf(tfile, "Bi", Person::players[j]->numwaypoints);
             for (int k = 0; k < Person::players[j]->numwaypoints; k++) {
@@ -254,40 +292,28 @@ void ch_save(const char *args)
         fpackf(tfile, "Bf Bf Bf", Person::players[j]->protectionhead, Person::players[j]->protectionhigh, Person::players[j]->protectionlow);
         fpackf(tfile, "Bf Bf Bf", Person::players[j]->metalhead, Person::players[j]->metalhigh, Person::players[j]->metallow);
         fpackf(tfile, "Bf Bf", Person::players[j]->power, Person::players[j]->speedmult);
-
-        float headprop, bodyprop, armprop, legprop;
-        if (Person::players[j]->creature == wolftype) {
-            headprop = Person::players[j]->proportionhead.x / 1.1;
-            bodyprop = Person::players[j]->proportionbody.x / 1.1;
-            armprop = Person::players[j]->proportionarms.x / 1.1;
-            legprop = Person::players[j]->proportionlegs.x / 1.1;
-        } else {
-            // rabbittype
-            headprop = Person::players[j]->proportionhead.x / 1.2;
-            bodyprop = Person::players[j]->proportionbody.x / 1.05;
-            armprop = Person::players[j]->proportionarms.x / 1.00;
-            legprop = Person::players[j]->proportionlegs.x / 1.1;
-        }
-
-        fpackf(tfile, "Bf Bf Bf Bf", headprop, bodyprop, armprop, legprop);
+        fpackf(tfile, "Bf Bf Bf Bf", Person::players[j]->getProportion(0), Person::players[j]->getProportion(1), Person::players[j]->getProportion(2), Person::players[j]->getProportion(3));
 
         fpackf(tfile, "Bi", Person::players[j]->numclothes);
-        if (Person::players[j]->numclothes)
+        if (Person::players[j]->numclothes) {
             for (int k = 0; k < Person::players[j]->numclothes; k++) {
                 int templength;
                 templength = strlen(Person::players[j]->clothes[k]);
                 fpackf(tfile, "Bi", templength);
-                for (int l = 0; l < templength; l++)
+                for (int l = 0; l < templength; l++) {
                     fpackf(tfile, "Bb", Person::players[j]->clothes[k][l]);
+                }
                 fpackf(tfile, "Bf Bf Bf", Person::players[j]->clothestintr[k], Person::players[j]->clothestintg[k], Person::players[j]->clothestintb[k]);
             }
+        }
     }
 
     fpackf(tfile, "Bi", numpathpoints);
     for (int j = 0; j < numpathpoints; j++) {
         fpackf(tfile, "Bf Bf Bf Bi", pathpoint[j].x, pathpoint[j].y, pathpoint[j].z, numpathpointconnect[j]);
-        for (int k = 0; k < numpathpointconnect[j]; k++)
+        for (int k = 0; k < numpathpointconnect[j]; k++) {
             fpackf(tfile, "Bi", pathpointconnect[j][k]);
+        }
     }
 
     fpackf(tfile, "Bf Bf Bf Bf", mapcenter.x, mapcenter.y, mapcenter.z, mapradius);
@@ -295,244 +321,218 @@ void ch_save(const char *args)
     fclose(tfile);
 }
 
-void ch_cellar(const char *args)
-{
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Furdarko.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
-}
-
-void ch_tint(const char *args)
+void ch_tint(const char* args)
 {
     sscanf(args, "%f%f%f", &tintr, &tintg, &tintb);
 }
 
-void ch_tintr(const char *args)
+void ch_tintr(const char* args)
 {
     tintr = atof(args);
 }
 
-void ch_tintg(const char *args)
+void ch_tintg(const char* args)
 {
     tintg = atof(args);
 }
 
-void ch_tintb(const char *args)
+void ch_tintb(const char* args)
 {
     tintb = atof(args);
 }
 
-void ch_speed(const char *args)
+void ch_speed(const char* args)
 {
     Person::players[0]->speedmult = atof(args);
 }
 
-void ch_strength(const char *args)
+void ch_strength(const char* args)
 {
     Person::players[0]->power = atof(args);
 }
 
-void ch_power(const char *args)
+void ch_power(const char* args)
 {
     Person::players[0]->power = atof(args);
 }
 
-void ch_size(const char *args)
+void ch_size(const char* args)
 {
     Person::players[0]->scale = atof(args) * .2;
 }
 
-void ch_sizenear(const char *args)
+void ch_sizenear(const char* args)
 {
     int closest = findClosestPlayer();
-    if (closest >= 0)
+    if (closest >= 0) {
         Person::players[closest]->scale = atof(args) * .2;
+    }
 }
 
-void ch_proportion(const char *args)
+void ch_proportion(const char* args)
 {
     set_proportion(0, args);
 }
 
-void ch_proportionnear(const char *args)
+void ch_proportionnear(const char* args)
 {
     int closest = findClosestPlayer();
-    if (closest >= 0)
+    if (closest >= 0) {
         set_proportion(closest, args);
+    }
 }
 
-void ch_protection(const char *args)
+void ch_protection(const char* args)
 {
     set_protection(0, args);
 }
 
-void ch_protectionnear(const char *args)
+void ch_protectionnear(const char* args)
 {
     int closest = findClosestPlayer();
-    if (closest >= 0)
+    if (closest >= 0) {
         set_protection(closest, args);
+    }
 }
 
-void ch_armor(const char *args)
+void ch_armor(const char* args)
 {
     set_armor(0, args);
 }
 
-void ch_armornear(const char *args)
+void ch_armornear(const char* args)
 {
     int closest = findClosestPlayer();
-    if (closest >= 0)
+    if (closest >= 0) {
         set_armor(closest, args);
+    }
 }
 
-void ch_protectionreset(const char *args)
+void ch_protectionreset(const char*)
 {
     set_protection(0, "1 1 1");
     set_armor(0, "1 1 1");
 }
 
-void ch_metal(const char *args)
+void ch_metal(const char* args)
 {
     set_metal(0, args);
 }
 
-void ch_noclothes(const char *args)
+void ch_noclothes(const char* args)
 {
     set_noclothes(0, args);
 }
 
-void ch_noclothesnear(const char *args)
+void ch_noclothesnear(const char* args)
 {
     int closest = findClosestPlayer();
-    if (closest >= 0)
+    if (closest >= 0) {
         set_noclothes(closest, args);
+    }
 }
 
-void ch_clothes(const char *args)
+void ch_clothes(const char* args)
 {
     set_clothes(0, args);
 }
 
-void ch_clothesnear(const char *args)
+void ch_clothesnear(const char* args)
 {
     int closest = findClosestPlayer();
-    if (closest >= 0)
+    if (closest >= 0) {
         set_clothes(closest, args);
-}
-
-void ch_belt(const char *args)
-{
-    Person::players[0]->skeleton.clothes = !Person::players[0]->skeleton.clothes;
-}
-
-
-void ch_cellophane(const char *args)
-{
-    cellophane = !cellophane;
-    float mul = (cellophane ? 0 : 1);
-
-    for (auto player : Person::players) {
-        player->proportionhead.z = player->proportionhead.x * mul;
-        player->proportionbody.z = player->proportionbody.x * mul;
-        player->proportionarms.z = player->proportionarms.x * mul;
-        player->proportionlegs.z = player->proportionlegs.x * mul;
     }
 }
 
-void ch_funnybunny(const char *args)
+void ch_clotheslist(const char*)
 {
-    Person::players[0]->creature = rabbittype;
-    Person::players[0]->skeletonLoad(true);
-    Person::players[0]->scale = .2;
-    Person::players[0]->headless = 0;
-    Person::players[0]->damagetolerance = 200;
-    set_proportion(0, "1 1 1 1");
+    list_clothes(0);
 }
 
-void ch_wolfie(const char *args)
+void ch_clotheslistnear(const char*)
 {
-    Person::players[0]->creature = wolftype;
-    Person::players[0]->skeletonLoad();
-    Person::players[0]->damagetolerance = 300;
-    set_proportion(0, "1 1 1 1");
-}
-
-void ch_wolfieisgod(const char *args)
-{
-    ch_wolfie(args);
-}
-
-void ch_wolf(const char *args)
-{
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    int closest = findClosestPlayer();
+    if (closest >= 0) {
+        list_clothes(closest);
+    }
 }
 
-void ch_snowwolf(const char *args)
+void ch_belt(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/SnowWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.clothes = !Person::players[0]->skeleton.clothes;
 }
 
-void ch_darkwolf(const char *args)
+void ch_cellophane(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/DarkWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    cellophane = !cellophane;
 }
 
-void ch_lizardwolf(const char *args)
+void ch_funnybunny(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/LizardWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->changeCreatureType(rabbittype);
+    Person::players[0]->headless = 0;
+    set_proportion(0, "1 1 1 1");
 }
 
-void ch_white(const char *args)
+void ch_wolfie(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->changeCreatureType(wolftype);
+    set_proportion(0, "1 1 1 1");
 }
 
-void ch_brown(const char *args)
+void ch_lizardwolf(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurWolfLizard.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
-void ch_black(const char *args)
+void ch_darko(const char*)
 {
-    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur2.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
+    Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/FurDarko.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 }
 
-void ch_sizemin(const char *args)
+void ch_sizemin(const char*)
 {
-    for (unsigned i = 1; i < Person::players.size(); i++)
-        if (Person::players[i]->scale < 0.8 * 0.2)
+    for (unsigned i = 1; i < Person::players.size(); i++) {
+        if (Person::players[i]->scale < 0.8 * 0.2) {
             Person::players[i]->scale = 0.8 * 0.2;
+        }
+    }
 }
 
-void ch_tutorial(const char *args)
+void ch_tutorial(const char* args)
 {
     Tutorial::active = atoi(args);
 }
 
-void ch_hostile(const char *args)
+void ch_hostile(const char* args)
 {
     hostile = atoi(args);
 }
 
-void ch_type(const char *args)
+void ch_type(const char* args)
 {
     int n = sizeof(editortypenames) / sizeof(editortypenames[0]);
-    for (int i = 0; i < n; i++)
+    for (int i = 0; i < n; i++) {
         if (stripfx(args, editortypenames[i])) {
             editoractive = i;
             break;
         }
+    }
 }
 
-void ch_path(const char *args)
+void ch_path(const char* args)
 {
-    int n = sizeof(pathtypenames) / sizeof(pathtypenames[0]);
-    for (int i = 0; i < n; i++)
+    unsigned int n = sizeof(pathtypenames) / sizeof(pathtypenames[0]);
+    for (unsigned int i = 0; i < n; i++) {
         if (stripfx(args, pathtypenames[i])) {
             editorpathtype = i;
             break;
         }
+    }
 }
 
-void ch_hs(const char *args)
+void ch_hs(const char* args)
 {
     float size;
     int type, shift;
@@ -544,7 +544,7 @@ void ch_hs(const char *args)
     strcat(Hotspot::hotspots.back().text, "\n");
 }
 
-void ch_dialogue(const char *args)
+void ch_dialog(const char* args)
 {
     int type;
     char buf1[32];
@@ -559,61 +559,79 @@ void ch_dialogue(const char *args)
     Dialog::whichdialogue = Dialog::dialogs.size();
 }
 
-void ch_fixdialogue(const char *args)
+void ch_fixdialog(const char* args)
 {
     char buf1[32];
-    int whichdi;
+    int whichdlg = 0;
 
-    sscanf(args, "%d %31s", &whichdi, buf1);
+    sscanf(args, "%d %31s", &whichdlg, buf1);
     std::string filename = std::string("Dialogues/") + buf1 + ".txt";
 
-    Dialog::dialogs[whichdi] = Dialog(Dialog::dialogs[whichdi].type, filename);
+    Dialog::dialogs[whichdlg] = Dialog(Dialog::dialogs[whichdlg].type, filename);
 }
 
-void ch_fixtype(const char *args)
+void ch_fixtype(const char* args)
 {
-    int dlg;
-    sscanf(args, "%d", &dlg);
-    Dialog::dialogs[0].type = dlg;
+    int whichdlg = 0;
+    int type = 0;
+    sscanf(args, "%d %d", &whichdlg, &type);
+    Dialog::dialogs[whichdlg].type = type;
 }
 
-void ch_fixrotation(const char *args)
+void ch_fixrotation(const char*)
 {
     int playerId = Dialog::currentScene().participantfocus;
     Dialog::currentDialog().participantyaw[playerId] = Person::players[playerId]->yaw;
 }
 
-void ch_ddialogue(const char *args)
+void ch_ddialog(const char* args)
 {
-    if (!Dialog::dialogs.empty()) {
+    if (Dialog::dialogs.empty() || Dialog::inDialog()) {
+        return;
+    }
+
+    int dlg = -1;
+    sscanf(args, "%d", &dlg);
+    if (dlg == -1) {
+        // Remove last entry
         Dialog::dialogs.pop_back();
+        return;
+    }
+
+    if (dlg >= int(Dialog::dialogs.size())) {
+        // Invalid index, abort
+        return;
     }
+
+    // Erase given index, higher indexes will be decreased by 1
+    Dialog::dialogs.erase(Dialog::dialogs.begin() + dlg);
 }
 
-void ch_dhs(const char *args)
+void ch_dhs(const char*)
 {
     if (!Hotspot::hotspots.empty()) {
         Hotspot::hotspots.pop_back();
     }
 }
 
-void ch_immobile(const char *args)
+void ch_immobile(const char*)
 {
     Person::players[0]->immobile = 1;
 }
 
-void ch_allimmobile(const char *args)
+void ch_allimmobile(const char*)
 {
-    for (unsigned i = 1; i < Person::players.size(); i++)
+    for (unsigned i = 1; i < Person::players.size(); i++) {
         Person::players[i]->immobile = 1;
+    }
 }
 
-void ch_mobile(const char *args)
+void ch_mobile(const char*)
 {
     Person::players[0]->immobile = 0;
 }
 
-void ch_default(const char *args)
+void ch_default(const char*)
 {
     Person::players[0]->armorhead = 1;
     Person::players[0]->armorhigh = 1;
@@ -626,31 +644,20 @@ void ch_default(const char *args)
     Person::players[0]->metallow = 1;
     Person::players[0]->power = 1;
     Person::players[0]->speedmult = 1;
-    Person::players[0]->scale = 1;
-
-    if (Person::players[0]->creature == wolftype) {
-        Person::players[0]->proportionhead = 1.1;
-        Person::players[0]->proportionbody = 1.1;
-        Person::players[0]->proportionarms = 1.1;
-        Person::players[0]->proportionlegs = 1.1;
-    } else if (Person::players[0]->creature == rabbittype) {
-        Person::players[0]->proportionhead = 1.2;
-        Person::players[0]->proportionbody = 1.05;
-        Person::players[0]->proportionarms = 1.00;
-        Person::players[0]->proportionlegs = 1.1;
-        Person::players[0]->proportionlegs.y = 1.05;
-    }
+    Person::players[0]->scale = PersonType::types[Person::players[0]->creature].defaultScale;
+
+    Person::players[0]->setProportions(1, 1, 1, 1);
 
     Person::players[0]->numclothes = 0;
     Person::players[0]->skeleton.drawmodel.textureptr.load(
-        creatureskin[Person::players[0]->creature][Person::players[0]->whichskin], 1,
+        PersonType::types[Person::players[0]->creature].skins[Person::players[0]->whichskin], 1,
         &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);
 
     editoractive = typeactive;
     Person::players[0]->immobile = 0;
 }
 
-void ch_play(const char *args)
+void ch_play(const char* args)
 {
     int dlg;
     sscanf(args, "%d", &dlg);
@@ -663,49 +670,49 @@ void ch_play(const char *args)
     Dialog::currentDialog().play();
 }
 
-void ch_mapkilleveryone(const char *args)
+void ch_mapkilleveryone(const char*)
 {
     maptype = mapkilleveryone;
 }
 
-void ch_mapkillmost(const char *args)
+void ch_mapkillmost(const char*)
 {
     maptype = mapkillmost;
 }
 
-void ch_mapkillsomeone(const char *args)
+void ch_mapkillsomeone(const char*)
 {
     maptype = mapkillsomeone;
 }
 
-void ch_mapgosomewhere(const char *args)
+void ch_mapgosomewhere(const char*)
 {
     maptype = mapgosomewhere;
 }
 
-void ch_viewdistance(const char *args)
+void ch_viewdistance(const char* args)
 {
     viewdistance = atof(args) * 100;
 }
 
-void ch_fadestart(const char *args)
+void ch_fadestart(const char* args)
 {
     fadestart = atof(args);
 }
 
-void ch_slomo(const char *args)
+void ch_slomo(const char* args)
 {
     slomospeed = atof(args);
     slomo = !slomo;
     slomodelay = 1000;
 }
 
-void ch_slofreq(const char *args)
+void ch_slofreq(const char* args)
 {
     slomofreq = atof(args);
 }
 
-void ch_skytint(const char *args)
+void ch_skytint(const char* args)
 {
     sscanf(args, "%f%f%f", &skyboxr, &skyboxg, &skyboxb);
 
@@ -719,7 +726,7 @@ void ch_skytint(const char *args)
     Object::DoShadows();
 }
 
-void ch_skylight(const char *args)
+void ch_skylight(const char* args)
 {
     sscanf(args, "%f%f%f", &skyboxlightr, &skyboxlightg, &skyboxlightb);
 
@@ -729,7 +736,7 @@ void ch_skylight(const char *args)
     Object::DoShadows();
 }
 
-void ch_skybox(const char *args)
+void ch_skybox(const char*)
 {
     skyboxtexture = !skyboxtexture;