Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Mon Sep 23 07:07:06 2013 +0200
+++ b/UI/UIHouses.cpp	Tue Sep 24 07:29:55 2013 +0200
@@ -1097,7 +1097,7 @@
         {
           if ( pParty->SpellBooksInGuilds[v8->par1C-139][i].uItemID )
           {
-            v34 = pIcons_LOD->LoadTexture(pItemsTable->pItems[pParty->SpellBooksInGuilds[v8->par1C-139][i].uItemID].pIconName, TEXTURE_16BIT_PALETTE);
+            v34 = pIcons_LOD->LoadTexture(pParty->SpellBooksInGuilds[v8->par1C-139][i].GetIconName(), TEXTURE_16BIT_PALETTE);
             v8 = window_SpeakInHouse;
             ItemsInShopTexture[i] = &pIcons_LOD->pTextures[v34];
           }
@@ -1617,7 +1617,7 @@
           {
             if ( pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].uItemID )
             {
-              v46 = pIcons_LOD->LoadTexture(pItemsTable->pItems[pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].uItemID].pIconName, TEXTURE_16BIT_PALETTE);
+              v46 = pIcons_LOD->LoadTexture(pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].GetIconName(), TEXTURE_16BIT_PALETTE);
               ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v46];
             }
           }
@@ -1645,7 +1645,7 @@
             {
               if ( pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].uItemID )
               {
-                v51 = pIcons_LOD->LoadTexture(pItemsTable->pItems[pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].uItemID].pIconName, TEXTURE_16BIT_PALETTE);
+                v51 = pIcons_LOD->LoadTexture(pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].GetIconName(), TEXTURE_16BIT_PALETTE);
                 ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v51];
               }
             }