Skip to content

Commit 87adc1a

Browse files
authored
bugfix(gui): Always show correct teams for players in the observer control bar (#1753)
1 parent 789af64 commit 87adc1a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ void ControlBar::populateObserverList( void )
274274
buttonPlayer[currentButton]->winHide(FALSE);
275275
buttonPlayer[currentButton]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
276276

277-
const GameSlot *slot = TheGameInfo->getConstSlot(currentButton);
277+
const GameSlot *slot = TheGameInfo->getConstSlot(i);
278278
Color playerColor = p->getPlayerColor();
279279
Color backColor = GameMakeColor(0, 0, 0, 255);
280280
staticTextPlayer[currentButton]->winSetEnabledTextColors( playerColor, backColor );

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ void ControlBar::populateObserverList( void )
274274
buttonPlayer[currentButton]->winHide(FALSE);
275275
buttonPlayer[currentButton]->winSetStatus( WIN_STATUS_USE_OVERLAY_STATES );
276276

277-
const GameSlot *slot = TheGameInfo->getConstSlot(currentButton);
277+
const GameSlot *slot = TheGameInfo->getConstSlot(i);
278278
Color playerColor = p->getPlayerColor();
279279
Color backColor = GameMakeColor(0, 0, 0, 255);
280280
staticTextPlayer[currentButton]->winSetEnabledTextColors( playerColor, backColor );

0 commit comments

Comments
 (0)