Merge branch 'master' of gitlab.com:osslugaru/lugaru

diff --git a/Docs/DEVTOOLS.txt b/Docs/DEVTOOLS.txt
index 46916a012fc7d14db1db03025afedb0a64000dca..db82aac66f627560eb50e46455b7a3b6cde8100b 100644 (file)
--- a/Docs/DEVTOOLS.txt
+++ b/Docs/DEVTOOLS.txt
@@ -87,7 +87,7 @@ save (string) - saves the state of the current map.
 Character attributes
 ~~~~~~~~~~~~~~~~~~~~
 
-wolfieisgod - sets the player to a wolf. You gain all of the speed, strength,
+wolfie - sets the player to a wolf. You gain all of the speed, strength,
     durability, and attacks of a wolf.
 funnybunny - sets the player to a rabbit.
 size (float) - changes the overall size of your character.

diff --git a/Source/Devtools/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp
index 16effbdfd0b03d1df9378bdca892418d1ca51f85..84252e3040a92a84943bb0a30411550d9092cb97 100644 (file)
--- a/Source/Devtools/ConsoleCmds.cpp
+++ b/Source/Devtools/ConsoleCmds.cpp
@@ -462,15 +462,11 @@ void ch_wolfie(const char*)
 {
     Person::players[0]->creature = wolftype;
     Person::players[0]->skeletonLoad();
+    Person::players[0]->scale = .23;
     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*)
 {
     Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize);

diff --git a/Source/Devtools/ConsoleCmds.def b/Source/Devtools/ConsoleCmds.def
index 0c058c4340a32a1afdf97341a3eb939e3845f634..162636e06c12d12bbe762a939b1b4006d14a0c5c 100644 (file)
--- a/Source/Devtools/ConsoleCmds.def
+++ b/Source/Devtools/ConsoleCmds.def
@@ -48,7 +48,6 @@ DECLARE_COMMAND(belt)
 DECLARE_COMMAND(cellophane)
 DECLARE_COMMAND(funnybunny)
 DECLARE_COMMAND(wolfie)
-DECLARE_COMMAND(wolfieisgod)
 DECLARE_COMMAND(wolf)
 DECLARE_COMMAND(snowwolf)
 DECLARE_COMMAND(darkwolf)

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 82b75e54eb693d47db5ced0fc44bb3b01ca0d632..a0bb4b3928dddfc767f48ef7ed760dcdd9a4c267 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -1227,21 +1227,20 @@ void Game::ProcessDevInput()
                 closest = findClosestPlayer();
             }
 
-            // FIXME: Those proportions are buggy
             if (closest >= 0) {
                 if (Person::players[closest]->creature == rabbittype) {
                     Person::players[closest]->creature = wolftype;
                     Person::players[closest]->whichskin = 0;
                     Person::players[closest]->skeletonLoad();
-                    Person::players[closest]->scale = .23 * 5 * Person::players[0]->scale;
+                    Person::players[closest]->scale *= 1.15;
 
                     Person::players[closest]->damagetolerance = 300;
-                } else {
+                } else { // wolftype
                     Person::players[closest]->creature = rabbittype;
                     Person::players[closest]->whichskin = 0;
                     Person::players[closest]->skeletonLoad(true);
 
-                    Person::players[closest]->scale = .2 * 5 * Person::players[0]->scale;
+                    Person::players[closest]->scale /= 1.15;
 
                     Person::players[closest]->damagetolerance = 200;
                 }