3 files changed, 10 insertions, 2 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 4ae78987..6dc12f29 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -818,6 +818,10 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
     DEBUGNAME("EV_FIRE_WEAPON2");
     CG_FireWeapon( cent ); //FIXME:??
     break;
+  case EV_FIRE_WEAPON3:
+    DEBUGNAME("EV_FIRE_WEAPON3");
+    CG_FireWeapon( cent ); //FIXME:??
+    break;
   case EV_FIRE_WEAPONBOTH:
     DEBUGNAME("EV_FIRE_WEAPONBOTH");
     CG_FireWeapon( cent ); //FIXME:??
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index 6d434eab..2d56f353 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -428,7 +428,8 @@ static void CG_OffsetFirstPersonView( void ) {
   }
 
   //provide some feedback for pouncing
-  if( cg.predictedPlayerState.weapon == WP_POUNCE )
+  if( cg.predictedPlayerState.weapon == WP_POUNCE ||
+      cg.predictedPlayerState.weapon == WP_POUNCE_UPG )
   {
     if( cg.predictedPlayerState.stats[ STAT_MISC ] > 0 )
     {
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index d8441016..91dc841e 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -708,7 +708,6 @@ void CG_RegisterWeapon( int weaponNum )
       break;
       
     case WP_LOCKBLOB_LAUNCHER:
-      weaponInfo->missileModel = trap_R_RegisterModel( "models/ammo/trapper/trapper.md3" );
   /*    weaponInfo->missileSound = trap_S_RegisterSound( "sound/weapons/rocket/rockfly.wav", qfalse );
       weaponInfo->missileTrailFunc = CG_RocketTrail;
       weaponInfo->missileDlight = 200;
@@ -716,6 +715,7 @@ void CG_RegisterWeapon( int weaponNum )
       weaponInfo->trailRadius = 64;
       MAKERGB( weaponInfo->missileDlightColor, 1, 0.75f, 0 );
       MAKERGB( weaponInfo->flashDlightColor, 1, 0.75f, 0 );*/
+      weaponInfo->missileModel = trap_R_RegisterModel( "models/ammo/grenade1.md3" );
       weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/rocket/rocklf1a.wav", qfalse );
       /*cgs.media.rocketExplosionShader = trap_R_RegisterShader( "rocketExplosion" );*/
       break;
@@ -775,8 +775,10 @@ void CG_RegisterWeapon( int weaponNum )
       break;
 
     case WP_POUNCE:
+    case WP_POUNCE_UPG:
       MAKERGB( weaponInfo->flashDlightColor, 0, 0, 0 );
       weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/melee/fstatck.wav", qfalse );
+      weaponInfo->missileModel = trap_R_RegisterModel( "models/ammo/grenade1.md3" );
       break;
 
     case WP_ABUILD:
@@ -1902,6 +1904,7 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im
     radius = 24;
     break;
   case WP_LOCKBLOB_LAUNCHER:
+  case WP_POUNCE_UPG:
     sfx = cgs.media.gibBounce1Sound;
     mark = cgs.media.greenBloodMarkShader;
     radius = 64;