Index: Init.cpp
===================================================================
--- Init.cpp	(revision 6638)
+++ Init.cpp	(working copy)
@@ -1018,20 +1018,42 @@
 #endif
 
 	// Externalised taunts
-	strcpy(fileName, directoryName);
-	strcat(fileName, TAUNTSFILENAME);
-	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-	SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), TAUNTSFILENAME);
-
-#ifndef ENGLISH
-	AddLanguagePrefix(fileName);
-	if ( FileExists(fileName) )
+	GETFILESTRUCT FileInfo;
+	char tauntFileNamePattern[MAX_PATH];
+	strcpy(tauntFileNamePattern, directoryName);
+	strcat(tauntFileNamePattern, TAUNTSFILENAMEBEGINNING"*"TAUNTSFILENAMEENDING);
+	if( GetFileFirst(tauntFileNamePattern, &FileInfo) )
 	{
+		strcpy(fileName, directoryName);
+		strcat(fileName, FileInfo.zFileName);
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), TAUNTSFILENAME);
+		SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
+#ifndef ENGLISH
+		AddLanguagePrefix(fileName);
+		if ( FileExists(fileName) )
+		{
+			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+			SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
+		}
+#endif
+		while( GetFileNext(&FileInfo) )
+		{
+			strcpy(fileName, directoryName);
+			strcat(fileName, FileInfo.zFileName);
+			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+			SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
+#ifndef ENGLISH
+			AddLanguagePrefix(fileName);
+			if ( FileExists(fileName) )
+			{
+				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+				SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
+			}
+#endif
+		}
+		GetFileClose(&FileInfo);
 	}
-#endif
-	
+
 	// IMP Portraits List by Jazz
 	strcpy(fileName, directoryName);
 	strcat(fileName, IMPPORTRAITS);
Index: Tactical/XML.h
===================================================================
--- Tactical/XML.h	(revision 6638)
+++ Tactical/XML.h	(working copy)
@@ -238,6 +238,8 @@
 #define SQUADNAMEFILENAME						"SquadNames.xml"
 #define BACKGROUNDSFILENAME						"Backgrounds.xml"
 #define TAUNTSFILENAME							"EnemyTaunts.xml"
+#define TAUNTSFILENAMEBEGINNING					"EnemyTaunts"
+#define TAUNTSFILENAMEENDING					".xml"
 
 #define ENEMY_ADMIN_PROFILE_FILENAME			"Profiles\\SoldierProfileEnemyAdmin.xml"
 #define ENEMY_REGULAR_PROFILE_FILENAME			"Profiles\\SoldierProfileEnemyRegular.xml"
Index: Tactical/XML_Taunts.cpp
===================================================================
--- Tactical/XML_Taunts.cpp	(revision 6638)
+++ Tactical/XML_Taunts.cpp	(working copy)
@@ -272,8 +272,8 @@
 						pData->curTaunt.uiFlags2 |= TAUNT_C_VETERAN;
 					}
 
-					//pData->curArray[pData->curTaunt.uiIndex] = pData->curTaunt;
-					pData->curArray[num_found_taunt-1] = pData->curTaunt;
+					pData->curArray[pData->curTaunt.uiIndex] = pData->curTaunt;
+					//pData->curArray[num_found_taunt-1] = pData->curTaunt;
 				}
 			}	
 			num_found_taunt++;
@@ -962,7 +962,7 @@
 
 
 	memset(&pData,0,sizeof(pData));
-	pData.curArray = zTaunt;
+	pData.curArray = &(zTaunt[num_found_taunt]);
 	pData.maxArraySize = NUM_TAUNT;
 
 	XML_SetUserData(parser, &pData);

Index: ja2_v1.13/Build/Init.cpp
===================================================================
--- ja2_v1.13/Build/Init.cpp	(revision 6638)
+++ ja2_v1.13/Build/Init.cpp	(working copy)
@@ -1018,20 +1018,42 @@
 #endif
 
 	// Externalised taunts
