teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Rename the Class::attack method to Class::hit

Browse source
This commit is contained in:
Chris Robinson 2013-07-25 00:30:01 -07:00
parent fb0ee7f2fc
commit 92cc566fdc
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/creature.cpp
View file

@ -149,7 +149,7 @@ namespace MWClass
}
void Creature::attack(const MWWorld::Ptr& ptr, int type) const
void Creature::hit(const MWWorld::Ptr& ptr, int type) const
{
}

2
apps/openmw/mwclass/creature.hpp
View file

@ -42,7 +42,7 @@ namespace MWClass
virtual MWMechanics::CreatureStats& getCreatureStats (const MWWorld::Ptr& ptr) const;
///< Return creature stats
virtual void attack(const MWWorld::Ptr& ptr, int type) const;
virtual void hit(const MWWorld::Ptr& ptr, int type) const;
virtual void setActorHealth(const MWWorld::Ptr& ptr, float health, const MWWorld::Ptr& attacker) const;

2
apps/openmw/mwclass/npc.cpp
View file

@ -290,7 +290,7 @@ namespace MWClass
}
void Npc::attack(const MWWorld::Ptr& ptr, int type) const
void Npc::hit(const MWWorld::Ptr& ptr, int type) const
{
// FIXME: Detect what was hit
MWWorld::Ptr victim;

2
apps/openmw/mwclass/npc.hpp
View file

@ -68,7 +68,7 @@ namespace MWClass
virtual MWWorld::InventoryStore& getInventoryStore (const MWWorld::Ptr& ptr) const;
///< Return inventory store
virtual void attack(const MWWorld::Ptr& ptr, int type) const;
virtual void hit(const MWWorld::Ptr& ptr, int type) const;
virtual void setActorHealth(const MWWorld::Ptr& ptr, float health, const MWWorld::Ptr& attacker) const;

8
apps/openmw/mwrender/animation.cpp
View file

@ -538,13 +538,13 @@ void Animation::handleTextKey(AnimState &state, const std::string &groupname, co
else if(evt.compare(off, len, "unequip detach") == 0)
showWeapons(false);
else if(evt.compare(off, len, "chop hit") == 0)
MWWorld::Class::get(mPtr).attack(mPtr, MWMechanics::CreatureStats::AT_Chop);
MWWorld::Class::get(mPtr).hit(mPtr, MWMechanics::CreatureStats::AT_Chop);
else if(evt.compare(off, len, "slash hit") == 0)
MWWorld::Class::get(mPtr).attack(mPtr, MWMechanics::CreatureStats::AT_Slash);
MWWorld::Class::get(mPtr).hit(mPtr, MWMechanics::CreatureStats::AT_Slash);
else if(evt.compare(off, len, "thrust hit") == 0)
MWWorld::Class::get(mPtr).attack(mPtr, MWMechanics::CreatureStats::AT_Thrust);
MWWorld::Class::get(mPtr).hit(mPtr, MWMechanics::CreatureStats::AT_Thrust);
else if(evt.compare(off, len, "hit") == 0)
MWWorld::Class::get(mPtr).attack(mPtr, -1);
MWWorld::Class::get(mPtr).hit(mPtr);
}

4
apps/openmw/mwworld/class.cpp
View file

@ -77,9 +77,9 @@ namespace MWWorld
throw std::runtime_error ("class does not have item health");
}
void Class::attack(const Ptr& ptr, int type) const
void Class::hit(const Ptr& ptr, int type) const
{
throw std::runtime_error("class cannot attack");
throw std::runtime_error("class cannot hit");
}
void Class::setActorHealth(const Ptr& ptr, float health, const Ptr& attacker) const

6
apps/openmw/mwworld/class.hpp
View file

@ -105,11 +105,11 @@ namespace MWWorld
///< Return item max health or throw an exception, if class does not have item health
/// (default implementation: throw an exceoption)
virtual void attack(const Ptr& ptr, int type) const;
virtual void hit(const Ptr& ptr, int type=-1) const;
///< Execute a melee hit, using the current weapon. This will check the relevant skills
/// of the given attacker, and whoever is hit.
/// \a type - type of attack, one of the MWMechanics::CreatureStats::AttackType enums.
/// ignored for creature attacks.
/// \param type - type of attack, one of the MWMechanics::CreatureStats::AttackType
/// enums. ignored for creature attacks.
/// (default implementation: throw an exceoption)
virtual void setActorHealth(const Ptr& ptr, float health, const Ptr& attacker=Ptr()) const;