summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-12-13 22:38:45 +0000
committerDarkvater <darkvater@openttd.org>2006-12-13 22:38:45 +0000
commitdd42d07d2a268e836bfcbc70f73764c454637822 (patch)
treed32bf237881c597a491fef3ecc20f00c5c277cbd
parenta10dc3067a9ef7b3740b1454739eaf77dc42d9eb (diff)
downloadopenttd-dd42d07d2a268e836bfcbc70f73764c454637822.tar.xz
(svn r7494) -Fix: Really disable AI's in Multiplayer if you tell it so. In loaded games with
AI's the setting didn't take effect, resulting in immediate desyncs.
-rw-r--r--ai/ai.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ai/ai.c b/ai/ai.c
index 8068227d0..f06ba06f6 100644
--- a/ai/ai.c
+++ b/ai/ai.c
@@ -170,8 +170,8 @@ void AI_RunGameLoop(void)
/* Don't do anything if ai is disabled */
if (!_ai.enabled) return;
- /* Don't do anything if we are a network-client */
- if (_networking && !_network_server) return;
+ /* Don't do anything if we are a network-client, or the AI has been disabled */
+ if (_networking && (!_network_server || !_patches.ai_in_multiplayer)) return;
/* New tick */
_ai.tick++;