summaryrefslogtreecommitdiff
path: root/src/cgame/cg_event.c
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2015-06-26 11:34:41 +0200
committerPaweł Redman <pawel.redman@gmail.com>2015-06-26 13:17:24 +0200
commite99ab52825d6b713a12a8ee19b5eaa81e78db28e (patch)
tree6e05d09962f6c6109e799082de9f62796a5b905d /src/cgame/cg_event.c
parent1895729b01532be9589d3606c331cc8f9ca9a9e3 (diff)
More Wraith changes.
Diffstat (limited to 'src/cgame/cg_event.c')
-rw-r--r--src/cgame/cg_event.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 4ce475e..4ce2b25 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -135,6 +135,9 @@ static void CG_Obituary( entityState_t *ent )
case MOD_SPITEFUL_ABCESS:
message = "^5was raped by a Spiteful Abcess";
break;
+ case MOD_WARP_BLOCKED:
+ message = "^5warped into a wall";
+ break;
default:
message = NULL;
break;
@@ -644,6 +647,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
ci = &cgs.clientinfo[ clientNum ];
if( ci->team != cg.snap->ps.stats[ STAT_TEAM ] &&
+ cg.snap->ps.stats[ STAT_TEAM ] != TEAM_NONE &&
( es->eFlags & EF_WARPING ) )
{
warpingEnemyWraith = qtrue;