mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-09 12:04:31 +00:00
Code Issues Releases Wiki Activity

Merge branch 'stripperiffic_werewolves' into 'master'

Browse source 
Remove magic effects before saving stats when turning into a werewolf

Closes #6330

See merge request OpenMW/openmw!1270
This commit is contained in:
psi29a 2021-10-11 08:52:46 +00:00
commit d3bad2dba2
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -1761,17 +1761,6 @@ namespace MWMechanics
MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer(); MWWorld::Player* player = &MWBase::Environment::get().getWorld()->getPlayer();
if (actor == player->getPlayer())
{
if (werewolf)
{
player->saveStats();
player->setWerewolfStats();
}
else
player->restoreStats();
}
// Werewolfs can not cast spells, so we need to unset the prepared spell if there is one. // Werewolfs can not cast spells, so we need to unset the prepared spell if there is one.
if (npcStats.getDrawState() == MWMechanics::DrawState_Spell) if (npcStats.getDrawState() == MWMechanics::DrawState_Spell)
npcStats.setDrawState(MWMechanics::DrawState_Nothing); npcStats.setDrawState(MWMechanics::DrawState_Nothing);
@ -1798,13 +1787,23 @@ namespace MWMechanics
// Update the GUI only when called on the player // Update the GUI only when called on the player
MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager(); MWBase::WindowManager* windowManager = MWBase::Environment::get().getWindowManager();
// Transforming removes all temporary effects
actor.getClass().getCreatureStats(actor).getActiveSpells().purge([] (const auto& params)
{
return params.getType() == ESM::ActiveSpells::Type_Consumable || params.getType() == ESM::ActiveSpells::Type_Temporary;
}, actor);
mActors.updateActor(actor, 0.f);
if (werewolf) if (werewolf)
{ {
player->saveStats();
player->setWerewolfStats();
windowManager->forceHide(MWGui::GW_Inventory); windowManager->forceHide(MWGui::GW_Inventory);
windowManager->forceHide(MWGui::GW_Magic); windowManager->forceHide(MWGui::GW_Magic);
} }
else else
{ {
player->restoreStats();
windowManager->unsetForceHide(MWGui::GW_Inventory); windowManager->unsetForceHide(MWGui::GW_Inventory);
windowManager->unsetForceHide(MWGui::GW_Magic); windowManager->unsetForceHide(MWGui::GW_Magic);
} }