diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 12:15:17 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:47 +0000 |
| commit | bbf9693d114d11df15b8e9157a134733e4aa49bd (patch) | |
| tree | ea3b93a16c0aca311400a8bc566d38b439a667fa /src/game/g_active.c | |
| parent | 0dff9796f8a2921844e84eaa00a550a0b6dcac09 (diff) | |
* Remove SS_INFESTING and PM_SPINTERMISSION since they were not used
* Merge SS_WALLCLIMBINGCEILING and EF_WALLCLIMBCEILING
* Remove ui_emoticons, using the value of cg_emoticons for both contexts.
* Add PM_Paralyzed() to get rid of all the silly >= PM_DEAD comparisons
* Don't allow players to taunt while dead
* Fix full ammo check in reload (oops)
* Fiddle with bg_lib.h _MAX/_MIN defines, fix min(), add [u]intX_t typedefs
* Remove non-functional cgame command (thanks Amanieu for spotting)
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index c5f1bd8e..8b3b79fc 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -360,7 +360,6 @@ void G_TouchTriggers( gentity_t *ent ) // ignore most entities if a spectator if( ( ent->client->sess.spectatorState != SPECTATOR_NOT ) || - ( ent->client->ps.stats[ STAT_STATE ] & SS_INFESTING ) || ( ent->client->ps.stats[ STAT_STATE ] & SS_HOVELING ) ) { if( hit->s.eType != ET_TELEPORT_TRIGGER && @@ -1406,8 +1405,7 @@ void ClientThink_real( gentity_t *ent ) client->ps.pm_type = PM_NOCLIP; else if( client->ps.stats[ STAT_HEALTH ] <= 0 ) client->ps.pm_type = PM_DEAD; - else if( client->ps.stats[ STAT_STATE ] & SS_INFESTING || - client->ps.stats[ STAT_STATE ] & SS_HOVELING ) + else if( client->ps.stats[ STAT_STATE ] & SS_HOVELING ) client->ps.pm_type = PM_FREEZE; else if( client->ps.stats[ STAT_STATE ] & SS_BLOBLOCKED || client->ps.stats[ STAT_STATE ] & SS_GRABBED ) @@ -1538,8 +1536,7 @@ void ClientThink_real( gentity_t *ent ) if( pm.ps->pm_type == PM_DEAD ) pm.tracemask = MASK_DEADSOLID; - if( pm.ps->stats[ STAT_STATE ] & SS_INFESTING || - pm.ps->stats[ STAT_STATE ] & SS_HOVELING ) + if( pm.ps->stats[ STAT_STATE ] & SS_HOVELING ) pm.tracemask = MASK_DEADSOLID; else pm.tracemask = MASK_PLAYERSOLID; |