Skip to content

MissileLauncherBuildingUpdate: Add safety check for destroyed objects #55

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

Merged
x64-dev merged 1 commit into from
Oct 10, 2025
Merged

MissileLauncherBuildingUpdate: Add safety check for destroyed objects #55

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
8 changes: 8 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 @@ -67,6 +67,10 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
if (m_doorState == dst)
return;

// Safety check: if the object has been destroyed, don't attempt state changes
if (!getObject())
return;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();
ModelConditionFlags clr, set;
UnsignedInt now = TheGameLogic->getFrame();
Expand Down Expand Up @@ -220,6 +224,10 @@ Bool MissileLauncherBuildingUpdate::isPowerCurrentlyInUse( const CommandButton *
//-------------------------------------------------------------------------------------------------
UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
{
// Safety check: if the object has been destroyed, don't update
if (!getObject())
return UPDATE_SLEEP_NONE;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();

UnsignedInt now = TheGameLogic->getFrame();
Expand Down
8 changes: 8 additions & 0 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 @@ -68,6 +68,10 @@ void MissileLauncherBuildingUpdate::switchToState(DoorStateType dst)
if (m_doorState == dst)
return;

// Safety check: if the object has been destroyed, don't attempt state changes
if (!getObject())
return;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();
ModelConditionFlags clr, set;
UnsignedInt now = TheGameLogic->getFrame();
Expand Down Expand Up @@ -236,6 +240,10 @@ Bool MissileLauncherBuildingUpdate::isPowerCurrentlyInUse( const CommandButton *
//-------------------------------------------------------------------------------------------------
UpdateSleepTime MissileLauncherBuildingUpdate::update( void )
{
// Safety check: if the object has been destroyed, don't update
if (!getObject())
return UPDATE_SLEEP_NONE;

const MissileLauncherBuildingUpdateModuleData* d = getMissileLauncherBuildingUpdateModuleData();

UnsignedInt now = TheGameLogic->getFrame();
Expand Down
Loading