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/ai/ai_gui.cpp
#	src/company_cmd.cpp
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/korean.txt
#	src/lang/slovak.txt
#	src/main_gui.cpp
#	src/video/sdl2_v.cpp
This commit is contained in:
Jonathan G Rennison
2021-02-01 19:34:30 +00:00
parent 7154f8859d 069fb54253
commit 650d5e014e
24 changed files with 1449 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/console_cmds.cpp
View File

@@ -158,7 +158,7 @@ DEF_CONSOLE_HOOK(ConHookNeedNetwork)
}
/**
* Check whether we are in single player mode.
* Check whether we are in singleplayer mode.
* @return True when no network is active.
*/
DEF_CONSOLE_HOOK(ConHookNoNetwork)
@@ -1317,7 +1317,8 @@ DEF_CONSOLE_CMD(ConReloadAI)
return true;
}
if (Company::IsHumanID(company_id)) {
/* In singleplayer mode the player can be in an AI company, after cheating or loading network save with an AI in first slot. */
if (Company::IsHumanID(company_id) || company_id == _local_company) {
IConsoleWarning("Company is not controlled by an AI.");
return true;
}
@@ -1354,6 +1355,7 @@ DEF_CONSOLE_CMD(ConStopAI)
return true;
}
/* In singleplayer mode the player can be in an AI company, after cheating or loading network save with an AI in first slot. */
if (Company::IsHumanID(company_id) || company_id == _local_company) {
IConsoleWarning("Company is not controlled by an AI.");
return true;