Skip to content

bugfix(ai): fix crash when AI fires China Nuclear Missile while another is under construction #1769

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

bugfix(ai): fix crash when AI fires China Nuclear Missile while another is under construction #1769

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2620,6 +2620,12 @@ void AIGroup::groupDoSpecialPower( UnsignedInt specialPowerID, UnsignedInt comma
//Special powers do a lot of different things, but the top level stuff doesn't use
//ai interface code. It finds the special power module and calls it directly for each object.
Object *object = (*i);
#if !RETAIL_COMPATIBLE_AIGROUP
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents AI from trying to fire special powers from buildings under construction.
if (object->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)) {
continue;
}
#endif
const SpecialPowerTemplate *spTemplate = TheSpecialPowerStore->findSpecialPowerTemplateByID( specialPowerID );
if( spTemplate )
{
Expand Down Expand Up @@ -2659,6 +2665,12 @@ void AIGroup::groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const C
//ai interface code. It finds the special power module and calls it directly for each object.

Object *object = (*i);
#if !RETAIL_COMPATIBLE_AIGROUP
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents AI from trying to fire special powers from buildings under construction.
if (object->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)) {
continue;
}
#endif
const SpecialPowerTemplate *spTemplate = TheSpecialPowerStore->findSpecialPowerTemplateByID( specialPowerID );
if( spTemplate )
{
Expand Down Expand Up @@ -2698,6 +2710,12 @@ void AIGroup::groupDoSpecialPowerAtObject( UnsignedInt specialPowerID, Object *t
//ai interface code. It finds the special power module and calls it directly for each object.

Object *object = (*i);
#if !RETAIL_COMPATIBLE_AIGROUP
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents AI from trying to fire special powers from buildings under construction.
if (object->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)) {
continue;
}
#endif
const SpecialPowerTemplate *spTemplate = TheSpecialPowerStore->findSpecialPowerTemplateByID( specialPowerID );
if( spTemplate )
{
Expand Down
10 changes: 10 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,16 @@ Bool SpecialPowerModule::initiateIntentToDoSpecialPower( const Object *targetObj
}
}

// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents AI from consuming special power timer when MissileLauncherBuildingUpdate is not ready.
#if RETAIL_COMPATIBLE_CRC
// TheSuperHackers @info we need to leave early if we are in the MissileLauncherBuildingUpdate crash fix codepath
if (m_availableOnFrame == 0xFFFFFFFF)
{
DEBUG_ASSERTCRASH(!valid, ("Using MissileLauncherBuildingUpdate escape path when valid is set to true"));
return false;
}
#endif

//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 )
Expand Down
14 changes: 14 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,20 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
//-------------------------------------------------------------------------------------------------
Bool MissileLauncherBuildingUpdate::initiateIntentToDoSpecialPower( const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions )
{
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents crash when AI fires China Nuclear Missile while another is under construction.
if (!m_specialPowerModule) {
#if RETAIL_COMPATIBLE_CRC
Object* us = getObject();
us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
#endif
return FALSE;
}

if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )
{
return FALSE;
}

#if defined(RTS_DEBUG)
DEBUG_ASSERTCRASH(!TheGlobalData->m_specialPowerUsesDelay || m_doorState == DOOR_OPEN, ("door is not fully open when specialpower is fired!"));
#endif
Expand Down
19 changes: 19 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2683,6 +2683,12 @@ void AIGroup::groupDoSpecialPower( UnsignedInt specialPowerID, UnsignedInt comma
//Special powers do a lot of different things, but the top level stuff doesn't use
//ai interface code. It finds the special power module and calls it directly for each object.
Object *object = (*i);
#if !RETAIL_COMPATIBLE_AIGROUP
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents AI from trying to fire special powers from buildings under construction.
if (object->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)) {
continue;
}
#endif
const SpecialPowerTemplate *spTemplate = TheSpecialPowerStore->findSpecialPowerTemplateByID( specialPowerID );
if( spTemplate )
{
Expand Down Expand Up @@ -2731,6 +2737,13 @@ void AIGroup::groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const C
// destroys the AIGroup list, in order to keep the selection sync'ed with the group.
// M Lorenzen... 8/23/03

#if !RETAIL_COMPATIBLE_AIGROUP
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents AI from trying to fire special powers from buildings under construction.
if (object->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)) {
continue;
}
#endif

const SpecialPowerTemplate *spTemplate = TheSpecialPowerStore->findSpecialPowerTemplateByID( specialPowerID );
if( spTemplate )
{
Expand Down Expand Up @@ -2771,6 +2784,12 @@ void AIGroup::groupDoSpecialPowerAtObject( UnsignedInt specialPowerID, Object *t
//ai interface code. It finds the special power module and calls it directly for each object.

Object *object = (*i);
#if !RETAIL_COMPATIBLE_AIGROUP
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents AI from trying to fire special powers from buildings under construction.
if (object->testStatus(OBJECT_STATUS_UNDER_CONSTRUCTION)) {
continue;
}
#endif
const SpecialPowerTemplate *spTemplate = TheSpecialPowerStore->findSpecialPowerTemplateByID( specialPowerID );
if( spTemplate )
{
Expand Down
5 changes: 3 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/MissileLauncherBuildingUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,15 @@ 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
// TheSuperHackers @bugfix bobtista 01/11/2025 Prevents crash when AI fires China Nuclear Missile while another is under construction.
if (!m_specialPowerModule) {
#if RETAIL_COMPATIBLE_CRC
Object* us = getObject();
us->getSpecialPowerModule(specialPowerTemplate)->setReadyFrame(0xFFFFFFFF);
#endif
return FALSE;
}
#endif

if( m_specialPowerModule->getSpecialPowerTemplate() != specialPowerTemplate )
{
Expand Down
Loading