Mercurial > mm7

comparison UI/UiGame.cpp @ 1399:91ff22cc755b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 18 Jul 2013 09:40:14 +0600
parents b51332ab228f
children 28f87f5234a1
comparison
equal deleted inserted replaced
1398:8557d021a31b 1399:91ff22cc755b
58 if (pParty->pPickedItem.uItemID) 58 if (pParty->pPickedItem.uItemID)
59 { 59 {
60 //v3 = player; 60 //v3 = player;
61 if (auto slot = player->AddItem(-1, pParty->pPickedItem.uItemID)) 61 if (auto slot = player->AddItem(-1, pParty->pPickedItem.uItemID))
62 { 62 {
63 memcpy(&player->pInventoryItems[slot-1], &pParty->pPickedItem, 0x24u); 63 memcpy(&player->pInventoryItemList[slot-1], &pParty->pPickedItem, 0x24u);
64 viewparams->bRedrawGameUI = true; 64 viewparams->bRedrawGameUI = true;
65 pMouse->RemoveHoldingItem(); 65 pMouse->RemoveHoldingItem();
66 return; 66 return;
67 } 67 }
68 68
1967 } 1967 }
1968 } 1968 }
1969 uLastPointedObjectID = pMouse->uPointingObjectID; 1969 uLastPointedObjectID = pMouse->uPointingObjectID;
1970 return; 1970 return;
1971 } 1971 }
1972 pItemGen = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItems[v14-1]; 1972 pItemGen = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[v14-1];
1973 //goto LABEL_49; 1973 //goto LABEL_49;
1974 v17 = pItemGen->GetDisplayName(); 1974 v17 = pItemGen->GetDisplayName();
1975 GameUI_SetFooterString(v17); 1975 GameUI_SetFooterString(v17);
1976 uLastPointedObjectID = 1; 1976 uLastPointedObjectID = 1;
1977 if ( pMouse->uPointingObjectID == 0 ) 1977 if ( pMouse->uPointingObjectID == 0 )