(svn r9529) -Fix [FS#705]: when 2 clients joined together, the second asserted on the NewCompany command of the first

18 years ago · 9d7497c837
parent fab0c38ddf
commit 9d7497c837
1 changed files with 2 additions and 2 deletions
--- 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) {
+		if (_local_player != _network_playas && _network_playas == p->index) {
-			assert(_local_player == PLAYER_SPECTATOR && _network_playas == p->index);
+			assert(_local_player == PLAYER_SPECTATOR);
 			SetLocalPlayer(p->index);
 			MarkWholeScreenDirty();
 		}