From 0adc2df65fcbe128c0bc602d58cc3cd1f6b084cc Mon Sep 17 00:00:00 2001 From: Capostrophic Date: Sat, 23 Nov 2019 14:47:50 +0300 Subject: [PATCH] Make SameFaction work (bug #5213) --- CHANGELOG.md | 1 + apps/openmw/mwscript/dialogueextensions.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8c7ab517..de53c3a9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -176,6 +176,7 @@ Bug #5209: Spellcasting ignores race height Bug #5210: AiActivate allows actors to open dialogue and inventory windows Bug #5211: Screen fades in if the first loaded save is in interior cell + Bug #5213: SameFaction script function is broken Feature #1774: Handle AvoidNode Feature #2229: Improve pathfinding AI Feature #3025: Analogue gamepad movement controls diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp index 200ddbb74..25c7f518e 100644 --- a/apps/openmw/mwscript/dialogueextensions.cpp +++ b/apps/openmw/mwscript/dialogueextensions.cpp @@ -210,7 +210,7 @@ namespace MWScript MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr(); - player.getClass().getNpcStats (player).isInFaction(ptr.getClass().getPrimaryFaction(ptr)); + runtime.push(player.getClass().getNpcStats (player).isInFaction(ptr.getClass().getPrimaryFaction(ptr))); } };