diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 11:51:03 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:24 +0000 |
| commit | 8ae9cc0583992f15b63ed4f62a063e46676df607 (patch) | |
| tree | cdc00079d4a4a27aa0dd5bf28fc56aba678be2e7 /src | |
| parent | fce722051b72d556671f62a3668f42dcc2ecb289 (diff) | |
Un-merge bits of svn because they interfere with stickypsec (oops)
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_cmds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 9a835acd..efcf4938 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -2662,6 +2662,10 @@ qboolean G_FollowNewClient( gentity_t *ent, int dir ) if( clientnum < 0 ) clientnum = level.maxclients - 1; + // can't follow self + if( level.clients[ clientnum ].pers.connected != CON_CONNECTED ) + continue; + // avoid selecting existing follow target if( clientnum == original && !selectAny ) continue; //effectively break; @@ -2685,10 +2689,6 @@ qboolean G_FollowNewClient( gentity_t *ent, int dir ) ent->client->pers.teamSelection ) ) continue; - // can't follow dead client - if( level.clients[ clientnum ].ps.stats[ STAT_HEALTH ] <= 0 ) - continue; - // this is good, we can use it ent->client->sess.spectatorClient = clientnum; ent->client->sess.spectatorState = SPECTATOR_FOLLOW; |