fix: SetWeaponDrawn on 3D loaded

tiltedphoques · Apr 7, 2022 · e7919f9 · e7919f9
1 parent ef580ac
commit e7919f9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/Code/client/Games/Skyrim/Actor.cpp b/Code/client/Games/Skyrim/Actor.cpp
@@ -39,7 +39,6 @@
 
 #include <Games/Overrides.h>
 
-#define SAVE_STUFF
 #ifdef SAVE_STUFF
 
 #include <Games/Skyrim/SaveLoad.h>

diff --git a/Code/client/Services/Debug/TestService.cpp b/Code/client/Services/Debug/TestService.cpp
@@ -90,6 +90,23 @@ void TestService::OnUpdate(const UpdateEvent& acUpdateEvent) noexcept
 {
     static std::atomic<bool> s_f8Pressed = false;
     static std::atomic<bool> s_f7Pressed = false;
+    static std::atomic<bool> s_f6Pressed = false;
+
+    if (GetAsyncKeyState(VK_F6))
+    {
+        if (!s_f6Pressed)
+        {
+            s_f6Pressed = true;
+
+            static char s_address[256] = "127.0.0.1:10578";
+            if (!m_transport.IsOnline())
+                m_transport.Connect(s_address);
+            else
+                m_transport.Close();
+        }
+    }
+    else
+        s_f6Pressed = false;
 
     if (GetAsyncKeyState(VK_F7))
     {

diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -1304,6 +1304,7 @@ void CharacterService::RunRemoteUpdates() const noexcept
         pActor->SetActorInventory(remoteComponent.SpawnRequest.InventoryContent);
         pActor->SetFactions(remoteComponent.SpawnRequest.FactionsContent);
         pActor->LoadAnimationVariables(remoteComponent.SpawnRequest.LatestAction.Variables);
+        pActor->SetWeaponDrawnEx(remoteComponent.SpawnRequest.IsWeaponDrawn);
 
         if (pActor->IsDead() != remoteComponent.SpawnRequest.IsDead)
             remoteComponent.SpawnRequest.IsDead ? pActor->Kill() : pActor->Respawn();