AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-19 09:27:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nomushroomdataforyou' into 'master'

Browse Source 
Don't init custom data when checking container resolution

Closes #8650

See merge request OpenMW/openmw!4831
This commit is contained in:
Alexei Kotov 2025-08-05 21:06:56 +03:00
commit a69b67a2b1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
set(OPENMW_VERSION_MAJOR 0) set(OPENMW_VERSION_MAJOR 0)
set(OPENMW_VERSION_MINOR 50) set(OPENMW_VERSION_MINOR 50)
set(OPENMW_VERSION_RELEASE 0) set(OPENMW_VERSION_RELEASE 0)
set(OPENMW_LUA_API_REVISION 88) set(OPENMW_LUA_API_REVISION 89)
set(OPENMW_POSTPROCESSING_API_REVISION 3) set(OPENMW_POSTPROCESSING_API_REVISION 3)
set(OPENMW_VERSION_COMMITHASH "") set(OPENMW_VERSION_COMMITHASH "")

3
apps/openmw/mwlua/objectbindings.cpp
View File

@ -645,6 +645,9 @@ namespace MWLua
} }
inventoryT["isResolved"] = [](const InventoryT& inventory) -> bool { inventoryT["isResolved"] = [](const InventoryT& inventory) -> bool {
const MWWorld::Ptr& ptr = inventory.mObj.ptr(); const MWWorld::Ptr& ptr = inventory.mObj.ptr();
// Avoid initializing custom data
if (!ptr.getRefData().getCustomData())
return false;
MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr); MWWorld::ContainerStore& store = ptr.getClass().getContainerStore(ptr);
return store.isResolved(); return store.isResolved();
}; };