Mercurial > mm7

diff UI/UiGame.cpp @ 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 d6cf8ead9242
children 28f87f5234a1
line wrap: on
line diff
--- a/UI/UiGame.cpp	Tue Jul 16 00:40:01 2013 +0200
+++ b/UI/UiGame.cpp	Tue Jul 16 20:51:29 2013 +0200
@@ -60,7 +60,7 @@
     //v3 = player;
     if (auto slot = player->AddItem(-1, pParty->pPickedItem.uItemID))
     {
-      memcpy(&player->pInventoryItems[slot-1], &pParty->pPickedItem, 0x24u);
+      memcpy(&player->pInventoryItemList[slot-1], &pParty->pPickedItem, 0x24u);
       viewparams->bRedrawGameUI = true;
       pMouse->RemoveHoldingItem();
       return;
@@ -1969,7 +1969,7 @@
         uLastPointedObjectID = pMouse->uPointingObjectID;
         return;
       }
-      pItemGen = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItems[v14-1];
+      pItemGen = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[v14-1];
       //goto LABEL_49;
       v17 = pItemGen->GetDisplayName();
       GameUI_SetFooterString(v17);