Skip to content

Commit 0592b1e

Browse files
committed
refactor: Remove more duplicate buildings destroyed score screen logic
1 parent f7a77ab commit 0592b1e

File tree

2 files changed

+0
-24
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus
  • Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus

2 files changed

+0
-24
lines changed

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,12 +2026,6 @@ void hideWindows( Int pos )
20262026
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
20272027
win->winHide(TRUE);
20282028

2029-
// set the total BuildingsDestroyed
2030-
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
2031-
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
2032-
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
2033-
win->winHide(TRUE);
2034-
20352029
// set the total Resources
20362030
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
20372031
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
@@ -2124,12 +2118,6 @@ void setObserverWindows( Player *player, Int i )
21242118
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
21252119
win->winHide(TRUE);
21262120

2127-
// set the total BuildingsDestroyed
2128-
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
2129-
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
2130-
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
2131-
win->winHide(TRUE);
2132-
21332121
// set the total Resources
21342122
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
21352123
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,12 +2294,6 @@ void hideWindows( Int pos )
22942294
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
22952295
win->winHide(TRUE);
22962296

2297-
// set the total BuildingsDestroyed
2298-
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
2299-
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
2300-
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
2301-
win->winHide(TRUE);
2302-
23032297
// set the total Resources
23042298
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
23052299
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
@@ -2392,12 +2386,6 @@ void setObserverWindows( Player *player, Int i )
23922386
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
23932387
win->winHide(TRUE);
23942388

2395-
// set the total BuildingsDestroyed
2396-
winName.format("ScoreScreen.wnd:StaticTextBuildingsDestroyed%d", i);
2397-
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );
2398-
DEBUG_ASSERTCRASH(win,("Could not find window %s on the score screen", winName.str()));
2399-
win->winHide(TRUE);
2400-
24012389
// set the total Resources
24022390
winName.format("ScoreScreen.wnd:StaticTextResources%d", i);
24032391
win = TheWindowManager->winGetWindowFromId( parent, TheNameKeyGenerator->nameToKey( winName ) );

0 commit comments

Comments
 (0)