Merge branch 'skeleton_b_gone' into 'master'

Don't use a levelled creature's base pointer when spawning a new instance

See merge request OpenMW/openmw!2578
7220-lua-add-a-general-purpose-lexical-parser
psi29a 2 years ago
commit 452ea3d353

@ -127,10 +127,10 @@ namespace MWClass
if (!customData.mSpawn)
return;
MWWorld::LiveCellRef<ESM::CreatureLevList>* ref = ptr.get<ESM::CreatureLevList>();
const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
auto& prng = MWBase::Environment::get().getWorld()->getPrng();
const ESM::RefId& id = MWMechanics::getLevelledItem(ref->mBase, true, prng);
const ESM::RefId& id = MWMechanics::getLevelledItem(
store.get<ESM::CreatureLevList>().find(ptr.getCellRef().getRefId()), true, prng);
if (!id.empty())
{
@ -144,7 +144,6 @@ namespace MWClass
customData.mSpawnActorId = -1;
}
const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
MWWorld::ManualRef manualRef(store, id);
manualRef.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
manualRef.getPtr().getCellRef().setScale(ptr.getCellRef().getScale());

Loading…
Cancel
Save