mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'potatoesmaster/disable-crash'

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-02-15 22:55:00 +01:00
commit 9cdfca6c26
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/openmw/mwworld/worldimp.cpp
View File

@ -529,12 +529,6 @@ namespace MWWorld
return mPlayer->getPlayer(); return mPlayer->getPlayer();
} }
Ptr ptr = Class::get (mPlayer->getPlayer()).
getContainerStore (mPlayer->getPlayer()).search (name);
if (!ptr.isEmpty())
return ptr;
std::string lowerCaseName = Misc::StringUtils::lowerCase(name); std::string lowerCaseName = Misc::StringUtils::lowerCase(name);
// active cells // active cells
@ -548,6 +542,12 @@ namespace MWWorld
return ptr; return ptr;
} }
Ptr ptr = Class::get (mPlayer->getPlayer()).
getContainerStore (mPlayer->getPlayer()).search (lowerCaseName);
if (!ptr.isEmpty())
return ptr;
if (!activeOnly) if (!activeOnly)
{ {
ret = mCells.getPtr (lowerCaseName); ret = mCells.getPtr (lowerCaseName);
@ -610,6 +610,10 @@ namespace MWWorld
void World::enable (const Ptr& reference) void World::enable (const Ptr& reference)
{ {
// enable is a no-op for items in containers
if (!reference.isInCell())
return;
if (!reference.getRefData().isEnabled()) if (!reference.getRefData().isEnabled())
{ {
reference.getRefData().enable(); reference.getRefData().enable();
@ -640,6 +644,10 @@ namespace MWWorld
void World::disable (const Ptr& reference) void World::disable (const Ptr& reference)
{ {
// disable is a no-op for items in containers
if (!reference.isInCell())
return;
if (reference.getRefData().isEnabled()) if (reference.getRefData().isEnabled())
{ {
reference.getRefData().disable(); reference.getRefData().disable();