diff Render.cpp @ 726:9d13d2ec35a6

Слияние
author Ritor1
date Fri, 22 Mar 2013 01:29:46 +0600
parents 737d7fec67f0 735dab8d3c9a
children 9f596a163257
line wrap: on
line diff
--- a/Render.cpp	Fri Mar 22 01:29:25 2013 +0600
+++ b/Render.cpp	Fri Mar 22 01:29:46 2013 +0600
@@ -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);
@@ -9664,7 +9664,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;
@@ -10133,7 +10133,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 )
@@ -10243,7 +10243,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 )
@@ -10346,7 +10346,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;
@@ -10464,7 +10464,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;
@@ -10520,7 +10520,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 )
@@ -10583,7 +10583,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 )
@@ -10660,7 +10660,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
@@ -10690,7 +10690,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;
@@ -10879,7 +10879,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 )