summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoman Tetelman <kevlarman@gmail.com>2009-10-03 13:03:39 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:26 +0000
commit4f5ad70bead13bb2b77734d9828befa1c1c95bc5 (patch)
tree08f13df1faa670769f64c6bfc05477d1dea5ac5a /src
parent985e0fc9942d331fdac5b4cce1b3dfad66dbed58 (diff)
* spectating teammates no longer copies their credits, borrowed from lakitu7 (fixes #78)
Diffstat (limited to 'src')
-rw-r--r--src/game/g_client.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c
index ea4aab82..911d9792 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1388,6 +1388,10 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn, vec3_t origin, vec3_t angles
else if( client->pers.classSelection == PCL_NONE )
client->sess.spectatorState = SPECTATOR_LOCKED;
+ // if client is dead and following teammate, stop following before spawning
+ if( ent->client->sess.spectatorState == SPECTATOR_FOLLOW )
+ G_StopFollowing( ent );
+
if( origin != NULL )
VectorCopy( origin, spawn_origin );