* (bug 2783) Rework lcannon firing logic

* Remove STAT_BOOSTEDTIME, instead inferring it via SS_BOOSTED
* Set EF_TELEPORT_BIT when buying or selling the bsuit

4 files changed, 21 insertions, 10 deletions

diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 94571799..85a97526 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2856,30 +2856,42 @@ static void PM_Weapon( void )
     case WP_LUCIFER_CANNON:
       attack1 = pm->cmd.buttons & BUTTON_ATTACK;
       attack2 = pm->cmd.buttons & BUTTON_ATTACK2;
-      attack3 = pm->cmd.buttons & BUTTON_USE_HOLDABLE;
+      attack3 = qfalse;
 
-      if( ( attack1 || pm->ps->stats[ STAT_MISC ] == 0 ) && !attack2 && !attack3 )
+      if( attack1 )
       {
+        attack2 = qfalse;
+
         if( pm->ps->stats[ STAT_MISC ] < LCANNON_TOTAL_CHARGE )
         {
+          // Charging
           pm->ps->weaponTime = 0;
           pm->ps->weaponstate = WEAPON_READY;
           return;
         }
-        else
-          attack1 = !attack1;
       }
 
-      //erp this looks confusing
       if( pm->ps->stats[ STAT_MISC ] > LCANNON_MIN_CHARGE )
-        attack1 = !attack1;
+      {
+        // Fire primary attack
+        attack1 = qtrue;
+        attack2 = qfalse;
+      }
       else if( pm->ps->stats[ STAT_MISC ] > 0 )
       {
+        // Not enough charge
         pm->ps->stats[ STAT_MISC ] = 0;
         pm->ps->weaponTime = 0;
         pm->ps->weaponstate = WEAPON_READY;
         return;
       }
+      else if( !attack2 )
+      {
+        // Idle
+        pm->ps->weaponTime = 0;
+        pm->ps->weaponstate = WEAPON_READY;
+        return;
+      }
       break;
 
     case WP_MASS_DRIVER:
@@ -3034,7 +3046,7 @@ static void PM_Weapon( void )
   // take an ammo away if not infinite
   if( !BG_FindInfinteAmmoForWeapon( pm->ps->weapon ) )
   {
-    //special case for lCanon
+    //special case for lcannon
     if( pm->ps->weapon == WP_LUCIFER_CANNON && attack1 && !attack2 )
     {
       ammo -= (int)( ceil( ( (float)pm->ps->stats[ STAT_MISC ] / (float)LCANNON_TOTAL_CHARGE ) * 10.0f ) );
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index bad2ffa4..2f4f3a1a 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -217,7 +217,6 @@ typedef enum
   STAT_STATE,     //TA: client states e.g. wall climbing
   STAT_MISC,      //TA: for uh...misc stuff
   STAT_BUILDABLE, //TA: which ghost model to display for building
-  STAT_BOOSTTIME, //TA: time left for boost (alien only)
   STAT_FALLDIST,  //TA: the distance the player fell
   STAT_VIEWLOCK   //TA: direction to lock the view in
 } statIndex_t;
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 4fb9624a..7acf6a9b 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1375,8 +1375,6 @@ void ClientThink_real( gentity_t *ent )
       client->lastSlowTime + ABUILDER_BLOB_TIME < level.time )
     client->ps.stats[ STAT_STATE ] &= ~SS_SLOWLOCKED;
 
-  client->ps.stats[ STAT_BOOSTTIME ] = level.time - client->lastBoostedTime;
-
   if( client->ps.stats[ STAT_STATE ] & SS_BOOSTED &&
       client->lastBoostedTime + BOOST_TIME < level.time )
     client->ps.stats[ STAT_STATE ] &= ~SS_BOOSTED;
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 54928853..e383635b 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -2139,6 +2139,7 @@ void Cmd_Buy_f( gentity_t *ent )
         }
         VectorCopy( newOrigin, ent->s.pos.trBase );
         ent->client->ps.stats[ STAT_PCLASS ] = PCL_HUMAN_BSUIT;
+        ent->client->ps.eFlags ^= EF_TELEPORT_BIT;
       }
 
       //add to inventory
@@ -2246,6 +2247,7 @@ void Cmd_Sell_f( gentity_t *ent )
         }
         VectorCopy( newOrigin, ent->s.pos.trBase );
         ent->client->ps.stats[ STAT_PCLASS ] = PCL_HUMAN;
+        ent->client->ps.eFlags ^= EF_TELEPORT_BIT;
       }
 
       //add to inventory