fix: build fixes

tiltedphoques · Feb 15, 2022 · 86319bc · 86319bc
1 parent a0cb1f4
commit 86319bc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/Code/client/Games/Skyrim/Forms/EnchantmentItem.h b/Code/client/Games/Skyrim/Forms/EnchantmentItem.h
@@ -2,7 +2,7 @@
 
 #include "MagicItem.h"
 
-#include <Structs/Container.h>
+#include <Structs/Inventory.h>
 #include <Games/Magic/MagicSystem.h>
 #include "BGSListForm.h"
 

diff --git a/Code/client/Games/Skyrim/TESObjectREFR.cpp b/Code/client/Games/Skyrim/TESObjectREFR.cpp
@@ -180,6 +180,9 @@ Inventory TESObjectREFR::GetInventory() const noexcept
     auto pExtraContChangesEntries = GetContainerChanges()->entries;
     for (auto pGameEntry : *pExtraContChangesEntries)
     {
+        if (!pGameEntry)
+            continue;
+
         Inventory::Entry entry;
         modSystem.GetServerModId(pGameEntry->form->formID, entry.BaseId);
         entry.Count = pGameEntry->count;

diff --git a/Code/client/Games/Skyrim/TESObjectREFR.h b/Code/client/Games/Skyrim/TESObjectREFR.h
@@ -9,9 +9,8 @@
 #include <Games/Misc/Lock.h>
 #include <Games/Magic/MagicSystem.h>
 #include <Magic/MagicCaster.h>
-#include <Structs/Container.h>
+#include <Structs/Inventory.h>
 #include <Games/ExtraDataList.h>
-#include <Structs/Container.h>
 
 struct AnimationVariables;
 struct TESWorldSpace;

diff --git a/Code/client/Services/Debug/TestService.cpp b/Code/client/Services/Debug/TestService.cpp
@@ -86,6 +86,8 @@ void TestService::OnUpdate(const UpdateEvent& acUpdateEvent) noexcept
             static char s_address[256] = "127.0.0.1:10578";
             if (!m_transport.IsOnline())
                 m_transport.Connect(s_address);
+            else
+                m_transport.Close();
         }
     }
     else

diff --git a/Code/encoding/Structs/Inventory.cpp b/Code/encoding/Structs/Inventory.cpp
@@ -1,4 +1,4 @@
-#include <Structs/Container.h>
+#include <Structs/Inventory.h>
 #include <TiltedCore/Serialization.hpp>
 
 using TiltedPhoques::Serialization;