mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 01:06:42 +00:00
Code Issues Releases Wiki Activity

[Client] Reset friendly hits when summoning a creature

Browse source
This commit is contained in:
David Cernat 2019-12-02 23:29:36 +02:00
parent 9792a5256f
commit eeb3e4f938
3 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwmechanics/creaturestats.cpp
View file

@ -357,6 +357,19 @@ namespace MWMechanics
return mFriendlyHits; return mFriendlyHits;
} }
/*
Start of tes3mp addition
Make it possible to set the number of friendly hits from elsewhere
*/
void CreatureStats::setFriendlyHits(int hits)
{
mFriendlyHits = hits;
}
/*
End of tes3mp addition
*/
void CreatureStats::friendlyHit() void CreatureStats::friendlyHit()
{ {
++mFriendlyHits; ++mFriendlyHits;

10
apps/openmw/mwmechanics/creaturestats.hpp
View file

@ -212,6 +212,16 @@ namespace MWMechanics
int getFriendlyHits() const; int getFriendlyHits() const;
///< Number of friendly hits received. ///< Number of friendly hits received.
/*
Start of tes3mp addition
Make it possible to set the number of friendly hits from elsewhere
*/
void setFriendlyHits(int hits);
/*
End of tes3mp addition
*/
void friendlyHit(); void friendlyHit();
///< Increase number of friendly hits by one. ///< Increase number of friendly hits by one.

2
apps/openmw/mwmp/ObjectList.cpp
View file

@ -477,6 +477,8 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore)
// If not, add it to the summoned creature map // If not, add it to the summoned creature map
else else
creatureMap.insert(std::make_pair(std::make_pair(baseObject.summonEffectId, baseObject.summonSpellId), creatureActorId)); creatureMap.insert(std::make_pair(std::make_pair(baseObject.summonEffectId, baseObject.summonSpellId), creatureActorId));
creatureStats.setFriendlyHits(0);
} }
} }
} }