More fixes 2

Author: xezon

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp

@@ -177,8 +177,8 @@ void OCLSpecialPower::doSpecialPowerAtLocation( const Coord3D *loc, Real angle,
 	SpecialPowerModule::doSpecialPowerAtLocation( &targetCoord, angle, commandOptions );
 
 #if RETAIL_COMPATIBLE_CRC
-	// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
-	if (m_availableOnFrame == 0xFFFFFFFF)
+	// TheSuperHackers @info Leave early if we are in the special power crash fix code path
+	if (m_availableOnFrame == ~0u)
 		return;
 #endif
 
@@ -244,6 +244,12 @@ void OCLSpecialPower::doSpecialPower( UnsignedInt commandOptions )
 	// call the base class action cause we are *EXTENDING* functionality
 	SpecialPowerModule::doSpecialPowerAtLocation( &creationCoord, INVALID_ANGLE, commandOptions );
 
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @info Leave early if we are in the special power crash fix code path
+	if (m_availableOnFrame == ~0u)
+		return;
+#endif
+
 	const ObjectCreationList* ocl = findOCL();
 	ObjectCreationList::create( ocl, getObject(), &creationCoord, &creationCoord, false );
 }

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp

@@ -95,7 +95,6 @@ SpecialPowerModuleData::SpecialPowerModuleData()
 SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleData )
 									: BehaviorModule( thing, moduleData )
 {
-
 	m_availableOnFrame = 0;
 	m_pausedCount = 0;
 	m_pausedOnFrame = 0;
@@ -113,12 +112,11 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 #if RETAIL_COMPATIBLE_CRC
 		initCountdown();
 #else
-		// The Special Power will not be available until construction is done.
+		// TheSuperHackers @bugfix The Special Power will not be available until construction is done.
 		m_availableOnFrame = ~0u;
 #endif
 	}
