diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 12:10:20 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:43 +0000 |
| commit | 609cf594b65b92c2d8e2041f67dcf01f40896e4d (patch) | |
| tree | 6ee9aac51de356fb6cf9f2ee0f7a928b2ce22b78 | |
| parent | 8e61c2f6d2451d320314b26e600bd8e0b636c8b0 (diff) | |
* Fix spectator occasionally displaying crosshairs
* Fix reference to function not defined in .sos
| -rw-r--r-- | src/cgame/cg_main.c | 4 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 55396704..9f7d26d5 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -1440,9 +1440,9 @@ static qboolean CG_ClientIsReady( int clientNum ) if( isdigit( *s ) ) val = *s - '0'; - else if( isxlower( *s ) ) + else if( *s >= 'a' && *s <= 'f' ) val = 10 + *s - 'a'; - else if( isxupper( *s ) ) + else if( *s >= 'A' && *s <= 'F' ) val = 10 + *s - 'A'; else return qfalse; diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index db8a37b9..888e678e 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -2454,13 +2454,15 @@ void G_StopFollowing( gentity_t *ent ) if( ent->client->pers.teamSelection == TEAM_NONE ) { - ent->client->sess.spectatorState = SPECTATOR_FREE; + ent->client->sess.spectatorState = + ent->client->ps.persistant[ PERS_SPECSTATE ] = SPECTATOR_FREE; } else { vec3_t spawn_origin, spawn_angles; - ent->client->sess.spectatorState = SPECTATOR_LOCKED; + ent->client->sess.spectatorState = + ent->client->ps.persistant[ PERS_SPECSTATE ] = SPECTATOR_LOCKED; if( ent->client->pers.teamSelection == TEAM_ALIENS ) G_SelectAlienLockSpawnPoint( spawn_origin, spawn_angles ); |