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

When clearing LocalPlayer's spells, keep race and birthsign abilities

Browse source
This commit is contained in:
David Cernat 2017-01-20 08:06:48 +02:00
parent e7675d94d4
commit 0f7748d9d2
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -639,6 +639,7 @@ void LocalPlayer::addSpells()
for (vector<ESM::Spell>::const_iterator spell = packetSpells.spells.begin(); spell != packetSpells.spells.end(); spell++) for (vector<ESM::Spell>::const_iterator spell = packetSpells.spells.begin(); spell != packetSpells.spells.end(); spell++)
ptrSpells.add(spell->mId); ptrSpells.add(spell->mId);
} }
void LocalPlayer::removeItems() void LocalPlayer::removeItems()
@ -875,8 +876,16 @@ void LocalPlayer::setSpellbook()
MWWorld::Ptr ptrPlayer = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWWorld::Ptr ptrPlayer = MWBase::Environment::get().getWorld()->getPlayerPtr();
MWMechanics::Spells &ptrSpells = ptrPlayer.getClass().getCreatureStats(ptrPlayer).getSpells(); MWMechanics::Spells &ptrSpells = ptrPlayer.getClass().getCreatureStats(ptrPlayer).getSpells();
// Clear spells in spellbook // Clear spells in spellbook, while ignoring abilities, powers, etc.
ptrSpells.clear(); for (MWMechanics::Spells::TIterator iter = ptrSpells.begin(); iter != ptrSpells.end(); ++iter)
{
const ESM::Spell *spell = iter->first;
if (spell->mData.mType == ESM::Spell::ST_Spell)
{
ptrSpells.remove(spell->mId);
}
}
// Proceed by adding spells // Proceed by adding spells
addSpells(); addSpells();