Skip to content

[GEN][ZH] Fix CONTINUE button mistakenly shown in Replay Score Screen #1196

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 1 commit into from
Jun 26, 2025
Merged

[GEN][ZH] Fix CONTINUE button mistakenly shown in Replay Score Screen #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 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 @@ -412,9 +412,12 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,

} // end MainMenuInput

static Bool showButtonContinue()
static Bool showReplayButtonContinue()
{
return ReplaySimulation::getCurrentReplayIndex() != ReplaySimulation::getReplayCount()-1;
bool hasSimulationReplay = ReplaySimulation::getReplayCount() > 0;
bool isLastSimulationReplay = ReplaySimulation::getCurrentReplayIndex() == ReplaySimulation::getReplayCount()-1;

return hasSimulationReplay && !isLastSimulationReplay;
}

/** System Function for the ScoreScreen */
Expand Down Expand Up @@ -819,7 +822,7 @@ void initReplaySinglePlayer( void )
if (chatBoxBorder)
chatBoxBorder->winHide(TRUE);
if (buttonContinue)
buttonContinue->winHide(!showButtonContinue());
buttonContinue->winHide(!showReplayButtonContinue());
if (buttonBuddies)
buttonBuddies->winHide(TRUE);
if (listboxChatWindowScoreScreen)
Expand Down Expand Up @@ -905,7 +908,7 @@ void initReplayMultiPlayer(void)
if (chatBoxBorder)
chatBoxBorder->winHide(TRUE);
if (buttonContinue)
buttonContinue->winHide(!showButtonContinue());
buttonContinue->winHide(!showReplayButtonContinue());
if (buttonBuddies)
buttonBuddies->winHide(TRUE);
// if (buttonRehost)
Expand Down
11 changes: 7 additions & 4 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 @@ -504,9 +504,12 @@ WindowMsgHandledType ScoreScreenInput( GameWindow *window, UnsignedInt msg,

} // end MainMenuInput

static Bool showButtonContinue()
static Bool showReplayButtonContinue()
{
return ReplaySimulation::getCurrentReplayIndex() != ReplaySimulation::getReplayCount()-1;
bool hasSimulationReplay = ReplaySimulation::getReplayCount() > 0;
bool isLastSimulationReplay = ReplaySimulation::getCurrentReplayIndex() == ReplaySimulation::getReplayCount()-1;

return hasSimulationReplay && !isLastSimulationReplay;
}

/** System Function for the ScoreScreen */
Expand Down Expand Up @@ -1003,7 +1006,7 @@ void initReplaySinglePlayer( void )
if (chatBoxBorder)
chatBoxBorder->winHide(TRUE);
if (buttonContinue)
buttonContinue->winHide(!showButtonContinue());
buttonContinue->winHide(!showReplayButtonContinue());
if (buttonBuddies)
buttonBuddies->winHide(TRUE);
if (listboxChatWindowScoreScreen)
Expand Down Expand Up @@ -1110,7 +1113,7 @@ void initReplayMultiPlayer(void)
if (chatBoxBorder)
chatBoxBorder->winHide(TRUE);
if (buttonContinue)
buttonContinue->winHide(!showButtonContinue());
buttonContinue->winHide(!showReplayButtonContinue());
if (buttonBuddies)
buttonBuddies->winHide(TRUE);
// if (buttonRehost)
Expand Down
Loading