Merge branch 'main' of https://github.com/githubawn/GeneralsGameCode

Author: Your Name

Core/CMakeLists.txt

@@ -14,7 +14,9 @@ target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libra
 target_include_directories(corei_main INTERFACE "Main")
 
 target_sources(corei_libraries_include PRIVATE
+    Libraries/Include/Lib/BaseType.h
     Libraries/Include/Lib/BaseTypeCore.h
+    Libraries/Include/Lib/trig.h
     Libraries/Include/rts/debug.h
     Libraries/Include/rts/profile.h
 )

Core/GameEngine/CMakeLists.txt

@@ -37,14 +37,14 @@ set(GAMEENGINE_SRC
     Include/Common/DynamicAudioEventInfo.h
 #    Include/Common/encrypt.h
 #    Include/Common/Energy.h
-#    Include/Common/Errors.h
+    Include/Common/Errors.h
     Include/Common/file.h
     Include/Common/FileSystem.h
     Include/Common/FramePacer.h
     Include/Common/FrameRateLimit.h
 #    Include/Common/FunctionLexicon.h
     Include/Common/GameAudio.h
-#    Include/Common/GameCommon.h
+    Include/Common/GameCommon.h
     Include/Common/GameDefines.h
 #    Include/Common/GameEngine.h
 #    Include/Common/GameLOD.h
@@ -54,13 +54,13 @@ set(GAMEENGINE_SRC
 #    Include/Common/GameSpyMiscPreferences.h
 #    Include/Common/GameState.h
 #    Include/Common/GameStateMap.h
-#    Include/Common/GameType.h
+    Include/Common/GameType.h
     Include/Common/GameUtility.h
 #    Include/Common/Geometry.h
 #    Include/Common/GlobalData.h
 #    Include/Common/Handicap.h
 #    Include/Common/IgnorePreferences.h
-#    Include/Common/INI.h
+    Include/Common/INI.h
 #    Include/Common/INIException.h
 #    Include/Common/KindOf.h
 #    Include/Common/LadderPreferences.h
@@ -108,17 +108,17 @@ set(GAMEENGINE_SRC
     #Include/Common/simpleplayer.h # unused
 #    Include/Common/SkirmishBattleHonors.h
 #    Include/Common/SkirmishPreferences.h
-#    Include/Common/Snapshot.h
+    Include/Common/Snapshot.h
 #    Include/Common/SparseMatchFinder.h
 #    Include/Common/SpecialPower.h
 #    Include/Common/SpecialPowerMaskType.h
 #    Include/Common/SpecialPowerType.h
 #    Include/Common/StackDump.h
 #    Include/Common/StateMachine.h
 #    Include/Common/StatsCollector.h
-#    Include/Common/STLTypedefs.h
+    Include/Common/STLTypedefs.h
     Include/Common/StreamingArchiveFile.h
-#    Include/Common/SubsystemInterface.h
+    Include/Common/SubsystemInterface.h
 #    Include/Common/SystemInfo.h
 #    Include/Common/Team.h
 #    Include/Common/Terrain.h
@@ -132,7 +132,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/UnitTimings.h
 #    Include/Common/Upgrade.h
     #Include/Common/urllaunch.h # unused
-#    Include/Common/UserPreferences.h
+    Include/Common/UserPreferences.h
 #    Include/Common/version.h
 #    Include/Common/WellKnownKeys.h
     Include/Common/WorkerProcess.h
@@ -145,7 +145,7 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/AnimateWindowManager.h
 #    Include/GameClient/CampaignManager.h
 #    Include/GameClient/CDCheck.h
-#    Include/GameClient/ChallengeGenerals.h
+    Include/GameClient/ChallengeGenerals.h
 #    Include/GameClient/ClientInstance.h
     Include/GameClient/ClientRandomValue.h
 #    Include/GameClient/Color.h
@@ -582,7 +582,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/GameMain.cpp
     Source/Common/GameUtility.cpp
 #    Source/Common/GlobalData.cpp
-#    Source/Common/INI/INI.cpp
+    Source/Common/INI/INI.cpp
 #    Source/Common/INI/INIAiData.cpp
 #    Source/Common/INI/INIAnimation.cpp
     Source/Common/INI/INIAudioEventInfo.cpp
@@ -653,10 +653,10 @@ set(GAMEENGINE_SRC
     Source/Common/System/File.cpp
     Source/Common/System/FileSystem.cpp
 #    Source/Common/System/FunctionLexicon.cpp
-#    Source/Common/System/GameCommon.cpp
+    Source/Common/System/GameCommon.cpp
     #Source/Common/System/GameMemory.cpp # is conditionally appended
     #Source/Common/System/GameMemoryInit.cpp # is conditionally appended
-#    Source/Common/System/GameType.cpp
+    Source/Common/System/GameType.cpp
 #    Source/Common/System/Geometry.cpp
 #    Source/Common/System/KindOf.cpp
 #    Source/Common/System/List.cpp
@@ -670,10 +670,10 @@ set(GAMEENGINE_SRC
 #    Source/Common/System/registry.cpp
 #    Source/Common/System/SaveGame/GameState.cpp
 #    Source/Common/System/SaveGame/GameStateMap.cpp
-#    Source/Common/System/Snapshot.cpp
+    Source/Common/System/Snapshot.cpp
 #    Source/Common/System/StackDump.cpp
     Source/Common/System/StreamingArchiveFile.cpp
-#    Source/Common/System/SubsystemInterface.cpp
+    Source/Common/System/SubsystemInterface.cpp
 #    Source/Common/System/Trig.cpp
     Source/Common/System/UnicodeString.cpp
 #    Source/Common/System/Upgrade.cpp
@@ -688,7 +688,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/Thing/Thing.cpp
 #    Source/Common/Thing/ThingFactory.cpp
 #    Source/Common/Thing/ThingTemplate.cpp
-#    Source/Common/UserPreferences.cpp
+    Source/Common/UserPreferences.cpp
 #    Source/Common/version.cpp
     Source/Common/WorkerProcess.cpp
 #    Source/GameClient/ClientInstance.cpp
@@ -710,7 +710,7 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GlobalLanguage.cpp
 #    Source/GameClient/GraphDraw.cpp
 #    Source/GameClient/GUI/AnimateWindowManager.cpp
-#    Source/GameClient/GUI/ChallengeGenerals.cpp
+    Source/GameClient/GUI/ChallengeGenerals.cpp
 #    Source/GameClient/GUI/ControlBar/ControlBar.cpp
 #    Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
 #    Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp

Core/GameEngine/Include/Common/AudioEventRTS.h

@@ -99,7 +99,7 @@ class AudioEventRTS
 	void decreaseLoopCount( void );
 	Bool hasMoreLoops( void ) const;
 
-	void setAudioEventInfo( const AudioEventInfo *eventInfo ) const;
+	void setAudioEventInfo( const AudioEventInfo *eventInfo ) const; // is mutable
 	const AudioEventInfo *getAudioEventInfo( void ) const;
 
 	void setPlayingHandle( AudioHandle handle );	// for ID of this audio piece.
@@ -141,8 +141,8 @@ class AudioEventRTS
 	Int getPlayerIndex( void ) const;
 	void setPlayerIndex( Int playerNdx );
 
-	Int getPlayingAudioIndex( void ) { return m_playingAudioIndex; };
-	void setPlayingAudioIndex( Int pai )  { m_playingAudioIndex = pai; };
+	Int getPlayingAudioIndex( void ) const { return m_playingAudioIndex; }
+	void setPlayingAudioIndex( Int pai ) const { m_playingAudioIndex = pai; } // is mutable
 
 	Bool getUninterruptible( ) const { return m_uninterruptible; }
 	void setUninterruptible( Bool uninterruptible ) { m_uninterruptible = uninterruptible; }
@@ -191,7 +191,7 @@ class AudioEventRTS
 	Real m_volumeShift;							///< Volume shift that should occur on this piece of audio
 	Real m_delay;										///< Amount to delay before playing this sound
 	Int m_loopCount;								///< The current loop count value. Only valid if this is a looping type event or the override has been set.
-	Int m_playingAudioIndex;				///< The sound index we are currently playing. In the case of non-random, we increment this to move to the next sound
+	mutable Int m_playingAudioIndex;	///< The sound index we are currently playing. In the case of non-random, we increment this to move to the next sound
 	Int m_allCount;									///< If this sound is an ALL type, then this is how many sounds we have played so far.
 
 	Int m_playerIndex;							///< The index of the player who owns this sound. Used for sounds that should have an owner, but don't have an object, etc.