dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/openttd.cpp
#	src/video/dedicated_v.cpp
This commit is contained in:
Jonathan G Rennison
2023-03-16 20:43:11 +00:00
parent 4dc846949c 0bf6d80cd7
commit 062d57eadb
9 changed files with 264 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/openttd.cpp
View File

@@ -1195,39 +1195,53 @@ bool SafeLoad(const std::string &filename, SaveLoadOperation fop, DetailedFileTy
_game_mode = newgm;
switch (lf == nullptr ? SaveOrLoad(filename, fop, dft, subdir) : LoadWithFilter(lf)) {
case SL_OK: return true;
SaveOrLoadResult result = (lf == nullptr) ? SaveOrLoad(filename, fop, dft, subdir) : LoadWithFilter(lf);
if (result == SL_OK) return true;
case SL_REINIT:
if (error_detail != nullptr) *error_detail = GetSaveLoadErrorString();
if (_network_dedicated) {
/*
* We need to reinit a network map...
* We can't simply load the intro game here as that game has many
* special cases which make clients desync immediately. So we fall
* back to just generating a new game with the current settings.
*/
DEBUG(net, 0, "Loading game failed, so a new (random) game will be started");
MakeNewGame(false, true);
return false;
}
if (_network_server) {
/* We can't load the intro game as server, so disconnect first. */
NetworkDisconnect();
}
if (error_detail != nullptr) *error_detail = GetSaveLoadErrorString();
switch (ogm) {
default:
case GM_MENU: LoadIntroGame(); break;
case GM_EDITOR: MakeNewEditorWorld(); break;
}
return false;
default:
if (error_detail != nullptr) *error_detail = GetSaveLoadErrorString();
_game_mode = ogm;
return false;
if (_network_dedicated && ogm == GM_MENU) {
/*
* If we are a dedicated server *and* we just were in the menu, then we
* are loading the first savegame. If that fails, not starting the
* server is a better reaction than starting the server with a newly
* generated map as it is quite likely to be started from a script.
*/
DEBUG(net, 0, "Loading requested map failed; closing server.");
_exit_game = true;
return false;
}
if (result != SL_REINIT) {
_game_mode = ogm;
return false;
}
if (_network_dedicated) {
/*
* If we are a dedicated server, have already loaded/started a game,
* and then loading the savegame fails in a manner that we need to
* reinitialize everything. We must not fall back into the menu mode
* with the intro game, as that is unjoinable by clients. So there is
* nothing else to do than start a new game, as it might have failed
* trying to reload the originally loaded savegame/scenario.
*/
DEBUG(net, 0, "Loading game failed, so a new (random) game will be started");
MakeNewGame(false, true);
return false;
}
if (_network_server) {
/* We can't load the intro game as server, so disconnect first. */
NetworkDisconnect();
}
switch (ogm) {
default:
case GM_MENU: LoadIntroGame(); break;
case GM_EDITOR: MakeNewEditorWorld(); break;
}
return false;
}
void SwitchToMode(SwitchMode new_mode)