* Added shotgun

* Fixed particle system destruction bug with muzzle systems
* Fixed armoury retriggering bug

5 files changed, 123 insertions, 131 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 185d58b7..aea70b2b 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -2852,6 +2852,28 @@ weaponAttributes_t bg_weapons[ ] =
     WUT_HUMANS            //WUTeam_t  team;
   },
   {
+    WP_SHOTGUN,           //int       weaponNum;
+    SHOTGUN_PRICE,        //int       price;
+    ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int  stages
+    SLOT_WEAPON,          //int       slots;
+    "shotgun",            //char      *weaponName;
+    "Shotgun",            //char      *weaponHumanName;
+    SHOTGUN_SHELLS,       //int       quan;
+    SHOTGUN_SPAWNCLIPS,   //int       clips;
+    SHOTGUN_MAXCLIPS,     //int       maxClips;
+    qfalse,               //int       infiniteAmmo;
+    qfalse,               //int       usesEnergy;
+    SHOTGUN_REPEAT,       //int       repeatRate1;
+    0,                    //int       repeatRate2;
+    0,                    //int       repeatRate3;
+    SHOTGUN_RELOAD,       //int       reloadTime;
+    qfalse,               //qboolean  hasAltMode;
+    qfalse,               //qboolean  hasThirdMode;
+    qtrue,                //qboolean  purchasable;
+    0,                    //int       buildDelay;
+    WUT_HUMANS            //WUTeam_t  team;
+  },
+  {
     WP_FLAMER,            //int       weaponNum;
     FLAMER_PRICE,         //int       price;
     ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int  stages
@@ -3733,9 +3755,6 @@ upgradeAttributes_t bg_upgrades[ ] =
     "larmour",              //char  *upgradeName;
     "Light Armour",         //char  *upgradeHumanName;
     "icons/iconu_larmour",
-    WP_NONE,                //weapon_t weaponAmmo;
-    0,                      //int   ammo;
-    0,                      //int   clips;
     WUT_HUMANS              //WUTeam_t  team;
   },
   {
@@ -3746,9 +3765,6 @@ upgradeAttributes_t bg_upgrades[ ] =
     "helmet",               //char  *upgradeName;
     "Helmet",               //char  *upgradeHumanName;
     "icons/iconu_helmet",
-    WP_NONE,                //weapon_t weaponAmmo;
-    0,                      //int   ammo;
-    0,                      //int   clips;
     WUT_HUMANS              //WUTeam_t  team;
   },
   {
@@ -3759,9 +3775,6 @@ upgradeAttributes_t bg_upgrades[ ] =
     "atoxin",               //char  *upgradeName;
     "Anti-toxin",           //char  *upgradeHumanName;
     "icons/iconu_atoxin",
-    WP_NONE,                //weapon_t weaponAmmo;
-    0,                      //int   ammo;
-    0,                      //int   clips;
     WUT_HUMANS              //WUTeam_t  team;
   },
   {
@@ -3772,9 +3785,6 @@ upgradeAttributes_t bg_upgrades[ ] =
     "battpack",             //char  *upgradeName;
     "Battery Pack",         //char  *upgradeHumanName;
     "icons/iconu_battpack",
-    WP_NONE,                //weapon_t weaponAmmo;
-    0,                      //int   ammo;
-    0,                      //int   clips;
     WUT_HUMANS              //WUTeam_t  team;
   },
   {
@@ -3785,9 +3795,6 @@ upgradeAttributes_t bg_upgrades[ ] =
     "jetpack",              //char  *upgradeName;
     "Jet Pack",             //char  *upgradeHumanName;
     "icons/iconu_jetpack",
-    WP_NONE,                //weapon_t weaponAmmo;
-    0,                      //int   ammo;
-    0,                      //int   clips;
     WUT_HUMANS              //WUTeam_t  team;
   },
   {
@@ -3798,48 +3805,16 @@ upgradeAttributes_t bg_upgrades[ ] =
     "bsuit",                                  //char  *upgradeName;
     "Battlesuit",                             //char  *upgradeHumanName;
     "icons/iconu_bsuit",
-    WP_NONE,                //weapon_t weaponAmmo;
-    0,                      //int   ammo;
-    0,                      //int   clips;
     WUT_HUMANS              //WUTeam_t  team;
   },
   {
-    UP_MGCLIP,              //int   upgradeNum;
-    MGCLIP_PRICE,           //int   price;
+    UP_AMMO,                //int   upgradeNum;
+    0,                      //int   price;
     ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int  stages
     SLOT_NONE,              //int   slots;
-    "mgclip",               //char  *upgradeName;
-    "1 Rifle Clip",         //char  *upgradeHumanName;
+    "ammo",                 //char  *upgradeName;
+    "Ammunition",           //char  *upgradeHumanName;
     0,
-    WP_MACHINEGUN,          //weapon_t weaponAmmo;
-    0,                      //int   ammo;
-    1,                      //int   clips;
-    WUT_HUMANS              //WUTeam_t  team;
-  },
-  {
-    UP_CGAMMO,              //int   upgradeNum;
-    CGAMMO_PRICE,           //int   price;
-    ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int  stages
-    SLOT_NONE,              //int   slots;
-    "cgammo",               //char  *upgradeName;
-    "Chaingun bullets",     //char  *upgradeHumanName;
-    0,
-    WP_CHAINGUN,            //weapon_t weaponAmmo;
-    100,                    //int   ammo;
-    0,                      //int   clips;
-    WUT_HUMANS              //WUTeam_t  team;
-  },
-  {
-    UP_GAS,                 //int   upgradeNum;
-    GAS_PRICE,              //int   price;
-    ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int  stages
-    SLOT_NONE,              //int   slots;
-    "gas",                  //char  *upgradeName;
-    "Flamer gas",           //char  *upgradeHumanName;
-    0,
-    WP_FLAMER,              //weapon_t weaponAmmo;
-    200,                    //int   ammo;
-    0,                      //int   clips;
     WUT_HUMANS              //WUTeam_t  team;
   }
 };
