comparison mm7_1.cpp @ 238:b070b83a897b

Merge
author Gloval
date Mon, 18 Feb 2013 00:49:50 +0400
parents 2799737f8a74 0d9d30a1efc9
children f305a0ece6ab
comparison
equal deleted inserted replaced
237:2799737f8a74 238:b070b83a897b
5745 if (pParty->pPickedItem.uItemID) 5745 if (pParty->pPickedItem.uItemID)
5746 { 5746 {
5747 //v3 = player; 5747 //v3 = player;
5748 if (auto slot = player->AddItem(0xFFFFFFFFu, pParty->pPickedItem.uItemID)) 5748 if (auto slot = player->AddItem(0xFFFFFFFFu, pParty->pPickedItem.uItemID))
5749 { 5749 {
5750 __debugbreak(); // invalid inventory indexing
5751 memcpy(&player->pInventoryItems[slot-1], &pParty->pPickedItem, 0x24u); 5750 memcpy(&player->pInventoryItems[slot-1], &pParty->pPickedItem, 0x24u);
5752 viewparams->bRedrawGameUI = true; 5751 viewparams->bRedrawGameUI = true;
5753 pMouse->RemoveHoldingItem(); 5752 pMouse->RemoveHoldingItem();
5754 return; 5753 return;
5755 } 5754 }