comparison Player.h @ 1384:b51332ab228f

changed a few member variables in Player to slightly less confusing names
author Grumpy7
date Tue, 16 Jul 2013 20:51:29 +0200
parents 0a4254e80036
children 71a2cf416478
comparison
equal deleted inserted replaced
1383:0a4254e80036 1384:b51332ab228f
538 int GetMerchant(); 538 int GetMerchant();
539 int GetPerception(); 539 int GetPerception();
540 int GetDisarmTrap(); 540 int GetDisarmTrap();
541 char GetLearningPercent(); 541 char GetLearningPercent();
542 bool CanFitItem(unsigned int uSlot, unsigned int uItemID); 542 bool CanFitItem(unsigned int uSlot, unsigned int uItemID);
543 int FindFreeInventorySlot(); 543 int FindFreeInventoryListSlot();
544 int CreateItemInInventory(unsigned int uSlot, unsigned int uItemID); 544 int CreateItemInInventory(unsigned int uSlot, unsigned int uItemID);
545 int HasSkill(unsigned int uSkillType); 545 int HasSkill(unsigned int uSkillType);
546 void WearItem(unsigned int uItemID); 546 void WearItem(unsigned int uItemID);
547 int AddItem(int uSlot, unsigned int uItemID); 547 int AddItem(int uSlot, unsigned int uItemID);
548 int AddItem2(int uSlot, ItemGen *Src); 548 int AddItem2(int uSlot, ItemGen *Src);
549 int CreateItemInInventory2(unsigned int uSlot, ItemGen *Src); 549 int CreateItemInInventory2(unsigned int index, ItemGen *Src);
550 void PutItemArInventoryIndex(int uItemID, int item_id, int uSlot); 550 void PutItemArInventoryIndex(int uItemID, int itemListPos, int uSlot);
551 void RemoveItemAtInventoryIndex(unsigned int uSlot); 551 void RemoveItemAtInventoryIndex(unsigned int uSlot);
552 bool CanAct(); 552 bool CanAct();
553 bool CanSteal(); 553 bool CanSteal();
554 bool CanEquip_RaceAndAlignmentCheck(unsigned int uItemID); 554 bool CanEquip_RaceAndAlignmentCheck(unsigned int uItemID);
555 void SetCondition(unsigned int uConditionIdx, int a3); 555 void SetCondition(unsigned int uConditionIdx, int a3);
708 int pure_might_used; 708 int pure_might_used;
709 union //214h 709 union //214h
710 { 710 {
711 struct 711 struct
712 { 712 {
713 ItemGen pInventoryItems[126]; 713 ItemGen pInventoryItemList[126];
714 ItemGen pEquippedItems[12]; 714 ItemGen pEquippedItems[12];
715 }; 715 };
716 ItemGen pOwnItems[138]; 716 ItemGen pOwnItems[138];
717 }; 717 };
718 718
719 int pInventoryIndices[126]; 719 int pInventoryMatrix[126];
720 __int16 sResFireBase; 720 __int16 sResFireBase;
721 __int16 sResAirBase; 721 __int16 sResAirBase;
722 __int16 sResWaterBase; 722 __int16 sResWaterBase;
723 __int16 sResEarthBase; 723 __int16 sResEarthBase;
724 __int16 field_177C; 724 __int16 field_177C;