hack the second

* might work better now, still needs testing
mlthelama · Dec 28, 2023 · 299a7ce · 299a7ce
1 parent ccc58d6
commit 299a7ce
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/src/equip/item.cpp b/src/equip/item.cpp
@@ -54,16 +54,18 @@ namespace equip {
                 auto simple_extra_data_list = entry->extraLists;
                 if (simple_extra_data_list) {
                     for (auto* extra_data : *simple_extra_data_list) {
-                        extra = extra_data;
+                        //extra = extra_data;
                         auto worn_right = extra_data->HasType(RE::ExtraDataType::kWorn);
                         auto worn_left = extra_data->HasType(RE::ExtraDataType::kWornLeft);
                         logger::trace("extra data {}, worn right {}, worn left {}"sv,
                             extra_data->GetCount(),
                             worn_right,
                             worn_left);
-                        if (!worn_right || !worn_left) {
-                            extra_vector.push_back(extra_data);
+                        if (worn_right || worn_left) {
+                            continue;
                         }
+
+                        extra_vector.push_back(extra_data);
                     }
                 }
                 break;
@@ -88,13 +90,7 @@ namespace equip {
             if (!extra_vector.empty()) {
                 extra = extra_vector.back();
                 extra_vector.pop_back();  //remove last item, because we already use that
-                if (extra_vector.empty() && ((left && extra->HasType(RE::ExtraDataType::kWorn) ||
-                                                (!left && extra->HasType(RE::ExtraDataType::kWornLeft))))) {
-                    extra = nullptr;
-                } else if (!extra_vector.empty()) {
-                    extra = extra_vector.back();
-                    extra_vector.pop_back();  //remove last item, because we already use that
-                }
+
                 extra_handler->init_extra_data(a_form, extra_vector);
                 logger::trace("set {} extra data for form {}"sv, extra_vector.size(), a_form->GetName());
             }
@@ -115,12 +111,12 @@ namespace equip {
         auto equipped_count = 0;
         if (obj_right && obj_right->formID == obj->formID) {
             equipped_count++;
-            logger::debug("Object {} already equipped."sv, obj->GetName());
+            logger::debug("Object {} already equipped (right)."sv, obj->GetName());
         }
 
         if (obj_left && obj_left->formID == obj->formID) {
             equipped_count++;
-            logger::debug("Object {} already equipped."sv, obj->GetName());
+            logger::debug("Object {} already equipped (left)."sv, obj->GetName());
         }
 
         logger::trace("Got a count of {} in the Inventory {}, Equipped {}"sv,

diff --git a/src/event/equip_event.cpp b/src/event/equip_event.cpp
@@ -41,7 +41,7 @@ namespace event {
             util::helper::is_two_handed(form)) {
             processing::set_setting_data::check_if_location_needs_block(form, a_event->equipped);
         }
-
+        
         return event_result::kContinue;
     }
 }
diff --git a/src/event/key_manager.cpp b/src/event/key_manager.cpp
@@ -52,7 +52,7 @@ namespace event {
             return event_result::kContinue;
         }
 
-        handle::extra_data_holder::get_singleton()->reset_data();
+        //handle::extra_data_holder::get_singleton()->reset_data();
 
         for (auto* event = *a_event; event; event = event->next) {
             if (event->eventType != RE::INPUT_EVENT_TYPE::kButton) {
@@ -188,6 +188,7 @@ namespace event {
                 }
             }
         }
+
         return event_result::kContinue;
     }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -116,8 +116,8 @@ EXTERN_C [[maybe_unused]] __declspec(dllexport) constinit auto SKSEPlugin_Versio
     return v;
 }();
 
-EXTERN_C [[maybe_unused]] __declspec(dllexport) bool SKSEAPI
-    SKSEPlugin_Query(const SKSE::QueryInterface* a_skse, SKSE::PluginInfo* pluginInfo) {
+EXTERN_C [[maybe_unused]] __declspec(dllexport) bool SKSEAPI SKSEPlugin_Query(const SKSE::QueryInterface* a_skse,
+    SKSE::PluginInfo* pluginInfo) {
     pluginInfo->name = SKSEPlugin_Version.pluginName;
     pluginInfo->infoVersion = SKSE::PluginInfo::kVersion;
     pluginInfo->version = SKSEPlugin_Version.pluginVersion;

diff --git a/src/processing/set_setting_data.cpp b/src/processing/set_setting_data.cpp
@@ -2,6 +2,7 @@
 #include "equip/equip_slot.h"
 #include "equip/item.h"
 #include "handle/ammo_handle.h"
+#include "handle/extra_data_holder.h"
 #include "handle/name_handle.h"
 #include "handle/page_handle.h"
 #include "setting/custom_setting.h"
@@ -392,12 +393,15 @@ namespace processing {
             setting_execute::execute_settings(position_setting->slot_settings);
         }
 
-        setting_execute::execute_settings(right_position_setting->slot_settings);
+        if (right_position_setting && !right_position_setting->slot_settings.empty()) {
+            setting_execute::execute_settings(right_position_setting->slot_settings);
+        }
 
         position_setting = page_handle->get_page_setting(page_handle->get_active_page_id_position(position_type::top),
             position_type::top);
         setting_execute::execute_settings(position_setting->slot_settings, true);
 
+        handle::extra_data_holder::get_singleton()->reset_data();
         logger::trace("done equip for first set"sv);
     }
 
@@ -460,6 +464,7 @@ namespace processing {
                 processing::setting_execute::reequip_left_hand_if_needed(setting);
             }
         }
+        handle::extra_data_holder::get_singleton()->reset_data();
         logger::trace("checking for block done. return."sv);
     }