[GEN] Backport all Audio changes, incl. localization lookup changes in AudioEventRTS from Zero Hour (#1330)

Author: xezon

Generals/Code/GameEngine/Include/Common/GameAudio.h

@@ -316,6 +316,7 @@ class AudioManager : public SubsystemInterface
 
 		// For tracking purposes
 		virtual AudioHandle allocateNewHandle( void );	
+
     // Remove all AudioEventInfo's with the m_isLevelSpecific flag
     virtual void removeLevelSpecificAudioEventInfos( void );
 

Generals/Code/GameEngine/Include/Common/MiscAudio.h

@@ -69,8 +69,11 @@ struct MiscAudio
 	AudioEventRTS m_crateMoney;														///< When money crate is picked up.
 	AudioEventRTS m_unitPromoted;													///< Unit is promoted.
 	AudioEventRTS m_repairSparks;													///< Battle drone repairs unit.
+	AudioEventRTS m_sabotageShutDownBuilding;											///< When Saboteur hits a building 
+	AudioEventRTS m_sabotageResetTimerBuilding;											///< When Saboteur hits a building 
 	AudioEventRTS m_aircraftWheelScreech;									///< When a jet lands on a runway.
 };
 
 
-#endif /* _MISCAUDIO_H_ */
+#endif /* _MISCAUDIO_H_ */
+

Generals/Code/GameEngine/Source/Common/Audio/AudioEventRTS.cpp

@@ -800,20 +800,23 @@ AsciiString AudioEventRTS::generateFilenameExtension( AudioType audioTypeToPlay
 //-------------------------------------------------------------------------------------------------
 void AudioEventRTS::adjustForLocalization(AsciiString &strToAdjust)
 {
-	if (TheFileSystem->doesFileExist(strToAdjust.str()))
-	{
-		return;
-	}
-
 	const char *str = strToAdjust.reverseFind('\\');
 	if (!str) {
 		return;
 	}
 
+	// try the localized version first so that we're guarenteed to get it
+	// even if the generic data directory holds a version of the file
+	AsciiString localizedFilePath = generateFilenamePrefix(m_eventInfo->m_soundType, TRUE);
 	AsciiString filename = str;
+	localizedFilePath.concat(filename);
+
+	if (TheFileSystem->doesFileExist(localizedFilePath.str())) {
+		strToAdjust = localizedFilePath;
+	}
+	// else there was no localized version, so leave the path we received unchanged
 
-	strToAdjust = generateFilenamePrefix(m_eventInfo->m_soundType, TRUE);
-	strToAdjust.concat(filename);
+	return;
 }
 
 //-------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Source/Common/INI/INIMiscAudio.cpp

@@ -63,7 +63,9 @@ const FieldParse MiscAudio::m_fieldParseTable[] =
 	{ "CrateMoney",														INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_crateMoney ) },
 	{ "UnitPromoted",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_unitPromoted ) },
 	{ "RepairSparks",													INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_repairSparks ) },
-	{ "AircraftWheelScreech",									INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_aircraftWheelScreech ) },
+	{ "SabotageShutDownBuilding",							INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_sabotageShutDownBuilding ) },
+	{ "SabotageResetTimeBuilding",						INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_sabotageResetTimerBuilding ) },
+  { "AircraftWheelScreech",									INI::parseAudioEventRTS, NULL, offsetof( MiscAudio, m_aircraftWheelScreech ) },
 
 	{ 0, 0, 0, 0 }
 };