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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	os/macosx/Info.plist.in
#	src/fileio.cpp
#	src/landscape.cpp
#	src/league_cmd.h
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2022-12-17 23:19:23 +00:00
parent 6fadbe117c 888c9172e0
commit 3435e74c0c
81 changed files with 626 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saveload/ai_sl.cpp
View File

@@ -69,7 +69,7 @@ static void Load_AIPL()
_ai_saveload_version = -1;
SlObject(nullptr, _ai_company);
if (_networking && !_network_server) {
if (_game_mode == GM_MENU || (_networking && !_network_server)) {
if (Company::IsValidAiID(index)) AIInstance::LoadEmpty();
continue;
}

2
src/saveload/game_sl.cpp
View File

@@ -62,7 +62,7 @@ static void Load_GSDT()
_game_saveload_version = -1;
SlObject(nullptr, _game_script);
if (_networking && !_network_server) {
if (_game_mode == GM_MENU || (_networking && !_network_server)) {
GameInstance::LoadEmpty();
if ((CompanyID)SlIterateArray() != (CompanyID)-1) SlErrorCorrupt("Too many GameScript configs");
return;

2
src/saveload/upstream/ai_sl.cpp
View File

@@ -79,7 +79,7 @@ struct AIPLChunkHandler : ChunkHandler {
_ai_saveload_version = -1;
SlObject(nullptr, slt);
if (_networking && !_network_server) {
if (_game_mode == GM_MENU || (_networking && !_network_server)) {
if (Company::IsValidAiID(index)) AIInstance::LoadEmpty();
continue;
}

2
src/saveload/upstream/game_sl.cpp
View File

@@ -73,7 +73,7 @@ struct GSDTChunkHandler : ChunkHandler {
_game_saveload_version = -1;
SlObject(nullptr, slt);
if (_networking && !_network_server) {
if (_game_mode == GM_MENU || (_networking && !_network_server)) {
GameInstance::LoadEmpty();
if (SlIterateArray() != -1) SlErrorCorrupt("Too many GameScript configs");
return;