diff options
author | Tim Angus <tim@ngus.net> | 2006-05-16 21:18:58 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2006-05-16 21:18:58 +0000 |
commit | 7e62e77d7d8a406f8800de980b67c5cb213618de (patch) | |
tree | 3ac49b1f30759aadf87679fd95511e4e92dba63d /src/game/g_active.c | |
parent | bac6bec08fe63e12578c47809823cb7ee3016c44 (diff) |
* Patches from bugs:
2677: Credit transfer,
2691: Disallow deconstruct during SD,
2698: nextweap bug on OS X,
2700: Fix to buildables underground bug,
2701: Fix to dretch exploit,
2706: Fix to jetpack uninit memory read
Diffstat (limited to 'src/game/g_active.c')
-rw-r--r-- | src/game/g_active.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 99d4c308..299ca9f9 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1140,7 +1140,7 @@ void ClientThink_real( gentity_t *ent ) memset( &pm, 0, sizeof( pm ) ); - if( !( ucmd->buttons & BUTTON_TALK ) ) //&& client->ps.weaponTime <= 0 ) //TA: erk more server load + if( !( ucmd->buttons & BUTTON_TALK ) && !( client->ps.pm_flags & PMF_RESPAWNED ) ) { switch( client->ps.weapon ) { |