Merge branch 'master' into jgrpp

# Conflicts:
#	src/highscore_gui.cpp
#	src/lang/english.txt
This commit is contained in:
Jonathan G Rennison
2023-01-18 23:50:56 +00:00
16 changed files with 66 additions and 56 deletions

View File

@@ -125,7 +125,7 @@ struct EndGameWindow : EndGameHighScoreBaseWindow {
~EndGameWindow()
{
if (!_networking) DoCommandP(0, PM_PAUSED_NORMAL, 0, CMD_PAUSE); // unpause
ShowHighscoreTable(this->window_number, this->rank);
if (_game_mode != GM_MENU) ShowHighscoreTable(this->window_number, this->rank);
}
void OnPaint() override