mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 13:36:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_magic' into 'master'

Browse source 
Fix 'toggle spell' control (was broken by !2541)

See merge request OpenMW/openmw!2566
This commit is contained in:
jvoisin 2022-12-31 15:05:44 +00:00
commit 500e8bdf4c
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwlua/types/actor.cpp
View file

@ -4,6 +4,7 @@
#include <components/lua/luastate.hpp> #include <components/lua/luastate.hpp>
#include <apps/openmw/mwbase/mechanicsmanager.hpp> #include <apps/openmw/mwbase/mechanicsmanager.hpp>
#include <apps/openmw/mwbase/windowmanager.hpp>
#include <apps/openmw/mwmechanics/creaturestats.hpp> #include <apps/openmw/mwmechanics/creaturestats.hpp>
#include <apps/openmw/mwmechanics/drawstate.hpp> #include <apps/openmw/mwmechanics/drawstate.hpp>
#include <apps/openmw/mwworld/class.hpp> #include <apps/openmw/mwworld/class.hpp>
@ -165,13 +166,24 @@ namespace MWLua
MWMechanics::DrawState newDrawState = static_cast<MWMechanics::DrawState>(stance); MWMechanics::DrawState newDrawState = static_cast<MWMechanics::DrawState>(stance);
if (stats.getDrawState() == newDrawState) if (stats.getDrawState() == newDrawState)
return; return;
if (newDrawState == MWMechanics::DrawState::Spell && stats.getSpells().getSelectedSpell().empty()) if (newDrawState == MWMechanics::DrawState::Spell)
{ {
if (!cls.hasInventoryStore(self.ptr())) bool hasSelectedSpell;
return; // No selected spell and no items; can't use magic stance. if (self.ptr() == MWBase::Environment::get().getWorld()->getPlayerPtr())
MWWorld::InventoryStore& store = cls.getInventoryStore(self.ptr()); // For the player selecting spell in UI doesn't change selected spell in CreatureStats (was
if (store.getSelectedEnchantItem() == store.end()) // implemented this way to prevent changing spell during casting, probably should be refactored), so
return; // No selected spell and no selected enchanted item; can't use magic stance. // we have to handle the player separately.
hasSelectedSpell = !MWBase::Environment::get().getWindowManager()->getSelectedSpell().empty();
else
hasSelectedSpell = !stats.getSpells().getSelectedSpell().empty();
if (!hasSelectedSpell)
{
if (!cls.hasInventoryStore(self.ptr()))
return; // No selected spell and no items; can't use magic stance.
MWWorld::InventoryStore& store = cls.getInventoryStore(self.ptr());
if (store.getSelectedEnchantItem() == store.end())
return; // No selected spell and no selected enchanted item; can't use magic stance.
}
} }
MWBase::MechanicsManager* mechanics = MWBase::Environment::get().getMechanicsManager(); MWBase::MechanicsManager* mechanics = MWBase::Environment::get().getMechanicsManager();
// We want to interrupt animation only if attack is preparing, but still is not triggered. // We want to interrupt animation only if attack is preparing, but still is not triggered.