@@ -3987,46 +3962,6 @@ char *BG_FindIconForUpgrade( int upgrade )
 
 /*
 ==============
-BG_FindWeaponAmmoForUpgrade
-==============
-*/
-weapon_t BG_FindWeaponAmmoForUpgrade( int upgrade )
-{
-  int i;
-
-  for( i = 0; i < bg_numUpgrades; i++ )
-  {
-    if( bg_upgrades[ i ].upgradeNum == upgrade )
-      return bg_upgrades[ i ].weaponAmmo;
-  }
-
-  return WP_NONE;
-}
-
-/*
-==============
-BG_FindAmmoForUpgrade
-==============
-*/
-void BG_FindAmmoForUpgrade( int upgrade, int *ammo, int *clips )
-{
-  int i;
-
-  for( i = 0; i < bg_numUpgrades; i++ )
-  {
-    if( bg_upgrades[ i ].upgradeNum == upgrade )
-    {
-      if( ammo != NULL )
-        *ammo = bg_upgrades[ i ].ammo;
-
-      if( clips != NULL )
-        *clips = bg_upgrades[ i ].clips;
-    }
-  }
-}
-
-/*
-==============
 BG_FindTeamForUpgrade
 ==============
 */
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index ade44adf..49165a49 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -339,6 +339,7 @@ typedef enum
   
   WP_BLASTER,
   WP_MACHINEGUN,
+  WP_SHOTGUN,
   WP_CHAINGUN,
   WP_FLAMER,
   WP_MASS_DRIVER,
@@ -373,9 +374,7 @@ typedef enum
   UP_JETPACK,
   UP_BATTLESUIT,
   
-  UP_MGCLIP,
-  UP_CGAMMO,
-  UP_GAS,
+  UP_AMMO,
 
   UP_NUM_UPGRADES
 } upgrade_t;
@@ -521,6 +520,8 @@ typedef enum
   EV_BULLET_HIT_FLESH,
   EV_BULLET_HIT_WALL,
 
