(svn r7131) -Fix (r7126) which fixes (r2817) the activating of a function call that was

1. never executed before that and even if it would, it
 2. could never be executed because if it did OpenTTD would crash
This commit is contained in:
Darkvater 2006-11-11 23:08:07 +00:00
parent cab930041a
commit ff8f301066

View File

@ -860,11 +860,18 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (_local_player != _network_playas) { if (_local_player != _network_playas) {
assert(_local_player == PLAYER_SPECTATOR && _network_playas == p->index); assert(_local_player == PLAYER_SPECTATOR && _network_playas == p->index);
_local_player = p->index; _local_player = p->index;
DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_SET_AUTOREPLACE);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
} }
/* Now that we have a new player, broadcast its autorenew settings to
* all clients so everything is in sync */
DoCommand(0,
(_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4,
_patches.autorenew_money,
DC_EXEC,
CMD_SET_AUTOREPLACE
);
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
if (_network_server) { if (_network_server) {
/* XXX - UGLY! p2 (pid) is mis-used to fetch the client-id, done at /* XXX - UGLY! p2 (pid) is mis-used to fetch the client-id, done at