More fixes

Author: xezon

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

@@ -114,7 +114,7 @@ SpecialPowerModule::SpecialPowerModule( Thing *thing, const ModuleData *moduleDa
 		initCountdown();
 #else
 		// The Special Power will not be available until construction is done.
-		m_availableOnFrame = UINT_MAX;
+		m_availableOnFrame = ~0u;
 #endif
 	}
 
@@ -400,7 +400,7 @@ Bool SpecialPowerModule::isScriptOnly() const
 void SpecialPowerModule::onConstructionCompleted()
 {
 #if !RETAIL_COMPATIBLE_CRC
-	DEBUG_ASSERTCRASH(m_availableOnFrame == UINT_MAX,
+	DEBUG_ASSERTCRASH(m_availableOnFrame == ~0u,
 		("Unexpected state. Function must be called only after OBJECT_STATUS_UNDER_CONSTRUCTION was completed"));
 
 	m_availableOnFrame = 0;
@@ -483,7 +483,7 @@ 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
-	if (m_availableOnFrame == 0xFFFFFFFF)
+	if (m_availableOnFrame == ~0u)
 	{
 		DEBUG_ASSERTCRASH(!valid, ("Using MissileLauncherBuildingUpdate escape path when valid is set to true"));
 		return false;
@@ -752,7 +752,7 @@ void SpecialPowerModule::doSpecialPowerAtLocation( const Coord3D *loc, Real angl
 
 #if RETAIL_COMPATIBLE_CRC
 	// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
-	if (m_availableOnFrame == 0xFFFFFFFF)
+	if (m_availableOnFrame == ~0u)
 		return;
 #endif
 

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

@@ -46,11 +46,15 @@
 //-------------------------------------------------------------------------------------------------
 MissileLauncherBuildingUpdate::MissileLauncherBuildingUpdate( Thing *thing, const ModuleData* moduleData ) : SpecialPowerUpdateModule( thing, moduleData )
 {
+	const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();
+
 	m_doorState = DOOR_CLOSED;
 	m_timeoutState = DOOR_CLOSED;
 	m_timeoutFrame = 0;
-	m_openIdleAudio = getMissileLauncherBuildingUpdateModuleData()->m_openIdleAudio;
+	m_openIdleAudio = d->m_openIdleAudio;
 	m_openIdleAudio.setObjectID(getObject()->getID());
+	m_specialPowerModule = getObject()->getSpecialPowerModule(d->m_specialPowerTemplate);
+	DEBUG_ASSERTCRASH(m_specialPowerModule, ("Missing special power"));
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -201,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 )
 {
-#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);
+	if( getObject()->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
+	{
+#if RETAIL_COMPATIBLE_CRC
+		getObject()->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(~0u);
+#endif
 		return FALSE;
 	}
-#endif
 
 	if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )
 	{
@@ -236,23 +240,16 @@ Bool MissileLauncherBuildingUpdate::isPowerCurrentlyInUse( const CommandButton *
 //-------------------------------------------------------------------------------------------------
 UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
 {
-	const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();
-
-	UnsignedInt now = TheGameLogic->getFrame();
-
 	// If we are under construction, any decision we make about door status could be wrong.
 	// Our special power module is randomly going to be initialized or not (which would result
 	// in him reporting a 0 frame ready, which means we will start open).
 	if( getObject()->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION) )
 		return UPDATE_SLEEP_NONE;
 
-	if (!m_specialPowerModule)
-	{
-		m_specialPowerModule = getObject()->getSpecialPowerModule(d->m_specialPowerTemplate);
-		DEBUG_ASSERTCRASH(m_specialPowerModule, ("Missing special power"));
-	}
+	const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();
+
+	UnsignedInt now = TheGameLogic->getFrame();
 
-	if (m_specialPowerModule)
 	{
 		UnsignedInt readyFrame = m_specialPowerModule->getReadyFrame();
 		UnsignedInt whenToStartOpening = (readyFrame >= d->m_doorOpenTime) ? (readyFrame - d->m_doorOpenTime) : 0;
@@ -313,9 +310,6 @@ void MissileLauncherBuildingUpdate::xfer( Xfer *xfer )
 	// extend base class
 	UpdateModule::xfer( xfer );
 
-	// do not need to tie the m_specialPowerModule pointer cause it gets tied
-	// SpecialPowerModuleInterface *m_specialPowerModule;
-
 	// door state
 	xfer->xferUser( &m_doorState, sizeof( DoorStateType ) );