diff Render.cpp @ 840:6dd2b94efce7

DrawFan
author Ritor1
date Fri, 29 Mar 2013 10:43:46 +0600
parents f5156b8c61ad
children e3609dd06c15
line wrap: on
line diff
--- a/Render.cpp	Thu Mar 28 00:37:58 2013 +0400
+++ b/Render.cpp	Fri Mar 29 10:43:46 2013 +0600
@@ -7601,12 +7601,12 @@
 //----- (004A2DA3) --------------------------------------------------------
 void Render::DrawStrip(unsigned int uNumVertices, struct stru148 *a3, IDirect3DTexture2 *pTexture)
 {
-  int v4; // ebx@1
+  //int v4; // ebx@1
   int v7; // eax@7
   float v12; // ST3C_4@8
  int i;
 
-  v4 = (int)this;
+  //v4 = (int)this;
  if (!this->uNumD3DSceneBegins)
    return;
 
@@ -7639,19 +7639,20 @@
    pVertices[i].texcoord.y = array_50AC10[i].v;
   }
   pRenderer->pRenderD3D->pDevice->SetTexture(0, pTexture);
-  pRenderer->pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, pVertices, uNumVertices, D3DDP_DONOTUPDATEEXTENTS | D3DDP_DONOTLIGHT);
+  pRenderer->pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1, 
+    pVertices, uNumVertices, D3DDP_DONOTUPDATEEXTENTS | D3DDP_DONOTLIGHT);
  }
 }
 
 //----- (004A2DA3) --------------------------------------------------------
 void Render::DrawFan(unsigned int uNumVertices, stru148 *a3, IDirect3DTexture2 *pTexture)
 {
-  int v4; // ebx@1
+  //int v4; // ebx@1
   int v7; // eax@7
   float v13; // ST3C_4@8
   int i;
 
-  v4 = (int)this;
+  //v4 = (int)this;
   if ( !this->uNumD3DSceneBegins )
     return;
   if ( uNumVertices >= 3 )
@@ -7663,14 +7664,14 @@
       this->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_SRCBLEND, D3DBLEND_ONE);
       this->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_DESTBLEND, D3DBLEND_ZERO);
     }
-    for (i = 0; i < uNumVertices; ++i)
+    for ( i = 0; i < uNumVertices; ++i )
     {
       pVertices[i].pos.x = array_50AC10[i].vWorldViewProjX;
       pVertices[i].pos.y = array_50AC10[i].vWorldViewProjY;
       pVertices[i].pos.z = 0.99989998;
       pVertices[i].rhw = array_50AC10[i]._rhw;
 
-      pVertices[i].diffuse = GetActorTintColor(31, 0, array_50AC10[i].vWorldViewPosition.x, 1, 0);
+      pVertices[i].diffuse = ::GetActorTintColor(31, 0, array_50AC10[i].vWorldViewPosition.x, 1, 0);
       v7 = 0;
       if (this->bUsingSpecular)
       {
@@ -7683,7 +7684,7 @@
     }
     pRenderer->pRenderD3D->pDevice->SetTexture(0, pTexture);
     pRenderer->pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLEFAN, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1,
-    pVertices, uNumVertices, D3DDP_DONOTUPDATEEXTENTS | D3DDP_DONOTLIGHT);
+      pVertices, uNumVertices, D3DDP_DONOTUPDATEEXTENTS | D3DDP_DONOTLIGHT);
   }
 }