From f4413207a03658c719987d02fdbb87443843f43b Mon Sep 17 00:00:00 2001 From: enneract Date: Sun, 23 Nov 2014 22:29:30 +0100 Subject: Remove Smoke Grenade. --- src/cgame/cg_event.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/cgame/cg_event.c') diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index 794b8a4..d9e2f77 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -244,10 +244,7 @@ static void CG_Obituary( entityState_t *ent ) else message = "^5was terminated by own flames"; break; - - case MOD_SMOKE: - message = "^5smoked himself up"; - break; + case MOD_ABOMB: message = "^5bombed himself up"; break; @@ -357,11 +354,6 @@ static void CG_Obituary( entityState_t *ent ) message2 = "^5's ^5flames"; break; - case MOD_SMOKE: - message = "^5tasted^7"; - message2 = "^5's ^5smoke"; - break; - case MOD_ABUILDER_CLAW: message = "^5should leave^7"; message2 = "^5's ^5buildings alone"; -- cgit From 0aa94f6b6b7b49972a839aadaee4dbb42a3a53de Mon Sep 17 00:00:00 2001 From: enneract Date: Tue, 25 Nov 2014 01:45:57 +0100 Subject: Lightning Gun assets. --- src/cgame/cg_event.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/cgame/cg_event.c') diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index d9e2f77..4c756ad 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -335,6 +335,9 @@ static void CG_Obituary( entityState_t *ent ) message = "^5almost dodged^7"; message2 = "^5's ^5rocket"; break; + case MOD_LIGHTNING: + message = "^5was electrocuted by^7"; + break; case MOD_GRENADE: message = "^5couldn't escape^7"; message2 = "^5's ^5grenade"; -- cgit From bb6121f265d70282aeba57a252996f130e5d6df8 Mon Sep 17 00:00:00 2001 From: enneract Date: Sun, 14 Dec 2014 13:17:33 +0100 Subject: Add view quake to more events. --- src/cgame/cg_event.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/cgame/cg_event.c') diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index 4c756ad..e5002cd 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -1009,9 +1009,12 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) CG_MissileHitWall( es->weapon, es->generic1, 0, position, dir, IMPACTSOUND_METAL, es->torsoAnim ); break; +#define BUILDABLE_EXPLOSION_QUAKE 50 + case EV_HUMAN_BUILDABLE_EXPLOSION: ByteToDir( es->eventParm, dir ); CG_HumanBuildableExplosion( position, dir, es->modelindex ); + CG_InduceViewQuake( position, BUILDABLE_EXPLOSION_QUAKE ); break; case EV_ALIEN_BUILDABLE_EXPLOSION: @@ -1020,6 +1023,8 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) if ( es->modelindex == BA_A_SPITEFUL_ABCESS ) CG_AlienSPITEFUL_ABCESSExplosion( position, dir ); + + CG_InduceViewQuake( position, BUILDABLE_EXPLOSION_QUAKE ); break; //Scleim greifer schwanz f\FCr slime -- cgit