Simplified non-retail logic.

Author: Caball009

Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp

@@ -189,13 +189,13 @@ void Energy::removePowerBonus( Object *obj )
 		return;
 
 	// TheSuperHackers @bugfix Caball009 14/11/2025 Don't remove power bonus for disabled power plants.
-#if RETAIL_COMPATIBLE_CRC
-	addProduction( -obj->getTemplate()->getEnergyBonus() );
-#else
-	if ( !obj->isDisabled() )
-		addProduction( -obj->getTemplate()->getEnergyBonus() );
+#if !RETAIL_COMPATIBLE_CRC
+	if ( obj->isDisabled() )
+		return;
 #endif
 
+	addProduction( -obj->getTemplate()->getEnergyBonus() );
+
 	// sanity
 	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",

GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp

@@ -208,13 +208,13 @@ void Energy::removePowerBonus( Object *obj )
 		return;
 
 	// TheSuperHackers @bugfix Caball009 14/11/2025 Don't remove power bonus for disabled power plants.
-#if RETAIL_COMPATIBLE_CRC
-	addProduction( -obj->getTemplate()->getEnergyBonus() );
-#else
-	if ( !obj->isDisabled() )
-		addProduction( -obj->getTemplate()->getEnergyBonus() );
+#if !RETAIL_COMPATIBLE_CRC
+	if ( obj->isDisabled() )
+		return;
 #endif
 
+	addProduction( -obj->getTemplate()->getEnergyBonus() );
+
 	// sanity
 	DEBUG_ASSERTCRASH( m_energyProduction >= 0 && m_energyConsumption >= 0,
 										 ("Energy - Negative Energy numbers, Produce=%d Consume=%d\n",