mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r1169) -Fix: [Network] [ 1087591 ] When you want to be a spectator, you now 

stay a spectator even if someone else joins.
This commit is contained in:
truelight 2004-12-19 10:24:45 +00:00
parent 0e19f74c16
commit 4d94803d32
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network_client.c
View File

@ -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;

7
players.c
View File

@ -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) {