diff Render.cpp @ 107:23b213c3f8e1

Слияние
author Ritor1
date Fri, 08 Feb 2013 18:34:09 +0600
parents efece1632349 2fb33d31ca0d
children 3471df3713e2 c70fea5013aa
line wrap: on
line diff
--- a/Render.cpp	Fri Feb 08 18:33:54 2013 +0600
+++ b/Render.cpp	Fri Feb 08 18:34:09 2013 +0600
@@ -1026,7 +1026,7 @@
   int v125; // [sp+6Ch] [bp-8h]@9
   int v126; // [sp+70h] [bp-4h]@9
 
-  v105 = pIndoorCamera->sRotationY / ((signed int)stru_5C6E00->uIntegerHalfPi / 2);
+  v105 = pIndoorCamera->sRotationY / ((signed int)stru_5C6E00->uIntegerHalfPi / 2);//2
   pDirectionIndicator1 = stru_5C6E00->uDoublePiMask & (stru_5C6E00->uIntegerDoublePi - pIndoorCamera->sRotationY);//1536
   pDirectionIndicator2 = stru_5C6E00->uDoublePiMask & (stru_5C6E00->uIntegerPi + pDirectionIndicator1);//512
   v124 = ((pIndoorCamera->uMapGridCellX << 16) + 3 * stru_5C6E00->SinCos(stru_5C6E00->uDoublePiMask & (stru_5C6E00->uIntegerPi + pDirectionIndicator1))) >> 16;
@@ -2047,12 +2047,12 @@
           if ( pOutdoorCamera->numStru148s >= 1999 )
             return;
           ++pOutdoorCamera->numStru148s;
-          if ( !sub_481FC9(v8, pVertices, v101, v16) )
+          //if ( !sub_481FC9(v8, pVertices, v101, v16) )//Ritor1: It's temporary
           //goto LABEL_126;
-          {
-            --pOutdoorCamera->numStru148s;
-            goto LABEL_162;
-          }
+          //{
+            //--pOutdoorCamera->numStru148s;
+            //goto LABEL_162;
+          //}
           memcpy(&array_50AC10[0], v102, 0x30u);
           array_50AC10[0].flt_20 = 1.0 / (v102->vWorldViewPosition.x + 0.0000001000000011686097);
           array_50AC10[0].u = 0.0;
@@ -11333,12 +11333,12 @@
 
   for (uint i = pRenderer->uNumBillboardsToDraw - 1; i != (uint)-1; --i)
   {
-    auto p = pRenderer->pBillboardRenderListD3D + i;
+    auto p = &pRenderer->pBillboardRenderListD3D[i];
 
     if (p->uOpacity != RenderBillboardD3D::InvalidOpacity)
       SetBillboardBlendOptions(p->uOpacity);
     
-    ErrD3D(pRenderer->pRenderD3D->pDevice->SetTexture(0, p->pTexture));
+    pRenderer->pRenderD3D->pDevice->SetTexture(0, p->pTexture);
     ErrD3D(pRenderer->pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLEFAN, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1,
         p->pQuards, p->uNumVertices, D3DDP_DONOTLIGHT | D3DDP_DONOTUPDATEEXTENTS));
   }