diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2011-01-27 14:58:06 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:56 +0000 |
| commit | dc3114db78bda3b4485f47afbd99eeb61ca34d7c (patch) | |
| tree | 6da224d7dc30c1bd8d30d55491c3f7f7ae21f7cc | |
| parent | f146092d622b58d8d224f8763c521494555e65d6 (diff) | |
* Three minor cleanups (/dev/humancontroller)
- Properly initialize cvartable entry for g_teamforcebalance
- Properly remove the "which" command on shutdown
- Clear all SS_ flags on stopping spectating instead of just wallwalk so free spectators don't get stuck with slowblob or whatever
| -rw-r--r-- | src/game/g_cmds.c | 2 | ||||
| -rw-r--r-- | src/game/g_main.c | 2 | ||||
| -rw-r--r-- | src/qcommon/files.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 3ef818ab..49603c39 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -2524,7 +2524,7 @@ void G_StopFollowing( gentity_t *ent ) } ent->client->sess.spectatorClient = -1; ent->client->ps.pm_flags &= ~PMF_FOLLOW; - ent->client->ps.stats[ STAT_STATE ] &= ~SS_WALLCLIMBING; + ent->client->ps.stats[ STAT_STATE ] = 0; ent->client->ps.stats[ STAT_VIEWLOCK ] = 0; ent->client->ps.eFlags &= ~( EF_WALLCLIMB | EF_WALLCLIMBCEILING ); ent->client->ps.viewangles[ PITCH ] = 0.0f; diff --git a/src/game/g_main.c b/src/game/g_main.c index e28effd4..196e6a8b 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -176,7 +176,7 @@ static cvarTable_t gameCvarTable[ ] = { &g_friendlyBuildableFire, "g_friendlyBuildableFire", "0", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qtrue }, { &g_dretchPunt, "g_dretchPunt", "1", CVAR_ARCHIVE, 0, qtrue }, - { &g_teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE }, + { &g_teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE, 0, qtrue }, { &g_warmup, "g_warmup", "10", CVAR_ARCHIVE, 0, qtrue }, { &g_doWarmup, "g_doWarmup", "0", CVAR_ARCHIVE, 0, qtrue }, diff --git a/src/qcommon/files.c b/src/qcommon/files.c index 807be3f5..cae3da7f 100644 --- a/src/qcommon/files.c +++ b/src/qcommon/files.c @@ -2800,6 +2800,7 @@ void FS_Shutdown( qboolean closemfp ) { Cmd_RemoveCommand( "dir" ); Cmd_RemoveCommand( "fdir" ); Cmd_RemoveCommand( "touchFile" ); + Cmd_RemoveCommand( "which" ); #ifdef FS_MISSING if (closemfp) { |