Mercurial > mm7
diff Player.h @ 821:5e3f4bf3b8e6
* UpdateActorAI clean
* VS 2010 fixes
author | zipi |
---|---|
date | Tue, 26 Mar 2013 15:21:03 +0000 |
parents | cfc65feef029 |
children | 9c3f28b31b4a |
line wrap: on
line diff
--- a/Player.h Tue Mar 26 14:55:43 2013 +0200 +++ b/Player.h Tue Mar 26 15:21:03 2013 +0000 @@ -485,10 +485,10 @@ bool CanTrainToNextLevel(); unsigned int GetExperienceDisplayColor(); int CalculateIncommingDamage(int resistance, signed int type); - ITEM_EQUIP_TYPE GetEquippedItemEquipType(enum ITEM_EQUIP_TYPE uEquipSlot); - PLAYER_SKILL_TYPE GetEquippedItemSkillType(enum ITEM_EQUIP_TYPE uEquipSlot); + ITEM_EQUIP_TYPE GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot); + PLAYER_SKILL_TYPE GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot); bool IsUnarmed(); - bool HasItemEquipped(enum ITEM_EQUIP_TYPE uEquipIndex); + bool HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex); bool HasEnchantedItemEquipped(int uEnchantment); bool WearsItem(int a1, signed int a2); bool StealFromShop(struct ItemGen *a2, int a3, int a4, int a5, int *a6); @@ -513,14 +513,14 @@ int _48EA46_calc_special_bonus_by_items(int a2); int GetItemsBonus(enum CHARACTER_ATTRIBUTE_TYPE attr, int a3); int GetMagicalBonus(enum CHARACTER_ATTRIBUTE_TYPE a2); - char GetActualSkillLevel(enum PLAYER_SKILL_TYPE uSkillType); + char GetActualSkillLevel(PLAYER_SKILL_TYPE uSkillType); int GetSkillBonus(enum CHARACTER_ATTRIBUTE_TYPE a2); enum CHARACTER_RACE GetRace(); PLAYER_SEX GetSexByVoice(); void SetInitialStats(); int SetSexByVoice(); void Reset(PLAYER_CLASS_TYPE classType); - enum PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order); + PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order); void DecreaseAttribute(int eAttribute); int IncreaseAttribute(int eAttribute); void Player::Zero();