Mercurial > mm7
changeset 320:0b2af9c5f70f
Merge
| author | Nomad |
|---|---|
| date | Wed, 20 Feb 2013 02:56:46 +0200 |
| parents | 5a66be213cff (current diff) 981fbe2da232 (diff) |
| children | 15decc249a94 |
| files | mm7_5.cpp mm7_data.h |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Player.cpp Wed Feb 20 02:53:37 2013 +0200 +++ b/Player.cpp Wed Feb 20 02:56:46 2013 +0200 @@ -7542,7 +7542,7 @@ goto LABEL_92; } v15 = pParty->pPickedItem.uItemID - 400; - v72 = (char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2; + v72 = (char *)&v3->spellbook.pFireSpellbook+pParty->pPickedItem.uItemID-400;//(char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2; if ( *v72 ) { v66 = pParty->pPickedItem.GetDisplayName();
--- a/mm7_5.cpp Wed Feb 20 02:53:37 2013 +0200 +++ b/mm7_5.cpp Wed Feb 20 02:56:46 2013 +0200 @@ -13544,10 +13544,10 @@ { if (v11[i]) { - sprintf(pContainer, "SB%sS%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]); + sprintf(pContainer, "SB%cS%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]); dword_506408[i] = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE); - sprintf(pContainer, "SB%sC%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]); + sprintf(pContainer, "SB%cC%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]); dword_5063D8[i] = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE); } }
--- a/mm7_data.h Wed Feb 20 02:53:37 2013 +0200 +++ b/mm7_data.h Wed Feb 20 02:56:46 2013 +0200 @@ -366,7 +366,7 @@ extern char aPending[]; // idb extern char aCanTFindS[]; // idb extern char pDayMoonPhase[28]; -extern char *spellbook_texture_filename_suffices[8]; // weak +extern char spellbook_texture_filename_suffices[9]; // weak extern __int16 word_4E1D3A[]; // weak extern __int16 pTownPortalBook_xs[6]; extern __int16 pTownPortalBook_ys[6];