xrGame: D3DCOLOR_RGBA() replaced by color_rgba().

OpenXRay · Nov 10, 2015 · 86c8675 · 86c8675
1 parent 79c9582
commit 86c8675
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/xrGame/HUDTarget.cpp b/src/xrGame/HUDTarget.cpp
@@ -23,12 +23,12 @@
 #include <ai/monsters/poltergeist/poltergeist.h>
 
 
-u32 C_ON_ENEMY		D3DCOLOR_RGBA(0xff,0,0,0x80);
-u32 C_ON_NEUTRAL	D3DCOLOR_RGBA(0xff,0xff,0x80,0x80);
-u32 C_ON_FRIEND		D3DCOLOR_RGBA(0,0xff,0,0x80);
+u32 C_ON_ENEMY		color_rgba(0xff,0,0,0x80);
+u32 C_ON_NEUTRAL	color_rgba(0xff,0xff,0x80,0x80);
+u32 C_ON_FRIEND		color_rgba(0,0xff,0,0x80);
 
 
-#define C_DEFAULT	D3DCOLOR_RGBA(0xff,0xff,0xff,0x80)
+#define C_DEFAULT	color_rgba(0xff,0xff,0xff,0x80)
 #define C_SIZE		0.025f
 #define NEAR_LIM	0.5f
 

diff --git a/src/xrGame/IKFoot.cpp b/src/xrGame/IKFoot.cpp
@@ -374,7 +374,7 @@ bool CIKFoot::GetFootStepMatrix( ik_goal_matrix &m, const Fmatrix &g_anim, const
 #ifdef DEBUG
 	if(ph_dbg_draw_mask.test( phDbgDrawIKGoal ))
 	{
-		DBG_DrawPoint( global_point, 0.03f, D3DCOLOR_RGBA( 255, 0, 0, 255 ) );
+		DBG_DrawPoint( global_point, 0.03f, color_rgba( 255, 0, 0, 255 ) );
 	}
 	if(!fsimilar( _abs( DET( g_anim ) - 1.f ), _abs( DET( m.get() ) - 1.f ), 0.001f ) )
 		Msg("scale g_anim: %f scale m: %f ",  DET( g_anim ) ,  DET( m.get() ) );

diff --git a/src/xrGame/ai/stalker/ai_stalker_debug.cpp b/src/xrGame/ai/stalker/ai_stalker_debug.cpp
@@ -966,7 +966,7 @@ void CAI_Stalker::dbg_draw_vision	()
 	string64					out_text;
 	xr_sprintf						(out_text,"%.2f",object ? object->m_value : 0.f);
 
-	UI().Font().pFontMedium->SetColor	(D3DCOLOR_RGBA(255,0,0,95));
+	UI().Font().pFontMedium->SetColor	(color_rgba(255,0,0,95));
 	UI().Font().pFontMedium->OutSet	(x,y);
 	UI().Font().pFontMedium->OutNext	(out_text);
 }