summaryrefslogtreecommitdiff
path: root/src/resources/iteminfo.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-14 17:06:02 +0300
commit6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d (patch)
treef1acb027394af1aec49790354df97da4665488b7 /src/resources/iteminfo.h
parenta7d7346b9eb3fa62a8912e31d5c00f8e05390425 (diff)
downloadplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.gz
plus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.bz2
plus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.xz
plus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.zip
another fixes from cpplint.
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r--src/resources/iteminfo.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 30b22cec8..0a3b20c61 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -63,7 +63,8 @@ enum EquipmentSlot
EQUIP_FIGHT1_SLOT = 8,
EQUIP_FIGHT2_SLOT = 9,
// Projectile:
- // this item does not amount to one, it only indicates the chosen projectile.
+ // this item does not amount to one, it only
+ // indicates the chosen projectile.
EQUIP_PROJECTILE_SLOT = 10
};
@@ -78,17 +79,17 @@ enum ItemType
ITEM_EQUIPMENT_ONE_HAND_WEAPON,
ITEM_EQUIPMENT_TWO_HANDS_WEAPON,
ITEM_EQUIPMENT_TORSO,
- ITEM_EQUIPMENT_ARMS, // 5
+ ITEM_EQUIPMENT_ARMS, // 5
ITEM_EQUIPMENT_HEAD,
ITEM_EQUIPMENT_LEGS,
ITEM_EQUIPMENT_SHIELD,
ITEM_EQUIPMENT_RING,
- ITEM_EQUIPMENT_NECKLACE, // 10
+ ITEM_EQUIPMENT_NECKLACE, // 10
ITEM_EQUIPMENT_FEET,
ITEM_EQUIPMENT_AMMO,
ITEM_EQUIPMENT_CHARM,
ITEM_SPRITE_RACE,
- ITEM_SPRITE_HAIR // 15
+ ITEM_SPRITE_HAIR // 15
};
// sprite, <itemfrom, itemto>
@@ -179,7 +180,8 @@ class ItemInfo final
void setAttackAction(std::string attackAction);
- // Handlers for seting and getting the string used for particles when attacking
+ // Handlers for seting and getting the string
+ // used for particles when attacking
void setMissileParticleFile(const std::string &s)
{ mMissileParticleFile = s; }