Merge branch 'TheSuperHackers:main' into feature/unlimited-zoom-terrain

githubawn · web-flow · commit ddf9d6da9e84 · 2026-02-05T15:53:42.000-08:00
diff --git a/Core/GameEngine/Include/Common/GameAudio.h b/Core/GameEngine/Include/Common/GameAudio.h
@@ -131,6 +131,17 @@ enum
 class AudioManager : public SubsystemInterface
 {
 	public:
+		typedef UnsignedInt MuteAudioReasonInt;
+
+		enum MuteAudioReason CPP_11(: UnsignedInt)
+		{
+			MuteAudioReason_WindowFocus,
+
+			MuteAudioReason_Count
+		};
+
+		static const char *const MuteAudioReasonNames[];
+
 		AudioManager();
 		virtual ~AudioManager();
 #if defined(RTS_DEBUG)
@@ -149,9 +160,8 @@ class AudioManager : public SubsystemInterface
 		virtual void resumeAudio( AudioAffect which ) = 0;
 		virtual void pauseAmbient( Bool shouldPause ) = 0;
 
-		// for focus issues
-		virtual void loseFocus( void );
-		virtual void regainFocus( void );
+		void muteAudio( MuteAudioReason reason );
+		void unmuteAudio( MuteAudioReason reason );
 
 		// control for AudioEventsRTS
 		virtual AudioHandle addAudioEvent( const AudioEventRTS *eventToAdd );	///< Add an audio event (event must be declared in an INI file)
@@ -361,6 +371,7 @@ class AudioManager : public SubsystemInterface
 			NUM_VOLUME_TYPES
 		};
 		Real *m_savedValues;
+		MuteAudioReasonInt m_muteReasonBits;
 
 		// Group of 8
 		Bool m_speechOn						: 1;
diff --git a/Core/GameEngine/Include/GameNetwork/LANAPI.h b/Core/GameEngine/Include/GameNetwork/LANAPI.h
@@ -130,6 +130,7 @@ class LANAPIInterface : public SubsystemInterface
 	// Misc utility functions
 	virtual LANGameInfo * LookupGame( UnicodeString gameName ) = 0;														///< return a pointer to a game we know about
 	virtual LANGameInfo * LookupGameByListOffset( Int offset ) = 0;														///< return a pointer to a game we know about
+	virtual LANGameInfo * LookupGameByHost( UnsignedInt hostIP ) = 0;													///< return a pointer to the most recent game associated to the host IP address
 	virtual Bool SetLocalIP( UnsignedInt localIP ) = 0;																		///< For multiple NIC machines
 	virtual void SetLocalIP( AsciiString localIP ) = 0;																		///< For multiple NIC machines
 	virtual Bool AmIHost( void ) = 0;																											///< Am I hosting a game?
@@ -331,6 +332,7 @@ class LANAPI : public LANAPIInterface
 	// Misc utility functions
 	virtual LANGameInfo * LookupGame( UnicodeString gameName );														///< return a pointer to a game we know about
 	virtual LANGameInfo * LookupGameByListOffset( Int offset );														///< return a pointer to a game we know about
+	virtual LANGameInfo * LookupGameByHost( UnsignedInt hostIP );													///< return a pointer to the most recent game associated to the host IP address
 	virtual LANPlayer * LookupPlayer( UnsignedInt playerIP );													///< return a pointer to a player we know about
 	virtual Bool SetLocalIP( UnsignedInt localIP );																		///< For multiple NIC machines
 	virtual void SetLocalIP( AsciiString localIP );																		///< For multiple NIC machines
diff --git a/Core/GameEngine/Source/Common/Audio/GameAudio.cpp b/Core/GameEngine/Source/Common/Audio/GameAudio.cpp
@@ -139,6 +139,10 @@ static const FieldParse audioSettingsFieldParseTable[] =
 // Singleton TheAudio /////////////////////////////////////////////////////////////////////////////
 AudioManager *TheAudio = nullptr;
 
+const char *const AudioManager::MuteAudioReasonNames[] =
+{
+	"MuteAudioReason_WindowFocus",
+};
 
 // AudioManager Device Independent functions //////////////////////////////////////////////////////
 AudioManager::AudioManager() :
@@ -152,6 +156,8 @@ AudioManager::AudioManager() :
 	m_hardwareAccel(FALSE),
 	m_musicPlayingFromCD(FALSE)
 {
+	static_assert(ARRAY_SIZE(AudioManager::MuteAudioReasonNames) == MuteAudioReason_Count, "Incorrect array size");
+
 	m_adjustedVolumes.clear();
 	m_audioRequests.clear();
 	m_listenerPosition.zero();
@@ -171,6 +177,7 @@ AudioManager::AudioManager() :
 	m_miscAudio = NEW MiscAudio;
 	m_silentAudioEvent = NEW AudioEventRTS;
 	m_savedValues = nullptr;
+	m_muteReasonBits = 0;
 	m_disallowSpeech = FALSE;
 }
 
