Merge pull request #650 from tiltedphoques/dev

RobbeBryssinck · web-flow · commit 1d819b3806cc · 2024-03-29T13:04:32.000+01:00
V1.6.4
diff --git a/Code/client/Games/Fallout4/TESObjectREFR.cpp b/Code/client/Games/Fallout4/TESObjectREFR.cpp
@@ -14,7 +14,7 @@
 
 #include <Games/Overrides.h>
 
-TP_THIS_FUNCTION(TActivate, void, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping);
+TP_THIS_FUNCTION(TActivate, bool, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping);
 TP_THIS_FUNCTION(TAddInventoryItem, void, TESObjectREFR, TESBoundObject* apObject, ExtraDataList* apExtraData, uint32_t aCount, TESObjectREFR* apOldContainer, void* apUnk1, void* apUnk2);
 TP_THIS_FUNCTION(TRemoveInventoryItem, uint32_t*, TESObjectREFR, uint32_t* apUnk1, void* apUnk2);
 
@@ -139,12 +139,12 @@ const BGSEquipSlot* TESObjectREFR::GetEquipSlot(uint32_t aEquipIndex) const noex
     return TiltedPhoques::ThisCall(getEquipSlot, this, aEquipIndex);
 }
 
-void TESObjectREFR::Activate(TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping) noexcept
+bool TESObjectREFR::Activate(TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping) noexcept
 {
     return TiltedPhoques::ThisCall(RealActivate, this, apActivator, apObjectToGet, aCount, aDefaultProcessing, aFromScript, aIsLooping);
 }
 
-void TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping)
+bool TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping)
 {
     auto* pActivator = Cast<Actor>(apActivator);
     if (pActivator)
diff --git a/Code/client/Games/Fallout4/TESObjectREFR.h b/Code/client/Games/Fallout4/TESObjectREFR.h
@@ -188,7 +188,7 @@ struct TESObjectREFR : TESForm
     void PayGold(int32_t aAmount) noexcept;
     void PayGoldToContainer(TESObjectREFR* pContainer, int32_t aAmount) noexcept;
 
-    void Activate(TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping) noexcept;
+    bool Activate(TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping) noexcept;
 
     Lock* CreateLock() noexcept;
     void LockChange() noexcept;
diff --git a/Code/client/Games/Skyrim/TESObjectREFR.cpp b/Code/client/Games/Skyrim/TESObjectREFR.cpp
@@ -24,7 +24,7 @@
 #include <EquipManager.h>
 #include <DefaultObjectManager.h>
 
-TP_THIS_FUNCTION(TActivate, void, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing);
+TP_THIS_FUNCTION(TActivate, bool, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing);
 TP_THIS_FUNCTION(TAddInventoryItem, void, TESObjectREFR, TESBoundObject* apItem, ExtraDataList* apExtraData, int32_t aCount, TESObjectREFR* apOldOwner);
 TP_THIS_FUNCTION(
     TRemoveInventoryItem, BSPointerHandle<TESObjectREFR>*, TESObjectREFR, BSPointerHandle<TESObjectREFR>* apResult, TESBoundObject* apItem, int32_t aCount, ITEM_REMOVE_REASON aReason, ExtraDataList* apExtraList, TESObjectREFR* apMoveToRef, const NiPoint3* apDropLoc, const NiPoint3* apRotate);
@@ -520,7 +520,7 @@ void TESObjectREFR::UpdateItemList(TESForm* pUnkForm) noexcept
     TiltedPhoques::ThisCall(updateItemList, this, pUnkForm);
 }
 
