mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 03:40:40 +00:00
Code Issues Projects 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 (1, "");
}
return std::make_pair(1, "");
}
return std::make_pair (0, "");
}

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

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