diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-07-19 12:05:03 -0300 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-11 15:57:08 +0100 |
| commit | e56633dbd9908423d0cc6615cb9bb3dfab80668f (patch) | |
| tree | 4cb140e0ade91951fdb75df91f7cfea3052bbc1e /src | |
| parent | 3e33e5bf782fbeee74d05e1f2225f380be39cae1 (diff) | |
Update ItemPrototype.cpp, codestyle and indentation cleanup
(cherry picked from commit a6005d98e73c96c952d0992c3133d1c3368efbb6)
# Conflicts:
# src/server/game/Entities/Item/ItemPrototype.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Item/ItemTemplate.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp index 80701f436dc..f418640c9af 100644 --- a/src/server/game/Entities/Item/ItemTemplate.cpp +++ b/src/server/game/Entities/Item/ItemTemplate.cpp @@ -57,19 +57,19 @@ bool ItemTemplate::CanChangeEquipStateInCombat() const { switch (GetInventoryType()) { - case INVTYPE_RELIC: - case INVTYPE_SHIELD: - case INVTYPE_HOLDABLE: - return true; - default: - break; + case INVTYPE_RELIC: + case INVTYPE_SHIELD: + case INVTYPE_HOLDABLE: + return true; + default: + break; } switch (GetClass()) { - case ITEM_CLASS_WEAPON: - case ITEM_CLASS_PROJECTILE: - return true; + case ITEM_CLASS_WEAPON: + case ITEM_CLASS_PROJECTILE: + return true; } return false; @@ -77,7 +77,7 @@ bool ItemTemplate::CanChangeEquipStateInCombat() const uint32 ItemTemplate::GetSkill() const { - const static uint32 item_weapon_skills[MAX_ITEM_SUBCLASS_WEAPON] = + static uint32 const itemWeaponSkills[MAX_ITEM_SUBCLASS_WEAPON] = { SKILL_AXES, SKILL_TWO_HANDED_AXES, SKILL_BOWS, SKILL_GUNS, SKILL_MACES, SKILL_TWO_HANDED_MACES, SKILL_POLEARMS, SKILL_SWORDS, SKILL_TWO_HANDED_SWORDS, SKILL_WARGLAIVES, @@ -86,7 +86,7 @@ uint32 ItemTemplate::GetSkill() const SKILL_FISHING }; - const static uint32 item_armor_skills[MAX_ITEM_SUBCLASS_ARMOR] = + static uint32 const itemArmorSkills[MAX_ITEM_SUBCLASS_ARMOR] = { 0, SKILL_CLOTH, SKILL_LEATHER, SKILL_MAIL, SKILL_PLATE_MAIL, 0, SKILL_SHIELD, 0, 0, 0, 0 }; @@ -94,20 +94,20 @@ uint32 ItemTemplate::GetSkill() const switch (GetClass()) { - case ITEM_CLASS_WEAPON: - if (GetSubClass() >= MAX_ITEM_SUBCLASS_WEAPON) - return 0; - else - return item_weapon_skills[GetSubClass()]; + case ITEM_CLASS_WEAPON: + if (GetSubClass() >= MAX_ITEM_SUBCLASS_WEAPON) + return 0; + else + return itemWeaponSkills[GetSubClass()]; - case ITEM_CLASS_ARMOR: - if (GetSubClass() >= MAX_ITEM_SUBCLASS_ARMOR) - return 0; - else - return item_armor_skills[GetSubClass()]; + case ITEM_CLASS_ARMOR: + if (GetSubClass() >= MAX_ITEM_SUBCLASS_ARMOR) + return 0; + else + return itemArmorSkills[GetSubClass()]; - default: - return 0; + default: + return 0; } } |