gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18053) -Codechange: remove the manual pause/unpause limitation with min_active_clients

Browse Source
This commit is contained in:
rubidium 2009-11-12 20:38:52 +00:00
parent 2a1cab4d46
commit 64ecceadda
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/console_cmds.cpp
View File

@ -491,16 +491,9 @@ DEF_CONSOLE_CMD(ConPauseGame)
return true;
}
#ifdef ENABLE_NETWORK
if (_network_dedicated && _settings_client.network.min_active_clients != 0) {
IConsolePrint(CC_WARNING, "Manual pausing is disabled. Set network.min_active_clients to 0 (disable autopausing) to enable manual pausing.");
return true;
}
#endif /* ENABLE_NETWORK */
if (_pause_mode == PM_UNPAUSED) {
if ((_pause_mode & PM_PAUSED_NORMAL) == PM_UNPAUSED) {
DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
IConsolePrint(CC_DEFAULT, "Game paused.");
if (!_networking) IConsolePrint(CC_DEFAULT, "Game paused.");
} else {
IConsolePrint(CC_DEFAULT, "Game is already paused.");
}
@ -515,16 +508,13 @@ DEF_CONSOLE_CMD(ConUnPauseGame)
return true;
}
#ifdef ENABLE_NETWORK
if (_network_dedicated && _settings_client.network.min_active_clients != 0) {
IConsolePrint(CC_WARNING, "Manual unpausing is disabled. Set network.min_active_clients to 0 (disable autopausing) to enable manual unpausing.");
return true;
}
#endif /* ENABLE_NETWORK */
if (_pause_mode != PM_UNPAUSED) {
if ((_pause_mode & PM_PAUSED_NORMAL) != PM_UNPAUSED) {
DoCommandP(0, PM_PAUSED_NORMAL, 0, CMD_PAUSE);
IConsolePrint(CC_DEFAULT, "Game unpaused.");
if (!_networking) IConsolePrint(CC_DEFAULT, "Game unpaused.");
} else if ((_pause_mode & PM_PAUSED_ERROR) != PM_UNPAUSED) {
IConsolePrint(CC_DEFAULT, "Game is in error state and cannot be unpaused via console.");
} else if (_pause_mode != PM_UNPAUSED) {
IConsolePrint(CC_DEFAULT, "Game cannot be unpaused manually; disable pause_on_join/min_active_clients.");
} else {
IConsolePrint(CC_DEFAULT, "Game is already unpaused.");
}