From 24bac3ebd4d2fc24874fd4b393f43f4d7e6d7fb7 Mon Sep 17 00:00:00 2001 From: Mads Buvik Sandvei Date: Fri, 27 Oct 2023 18:22:13 +0200 Subject: [PATCH 1/2] AiWander must update mIsWanderingManually when resuming wander. --- CHANGELOG.md | 1 + apps/openmw/mwmechanics/aiwander.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e9d31a19e..fd1e0ce39e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,6 +84,7 @@ Bug #7630: Charm can be cast on creatures Bug #7631: Cannot trade with/talk to Creeper or Mudcrab Merchant when they're fleeing Bug #7639: NPCs don't use hand-to-hand if their other melee skills were damaged during combat + Bug #7647: NPC walk cycle bugs after greeting player Feature #3537: Shader-based water ripples Feature #5492: Let rain and snow collide with statics Feature #6149: Dehardcode Lua API_REVISION diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp index 30756ade35..30aad2e89a 100644 --- a/apps/openmw/mwmechanics/aiwander.cpp +++ b/apps/openmw/mwmechanics/aiwander.cpp @@ -229,7 +229,7 @@ namespace MWMechanics } if (mPathFinder.isPathConstructed()) - storage.setState(AiWanderStorage::Wander_Walking); + storage.setState(AiWanderStorage::Wander_Walking, !mUsePathgrid); } if (!cStats.getMovementFlag(CreatureStats::Flag_ForceJump) @@ -499,7 +499,7 @@ namespace MWMechanics if (!checkIdle(actor, storage.mIdleAnimation) && (greetingState == Greet_Done || greetingState == Greet_None)) { if (mPathFinder.isPathConstructed()) - storage.setState(AiWanderStorage::Wander_Walking); + storage.setState(AiWanderStorage::Wander_Walking, !mUsePathgrid); else storage.setState(AiWanderStorage::Wander_ChooseAction); } From ec81d99f210ce480dc09527025866f7f55e0047a Mon Sep 17 00:00:00 2001 From: Mads Buvik Sandvei Date: Fri, 27 Oct 2023 18:31:02 +0200 Subject: [PATCH 2/2] Add me to authors --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index 99080fdebd..9791171b9c 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -140,6 +140,7 @@ Programmers Lordrea Łukasz Gołębiewski (lukago) Lukasz Gromanowski (lgro) + Mads Sandvei (Foal) Marc Bouvier (CramitDeFrog) Marcin Hulist (Gohan) Mark Siewert (mark76)