Mercurial > hg > openttd

changeset 6399:ca7267076ce4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r9529) -Fix [FS#705]: when 2 clients joined together, the second asserted on the NewCompany command of the first
author truelight <truelight@openttd.org>
date Fri, 30 Mar 2007 22:17:47 +0000
parents e8a93d125d69
children a7e45bc879a6
files src/players.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/players.cpp
+++ b/src/players.cpp
@@ -821,8 +821,8 @@
 		}
 
 		/* 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();
 		}