combat: force grenade war if have only grenade in hands

fix: crash bug when in some situations sv_gravity is zero

inc/yapb.h

@@ -402,6 +402,7 @@ private:
    bool selectBestNextNode ();
    bool hasAnyWeapons ();
    bool isKnifeMode ();
+   bool isGrenadeWar ();
    bool isDeadlyMove (const Vector &to);
    bool isOutOfBombTimer ();
    bool isWeaponBadAtDistance (int weaponIndex, float distance);
@@ -867,6 +868,7 @@ extern ConVar cv_graph_auto_save_count;
 extern ConVar cv_graph_analyze_max_jump_height;
 extern ConVar cv_spraypaints;
 extern ConVar cv_whose_your_daddy;
+extern ConVar cv_grenadier_mode;
 
 extern ConVar mp_freezetime;
 extern ConVar mp_roundtime;

src/combat.cpp

@@ -1528,6 +1528,21 @@ bool Bot::isKnifeMode () {
    return cv_jasonmode.bool_ () || (usesKnife () && !hasAnyWeapons ()) || m_isCreature;
 }
 
+bool Bot::isGrenadeWar () {
+   const bool hasSomeGreandes = bestGrenadeCarried () != -1;
+
+   // if has grenade an not other weapons, assume we're in grenade war
+   if (!hasAnyWeapons () && hasSomeGreandes) {
+      return true;
+   }
+
+   // if we're forced to via cvar
+   if (cv_grenadier_mode.bool_ ()) {
+      return true;
+   }
+   return game.mapIs (MapFlags::GrenadeWar); // in case map was flagged
+}
+
 void Bot::selectBestWeapon () {
    // this function chooses best weapon, from weapons that bot currently own, and change
    // current weapon to best one.
@@ -1791,6 +1806,11 @@ Vector Bot::calcToss (const Vector &start, const Vector &stop) {
    TraceResult tr {};
    const float gravity = sv_gravity.float_ () * 0.55f;
 
+   // prevent div by zero in some strange situations
+   if (cr::fzero (gravity)) {
+      return nullptr;
+   }
+
    Vector end = stop - pev->velocity;
    end.z -= 15.0f;
 
@@ -1845,6 +1865,12 @@ Vector Bot::calcThrow (const Vector &start, const Vector &stop) {
    TraceResult tr {};
 
    const float gravity = sv_gravity.float_ () * 0.55f;
+
+   // prevent div by zero in some strange situations
+   if (cr::fzero (gravity)) {
+      return nullptr;
+   }
+
    float time = velocity.length () / 195.0f;
 
    if (time < 0.01f) {
@@ -1902,16 +1928,18 @@ edict_t *Bot::setCorrectGrenadeVelocity (StringRef model) {
 }
 
 void Bot::checkGrenadesThrow () {
+   const auto tid = getCurrentTaskId ();
 
    // do not check cancel if we have grenade in out hands
-   const bool preventibleTasks = getCurrentTaskId () == Task::PlantBomb || getCurrentTaskId () == Task::DefuseBomb;
+   const bool preventibleTasks = tid == Task::PlantBomb || tid == Task::DefuseBomb;
+   const bool isGrenadeMode = isGrenadeWar ();
 
    auto clearThrowStates = [] (uint32_t &states) {
       states &= ~(Sense::ThrowExplosive | Sense::ThrowFlashbang | Sense::ThrowSmoke);
    };
 
    // check if throwing a grenade is a good thing to do...
-   const auto throwingCondition = game.mapIs (MapFlags::GrenadeWar)
+   const auto throwingCondition = isGrenadeMode
       ? false
       : (preventibleTasks
          || isInNarrowPlace ()
@@ -1930,7 +1958,7 @@ void Bot::checkGrenadesThrow () {
    // check again in some seconds
    m_grenadeCheckTime = game.time () + kGrenadeCheckTime;
 
-   const auto senseCondition = game.mapIs (MapFlags::GrenadeWar) ? false : !(m_states & (Sense::SuspectEnemy | Sense::HearingEnemy));
+   const auto senseCondition = isGrenadeMode ? false : !(m_states & (Sense::SuspectEnemy | Sense::HearingEnemy));
 
    if (!util.isAlive (m_lastEnemy) || senseCondition) {
       clearThrowStates (m_states);
@@ -1974,7 +2002,7 @@ void Bot::checkGrenadesThrow () {
    }
 
    // enemy within a good throw distance?
-   const auto grenadeToThrowCondition = game.mapIs (MapFlags::GrenadeWar)
+   const auto grenadeToThrowCondition = isGrenadeMode
       ? 100.0f
       : grenadeToThrow == Weapon::Smoke ? 200.0f : 400.0f;
 

src/engine.cpp

@@ -167,10 +167,6 @@ void Game::levelInitialize (edict_t *entities, int max) {
       }
    }
 
-   if (cv_grenadier_mode.bool_()) {
-      m_mapFlags |= MapFlags::GrenadeWar;
-   }
-
    // reset some timers
    m_oneSecondFrame = 0.0f;
    m_halfSecondFrame = 0.0f;

src/tasks.cpp

@@ -1084,7 +1084,7 @@ void Bot::throwExplosive_ () {
 
    ignoreCollision ();
 
-   if (!game.mapIs (MapFlags::GrenadeWar) && (pev->origin.distanceSq (dest) < cr::sqrf (450.0f))) {
+   if (!isGrenadeWar () && pev->origin.distanceSq (dest) < cr::sqrf (450.0f)) {
       // heck, I don't wanna blow up myself
       m_grenadeCheckTime = game.time () + kGrenadeCheckTime * 2.0f;
 
@@ -1099,7 +1099,7 @@ void Bot::throwExplosive_ () {
       m_grenade = calcToss (pev->origin, dest);
    }
 
-   if (!game.mapIs (MapFlags::GrenadeWar) &&  (m_grenade.lengthSq () <= 100.0f)) {
+   if (!isGrenadeWar () && m_grenade.lengthSq () <= 100.0f) {
       m_grenadeCheckTime = game.time () + kGrenadeCheckTime * 2.0f;
 
       selectBestWeapon ();
@@ -1218,7 +1218,7 @@ void Bot::throwSmoke_ () {
    if (!game.isNullEntity (m_enemy)) {
       src = src + m_enemy->v.velocity;
    }
-   m_grenade = (src - getEyesPos ()).normalize ();
+   m_grenade = (src - getEyesPos ()).normalize_apx ();
 
    if (getTask ()->time < game.time ()) {
       completeTask ();