@@ -1103,12 +1110,17 @@ void AudioManager::releaseAudioEventRTS( AudioEventRTS *&eventToRelease )
 }
 
 //-------------------------------------------------------------------------------------------------
-void AudioManager::loseFocus( void )
+void AudioManager::muteAudio( MuteAudioReason reason )
 {
-	if (m_savedValues)
+	m_muteReasonBits |= 1u << reason;
+
+	DEBUG_LOG(("AudioManager::muteAudio(%s): m_muteReason=%u muted=%d",
+		MuteAudioReasonNames[reason], m_muteReasonBits, (int)(m_muteReasonBits != 0)));
+
+	if (m_muteReasonBits == 0 || m_savedValues)
 		return;
 
-	// In this case, make all the audio go silent.
+	// Make all the audio go silent.
 	m_savedValues = NEW Real[NUM_VOLUME_TYPES];
 	m_savedValues[VOLUME_TYPE_MUSIC] = m_systemMusicVolume;
 	m_savedValues[VOLUME_TYPE_SOUND] = m_systemSoundVolume;
@@ -1120,12 +1132,17 @@ void AudioManager::loseFocus( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-void AudioManager::regainFocus( void )
+void AudioManager::unmuteAudio( MuteAudioReason reason )
 {
-	if (!m_savedValues)
+	m_muteReasonBits &= ~(1u << reason);
+
+	DEBUG_LOG(("AudioManager::unmuteAudio(%s): m_muteReason=%u muted=%d",
+		MuteAudioReasonNames[reason], m_muteReasonBits, (int)(m_muteReasonBits != 0)));
+
+	if (m_muteReasonBits != 0 || !m_savedValues)
 		return;
 
-	// We got focus back. Restore the previous audio values.
+	// Restore the previous audio values.
 	setVolume(m_savedValues[VOLUME_TYPE_MUSIC], (AudioAffect) (AudioAffect_Music | AudioAffect_SystemSetting));
 	setVolume(m_savedValues[VOLUME_TYPE_SOUND], (AudioAffect) (AudioAffect_Sound | AudioAffect_SystemSetting));
 	setVolume(m_savedValues[VOLUME_TYPE_SOUND3D], (AudioAffect) (AudioAffect_Sound3D | AudioAffect_SystemSetting));
diff --git a/Core/GameEngine/Source/GameNetwork/LANAPI.cpp b/Core/GameEngine/Source/GameNetwork/LANAPI.cpp
@@ -1112,6 +1112,23 @@ LANGameInfo * LANAPI::LookupGameByListOffset( Int offset )
 	return theGame; // null means we didn't find anything.
 }
 
+LANGameInfo* LANAPI::LookupGameByHost(UnsignedInt hostIP)
+{
+	LANGameInfo* lastGame = nullptr;
+	UnsignedInt lastHeard = 0;
+
+	for (LANGameInfo* game = m_games; game; game = game->getNext())
+	{
+		if (game->getHostIP() == hostIP && game->getLastHeard() >= lastHeard)
+		{
+			lastGame = game;
+			lastHeard = game->getLastHeard();
+		}
+	}
+
+	return lastGame;
+}
+
 void LANAPI::removeGame( LANGameInfo *game )
 {
 	LANGameInfo *g = m_games;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -49,6 +49,12 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/TerrainLogic.h"
 #include "GameLogic/Weapon.h"
+#if RETAIL_COMPATIBLE_PATHFINDING
+#include "GameClient/InGameUI.h"
+#include "GameClient/GameText.h"
+#include "Common/GameAudio.h"
+#include "Common/MiscAudio.h"
+#endif
 
 #include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
@@ -1105,6 +1111,11 @@ void PathfindCellInfo::forceCleanPathFindCellInfos()
 
 void Pathfinder::forceCleanCells()
 {
+	UnicodeString pathfinderFailoverMessage = TheGameText->FETCH_OR_SUBSTITUTE("GUI:PathfindingCrashPrevented", L"A pathfinding crash was prevented, now switching to the crash fixed pathfinding.");
+	TheInGameUI->message(pathfinderFailoverMessage);
+
+	TheAudio->addAudioEvent(&TheAudio->getMiscAudio()->m_allCheerSound);
+
 	PathfindCellInfo::forceCleanPathFindCellInfos();
 	m_openList = nullptr;
 	m_closedList = nullptr;
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -58,7 +58,9 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/ActiveBody.h"
 
-
+// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that
+// enormous camera heights cannot see above the laser origin.
+constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -550,7 +552,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 
 			Coord3D orbitPosition;
 			orbitPosition.set( &m_currentTargetPosition );
-			orbitPosition.z += 500.0f;
+			orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 
 			Real scorchRadius = 0.0f;
 			Real damageRadius = 0.0f;
@@ -918,7 +920,7 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_laserOriginPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, &m_laserOriginPosition, &orbitPosition, growthFrames );
 				}
 			}
@@ -957,7 +959,7 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_initialTargetPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, &orbitPosition, &m_initialTargetPosition, growthFrames );
 				}
 			}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
