fix: weapon draw sync

tiltedphoques · Mar 9, 2022 · d764a31 · d764a31
1 parent 8fe7d83
commit d764a31
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Code/client/Games/Skyrim/Actor.cpp b/Code/client/Games/Skyrim/Actor.cpp
@@ -207,7 +207,7 @@ Inventory Actor::GetInventory() const noexcept
     uint32_t ammoId = pAmmo ? pAmmo->formID : 0;
     modSystem.GetServerModId(ammoId, inventory.Ammo);
 
-    inventory.IsWeaponDrawn = actorState.IsWeaponDrawn();
+    inventory.IsWeaponDrawn = actorState.IsWeaponFullyDrawn();
 
     return inventory;
 }

diff --git a/Code/client/Games/Skyrim/Misc/ActorState.h b/Code/client/Games/Skyrim/Misc/ActorState.h
@@ -14,5 +14,10 @@ struct ActorState : IMovementState
         return (flags2 >> 5 & 7) >= 3;
     }
 
+    bool IsWeaponFullyDrawn() const noexcept
+    {
+        return (flags2 >> 5 & 7) == 3;
+    }
+
     bool SetWeaponDrawn(bool aDraw) noexcept;
 };
diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -683,7 +683,7 @@ void CharacterService::RequestServerAssignment(entt::registry& aRegistry, const
     message.FactionsContent = pActor->GetFactions();
     message.AllActorValues = pActor->GetEssentialActorValues();
     message.IsDead = pActor->IsDead();
-    message.IsWeaponDrawn = pActor->actorState.IsWeaponDrawn();
+    message.IsWeaponDrawn = pActor->actorState.IsWeaponFullyDrawn();
 
     if(isTemporary)
     {