Mercurial > mm7

comparison UI/UIShops.cpp @ 1827:0c75c3e7e436

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
author Grumpy7
date Fri, 11 Oct 2013 05:49:39 +0200
parents 24e756a50073
children 211dfe2d8db1
comparison
equal deleted inserted replaced
1826:bdac32c645c5 1827:0c75c3e7e436
1647 uPriceItemService = pPlayers[uActiveCharacter]->GetBuyingPrice(bought_item->GetValue(), p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier); 1647 uPriceItemService = pPlayers[uActiveCharacter]->GetBuyingPrice(bought_item->GetValue(), p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier);
1648 uNumSeconds = 0; 1648 uNumSeconds = 0;
1649 a3 = 0; 1649 a3 = 0;
1650 if ( pMapStats->GetMapInfo(pCurrentMapName) ) 1650 if ( pMapStats->GetMapInfo(pCurrentMapName) )
1651 a3 = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)]._steal_perm; 1651 a3 = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)]._steal_perm;
1652 party_reputation = GetPartyReputation(); 1652 party_reputation = pParty->GetPartyReputation();
1653 if (pPlayers[uActiveCharacter]->CanSteal()) 1653 if (pPlayers[uActiveCharacter]->CanSteal())
1654 { 1654 {
1655 if ( GetAsyncKeyState(VK_CONTROL) ) 1655 if ( GetAsyncKeyState(VK_CONTROL) )
1656 { 1656 {
1657 uNumSeconds = pPlayers[uActiveCharacter]->StealFromShop(bought_item, a3, party_reputation, 0, &a6); 1657 uNumSeconds = pPlayers[uActiveCharacter]->StealFromShop(bought_item, a3, party_reputation, 0, &a6);