Remove Smoke Grenade.

8 files changed, 1 insertions, 106 deletions

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 );
 }
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 92f3826..742363d 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -3652,31 +3652,6 @@ static const weaponAttributes_t bg_weapons[ ] =
     TEAM_HUMANS           //team_t    team;
   },
   {
-    WP_SMOKE,         	  //int       weaponNum;
-    SMOKE_PRICE,          //int       price;
-    STAGE_GE_5,           //int  stages
-    SLOT_NONE,            //int       slots;
-    "smoke",              //char      *weaponName;
-    "Smoke",              //char      *weaponHumanName;
-    "",
-    1,                    //int       maxAmmo;
-    0,                    //int       maxClips;
-    qfalse,               //int       infiniteAmmo;
-    qfalse,               //int       usesEnergy;
-    SMOKE_REPEAT,         //int       repeatRate1;
-    0,                    //int       repeatRate2;
-    0,                    //int       repeatRate3;
-    0,                    //int       reloadTime;
-    SMOKE_K_SCALE,        //float     knockbackScale;
-    qfalse,               //qboolean  hasAltMode;
-    qfalse,               //qboolean  hasThirdMode;
-    qfalse,               //qboolean  canZoom;
-    90.0f,                //float     zoomFov;
-    qfalse,               //qboolean  purchasable;
-    qfalse,               //qboolean  longRanged;
-    TEAM_HUMANS            //WUTeam_t  team;
-  },
-  {
     WP_MINE,         //int       weaponNum;
     MINE_PRICE,        //int       price;
     STAGE_GE_5,           //int  stages
diff --git a/src/game/bg_mod.h b/src/game/bg_mod.h
index 5e4245b..4929b32 100644
--- a/src/game/bg_mod.h
+++ b/src/game/bg_mod.h
@@ -18,7 +18,6 @@ MOD( MOD_GRENADE ),
 MOD( MOD_PSAWBLADE ),
 MOD( MOD_MINE ),
 MOD( MOD_FLAMES ),
-MOD( MOD_SMOKE ),
 MOD( MOD_SPITEFUL_ABCESS ),
 MOD( MOD_WATER ),
 MOD( MOD_SLIME ),
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 2ca9e32..c0b6381 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -359,7 +359,6 @@ typedef enum
   WP_LUCIFER_CANNON,
   WP_ROCKET_LAUNCHER,
   WP_GRENADE,
-  WP_SMOKE,
   WP_MINE,
   WP_LOCKBLOB_LAUNCHER,
   WP_HIVE,
diff --git a/src/game/g_active.c b/src/game/g_active.c
index c7a8977..951a3a9 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1941,21 +1941,6 @@ void ClientThink_real( gentity_t *ent )
     ent->s.weapon = lastWeapon;
   }
 
-  if( BG_InventoryContainsUpgrade( UP_SMOKE, client->ps.stats ) &&
-      BG_UpgradeIsActive( UP_SMOKE, client->ps.stats ) )
-  {
-    int lastWeapon = ent->s.weapon;
-
-    //remove SMOKE
-    BG_DeactivateUpgrade( UP_SMOKE, client->ps.stats );
-    BG_RemoveUpgradeFromInventory( UP_SMOKE, client->ps.stats );
-
-    //M-M-M-M-MONSTER HACK
-    ent->s.weapon = WP_SMOKE;
-    FireWeapon( ent );
-    ent->s.weapon = lastWeapon;
-  }
-  
   // set speed
   if( client->ps.pm_type == PM_NOCLIP )
     client->ps.speed = client->pers.flySpeed;
diff --git a/src/game/g_missile.c b/src/game/g_missile.c
index 830d72a..2056f79 100644
--- a/src/game/g_missile.c
+++ b/src/game/g_missile.c
@@ -1241,44 +1241,6 @@ gentity_t *launch_saw( gentity_t *self, vec3_t start, vec3_t dir )
   return bolt;
 }
 
-
-gentity_t *launch_smoke( gentity_t *self, vec3_t start, vec3_t dir )
-{
-  gentity_t *bolt;
-
-  VectorNormalize( dir );
-  bolt = G_Spawn( );
-  bolt->classname = "smoke";
-  bolt->nextthink = level.time + 200;
-  bolt->think = G_ProcessSmoke;
-  bolt->s.eType = ET_MISSILE;
-  bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN;
-  bolt->s.weapon = WP_SMOKE;
-  bolt->s.eFlags = EF_BOUNCE_HALF;
-  bolt->s.generic1 = WPM_PRIMARY; //weaponMode
-  bolt->r.ownerNum = self->s.number;
-  bolt->parent = self;
-  bolt->damage = SMOKE_DAMAGE;
-  bolt->splashDamage = 0;
-  bolt->splashRadius = 0;
-  bolt->methodOfDeath = MOD_SMOKE;
-  bolt->splashMethodOfDeath = MOD_SMOKE;
-  bolt->clipmask = MASK_SHOT;
-  bolt->target_ent = NULL;
-  bolt->r.mins[ 0 ] = bolt->r.mins[ 1 ] = bolt->r.mins[ 2 ] = -3.0f;
-  bolt->r.maxs[ 0 ] = bolt->r.maxs[ 1 ] = bolt->r.maxs[ 2 ] = 3.0f;
-  bolt->s.time = level.time;
-  bolt->s.pos.trType = TR_GRAVITY;
-  bolt->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME;   // move a bit on the very first frame
-  VectorCopy( start, bolt->s.pos.trBase );
-  VectorScale( dir, SMOKE_SPEED, bolt->s.pos.trDelta );
-  SnapVector( bolt->s.pos.trDelta );      // save net bandwidth
-
-  VectorCopy( start, bolt->r.currentOrigin );
-
-  return bolt;
-}
-
 /*
 ================
 AHive_SearchAndDestroy
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 5453913..d869fb1 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -698,18 +698,6 @@ void acidBombFire2x( gentity_t *ent, int wp )
 
 /*
 ======================================================================
-SMOKE
-======================================================================
-*/
-
-void throwSmoke( gentity_t *ent )
-{
-  gentity_t *m;
-  m = launch_smoke( ent, muzzle, forward );
-}
-
-/*
-======================================================================
 LAS GUN
 ======================================================================
 */
@@ -1994,9 +1982,6 @@ void FireWeapon( gentity_t *ent )
     case WP_MINE:
       throwMine( ent );
       break;
-    case WP_SMOKE:
-      throwSmoke( ent );
-      break; 
     case WP_LOCKBLOB_LAUNCHER:
       lockBlobLauncherFire( ent );
       break;