summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network_client.c3
-rw-r--r--network_server.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/network_client.c b/network_client.c
index 8f6379a67..836c0611d 100644
--- a/network_client.c
+++ b/network_client.c
@@ -521,9 +521,8 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
} else {
/* We have arrived and ready to start playing; send a command to make a new player;
* the server will give us a client-id and let us in */
- _local_player = 0;
- NetworkSend_Command(0, 0, 0, CMD_PLAYER_CTRL, NULL);
_local_player = PLAYER_SPECTATOR;
+ NetworkSend_Command(0, 0, 0, CMD_PLAYER_CTRL, NULL);
}
} else {
// take control over an existing company
diff --git a/network_server.c b/network_server.c
index e64f723e3..51c11ba83 100644
--- a/network_server.c
+++ b/network_server.c
@@ -844,6 +844,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
}
// XXX - UGLY! p2 is mis-used to get the client-id in CmdPlayerCtrl
+ cp->player = 0;
cp->p2 = cs - _clients;
}