1 files changed, 21 insertions, 20 deletions

diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index c1afd750..b2606c23 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -382,8 +382,9 @@ static float PM_CmdScale( usercmd_t *cmd )
     }
   }
 
-  if( pm->ps->weapon == WP_BIGMOFO && pm->ps->pm_flags & PMF_CHARGE )
-    modifier *= ( 1.0f + ( pm->ps->stats[ STAT_MISC ] / (float)BMOFO_CHARGE_TIME ) * ( BMOFO_CHARGE_SPEED - 1.0f ) );
+  if( pm->ps->weapon == WP_ALEVEL4 && pm->ps->pm_flags & PMF_CHARGE )
+    modifier *= ( 1.0f + ( pm->ps->stats[ STAT_MISC ] / (float)LEVEL4_CHARGE_TIME ) *
+        ( LEVEL4_CHARGE_SPEED - 1.0f ) );
   
   if( pm->ps->pm_type == PM_GRABBED )
     modifier = 0.0f;
@@ -466,7 +467,7 @@ PM_CheckCharge
 */
 static void PM_CheckCharge( void )
 {
-  if( pm->ps->weapon != WP_BIGMOFO )
+  if( pm->ps->weapon != WP_ALEVEL4 )
     return;
 
   if( pm->cmd.buttons & BUTTON_ATTACK2 )
@@ -488,8 +489,8 @@ PM_CheckPounce
 */
 static qboolean PM_CheckPounce( void )
 {
-  if( pm->ps->weapon != WP_DRAGOON &&
-      pm->ps->weapon != WP_DRAGOON_UPG )
+  if( pm->ps->weapon != WP_ALEVEL3 &&
+      pm->ps->weapon != WP_ALEVEL3_UPG )
     return qfalse;
 
   if( pm->cmd.buttons & BUTTON_ATTACK2 )
@@ -600,10 +601,10 @@ static qboolean PM_CheckWallJump( void )
             dir, pm->ps->velocity );
   
   //for a long run of wall jumps the velocity can get pretty large, this caps it
-  if( VectorLength( pm->ps->velocity ) > CHIMERA_WALLJUMP_MAXSPEED )
+  if( VectorLength( pm->ps->velocity ) > LEVEL2_WALLJUMP_MAXSPEED )
   {
     VectorNormalize( pm->ps->velocity );
-    VectorScale( pm->ps->velocity, CHIMERA_WALLJUMP_MAXSPEED, pm->ps->velocity );
+    VectorScale( pm->ps->velocity, LEVEL2_WALLJUMP_MAXSPEED, pm->ps->velocity );
   }
     
   PM_AddEvent( EV_JUMP );
@@ -644,13 +645,13 @@ static qboolean PM_CheckJump( void )
     return PM_CheckWallJump( );
 
   //can't jump and pounce at the same time
-  if( ( pm->ps->weapon == WP_DRAGOON ||
-        pm->ps->weapon == WP_DRAGOON_UPG ) &&
+  if( ( pm->ps->weapon == WP_ALEVEL3 ||
+        pm->ps->weapon == WP_ALEVEL3_UPG ) &&
       pm->ps->stats[ STAT_MISC ] > 0 )
     return qfalse;
 
   //can't jump and charge at the same time
-  if( ( pm->ps->weapon == WP_BIGMOFO ) &&
+  if( ( pm->ps->weapon == WP_ALEVEL4 ) &&
       pm->ps->stats[ STAT_MISC ] > 0 )
     return qfalse;
 
@@ -2426,7 +2427,7 @@ static void PM_Footsteps( void )
     {
       bobmove = 0.4f; // faster speeds bob faster
 
-      if( pm->ps->weapon == WP_BIGMOFO && pm->ps->pm_flags & PMF_CHARGE )
+      if( pm->ps->weapon == WP_ALEVEL4 && pm->ps->pm_flags & PMF_CHARGE )
         PM_ContinueLegsAnim( NSPA_CHARGE );
       else if( pm->ps->pm_flags & PMF_BACKWARDS_RUN )
       {
@@ -2797,7 +2798,7 @@ static void PM_Weapon( void )
   //check if non-auto primary/secondary attacks are permited
   switch( pm->ps->weapon )
   {
-    case WP_SOLDIER:
+    case WP_ALEVEL0:
       //venom is only autohit
       attack1 = attack2 = attack3 = qfalse;
 
@@ -2809,8 +2810,8 @@ static void PM_Weapon( void )
       }
       break;
       
-    case WP_DRAGOON:
-    case WP_DRAGOON_UPG:
+    case WP_ALEVEL3:
+    case WP_ALEVEL3_UPG:
       //pouncing has primary secondary AND autohit procedures
       attack1 = pm->cmd.buttons & BUTTON_ATTACK;
       attack2 = pm->cmd.buttons & BUTTON_ATTACK2;
@@ -2867,7 +2868,7 @@ static void PM_Weapon( void )
     if( BG_WeaponHasThirdMode( pm->ps->weapon ) )
     {
       //hacky special case for slowblob
-      if( pm->ps->weapon == WP_DRAGOON_UPG && !ammo )
+      if( pm->ps->weapon == WP_ALEVEL3_UPG && !ammo )
       {
         PM_AddEvent( EV_NOAMMO );
         pm->ps->weaponTime += 200;
@@ -2912,14 +2913,14 @@ static void PM_Weapon( void )
   {
     switch( pm->ps->weapon )
     {
-      case WP_SOLDIER:
+      case WP_ALEVEL0:
         pm->ps->generic1 = WPM_PRIMARY;
         PM_AddEvent( EV_FIRE_WEAPON );
         addTime = BG_FindRepeatRate1ForWeapon( pm->ps->weapon );
         break;
     
-      case WP_DRAGOON:
-      case WP_DRAGOON_UPG:
+      case WP_ALEVEL3:
+      case WP_ALEVEL3_UPG:
         pm->ps->generic1 = WPM_SECONDARY;
         PM_AddEvent( EV_FIRE_WEAPON2 );
         addTime = BG_FindRepeatRate2ForWeapon( pm->ps->weapon );
@@ -2953,7 +2954,7 @@ static void PM_Weapon( void )
   }
   else
   {
-    if( pm->ps->weapon == WP_BIGMOFO )
+    if( pm->ps->weapon == WP_ALEVEL4 )
     {
       //hack to get random attack animations
       //FIXME: does pm->ps->weaponTime cycle enough?
@@ -2998,7 +2999,7 @@ static void PM_Weapon( void )
     
     BG_PackAmmoArray( pm->ps->weapon, pm->ps->ammo, pm->ps->powerups, ammo, clips, maxclips );
   }
-  else if( pm->ps->weapon == WP_DRAGOON_UPG && attack3 )
+  else if( pm->ps->weapon == WP_ALEVEL3_UPG && attack3 )
   {
     //special case for slowblob
     ammo--;