* Charge no longer works backwards

* Dragoon pounce numbers fiddled a bit

5 files changed, 26 insertions, 24 deletions

diff --git a/src/game/bg_local.h b/src/game/bg_local.h
index 951ed385..fc5df698 100644
--- a/src/game/bg_local.h
+++ b/src/game/bg_local.h
@@ -25,7 +25,7 @@
 
 #define OVERCLIP    1.001f
 
-#define FALLING_THRESHOLD -600.0f //what vertical speed to start falling sound at
+#define FALLING_THRESHOLD -1000.0f //what vertical speed to start falling sound at
       
 
 // all of the locals will be zeroed before each
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 7f1799b5..c9a57fc0 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2391,26 +2391,15 @@ static void PM_Footsteps( void )
     }
     
     // ducked characters never play footsteps
-  /*
-  } else  if ( pm->ps->pm_flags & PMF_BACKWARDS_RUN ) {
-    if ( !( pm->cmd.buttons & BUTTON_WALKING ) ) {
-      bobmove = 0.4;  // faster speeds bob faster
-      footstep = qtrue;
-    } else {
-      bobmove = 0.3;
-    }
-    PM_ContinueLegsAnim( LEGS_BACK );
-  */
   }
   else
   {
     //TA: switch walking/running anims based on speed
-    //if ( !( pm->cmd.buttons & BUTTON_WALKING ) ) {
     if( pm->xyspeed > 160 )
     {
       bobmove = 0.4f; // faster speeds bob faster
 
-      if( pm->ps->pm_flags & PMF_CHARGE )
+      if( pm->ps->weapon == WP_BIGMOFO && pm->ps->pm_flags & PMF_CHARGE )
         PM_ContinueLegsAnim( NSPA_CHARGE );
       else if( pm->ps->pm_flags & PMF_BACKWARDS_RUN )
       {
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 61e78365..3cc01607 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -467,8 +467,15 @@ void ClientTimerActions( gentity_t *ent, int msec )
     //client is charging up for a pounce
     if( client->ps.weapon == WP_DRAGOON || client->ps.weapon == WP_DRAGOON_UPG )
     {
-      if( client->ps.stats[ STAT_MISC ] < DRAGOON_POUNCE_SPEED && ucmd->buttons & BUTTON_ATTACK2 )
-        client->ps.stats[ STAT_MISC ] += ( 100.0f / (float)DRAGOON_POUNCE_TIME ) * DRAGOON_POUNCE_SPEED;
+      int pounceSpeed;
+
+      if( client->ps.weapon == WP_DRAGOON )
+        pounceSpeed = DRAGOON_POUNCE_SPEED;
+      else if( client->ps.weapon == WP_DRAGOON_UPG )
+        pounceSpeed = DRAGOON_POUNCE_UPG_SPEED;
+
+      if( client->ps.stats[ STAT_MISC ] < pounceSpeed && ucmd->buttons & BUTTON_ATTACK2 )
+        client->ps.stats[ STAT_MISC ] += ( 100.0f / (float)DRAGOON_POUNCE_TIME ) * pounceSpeed;
 
       if( !( ucmd->buttons & BUTTON_ATTACK2 ) )
       {
@@ -481,14 +488,15 @@ void ClientTimerActions( gentity_t *ent, int msec )
         client->ps.stats[ STAT_MISC ] = 0;
       }
 
-      if( client->ps.stats[ STAT_MISC ] > DRAGOON_POUNCE_SPEED )
-        client->ps.stats[ STAT_MISC ] = DRAGOON_POUNCE_SPEED;
+      if( client->ps.stats[ STAT_MISC ] > pounceSpeed )
+        client->ps.stats[ STAT_MISC ] = pounceSpeed;
     }
 
     //client is charging up for a... charge
     if( client->ps.weapon == WP_BIGMOFO )
     {
-      if( client->ps.stats[ STAT_MISC ] < BMOFO_CHARGE_TIME && ucmd->buttons & BUTTON_ATTACK2 )
+      if( client->ps.stats[ STAT_MISC ] < BMOFO_CHARGE_TIME && ucmd->buttons & BUTTON_ATTACK2 && 
+          ( ucmd->forwardmove > 0 || aRight ) )
       {
         client->charging = qfalse; //should already be off, just making sure
 
@@ -508,6 +516,10 @@ void ClientTimerActions( gentity_t *ent, int msec )
           //if the charger has stopped moving take a chunk of charge away
           if( VectorLength( client->ps.velocity ) < 64.0f )
             client->ps.stats[ STAT_MISC ] = client->ps.stats[ STAT_MISC ] >> 1;
+
+          //can't charge backwards
+          if( ucmd->forwardmove < 0 )
+            client->ps.stats[ STAT_MISC ] = 0;
         }
         
         if( client->ps.stats[ STAT_MISC ] <= 0 )
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index e5c130e9..2fb5febd 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -323,12 +323,12 @@ void Cmd_Kill_f( gentity_t *ent )
     return;
   }
     
-  if (ent->health <= 0)
+  if( ent->health <= 0 )
     return;
 
   ent->flags &= ~FL_GODMODE;
-  ent->client->ps.stats[STAT_HEALTH] = ent->health = 0;
-  player_die (ent, ent, ent, 100000, MOD_SUICIDE);
+  ent->client->ps.stats[ STAT_HEALTH ] = ent->health = 0;
+  player_die( ent, ent, ent, 100000, MOD_SUICIDE );
 }
 
 /*
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 7a38cad5..c0be2e3b 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -67,9 +67,10 @@
 #define DRAGOON_CLAW_U_REPEAT       500
 #define DRAGOON_POUNCE_DMG          ADM(200)
 #define DRAGOON_POUNCE_RANGE        96.0f
-#define DRAGOON_POUNCE_SPEED        600
+#define DRAGOON_POUNCE_SPEED        700
+#define DRAGOON_POUNCE_UPG_SPEED    800
 #define DRAGOON_POUNCE_SPEED_MOD    0.75f
-#define DRAGOON_POUNCE_TIME         1000
+#define DRAGOON_POUNCE_TIME         700
 #define DRAGOON_BOUNCEBALL_DMG      ADM(50)
 #define DRAGOON_BOUNCEBALL_REPEAT   1000
 #define DRAGOON_BOUNCEBALL_SPEED    1000.0f
@@ -291,7 +292,7 @@
 
 #define BLASTER_REPEAT              1000
 #define BLASTER_SPREAD              200
-#define BLASTER_SPEED               500
+#define BLASTER_SPEED               700
 #define BLASTER_DMG                 HDM(10)
 
 #define RIFLE_CLIPSIZE              30