--- a/Player.h	Mon Feb 11 19:42:28 2013 +0200
+++ b/Player.h	Mon Feb 11 20:23:55 2013 +0200
@@ -60,25 +60,25 @@
 /*  328 */
 enum PLAYER_SKILL_TYPE
 {
-  PLAYER_SKILL_STAFF = 0x0,
-  PLAYER_SKILL_SWORD = 0x1,
-  PLAYER_SKILL_DAGGER = 0x2,
-  PLAYER_SKILL_AXE = 0x3,
-  PLAYER_SKILL_SPEAR = 0x4,
-  PLAYER_SKILL_BOW = 0x5,
-  PLAYER_SKILL_MACE = 0x6,
-  PLAYER_SKILL_BLASTER = 0x7,
-  PLAYER_SKILL_SHIELD = 0x8,
-  PLAYER_SKILL_LEATHER = 0x9,
-  PLAYER_SKILL_CHAIN = 0xA,
-  PLAYER_SKILL_PLATE = 0xB,
-  PLAYER_SKILL_FIRE = 0xC,
-  PLAYER_SKILL_AIR = 0xD,
-  PLAYER_SKILL_WATER = 0xE,
-  PLAYER_SKILL_EARTH = 0xF,
-  PLAYER_SKILL_SPIRIT = 0x10,
+  PLAYER_SKILL_STAFF = 0,
+  PLAYER_SKILL_SWORD = 1,
+  PLAYER_SKILL_DAGGER = 2,
+  PLAYER_SKILL_AXE = 3,
+  PLAYER_SKILL_SPEAR = 4,
+  PLAYER_SKILL_BOW = 5,
+  PLAYER_SKILL_MACE = 6,
+  PLAYER_SKILL_BLASTER = 7,
+  PLAYER_SKILL_SHIELD = 8,
+  PLAYER_SKILL_LEATHER = 9,
+  PLAYER_SKILL_CHAIN = 10,
+  PLAYER_SKILL_PLATE = 11,
+  PLAYER_SKILL_FIRE = 12,
+  PLAYER_SKILL_AIR = 13,
+  PLAYER_SKILL_WATER = 14,
+  PLAYER_SKILL_EARTH = 15,
+  PLAYER_SKILL_SPIRIT = 16,
   PLAYER_SKILL_MIND = 0x11,
-  PLAYER_SKILL_BODY = 0x12,
+  PLAYER_SKILL_BODY = 18,
   PLAYER_SKILL_LIGHT = 0x13,
   PLAYER_SKILL_DARK = 0x14,
   PLAYER_SKILL_ITEM_ID = 0x15,
@@ -89,31 +89,32 @@
   PLAYER_SKILL_PERCEPTION = 0x1A,
   PLAYER_SKILL_DIPLOMACY = 0x1B,
   PLAYER_SKILL_TIEVERY = 0x1C,
-  PLAYER_SKILL_TRAP_DISARM = 0x1D,
+  PLAYER_SKILL_TRAP_DISARM = 29,
   PLAYER_SKILL_DODGE = 0x1E,
   PLAYER_SKILL_UNARMED = 0x1F,
   PLAYER_SKILL_MONSTER_ID = 0x20,
-  PLAYER_SKILL_ARMSMASTER = 0x21,
-  PLAYER_SKILL_STEALING = 0x22,
-  PLAYER_SKILL_ALCHEMY = 0x23,
+  PLAYER_SKILL_ARMSMASTER = 33,
+  PLAYER_SKILL_STEALING = 34,
+  PLAYER_SKILL_ALCHEMY = 35,
   PLAYER_SKILL_LEARNING = 0x24,
 };
 
 /*  329 */
-enum PLAYER_CLASS_TYPE
+enum PLAYER_CLASS_TYPE: unsigned __int8
 {
-  PLAYER_CLASS_KNIGHT = 0x0,
-  PLAYER_CLASS_THEIF = 0x4,
+  PLAYER_CLASS_KNIGHT = 0,
+  PLAYER_CLASS_THEIF = 4,
   PLAYER_CLASS_BOUNTY_HUNTER = 0x7,
   PLAYER_CLASS_MONK = 0x8,
   PLAYER_CLASS_PALADIN = 0xC,
   PLAYER_CLASS_SHOOTER = 0x10,
   PLAYER_CLASS_RANGER = 0x14,
-  PLAYER_CLASS_CLERIC = 0x18,
+  PLAYER_CLASS_CLERIC = 24,
   PLAYER_CLASS_PRIEST_OF_MOON = 0x1B,
-  PLAYER_CLASS_DRUID = 0x1C,
-  PLAYER_CLASS_SORCERER = 0x20,
-  PLAYER_CLASS_LICH = 0x23,
+  PLAYER_CLASS_DRUID = 28,
+  PLAYER_CLASS_31 = 31,
+  PLAYER_CLASS_SORCERER = 32,
+  PLAYER_CLASS_LICH = 35,
 };
 
 
@@ -365,7 +366,7 @@
   int GetSexByVoice();
   void SetInitialStats();
   int SetSexByVoice();
-  void Reset(unsigned __int8 uClass);
+  void Reset(PLAYER_CLASS_TYPE classType);
   enum PLAYER_SKILL_TYPE GetSkillIdxByOrder(signed int order);
   void DecreaseAttribute(int eAttribute);
   int IncreaseAttribute(int eAttribute);
@@ -418,6 +419,7 @@
 
   inline bool Dead()       {return pConditions[Condition::Condition_Dead] != 0;}
   inline bool Eradicated() {return pConditions[Condition::Condition_Eradicated] != 0;}
+  inline bool Zombie()     {return pConditions[Condition::Condition_Zombie] != 0;}
 
 
 
@@ -425,7 +427,7 @@
   unsigned __int64 uExperience;
   char pName[16];
   PLAYER_SEX uSex;
-  unsigned __int8 uClass;
+  PLAYER_CLASS_TYPE classType;
   unsigned __int8 uFace;
   char field_BB;
   unsigned __int16 uMight;