+  EV_SHOTGUN,
+
   EV_MISSILE_HIT,
   EV_MISSILE_MISS,
   EV_MISSILE_MISS_METAL,
@@ -1045,10 +1046,6 @@ typedef struct
 
   char      *icon;
   
-  weapon_t  weaponAmmo;
-  int       ammo;
-  int       clips;
-  
   WUTeam_t  team;
 } upgradeAttributes_t;
 
@@ -1164,8 +1161,6 @@ char      *BG_FindNameForUpgrade( int upgrade );
 int       BG_FindUpgradeNumForName( char *name );
 char      *BG_FindHumanNameForUpgrade( int upgrade );
 char      *BG_FindIconForUpgrade( int upgrade );
-weapon_t  BG_FindWeaponAmmoForBuildable( int upgrade );
-void      BG_FindAmmoForUpgrade( int upgrade, int *ammo, int *clips );
 WUTeam_t  BG_FindTeamForUpgrade( int upgrade );
 
 // content masks
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 6bc84ed9..3662a8ab 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1338,7 +1338,6 @@ void Cmd_Buy_f( gentity_t *ent )
   }
   else if( upgrade != UP_NONE )
   {
-    int       maxAmmo, newAmmo, newClips;
     weapon_t  weaponAmmo;
     
     //already got this?
@@ -1382,33 +1381,11 @@ void Cmd_Buy_f( gentity_t *ent )
       return;
     }
     
