AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 23:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Add creatures to summoner's creature map when they are missing

Browse Source 
Additionally, adjust logging related to summons.
This commit is contained in:
David Cernat 2019-12-01 15:02:04 +02:00
parent 985d1f17e0
commit 7120f41cfa
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/openmw/mwmp/ObjectList.cpp
View File

@ -22,6 +22,7 @@
#include "../mwgui/windowmanagerimp.hpp" #include "../mwgui/windowmanagerimp.hpp"
#include "../mwmechanics/aifollow.hpp" #include "../mwmechanics/aifollow.hpp"
#include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/spellcasting.hpp" #include "../mwmechanics/spellcasting.hpp"
#include "../mwmechanics/summoning.hpp" #include "../mwmechanics/summoning.hpp"
@ -458,15 +459,24 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore)
activeEffect.mMagnitude = 1; activeEffect.mMagnitude = 1;
activeEffects.push_back(activeEffect); activeEffects.push_back(activeEffect);
LOG_APPEND(TimedLog::LOG_INFO, "- adding spell from ObjectList with id %s and effect %i", LOG_APPEND(TimedLog::LOG_INFO, "-- adding active spell to master with id %s, effect %i, duration %f",
baseObject.summonSpellId.c_str(), baseObject.summonEffectId); baseObject.summonSpellId.c_str(), baseObject.summonEffectId, baseObject.summonDuration);
masterCreatureStats.getActiveSpells().addSpell(baseObject.summonSpellId, false, activeEffects, "", masterCreatureStats.getActorId()); masterCreatureStats.getActiveSpells().addSpell(baseObject.summonSpellId, false, activeEffects, "", masterCreatureStats.getActorId());
LOG_APPEND(TimedLog::LOG_INFO, "- setting summoned creature actor ID for %i-%i to %i", LOG_APPEND(TimedLog::LOG_INFO, "-- setting summoned creatureActorId for %i-%i to %i",
newPtr.getCellRef().getRefNum(), newPtr.getCellRef().getMpNum(), creatureActorId); newPtr.getCellRef().getRefNum(), newPtr.getCellRef().getMpNum(), creatureActorId);
// Check if this creature is present in the summoner's summoned creature map
std::map<std::pair<int, std::string>, int>& creatureMap = masterCreatureStats.getSummonedCreatureMap();
bool foundSummonedCreature = creatureMap.find(std::make_pair(baseObject.summonEffectId, baseObject.summonSpellId)) != creatureMap.end();
// If it is, update its creatureActorId
if (foundSummonedCreature)
masterCreatureStats.setSummonedCreatureActorId(baseObject.refId, creatureActorId); masterCreatureStats.setSummonedCreatureActorId(baseObject.refId, creatureActorId);
// If not, add it to the summoned creature map
else
creatureMap.insert(std::make_pair(std::make_pair(baseObject.summonEffectId, baseObject.summonSpellId), creatureActorId));
} }
} }
} }