comparison UI/UIShops.cpp @ 1477:7ef4b64f6329

* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load Added support for most of mm6 resources, placeholders for mm8 resources. Fixed few C4258
author Nomad
date Wed, 28 Aug 2013 18:43:07 +0200
parents ec79ee6d44ce
children 61458df2cb4f
comparison
equal deleted inserted replaced
1475:d7720c1f1d3b 1477:7ef4b64f6329
2481 else 2481 else
2482 bought_item = &pParty->SpecialItemsInShops[(int)window_SpeakInHouse->ptr_1C][v18 - 1];//(ItemGen *)&pParty->field_C59C[v31 + 724]; 2482 bought_item = &pParty->SpecialItemsInShops[(int)window_SpeakInHouse->ptr_1C][v18 - 1];//(ItemGen *)&pParty->field_C59C[v31 + 724];
2483 uPriceItemService = pPlayers[uActiveCharacter]->GetBuyingPrice(bought_item->GetValue(), p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier); 2483 uPriceItemService = pPlayers[uActiveCharacter]->GetBuyingPrice(bought_item->GetValue(), p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier);
2484 uNumSeconds = 0; 2484 uNumSeconds = 0;
2485 a3 = 0; 2485 a3 = 0;
2486 if ( pMapStats->GetMapInfo(pCurrentMapName.data()) ) 2486 if ( pMapStats->GetMapInfo(pCurrentMapName) )
2487 a3 = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName.data())]._steal_perm; 2487 a3 = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)]._steal_perm;
2488 party_reputation = GetPartyReputation(); 2488 party_reputation = GetPartyReputation();
2489 if (pPlayers[uActiveCharacter]->CanSteal()) 2489 if (pPlayers[uActiveCharacter]->CanSteal())
2490 { 2490 {
2491 if ( GetAsyncKeyState(VK_CONTROL) ) 2491 if ( GetAsyncKeyState(VK_CONTROL) )
2492 { 2492 {