From 2a93a38bfa8feab7e7f9be7332f75f2d2b0036e7 Mon Sep 17 00:00:00 2001
From: enneract <trem.redman@gmail.com>
Date: Wed, 19 Nov 2014 11:31:42 +0100
Subject: Merge WP_ABUILD and WP_ABUILD2 to free a weapon slot.

---
 src/game/g_weapon.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/game/g_weapon.c')

diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index bbc4e08..4e08523 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -937,8 +937,7 @@ void cancelBuildFire( gentity_t *ent )
     ent->client->ps.stats[ STAT_BUILDABLE ] = BA_NONE;
     return;
   }
-  if( ent->client->ps.weapon == WP_ABUILD ||
-      ent->client->ps.weapon == WP_ABUILD2 )
+  if( ent->client->ps.weapon == WP_ABUILD )
     meleeAttack( ent, ABUILDER_CLAW_RANGE, ABUILDER_CLAW_WIDTH,
                  ABUILDER_CLAW_WIDTH, ABUILDER_CLAW_DMG, MOD_ABUILDER_CLAW );
 }
@@ -1776,7 +1775,7 @@ gclient_t *client;
       bounceBallFire( ent );
       break;
 
-    case WP_ABUILD2:
+    case WP_ABUILD:
       slowBlobFire( ent );
       break;
 
@@ -1877,7 +1876,6 @@ void FireWeapon2( gentity_t *ent )
       break;
 	  
     case WP_ABUILD:
-    case WP_ABUILD2:
     case WP_HBUILD:
       cancelBuildFire( ent );
       break;
@@ -1999,7 +1997,6 @@ void FireWeapon( gentity_t *ent )
 	   FlameTurretFire( ent );	   
       break;	  	  
     case WP_ABUILD:
-    case WP_ABUILD2:
       buildFire( ent, MN_A_BUILD );
       break;
     case WP_HBUILD:
-- 
cgit 


From 9e0e1eeeb964f1eaf94622399695e4b4a2d0f1db Mon Sep 17 00:00:00 2001
From: enneract <trem.redman@gmail.com>
Date: Wed, 19 Nov 2014 19:57:31 +0100
Subject: Implement the Rocket Launcher.

---
 src/game/g_weapon.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/game/g_weapon.c')

diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 4e08523..5453913 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -829,6 +829,19 @@ void LCChargeFire( gentity_t *ent, qboolean secondary )
   ent->client->ps.stats[ STAT_MISC ] = 0;
 }
 
+/*
+======================================================================
+
+PULSE RIFLE
+
+======================================================================
+*/
+
+void rocketLauncherFire( gentity_t *ent )
+{
+  fire_rocket( ent, muzzle, forward );
+}
+
 /*
 ======================================================================
 TESLA GENERATOR
@@ -1972,6 +1985,9 @@ void FireWeapon( gentity_t *ent )
     case WP_PAIN_SAW:
       painSawFire( ent );
       break;
+    case WP_ROCKET_LAUNCHER:
+      rocketLauncherFire( ent );
+      break;
     case WP_GRENADE:
       throwGrenade( ent );
       break;
-- 
cgit