-    BG_FindAmmoForUpgrade( upgrade, &newAmmo, &newClips );
-
-    if( newAmmo || newClips )
-    {
-      //get current ammo for the weapon in question
-      weaponAmmo = BG_FindWeaponAmmoForUpgrade( upgrade );
-      BG_unpackAmmoArray( weaponAmmo, ent->client->ps.ammo, ent->client->ps.powerups,
-                          &quan, &clips, &maxClips );
+    weaponAmmo = ent->client->ps.weapon;
       
-      BG_FindAmmoForWeapon( weaponAmmo, &maxAmmo, NULL, NULL );
-
-      //this ammo package would exceed max ammo
-      if( clips + newClips > maxClips )
-      {
-        //FIXME: different dialog?
-        G_TriggerMenu( ent->client->ps.clientNum, MN_H_NOSLOTS );
-        return;
-      }
-      else
-        clips += newClips;
-
-      if( quan + newAmmo > maxAmmo )
-        quan = maxAmmo;
-      else
-        quan += newAmmo;
-
-      //updata ammo count
+    if( upgrade == UP_AMMO && !BG_FindUsesEnergyForWeapon( weaponAmmo ) )
+    {
+      BG_FindAmmoForWeapon( weaponAmmo, &quan, &clips, &maxClips );
       BG_packAmmoArray( weaponAmmo, ent->client->ps.ammo, ent->client->ps.powerups,
                         quan, clips, maxClips );
     }
@@ -1430,8 +1407,14 @@ void Cmd_Buy_f( gentity_t *ent )
   if( numItems == 0 )
     G_AddEvent( ent, EV_NEXT_WEAPON, ent->client->ps.clientNum );
   
-  //retrigger the armoury menu
-  ent->client->retriggerArmouryMenu = level.framenum + RAM_FRAMES;
+  if( trap_Argc( ) >= 2 )
+  {
+    trap_Argv( 2, s, sizeof( s ) );
+    
+    //retrigger the armoury menu
+    if( !Q_stricmp( s, "retrigger" ) )
+      ent->client->retriggerArmouryMenu = level.framenum + RAM_FRAMES;
+  }
   
   //update ClientInfo
   ClientUserinfoChanged( ent->client->ps.clientNum );
@@ -1506,8 +1489,14 @@ void Cmd_Sell_f( gentity_t *ent )
   else
     trap_SendServerCommand( ent-g_entities, va( "print \"Unknown item\n\"" ) );
   
-  //retrigger the armoury menu
-  ent->client->retriggerArmouryMenu = level.framenum + RAM_FRAMES;
+  if( trap_Argc( ) >= 2 )
+  {
+    trap_Argv( 2, s, sizeof( s ) );
+    
+    //retrigger the armoury menu
+    if( !Q_stricmp( s, "retrigger" ) )
+      ent->client->retriggerArmouryMenu = level.framenum + RAM_FRAMES;
+  }
   
   //update ClientInfo
   ClientUserinfoChanged( ent->client->ps.clientNum );
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 4dd1d67e..107128b5 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -159,6 +159,66 @@ void bulletFire( gentity_t *ent, float spread, int damage, int mod )
 /*
 ======================================================================
 
+SHOTGUN
+
+======================================================================
+*/
+
+// this should match CG_ShotgunPattern
+void ShotgunPattern( vec3_t origin, vec3_t origin2, int seed, gentity_t *ent )
+{
+	int			  i;
+	float		  r, u;
+	vec3_t		end;
+	vec3_t		forward, right, up;
+	trace_t		tr;
+	gentity_t	*traceEnt;
+
+	// derive the right and up vectors from the forward vector, because
+	// the client won't have any other information
+	VectorNormalize2( origin2, forward );
+	PerpendicularVector( right, forward );
+	CrossProduct( forward, right, up );
+
+	// generate the "random" spread pattern
+	for( i = 0; i < SHOTGUN_PELLETS; i++ )
+  {
+		r = Q_crandom( &seed ) * SHOTGUN_SPREAD * 16;
+		u = Q_crandom( &seed ) * SHOTGUN_SPREAD * 16;
+		VectorMA( origin, 8192 * 16, forward, end );
+		VectorMA( end, r, right, end );
+		VectorMA( end, u, up, end );
+		
+    trap_Trace( &tr, origin, NULL, NULL, end, ent->s.number, MASK_SHOT );
+    traceEnt = &g_entities[ tr.entityNum ];
+
+    // send bullet impact
+    if( !( tr.surfaceFlags & SURF_NOIMPACT ) )
+    {
+      if( traceEnt->takedamage )
+        G_Damage( traceEnt, ent, ent, forward, tr.endpos,	SHOTGUN_DMG, 0, MOD_SHOTGUN );
+    }
+	}
+}
+
+
+void shotgunFire( gentity_t *ent )
+{
+	gentity_t		*tent;
+
+	// send shotgun blast
+	tent = G_TempEntity( muzzle, EV_SHOTGUN );
+	VectorScale( forward, 4096, tent->s.origin2 );
+	SnapVector( tent->s.origin2 );
+	tent->s.eventParm = rand() & 255;		// seed for spread pattern
+	tent->s.otherEntityNum = ent->s.number;
+
+	ShotgunPattern( tent->s.pos.trBase, tent->s.origin2, tent->s.eventParm, ent );
+}
+
+/*
+======================================================================
+
 MASS DRIVER
 
 ======================================================================
@@ -1120,6 +1180,9 @@ void FireWeapon( gentity_t *ent )
     case WP_MACHINEGUN:
       bulletFire( ent, RIFLE_SPREAD, RIFLE_DMG, MOD_MACHINEGUN );
       break;
+    case WP_SHOTGUN:
+      shotgunFire( ent );
+      break;
     case WP_CHAINGUN:
       bulletFire( ent, CHAINGUN_SPREAD, CHAINGUN_DMG, MOD_CHAINGUN );
       break;
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index ca7c48d8..7694887d 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -291,6 +291,16 @@
 #define RIFLE_SPREAD                200
 #define RIFLE_DMG                   HDM(5)
 
+#define SHOTGUN_SHELLS              8
+#define SHOTGUN_PELLETS             8 //used to sync server and client side
+#define SHOTGUN_SPAWNCLIPS          3
+#define SHOTGUN_MAXCLIPS            3
+#define SHOTGUN_REPEAT              1200
+#define SHOTGUN_RELOAD              2000
+#define SHOTGUN_PRICE               150
+#define SHOTGUN_SPREAD              900
+#define SHOTGUN_DMG                 HDM(5)
+
 #define CHAINGUN_BULLETS            300
 #define CHAINGUN_REPEAT             50
 #define CHAINGUN_PRICE              200