comparison UIBooks.cpp @ 977:ac85898f5903

Слияние
author Ritor1
date Thu, 09 May 2013 01:33:54 +0600
parents ec7568e13b24
children a6ef7125f6e4
comparison
equal deleted inserted replaced
976:15c6b80caa3a 977:ac85898f5903
206 206
207 sub_412AF9(); 207 sub_412AF9();
208 v0 = pPlayers[uActiveCharacter]; 208 v0 = pPlayers[uActiveCharacter];
209 v1 = 11 * v0->lastOpenedSpellbookPage; 209 v1 = 11 * v0->lastOpenedSpellbookPage;
210 v2 = pIcons_LOD->FindTextureByName("Pending"); 210 v2 = pIcons_LOD->FindTextureByName("Pending");
211 v3 = (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0); 211 v3 = pIcons_LOD->GetTexture(v2);
212 pRenderer->ClearZBuffer(0, 479); 212 pRenderer->ClearZBuffer(0, 479);
213 v4 = 1; 213 v4 = 1;
214 if ( __OFSUB__(v1, v1 + 11) ^ 1 ) 214 if ( __OFSUB__(v1, v1 + 11) ^ 1 )
215 { 215 {
216 do 216 do
1377 v50 = v73; 1377 v50 = v73;
1378 } 1378 }
1379 else 1379 else
1380 v50 = 1; 1380 v50 = 1;
1381 } 1381 }
1382 pRenderer->DrawTransparentRedShade(v47, v49, (Texture *)(pTextureIDs_pMapDirs[v50] != -1 ? (int)&pIcons_LOD->pTextures[pTextureIDs_pMapDirs[v50]] : 0)); 1382 pRenderer->DrawTransparentRedShade(v47, v49, pIcons_LOD->GetTexture(pTextureIDs_pMapDirs[v50]));
1383 } 1383 }
1384 result = TargetColor(0xFFu, 0xFFu, 0xFFu); 1384 result = TargetColor(0xFFu, 0xFFu, 0xFFu);
1385 v95 = 0; 1385 v95 = 0;
1386 v86 = result; 1386 v86 = result;
1387 if ( (signed int)uNumLevelDecorations > 0 ) 1387 if ( (signed int)uNumLevelDecorations > 0 )