Mercurial > mm7

comparison UI/UIShops.cpp @ 1982:2647e2f820a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 01 Nov 2013 14:44:06 +0600
parents c1c74df0a33e
children 259df09dfb50
comparison
equal deleted inserted replaced
1981:d9ea00250e2e 1982:2647e2f820a6
1600 pItemID = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v79); 1600 pItemID = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v79);
1601 if ( pItemID ) 1601 if ( pItemID )
1602 { 1602 {
1603 item = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1]; 1603 item = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1];
1604 pPriceMultiplier = p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier; 1604 pPriceMultiplier = p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier;
1605 auto _v = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1]; 1605 ItemGen* _v = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1];
1606 uPriceItemService = pPlayers[uActiveCharacter]->GetPriceRepair(_v->GetValue(), pPriceMultiplier); 1606 uPriceItemService = pPlayers[uActiveCharacter]->GetPriceRepair(_v->GetValue(), pPriceMultiplier);
1607 if ( item->uAttributes & 2 ) 1607 if ( item->uAttributes & 2 )
1608 { 1608 {
1609 if ( MerchandiseTest(item, (int)window_SpeakInHouse->ptr_1C) ) 1609 if ( MerchandiseTest(item, (int)window_SpeakInHouse->ptr_1C) )
1610 { 1610 {