Mercurial > mm7
diff Player.h @ 1014:a704435d3285
comtinue player cleaning
author | Gloval |
---|---|
date | Sun, 19 May 2013 20:38:49 +0400 |
parents | 9e823ad5eaa6 |
children | 32ec62bbaa2c |
line wrap: on
line diff
--- a/Player.h Sun May 19 12:13:42 2013 +0400 +++ b/Player.h Sun May 19 20:38:49 2013 +0400 @@ -542,10 +542,10 @@ int CreateItemInInventory(unsigned int uSlot, unsigned int uItemID); int HasSkill(unsigned int uSkillType); int WearItem(unsigned int uItemID); - int AddItem(unsigned int uSlot, unsigned int uItemID); - int AddItem2(unsigned int uSlot, ItemGen *Src); + int AddItem(int uSlot, unsigned int uItemID); + int AddItem2(int uSlot, ItemGen *Src); int CreateItemInInventory2(unsigned int uSlot, ItemGen *Src); - bool _49298B(ItemGen *a2, int a3, int a4); + int PutItemArInventoryIndex(ItemGen *item, int item_id, int uSlot); void RemoveItemAtInventoryIndex(unsigned int uSlot); bool CanAct(); bool CanSteal(); @@ -568,7 +568,7 @@ int _4B807C(float a2); int _4B8040_condition_time(unsigned int uCondition); bool _43EEF3(); - void SalesProcess(unsigned int a2, int a3, int _2devent_idx);//0x4BE2DD + void SalesProcess(unsigned int inventory_idnx, int item_index, int _2devent_idx);//0x4BE2DD bool Recover(signed int a2); bool CanCastSpell(unsigned int uRequiredMana); @@ -606,7 +606,7 @@ char pName[16]; PLAYER_SEX uSex; PLAYER_CLASS_TYPE classType; - unsigned __int8 uFace; + unsigned __int8 uCurrentFace; char field_BB; unsigned __int16 uMight; unsigned __int16 uMightBonus; @@ -693,8 +693,7 @@ ItemGen pOwnItems[138]; }; - - int pInventoryIndices[126]; + int pInventoryIndices[126]; __int16 sResFireBase; __int16 sResAirBase; __int16 sResWaterBase; @@ -719,8 +718,8 @@ __int16 sResDarkBonus; SpellBuff pPlayerBuffs[24]; unsigned int uVoiceID; - int field_1924; - int field_1928; + int uPrevVoiceID; + int uPrevFace; int field_192C; int field_1930; unsigned __int16 uTimeToRecovery;