mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-31 17:15:34 +00:00
Merge branch 'try_and_hit_me' into 'master'
Bring HitAttemptOnMe in line with HitOnMe See merge request OpenMW/openmw!1816
This commit is contained in:
commit
dccbd3e980
3 changed files with 10 additions and 3 deletions
|
@ -362,6 +362,11 @@ namespace MWMechanics
|
|||
mLastHitAttemptObject = objectid;
|
||||
}
|
||||
|
||||
void CreatureStats::clearLastHitAttemptObject()
|
||||
{
|
||||
mLastHitAttemptObject.clear();
|
||||
}
|
||||
|
||||
const std::string &CreatureStats::getLastHitAttemptObject() const
|
||||
{
|
||||
return mLastHitAttemptObject;
|
||||
|
|
|
@ -258,6 +258,7 @@ namespace MWMechanics
|
|||
void clearLastHitObject();
|
||||
const std::string &getLastHitObject() const;
|
||||
void setLastHitAttemptObject(const std::string &objectid);
|
||||
void clearLastHitAttemptObject();
|
||||
const std::string &getLastHitAttemptObject() const;
|
||||
void setHitAttemptActorId(const int actorId);
|
||||
int getHitAttemptActorId() const;
|
||||
|
|
|
@ -997,9 +997,10 @@ namespace MWScript
|
|||
runtime.pop();
|
||||
|
||||
MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
|
||||
runtime.push(::Misc::StringUtils::ciEqual(objectID, stats.getLastHitAttemptObject()));
|
||||
|
||||
stats.setLastHitAttemptObject(std::string());
|
||||
bool hit = ::Misc::StringUtils::ciEqual(objectID, stats.getLastHitAttemptObject());
|
||||
runtime.push(hit);
|
||||
if(hit)
|
||||
stats.clearLastHitAttemptObject();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue