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 +--------- src/cgame/cg_weapons.c | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'src/cgame') 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"; diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 2b41d13..04f6495 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -65,8 +65,6 @@ void CG_RegisterUpgrade( int upgradeNum ) upgradeInfo->upgradeIcon = cg_weapons[ WP_GRENADE ].weaponIcon; else if( upgradeNum == UP_MINE ) upgradeInfo->upgradeIcon = cg_weapons[ WP_MINE ].weaponIcon; - else if( upgradeNum == UP_SMOKE ) - upgradeInfo->upgradeIcon = cg_weapons[ WP_SMOKE ].weaponIcon; else if( ( icon = BG_Upgrade( upgradeNum )->icon ) ) upgradeInfo->upgradeIcon = trap_R_RegisterShader( icon ); } -- cgit