Skip to content

refactor(object): Replace explicit local player checks with Object::isLocallyControlled #2512

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
xezon merged 2 commits into from
Apr 1, 2026
Merged

refactor(object): Replace explicit local player checks with Object::isLocallyControlled #2512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97806ac
refactor(object): Replace explicit local player checks with Object::i…
Caball009 Mar 30, 2026
2d0da95
Replicated in Generals (manually).
Caball009 Mar 31, 2026
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
2 changes: 1 addition & 1 deletion Core/GameEngine/Source/GameClient/SelectionInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ Bool addDrawableToList( Drawable *draw, void *userData )
{
const Object *obj = draw->getObject();
if (obj)
if (obj->getControllingPlayer() != ThePlayerList->getLocalPlayer())
if (!obj->isLocallyControlled())
if (obj->getContain() && draw->getObject()->getContain()->getContainCount() > 0)
return FALSE;
}
Expand Down
4 changes: 2 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
break;

// sanity check, the building must be under our control to cancel construction
if( building->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
if( !building->isLocallyControlled() )
break;

// do the message
Expand Down Expand Up @@ -357,7 +357,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
break;

// sanity, we must control the producer ... if this isn't true they might be hacking the game
if( producer->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
if( !producer->isLocallyControlled() )
break;

// send a message to cancel that particular production entry
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ UpdateSleepTime OverchargeBehavior::update()
enable( FALSE );

// do some UI info for the local user if this is theirs
if( ThePlayerList->getLocalPlayer() == us->getControllingPlayer() )
if( us->isLocallyControlled() )
{

// print msg
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,7 @@ void Object::attemptDamage( DamageInfo *damageInfo )
damageInfo->in.m_damageType != DAMAGE_HEALING &&
!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
m_radarData != nullptr &&
getControllingPlayer() == ThePlayerList->getLocalPlayer() )
isLocallyControlled() )
TheRadar->tryUnderAttackEvent( this );

}
Expand Down
4 changes: 2 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
break;

// sanity check, the building must be under our control to cancel construction
if( building->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
if( !building->isLocallyControlled() )
break;

// do the message
Expand Down Expand Up @@ -490,7 +490,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
break;

// sanity, we must control the producer ... if this isn't true they might be hacking the game
if( producer->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
if( !producer->isLocallyControlled() )
break;

// send a message to cancel that particular production entry
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ UpdateSleepTime OverchargeBehavior::update()
enable( FALSE );

// do some UI info for the local user if this is theirs
if( ThePlayerList->getLocalPlayer() == us->getControllingPlayer() )
if( us->isLocallyControlled() )
{

// print msg
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ void RiderChangeContain::onRemoving( Object *rider )
if( containDraw && riderDraw )
{
//Create the selection message for the rider if it's ours and SELECTED!
if( bike->getControllingPlayer() == ThePlayerList->getLocalPlayer() && containDraw->isSelected() )
if( bike->isLocallyControlled() && containDraw->isSelected() )
{
GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
teamMsg->appendBooleanArgument( FALSE );// not creating new team so pass false
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,7 +1916,7 @@ void Object::attemptDamage( DamageInfo *damageInfo )
getControllingPlayer() &&
!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
m_radarData != nullptr &&
getControllingPlayer() == ThePlayerList->getLocalPlayer() )
isLocallyControlled() )
TheRadar->tryUnderAttackEvent( this );

}
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4030,7 +4030,7 @@ void GameLogic::destroyObject( Object *obj )
//Clean up special power shortcut bars
if( obj->hasAnySpecialPower() )
{
if( ThePlayerList->getLocalPlayer() == obj->getControllingPlayer() )
if( obj->isLocallyControlled() )
{
TheControlBar->markUIDirty();
}
Expand Down
Loading