Mercurial > mm7
diff Party.cpp @ 1721:1c072d19e397
Слияние
author | Ritor1 |
---|---|
date | Wed, 25 Sep 2013 09:03:56 +0600 |
parents | 8251e59fd7c1 |
children | cecb080929c4 |
line wrap: on
line diff
--- a/Party.cpp Wed Sep 25 08:59:01 2013 +0600 +++ b/Party.cpp Wed Sep 25 09:03:56 2013 +0600 @@ -1422,7 +1422,7 @@ if ( !pParty->pPickedItem.uItemID ) return 1; v0 = pIcons_LOD->LoadTexture( - pItemsTable->pItems[pParty->pPickedItem.uItemID].pIconName, + pParty->pPickedItem.GetIconName(), TEXTURE_16BIT_PALETTE); v1 = pIcons_LOD->GetTexture(v0); v11 = areWeLoadingTexture;