diff Vis.cpp @ 1449:27b7ee003c7c

Merge
author Gloval
date Tue, 06 Aug 2013 00:56:33 +0400
parents 613c77e51e38
children a109bb203e28
line wrap: on
line diff
--- a/Vis.cpp	Tue Aug 06 00:52:46 2013 +0400
+++ b/Vis.cpp	Tue Aug 06 00:56:33 2013 +0400
@@ -173,8 +173,8 @@
     //while ( v8 );
   }
 
-  if (min_x < pRenderer->pBillboardRenderListD3D[v13].pQuards[0].pos.x || pRenderer->pBillboardRenderListD3D[v13].pQuards[0].pos.y > min_y ||
-      pRenderer->pBillboardRenderListD3D[v13].pQuards[3].pos.x < max_x || pRenderer->pBillboardRenderListD3D[v13].pQuards[1].pos.y < max_y)
+  if (min_x < pRenderer->pBillboardRenderListD3D[v13].pQuads[0].pos.x || pRenderer->pBillboardRenderListD3D[v13].pQuads[0].pos.y > min_y ||
+      pRenderer->pBillboardRenderListD3D[v13].pQuads[3].pos.x < max_x || pRenderer->pBillboardRenderListD3D[v13].pQuads[1].pos.y < max_y)
     return false;
 
   return true;
@@ -265,12 +265,12 @@
     return false;
 
   //result = a1;
-  v5 = a1->pQuards[0].pos.x;
-  a1a = a1->pQuards[3].pos.x;
-  v6 = a1->pQuards[0].pos.y;
-  //result = (RenderBillboardD3D *)LODWORD(result->pQuards[1].pos.y);
+  v5 = a1->pQuads[0].pos.x;
+  a1a = a1->pQuads[3].pos.x;
+  v6 = a1->pQuads[0].pos.y;
+  //result = (RenderBillboardD3D *)LODWORD(result->pQuads[1].pos.y);
   v29 = v6;
-  v28 = a1->pQuards[1].pos.y;
+  v28 = a1->pQuads[1].pos.y;
   if ( v5 > a1a )
   {
     v7 = v5;
@@ -1548,7 +1548,7 @@
     return false;
 
 
-    GetPolygonCenter(pRenderer->pBillboardRenderListD3D[v3].pQuards, 4, &test_x, &test_y);
+    GetPolygonCenter(pRenderer->pBillboardRenderListD3D[v3].pQuads, 4, &test_x, &test_y);
     CastPickRay(pPickingRay, test_x, test_y, fDepth);
     if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
       PickIndoorFaces_Mouse(fDepth, pPickingRay, &Vis_static_stru_F91E10, &vis_face_filter);
@@ -1569,8 +1569,8 @@
 
     for (v40 = 0; v40 < 4; ++v40)
         {
-        test_x=pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuards[v40].pos.x;
-        test_y=  pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuards[v40].pos.y;
+        test_x=pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuads[v40].pos.x;
+        test_y=  pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuads[v40].pos.y;
         if ((double)(pViewport->uScreen_TL_X) <= test_x &&
             (double)pViewport->uScreen_BR_X >= test_x &&
             (double)pViewport->uScreen_TL_Y <= test_y &&
@@ -1595,11 +1595,11 @@
         {
           if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor )
             return false;
-          t1_x = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuards[0].pos.x;
-          t2_x = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuards[3].pos.x;
+          t1_x = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuads[0].pos.x;
+          t2_x = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuads[3].pos.x;
 
-          t1_y = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuards[0].pos.y;
-          t2_y = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuards[1].pos.y;
+          t1_y = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuads[0].pos.y;
+          t2_y = pRenderer->pBillboardRenderListD3D[uD3DBillboardIdx].pQuads[1].pos.y;
           if ( t1_x > t2_x )
           {
             swap_temp = t1_x;