Skip to content

refactor(gui): Remove duplicate code in score screen #1699

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
merged 2 commits into from
Oct 15, 2025
Merged

refactor(gui): Remove duplicate code in score screen #1699

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
f7a77ab
refactor: Remove duplicate buildings destroyed score screen logic
Stubbjax Oct 15, 2025
0592b1e
refactor: Remove more duplicate buildings destroyed score screen logic
Stubbjax Oct 15, 2025
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
21 changes: 0 additions & 21 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,15 +1265,6 @@ void populatePlayerInfo( Player *player, Int pos)
win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
win->winHide(FALSE);

// set the total BuildingsDestroyed
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", pos);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
winValue.format(L"%d", scoreKpr->getTotalBuildingsDestroyed());
GadgetStaticTextSetText(win, winValue);
win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
win->winHide(FALSE);

// set the total Resources
winName.format("ScoreScreen.wnd:StaticTextResources%d", pos);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
Expand Down Expand Up @@ -2035,12 +2026,6 @@ void hideWindows( Int pos )
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total BuildingsDestroyed
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total Resources
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
Expand Down Expand Up @@ -2133,12 +2118,6 @@ void setObserverWindows( Player *player, Int i )
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total BuildingsDestroyed
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total Resources
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
Expand Down
21 changes: 0 additions & 21 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,15 +1499,6 @@ void populatePlayerInfo( Player *player, Int pos)
win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
win->winHide(FALSE);

// set the total BuildingsDestroyed
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", pos);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
winValue.format(L"%d", scoreKpr->getTotalBuildingsDestroyed());
GadgetStaticTextSetText(win, winValue);
win->winSetEnabledTextColors(color, win->winGetEnabledTextBorderColor());
win->winHide(FALSE);

// set the total Resources
winName.format("ScoreScreen.wnd:StaticTextResources%d", pos);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
Expand Down Expand Up @@ -2303,12 +2294,6 @@ void hideWindows( Int pos )
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total BuildingsDestroyed
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total Resources
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
Expand Down Expand Up @@ -2401,12 +2386,6 @@ void setObserverWindows( Player *player, Int i )
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total BuildingsDestroyed
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
win->winHide(TRUE);

// set the total Resources
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
Expand Down
Loading