diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp index 9b97d7de88..8570d5e211 100644 --- a/apps/openmw/mwclass/armor.cpp +++ b/apps/openmw/mwclass/armor.cpp @@ -121,7 +121,7 @@ namespace MWClass return std::make_pair (slots, false); } - int Armor::getEuqipmentSkill (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const + int Armor::getEquipmentSkill (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const { ESMS::LiveCellRef *ref = ptr.get(); @@ -169,7 +169,7 @@ namespace MWClass std::string Armor::getUpSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const { - int es = getEuqipmentSkill(ptr, environment); + int es = getEquipmentSkill(ptr, environment); if (es == ESM::Skill::LightArmor) return std::string("Item Armor Light Up"); else if (es == ESM::Skill::MediumArmor) @@ -180,7 +180,7 @@ namespace MWClass std::string Armor::getDownSoundId (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const { - int es = getEuqipmentSkill(ptr, environment); + int es = getEquipmentSkill(ptr, environment); if (es == ESM::Skill::LightArmor) return std::string("Item Armor Light Down"); else if (es == ESM::Skill::MediumArmor) diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp index b240e96e3d..2b66ff8280 100644 --- a/apps/openmw/mwclass/armor.hpp +++ b/apps/openmw/mwclass/armor.hpp @@ -35,7 +35,7 @@ namespace MWClass ///< \return first: Return IDs of the slot this object can be equipped in; second: can object /// stay stacked when equipped? - virtual int getEuqipmentSkill (const MWWorld::Ptr& ptr, + virtual int getEquipmentSkill (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const; /// Return the index of the skill this item corresponds to when equiopped or -1, if there is /// no such skill. diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp index 56b981fe4e..4fe19ada40 100644 --- a/apps/openmw/mwclass/clothing.cpp +++ b/apps/openmw/mwclass/clothing.cpp @@ -111,7 +111,7 @@ namespace MWClass return std::make_pair (slots, false); } - int Clothing::getEuqipmentSkill (const MWWorld::Ptr& ptr, + int Clothing::getEquipmentSkill (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const { ESMS::LiveCellRef *ref = diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp index 47faa5ad37..171b062461 100644 --- a/apps/openmw/mwclass/clothing.hpp +++ b/apps/openmw/mwclass/clothing.hpp @@ -29,7 +29,7 @@ namespace MWClass ///< \return first: Return IDs of the slot this object can be equipped in; second: can object /// stay stacked when equipped? - virtual int getEuqipmentSkill (const MWWorld::Ptr& ptr, + virtual int getEquipmentSkill (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const; /// Return the index of the skill this item corresponds to when equiopped or -1, if there is /// no such skill. diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp index 45fdaada3f..20db0cf38f 100644 --- a/apps/openmw/mwclass/weapon.cpp +++ b/apps/openmw/mwclass/weapon.cpp @@ -108,7 +108,7 @@ namespace MWClass return std::make_pair (slots, stack); } - int Weapon::getEuqipmentSkill (const MWWorld::Ptr& ptr, + int Weapon::getEquipmentSkill (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const { ESMS::LiveCellRef *ref = diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp index b5ccad3033..f863c0bfe2 100644 --- a/apps/openmw/mwclass/weapon.hpp +++ b/apps/openmw/mwclass/weapon.hpp @@ -35,7 +35,7 @@ namespace MWClass ///< \return first: Return IDs of the slot this object can be equipped in; second: can object /// stay stacked when equipped? - virtual int getEuqipmentSkill (const MWWorld::Ptr& ptr, + virtual int getEquipmentSkill (const MWWorld::Ptr& ptr, const MWWorld::Environment& environment) const; /// Return the index of the skill this item corresponds to when equiopped or -1, if there is /// no such skill. diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp index 8845165299..9d766909f7 100644 --- a/apps/openmw/mwworld/class.cpp +++ b/apps/openmw/mwworld/class.cpp @@ -132,7 +132,7 @@ namespace MWWorld return std::make_pair (std::vector(), false); } - int Class::getEuqipmentSkill (const Ptr& ptr, const Environment& environment) const + int Class::getEquipmentSkill (const Ptr& ptr, const Environment& environment) const { return -1; } diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp index ad0fb8d6d3..67320b3e07 100644 --- a/apps/openmw/mwworld/class.hpp +++ b/apps/openmw/mwworld/class.hpp @@ -149,7 +149,7 @@ namespace MWWorld /// /// Default implementation: return (empty vector, false). - virtual int getEuqipmentSkill (const Ptr& ptr, const Environment& environment) + virtual int getEquipmentSkill (const Ptr& ptr, const Environment& environment) const; /// Return the index of the skill this item corresponds to when equiopped or -1, if there is /// no such skill.