# HG changeset patch # User zipi # Date 1360270939 0 # Node ID b7ff791b13337a3512327234f2be9d9f6c55c9e7 # Parent b9196a36b7c969155f04bba54c5ebba930c843d4 spells tab fix, small fixes diff -r b9196a36b7c9 -r b7ff791b1333 GUIWindow.cpp --- a/GUIWindow.cpp Thu Feb 07 15:25:44 2013 +0600 +++ b/GUIWindow.cpp Thu Feb 07 21:02:19 2013 +0000 @@ -906,9 +906,9 @@ { pTextures_5064A0[i] = pIcons_LOD->LoadTexturePtr(texNames[i], TEXTURE_16BIT_PALETTE); - sprintf(pTmpBuf, "tab%da", i); + sprintf(pTmpBuf, "tab%da", i+1); pTextures_tabs[i][0] = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE); - sprintf(pTmpBuf, "tab%db", i); + sprintf(pTmpBuf, "tab%db", i+1); pTextures_tabs[i][1] = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE); } } diff -r b9196a36b7c9 -r b7ff791b1333 mm7_4.cpp --- a/mm7_4.cpp Thu Feb 07 15:25:44 2013 +0600 +++ b/mm7_4.cpp Thu Feb 07 21:02:19 2013 +0000 @@ -3950,8 +3950,8 @@ while ( 1 ) { if ( pPlayers[v12]->WearsItem(516, 3) - || v13->HasEnchantedItemEquipped(71) - || (signed __int64)v13->pPlayerBuffs[23].uExpireTime > 0 ) + || pPlayers[v12]->HasEnchantedItemEquipped(71) + || pPlayers[v12]->pPlayerBuffs[23].uExpireTime > 0 ) { v58 = 0; } diff -r b9196a36b7c9 -r b7ff791b1333 mm7_5.cpp --- a/mm7_5.cpp Thu Feb 07 15:25:44 2013 +0600 +++ b/mm7_5.cpp Thu Feb 07 21:02:19 2013 +0000 @@ -13284,7 +13284,7 @@ v0 = 0; if ( uActiveCharacter ) - v0 = *((char *)&pParty->pPartyBuffs[5].uExpireTime + 6972 * uActiveCharacter + 2); + v0 = pParty->pPlayers[uActiveCharacter-1].pNumSpellBookPage;//*((char *)&pParty->pPartyBuffs[5].uExpireTime + 6972 * uActiveCharacter + 2); pRenderer->DrawTextureIndexed(8u, 8u, pTextures_5064A0[v0]); pRenderer->DrawTextureIndexed(0x1DCu, 0x1C2u, pTexture_50643C); pRenderer->DrawTextureIndexed(0x231u, 0x1C2u, pTexture_506448);