fix: merge conflict

tiltedphoques · Jan 21, 2022 · c2b082f · c2b082f
2 parents 7f299e9 + 7233d04
commit c2b082f
Show file tree

Hide file tree

Showing 21 changed files with 301 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# [1.10.0](https://github.com/tiltedphoques/TiltedEvolution/compare/v1.9.0...v1.10.0) (2022-01-21)
+
+
+### Bug Fixes
+
+* build error ([e7c1f9a](https://github.com/tiltedphoques/TiltedEvolution/commit/e7c1f9a9ab83e994ed848d9a122dd11922521915))
+* build errors ([4826b8b](https://github.com/tiltedphoques/TiltedEvolution/commit/4826b8b4db1f8170e789f60e8b385092632c6d39))
+* moved opcode check ([f168015](https://github.com/tiltedphoques/TiltedEvolution/commit/f168015c01b36dacec8d9e4a014ff37bbfc967e7))
+* variable naming convention ([47f3e70](https://github.com/tiltedphoques/TiltedEvolution/commit/47f3e7093bd31a09e2d84742767e369e9e34f57a))
+
+
+### Features
+
+* remote horses are now synced ([a8a267a](https://github.com/tiltedphoques/TiltedEvolution/commit/a8a267a9229e8a239bd6d6411590b2171d1d0871))
+* take control of remote horse ([400c12e](https://github.com/tiltedphoques/TiltedEvolution/commit/400c12e0a6065e021a7a2ace7744c2e283347aba))
+* trigger mounting ([6fe7d4a](https://github.com/tiltedphoques/TiltedEvolution/commit/6fe7d4a04f0f898d303e43d1b9c37714c1535a57))
+
 # [1.9.0](https://github.com/tiltedphoques/TiltedEvolution/compare/v1.8.0...v1.9.0) (2022-01-21)
 
 

diff --git a/Code/client/Events/MountEvent.h b/Code/client/Events/MountEvent.h
@@ -0,0 +1,11 @@
+#pragma once
+
+struct MountEvent
+{
+    MountEvent(uint32_t aRiderID, uint32_t aMountID)
+        : RiderID(aRiderID), MountID(aMountID)
+    {}
+
+    uint32_t RiderID;
+    uint32_t MountID;
+};
diff --git a/Code/client/Games/Primitives.h b/Code/client/Games/Primitives.h
@@ -265,7 +265,7 @@ struct GamePtr
 
     GamePtr& operator=(GamePtr<T>&& aRhs)
     {
-        std::swap(m_pPointer, acRhs.m_pPointer);
+        std::swap(m_pPointer, aRhs.m_pPointer);
 
         return *this;
     }

diff --git a/Code/client/Games/Skyrim/Actor.cpp b/Code/client/Games/Skyrim/Actor.cpp
@@ -13,6 +13,7 @@
 
 #include <Events/HealthChangeEvent.h>
 #include <Events/InventoryChangeEvent.h>
+#include <Events/MountEvent.h>
 
 #include <World.h>
 #include <Services/PapyrusService.h>
@@ -465,6 +466,14 @@ void Actor::RemoveFromAllFactions() noexcept
     s_pRemoveFromAllFactions(this);
 }
 
+TP_THIS_FUNCTION(TInitiateMountPackage, bool, Actor, Actor* apMount);
+static TInitiateMountPackage* RealInitiateMountPackage = nullptr;
+
+bool Actor::InitiateMountPackage(Actor* apMount) noexcept
+{
+    return ThisCall(RealInitiateMountPackage, this, apMount);
+}
+
 bool Actor::IsDead() noexcept
 {
     PAPYRUS_FUNCTION(bool, Actor, IsDead);
@@ -651,7 +660,7 @@ void TP_MAKE_THISCALL(HookUpdateDetectionState, ActorKnowledge, void* apState)
 
 struct DialogueItem;
 
-// This is an AIProcess function
+// TODO: This is an AIProcess function
 TP_THIS_FUNCTION(TProcessResponse, uint64_t, void, DialogueItem* apVoice, Actor* apTalkingActor, Actor* apTalkedToActor);
 static TProcessResponse* RealProcessResponse = nullptr;
 
@@ -665,6 +674,17 @@ uint64_t TP_MAKE_THISCALL(HookProcessResponse, void, DialogueItem* apVoice, Acto
     return ThisCall(RealProcessResponse, apThis, apVoice, apTalkingActor, apTalkedToActor);
 }
 
+bool TP_MAKE_THISCALL(HookInitiateMountPackage, Actor, Actor* apMount)
+{
+    if (!apMount)
+    {
+        return ThisCall(RealInitiateMountPackage, apThis, apMount);
+    }
+
+    World::Get().GetRunner().Trigger(MountEvent(apThis->formID, apMount->formID));
+    return ThisCall(RealInitiateMountPackage, apThis, apMount);
+}
+
 TP_THIS_FUNCTION(TCheckForNewPackage, bool, void, Actor* apActor, uint64_t aUnk1);
 static TCheckForNewPackage* RealCheckForNewPackage = nullptr;
 
@@ -691,6 +711,7 @@ static TiltedPhoques::Initializer s_actorHooks([]()
     POINTER_SKYRIMSE(TPickUpItem, s_pickUpItem, 0x14060C280 - 0x140000000);
     POINTER_SKYRIMSE(TUpdateDetectionState, s_updateDetectionState, 0x140742FE0 - 0x140000000);
     POINTER_SKYRIMSE(TProcessResponse, s_processResponse, 0x14068BC50 - 0x140000000);
+    POINTER_SKYRIMSE(TInitiateMountPackage, s_initiateMountPackage, 0x14062CF40 - 0x140000000);
     POINTER_SKYRIMSE(TCheckForNewPackage, s_checkForNewPackage, 0x1406692F0 - 0x140000000);
 
     FUNC_GetActorLocation = s_GetActorLocation.Get();
@@ -705,6 +726,7 @@ static TiltedPhoques::Initializer s_actorHooks([]()
     RealPickUpItem = s_pickUpItem.Get();
     RealUpdateDetectionState = s_updateDetectionState.Get();
     RealProcessResponse = s_processResponse.Get();
+    RealInitiateMountPackage = s_initiateMountPackage.Get();
     RealCheckForNewPackage = s_checkForNewPackage.Get();
 
     TP_HOOK(&RealCharacterConstructor, HookCharacterConstructor);
@@ -718,5 +740,6 @@ static TiltedPhoques::Initializer s_actorHooks([]()
     TP_HOOK(&RealPickUpItem, HookPickUpItem);
     TP_HOOK(&RealUpdateDetectionState, HookUpdateDetectionState);
     TP_HOOK(&RealProcessResponse, HookProcessResponse);
+    TP_HOOK(&RealInitiateMountPackage, HookInitiateMountPackage);
     TP_HOOK(&RealCheckForNewPackage, HookCheckForNewPackage);
 });
diff --git a/Code/client/Games/Skyrim/Actor.h b/Code/client/Games/Skyrim/Actor.h
@@ -211,6 +211,7 @@ struct Actor : TESObjectREFR
     void UnEquipAll() noexcept;
     void RemoveFromAllFactions() noexcept;
     void QueueUpdate() noexcept;
+    bool InitiateMountPackage(Actor* apMount) noexcept;
 
     bool IsDead() noexcept;
     void Kill() noexcept;

diff --git a/Code/client/Games/Skyrim/BSAnimationGraphManager.h b/Code/client/Games/Skyrim/BSAnimationGraphManager.h
@@ -30,7 +30,7 @@ struct BSAnimationGraphManager
 
     uint32_t animationGraphIndex; // A8 - 5C
 
-    SortedMap<uint32_t, String> BSAnimationGraphManager::DumpAnimationVariables(bool aPrintVariables);
+    SortedMap<uint32_t, String> DumpAnimationVariables(bool aPrintVariables);
     uint64_t GetDescriptorKey(int aForceIndex = -1);
     uint32_t ReSendEvent(BSFixedString* apEventName);
 };

diff --git a/Code/client/Games/Skyrim/Effects/ActiveEffect.h b/Code/client/Games/Skyrim/Effects/ActiveEffect.h
@@ -10,7 +10,7 @@ struct ActiveEffect
     // this ctor is used by seemingly all ActiveEffect child classes' Instantiate() methods
     // can be used to find individual Instantiate() methods
     // address: 0x140C4E350
-    ActiveEffect::ActiveEffect(Actor* apCaster, MagicItem* apSpell, EffectItem* apEffect);
+    ActiveEffect(Actor* apCaster, MagicItem* apSpell, EffectItem* apEffect);
 
     virtual void sub_0();
     virtual void sub_1();

diff --git a/Code/client/Games/Skyrim/LoadingScreen.cpp b/Code/client/Games/Skyrim/LoadingScreen.cpp
@@ -35,11 +35,11 @@ TRequestLoadingText* RealRequestLoadingText;
 
 void RequestLoadingText(ScaleFormContext* apContext)
 {
-    static char* s_displayStr = "TESSST";
+    static const char* s_displayStr = "TESSST";
 
     apContext->scaleformReturn->someBool50 = 0;
     if(apContext->scaleformReturn->scaleformValue)
-        apContext->scaleformReturn->scaleformValue->data = s_displayStr;
+        apContext->scaleformReturn->scaleformValue->data = (char*)s_displayStr;
 
     RealRequestLoadingText(apContext);
 }

diff --git a/Code/client/Games/Skyrim/Misc/BSScript.h b/Code/client/Games/Skyrim/Misc/BSScript.h
@@ -123,7 +123,7 @@ struct BSScript
         void PrepareImplementation(IFunctionArguments::Statement* apStatement,
                                    std::index_sequence<Is...>) noexcept
         {
-            ((apStatement->values[Is].Set(std::get<Is>(args))), ...);
+            ((apStatement->vars[Is].Set(std::get<Is>(args))), ...);
         }
 
         Tuple args;

diff --git a/Code/client/Services/CharacterService.h b/Code/client/Services/CharacterService.h
@@ -23,6 +23,8 @@ struct AddTargetEvent;
 struct NotifyAddTarget;
 struct ProjectileLaunchedEvent;
 struct NotifyProjectileLaunch;
+struct MountEvent;
+struct NotifyMount;
 
 struct Actor;
 struct World;
@@ -50,6 +52,8 @@ struct CharacterService
     void OnRemoteSpawnDataReceived(const NotifySpawnData& acEvent) const noexcept;
     void OnProjectileLaunchedEvent(const ProjectileLaunchedEvent& acEvent) const noexcept;
     void OnNotifyProjectileLaunch(const NotifyProjectileLaunch& acMessage) const noexcept;
+    void OnMountEvent(const MountEvent& acEvent) const noexcept;
+    void OnNotifyMount(const NotifyMount& acMessage) const noexcept;
 
 private:
 
@@ -82,4 +86,6 @@ struct CharacterService
     entt::scoped_connection m_remoteSpawnDataReceivedConnection;
     entt::scoped_connection m_projectileLaunchedConnection;
     entt::scoped_connection m_projectileLaunchConnection;
+    entt::scoped_connection m_mountConnection;
+    entt::scoped_connection m_notifyMountConnection;
 };
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -32,6 +32,7 @@
 #include <Events/EquipmentChangeEvent.h>
 #include <Events/UpdateEvent.h>
 #include <Events/ProjectileLaunchedEvent.h>
+#include <Events/MountEvent.h>
 
 #include <Structs/ActionEvent.h>
 #include <Messages/CancelAssignmentRequest.h>
@@ -50,6 +51,8 @@
 #include <Messages/RequestOwnershipClaim.h>
 #include <Messages/ProjectileLaunchRequest.h>
 #include <Messages/NotifyProjectileLaunch.h>
+#include <Messages/MountRequest.h>
+#include <Messages/NotifyMount.h>
 
 #include <World.h>
 #include <Games/TES.h>
@@ -79,8 +82,12 @@ CharacterService::CharacterService(World& aWorld, entt::dispatcher& aDispatcher,
     m_ownershipTransferConnection = m_dispatcher.sink<NotifyOwnershipTransfer>().connect<&CharacterService::OnOwnershipTransfer>(this);
     m_removeCharacterConnection = m_dispatcher.sink<NotifyRemoveCharacter>().connect<&CharacterService::OnRemoveCharacter>(this);
     m_remoteSpawnDataReceivedConnection = m_dispatcher.sink<NotifySpawnData>().connect<&CharacterService::OnRemoteSpawnDataReceived>(this);
+
     m_projectileLaunchedConnection = m_dispatcher.sink<ProjectileLaunchedEvent>().connect<&CharacterService::OnProjectileLaunchedEvent>(this);
     m_projectileLaunchConnection = m_dispatcher.sink<NotifyProjectileLaunch>().connect<&CharacterService::OnNotifyProjectileLaunch>(this);
+
+    m_mountConnection = m_dispatcher.sink<MountEvent>().connect<&CharacterService::OnMountEvent>(this);
+    m_notifyMountConnection = m_dispatcher.sink<NotifyMount>().connect<&CharacterService::OnNotifyMount>(this);
 }
 
 void CharacterService::OnFormIdComponentAdded(entt::registry& aRegistry, const entt::entity aEntity) const noexcept
@@ -1139,3 +1146,121 @@ void CharacterService::OnNotifyProjectileLaunch(const NotifyProjectileLaunch& ac
     Projectile::Launch(&result, launchData);
 }
 
+void CharacterService::OnMountEvent(const MountEvent& acEvent) const noexcept
+{
+#if TP_SKYRIM64
+    auto view = m_world.view<FormIdComponent>();
+
+    const auto riderIt = std::find_if(std::begin(view), std::end(view), [id = acEvent.RiderID, view](auto entity) {
+        return view.get<FormIdComponent>(entity).Id == id;
+    });
+
+    if (riderIt == std::end(view))
+    {
+        spdlog::warn("Rider not found, form id: {:X}", acEvent.RiderID);
+        return;
+    }
+
+    const entt::entity cRiderEntity = *riderIt;
+
+    std::optional<uint32_t> riderServerIdRes = utils::GetServerId(cRiderEntity);
+    if (!riderServerIdRes.has_value())
+        return;
+
+    const auto mountIt = std::find_if(std::begin(view), std::end(view), [id = acEvent.MountID, view](auto entity) {
+        return view.get<FormIdComponent>(entity).Id == id;
+    });
+
+    if (mountIt == std::end(view))
+    {
+        spdlog::warn("Mount not found, form id: {:X}", acEvent.MountID);
+        return;
+    }
+
+    const entt::entity cMountEntity = *mountIt;
+
+    std::optional<uint32_t> mountServerIdRes = utils::GetServerId(cMountEntity);
+    if (!mountServerIdRes.has_value())
+        return;
+
+    if (m_world.try_get<RemoteComponent>(cMountEntity))
+    {
+        const TESForm* pMountForm = TESForm::GetById(acEvent.MountID);
+        Actor* pMount = RTTI_CAST(pMountForm, TESForm, Actor);
+        pMount->GetExtension()->SetRemote(false);
+
+        m_world.emplace<LocalComponent>(cMountEntity, mountServerIdRes.value());
+        m_world.emplace<LocalAnimationComponent>(cMountEntity);
+        m_world.remove<RemoteComponent, InterpolationComponent, RemoteAnimationComponent, 
+                       FaceGenComponent, CacheComponent, WaitingFor3D>(cMountEntity);
+
+        RequestOwnershipClaim request;
+        request.ServerId = mountServerIdRes.value();
+
+        m_transport.Send(request);
+    }
+
+    MountRequest request;
+    request.MountId = mountServerIdRes.value();
+    request.RiderId = riderServerIdRes.value();
+
+    m_transport.Send(request);
+#endif
+}
+
+void CharacterService::OnNotifyMount(const NotifyMount& acMessage) const noexcept
+{
+#if TP_SKYRIM64
+    auto remoteView = m_world.view<RemoteComponent, FormIdComponent>();
+
+    const auto riderIt = std::find_if(std::begin(remoteView), std::end(remoteView), [remoteView, Id = acMessage.RiderId](auto entity)
+    {
+        return remoteView.get<RemoteComponent>(entity).Id == Id;
+    });
+
+    if (riderIt == std::end(remoteView))
+    {
+        spdlog::warn("Rider with remote id {:X} not found.", acMessage.RiderId);
+        return;
+    }
+
+    auto riderFormIdComponent = remoteView.get<FormIdComponent>(*riderIt);
+    TESForm* pRiderForm = TESForm::GetById(riderFormIdComponent.Id);
+    Actor* pRider = RTTI_CAST(pRiderForm, TESForm, Actor);
+
+    Actor* pMount = nullptr;
+
+    auto formView = m_world.view<FormIdComponent>();
+    for (auto entity : formView)
+    {
+        std::optional<uint32_t> serverIdRes = utils::GetServerId(entity);
+        if (!serverIdRes.has_value())
+            continue;
+
+        uint32_t serverId = serverIdRes.value();
+
+        if (serverId == acMessage.MountId)
+        {
+            auto mountFormIdComponent = formView.get<FormIdComponent>(entity);
+
+            if (m_world.all_of<LocalComponent>(entity))
+            {
+                m_world.remove<LocalAnimationComponent, LocalComponent>(entity);
+                m_world.emplace_or_replace<RemoteComponent>(entity, acMessage.MountId, mountFormIdComponent.Id);
+            }
+
+            TESForm* pMountForm = TESForm::GetById(mountFormIdComponent.Id);
+            pMount = RTTI_CAST(pMountForm, TESForm, Actor);
+            pMount->GetExtension()->SetRemote(true);
+
+            InterpolationSystem::Setup(m_world, entity);
+            AnimationSystem::Setup(m_world, entity);
+
+            break;
+        }
+    }
+
+    pRider->InitiateMountPackage(pMount);
+#endif
+}
+
diff --git a/Code/encoding/Messages/ClientMessageFactory.h b/Code/encoding/Messages/ClientMessageFactory.h
@@ -38,6 +38,7 @@
 #include <Messages/ProjectileLaunchRequest.h>
 #include <Messages/ScriptAnimationRequest.h>
 #include <Messages/DrawWeaponRequest.h>
+#include <Messages/MountRequest.h>
 
 using TiltedPhoques::UniquePtr;
 
@@ -56,7 +57,7 @@ struct ClientMessageFactory
                                  RequestHealthChangeBroadcast, RequestSpawnData, ActivateRequest, LockChangeRequest,
                                  AssignObjectsRequest, RequestDeathStateChange, ShiftGridCellRequest, RequestOwnershipTransfer,
                                  RequestOwnershipClaim, RequestObjectInventoryChanges, SpellCastRequest, ProjectileLaunchRequest, InterruptCastRequest,
-                                 AddTargetRequest, ScriptAnimationRequest, DrawWeaponRequest>;
+                                 AddTargetRequest, ScriptAnimationRequest, DrawWeaponRequest, MountRequest>;
 
         return s_visitor(std::forward<T>(func));
     }

diff --git a/Code/encoding/Messages/MountRequest.cpp b/Code/encoding/Messages/MountRequest.cpp
@@ -0,0 +1,15 @@
+#include <Messages/MountRequest.h>
+
+void MountRequest::SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) const noexcept
+{
+    Serialization::WriteVarInt(aWriter, RiderId);
+    Serialization::WriteVarInt(aWriter, MountId);
+}
+
+void MountRequest::DeserializeRaw(TiltedPhoques::Buffer::Reader& aReader) noexcept
+{
+    ClientMessage::DeserializeRaw(aReader);
+
+    RiderId = Serialization::ReadVarInt(aReader) & 0xFFFFFFFF;
+    MountId = Serialization::ReadVarInt(aReader) & 0xFFFFFFFF;
+}
diff --git a/Code/encoding/Messages/MountRequest.h b/Code/encoding/Messages/MountRequest.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Message.h"
+
+struct MountRequest final : ClientMessage
+{
+    static constexpr ClientOpcode Opcode = kMountRequest;
+
+    MountRequest() : ClientMessage(Opcode)
+    {
+    }
+
+    void SerializeRaw(TiltedPhoques::Buffer::Writer& aWriter) const noexcept override;
+    void DeserializeRaw(TiltedPhoques::Buffer::Reader& aReader) noexcept override;
+
+    bool operator==(const MountRequest& acRhs) const noexcept
+    {
+        return GetOpcode() == acRhs.GetOpcode() &&
+               RiderId == acRhs.RiderId &&
+               MountId == acRhs.MountId;
+    }
+
+    uint32_t RiderId;
+    uint32_t MountId;
+};