mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-21 10:41:33 +00:00
Code Issues Releases Wiki Activity

rebase errors

Browse source
This commit is contained in:
Mads Buvik Sandvei 2024-01-30 00:05:57 +01:00
parent 055e9a5055
commit e0e968a082
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwbase/luamanager.hpp
View file

@ -63,11 +63,11 @@ namespace MWBase
virtual void useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force) = 0; virtual void useItem(const MWWorld::Ptr& object, const MWWorld::Ptr& actor, bool force) = 0;
virtual void animationTextKey(const MWWorld::Ptr& actor, const std::string& key) = 0; virtual void animationTextKey(const MWWorld::Ptr& actor, const std::string& key) = 0;
virtual void playAnimation(const MWWorld::Ptr& object, const std::string& groupname, virtual void playAnimation(const MWWorld::Ptr& object, const std::string& groupname,
virtual void skillLevelUp(const MWWorld::Ptr& actor, ESM::RefId skillId, std::string_view source) = 0;
virtual void skillUse(const MWWorld::Ptr& actor, ESM::RefId skillId, int useType, float scale) = 0;
const MWRender::AnimPriority& priority, int blendMask, bool autodisable, float speedmult, const MWRender::AnimPriority& priority, int blendMask, bool autodisable, float speedmult,
std::string_view start, std::string_view stop, float startpoint, uint32_t loops, bool loopfallback) std::string_view start, std::string_view stop, float startpoint, uint32_t loops, bool loopfallback)
= 0; = 0;
virtual void skillLevelUp(const MWWorld::Ptr& actor, ESM::RefId skillId, std::string_view source) = 0;
virtual void skillUse(const MWWorld::Ptr& actor, ESM::RefId skillId, int useType, float scale) = 0;
virtual void exteriorCreated(MWWorld::CellStore& cell) = 0; virtual void exteriorCreated(MWWorld::CellStore& cell) = 0;
virtual void actorDied(const MWWorld::Ptr& actor) = 0; virtual void actorDied(const MWWorld::Ptr& actor) = 0;
virtual void questUpdated(const ESM::RefId& questId, int stage) = 0; virtual void questUpdated(const ESM::RefId& questId, int stage) = 0;

2
apps/openmw/mwlua/engineevents.cpp
View file

@ -94,7 +94,7 @@ namespace MWLua
if (auto* scripts = getLocalScripts(actor)) if (auto* scripts = getLocalScripts(actor))
scripts->onAnimationTextKey(event.mGroupname, event.mKey); scripts->onAnimationTextKey(event.mGroupname, event.mKey);
} }
void operator()(const OnSkillUse& event) const void operator()(const OnSkillUse& event) const
{ {
MWWorld::Ptr actor = getPtr(event.mActor); MWWorld::Ptr actor = getPtr(event.mActor);

6
apps/openmw/mwlua/engineevents.hpp
View file

@ -57,12 +57,6 @@ namespace MWLua
std::string mGroupname; std::string mGroupname;
std::string mKey; std::string mKey;
}; };
struct OnAnimationTextKey
{
ESM::RefNum mActor;
std::string mGroupname;
std::string mKey;
};
struct OnSkillUse struct OnSkillUse
{ {
ESM::RefNum mActor; ESM::RefNum mActor;

3
apps/openmw/mwlua/localscripts.cpp
View file

@ -176,7 +176,8 @@ namespace MWLua
{ {
this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData)); this->addPackage("openmw.self", sol::make_object(lua->sol(), &mData));
registerEngineHandlers({ &mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers, &mOnActivatedHandlers, registerEngineHandlers({ &mOnActiveHandlers, &mOnInactiveHandlers, &mOnConsumeHandlers, &mOnActivatedHandlers,
&mOnTeleportedHandlers, &mOnAnimationTextKeyHandlers, &mOnPlayAnimationHandlers, &mOnSkillUse, &mOnSkillLevelUp }); &mOnTeleportedHandlers, &mOnAnimationTextKeyHandlers, &mOnPlayAnimationHandlers, &mOnSkillUse,
&mOnSkillLevelUp });
} }
void LocalScripts::setActive(bool active) void LocalScripts::setActive(bool active)