Skip to content

Commit 0243ce1

Browse files
StubbjaxStubbjax
committed
refactor: Reduce verbosity of viewed player conditions
1 parent f099e4d commit 0243ce1

File tree

10 files changed

+30
-68
lines changed

10 files changed

+30
-68
lines changed

‎Generals/Code/GameEngine/Include/GameClient/ControlBar.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,9 @@ class ControlBar : public SubsystemInterface
731731
void populateObserverList( void );
732732
Bool isObserverControlBarOn( void ) { return m_isObserverCommandBar;}
733733

734+
/// Returns the currently viewed player. May return NULL if no player is selected while observing.
735+
Player* getCurrentlyViewedPlayer();
736+
734737
// ControlBarResizer *getControlBarResizer( void ) {return m_controlBarResizer;}
735738

736739
// Functions for repositioning/resizing the control bar

‎Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,13 @@ void ControlBar::markUIDirty( void )
157157
#endif
158158
}
159159

160+
Player* ControlBar::getCurrentlyViewedPlayer()
161+
{
162+
if (TheControlBar->isObserverControlBarOn())
163+
return TheControlBar->getObserverLookAtPlayer();
164+
165+
return ThePlayerList->getLocalPlayer();
166+
}
160167

161168
void ControlBar::populatePurchaseScience( Player* player )
162169
{

‎Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -518,11 +518,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
518518
name = TheGameText->fetch("CONTROLBAR:Power");
519519
descrip = TheGameText->fetch("CONTROLBAR:PowerDescription");
520520

521-
Player *playerToDisplay = NULL;
522-
if(TheControlBar->isObserverControlBarOn())
523-
playerToDisplay = TheControlBar->getObserverLookAtPlayer();
524-
else
525-
playerToDisplay = ThePlayerList->getLocalPlayer();
521+
Player* playerToDisplay = TheControlBar->getCurrentlyViewedPlayer();
526522

527523
if( playerToDisplay && playerToDisplay->getEnergy() )
528524
{

‎Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,11 +1786,7 @@ void InGameUI::update( void )
17861786
// moneyWin = TheWindowManager->winGetWindowFromId( NULL, moneyWindowKey );
17871787
//
17881788
// } // end if
1789-
Player *moneyPlayer = NULL;
1790-
if( TheControlBar->isObserverControlBarOn())
1791-
moneyPlayer = TheControlBar->getObserverLookAtPlayer();
1792-
else
1793-
moneyPlayer = ThePlayerList->getLocalPlayer();
1789+
Player* moneyPlayer = TheControlBar->getCurrentlyViewedPlayer();
17941790
if( moneyPlayer)
17951791
{
17961792
Int currentMoney = moneyPlayer->getMoney()->countMoney();

‎Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
125125
//const Image *beginBar = NULL;
126126
const Image *centerBar = NULL;
127127
static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
128-
Player *player = NULL;
129-
if(TheControlBar->isObserverControlBarOn())
130-
{
131-
player = TheControlBar->getObserverLookAtPlayer();
132-
}
133-
else
134-
player = ThePlayerList->getLocalPlayer();
135-
136-
128+
Player* player = TheControlBar->getCurrentlyViewedPlayer();
137129

138130
if(!player || !TheGlobalData)
139131
return;
@@ -292,15 +284,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
292284
const Image *beginBar = NULL;
293285
const Image *centerBar = NULL;
294286
static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
295-
Player *player = NULL;
296-
if(TheControlBar->isObserverControlBarOn())
297-
{
298-
player = TheControlBar->getObserverLookAtPlayer();
299-
}
300-
else
301-
player = ThePlayerList->getLocalPlayer();
302-
303-
287+
Player* player = TheControlBar->getCurrentlyViewedPlayer();
304288

305289
if(!player || !TheGlobalData)
306290
return;
@@ -486,13 +470,8 @@ void W3DCommandBarGridDraw( GameWindow *window, WinInstanceData *instData )
486470

487471
void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
488472
{
489-
Player* player = NULL;
490-
491473
// TheSuperHackers @bugfix Stubbjax 08/08/2025 Show the experience bar for observers
492-
if (TheControlBar->isObserverControlBarOn())
493-
player = TheControlBar->getObserverLookAtPlayer();
494-
else
495-
player = ThePlayerList->getLocalPlayer();
474+
Player* player = TheControlBar->getCurrentlyViewedPlayer();
496475

497476
if (!player)
498477
return;

‎GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,9 @@ class ControlBar : public SubsystemInterface
745745
void populateObserverList( void );
746746
Bool isObserverControlBarOn( void ) { return m_isObserverCommandBar;}
747747

748+
/// Returns the currently viewed player. May return NULL if no player is selected while observing.
749+
Player* getCurrentlyViewedPlayer();
750+
748751
// ControlBarResizer *getControlBarResizer( void ) {return m_controlBarResizer;}
749752

750753
// Functions for repositioning/resizing the control bar

‎GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,13 @@ void ControlBar::markUIDirty( void )
158158
#endif
159159
}
160160

161+
Player* ControlBar::getCurrentlyViewedPlayer()
162+
{
163+
if (TheControlBar->isObserverControlBarOn())
164+
return TheControlBar->getObserverLookAtPlayer();
165+
166+
return ThePlayerList->getLocalPlayer();
167+
}
161168

162169
void ControlBar::populatePurchaseScience( Player* player )
163170
{

‎GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -567,11 +567,7 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
567567
name = TheGameText->fetch("CONTROLBAR:Power");
568568
descrip = TheGameText->fetch("CONTROLBAR:PowerDescription");
569569

570-
Player *playerToDisplay = NULL;
571-
if(TheControlBar->isObserverControlBarOn())
572-
playerToDisplay = TheControlBar->getObserverLookAtPlayer();
573-
else
574-
playerToDisplay = ThePlayerList->getLocalPlayer();
570+
Player* playerToDisplay = TheControlBar->getCurrentlyViewedPlayer();
575571

576572
if( playerToDisplay && playerToDisplay->getEnergy() )
577573
{

‎GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,11 +1842,7 @@ void InGameUI::update( void )
18421842
// moneyWin = TheWindowManager->winGetWindowFromId( NULL, moneyWindowKey );
18431843
//
18441844
// } // end if
1845-
Player *moneyPlayer = NULL;
1846-
if( TheControlBar->isObserverControlBarOn())
1847-
moneyPlayer = TheControlBar->getObserverLookAtPlayer();
1848-
else
1849-
moneyPlayer = ThePlayerList->getLocalPlayer();
1845+
Player* moneyPlayer = TheControlBar->getCurrentlyViewedPlayer();
18501846
if( moneyPlayer)
18511847
{
18521848
Int currentMoney = moneyPlayer->getMoney()->countMoney();

‎GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,7 @@ void W3DPowerDraw( GameWindow *window, WinInstanceData *instData )
125125
//const Image *beginBar = NULL;
126126
const Image *centerBar = NULL;
127127
static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
128-
Player *player = NULL;
129-
if(TheControlBar->isObserverControlBarOn())
130-
{
131-
player = TheControlBar->getObserverLookAtPlayer();
132-
}
133-
else
134-
player = ThePlayerList->getLocalPlayer();
135-
136-
128+
Player* player = TheControlBar->getCurrentlyViewedPlayer();
137129

138130
if(!player || !TheGlobalData)
139131
return;
@@ -292,15 +284,7 @@ void W3DPowerDrawA( GameWindow *window, WinInstanceData *instData )
292284
const Image *beginBar = NULL;
293285
const Image *centerBar = NULL;
294286
static const Image *slider = TheMappedImageCollection->findImageByName("PowerBarSlider");
295-
Player *player = NULL;
296-
if(TheControlBar->isObserverControlBarOn())
297-
{
298-
player = TheControlBar->getObserverLookAtPlayer();
299-
}
300-
else
301-
player = ThePlayerList->getLocalPlayer();
302-
303-
287+
Player* player = TheControlBar->getCurrentlyViewedPlayer();
304288

305289
if(!player || !TheGlobalData)
306290
return;
@@ -486,13 +470,8 @@ void W3DCommandBarGridDraw( GameWindow *window, WinInstanceData *instData )
486470

487471
void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
488472
{
489-
Player* player = NULL;
490-
491473
// TheSuperHackers @bugfix Stubbjax 08/08/2025 Show the experience bar for observers
492-
if (TheControlBar->isObserverControlBarOn())
493-
player = TheControlBar->getObserverLookAtPlayer();
494-
else
495-
player = ThePlayerList->getLocalPlayer();
474+
Player* player = TheControlBar->getCurrentlyViewedPlayer();
496475

497476
if (!player)
498477
return;

0 commit comments

Comments
 (0)