From: Côme Chilliet <come@chilliet.eu>
Date: Fri, 3 Feb 2017 23:58:10 +0000 (+0100)
Subject: Merge branch 'master' of gitlab.com:osslugaru/lugaru
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=58e2a577c2ea4cf639a07fc792122c288d4bc2a5;p=lugaru.git

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

58e2a577c2ea4cf639a07fc792122c288d4bc2a5
diff --cc Source/GameTick.cpp
index 82b75e5,a9cf0bf..a0bb4b3
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@@ -1233,15 -1245,25 +1232,15 @@@ void Game::ProcessDevInput(
                      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]->proportionhead = 1.1;
 -                    Person::players[closest]->proportionbody = 1.1;
 -                    Person::players[closest]->proportionarms = 1.1;
 -                    Person::players[closest]->proportionlegs = 1.1;
+                     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]->proportionhead = 1.2;
 -                    Person::players[closest]->proportionbody = 1.05;
 -                    Person::players[closest]->proportionarms = 1.00;
 -                    Person::players[closest]->proportionlegs.x = 1.1;
 -                    Person::players[closest]->proportionlegs.y = 1.05;
+                     Person::players[closest]->scale /= 1.15;
  
                      Person::players[closest]->damagetolerance = 200;
                  }