@@ -41,15 +41,10 @@
 //-------------------------------------------------------------------------------------------------
 ProjectileStreamUpdate::ProjectileStreamUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
-	ObjectID m_projectileIDs[MAX_PROJECTILE_STREAM];
-	for( Int index = 0; index < MAX_PROJECTILE_STREAM; index++ )
-	{
-		m_projectileIDs[index] = INVALID_ID;
-	}
-
-	m_owningObject = INVALID_ID;
+	std::fill(m_projectileIDs, m_projectileIDs + ARRAY_SIZE(m_projectileIDs), INVALID_ID);
 	m_nextFreeIndex = 0;
 	m_firstValidIndex = 0;
+	m_owningObject = INVALID_ID;
 }
 
 //-------------------------------------------------------------------------------------------------
diff --git a/Generals/Code/Main/WinMain.cpp b/Generals/Code/Main/WinMain.cpp
@@ -464,12 +464,12 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if( active == WA_INACTIVE )
 				{
 					if (TheAudio)
-						TheAudio->loseFocus();
+						TheAudio->muteAudio(AudioManager::MuteAudioReason_WindowFocus);
 				}
 				else
 				{
 					if (TheAudio)
-						TheAudio->regainFocus();
+						TheAudio->unmuteAudio(AudioManager::MuteAudioReason_WindowFocus);
 
 					// Cursor can only be captured after one of the activation events.
 					if (TheMouse)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
@@ -49,6 +49,12 @@
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/TerrainLogic.h"
 #include "GameLogic/Weapon.h"
+#if RETAIL_COMPATIBLE_PATHFINDING
+#include "GameClient/InGameUI.h"
+#include "GameClient/GameText.h"
+#include "Common/GameAudio.h"
+#include "Common/MiscAudio.h"
+#endif
 
 #include "Common/UnitTimings.h" //Contains the DO_UNIT_TIMINGS define jba.
 
@@ -1120,6 +1126,11 @@ void PathfindCellInfo::forceCleanPathFindCellInfos()
 
 void Pathfinder::forceCleanCells()
 {
+	UnicodeString pathfinderFailoverMessage = TheGameText->FETCH_OR_SUBSTITUTE("GUI:PathfindingCrashPrevented", L"A pathfinding crash was prevented, now switching to the crash fixed pathfinding.");
+	TheInGameUI->message(pathfinderFailoverMessage);
+
+	TheAudio->addAudioEvent(&TheAudio->getMiscAudio()->m_allCheerSound);
+
 	PathfindCellInfo::forceCleanPathFindCellInfos();
 	m_openList = nullptr;
 	m_closedList = nullptr;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp
@@ -58,7 +58,9 @@
 #include "GameLogic/Module/PhysicsUpdate.h"
 #include "GameLogic/Module/ActiveBody.h"
 
-
+// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that
+// enormous camera heights cannot see above the laser origin.
+constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -625,7 +627,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()
 
 			Coord3D orbitPosition;
 			orbitPosition.set( &m_currentTargetPosition );
-			orbitPosition.z += 500.0f;
+			orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 
 			Real scorchRadius = 0.0f;
 			Real damageRadius = 0.0f;
@@ -1003,7 +1005,7 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_laserOriginPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, nullptr, &m_laserOriginPosition, &orbitPosition, "", growthFrames );
 				}
 			}
