diff Render.cpp @ 58:764abc86ce90

22.01.13
author Ritor1
date Tue, 22 Jan 2013 00:59:02 +0600
parents 86d05cff0a35
children 285e144d0b8b
line wrap: on
line diff
--- a/Render.cpp	Mon Jan 21 20:22:10 2013 +0600
+++ b/Render.cpp	Tue Jan 22 00:59:02 2013 +0600
@@ -7083,7 +7083,7 @@
   if (pRenderD3D)
   {
     pGame->draw_debug_outlines();
-    //DoRenderBillboards_D3D(); //Ritor1: it's temporarily
+    DoRenderBillboards_D3D(); //Ritor1: it's temporarily
     pGame->pStru6Instance->RenderSpecialEffects();
     pRenderD3D->pDevice->EndScene();
   }
@@ -8228,11 +8228,11 @@
   if ( a1->uNumD3DSceneBegins )
   {
     v5 = a2;
-    v6 = (double)HIWORD(a2->sZValue);
+    v6 = (double)a2->sZValue; //Ritor1:begin pBillboardRenderListD3D
     v31 = v6;
     v7 = v6;
-    v8 = Billboard_ProbablyAddToListAndSortByZOrder(LODWORD(v7));
-    if ( BYTE3(v5->uTintColor) )
+    v8 = Billboard_ProbablyAddToListAndSortByZOrder(v7);
+    if ( v5->uTintColor )
       pBillboardRenderListD3D[v8].uOpacity = RenderBillboardD3D::Opaque_3;
     else
       pBillboardRenderListD3D[v8].uOpacity = RenderBillboardD3D::Transparent;
@@ -8267,8 +8267,7 @@
     pBillboardRenderListD3D[v8].pQuards[0].pos.y = a1b - v26 * v29;
     v27 = v31 * 1000.0;
     v13 = 1.0;
-    pBillboardRenderListD3D[v8].pQuards[0].pos.z = 1.0
-                                                    - 1.0 / (v27 / (double)pOutdoorCamera->shading_dist_mist);
+    pBillboardRenderListD3D[v8].pQuards[0].pos.z = 1.0 - 1.0 / (v27 / (double)pOutdoorCamera->shading_dist_mist);
     v25 = 1.0 / v31;
     pBillboardRenderListD3D[v8].pQuards[0].rhw = v25;
     if ( a3->bUsingSpecular )
@@ -11084,10 +11083,10 @@
 //----- (004A1C1E) --------------------------------------------------------
 void DoRenderBillboards_D3D()
 {
-  ErrD3D(pRenderer->pRenderD3D->pDevice->SetTextureStageState(0, D3DTSS_ADDRESS, 3u));
-  ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, 1u));
+  ErrD3D(pRenderer->pRenderD3D->pDevice->SetTextureStageState(0, D3DTSS_ADDRESS, 3));
+  ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, 1));
   ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, 0));
-  ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_CULLMODE, 1u));
+  ErrD3D(pRenderer->pRenderD3D->pDevice->SetRenderState(D3DRENDERSTATE_CULLMODE, 1));
 
   for (uint i = pRenderer->uNumBillboardsToDraw - 1; i != (uint)-1; --i)
   {