Merge branch 'main' into fix_airfield_takeoff_order

Author: Caball009

Core/GameEngine/CMakeLists.txt

@@ -3,14 +3,14 @@ set(GAMEENGINE_SRC
 #    Include/Common/ActionManager.h
     Include/Common/ArchiveFile.h
     Include/Common/ArchiveFileSystem.h
-#    Include/Common/AsciiString.h
-#    Include/Common/AudioAffect.h
-#    Include/Common/AudioEventInfo.h
-#    Include/Common/AudioEventRTS.h
-#    Include/Common/AudioHandleSpecialValues.h
-#    Include/Common/AudioRandomValue.h
-#    Include/Common/AudioRequest.h
-#    Include/Common/AudioSettings.h
+    Include/Common/AsciiString.h
+    Include/Common/AudioAffect.h
+    Include/Common/AudioEventInfo.h
+    Include/Common/AudioEventRTS.h
+    Include/Common/AudioHandleSpecialValues.h
+    Include/Common/AudioRandomValue.h
+    Include/Common/AudioRequest.h
+    Include/Common/AudioSettings.h
 #    Include/Common/BattleHonors.h
 #    Include/Common/BezFwdIterator.h
 #    Include/Common/BezierSegment.h
@@ -33,21 +33,21 @@ set(GAMEENGINE_SRC
 #    Include/Common/DisabledTypes.h
 #    Include/Common/DiscreteCircle.h
 #    Include/Common/DrawModule.h
-#    Include/Common/DynamicAudioEventInfo.h
+    Include/Common/DynamicAudioEventInfo.h
 #    Include/Common/encrypt.h
 #    Include/Common/Energy.h
 #    Include/Common/Errors.h
     Include/Common/file.h
     Include/Common/FileSystem.h
 #    Include/Common/FunctionLexicon.h
-#    Include/Common/GameAudio.h
+    Include/Common/GameAudio.h
 #    Include/Common/GameCommon.h
     Include/Common/GameDefines.h
 #    Include/Common/GameEngine.h
 #    Include/Common/GameLOD.h
 #    Include/Common/GameMemory.h
-#    Include/Common/GameMusic.h
-#    Include/Common/GameSounds.h
+    Include/Common/GameMusic.h
+    Include/Common/GameSounds.h
 #    Include/Common/GameSpyMiscPreferences.h
 #    Include/Common/GameState.h
 #    Include/Common/GameStateMap.h
@@ -69,7 +69,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/MapReaderWriterInfo.h
 #    Include/Common/MessageStream.h
 #    Include/Common/MiniLog.h
-#    Include/Common/MiscAudio.h
+    Include/Common/MiscAudio.h
 #    Include/Common/MissionStats.h
 #    Include/Common/ModelState.h
 #    Include/Common/Module.h
@@ -100,7 +100,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/Science.h
 #    Include/Common/ScopedMutex.h
 #    Include/Common/ScoreKeeper.h
-#    Include/Common/simpleplayer.h
+    #Include/Common/simpleplayer.h # unused
 #    Include/Common/SkirmishBattleHonors.h
 #    Include/Common/SkirmishPreferences.h
 #    Include/Common/Snapshot.h
@@ -124,10 +124,10 @@ set(GAMEENGINE_SRC
 #    Include/Common/ThingSort.h
 #    Include/Common/ThingTemplate.h
 #    Include/Common/TunnelTracker.h
-#    Include/Common/UnicodeString.h
+    Include/Common/UnicodeString.h
 #    Include/Common/UnitTimings.h
 #    Include/Common/Upgrade.h
-#    Include/Common/urllaunch.h
+    #Include/Common/urllaunch.h # unused
 #    Include/Common/UserPreferences.h
 #    Include/Common/version.h
 #    Include/Common/WellKnownKeys.h
@@ -552,12 +552,12 @@ set(GAMEENGINE_SRC
 #    Include/GameNetwork/WOLBrowser/FEBDispatch.h
 #    Include/GameNetwork/WOLBrowser/WebBrowser.h
 #    Include/Precompiled/PreRTS.h
-#    Source/Common/Audio/AudioEventRTS.cpp
-#    Source/Common/Audio/AudioRequest.cpp
-#    Source/Common/Audio/DynamicAudioEventInfo.cpp
-#    Source/Common/Audio/GameAudio.cpp
-#    Source/Common/Audio/GameMusic.cpp
-#    Source/Common/Audio/GameSounds.cpp
+    Source/Common/Audio/AudioEventRTS.cpp
+    Source/Common/Audio/AudioRequest.cpp
+    Source/Common/Audio/DynamicAudioEventInfo.cpp
+    Source/Common/Audio/GameAudio.cpp
+    Source/Common/Audio/GameMusic.cpp
+    Source/Common/Audio/GameSounds.cpp
     #Source/Common/Audio/simpleplayer.cpp # unused
     #Source/Common/Audio/urllaunch.cpp # unused
 #    Source/Common/Bezier/BezFwdIterator.cpp
@@ -576,7 +576,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/INI/INI.cpp
 #    Source/Common/INI/INIAiData.cpp
 #    Source/Common/INI/INIAnimation.cpp
-#    Source/Common/INI/INIAudioEventInfo.cpp
+    Source/Common/INI/INIAudioEventInfo.cpp
 #    Source/Common/INI/INICommandButton.cpp
 #    Source/Common/INI/INICommandSet.cpp
 #    Source/Common/INI/INIControlBarScheme.cpp
@@ -587,7 +587,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/INI/INIMapCache.cpp
 #    Source/Common/INI/INIMapData.cpp
 #    Source/Common/INI/INIMappedImage.cpp
-#    Source/Common/INI/INIMiscAudio.cpp
+    Source/Common/INI/INIMiscAudio.cpp
 #    Source/Common/INI/INIModel.cpp
 #    Source/Common/INI/INIMultiplayer.cpp
 #    Source/Common/INI/INIObject.cpp
@@ -632,7 +632,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/StatsCollector.cpp
     Source/Common/System/ArchiveFile.cpp
     Source/Common/System/ArchiveFileSystem.cpp
-#    Source/Common/System/AsciiString.cpp
+    Source/Common/System/AsciiString.cpp
 #    Source/Common/System/BuildAssistant.cpp
 #    Source/Common/System/CDManager.cpp
 #    Source/Common/System/CriticalSection.cpp
@@ -665,7 +665,7 @@ set(GAMEENGINE_SRC
     Source/Common/System/StreamingArchiveFile.cpp
 #    Source/Common/System/SubsystemInterface.cpp
 #    Source/Common/System/Trig.cpp
-#    Source/Common/System/UnicodeString.cpp
+    Source/Common/System/UnicodeString.cpp
 #    Source/Common/System/Upgrade.cpp
     Source/Common/System/Xfer.cpp
     Source/Common/System/XferCRC.cpp
@@ -815,7 +815,7 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/Statistics.cpp
 #    Source/GameClient/System/Anim2D.cpp
 #    Source/GameClient/System/CampaignManager.cpp
-#    "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
+    Source/GameClient/System/Debug/AudioDebugDisplay.cpp
 #    Source/GameClient/System/DebugDisplay.cpp
 #    Source/GameClient/System/Image.cpp
 #    Source/GameClient/System/ParticleSys.cpp

…/GameEngine/Include/Common/AsciiString.h …/GameEngine/Include/Common/AsciiString.hGeneralsMD/Code/GameEngine/Include/Common/AsciiString.h renamed to Core/GameEngine/Include/Common/AsciiString.h GeneralsMD/Code/GameEngine/Include/Common/AsciiString.h renamed to Core/GameEngine/Include/Common/AsciiString.h

@@ -35,8 +35,19 @@
 
 enum { MAX_HW_PROVIDERS = 4 };
 
+// TheSuperHackers @tweak xezon 23/07/2025 Adds setting to modify the volume of money deposit and withdraw sounds
+
 struct AudioSettings
 {
+	AudioSettings()
+#if RTS_GENERALS
+		: m_defaultMoneyTransactionVolume(1.0f)
+#elif RTS_ZEROHOUR
+		: m_defaultMoneyTransactionVolume(0.0f) // Uses zero volume by default because originally the money sounds did not work in Zero Hour
+#endif
+	{
+	}
+
 	AsciiString m_audioRoot;
 	AsciiString m_soundsFolder;
 	AsciiString m_musicFolder;
@@ -66,6 +77,7 @@ struct AudioSettings
 	Real m_default3DSoundVolume;
 	Real m_defaultSpeechVolume;
 	Real m_defaultMusicVolume;
+	Real m_defaultMoneyTransactionVolume;
 	UnsignedInt m_defaultSpeakerType2D;
 	UnsignedInt m_defaultSpeakerType3D;
 
@@ -74,6 +86,7 @@ struct AudioSettings
 	Real m_preferred3DSoundVolume;
 	Real m_preferredSpeechVolume;
 	Real m_preferredMusicVolume;
+	Real m_preferredMoneyTransactionVolume;
 
 	//The desired altitude of the microphone to improve panning relative to terrain.
 	Real m_microphoneDesiredHeightAboveTerrain;