From 2f6a26ab2d8b8781dc78063f54e0102e5191c63a Mon Sep 17 00:00:00 2001 From: truelight Date: Wed, 15 Dec 2004 21:13:52 +0000 Subject: (svn r1108) -Fix: [Network] Fixed problem around slow clients: They joined, they got the map, but it took some time before the new player was created. In this time a player could do stuff, causing a player-id-mismatch, and the player was kicked out. Now a player get's a nice GUI which says: registering.. When that is gone, the player is joined and can play safely. Tnx to Moriarty for bugging me with this bug ;) --- players.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'players.c') diff --git a/players.c b/players.c index 039654df3..603d1ead7 100644 --- a/players.c +++ b/players.c @@ -643,6 +643,13 @@ int32 CmdPlayerCtrl(int x, int y, uint32 flags, uint32 p1, uint32 p2) switch(p1 & 0xff) { case 0: // make new player p = DoStartupNewPlayer(false); + +#ifdef ENABLE_NETWORK + if (_networking && !_network_server && _local_player == OWNER_SPECTATOR) + /* In case we are a client joining a server... */ + DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); +#endif /* ENABLE_NETWORK */ + if (p != NULL) { if (_local_player == OWNER_SPECTATOR) { _local_player = p->index; -- cgit v1.2.3-54-g00ecf