Skip to content

Fix SpecialPowerModule null controlling player crash #305

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
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix SpecialPowerModule null controlling player crash #305

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
16 changes: 13 additions & 3 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 @@ -454,7 +454,12 @@ void SpecialPowerModule::createViewObject( const Coord3D *location )
if( viewObjectTemplate == nullptr )
return;

Object *viewObject = TheThingFactory->newObject( viewObjectTemplate, getObject()->getControllingPlayer()->getDefaultTeam() );
// Get the team to use for the view object - use controlling player's default team if available,
// otherwise fall back to the object's team
Player *controllingPlayer = getObject()->getControllingPlayer();
Team *team = controllingPlayer ? controllingPlayer->getDefaultTeam() : getObject()->getTeam();

Object *viewObject = TheThingFactory->newObject( viewObjectTemplate, team );

if( viewObject == nullptr )
return;
Expand Down Expand Up @@ -482,9 +487,14 @@ void SpecialPowerModule::markSpecialPowerTriggered( const Coord3D *location )
//-------------------------------------------------------------------------------------------------
void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
{
// Check if controlling player is null - if so, we can't proceed with some operations
Player *controllingPlayer = getObject()->getControllingPlayer();
if (!controllingPlayer)
return;

// Tell the scripting engine!
TheScriptEngine->notifyOfTriggeredSpecialPower(
getObject()->getControllingPlayer()->getPlayerIndex(),
controllingPlayer->getPlayerIndex(),
getSpecialPowerModuleData()->m_specialPowerTemplate->getName(),
getObject()->getID());

Expand Down Expand Up @@ -518,7 +528,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )

AudioEventRTS soundAtLocation = *modData->m_specialPowerTemplate->getInitiateAtTargetSound();
soundAtLocation.setPosition( location );
soundAtLocation.setPlayerIndex(getObject()->getControllingPlayer()->getPlayerIndex());
soundAtLocation.setPlayerIndex(controllingPlayer->getPlayerIndex());
TheAudio->addAudioEvent( &soundAtLocation );

}
Expand Down
26 changes: 18 additions & 8 deletions GeneralsMD/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 @@ -514,7 +514,12 @@ void SpecialPowerModule::createViewObject( const Coord3D *location )
if( viewObjectTemplate == nullptr )
return;

Object *viewObject = TheThingFactory->newObject( viewObjectTemplate, getObject()->getControllingPlayer()->getDefaultTeam() );
// Get the team to use for the view object - use controlling player's default team if available,
// otherwise fall back to the object's team
Player *controllingPlayer = getObject()->getControllingPlayer();
Team *team = controllingPlayer ? controllingPlayer->getDefaultTeam() : getObject()->getTeam();

Object *viewObject = TheThingFactory->newObject( viewObjectTemplate, team );

if( viewObject == nullptr )
return;
Expand Down Expand Up @@ -542,9 +547,14 @@ void SpecialPowerModule::markSpecialPowerTriggered( const Coord3D *location )
//-------------------------------------------------------------------------------------------------
void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
{
// Check if controlling player is null - if so, we can't proceed with some operations
Player *controllingPlayer = getObject()->getControllingPlayer();
if (!controllingPlayer)
return;

// Tell the scripting engine!
TheScriptEngine->notifyOfTriggeredSpecialPower(
getObject()->getControllingPlayer()->getPlayerIndex(),
controllingPlayer->getPlayerIndex(),
getSpecialPowerModuleData()->m_specialPowerTemplate->getName(),
getObject()->getID());

Expand All @@ -562,7 +572,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
{
if( type == SPECIAL_PARTICLE_UPLINK_CANNON || type == SUPW_SPECIAL_PARTICLE_UPLINK_CANNON || type == LAZR_SPECIAL_PARTICLE_UPLINK_CANNON )
{
if ( localPlayer == getObject()->getControllingPlayer() )
if ( localPlayer == controllingPlayer )
{
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_ParticleCannon);
}
Expand All @@ -578,7 +588,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
}
else if( type == SPECIAL_NEUTRON_MISSILE || type == NUKE_SPECIAL_NEUTRON_MISSILE || type == SUPW_SPECIAL_NEUTRON_MISSILE )
{
if ( localPlayer == getObject()->getControllingPlayer() )
if ( localPlayer == controllingPlayer )
{
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_Nuke);
}
Expand All @@ -594,7 +604,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
}
else if (type == SPECIAL_SCUD_STORM)
{
if ( localPlayer == getObject()->getControllingPlayer() )
if ( localPlayer == controllingPlayer )
{
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_ScudStorm);
}
Expand All @@ -612,7 +622,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
{
// This is Ghetto. Voices should be ini lines in the special power entry. You shouldn't have to
// add to an enum to get a new voice
if ( localPlayer == getObject()->getControllingPlayer() )
if ( localPlayer == controllingPlayer )
{
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_GPS_Scrambler);
}
Expand All @@ -628,7 +638,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )
}
else if (type == SPECIAL_SNEAK_ATTACK)
{
if ( localPlayer == getObject()->getControllingPlayer() )
if ( localPlayer == controllingPlayer )
{
TheEva->setShouldPlay(EVA_SuperweaponLaunched_Own_Sneak_Attack);
}
Expand Down Expand Up @@ -658,7 +668,7 @@ void SpecialPowerModule::aboutToDoSpecialPower( const Coord3D *location )

AudioEventRTS soundAtLocation = *modData->m_specialPowerTemplate->getInitiateAtTargetSound();
soundAtLocation.setPosition( location );
soundAtLocation.setPlayerIndex(getObject()->getControllingPlayer()->getPlayerIndex());
soundAtLocation.setPlayerIndex(controllingPlayer->getPlayerIndex());
TheAudio->addAudioEvent( &soundAtLocation );

}
Expand Down
Loading