mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 08:53:52 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-05-17 14:37:41 +02:00
commit e2b8f9ea6d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,8 +404,8 @@ namespace MWClass
{ {
return std::make_pair (2, ""); return std::make_pair (2, "");
} }
return std::make_pair (1, "");
} }
return std::make_pair(1, "");
} }
return std::make_pair (0, ""); return std::make_pair (0, "");
} }

2
apps/openmw/mwgui/container.cpp
View file

@ -201,7 +201,7 @@ namespace MWGui
{ {
mPtr = container; mPtr = container;
if (!loot) if (mPtr.getTypeName() == typeid(ESM::NPC).name() && !loot)
{ {
// we are stealing stuff // we are stealing stuff
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();