Mercurial > mm7

diff Player.h @ 816:cfc65feef029
* Player Recovery Times * Player Attack fixes * Debug log to timers
author: Nomad
date: Tue, 26 Mar 2013 12:40:27 +0200
parents: a464d28566a6
children: 5e3f4bf3b8e6
--- a/Player.h	Tue Mar 26 06:40:04 2013 +0200
+++ b/Player.h	Tue Mar 26 12:40:27 2013 +0200
@@ -8,6 +8,7 @@
 #define PLAYER_BUFF_BLESS            1
 #define PLAYER_BUFF_FATE             4
 #define PLAYER_BUFF_HAMMERHANDS      6
+#define PLAYER_BUFF_7                7
 #define PLAYER_BUFF_PAIN_REFLECTION 10
 #define PLAYER_BUFF_PRESERVATION    11
 #define PLAYER_BUFF_REGENERATION    12
@@ -184,7 +185,7 @@
 };
 
 /*  328 */
-enum PLAYER_SKILL_TYPE
+enum PLAYER_SKILL_TYPE: unsigned __int8
 {
   PLAYER_SKILL_STAFF = 0,
   PLAYER_SKILL_SWORD = 1,
@@ -484,8 +485,8 @@
   bool CanTrainToNextLevel();
   unsigned int GetExperienceDisplayColor();
   int CalculateIncommingDamage(int resistance, signed int type);
-  int GetEquippedItemEquipType(unsigned int uEquipSlot);
-  int GetEquippedItemSkillType(enum ITEM_EQUIP_TYPE uEquipSlot);
+  ITEM_EQUIP_TYPE   GetEquippedItemEquipType(enum ITEM_EQUIP_TYPE uEquipSlot);
+  PLAYER_SKILL_TYPE GetEquippedItemSkillType(enum ITEM_EQUIP_TYPE uEquipSlot);
   bool IsUnarmed();
   bool HasItemEquipped(enum ITEM_EQUIP_TYPE uEquipIndex);
   bool HasEnchantedItemEquipped(int uEnchantment);
@@ -496,7 +497,7 @@
   int ReceiveDamage(signed int type, int resistance);
   int _48DCF6(int a2, struct Actor *pActor);
   unsigned int GetSpellSchool(unsigned int uSpellID);
-  int GetAttackRecoveryTime(int a2);
+  int GetAttackRecoveryTime(bool bRangedAttack);
   int GetMaxHealth();
   int GetMaxMana();
   int GetBaseAC();