diff mm7_1.cpp @ 1014:a704435d3285

comtinue player cleaning
author Gloval
date Sun, 19 May 2013 20:38:49 +0400
parents e865f349aa41
children 9ac94d00012e
line wrap: on
line diff
--- a/mm7_1.cpp	Sun May 19 12:13:42 2013 +0400
+++ b/mm7_1.cpp	Sun May 19 20:38:49 2013 +0400
@@ -697,7 +697,7 @@
   v1 = pIcons_LOD->GetTexture(v0);
   v11 = areWeLoadingTexture;
   if ( uActiveCharacter
-    && (v2 = pPlayers[uActiveCharacter]->AddItem(0xFFFFFFFFu, pParty->pPickedItem.uItemID)) != 0 )
+    && (v2 = pPlayers[uActiveCharacter]->AddItem(-1, pParty->pPickedItem.uItemID)) != 0 )
   {
     memcpy(&pPlayers[uActiveCharacter]->pInventoryItems[v2-1], &pParty->pPickedItem, 0x24u);
 	pMouse->RemoveHoldingItem();
@@ -708,7 +708,7 @@
     v3 = pParty->pPlayers;
 	while ( v3 <= &pParty->pPlayers[3] )
     {
-      v4 = v3->AddItem(0xFFFFFFFFu, pParty->pPickedItem.uItemID);
+      v4 = v3->AddItem(-1, pParty->pPickedItem.uItemID);
       if ( v4 )
 	  {
 		memcpy(&pParty->pPlayers[v12].pInventoryItems[v4], &pParty->pPickedItem, 0x24u);
@@ -782,7 +782,7 @@
   if (pParty->pPickedItem.uItemID)
   {
     //v3 = player;
-    if (auto slot = player->AddItem(0xFFFFFFFFu, pParty->pPickedItem.uItemID))
+    if (auto slot = player->AddItem(-1, pParty->pPickedItem.uItemID))
     {
       memcpy(&player->pInventoryItems[slot-1], &pParty->pPickedItem, 0x24u);
       viewparams->bRedrawGameUI = true;
@@ -974,7 +974,7 @@
             pX = v0->AddItem2(0xFFFFFFFFu, &pParty->pPickedItem);
             if ( !pX )
             {
-              v0->_49298B(&this_, v13 - 1, a4);
+              v0->PutItemArInventoryIndex(&this_, v13 - 1, a4);
               memcpy((void *)a2.y, &this_, sizeof(ItemGen));
               return;
             }
@@ -986,7 +986,7 @@
         }
         v10 = v0->AddItem(a4, v7);
         pX = v10;
-        if ( v10 || (v10 = v0->AddItem(0xFFFFFFFFu, pParty->pPickedItem.uItemID), (pX = v10) != 0) )
+        if ( v10 || (v10 = v0->AddItem(-1, pParty->pPickedItem.uItemID), (pX = v10) != 0) )
         {
           memcpy(&v0->pInventoryItems[v10-1], &pParty->pPickedItem, 0x24u);
           pMouse->RemoveHoldingItem();