comparison Render.cpp @ 361:b803545c1b96

Слияние
author Ritor1
date Thu, 21 Feb 2013 22:42:52 +0600
parents 672b83584b0f
children edd2d8b7e3c4
comparison
equal deleted inserted replaced
360:90017057667f 361:b803545c1b96
7232 } 7232 }
7233 7233
7234 7234
7235 7235
7236 //----- (004A2031) -------------------------------------------------------- 7236 //----- (004A2031) --------------------------------------------------------
7237 unsigned int Render::GetActorTintColor(float a2, int a3, int a4, int a5, RenderBillboard *a6) 7237 unsigned int Render::GetActorTintColor(float a2, int tint, int a4, int a5, RenderBillboard *a6)
7238 { 7238 {
7239 return ::GetActorTintColor(a3, a4, a2, a5, a6); 7239 return ::GetActorTintColor(tint, a4, a2, a5, a6);
7240 } 7240 }
7241 7241
7242 /*void Render::DrawTerrainPolygon_new(stru148 *a3, IDirect3DTexture2 *pTexture)//new function 7242 /*void Render::DrawTerrainPolygon_new(stru148 *a3, IDirect3DTexture2 *pTexture)//new function
7243 { 7243 {
7244 int v5; // ebx@1 7244 int v5; // ebx@1