From 1afe04fab9fc3e48dc9e7c7fd80678e7fb096124 Mon Sep 17 00:00:00 2001 From: grayman Date: Sun, 4 Aug 2013 17:28:01 +0000 Subject: [PATCH] Fix for issue #3505. git-svn-id: https://svn.thedarkmod.com/svn/darkmod_src/trunk@5836 49c82d7f-2e2a-0410-a16f-ae8f201b507f --- game/ai/States/IdleState.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/game/ai/States/IdleState.cpp b/game/ai/States/IdleState.cpp index be0112b10..c72207960 100644 --- a/game/ai/States/IdleState.cpp +++ b/game/ai/States/IdleState.cpp @@ -85,8 +85,6 @@ void IdleState::Init(idAI* owner) return; } - owner->SheathWeapon(); - // Memory shortcut Memory& memory = owner->GetMemory(); @@ -172,6 +170,9 @@ void IdleState::Init(idAI* owner) ); } + // grayman #3505 - can't sheathe weapon until after the Idle anims were requested + owner->SheathWeapon(); + // Let the AI update their weapons (make them nonsolid) owner->UpdateAttachmentContents(false); }