[quake3-commits] r2393 - trunk/code/game

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-12-28 20:45:11 -0500 (Fri, 28 Dec 2012)
New Revision: 2393

Modified:
   trunk/code/game/g_client.c
Log:
- Fix spectator client being switched from follow to free after map_restart if following a client with a higher client number.
- Fix client unlinking issue caused by ent->s.number being set to followed client's ps->clientNum after map_restart. Reported by Ensiform.

Modified: trunk/code/game/g_client.c
===================================================================
--- trunk/code/game/g_client.c	2012-12-20 00:15:17 UTC (rev 2392)
+++ trunk/code/game/g_client.c	2012-12-29 01:45:11 UTC (rev 2393)
@@ -1248,8 +1248,11 @@
 	client->ps.commandTime = level.time - 100;
 	ent->client->pers.cmd.serverTime = level.time;
 	ClientThink( ent-g_entities );
-	// run the presend to set anything else
-	ClientEndFrame( ent );
+	// run the presend to set anything else, follow spectators wait
+	// until all clients have been reconnected after map_restart
+	if ( ent->client->sess.spectatorState != SPECTATOR_FOLLOW ) {
+		ClientEndFrame( ent );
+	}
 
 	// clear entity state values
 	BG_PlayerStateToEntityState( &client->ps, &ent->s, qtrue );