cpp/openttd-patchpack/source Changeset - r13522:764fd8565e70

Changeset - r13522:764fd8565e70

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 15 years ago 2009-11-12 20:38:52
rubidium@openttd.org

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

1 file changed with 8 insertions and 18 deletions:

src/console_cmds.cpp

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -488,22 +488,15 @@ DEF_CONSOLE_CMD(ConPauseGame) @@
+{
 	if (argc == 0) {
 		IConsoleHelp("Pause a network game. Usage: 'pause'");
 		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.");
+	}
 	return true;
+}
@@ @@ -512,22 +505,19 @@ DEF_CONSOLE_CMD(ConUnPauseGame) @@
+{
 	if (argc == 0) {
 		IConsoleHelp("Unpause a network game. Usage: 'unpause'");
 		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.");
+	}
 	return true;
+}

0 comments (0 inline, 0 general)