Mercurial > mm7

diff DecalBuilder.cpp @ 1980:c1c74df0a33e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changing most of auto types to their actual types
author Grumpy7
date Wed, 30 Oct 2013 00:47:37 -0700
parents 2c71fa8913d2
children 28cb79ae2f6f
line wrap: on
line diff
--- a/DecalBuilder.cpp	Mon Oct 28 22:16:42 2013 -0700
+++ b/DecalBuilder.cpp	Wed Oct 30 00:47:37 2013 -0700
@@ -454,7 +454,7 @@
   if (!pBloodsplatContainer->std__vector_pBloodsplats_size)
     return true;
   
-  auto pFace = &pIndoor->pFaces[uFaceID];
+  BLVFace* pFace = &pIndoor->pFaces[uFaceID];
 
   if (pFace->uAttributes & 0x400000)
     return true;
@@ -462,7 +462,7 @@
     return true;
   for (uint i = 0; i < pBloodsplatContainer->std__vector_pBloodsplats_size; ++i)
   {
-    auto pBloodsplat = pBloodsplatContainer->std__vector_pBloodsplats + i;
+    Bloodsplat* pBloodsplat = &pBloodsplatContainer->std__vector_pBloodsplats[i];
     if (pFace->pBounding.x1 - pBloodsplat->radius < pBloodsplat->x &&
         pFace->pBounding.x2 + pBloodsplat->radius > pBloodsplat->x &&
         pFace->pBounding.y1 - pBloodsplat->radius < pBloodsplat->y &&
@@ -741,7 +741,7 @@
   ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_DESTBLEND, D3DBLEND_ONE));
   ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_DITHERENABLE, FALSE));
 
-  auto pTex = pGame->pIndoorCameraD3D->LoadTextureAndGetHardwarePtr("hwsplat04");
+  IDirect3DTexture2* pTex = pGame->pIndoorCameraD3D->LoadTextureAndGetHardwarePtr("hwsplat04");
   ErrD3D(pRenderer->pRenderD3D->pDevice->SetTexture(0, pTex));
  
   DrawDecals(0.00039999999);