@@ -1042,7 +1044,7 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra
 				{
 					Coord3D orbitPosition;
 					orbitPosition.set( &m_initialTargetPosition );
-					orbitPosition.z += 500.0f;
+					orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;
 					update->initLaser( nullptr, nullptr, &orbitPosition, &m_initialTargetPosition, "", growthFrames );
 				}
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProjectileStreamUpdate.cpp
@@ -41,15 +41,10 @@
 //-------------------------------------------------------------------------------------------------
 ProjectileStreamUpdate::ProjectileStreamUpdate( Thing *thing, const ModuleData* moduleData ) : UpdateModule( thing, moduleData )
 {
-	ObjectID m_projectileIDs[MAX_PROJECTILE_STREAM];
-	for( Int index = 0; index < MAX_PROJECTILE_STREAM; index++ )
-	{
-		m_projectileIDs[index] = INVALID_ID;
-	}
-
-	m_owningObject = INVALID_ID;
+	std::fill(m_projectileIDs, m_projectileIDs + ARRAY_SIZE(m_projectileIDs), INVALID_ID);
 	m_nextFreeIndex = 0;
 	m_firstValidIndex = 0;
+	m_owningObject = INVALID_ID;
 
 	m_targetObject = INVALID_ID;
 	m_targetPosition.zero();
diff --git a/GeneralsMD/Code/Main/WinMain.cpp b/GeneralsMD/Code/Main/WinMain.cpp
@@ -486,12 +486,12 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if( active == WA_INACTIVE )
 				{
 					if (TheAudio)
-						TheAudio->loseFocus();
+						TheAudio->muteAudio(AudioManager::MuteAudioReason_WindowFocus);
 				}
 				else
 				{
 					if (TheAudio)
-						TheAudio->regainFocus();
+						TheAudio->unmuteAudio(AudioManager::MuteAudioReason_WindowFocus);
 
 					// Cursor can only be captured after one of the activation events.
 					if (TheMouse)

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,9 @@`
`58`	`58`	`#include "GameLogic/Module/PhysicsUpdate.h"`
`59`	`59`	`#include "GameLogic/Module/ActiveBody.h"`
`60`	`60`
`61`		`-`
	`61`	`+// TheSuperHackers @fix Mirelle 04/02/2026: Raised from 500.0f so that`
	`62`	`+// enormous camera heights cannot see above the laser origin.`
	`63`	`+constexpr const Real ORBITAL_BEAM_Z_OFFSET = 3500.0f;`
`62`	`64`
`63`	`65`	`//-------------------------------------------------------------------------------------------------`
`64`	`66`	`//-------------------------------------------------------------------------------------------------`
`@@ -550,7 +552,7 @@ UpdateSleepTime ParticleUplinkCannonUpdate::update()`
`550`	`552`
`551`	`553`	`Coord3D orbitPosition;`
`552`	`554`	`orbitPosition.set( &m_currentTargetPosition );`
`553`		`- orbitPosition.z += 500.0f;`
	`555`	`+ orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;`
`554`	`556`
`555`	`557`	`Real scorchRadius = 0.0f;`
`556`	`558`	`Real damageRadius = 0.0f;`
`@@ -918,7 +920,7 @@ void ParticleUplinkCannonUpdate::createGroundToOrbitLaser( UnsignedInt growthFra`
`918`	`920`	`{`
`919`	`921`	`Coord3D orbitPosition;`
`920`	`922`	`orbitPosition.set( &m_laserOriginPosition );`
`921`		`- orbitPosition.z += 500.0f;`
	`923`	`+ orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;`
`922`	`924`	`update->initLaser( nullptr, &m_laserOriginPosition, &orbitPosition, growthFrames );`
`923`	`925`	`}`
`924`	`926`	`}`
`@@ -957,7 +959,7 @@ void ParticleUplinkCannonUpdate::createOrbitToTargetLaser( UnsignedInt growthFra`
`957`	`959`	`{`
`958`	`960`	`Coord3D orbitPosition;`
`959`	`961`	`orbitPosition.set( &m_initialTargetPosition );`
`960`		`- orbitPosition.z += 500.0f;`
	`962`	`+ orbitPosition.z += ORBITAL_BEAM_Z_OFFSET;`
`961`	`963`	`update->initLaser( nullptr, &orbitPosition, &m_initialTargetPosition, growthFrames );`
`962`	`964`	`}`
`963`	`965`	`}`
Original file line number	Diff line number	Diff line change
`@@ -464,12 +464,12 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,`
`464`	`464`	`if( active == WA_INACTIVE )`
`465`	`465`	`{`
`466`	`466`	`if (TheAudio)`
`467`		`- TheAudio->loseFocus();`
	`467`	`+ TheAudio->muteAudio(AudioManager::MuteAudioReason_WindowFocus);`
`468`	`468`	`}`
`469`	`469`	`else`
`470`	`470`	`{`
`471`	`471`	`if (TheAudio)`
`472`		`- TheAudio->regainFocus();`
	`472`	`+ TheAudio->unmuteAudio(AudioManager::MuteAudioReason_WindowFocus);`
`473`	`473`
`474`	`474`	`// Cursor can only be captured after one of the activation events.`
`475`	`475`	`if (TheMouse)`