From 18af587c75c64064f36ff42d9d905de90a065ec5 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 28 Nov 2013 16:06:51 +0000
Subject: [PATCH] - Bugfix: Fixed initialization error of enemy taunts. The
 file was not found in the new location
 (TableData\EnemyTaunts\EnemyTaunts.xml), because the game looked in the old
 one (TableData\EnemyTaunts.xml)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6662 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Init.cpp       | 3 +++
 Tactical/XML.h | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Init.cpp b/Init.cpp
index ea1c0fd4..2e46feb1 100644
--- a/Init.cpp
+++ b/Init.cpp
@@ -1027,10 +1027,12 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 		GETFILESTRUCT FileInfo;
 		char tauntFileNamePattern[MAX_PATH];
 		strcpy(tauntFileNamePattern, directoryName);
+		strcat(tauntFileNamePattern, TAUNTSFOLDERNAME);
 		strcat(tauntFileNamePattern, TAUNTSFILENAMEBEGINNING"*"TAUNTSFILENAMEENDING);
 		if( GetFileFirst(tauntFileNamePattern, &FileInfo) )
 		{
 			strcpy(fileName, directoryName);
+			strcat(fileName, TAUNTSFOLDERNAME);
 			strcat(fileName, FileInfo.zFileName);
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
@@ -1045,6 +1047,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
 			while( GetFileNext(&FileInfo) )
 			{
 				strcpy(fileName, directoryName);
+				strcat(fileName, TAUNTSFOLDERNAME);
 				strcat(fileName, FileInfo.zFileName);
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 				SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
diff --git a/Tactical/XML.h b/Tactical/XML.h
index 46513251..a1e7ae2d 100644
--- a/Tactical/XML.h
+++ b/Tactical/XML.h
@@ -237,8 +237,10 @@ typedef PARSE_STAGE;
 #define VEHICLESFILENAME						"Vehicles.xml"
 #define SQUADNAMEFILENAME						"SquadNames.xml"
 #define BACKGROUNDSFILENAME						"Backgrounds.xml"
+
+#define TAUNTSFOLDERNAME						"EnemyTaunts\\"
 #define TAUNTSFILENAME							"EnemyTaunts.xml"
-#define TAUNTSFILENAMEBEGINNING					"EnemyTaunts\\EnemyTaunts"
+#define TAUNTSFILENAMEBEGINNING					"EnemyTaunts"		// You can add additional taunt files next to the "EnemyTaunts.xml" file. They have to start with "EnemyTaunts*.xml" (e.g: EnemyTauntsKill.xml)
 #define TAUNTSFILENAMEENDING					".xml"
 
 #define ENEMY_ADMIN_PROFILE_FILENAME			"Profiles\\SoldierProfileEnemyAdmin.xml"