fix (#33)

* fixed: looking for ammo (bolts and arrows) works now again
mlthelama · Apr 2, 2023 · df5f7fd · df5f7fd
2 parents 9744b09 + 348cb54
commit df5f7fd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 set(NAME "LamasTinyHUD")
-set(VERSION 1.4.0.0)
+set(VERSION 1.4.1.0)
 
 # ---- Options ----
 

diff --git a/src/processing/set_setting_data.cpp b/src/processing/set_setting_data.cpp
@@ -7,6 +7,7 @@
 #include "setting/custom_setting.h"
 #include "setting/mcm_setting.h"
 #include "setting_execute.h"
+#include "util/constant.h"
 #include "util/helper.h"
 #include "util/player/player.h"
 #include "util/string_util.h"
@@ -482,8 +483,11 @@ namespace processing {
             const auto& [num_items, entry] = inv_data;
             const auto ammo = item->As<RE::TESAmmo>();
 
-            if (ammo->IsBoundObject() || !ammo->GetPlayable() ||
-                ammo->GetRuntimeData().data.flags.any(RE::AMMO_DATA::Flag::kNonPlayable)) {
+            if (!ammo->GetPlayable() || ammo->GetRuntimeData().data.flags.any(RE::AMMO_DATA::Flag::kNonPlayable)) {
+                continue;
+            }
+
+            if (ammo->formID == util::bound_arrow) {
                 continue;
             }
 

diff --git a/src/util/constant.h b/src/util/constant.h
@@ -17,4 +17,6 @@ namespace util {
                                                                                                0x0003EADE },
         { RE::ActorValue::kStamina, 0x00039BE8 },
         { RE::ActorValue::kMagicka, 0x0003EAE1 } };
+
+    constexpr RE::FormID bound_arrow = 0x0010b0a7;
 }
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "lamastinyhud",
-    "version-string": "1.4.0",
+    "version-string": "1.4.1",
     "description": "hud element for skyrim",
     "homepage": "https://github.com/mlthelama/LamasTinyHUD",
     "license": "GPL-2.0-or-later",