From: Vadim Trochinsky <vadim.trochinsky@gmail.com>
Date: Sun, 23 May 2010 18:54:11 +0000 (+0400)
Subject: Merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=c0a6dc9211fd7855250be34151a70ec4bceb5126;hp=8429a5ba7c063e1834a63a963ff6ed5bdac6a9cf;p=lugaru.git

Merge
---

diff --git a/Source/ConsoleCmds.h b/Source/ConsoleCmds.h
index 0e6c0ef..c78f9e1 100644
--- 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 4d7af69..5c8b4ac 100644
--- 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,