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"