-void TESObjectREFR::Activate(TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* aObjectToGet, int32_t aCount, char aDefaultProcessing) noexcept
+bool TESObjectREFR::Activate(TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* aObjectToGet, int32_t aCount, char aDefaultProcessing) noexcept
 {
     ScopedActivateOverride _;
 
@@ -590,7 +590,7 @@ bool TP_MAKE_THISCALL(HookPlayAnimation, void, uint32_t auiStackID, TESObjectREF
     return TiltedPhoques::ThisCall(RealPlayAnimation, apThis, auiStackID, apSelf, apEventName);
 }
 
-void TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing)
+bool TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing)
 {
     Actor* pActivator = Cast<Actor>(apActivator);
 
diff --git a/Code/client/Games/Skyrim/TESObjectREFR.h b/Code/client/Games/Skyrim/TESObjectREFR.h
@@ -176,7 +176,7 @@ struct TESObjectREFR : TESForm
     void PayGold(int32_t aAmount) noexcept;
     void PayGoldToContainer(TESObjectREFR* pContainer, int32_t aAmount) noexcept;
 
-    void Activate(TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing) noexcept;
+    bool Activate(TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing) noexcept;
 
     bool PlayAnimationAndWait(BSFixedString* apAnimation, BSFixedString* apEventName) noexcept;
     bool PlayAnimation(BSFixedString* apEventName) noexcept;
diff --git a/Code/client/Services/Debug/DebugService.cpp b/Code/client/Services/Debug/DebugService.cpp
@@ -1,3 +1,5 @@
+#include <BranchInfo.h>
+
 #include <Havok/hkbStateMachine.h>
 #include <Structs/AnimationGraphDescriptorManager.h>
 
diff --git a/Code/client/TiltedOnlineApp.h b/Code/client/TiltedOnlineApp.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <BranchInfo.h>
+
 #if (!IS_MASTER)
 #include "CrashHandler.h"
 #else
@@ -36,6 +38,6 @@ struct TiltedOnlineApp final : App
 #if (!IS_MASTER)
     CrashHandler m_crashHandler;
 #else
-    ScopedCrashHandler m_crashHandler;
+    //ScopedCrashHandler m_crashHandler;
 #endif
 };
diff --git a/Code/client/TiltedOnlinePCH.h b/Code/client/TiltedOnlinePCH.h
@@ -4,8 +4,6 @@
 #define NOMINMAX
 #endif
 
-#include <BranchInfo.h>
-
 #include <TiltedCore/Platform.hpp>
 
 #if defined(TP_SKYRIM) && TP_PLATFORM_64
diff --git a/Code/client/xmake.lua b/Code/client/xmake.lua
@@ -79,7 +79,7 @@ target(name)
         "kernel32")
 end
 
-add_requires("tiltedcore", {debug = true})
+add_requires("tiltedcore v0.2.7", {debug = true})
 
 build_client("SkyrimTogetherClient", "TP_SKYRIM=1")
 build_client("FalloutTogetherClient", "TP_FALLOUT=1")
diff --git a/Code/immersive_launcher/Launcher.cpp b/Code/immersive_launcher/Launcher.cpp
@@ -15,6 +15,8 @@
 
 #include "base/dialogues/win/TaskDialog.h"
 
+#include <BranchInfo.h>
+
 // These symbols are defined within the client code skyrimtogetherclient
 extern void InstallStartHook();
 extern void RunTiltedApp();
diff --git a/Code/server/xmake.lua b/Code/server/xmake.lua
@@ -1,6 +1,6 @@
 local function istable(t) return type(t) == 'table' end
 
-add_requires("sol2", {configs = {lua = "lua"}})
+add_requires("sol2 v3.3.0", {configs = {lua = "lua"}})
 
 local function build_server()
     set_kind("shared")
diff --git a/Libraries/TiltedUI b/Libraries/TiltedUI
@@ -1 +1 @@
-Subproject commit 7f421437a36a49e5d06ca534e1eacf217b84bee7
+Subproject commit 2c00af54e93310597a5b750ddb8cf7893d741e47
diff --git a/xmake.lua b/xmake.lua
@@ -1,4 +1,4 @@
-set_xmakever("2.6.5")
+set_xmakever("2.8.5")
 
 -- If newer version of xmake, remove ccache until it actually works
 if set_policy ~= nil then
@@ -32,16 +32,16 @@ end
 
 add_requires(
     "entt v3.10.0", 
-    "recastnavigation", 
-    "tiltedcore", 
-    "cryptopp", 
-    "spdlog", 
-    "cpp-httplib",
-    "gtest", 
-    "mem", 
-    "glm", 
-    "sentry-native", 
-    "zlib")
+    "recastnavigation v1.6.0", 
+    "tiltedcore v0.2.7", 
+    "cryptopp 8.9.0", 
+    "spdlog v1.13.0", 
+    "cpp-httplib 0.14.0",
+    "gtest v1.14.0", 
+    "mem 1.0.0", 
+    "glm 0.9.9+8", 
+    "sentry-native 0.7.1", 
+    "zlib v1.3.1")
 
 add_requireconfs("cpp-httplib", {configs = {ssl = true}})
 add_requireconfs("sentry-native", { configs = { backend = "crashpad" } })
@@ -54,17 +54,9 @@ add_requireconfs("magnum-integration.imgui", { override = true })
 
 if is_plat("windows") then
     add_requires(
-        "discord", 
-        "imgui"
+        "discord 3.2.1", 
+        "imgui v1.89.7"
     )
