diff Render.cpp @ 741:cd9ae9a2c99c

Слияние
author Ritor1
date Fri, 22 Mar 2013 19:59:03 +0600
parents 14cf77af15de 2f4e33c1ed24
children 353ff9ea11e6
line wrap: on
line diff
--- a/Render.cpp	Fri Mar 22 19:58:47 2013 +0600
+++ b/Render.cpp	Fri Mar 22 19:59:03 2013 +0600
@@ -218,7 +218,7 @@
             soft_billboard.pPalette2 = PaletteManager::Get_Dark_or_Red_LUT(p->uPalette, 0, 1);
           v5 = p->uHwSpriteID;
           if ( v5 >= 0 )
-            pSprites_LOD->pSpriteHeaders[v5]._4ACC38(&soft_billboard, 1);
+            pSprites_LOD->pSpriteHeaders[v5].DrawSprite_sw(&soft_billboard, 1);
         }
       }
   }
@@ -2150,7 +2150,7 @@
               v33 = 3;
             else
               v33 = v108 != 0 ? 5 : 0;
-            static_sub_0048034E_stru_154._49B0C9(v23, v95);
+            static_sub_0048034E_stru_154.ClassifyPolygon(v23, v95);
             if ( pDecalBuilder->uNumDecals > 0 )
               pDecalBuilder->ApplyDecals(31 - v16->dimming_level, 4, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, *(float *)&v33, -1);
           }
@@ -2295,7 +2295,7 @@
         else
           pVertices = (RenderVertexSoft *)(v108 != 0 ? 5 : 0);
         //a8 = (RenderVertexSoft *)(this_3a ? 3 : v108 != 0 ? 5 : 0);
-        static_sub_0048034E_stru_76D590._49B0C9(v48, *(float *)&a4);
+        static_sub_0048034E_stru_76D590.ClassifyPolygon(v48, *(float *)&a4);
         if ( pDecalBuilder->uNumDecals > 0 )
           pDecalBuilder->ApplyDecals(31 - v40->dimming_level, 4, &static_sub_0048034E_stru_76D590, uNumVertices, array_50AC10, 0, (char)pVertices, -1);
       }
@@ -2418,7 +2418,7 @@
           v70 = 3;
         else
           v70 = v108 != 0 ? 5 : 0;
-        static_sub_0048034E_stru_76D578._49B0C9(v63, v87);
+        static_sub_0048034E_stru_76D578.ClassifyPolygon(v63, v87);
         if ( pDecalBuilder->uNumDecals > 0 )
           pDecalBuilder->ApplyDecals(31 - v40->dimming_level, 4, &static_sub_0048034E_stru_76D578, v100, array_50AC10, 0, v70, -1);
       }
@@ -3050,7 +3050,7 @@
           }
           v13 = *((short *)v1 - 8);
           if ( v13 >= 0 )
-            pSprites_LOD->pSpriteHeaders[v13]._4ACC38(&billboard, 1);
+            pSprites_LOD->pSpriteHeaders[v13].DrawSprite_sw(&billboard, 1);
       }
     }
   }