[location] query NPC_Event_ShotEnemyTest before each shot

storm-devs · Jan 20, 2022 · 2ff1e75 · 2ff1e75
1 parent 93562e1
commit 2ff1e75
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/src/libs/location/src/character.cpp b/src/libs/location/src/character.cpp
@@ -2832,7 +2832,7 @@ if(_stricmp(eventName, "Blade to belt") == 0)
                     // PlaySound("pistol_shot");
                     isFired = true;
                     float kDist;
-                    Character *chr = FindGunTarget(kDist, bShotOnlyEnemyTest);
+                    Character *chr = FindGunTarget(kDist, CheckShotOnlyEnemyTest());
                     entid_t enemy{};
                     if (chr)
                     {
@@ -5371,3 +5371,14 @@ Location *Character::GetLocation()
     loc_id = EntityManager::GetEntityId("location");
     return static_cast<Location *>(EntityManager::GetEntityPointer(loc_id));
 }
+
+bool Character::CheckShotOnlyEnemyTest() const
+{
+    auto * vd = core.Event("NPC_Event_ShotOnlyEnemyTest", "i", GetId());
+    int32_t tmpBool = 0;
+    if (vd)
+    {
+        vd->Get(tmpBool);
+    }
+    return tmpBool != 0;
+}
diff --git a/src/libs/location/src/character.h b/src/libs/location/src/character.h
@@ -688,7 +688,7 @@ class Character : public Entity
     float curHeadAX;
     float curHeadAY;
 
-    bool bShotOnlyEnemyTest{false};
+    [[nodiscard]] bool CheckShotOnlyEnemyTest() const;
 
   public:
     bool isPlayerEnemy;

diff --git a/src/libs/location/src/np_character.cpp b/src/libs/location/src/np_character.cpp
@@ -147,9 +147,7 @@ bool NPCharacter::PostInit()
     int32_t tmpInt;
     if (vd && vd->Get(tmpInt))
         stunChance = tmpInt;
-    vd = core.Event("NPC_Event_ShotEnemyTest", "i", GetId());
-    if (vd && vd->Get(tmpBool))
-        bShotOnlyEnemyTest = tmpBool;
+
     // Parameter normalization
     if (attackCur < 0.0f)
         attackCur = 0.0f;
@@ -732,7 +730,7 @@ void NPCharacter::UpdateFightCharacter(float dltTime)
                             const float _ay = ay;
                             ay = ang;
                             float kdst;
-                            Character *target = FindGunTarget(kdst, bShotOnlyEnemyTest, true);
+                            Character *target = FindGunTarget(kdst, CheckShotOnlyEnemyTest(), true);
                             // Character * target = FindGunTarget(kdst, true);
                             ay = _ay;
                             // if((target == c) || (target && bTryAnyTarget))

diff --git a/src/libs/location/src/player.cpp b/src/libs/location/src/player.cpp
@@ -292,7 +292,7 @@ void Player::Update(float dltTime)
             if (IsFireFindTarget())
             {
                 float kDist;
-                auto *c = FindGunTarget(kDist, bShotOnlyEnemyTest);
+                auto *c = FindGunTarget(kDist, CheckShotOnlyEnemyTest());
                 if (c)
                     c->Select();
             }