mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 20:49:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2594 from Capostrophic/summonsummon

Browse source 
Minor summoned creature cleanup fixes
This commit is contained in:
Andrei Kortunov 2019-11-17 10:47:07 +04:00 committed by GitHub
commit 6554130f6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/container.cpp
View file

@ -248,6 +248,12 @@ namespace MWGui
MWScript::InterpreterContext interpreterContext (&mPtr.getRefData().getLocals(), mPtr); MWScript::InterpreterContext interpreterContext (&mPtr.getRefData().getLocals(), mPtr);
MWBase::Environment::get().getScriptManager()->run (script, interpreterContext); MWBase::Environment::get().getScriptManager()->run (script, interpreterContext);
} }
// Clean up summoned creatures as well
std::map<MWMechanics::CreatureStats::SummonKey, int>& creatureMap = creatureStats.getSummonedCreatureMap();
for (const auto& creature : creatureMap)
MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mPtr, creature.second);
creatureMap.clear();
} }
MWBase::Environment::get().getWorld()->deleteObject(mPtr); MWBase::Environment::get().getWorld()->deleteObject(mPtr);

7
apps/openmw/mwmechanics/actors.cpp
View file

@ -1884,6 +1884,13 @@ namespace MWMechanics
if (fx) if (fx)
MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel, MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
"", ptr.getRefData().getPosition().asVec3()); "", ptr.getRefData().getPosition().asVec3());
// Remove the summoned creature's summoned creatures as well
MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
std::map<CreatureStats::SummonKey, int>& creatureMap = stats.getSummonedCreatureMap();
for (const auto& creature : creatureMap)
cleanupSummonedCreature(stats, creature.second);
creatureMap.clear();
} }
else if (creatureActorId != -1) else if (creatureActorId != -1)
{ {

25
apps/openmw/mwmechanics/summoning.cpp
View file

@ -86,10 +86,9 @@ namespace MWMechanics
} }
// Update summon effects // Update summon effects
bool casterDead = creatureStats.isDead();
for (std::map<CreatureStats::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); ) for (std::map<CreatureStats::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
{ {
bool found = !casterDead && mActiveEffects.find(it->first) != mActiveEffects.end(); bool found = mActiveEffects.find(it->first) != mActiveEffects.end();
if (!found) if (!found)
{ {
// Effect has ended // Effect has ended
@ -100,25 +99,11 @@ namespace MWMechanics
++it; ++it;
} }
std::vector<int>& graveyard = creatureStats.getSummonedCreatureGraveyard(); std::vector<int> graveyard = creatureStats.getSummonedCreatureGraveyard();
for (std::vector<int>::iterator it = graveyard.begin(); it != graveyard.end(); ) creatureStats.getSummonedCreatureGraveyard().clear();
{
MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(*it);
if (!ptr.isEmpty())
{
it = graveyard.erase(it);
const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>() for (const int creature : graveyard)
.search("VFX_Summon_End"); MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, creature);
if (fx)
MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
"", ptr.getRefData().getPosition().asVec3());
MWBase::Environment::get().getWorld()->deleteObject(ptr);
}
else
++it;
}
if (!cleanup) if (!cleanup)
return; return;