AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 23:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

When searching object by id, search in active cells before searching in the player's inventory

Browse Source
This commit is contained in:
Emanuel Guevel 2014-02-13 22:58:12 +01:00
parent e597328b6b
commit 7c981587fc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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);