-	strcpy(fileName, directoryName);
-	strcat(fileName, TAUNTSFILENAME);
-	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-	SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), TAUNTSFILENAME);
-
-#ifndef ENGLISH
-	AddLanguagePrefix(fileName);
-	if ( FileExists(fileName) )
+	GETFILESTRUCT FileInfo;
+	char tauntFileNamePattern[MAX_PATH];
+	strcpy(tauntFileNamePattern, directoryName);
+	strcat(tauntFileNamePattern, TAUNTSFILENAMEBEGINNING"*"TAUNTSFILENAMEENDING);
+	if( GetFileFirst(tauntFileNamePattern, &FileInfo) )
 	{
+		strcpy(fileName, directoryName);
+		strcat(fileName, FileInfo.zFileName);
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-		SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), TAUNTSFILENAME);
+		SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
+#ifndef ENGLISH
+		AddLanguagePrefix(fileName);
+		if ( FileExists(fileName) )
+		{
+			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+			SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
+		}
+#endif
+		while( GetFileNext(&FileInfo) )
+		{
+			strcpy(fileName, directoryName);
+			strcat(fileName, FileInfo.zFileName);
+			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+			SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
+#ifndef ENGLISH
+			AddLanguagePrefix(fileName);
+			if ( FileExists(fileName) )
+			{
+				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
+				SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
+			}
+#endif
+		}
+		GetFileClose(&FileInfo);
 	}
-#endif
-	
+
 	// IMP Portraits List by Jazz
 	strcpy(fileName, directoryName);
 	strcat(fileName, IMPPORTRAITS);
Index: ja2_v1.13/Build/Tactical/Civ Quotes.cpp
===================================================================
--- ja2_v1.13/Build/Tactical/Civ Quotes.cpp	(revision 6638)
+++ ja2_v1.13/Build/Tactical/Civ Quotes.cpp	(working copy)
@@ -1047,7 +1047,7 @@
 //--------------------------------------------------------------
 
 // anv: start enemy taunt with probabilty depending on taunt settings
-void PossiblyStartEnemyTaunt( SOLDIERTYPE *pCiv, INT8 iTauntType, SOLDIERTYPE *pTarget )
+void PossiblyStartEnemyTaunt( SOLDIERTYPE *pCiv, TAUNTTYPE iTauntType, SOLDIERTYPE *pTarget )
 {
 	// taunts disabled?
 	if( gGameSettings.fOptions[TOPTION_ALLOW_TAUNTS] == FALSE )
@@ -1243,7 +1243,7 @@
 }
 
 // SANDRO - soldier taunts 
-void StartEnemyTaunt( SOLDIERTYPE *pCiv, INT8 iTauntType, SOLDIERTYPE *pTarget )
+void StartEnemyTaunt( SOLDIERTYPE *pCiv, TAUNTTYPE iTauntType, SOLDIERTYPE *pTarget )
 {
 	UINT16	iTauntNumber;
 	CHAR16	sTauntText[320];	
Index: ja2_v1.13/Build/Tactical/Civ Quotes.h
===================================================================
--- ja2_v1.13/Build/Tactical/Civ Quotes.h	(revision 6638)
+++ ja2_v1.13/Build/Tactical/Civ Quotes.h	(working copy)
@@ -74,7 +74,7 @@
 	NUM_CIV_QUOTES
 };
 
-enum //enemy taunts - SANDRO
+enum TAUNTTYPE//enemy taunts - SANDRO
 {
 	// actions
 	TAUNT_FIRE_GUN,
@@ -154,8 +154,8 @@
 	TAUNT_RIPOSTE	
 };
 
