mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-26 13:09:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'consistently_hostile' into 'master'

Browse source 
Clear the magic queue when unloading actors

Closes #6954

See merge request OpenMW/openmw!2317

(cherry picked from commit 7c899364af)

afcbb3cb Clear the magic queue when unloading actors
443420ea CI compare cells
This commit is contained in:
psi29a 2022-08-21 20:05:46 +00:00
parent d262ca2d30
commit 2795097907
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmechanics/activespells.cpp
View file

@ -497,4 +497,13 @@ namespace MWMechanics
for(const ESM::ActiveSpells::ActiveSpellParams& spell : state.mQueue) for(const ESM::ActiveSpells::ActiveSpellParams& spell : state.mQueue)
mQueue.emplace_back(ActiveSpellParams{spell}); mQueue.emplace_back(ActiveSpellParams{spell});
} }
void ActiveSpells::unloadActor(const MWWorld::Ptr& ptr)
{
purge([] (const auto& spell)
{
return spell.getType() == ESM::ActiveSpells::Type_Consumable || spell.getType() == ESM::ActiveSpells::Type_Temporary;
}, ptr);
mQueue.clear();
}
} }

2
apps/openmw/mwmechanics/activespells.hpp
View file

@ -145,6 +145,8 @@ namespace MWMechanics
///< case insensitive ///< case insensitive
void skipWorsenings(double hours); void skipWorsenings(double hours);
void unloadActor(const MWWorld::Ptr& ptr);
}; };
} }

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

@ -220,10 +220,7 @@ void soulTrap(const MWWorld::Ptr& creature)
void removeTemporaryEffects(const MWWorld::Ptr& ptr) void removeTemporaryEffects(const MWWorld::Ptr& ptr)
{ {
ptr.getClass().getCreatureStats(ptr).getActiveSpells().purge([] (const auto& spell) ptr.getClass().getCreatureStats(ptr).getActiveSpells().unloadActor(ptr);
{
return spell.getType() == ESM::ActiveSpells::Type_Consumable || spell.getType() == ESM::ActiveSpells::Type_Temporary;
}, ptr);
} }
} }

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -972,7 +972,7 @@ namespace MWWorld
mPhysics->clearQueuedMovement(); mPhysics->clearQueuedMovement();
mDiscardMovements = true; mDiscardMovements = true;
if (changeEvent && mCurrentWorldSpace != cellName) if (changeEvent && !Misc::StringUtils::ciEqual(mCurrentWorldSpace, cellName))
{ {
// changed worldspace // changed worldspace
mProjectileManager->clear(); mProjectileManager->clear();