From 79874daf97233890c85211affc9cad64ed682d2a Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 19 Apr 2013 21:20:53 +0000 Subject: [PATCH] - Fix: compilation - Fix: zombie name generation git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6021 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- .../ModularizedTacticalAI_VS2010.vcxproj | 3 +- ...dularizedTacticalAI_VS2010.vcxproj.filters | 30 +++++++++++++++++++ Tactical/Rotting Corpses.cpp | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj b/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj index 3486aed5..819fa554 100644 --- a/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj +++ b/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj @@ -84,6 +84,7 @@ Level3 EditAndContinue ..\.;.\.;.\ext\VFS\include;..\ext\VFS\include;..\Utils;.\Utils;..\TileEngine;.\TileEngine;..\TacticalAI;.\TacticalAI;..\ModularizedTacticalAI;.\ModularizedTacticalAI;..\Tactical;.\Tactical;..\Strategic;.\Strategic;..\Standard Gaming Platform;.\Standard Gaming Platform;..\Res;.\Res;..\lua;.\lua;..\Laptop;.\Laptop;..\Multiplayer;.\Multiplayer;..\Multiplayer\raknet;.\Multiplayer\raknet;..\Editor;.\Editor;..\Console;.\Console;.\ext\libpng;..\ext\libpng;.\ext\zlib;..\ext\zlib;;$(NOINHERIT) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true @@ -156,4 +157,4 @@ - + \ No newline at end of file diff --git a/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj.filters b/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj.filters index 3184f181..3ecc12b1 100644 --- a/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj.filters +++ b/ModularizedTacticalAI/ModularizedTacticalAI_VS2010.vcxproj.filters @@ -16,6 +16,24 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -39,6 +57,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp index 1d720ab5..cdbafa62 100644 --- a/Tactical/Rotting Corpses.cpp +++ b/Tactical/Rotting Corpses.cpp @@ -2324,9 +2324,11 @@ BOOLEAN AddCorpseFromObject(OBJECTTYPE* pObj, INT32 sGridNo, INT8 bLevel ) Corpse.fHeadTaken = FALSE; Corpse.ubAIWarningValue = 20; +#ifdef ENABLE_ZOMBIES // Flugente: use zombie name (it's the only way this will ever be relevant again anyway) swprintf( Corpse.name, TacticalStr[ ZOMBIE_TEAM_MERC_NAME ] ); Corpse.name[9] = '\0'; +#endif INT32 iCorpseID = AddRottingCorpse( &Corpse );