-void PossiblyStartEnemyTaunt( SOLDIERTYPE *pCiv, INT8 iTauntType, SOLDIERTYPE *pTarget = NULL );
-void StartEnemyTaunt( SOLDIERTYPE *pCiv, INT8 iTauntType, SOLDIERTYPE *pTarget = NULL ); //enemy taunts - SANDRO // anv: added pTarget argument
+void PossiblyStartEnemyTaunt( SOLDIERTYPE *pCiv, TAUNTTYPE iTauntType, SOLDIERTYPE *pTarget = NULL );
+void StartEnemyTaunt( SOLDIERTYPE *pCiv, TAUNTTYPE iTauntType, SOLDIERTYPE *pTarget = NULL ); //enemy taunts - SANDRO // anv: added pTarget argument
 void ShowTauntPopupBox( SOLDIERTYPE *pCiv, STR16 gzTauntQuote );
 
 void InitCivQuoteSystem( );
Index: ja2_v1.13/Build/Tactical/Interface.h
===================================================================
--- ja2_v1.13/Build/Tactical/Interface.h	(revision 6638)
+++ ja2_v1.13/Build/Tactical/Interface.h	(working copy)
@@ -206,7 +206,7 @@
 extern UINT16 num_found_background;		// the correct number is set on reading the xml
 
 // anv: enums for externalised taunts
-enum {
+enum TAUNTPROPERTY{
 
 	// progress
 	TAUNT_PROGRESS_LT,
Index: ja2_v1.13/Build/Tactical/Soldier Control.cpp
===================================================================
--- ja2_v1.13/Build/Tactical/Soldier Control.cpp	(revision 6638)
+++ ja2_v1.13/Build/Tactical/Soldier Control.cpp	(working copy)
@@ -5917,30 +5917,30 @@
 				}
 			}
 			DecayIndividualOpplist( this );
-			PossiblyStartEnemyTaunt( this, TAUNT_S_GOT_BLINDED, MercPtrs[ubAttackerID]);
-			PossiblyStartEnemyTaunt( this, TAUNT_S_GOT_DEAFENED, MercPtrs[ubAttackerID]);
+			PossiblyStartEnemyTaunt( this, TAUNT_GOT_BLINDED, MercPtrs[ubAttackerID]);
+			PossiblyStartEnemyTaunt( this, TAUNT_GOT_DEAFENED, MercPtrs[ubAttackerID]);
 			break;
 
 		case FIRE_WEAPON_BLINDED:
-			PossiblyStartEnemyTaunt( this, TAUNT_S_GOT_BLINDED, MercPtrs[ubAttackerID]);
+			PossiblyStartEnemyTaunt( this, TAUNT_GOT_BLINDED, MercPtrs[ubAttackerID]);
 			break;
 
 		case FIRE_WEAPON_DEAFENED:
 			//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Soldier is deafened" );		
 			this->bDeafenedCounter = bDeafValue;
-			PossiblyStartEnemyTaunt( this, TAUNT_S_GOT_DEAFENED, MercPtrs[ubAttackerID]);
+			PossiblyStartEnemyTaunt( this, TAUNT_GOT_DEAFENED, MercPtrs[ubAttackerID]);
 			break;
 		};
 
 		if ( usWeaponIndex == STRUCTURE_EXPLOSION )
 		{
 			ubReason = TAKE_DAMAGE_STRUCTURE_EXPLOSION;
-			PossiblyStartEnemyTaunt( this, TAUNT_S_GOT_HIT_STRUCTURE_EXPLOSION, MercPtrs[ubAttackerID]);
+			PossiblyStartEnemyTaunt( this, TAUNT_GOT_HIT_STRUCTURE_EXPLOSION, MercPtrs[ubAttackerID]);
 		}
 		else
 		{
 			ubReason = TAKE_DAMAGE_EXPLOSION;
-			PossiblyStartEnemyTaunt( this, TAUNT_S_GOT_HIT_EXPLOSION, MercPtrs[ubAttackerID]);
+			PossiblyStartEnemyTaunt( this, TAUNT_GOT_HIT_EXPLOSION, MercPtrs[ubAttackerID]);
 		}
 	}
 	else
