Mercurial > mm7

diff Player.h @ 1384:b51332ab228f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/Player.h	Tue Jul 16 00:40:01 2013 +0200
+++ b/Player.h	Tue Jul 16 20:51:29 2013 +0200
@@ -540,14 +540,14 @@
   int GetDisarmTrap();
   char GetLearningPercent();
   bool CanFitItem(unsigned int uSlot, unsigned int uItemID);
-  int FindFreeInventorySlot();
+  int FindFreeInventoryListSlot();
   int CreateItemInInventory(unsigned int uSlot, unsigned int uItemID);
   int HasSkill(unsigned int uSkillType);
   void WearItem(unsigned int uItemID);
   int AddItem(int uSlot, unsigned int uItemID);
   int AddItem2(int uSlot, ItemGen *Src);
-  int CreateItemInInventory2(unsigned int uSlot, ItemGen *Src);
-  void PutItemArInventoryIndex(int uItemID, int item_id, int uSlot);
+  int CreateItemInInventory2(unsigned int index, ItemGen *Src);
+  void PutItemArInventoryIndex(int uItemID, int itemListPos, int uSlot);
   void RemoveItemAtInventoryIndex(unsigned int uSlot);
   bool CanAct();
   bool CanSteal();
@@ -710,13 +710,13 @@
       {
       struct  
           {
-          ItemGen pInventoryItems[126];
+          ItemGen pInventoryItemList[126];
           ItemGen pEquippedItems[12];
       };
       ItemGen pOwnItems[138];
       };
   
-    int pInventoryIndices[126];  
+    int pInventoryMatrix[126];  
   __int16 sResFireBase;
   __int16 sResAirBase;
   __int16 sResWaterBase;