Mercurial > mm7
comparison UI/Books/UISpellBook.cpp @ 1397:eb02a65e5c82
Quick Spell fixed.
Removed CShow, ThreadWard structures.
author | Nomad |
---|---|
date | Fri, 19 Jul 2013 09:42:03 +0200 |
parents | 16036e3e2642 |
children | 3161094869e0 |
comparison
equal
deleted
inserted
replaced
1396:e6908823897f | 1397:eb02a65e5c82 |
---|---|
108 int v4; // esi@1 | 108 int v4; // esi@1 |
109 Texture *v5; // eax@3 | 109 Texture *v5; // eax@3 |
110 Texture *v6; // edx@5 | 110 Texture *v6; // edx@5 |
111 int v7; // eax@8 | 111 int v7; // eax@8 |
112 int v8; // eax@11 | 112 int v8; // eax@11 |
113 POINT *v9; // esi@13 | 113 //POINT *v9; // esi@13 |
114 int v10; // eax@13 | 114 int v10; // eax@13 |
115 Texture *v11; // edx@14 | 115 Texture *v11; // edx@14 |
116 int v12; // eax@15 | 116 int v12; // eax@15 |
117 signed int v13; // ecx@18 | 117 signed int v13; // ecx@18 |
118 unsigned int v14; // esi@18 | 118 unsigned int v14; // esi@18 |
124 unsigned int v20; // [sp-8h] [bp-28h]@15 | 124 unsigned int v20; // [sp-8h] [bp-28h]@15 |
125 Texture *v21; // [sp-4h] [bp-24h]@15 | 125 Texture *v21; // [sp-4h] [bp-24h]@15 |
126 signed int v22; // [sp-4h] [bp-24h]@22 | 126 signed int v22; // [sp-4h] [bp-24h]@22 |
127 Texture *v23; // [sp+10h] [bp-10h]@5 | 127 Texture *v23; // [sp+10h] [bp-10h]@5 |
128 POINT a2; // [sp+18h] [bp-8h]@13 | 128 POINT a2; // [sp+18h] [bp-8h]@13 |
129 POINT v24; | 129 //POINT v24; |
130 int v25; | 130 int v25; |
131 | 131 |
132 static unsigned int texture_tab_coord1[9][2]= | 132 static unsigned int texture_tab_coord1[9][2]= |
133 {{406, 9}, {406, 46}, {406, 84}, {406,121}, {407,158}, {405, 196}, {405, 234}, {405, 272}, {405,309} }; | 133 {{406, 9}, {406, 46}, {406, 84}, {406,121}, {407,158}, {405, 196}, {405, 234}, {405, 272}, {405,309} }; |
134 | 134 |
141 v1 = 11 * player->lastOpenedSpellbookPage; | 141 v1 = 11 * player->lastOpenedSpellbookPage; |
142 //v2 = pIcons_LOD->FindTextureByName("Pending"); | 142 //v2 = pIcons_LOD->FindTextureByName("Pending"); |
143 v3 = pIcons_LOD->GetTexture(pIcons_LOD->FindTextureByName("Pending")); | 143 v3 = pIcons_LOD->GetTexture(pIcons_LOD->FindTextureByName("Pending")); |
144 pRenderer->ClearZBuffer(0, 479); | 144 pRenderer->ClearZBuffer(0, 479); |
145 v4 = 1; | 145 v4 = 1; |
146 if ( __OFSUB__(v1, v1 + 11) ^ 1 ) | 146 //if ( __OFSUB__(v1, v1 + 11) ^ 1 ) |
147 { | 147 { |
148 do | 148 do |
149 { | 149 { |
150 if ( *(&player->_guilds_member_bits[v1 + 63] + v4) ) | 150 if (player->_guilds_member_bits[v1 + v4 + 63] ) |
151 { | 151 { |
152 v5 = (Texture *)dword_506408[v4]; | 152 v5 = (Texture *)dword_506408[v4]; |
153 if ( v5 != v3 ) | 153 if ( v5 != v3 ) |
154 { | 154 { |
155 if ( quick_spell_at_page == v4 ) | 155 if ( quick_spell_at_page == v4 ) |
180 ++v4; | 180 ++v4; |
181 } | 181 } |
182 while ( v4 - 1 < 11 ); | 182 while ( v4 - 1 < 11 ); |
183 } | 183 } |
184 | 184 |
185 v9 = pMouse->GetCursorPos(&a2); | 185 /*v9 = */pMouse->GetCursorPos(&a2); |
186 v10 = pRenderer->pActiveZBuffer[v9->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v24)->y]] & 0xFFFF; | 186 v10 = pRenderer->pActiveZBuffer[a2.x + pSRZBufferLineOffsets[a2.y]] & 0xFFFF; |
187 if ( v10 ) | 187 if ( v10 ) |
188 { | 188 { |
189 v11 = dword_5063D8[v10]; | 189 v11 = dword_5063D8[v10]; |
190 if ( v11->pLevelOfDetail0_prolly_alpha_mask ) | 190 if ( v11->pLevelOfDetail0_prolly_alpha_mask ) |
191 { | 191 { |
192 v21 = dword_5063D8[v10]; | 192 v21 = dword_5063D8[v10]; |
193 v12 = player->lastOpenedSpellbookPage; | 193 v12 = player->lastOpenedSpellbookPage; |
194 // v12 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]); | 194 // v12 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]); |
195 v20 = pViewport->uViewportTL_Y + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Ypos; | 195 v20 = pViewport->uViewportTL_Y + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Ypos; |
196 v18 = pViewport->uViewportTL_X + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Xpos; | 196 v18 = pViewport->uViewportTL_X + pIconPos[v12][pSpellbookSpellIndices[v12][v10]].Xpos; |
197 if ( BYTE1(v11->pBits) & 2 ) | 197 if ( BYTE1(v11->pBits) & 2 ) |
198 pRenderer->DrawTextureTransparent(v18, v20, v21); | 198 pRenderer->DrawTextureTransparent(v18, v20, v21); |
199 else | 199 else |
200 pRenderer->DrawTextureIndexed(v18, v20, v21); | 200 pRenderer->DrawTextureIndexed(v18, v20, v21); |
201 } | 201 } |