X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=8138608f19f01a8c7e85a23631300f4138587ed4;hb=8607cde5d95f2f16770810063c25ae174ab1f7a8;hp=5b10d585be25f41fc7e5dbe7b2b39aef42d4d2ff;hpb=5c4dee6a92fa23796ada28e5e42dee7721230d3e;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 5b10d58..8138608 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -34,6 +34,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 using namespace std;
 
+// Added more evilness needed for MSVC
+#ifdef _MSC_VER
+	#define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n)
+	#define snprintf(buf, size, format, ...) _sprintf_p(buf, size, format)
+#endif
+
+
 extern float multiplier;
 extern XYZ viewer;
 extern int environment;
@@ -101,6 +108,7 @@ extern bool foliage;
 extern bool trilinear;
 extern bool damageeffects;
 extern bool showpoints;
+extern bool showdamagebar; // (des)activate the damage bar
 extern bool texttoggle;
 extern bool alwaysblur;
 extern float gamespeed;
@@ -737,6 +745,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 +768,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,
@@ -3098,6 +3117,9 @@ void	Game::Tick()
 				mainmenu=18;
 				keyselect = -1;
 			}
+			if(Button() && !oldbutton && selected == 13) {
+				showdamagebar=!showdamagebar;
+			}
 			if(Button()&&!oldbutton&&selected==8){
 				float gLoc[3]={0,0,0};
 				float vel[3]={0,0,0};
@@ -3694,10 +3716,8 @@ void	Game::Tick()
 				flashamount=1;
 				flashdelay=1;
 
-				if ( stereomode != newstereomode ) {
-					stereomode = newstereomode;
-					InitStereo(stereomode);
-				}
+				stereomode = newstereomode;
+				InitStereo(stereomode);
 				
 				mainmenu=3;
 			}