summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2005-11-29 16:06:06 +0000
committertruelight <truelight@openttd.org>2005-11-29 16:06:06 +0000
commit44c70c24d3e205592d8052d0a876f8cdf5912ce1 (patch)
tree8b7f265c59098ba43b43718499f68844752e0c9c
parentc963c59b672b18e1b67eb859b83d69eb17eac647 (diff)
downloadopenttd-44c70c24d3e205592d8052d0a876f8cdf5912ce1.tar.xz
(svn r3246) -Fix: small glitch in ai_network_client code (network_client.c)
-Fix: make sure this glitch can never happen again (ai.c)
-rw-r--r--ai/ai.c2
-rw-r--r--network_client.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ai/ai.c b/ai/ai.c
index 42465914d..516a86cc6 100644
--- a/ai/ai.c
+++ b/ai/ai.c
@@ -250,6 +250,8 @@ void AI_LoadAIControl(void)
*/
void AI_StartNewAI(PlayerID player)
{
+ assert(player < MAX_PLAYERS);
+
#ifdef GPMI
/* Keep this in a different IF, because the function can turn _ai.gpmi off!! */
if (_ai.gpmi && _ai.gpmi_mod == NULL)
diff --git a/network_client.c b/network_client.c
index 0f552f4a3..de22bb9e0 100644
--- a/network_client.c
+++ b/network_client.c
@@ -346,8 +346,8 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO)
if (index == _network_own_client_index) {
_network_playas = playas;
- /* Are we a ai-network-client? */
- if (_ai.network_client) {
+ /* Are we a ai-network-client? Are we not joining as a SPECTATOR (playas == 0, means SPECTATOR) */
+ if (_ai.network_client && playas != 0) {
if (_ai.network_playas == OWNER_SPECTATOR)
AI_StartNewAI(playas - 1);