mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'no_automagick' into 'master'

Browse Source 
Add missing `sol::is_automagical : std::false_type` in magicbindings.cpp

See merge request OpenMW/openmw!2982
This commit is contained in:
psi29a 2023-04-26 21:51:16 +00:00
commit 3bd72e9c5d
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
apps/openmw/mwlua/magicbindings.cpp
View File

@ -23,6 +23,39 @@
#include "objectvariant.hpp" #include "objectvariant.hpp"
#include "worldview.hpp" #include "worldview.hpp"
namespace MWLua
{
// class returned via 'types.Actor.spells(obj)' in Lua
struct ActorSpells
{
const ObjectVariant mActor;
};
}
namespace sol
{
template <typename T>
struct is_automagical<typename MWWorld::Store<T>> : std::false_type
{
};
template <>
struct is_automagical<ESM::Spell> : std::false_type
{
};
template <>
struct is_automagical<ESM::ENAMstruct> : std::false_type
{
};
template <>
struct is_automagical<ESM::MagicEffect> : std::false_type
{
};
template <>
struct is_automagical<MWLua::ActorSpells> : std::false_type
{
};
}
namespace MWLua namespace MWLua
{ {
sol::table initCoreMagicBindings(const Context& context) sol::table initCoreMagicBindings(const Context& context)
@ -182,12 +215,6 @@ namespace MWLua
return LuaUtil::makeReadOnly(magicApi); return LuaUtil::makeReadOnly(magicApi);
} }
// class returned via 'types.Actor.spells(obj)' in Lua
struct ActorSpells
{
const ObjectVariant mActor;
};
void addActorMagicBindings(sol::table& actor, const Context& context) void addActorMagicBindings(sol::table& actor, const Context& context)
{ {
const MWWorld::Store<ESM::Spell>* spellStore const MWWorld::Store<ESM::Spell>* spellStore