Mercurial > mm7

comparison UI/UIHouses.cpp @ 1709:8251e59fd7c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens
author Grumpy7
date Tue, 24 Sep 2013 07:29:55 +0200
parents 4bbb80c7dba7
children 1776d4f033a7 cecb080929c4
comparison
equal deleted inserted replaced
1708:f8414042db1f 1709:8251e59fd7c1
1095 { 1095 {
1096 for ( uint i = 0; i < 12; ++i ) 1096 for ( uint i = 0; i < 12; ++i )
1097 { 1097 {
1098 if ( pParty->SpellBooksInGuilds[v8->par1C-139][i].uItemID ) 1098 if ( pParty->SpellBooksInGuilds[v8->par1C-139][i].uItemID )
1099 { 1099 {
1100 v34 = pIcons_LOD->LoadTexture(pItemsTable->pItems[pParty->SpellBooksInGuilds[v8->par1C-139][i].uItemID].pIconName, TEXTURE_16BIT_PALETTE); 1100 v34 = pIcons_LOD->LoadTexture(pParty->SpellBooksInGuilds[v8->par1C-139][i].GetIconName(), TEXTURE_16BIT_PALETTE);
1101 v8 = window_SpeakInHouse; 1101 v8 = window_SpeakInHouse;
1102 ItemsInShopTexture[i] = &pIcons_LOD->pTextures[v34]; 1102 ItemsInShopTexture[i] = &pIcons_LOD->pTextures[v34];
1103 } 1103 }
1104 } 1104 }
1105 } 1105 }
1615 { 1615 {
1616 for ( v43 = 0; v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++v43 ) 1616 for ( v43 = 0; v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++v43 )
1617 { 1617 {
1618 if ( pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].uItemID ) 1618 if ( pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].uItemID )
1619 { 1619 {
1620 v46 = pIcons_LOD->LoadTexture(pItemsTable->pItems[pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].uItemID].pIconName, TEXTURE_16BIT_PALETTE); 1620 v46 = pIcons_LOD->LoadTexture(pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].GetIconName(), TEXTURE_16BIT_PALETTE);
1621 ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v46]; 1621 ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v46];
1622 } 1622 }
1623 } 1623 }
1624 } 1624 }
1625 if ( in_current_building_type == BuildingType_WeaponShop ) 1625 if ( in_current_building_type == BuildingType_WeaponShop )
1643 { 1643 {
1644 for ( v43 = 0; v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++v43 ) 1644 for ( v43 = 0; v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++v43 )
1645 { 1645 {
1646 if ( pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].uItemID ) 1646 if ( pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].uItemID )
1647 { 1647 {
1648 v51 = pIcons_LOD->LoadTexture(pItemsTable->pItems[pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].uItemID].pIconName, TEXTURE_16BIT_PALETTE); 1648 v51 = pIcons_LOD->LoadTexture(pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].GetIconName(), TEXTURE_16BIT_PALETTE);
1649 ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v51]; 1649 ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v51];
1650 } 1650 }
1651 } 1651 }
1652 } 1652 }
1653 if ( in_current_building_type == BuildingType_WeaponShop ) 1653 if ( in_current_building_type == BuildingType_WeaponShop )