Mercurial > mm7

diff UI/Books/UISpellBook.cpp @ 1397:eb02a65e5c82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Quick Spell fixed. Removed CShow, ThreadWard structures.
author Nomad
date Fri, 19 Jul 2013 09:42:03 +0200
parents 16036e3e2642
children 3161094869e0
line wrap: on
line diff
--- a/UI/Books/UISpellBook.cpp	Thu Jul 18 17:29:20 2013 +0200
+++ b/UI/Books/UISpellBook.cpp	Fri Jul 19 09:42:03 2013 +0200
@@ -110,7 +110,7 @@
   Texture *v6; // edx@5
   int v7; // eax@8
   int v8; // eax@11
-  POINT *v9; // esi@13
+  //POINT *v9; // esi@13
   int v10; // eax@13
   Texture *v11; // edx@14
   int v12; // eax@15
@@ -126,7 +126,7 @@
   signed int v22; // [sp-4h] [bp-24h]@22
   Texture *v23; // [sp+10h] [bp-10h]@5
   POINT a2; // [sp+18h] [bp-8h]@13
-  POINT v24;
+  //POINT v24;
   int v25;
 
   static unsigned int texture_tab_coord1[9][2]=
@@ -143,11 +143,11 @@
   v3 = pIcons_LOD->GetTexture(pIcons_LOD->FindTextureByName("Pending"));
   pRenderer->ClearZBuffer(0, 479);
   v4 = 1;
-  if ( __OFSUB__(v1, v1 + 11) ^ 1 )
+  //if ( __OFSUB__(v1, v1 + 11) ^ 1 )
   {
     do
     {
-      if ( *(&player->_guilds_member_bits[v1 + 63] + v4) )
+      if (player->_guilds_member_bits[v1 + v4 + 63] )
       {
         v5 = (Texture *)dword_506408[v4];
         if ( v5 != v3 )
@@ -182,8 +182,8 @@
     while ( v4 - 1 < 11 );
   }
 
-  v9 = pMouse->GetCursorPos(&a2);
-  v10 = pRenderer->pActiveZBuffer[v9->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v24)->y]] & 0xFFFF;
+  /*v9 = */pMouse->GetCursorPos(&a2);
+  v10 = pRenderer->pActiveZBuffer[a2.x + pSRZBufferLineOffsets[a2.y]] & 0xFFFF;
   if ( v10 )
   {
     v11 = dword_5063D8[v10];
@@ -192,8 +192,8 @@
       v21 = dword_5063D8[v10];
 	  v12 = player->lastOpenedSpellbookPage;
     //  v12 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]);
-      v20 = pViewport->uViewportTL_Y +  pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Ypos;
-      v18 = pViewport->uViewportTL_X +  pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Xpos;
+      v20 = pViewport->uViewportTL_Y + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Ypos;
+      v18 = pViewport->uViewportTL_X + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Xpos;
       if ( BYTE1(v11->pBits) & 2 )
         pRenderer->DrawTextureTransparent(v18, v20, v21);
       else