mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 12:39:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'lol_so_random' into 'master'

Browse Source 
Set the ptr's custom data before filling the store so leveled lists have access to the level

See merge request OpenMW/openmw!1028
This commit is contained in:
Alexei Dobrohotov 2021-07-18 14:02:06 +00:00
commit e5f96ab4ae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwclass/npc.cpp
View File

@ -383,15 +383,15 @@ namespace MWClass
if (!spellsInitialised) if (!spellsInitialised)
data->mNpcStats.getSpells().addAllToInstance(ref->mBase->mSpells.mList); data->mNpcStats.getSpells().addAllToInstance(ref->mBase->mSpells.mList);
// inventory
// setting ownership is used to make the NPC auto-equip his initial equipment only, and not bartered items
data->mInventoryStore.fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
data->mNpcStats.setGoldPool(gold); data->mNpcStats.setGoldPool(gold);
// store // store
ptr.getRefData().setCustomData(std::move(data)); ptr.getRefData().setCustomData(std::move(data));
// inventory
// setting ownership is used to make the NPC auto-equip his initial equipment only, and not bartered items
getInventoryStore(ptr).fill(ref->mBase->mInventory, ptr.getCellRef().getRefId());
getInventoryStore(ptr).autoEquip(ptr); getInventoryStore(ptr).autoEquip(ptr);
} }
} }