Mercurial > mm7
diff Items.h @ 394:172f1f9f55f4
Слияние
author | Ritor1 |
---|---|
date | Fri, 22 Feb 2013 18:32:47 +0600 |
parents | 0f35f908547f |
children | f0f66f690777 |
line wrap: on
line diff
--- a/Items.h Fri Feb 22 18:32:34 2013 +0600 +++ b/Items.h Fri Feb 22 18:32:47 2013 +0600 @@ -63,26 +63,27 @@ /* 331 */ enum ITEM_EQUIP_TYPE { - EQUIP_ONE_OR_TWO_HANDS = 0x0, - EQUIP_TWO_HANDED = 0x1, - EQUIP_BOW = 0x2, - EQUIP_ARMOUR = 0x3, - EQUIP_SHIELD = 0x4, - EQUIP_HELMET = 0x5, - EQUIP_BELT = 0x6, - EQUIP_CLOAK = 0x7, + EQUIP_ONE_OR_TWO_HANDS = 0, + EQUIP_TWO_HANDED = 1, + EQUIP_BOW = 2, + EQUIP_ARMOUR = 3, + EQUIP_SHIELD = 4, + EQUIP_HELMET = 5, + EQUIP_BELT = 6, + EQUIP_CLOAK = 7, EQUIP_GAUNTLETS = 0x8, EQUIP_BOOTS = 0x9, - EQUIP_RING = 0xA, - EQUIP_AMULET = 0xB, + EQUIP_RING = 10, + EQUIP_AMULET = 11, EQUIP_WAND = 12, - EQUIP_REAGENT = 0xD, - EQUIP_POTION = 0xE, + EQUIP_REAGENT = 13, + EQUIP_POTION = 14, EQUIP_F = 0xF, - EQUIP_BOOK = 0x10, - EQUIP_11 = 0x11, + EQUIP_BOOK = 16, + EQUIP_11 = 17, EQUIP_GOLD = 18, - EQUIP_GEM = 0x13, + EQUIP_GEM = 19, + EQUIP_NONE = 20 }; @@ -140,8 +141,8 @@ unsigned int uValue; //10 14 unsigned __int16 uSpriteID; //14 18 __int16 field_1A; //16 - unsigned __int16 uEquipX; //18 1c - unsigned __int16 uEquipY; //1a 1e + signed __int16 uEquipX; //18 1c + signed __int16 uEquipY; //1a 1e unsigned __int8 uEquipType; //1c 20 unsigned __int8 uSkillType; //1d 21 unsigned __int8 uDamageDice; //1e 22