mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 02:09:44 +00:00
Code Issues Releases Wiki Activity

Implement MWWorld::Class::isItem(ptr) and remove a hacky MWLua::WorldView::isItem.

Browse source
This commit is contained in:
Petr Mikheev 2023-03-19 21:11:49 +01:00
parent 2f2b952e12
commit 4fd07cb58d
17 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/apparatus.hpp
View file

@ -23,6 +23,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/armor.hpp
View file

@ -23,6 +23,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/book.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/clothing.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/ingredient.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

5
apps/openmw/mwclass/light.cpp
View file

@ -86,6 +86,11 @@ namespace MWClass
return !name.empty() ? name : ref->mBase->mId.getRefIdString();
}
bool Light::isItem(const MWWorld::ConstPtr& ptr) const
{
return ptr.get<ESM::Light>()->mBase->mData.mFlags & ESM::Light::Carry;
}
std::unique_ptr<MWWorld::Action> Light::activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const
{
if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))

2
apps/openmw/mwclass/light.hpp
View file

@ -36,6 +36,8 @@ namespace MWClass
bool showsInInventory(const MWWorld::ConstPtr& ptr) const override;
bool isItem(const MWWorld::ConstPtr&) const override;
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/lockpick.hpp
View file

@ -26,6 +26,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/misc.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/potion.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/probe.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/repair.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

2
apps/openmw/mwclass/weapon.hpp
View file

@ -21,6 +21,8 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
///< \return name or ID; can return an empty string.
bool isItem(const MWWorld::ConstPtr&) const override { return true; }
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation

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

@ -247,7 +247,7 @@ namespace MWLua
const MWWorld::Class& objClass = ptr.getClass();
if (objClass.isActor())
mGlobalScripts.actorActive(obj);
if (mWorldView.isItem(ptr))
if (objClass.isItem(ptr))
mGlobalScripts.itemActive(obj);
}
else if (luaDebug)

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

@ -52,7 +52,7 @@ namespace MWLua
return &mDoorsInScene;
if (typeid(cls) == typeid(MWClass::Container))
return &mContainersInScene;
if (cls.hasToolTip(ptr))
if (cls.isItem(ptr))
return &mItemsInScene;
return nullptr;
}

3
apps/openmw/mwlua/worldview.hpp
View file

@ -58,9 +58,6 @@ namespace MWLua
void load(ESM::ESMReader& esm);
void save(ESM::ESMWriter& esm) const;
// TODO: move this functionality to MWClass
bool isItem(const MWWorld::Ptr& ptr) { return chooseGroup(ptr) == &mItemsInScene; }
private:
struct ObjectGroup
{

3
apps/openmw/mwworld/class.hpp
View file

@ -323,6 +323,9 @@ namespace MWWorld
virtual bool isDoor() const { return false; }
// True if it is an item that can be picked up.
virtual bool isItem(const MWWorld::ConstPtr& ptr) const { return false; }
virtual bool isBipedal(const MWWorld::ConstPtr& ptr) const;
virtual bool canFly(const MWWorld::ConstPtr& ptr) const;
virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;