From a76488861990d586352e3d4e5f7686be782480c3 Mon Sep 17 00:00:00 2001 From: truelight Date: Fri, 30 Mar 2007 22:17:47 +0000 Subject: [PATCH] (svn r9529) -Fix [FS#705]: when 2 clients joined together, the second asserted on the NewCompany command of the first --- src/players.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/players.cpp b/src/players.cpp index 62123ed7e4..32ec427257 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -821,8 +821,8 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) } /* This is the joining client who wants a new company */ - if (_local_player != _network_playas) { - assert(_local_player == PLAYER_SPECTATOR && _network_playas == p->index); + if (_local_player != _network_playas && _network_playas == p->index) { + assert(_local_player == PLAYER_SPECTATOR); SetLocalPlayer(p->index); MarkWholeScreenDirty(); }