From d4a6a30d3a664f3dcbdc3b64fb3b4663d7577656 Mon Sep 17 00:00:00 2001
From: Dmitry <dmitry@jeefo.net>
Date: Tue, 9 Jun 2015 22:58:15 +0300
Subject: [PATCH] playing with msec...

---
 include/core.h      |  7 ++----
 source/basecode.cpp | 56 +++++++++++----------------------------------
 source/manager.cpp  |  4 +---
 3 files changed, 16 insertions(+), 51 deletions(-)

diff --git a/include/core.h b/include/core.h
index 92e8791..b60f49b 100644
--- a/include/core.h
+++ b/include/core.h
@@ -907,11 +907,8 @@ private:
    bool m_duckDefuse; // should or not bot duck to defuse bomb
    float m_duckDefuseCheckTime; // time to check for ducking for defuse
 
-   float m_msecVal; // calculated msec value
-   float m_msecDel;
-
    float m_frameInterval; // bot's frame interval
-   float m_lastThinkTime; // time bot last thinked
+   float m_lastCommandTime; // time bot last thinked
 
    float m_reloadCheckTime; // time to check reloading
    float m_zoomCheckTime; // time to check zoom again
@@ -1044,7 +1041,7 @@ private:
    int GetBestSecondaryWeaponCarried (void);
 
    void RunPlayerMovement (void);
-   void ThrottleMsec(void);
+   byte ThrottledMsec (float input);
    void GetValidWaypoint (void);
    void ChangeWptIndex (int waypointIndex);
    bool IsDeadlyDrop (Vector targetOriginPos);
diff --git a/source/basecode.cpp b/source/basecode.cpp
index 71f1b34..56c2877 100644
--- a/source/basecode.cpp
+++ b/source/basecode.cpp
@@ -3054,12 +3054,6 @@ void Bot::Think (void)
    if (m_team == TEAM_TF)
       m_hasC4 = !!(pev->weapons & (1 << WEAPON_C4));
 
-   m_frameInterval = GetWorldTime () - m_lastThinkTime;
-   m_lastThinkTime = GetWorldTime ();
-
-   // calculate msec value
-   ThrottleMsec ();
-
    // is bot movement enabled
    bool botMovement = false;
 
@@ -5777,45 +5771,16 @@ void Bot::MoveToVector (Vector to)
    FindPath (m_currentWaypointIndex, g_waypoint->FindNearest (to), 0);
 }
 
-void Bot::ThrottleMsec (void)
+byte Bot::ThrottledMsec (float input)
 {
-   m_msecVal = static_cast <int> (m_frameInterval * 1000.0);
+   // estimate msec to use for this command based on time passed from the previous command
+   int newMsec = static_cast <int> (input * 1000);
 
-   // count up difference that integer conversion caused
-   m_msecDel += m_frameInterval * 1000.0 - m_msecVal;
+   // bots are going to be slower than they should if this happens.
+   if (newMsec > 255)
+      newMsec = 255;
 
-   // remove effect of integer conversion and lost msecs on previous frames
-   if (m_msecDel > 1.625f)
-   {
-      float diff = 1.625f;
-
-      if (m_msecDel > 60.0f)
-         diff = 60.0f;
-      else if (m_msecDel > 30.0f)
-         diff = 30.0f;
-      else if (m_msecDel > 15.0f)
-         diff = 15.0f;
-      else if (m_msecDel > 7.5f)
-         diff = 7.5f;
-      else if (m_msecDel > 3.25f)
-         diff = 3.25f;
-
-      m_msecVal += diff - 0.5f;
-      m_msecDel -= diff - 0.5f;
-   }
-
-   if (m_msecVal < 1)    // don't allow msec to be less than 1...
-   {
-      // adjust msecdel so we can correct lost msecs on following frames
-      m_msecDel += m_msecVal - 1;
-      m_msecVal = 1;
-   }
-   else if (m_msecVal > 100)  // ...or greater than 100
-   {
-      // adjust msecdel so we can correct lost msecs on following frames
-      m_msecDel += m_msecVal - 100;
-      m_msecVal = 100;
-   }
+   return static_cast <byte> (newMsec);
 }
 
 void Bot::RunPlayerMovement (void)
@@ -5834,7 +5799,12 @@ void Bot::RunPlayerMovement (void)
    // elapses, that bot will behave like a ghost : no movement, but bullets and players can
    // pass through it. Then, when the next frame will begin, the stucking problem will arise !
 
-   (*g_engfuncs.pfnRunPlayerMove) (pev->pContainingEntity, m_moveAngles, m_moveSpeed, m_strafeSpeed, 0.0, pev->button, pev->impulse, m_msecVal);
+   m_frameInterval = GetWorldTime () - m_lastCommandTime;
+
+   byte msecVal = ThrottledMsec (m_frameInterval);
+   m_lastCommandTime = GetWorldTime ();
+
+   (*g_engfuncs.pfnRunPlayerMove) (pev->pContainingEntity, m_moveAngles, m_moveSpeed, m_strafeSpeed, 0.0, pev->button, pev->impulse, msecVal);
 }
 
 void Bot::CheckBurstMode (float distance)
diff --git a/source/manager.cpp b/source/manager.cpp
index 897f708..a860116 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -775,9 +775,7 @@ Bot::Bot (edict_t *bot, int difficulty, int personality, int team, int member)
 
    m_startAction = GSM_IDLE;
    m_moneyAmount = 0;
-
    m_logotypeIndex = Random.Long (0, 5);
-   m_msecVal = static_cast <byte> (g_pGlobals->frametime * 1000.0);
 
    // assign how talkative this bot will be
    m_sayTextBuffer.chatDelay = Random.Float (3.8, 10.0);
@@ -793,7 +791,7 @@ Bot::Bot (edict_t *bot, int difficulty, int personality, int team, int member)
       yb_difficulty.SetInt (difficulty);
    }
 
-   m_lastThinkTime = GetWorldTime () - 0.1f;
+   m_lastCommandTime = GetWorldTime () - 0.1f;
    m_frameInterval = GetWorldTime ();
    m_timePeriodicUpdate = 0.0f;