Destroying Disabled Power Plants Upgraded with PowerPlantUpgrade removes excess Energy

[IamInnocent3X]

Prerequisites

• I have searched for similar issues and confirmed this is not a duplicate

Game Version

• Command & Conquer Generals
• Command & Conquer Generals: Zero Hour
• Other (please specify below)

Bug Description

As per title, bug can be recreated with the steps below:

Reproduction Steps

1. Build a USA Power Plant and then Upgrade it with Control Rods.
2. Disable it with a Microwave Tank
3. Destroy the Power Plant
4. Loss of energy, able to reach negative levels.

Additional Context

No response

[xezon]

I suspect this is already tracked and maybe even fixed?

[bobtista]

Searching around, I found
#937
Fixed with TheSuperHackers/GeneralsGamePatch#7 (game patch)
then with #1302 (game code)

Though that issue was about power plant scaffolds, I'm not sure if it fixes the issue for fully built power plants.

[Caball009]

I just checked and was able to reproduce with the latest weekly release. With and without retail compatibility btw.

This issue is specific to the power plant upgrade.

[Caball009]

I think this would fix it:

if ( !obj->isDisabled() )
	addProduction( -obj->getTemplate()->getEnergyBonus() );

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

Line 210 in 35b3f01

addProduction( -obj->getTemplate()->getEnergyBonus() );

[Caball009]

Disabled nuclear reactors that have overcharge enabled are also affected by this bug.