X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FDevtools%2FConsoleCmds.cpp;h=6b30e3f038d6ae08b0d162bb3c73263ab3cd31c6;hb=5bba986635ab85bf530ac1d4af42b04164d7d6b7;hp=dc4c275d58989bae4427039e53d1ac72fb8f4c72;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git diff --git a/Source/Devtools/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp index dc4c275..6b30e3f 100644 --- a/Source/Devtools/ConsoleCmds.cpp +++ b/Source/Devtools/ConsoleCmds.cpp @@ -18,11 +18,12 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#include "Game.h" -#include "Devtools/ConsoleCmds.h" -#include "Level/Dialog.h" -#include "Level/Hotspot.h" -#include "Utils/Folders.h" +#include "Devtools/ConsoleCmds.hpp" + +#include "Game.hpp" +#include "Level/Dialog.hpp" +#include "Level/Hotspot.hpp" +#include "Utils/Folders.hpp" const char *cmd_names[cmd_count] = { #define DECLARE_COMMAND(cmd) #cmd, @@ -216,7 +217,7 @@ void ch_save(const char *args) objects.position[k].x, objects.position[k].y, objects.position[k].z, objects.scale[k]); fpackf(tfile, "Bi", Hotspot::hotspots.size()); - for (int i = 0; i < Hotspot::hotspots.size(); i++) { + 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); @@ -261,7 +262,8 @@ void ch_save(const char *args) 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 if (Person::players[j]->creature == rabbittype) { + } 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; @@ -655,7 +657,7 @@ void ch_play(const char *args) sscanf(args, "%d", &dlg); Dialog::whichdialogue = dlg; - if (Dialog::whichdialogue >= Dialog::dialogs.size()) { + if (Dialog::whichdialogue >= int(Dialog::dialogs.size())) { return; }