-    --[[
-    add_requires(
-        "discord", 
-        "imgui",
-        "magnum", 
-        "magnum-integration"
-    )
-    --]]
 end
 
 before_build(function (target)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`#include <Games/Overrides.h>`
`16`	`16`
`17`		`-TP_THIS_FUNCTION(TActivate, void, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping);`
	`17`	`+TP_THIS_FUNCTION(TActivate, bool, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping);`
`18`	`18`	`TP_THIS_FUNCTION(TAddInventoryItem, void, TESObjectREFR, TESBoundObject* apObject, ExtraDataList* apExtraData, uint32_t aCount, TESObjectREFR* apOldContainer, void* apUnk1, void* apUnk2);`
`19`	`19`	`TP_THIS_FUNCTION(TRemoveInventoryItem, uint32_t, TESObjectREFR, uint32_t apUnk1, void* apUnk2);`
`20`	`20`
`@@ -139,12 +139,12 @@ const BGSEquipSlot* TESObjectREFR::GetEquipSlot(uint32_t aEquipIndex) const noex`
`139`	`139`	`return TiltedPhoques::ThisCall(getEquipSlot, this, aEquipIndex);`
`140`	`140`	`}`
`141`	`141`
`142`		`-void TESObjectREFR::Activate(TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping) noexcept`
	`142`	`+bool TESObjectREFR::Activate(TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int32_t aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping) noexcept`
`143`	`143`	`{`
`144`	`144`	`return TiltedPhoques::ThisCall(RealActivate, this, apActivator, apObjectToGet, aCount, aDefaultProcessing, aFromScript, aIsLooping);`
`145`	`145`	`}`
`146`	`146`
`147`		`-void TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping)`
	`147`	`+bool TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, TESBoundObject* apObjectToGet, int aCount, bool aDefaultProcessing, bool aFromScript, bool aIsLooping)`
`148`	`148`	`{`
`149`	`149`	`auto* pActivator = Cast<Actor>(apActivator);`
`150`	`150`	`if (pActivator)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#include <EquipManager.h>`
`25`	`25`	`#include <DefaultObjectManager.h>`
`26`	`26`
`27`		`-TP_THIS_FUNCTION(TActivate, void, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing);`
	`27`	`+TP_THIS_FUNCTION(TActivate, bool, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing);`
`28`	`28`	`TP_THIS_FUNCTION(TAddInventoryItem, void, TESObjectREFR, TESBoundObject* apItem, ExtraDataList* apExtraData, int32_t aCount, TESObjectREFR* apOldOwner);`
`29`	`29`	`TP_THIS_FUNCTION(`
`30`	`30`	`TRemoveInventoryItem, BSPointerHandle<TESObjectREFR>, TESObjectREFR, BSPointerHandle<TESObjectREFR> apResult, TESBoundObject* apItem, int32_t aCount, ITEM_REMOVE_REASON aReason, ExtraDataList* apExtraList, TESObjectREFR* apMoveToRef, const NiPoint3* apDropLoc, const NiPoint3* apRotate);`
`@@ -520,7 +520,7 @@ void TESObjectREFR::UpdateItemList(TESForm* pUnkForm) noexcept`
`520`	`520`	`TiltedPhoques::ThisCall(updateItemList, this, pUnkForm);`
`521`	`521`	`}`
`522`	`522`
`523`		`-void TESObjectREFR::Activate(TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* aObjectToGet, int32_t aCount, char aDefaultProcessing) noexcept`
	`523`	`+bool TESObjectREFR::Activate(TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* aObjectToGet, int32_t aCount, char aDefaultProcessing) noexcept`
`524`	`524`	`{`
`525`	`525`	`ScopedActivateOverride _;`
`526`	`526`
`@@ -590,7 +590,7 @@ bool TP_MAKE_THISCALL(HookPlayAnimation, void, uint32_t auiStackID, TESObjectREF`
`590`	`590`	`return TiltedPhoques::ThisCall(RealPlayAnimation, apThis, auiStackID, apSelf, apEventName);`
`591`	`591`	`}`
`592`	`592`
`593`		`-void TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing)`
	`593`	`+bool TP_MAKE_THISCALL(HookActivate, TESObjectREFR, TESObjectREFR* apActivator, uint8_t aUnk1, TESBoundObject* apObjectToGet, int32_t aCount, char aDefaultProcessing)`
`594`	`594`	`{`
`595`	`595`	`Actor* pActivator = Cast<Actor>(apActivator);`
`596`	`596`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#include <BranchInfo.h>`
	`2`	`+`
`1`	`3`	`#include <Havok/hkbStateMachine.h>`
`2`	`4`	`#include <Structs/AnimationGraphDescriptorManager.h>`
`3`	`5`