summaryrefslogtreecommitdiff
path: root/src/cgame/cg_event.c
diff options
context:
space:
mode:
authormtiusane <mtiusane@users.noreply.github.com>2014-11-22 20:40:43 +0200
committermtiusane <mtiusane@users.noreply.github.com>2014-11-22 20:40:43 +0200
commit69382df33438a83a58645b9912788a47cd24552d (patch)
tree01d7e5a29f3a84abdc4f67d8515892135e62e68f /src/cgame/cg_event.c
parentfd19ccb037e349286e3b72a1277c58079056fcc2 (diff)
parentae41a0cdf13d6cf4150d32f089d5a45fe068b241 (diff)
Merge pull request #14 from enneract/newguns
Rocket Launcher
Diffstat (limited to 'src/cgame/cg_event.c')
-rw-r--r--src/cgame/cg_event.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 49dec3f..794b8a4 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -162,6 +162,16 @@ static void CG_Obituary( entityState_t *ent )
message = "^5irradiated himself";
break;
+
+ case MOD_ROCKETL_SPLASH:
+ if( gender == GENDER_FEMALE )
+ message = "^5blew herself up";
+ else if( gender == GENDER_NEUTER )
+ message = "^5blew itself up";
+ else
+ message = "^5blew himself up";
+ break;
+
case MOD_PSAWBLADE:
if( gender == GENDER_FEMALE )
message = "^5sliced herself up";
@@ -320,6 +330,14 @@ static void CG_Obituary( entityState_t *ent )
message = "^5was caught in the fallout of^7";
message2 = "^5's ^5lucifer cannon";
break;
+ case MOD_ROCKETL:
+ message = "^5ate^7";
+ message2 = "^5's ^5rocket";
+ break;
+ case MOD_ROCKETL_SPLASH:
+ message = "^5almost dodged^7";
+ message2 = "^5's ^5rocket";
+ break;
case MOD_GRENADE:
message = "^5couldn't escape^7";
message2 = "^5's ^5grenade";
@@ -1009,7 +1027,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
CG_AlienSPITEFUL_ABCESSExplosion( position, dir );
break;
-//Scleim greifer schwanz für slime
+//Scleim greifer schwanz f\FCr slime
case EV_SLIMETRAIL:
cent->currentState.weapon = WP_NONE;
{