Mercurial > mm7
diff Render.cpp @ 712:e7c86528a2b3
Merge
author | Gloval |
---|---|
date | Thu, 21 Mar 2013 23:11:54 +0400 |
parents | 735dab8d3c9a |
children | 9d13d2ec35a6 da130dd3092a |
line wrap: on
line diff
--- a/Render.cpp Thu Mar 21 23:10:57 2013 +0400 +++ b/Render.cpp Thu Mar 21 23:11:54 2013 +0400 @@ -841,7 +841,7 @@ v16 = v42 + ((unsigned __int64)(v3->ptr_38->field_10 * (signed __int64)v10) >> 16); v17 = v40 + ((unsigned __int64)(v3->ptr_38->field_1C * (signed __int64)v10) >> 16); v18 = v15 / v52; - v43 = v3->pTexture->pLevelOfDetail0; + v43 = v3->pTexture->pLevelOfDetail0_prolly_alpha_mask; v19 = v3->sTextureDeltaU + ((signed int)((unsigned __int64)(v16 * v15 / v52) >> 16) >> 3); v56 = v15 / v52; v20 = v3->sTextureDeltaV + ((signed int)((unsigned __int64)(v17 * v15 / v52) >> 16) >> 3); @@ -9662,7 +9662,7 @@ if ( this->uNumSceneBegins && a4 && a4->pPalette16 ) { v4 = &this->pTargetSurface[a2 + a3 * this->uTargetSurfacePitch]; - v20 = a4->pLevelOfDetail0; + v20 = a4->pLevelOfDetail0_prolly_alpha_mask; v5 = a4->uTextureWidth; v6 = a4->uTextureHeight; v19 = a4->uTextureWidth; @@ -10131,7 +10131,7 @@ { v5 = pTexture->uTextureHeight; v6 = &this->pTargetSurface[a2 + a3 * this->uTargetSurfacePitch]; - v19 = pTexture->pLevelOfDetail0; + v19 = pTexture->pLevelOfDetail0_prolly_alpha_mask; v20 = pTexture->uTextureWidth; v18 = pTexture->uTextureWidth; if ( this->bClip ) @@ -10241,7 +10241,7 @@ { v5 = a4->uTextureHeight; v6 = &this->pTargetSurface[a2 + a3 * this->uTargetSurfacePitch]; - v19 = a4->pLevelOfDetail0; + v19 = a4->pLevelOfDetail0_prolly_alpha_mask; v20 = a4->uTextureWidth; v18 = a4->uTextureWidth; if ( this->bClip ) @@ -10344,7 +10344,7 @@ if ( this->uNumSceneBegins && a4 && a4->pPalette16 && a5 && a5->pPalette16 ) { v8 = &this->pTargetSurface[x + y * this->uTargetSurfacePitch]; - v24 = a4->pLevelOfDetail0; + v24 = a4->pLevelOfDetail0_prolly_alpha_mask; v27 = a4->uTextureWidth; v9 = a4->uTextureHeight; v22 = a4->uTextureWidth; @@ -10462,7 +10462,7 @@ if ( a5->pPalette16 ) { v10 = &this->pTargetSurface[a2 + a3 * this->uTargetSurfacePitch]; - v28 = a4->pLevelOfDetail0; + v28 = a4->pLevelOfDetail0_prolly_alpha_mask; v25 = v8->uTextureWidth; v24 = v8->uTextureHeight; v22 = v8->uTextureWidth; @@ -10518,7 +10518,7 @@ { if ( *v28 ) { - v20 = *(&v9->pLevelOfDetail0[i & v9->uWidthMinus1] + v9->uTextureWidth * (v27 & v9->uHeightMinus1)); + v20 = *(&v9->pLevelOfDetail0_prolly_alpha_mask[i & v9->uWidthMinus1] + v9->uTextureWidth * (v27 & v9->uHeightMinus1)); if ( v20 >= a7 ) { if ( v20 <= a8 ) @@ -10581,7 +10581,7 @@ { uHeight = pTexture->uTextureHeight; v6 = &this->pTargetSurface[uX + uY * this->uTargetSurfacePitch]; - v19 = pTexture->pLevelOfDetail0; + v19 = pTexture->pLevelOfDetail0_prolly_alpha_mask; uWidth = pTexture->uTextureWidth; v18 = pTexture->uTextureWidth; if ( this->bClip ) @@ -10658,7 +10658,7 @@ //----- (004A612A) -------------------------------------------------------- -void Render::_4A612A(signed int uOutX, unsigned int uOutY, Texture *pTexture, int zVal) +void Render::DrawMaskToZBuffer(signed int uOutX, unsigned int uOutY, Texture *pTexture, int zVal) { Texture *v5; // eax@2 unsigned int v6; // edx@3 @@ -10688,7 +10688,7 @@ v6 = uOutY; v7 = pTexture->uTextureHeight; pZBuffer = &this->pActiveZBuffer[uOutX + 640 * uOutY]; - uOutYa = v5->pLevelOfDetail0; + uOutYa = v5->pLevelOfDetail0_prolly_alpha_mask; v8 = v5->uTextureWidth; v20 = v5->uTextureWidth; v19 = v5->uTextureWidth; @@ -10877,7 +10877,7 @@ { v5 = a4->uTextureHeight; pTarget = &this->pTargetSurface[uX + uY * this->uTargetSurfacePitch]; - v19 = a4->pLevelOfDetail0; + v19 = a4->pLevelOfDetail0_prolly_alpha_mask; v20 = a4->uTextureWidth; v18 = a4->uTextureWidth; if ( this->bClip )