Skip to content

bugfix(specialpower): Charge uninitialized special powers on new buildings #2781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bobtista wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −0
Open

bugfix(specialpower): Charge uninitialized special powers on new buildings #2781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,6 +1652,27 @@ void Player::onStructureConstructionComplete( Object *builder, Object *structure
if( m_ai )
m_ai->onStructureProduced( builder, structure );

#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista 10/06/2026 Buildings constructed under OBJECT_STATUS_UNDER_CONSTRUCTION
// skip the SpecialPowerModule recharge and, without a SpecialPowerCreate module, never leave the
// uninitialized 0xFFFFFFFF ready frame (e.g. Strategy Center battle plans, Detention Camp CIA Intelligence).
// Make any such special power ready now on completion to match retail availability.
for( BehaviorModule** module = structure->getBehaviorModules(); *module; ++module )
{
SpecialPowerModuleInterface* specialPower = (*module)->getSpecialPower();
if( specialPower == nullptr )
{
continue;
}
if( specialPower->getReadyFrame() == 0xFFFFFFFF )
{
specialPower->setReadyFrame( TheGameLogic->getFrame() );
DEBUG_LOG(( "onStructureConstructionComplete: charged uninitialized special power '%s' on '%s' to ready.",
specialPower->getPowerName().str(), structure->getTemplate()->getName().str() ));
}
}
#endif

// the GUI needs to re-evaluate the information being displayed to the user now
if( TheControlBar )
TheControlBar->markUIDirty();
Expand Down
Loading