Mercurial > mm7
comparison mm7_5.cpp @ 359:57d81602e72c
Слияние
author | Ritor1 |
---|---|
date | Thu, 21 Feb 2013 17:24:15 +0600 |
parents | 4a236657a0be b07cf89108d5 |
children | 38bfbee60146 2bc1c8d68f41 |
comparison
equal
deleted
inserted
replaced
358:4a236657a0be | 359:57d81602e72c |
---|---|
13667 v23 = dword_506408[v4]; | 13667 v23 = dword_506408[v4]; |
13668 v6 = v5; | 13668 v6 = v5; |
13669 } | 13669 } |
13670 if ( v6->pLevelOfDetail0 ) | 13670 if ( v6->pLevelOfDetail0 ) |
13671 { | 13671 { |
13672 v7 = 2 * (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]); | 13672 v7 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]); |
13673 v19 = pViewport->uViewportY + dword_4E20D0[v7 + 1]; | 13673 v19 = pViewport->uViewportY + pIconPos[v7].Ypos; |
13674 v17 = pViewport->uViewportX + dword_4E20D0[v7]; | 13674 v17 = pViewport->uViewportX + pIconPos[v7].Xpos; |
13675 if ( BYTE1(v6->pBits) & 2 ) | 13675 if ( BYTE1(v6->pBits) & 2 ) |
13676 pRenderer->DrawTextureTransparent(v17, v19, v6); | 13676 pRenderer->DrawTextureTransparent(v17, v19, v6); |
13677 else | 13677 else |
13678 pRenderer->DrawTextureIndexed(v17, v19, v6); | 13678 pRenderer->DrawTextureIndexed(v17, v19, v6); |
13679 v8 = 2 * (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]); | 13679 v8 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]); |
13680 pRenderer->_4A612A(dword_4E20D0[v8], dword_4E20D0[v8 + 1], v23, v4); | 13680 pRenderer->_4A612A(pIconPos[v8].Xpos,pIconPos[v8].Ypos, v23, v4); |
13681 } | 13681 } |
13682 } | 13682 } |
13683 } | 13683 } |
13684 ++v4; | 13684 ++v4; |
13685 } | 13685 } |
13691 { | 13691 { |
13692 v11 = dword_5063D8[v10]; | 13692 v11 = dword_5063D8[v10]; |
13693 if ( v11->pLevelOfDetail0 ) | 13693 if ( v11->pLevelOfDetail0 ) |
13694 { | 13694 { |
13695 v21 = dword_5063D8[v10]; | 13695 v21 = dword_5063D8[v10]; |
13696 v12 = 2 * (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]); | 13696 v12 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]); |
13697 v20 = pViewport->uViewportY + dword_4E20D0[v12 + 1]; | 13697 v20 = pViewport->uViewportY + pIconPos[v12].Ypos; |
13698 v18 = pViewport->uViewportX + dword_4E20D0[v12]; | 13698 v18 = pViewport->uViewportX + pIconPos[v12].Xpos; |
13699 if ( BYTE1(v11->pBits) & 2 ) | 13699 if ( BYTE1(v11->pBits) & 2 ) |
13700 pRenderer->DrawTextureTransparent(v18, v20, v21); | 13700 pRenderer->DrawTextureTransparent(v18, v20, v21); |
13701 else | 13701 else |
13702 pRenderer->DrawTextureIndexed(v18, v20, v21); | 13702 pRenderer->DrawTextureIndexed(v18, v20, v21); |
13703 } | 13703 } |