-
-}  // end SpecialPowerModule
+}
 
 void SpecialPowerModule::init()
 {
@@ -144,7 +142,7 @@ void SpecialPowerModule::initCountdown()
 
 	// Now, if we find that we have just come into being,
 	// but there is already a science granted for our shared superweapon,
-	// lets make sure TheIngameUI knows about our public timer
+	// lets make sure TheInGameUI knows about our public timer
 	// add this weapon to the UI if it has a public timer for all to see
 	if( m_pausedCount == 0 &&
 			getSpecialPowerTemplate()->isSharedNSync() == TRUE &&
@@ -401,7 +399,7 @@ void SpecialPowerModule::onConstructionCompleted()
 {
 #if !RETAIL_COMPATIBLE_CRC
 	DEBUG_ASSERTCRASH(m_availableOnFrame == ~0u,
-		("Unexpected state. Function must be called only after OBJECT_STATUS_UNDER_CONSTRUCTION was completed"));
+		("Unexpected state. Function must be called only after OBJECT_STATUS_UNDER_CONSTRUCTION was removed"));
 
 	m_availableOnFrame = 0;
 	init();
@@ -455,6 +453,13 @@ void SpecialPowerModule::startPowerRecharge()
 //-------------------------------------------------------------------------------------------------
 Bool SpecialPowerModule::initiateIntentToDoSpecialPower( const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
+#if !RETAIL_COMPATIBLE_CRC
+	if( getObject()->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
+	{
+		return false;
+	}
+#endif
+
 	Bool valid = false;
 	// tell our update modules that we intend to do this special power.
 	for( BehaviorModule** u = getObject()->getBehaviorModules(); *u; ++u )
@@ -482,26 +487,20 @@ Bool SpecialPowerModule::initiateIntentToDoSpecialPower( const Object *targetObj
 	}
 
 #if RETAIL_COMPATIBLE_CRC
-	// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
+	// TheSuperHackers @info Leave early if we are in the special power crash fix code path
 	if (m_availableOnFrame == ~0u)
 	{
-		DEBUG_ASSERTCRASH(!valid, ("Using MissileLauncherBuildingUpdate escape path when valid is set to true"));
+		DEBUG_ASSERTCRASH(!valid, ("Using special power escape path when valid is set to true"));
 		return false;
 	}
 #endif
 
-	getObject()->getControllingPlayer()->getAcademyStats()->recordSpecialPowerUsed( getSpecialPowerModuleData()->m_specialPowerTemplate );
-
-	//If we depend on our update module to trigger the special power, make sure we have the
-	//appropriate update module!
-	if( !valid && getSpecialPowerModuleData()->m_updateModuleStartsAttack )
-	{
-		DEBUG_CRASH( ("Object does not contain a special power module to execute.  Did you forget to add it to the object INI?"));
-		//DEBUG_CRASH(( "Object does not contain special power module (%s) to execute.  Did you forget to add it to the object INI?",
-		//							command->m_specialPower->getName().str() ));
-	}
+	//If we depend on our update module to trigger the special power, make sure we have the appropriate update module!
+	DEBUG_ASSERTCRASH(valid || !getSpecialPowerModuleData()->m_updateModuleStartsAttack,
+		("Object does not contain a special power module to execute. Did you forget to add it to the object INI?"));
 
-	return valid;
+	getObject()->getControllingPlayer()->getAcademyStats()->recordSpecialPowerUsed( getSpecialPowerModuleData()->m_specialPowerTemplate );
+	return true;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -704,15 +703,16 @@ void SpecialPowerModule::doSpecialPower( UnsignedInt commandOptions )
 
 	//This tells the update module that we want to do our special power. The update modules
 	//will then start processing each frame.
-	initiateIntentToDoSpecialPower( NULL, NULL, NULL, commandOptions );
-
-	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to
-	//close to range before firing the special attack. A case that would trigger immediately
-	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
-	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+	if (initiateIntentToDoSpecialPower( NULL, NULL, NULL, commandOptions ))
 	{
-		triggerSpecialPower( NULL );// Location-less trigger
+		//Only trigger the special power immediately if the update module doesn't start the attack.
+		//An example of a case that wouldn't trigger immediately is for a unit that needs to
+		//close to range before firing the special attack. A case that would trigger immediately
+		//is the napalm strike. If we don't call this now, it's up to the update module to do so.
+		if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+		{
+			triggerSpecialPower( NULL );// Location-less trigger
+		}
 	}
 }
 
@@ -726,15 +726,16 @@ void SpecialPowerModule::doSpecialPowerAtObject( Object *obj, UnsignedInt comman
 
 	//This tells the update module that we want to do our special power. The update modules
 	//will then start processing each frame.
-	initiateIntentToDoSpecialPower( obj, NULL, NULL, commandOptions );
-
-	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to
-	//close to range before firing the special attack. A case that would trigger immediately
-	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
-	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+	if (initiateIntentToDoSpecialPower( obj, NULL, NULL, commandOptions ))
 	{
-		triggerSpecialPower( obj->getPosition() );
+		//Only trigger the special power immediately if the update module doesn't start the attack.
+		//An example of a case that wouldn't trigger immediately is for a unit that needs to
+		//close to range before firing the special attack. A case that would trigger immediately
+		//is the napalm strike. If we don't call this now, it's up to the update module to do so.
+		if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+		{
+			triggerSpecialPower( obj->getPosition() );
+		}
 	}
 }
 
@@ -748,21 +749,16 @@ void SpecialPowerModule::doSpecialPowerAtLocation( const Coord3D *loc, Real angl
 
 	//This tells the update module that we want to do our special power. The update modules
 	//will then start processing each frame.
-	initiateIntentToDoSpecialPower( NULL, loc, NULL, commandOptions );
-
-#if RETAIL_COMPATIBLE_CRC
-	// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
-	if (m_availableOnFrame == ~0u)
-		return;
-#endif
-
-	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to
-	//close to range before firing the special attack. A case that would trigger immediately
-	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
-	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+	if (initiateIntentToDoSpecialPower( NULL, loc, NULL, commandOptions ))
 	{
-		triggerSpecialPower( loc );
+		//Only trigger the special power immediately if the update module doesn't start the attack.
+		//An example of a case that wouldn't trigger immediately is for a unit that needs to
+		//close to range before firing the special attack. A case that would trigger immediately
+		//is the napalm strike. If we don't call this now, it's up to the update module to do so.
+		if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+		{
+			triggerSpecialPower( loc );
+		}
 	}
 }
 
@@ -776,15 +772,16 @@ void SpecialPowerModule::doSpecialPowerUsingWaypoints( const Waypoint *way, Unsi
 
 	//This tells the update module that we want to do our special power. The update modules
 	//will then start processing each frame.
-	initiateIntentToDoSpecialPower( NULL, NULL, way, commandOptions );
-
-	//Only trigger the special power immediately if the updatemodule doesn't start the attack.
-	//An example of a case that wouldn't trigger immediately is for a unit that needs to
-	//close to range before firing the special attack. A case that would trigger immediately
-	//is the napalm strike. If we don't call this now, it's up to the update module to do so.
-	if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+	if (initiateIntentToDoSpecialPower( NULL, NULL, way, commandOptions ))
 	{
-		triggerSpecialPower( NULL );// This type doesn't create view objects
+		//Only trigger the special power immediately if the update module doesn't start the attack.
+		//An example of a case that wouldn't trigger immediately is for a unit that needs to
+		//close to range before firing the special attack. A case that would trigger immediately
+		//is the napalm strike. If we don't call this now, it's up to the update module to do so.
+		if( !getSpecialPowerModuleData()->m_updateModuleStartsAttack )
+		{
+			triggerSpecialPower( NULL );// This type doesn't create view objects
+		}
 	}
 }
 

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/BattlePlanUpdate.cpp

@@ -261,6 +261,15 @@ void BattlePlanUpdate::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 Bool BattlePlanUpdate::initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Mauller 29/06/2025 prevent a game crash when told to launch before ready to do so
+	if (!m_specialPowerModule) {
+		Object* us = getObject();
+		us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
+		return FALSE;
+	}
+#endif
+
 	if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )
 	{
 		//Check to make sure our modules are connected.

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp

@@ -205,14 +205,14 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
 //-------------------------------------------------------------------------------------------------
 Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
-	// TheSuperHackers @bugfix Mauller 29/06/2025 prevent a game crash when told to launch before ready to do so
-	if( getObject()->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
-	{
 #if RETAIL_COMPATIBLE_CRC
-		getObject()->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(~0u);
-#endif
+	// TheSuperHackers @bugfix Mauller 29/06/2025 prevent a game crash when told to launch before ready to do so
+	if (!m_specialPowerModule) {
+		Object* us = getObject();
+		us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
 		return FALSE;
 	}
+#endif
 
 	if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )
 	{

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp

@@ -267,6 +267,15 @@ void ParticleUplinkCannonUpdate::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 Bool ParticleUplinkCannonUpdate::initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Mauller 29/06/2025 prevent a game crash when told to launch before ready to do so
+	if (!m_specialPowerModule) {
+		Object* us = getObject();
+		us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
+		return FALSE;
+	}
+#endif
+
 	const ParticleUplinkCannonUpdateModuleData *data = getParticleUplinkCannonUpdateModuleData();
 
 	if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipDeploymentUpdate.cpp

@@ -139,6 +139,15 @@ void SpectreGunshipDeploymentUpdate::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 Bool SpectreGunshipDeploymentUpdate::initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Mauller 29/06/2025 prevent a game crash when told to launch before ready to do so
+	if (!m_specialPowerModule) {
+		Object* us = getObject();
+		us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
+		return FALSE;
+	}
+#endif
+
 	const SpectreGunshipDeploymentUpdateModuleData *data = getSpectreGunshipDeploymentUpdateModuleData();
 
 	if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp

@@ -183,6 +183,15 @@ void SpectreGunshipUpdate::onObjectCreated()
 //-------------------------------------------------------------------------------------------------
 Bool SpectreGunshipUpdate::initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
 {
+#if RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix Mauller 29/06/2025 prevent a game crash when told to launch before ready to do so
+	if (!m_specialPowerModule) {
+		Object* us = getObject();
+		us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
+		return FALSE;
+	}
+#endif
+
 	const SpectreGunshipUpdateModuleData *data = getSpectreGunshipUpdateModuleData();
 
 	if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )