Merge branch 'lol_so_random' into 'master'

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

See merge request OpenMW/openmw!1028
dont-compose-content
Alexei Dobrohotov 4 years ago
commit e5f96ab4ae

@ -383,15 +383,15 @@ namespace MWClass
if (!spellsInitialised)
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);
// store
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);
}
}

Loading…
Cancel
Save