teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Do not show uncarriable lights in item views

Browse source
This commit is contained in:
MiroslavR 2016-09-24 18:01:31 +02:00
parent 4b178f6f3d
commit 52e00f5fef
7 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,6 +173,16 @@ namespace MWClass
return info;
}
bool Light::showsInInventory (const MWWorld::ConstPtr& ptr) const
{
const ESM::Light* light = ptr.get<ESM::Light>()->mBase;
if (!(light->mData.mFlags & ESM::Light::Carry))
return false;
return Class::showsInInventory(ptr);
}
boost::shared_ptr<MWWorld::Action> Light::use (const MWWorld::Ptr& ptr) const
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));

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

@ -26,6 +26,8 @@ namespace MWClass
virtual MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const;
///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
virtual bool showsInInventory (const MWWorld::ConstPtr& ptr) const;
virtual boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
const MWWorld::Ptr& actor) const;
///< Generate action for activation

6
apps/openmw/mwgui/inventoryitemmodel.cpp
View file

@ -77,10 +77,8 @@ void InventoryItemModel::update()
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
{
MWWorld::Ptr item = *it;
// NOTE: Don't show WerewolfRobe objects in the inventory, or allow them to be taken.
// Vanilla likely uses a hack like this since there's no other way to prevent it from
// being shown or taken.
if(item.getCellRef().getRefId() == "werewolfrobe")
if (!item.getClass().showsInInventory(item))
continue;
ItemStack newItem (item, this, item.getRefData().getCount());

5
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -545,10 +545,7 @@ namespace MWGui
if(invStore.getSlot(slot) != invStore.end())
{
MWWorld::Ptr item = *invStore.getSlot(slot);
// NOTE: Don't allow users to select WerewolfRobe objects in the inventory. Vanilla
// likely uses a hack like this since there's no other way to prevent it from being
// taken.
if(item.getCellRef().getRefId() == "werewolfrobe")
if (!item.getClass().showsInInventory(item))
return MWWorld::Ptr();
return item;
}

4
apps/openmw/mwgui/tradeitemmodel.cpp
View file

@ -163,6 +163,10 @@ namespace MWGui
MWWorld::Ptr base = item.mBase;
if(Misc::StringUtils::ciEqual(base.getCellRef().getRefId(), MWWorld::ContainerStore::sGoldId))
continue;
if (!base.getClass().showsInInventory(base))
return;
if(!base.getClass().canSell(base, services))
continue;

8
apps/openmw/mwworld/class.cpp
View file

@ -277,6 +277,14 @@ namespace MWWorld
throw std::runtime_error ("class does not have a tool tip");
}
bool Class::showsInInventory (const ConstPtr& ptr) const
{
// NOTE: Don't show WerewolfRobe objects in the inventory, or allow them to be taken.
// Vanilla likely uses a hack like this since there's no other way to prevent it from
// being shown or taken.
return (ptr.getCellRef().getRefId() != "werewolfrobe");
}
bool Class::hasToolTip (const ConstPtr& ptr) const
{
return false;

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

@ -98,6 +98,11 @@ namespace MWWorld
virtual MWGui::ToolTipInfo getToolTipInfo (const ConstPtr& ptr, int count) const;
///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
virtual bool showsInInventory (const ConstPtr& ptr) const;
///< Return whether ptr shows in inventory views.
/// Hidden items are not displayed and cannot be (re)moved by the user.
/// \return True if shown, false if hidden.
virtual MWMechanics::NpcStats& getNpcStats (const Ptr& ptr) const;
///< Return NPC stats or throw an exception, if class does not have NPC stats
/// (default implementation: throw an exception)