diff options
| -rw-r--r-- | network_client.c | 6 | ||||
| -rw-r--r-- | players.c | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/network_client.c b/network_client.c index 1ac821fc1..524a7b018 100644 --- a/network_client.c +++ b/network_client.c @@ -508,12 +508,6 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) _local_player = _network_playas - 1; DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); } - - // Remeber the player - if (_local_player != OWNER_SPECTATOR) - _network_playas = _local_player + 1; - else - _network_playas = OWNER_SPECTATOR; } return NETWORK_RECV_STATUS_OKAY; @@ -653,8 +653,11 @@ int32 CmdPlayerCtrl(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (p != NULL) { if (_local_player == OWNER_SPECTATOR) { - _local_player = p->index; - MarkWholeScreenDirty(); + /* Check if we do not want to be a spectator in network */ + if (!_networking || _network_server || _network_playas != OWNER_SPECTATOR) { + _local_player = p->index; + MarkWholeScreenDirty(); + } } #ifdef ENABLE_NETWORK if (_network_server) { |