mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 08:15:34 +00:00
Code Issues Releases Wiki Activity

Preserve inventories when resurrecting actors while looting them

Browse source
This commit is contained in:
Evil Eye 2021-12-02 20:36:42 +01:00
parent 893d569529
commit 58b888a38e
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw/mwscript/statsextensions.cpp
View file

@ -1194,20 +1194,25 @@ namespace MWScript
{ {
bool wasEnabled = ptr.getRefData().isEnabled(); bool wasEnabled = ptr.getRefData().isEnabled();
MWBase::Environment::get().getWorld()->undeleteObject(ptr); MWBase::Environment::get().getWorld()->undeleteObject(ptr);
MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
auto windowManager = MWBase::Environment::get().getWindowManager(); auto windowManager = MWBase::Environment::get().getWindowManager();
bool wasOpen = windowManager->containsMode(MWGui::GM_Container); bool wasOpen = windowManager->containsMode(MWGui::GM_Container);
windowManager->onDeleteCustomData(ptr); windowManager->onDeleteCustomData(ptr);
// HACK: disable/enable object to re-add it to the scene properly (need a new Animation). // HACK: disable/enable object to re-add it to the scene properly (need a new Animation).
MWBase::Environment::get().getWorld()->disable(ptr); MWBase::Environment::get().getWorld()->disable(ptr);
if (wasOpen && !windowManager->containsMode(MWGui::GM_Container))
{
// Reopen the loot GUI if it was closed because we resurrected the actor we were looting
MWBase::Environment::get().getMechanicsManager()->resurrect(ptr);
windowManager->forceLootMode(ptr);
}
else
{
MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
// resets runtime state such as inventory, stats and AI. does not reset position in the world // resets runtime state such as inventory, stats and AI. does not reset position in the world
ptr.getRefData().setCustomData(nullptr); ptr.getRefData().setCustomData(nullptr);
}
if (wasEnabled) if (wasEnabled)
MWBase::Environment::get().getWorld()->enable(ptr); MWBase::Environment::get().getWorld()->enable(ptr);
// Reopen the loot GUI if it was closed because we resurrected the actor we were looting
if (wasOpen && !windowManager->containsMode(MWGui::GM_Container))
windowManager->forceLootMode(ptr);
} }
} }
}; };