Index: ja2_v1.13/Build/Tactical/XML.h
===================================================================
--- ja2_v1.13/Build/Tactical/XML.h	(revision 6638)
+++ ja2_v1.13/Build/Tactical/XML.h	(working copy)
@@ -238,6 +238,8 @@
 #define SQUADNAMEFILENAME						"SquadNames.xml"
 #define BACKGROUNDSFILENAME						"Backgrounds.xml"
 #define TAUNTSFILENAME							"EnemyTaunts.xml"
+#define TAUNTSFILENAMEBEGINNING					"EnemyTaunts"
+#define TAUNTSFILENAMEENDING					".xml"
 
 #define ENEMY_ADMIN_PROFILE_FILENAME			"Profiles\\SoldierProfileEnemyAdmin.xml"
 #define ENEMY_REGULAR_PROFILE_FILENAME			"Profiles\\SoldierProfileEnemyRegular.xml"
Index: ja2_v1.13/Build/Tactical/XML_Taunts.cpp
===================================================================
--- ja2_v1.13/Build/Tactical/XML_Taunts.cpp	(revision 6638)
+++ ja2_v1.13/Build/Tactical/XML_Taunts.cpp	(working copy)
@@ -21,7 +21,7 @@
 	UINT32			currentDepth;
 	UINT32			maxReadDepth;
 }
-typedef enemyRankParseData;
+typedef tauntParseData;
 
 BOOLEAN localizedTextOnly_Taunts;
 
@@ -30,7 +30,7 @@
 static void XMLCALL
 tauntStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
 {
-	enemyRankParseData * pData = (enemyRankParseData *)userData;
+	tauntParseData * pData = (tauntParseData *)userData;
 
 	if(pData->currentDepth <= pData->maxReadDepth) //are we reading this element?
 	{
@@ -202,7 +202,7 @@
 static void XMLCALL
 tauntCharacterDataHandle(void *userData, const XML_Char *str, int len)
 {
-	enemyRankParseData * pData = (enemyRankParseData *)userData;
+	tauntParseData * pData = (tauntParseData *)userData;
 
 	if( (pData->currentDepth <= pData->maxReadDepth) &&
 		(strlen(pData->szCharData) < MAX_CHAR_DATA_LENGTH)
@@ -214,7 +214,7 @@
 static void XMLCALL
 tauntEndElementHandle(void *userData, const XML_Char *name)
 {
-	enemyRankParseData * pData = (enemyRankParseData *)userData;
+	tauntParseData * pData = (tauntParseData *)userData;
 
 	if(pData->currentDepth <= pData->maxReadDepth) 
 	{
@@ -272,8 +272,8 @@
 						pData->curTaunt.uiFlags2 |= TAUNT_C_VETERAN;
 					}
 
-					//pData->curArray[pData->curTaunt.uiIndex] = pData->curTaunt;
-					pData->curArray[num_found_taunt-1] = pData->curTaunt;
+					pData->curArray[pData->curTaunt.uiIndex] = pData->curTaunt;
+					//pData->curArray[num_found_taunt-1] = pData->curTaunt;
 				}
 			}	
 			num_found_taunt++;
@@ -931,7 +931,7 @@
 	CHAR8 *		lpcBuffer;
 	XML_Parser	parser = XML_ParserCreate(NULL);
 
-	enemyRankParseData pData;
+	tauntParseData pData;
 
 	DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading EnemyTaunts.xml" );
 
@@ -962,7 +962,7 @@
 
 
 	memset(&pData,0,sizeof(pData));
-	pData.curArray = zTaunt;
+	pData.curArray = &(zTaunt[num_found_taunt]);
 	pData.maxArraySize = NUM_TAUNT;
 
 	XML_SetUserData(parser, &pData);