Mercurial > mm7

changeset 99:b7ff791b1333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spells tab fix, small fixes
author zipi
date Thu, 07 Feb 2013 21:02:19 +0000
parents b9196a36b7c9
children 81e93310f73c
files GUIWindow.cpp mm7_4.cpp mm7_5.cpp
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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);
   }
 }
--- 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;
       }
--- 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);