Merge

diff --git a/Source/ConsoleCmds.h b/Source/ConsoleCmds.h
index 0e6c0ef8816f8eef46f54ad537b4cf297fd64ce6..c78f9e1778873d0f43e34644613e70ea595801b0 100644 (file)
--- a/Source/ConsoleCmds.h
+++ b/Source/ConsoleCmds.h
@@ -28,9 +28,11 @@ DECLARE_COMMAND(belt)
 DECLARE_COMMAND(cellophane)
 DECLARE_COMMAND(funnybunny)
 DECLARE_COMMAND(wolfie)
+DECLARE_COMMAND(wolfieisgod)
 DECLARE_COMMAND(wolf)
 DECLARE_COMMAND(snowwolf)
 DECLARE_COMMAND(darkwolf)
+DECLARE_COMMAND(lizardwolf)
 DECLARE_COMMAND(white)
 DECLARE_COMMAND(brown)
 DECLARE_COMMAND(black)

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 4d7af69750c0b09c06585d07d0d4ffdab0e29ef1..5c8b4acd77ef67faaadbdaee4fe991ef27b0d20b 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -737,6 +737,11 @@ static void ch_wolfie(Game *game, const char *args)
   set_proportion(0, "1 1 1 1");
 }
 
+static void ch_wolfieisgod(Game *game, const char *args)
+{
+  ch_wolfie(game, args);
+}
+
 static void ch_wolf(Game *game, const char *args)
 {
   game->LoadTextureSave(":Data:Textures:Wolf.jpg",&player[0].skeleton.drawmodel.textureptr,1,
@@ -755,6 +760,12 @@ static void ch_darkwolf(Game *game, const char *args)
                        &player[0].skeleton.skinText[0],&player[0].skeleton.skinsize);
 }
 
+static void ch_lizardwolf(Game *game, const char *args)
+{
+  game->LoadTextureSave(":Data:Textures:Lizardwolf.jpg",&player[0].skeleton.drawmodel.textureptr,1,
+                       &player[0].skeleton.skinText[0],&player[0].skeleton.skinsize);
+}
+
 static void ch_white(Game *game, const char *args)
 {
   game->LoadTextureSave(":Data:Textures:fur.jpg",&player[0].skeleton.drawmodel.textureptr,1,