Mercurial > mm7

diff Render.cpp @ 746:852ec78d9548

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Mar 2013 23:46:32 +0600
parents 353ff9ea11e6 225d92620998
children 45615cacad31
line wrap: on
line diff
--- a/Render.cpp	Fri Mar 22 23:46:19 2013 +0600
+++ b/Render.cpp	Fri Mar 22 23:46:32 2013 +0600
@@ -8140,7 +8140,7 @@
     if ( pSoftBillboard->uTintColor && this->bTinting )
     {
       v11 = ::GetActorTintColor(dimming_level, 0, pSoftBillboard->zbuffer_depth, 0, 0);
-      v12 = sub_4A19D8(pSoftBillboard->uTintColor, v11);
+      v12 = BlendColors(pSoftBillboard->uTintColor, v11);
       if ( v28 )
         v12 = (unsigned int)((char *)&array_77EC08[1852].pEdgeList1[17] + 3) & ((unsigned int)v12 >> 1);
     }
@@ -8586,7 +8586,7 @@
   unsigned int diffuse = ::GetActorTintColor(dimming_level, 0, a2->zbuffer_depth, 0, pBillboard);
   if (a2->uTintColor & 0x00FFFFFF && bTinting)
   {
-    diffuse = sub_4A19D8(a2->uTintColor, diffuse);
+    diffuse = BlendColors(a2->uTintColor, diffuse);
     if (a2->uTintColor & 0xFF000000)
       diffuse = 0x007F7F7F & ((unsigned int)diffuse >> 1);
   }