diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp index 535042740..758c07a65 100644 --- a/apps/openmw/mwmechanics/creaturestats.cpp +++ b/apps/openmw/mwmechanics/creaturestats.cpp @@ -357,6 +357,19 @@ namespace MWMechanics 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() { ++mFriendlyHits; diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp index 7e9785d22..50b984567 100644 --- a/apps/openmw/mwmechanics/creaturestats.hpp +++ b/apps/openmw/mwmechanics/creaturestats.hpp @@ -212,6 +212,16 @@ namespace MWMechanics int getFriendlyHits() const; ///< 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(); ///< Increase number of friendly hits by one. diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp index 1542e634f..96b104f1e 100644 --- a/apps/openmw/mwmp/ObjectList.cpp +++ b/apps/openmw/mwmp/ObjectList.cpp @@ -477,6 +477,8 @@ void ObjectList::spawnObjects(MWWorld::CellStore* cellStore) // If not, add it to the summoned creature map else creatureMap.insert(std::make_pair(std::make_pair(baseObject.summonEffectId, baseObject.summonSpellId), creatureActorId)); + + creatureStats.setFriendlyHits(0); } } }