Refactor xrDebug.

Author: nitrocaster

src/Layers/xrRender/AnimationKeyCalculate.h

@@ -206,7 +206,7 @@ IC void MixInterlerp( CKey &Result, const CKey	*R, const CBlend* const BA[MAX_BL
 			else				w = w1/ws;
 #ifdef DEBUG
 			//.					if (fis_zero(w0+w1) || (!_valid(w))){
-			//.						Debug.fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, w0: %f, w1: %f, ws:%f, BIS: %d",w0+w1,w,w0,w1,ws,BLEND_INST.Blend.size());
+			//.						xrDebug::Fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, w0: %f, w1: %f, ws:%f, BIS: %d",w0+w1,w,w0,w1,ws,BLEND_INST.Blend.size());
 			//.					}
 #endif
 			KEY_Interp	(Result,R[0],R[1], clampr(w,0.f,1.f));
@@ -245,7 +245,7 @@ IC void MixInterlerp( CKey &Result, const CKey	*R, const CBlend* const BA[MAX_BL
 
 #ifdef DEBUG
 				//.						if ((total==0) || (!_valid(S[cnt].w/total))){
-				//.							Debug.fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, total: %f, count: %d, real count: %d",total,S[cnt].w,total,count,BLEND_INST.Blend.size());
+				//.							xrDebug::Fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, total: %f, count: %d, real count: %d",total,S[cnt].w,total,count,BLEND_INST.Blend.size());
 				//.						}
 #endif
 

src/Layers/xrRender/Blender_BmmD.cpp

@@ -87,7 +87,7 @@ void	CBlender_BmmD::Compile	(CBlender_Compile& C)
 		}
 		C.PassEnd			();
 	} else {
-		if (C.L_textures.size()<2)	Debug.fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
+		if (C.L_textures.size()<2)	xrDebug::Fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
 		switch (C.iElement)
 		{
 		case SE_R1_NORMAL_HQ:	

src/Layers/xrRender/Blender_Lm(EbB).cpp

@@ -85,7 +85,7 @@ void	CBlender_LmEbB::Compile(CBlender_Compile& C)
 		}
 		C.PassEnd			();
 	} else {
-		if (C.L_textures.size()<2)	Debug.fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
+		if (C.L_textures.size()<2)	xrDebug::Fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
 		switch (C.iElement)
 		{
 		case SE_R1_NORMAL_HQ:

src/Layers/xrRender/HW.cpp

@@ -75,7 +75,7 @@ void CHW::Reset		(HWND hwnd)
 	while	(TRUE)	{
 		HRESULT _hr							= HW.pDevice->Reset	(&DevPP);
 		if (SUCCEEDED(_hr))					break;
-		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,Debug.error2string(_hr));
+		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,xrDebug::ErrorToString(_hr));
 		Sleep	(100);
 	}
 	R_CHK				(pDevice->GetRenderTarget			(0,&pBaseRT));

src/Layers/xrRender/ModelPool.cpp

@@ -114,7 +114,7 @@ dxRender_Visual*	CModelPool::Instance_Load		(const char* N, BOOL allow_register)
 				Msg("!Can't find model file '%s'.",name);
                 return 0;
 #else            
-				Debug.fatal(DEBUG_INFO,"Can't find model file '%s'.",name);
+				xrDebug::Fatal(DEBUG_INFO,"Can't find model file '%s'.",name);
 #endif
 			}
 	} else {

src/Layers/xrRender/ParticleGroup.cpp

@@ -248,7 +248,7 @@ void CParticleGroup::SItem::StartFreeChild(CParticleEffect* emitter, LPCSTR nm,
 #ifdef _EDITOR        
         Msg			("!Can't use looped effect '%s' as 'On Birth' child for group.",nm);
 #else
-        Debug.fatal	(DEBUG_INFO,"Can't use looped effect '%s' as 'On Birth' child for group.",nm);
+        xrDebug::Fatal	(DEBUG_INFO,"Can't use looped effect '%s' as 'On Birth' child for group.",nm);
 #endif
     }
 }

src/Layers/xrRender/ResourceManager.cpp

@@ -57,7 +57,7 @@ IBlender* CResourceManager::_GetBlender		(LPCSTR Name)
 		return 0;
 	}
 #endif
-	if (I==m_blenders.end())	{ Debug.fatal(DEBUG_INFO,"Shader '%s' not found in library.",Name); return 0; }
+	if (I==m_blenders.end())	{ xrDebug::Fatal(DEBUG_INFO,"Shader '%s' not found in library.",Name); return 0; }
 #endif
 	else					return I->second;
 }

src/Layers/xrRender/SkeletonAnimated.cpp

@@ -369,7 +369,7 @@ CBlend*	CKinematicsAnimated::PlayCycle		(LPCSTR  N, BOOL bMixIn, PlayCallback Ca
 {
 	MotionID motion_ID		= ID_Cycle(N);
 	if (motion_ID.valid())	return PlayCycle(motion_ID,bMixIn,Callback,CallbackParam,channel);
-	else					{ Debug.fatal(DEBUG_INFO,"! MODEL: can't find cycle: %s", N); return 0; }
+	else					{ xrDebug::Fatal(DEBUG_INFO,"! MODEL: can't find cycle: %s", N); return 0; }
 }
 CBlend*	CKinematicsAnimated::PlayCycle		(MotionID motion_ID,  BOOL bMixIn, PlayCallback Callback, LPVOID CallbackParam,u8 channel /*= 0*/)
 {	
@@ -702,7 +702,7 @@ void CKinematicsAnimated::Load(const char* N, IReader *data, u32 dwFlags)
                     Msg			("!Can't find motion file '%s'.",nm);
                     return;
 #else
-                    Debug.fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
+                    xrDebug::Fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
 #endif
                 }
             }
@@ -741,7 +741,7 @@ void CKinematicsAnimated::Load(const char* N, IReader *data, u32 dwFlags)
                     Msg			("!Can't find motion file '%s'.",nm);
                     return;
 #else
-                    Debug.fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
+                    xrDebug::Fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
 #endif
                 }
             }

src/Layers/xrRender/SkeletonX.cpp

@@ -337,7 +337,7 @@ void CSkeletonX::_Load	(const char* N, IReader *data, u32& dwVertCount)
 			}
 		}break;
 	default:
-		Debug.fatal	(DEBUG_INFO,"Invalid vertex type in skinned model '%s'",N);
+		xrDebug::Fatal	(DEBUG_INFO,"Invalid vertex type in skinned model '%s'",N);
 		break;
 	}
 #ifdef _EDITOR

src/Layers/xrRender/Texture.cpp

@@ -313,7 +313,7 @@ ID3DBaseTexture*	CRender::texture_load(LPCSTR fRName, u32& ret_msize)
 	R_ASSERT(FS.exist(fn,"$game_textures$",	"ed\\ed_not_existing_texture",".dds"));
 	goto _DDS;
 
-//	Debug.fatal(DEBUG_INFO,"Can't find texture '%s'",fname);
+//	xrDebug::Fatal(DEBUG_INFO,"Can't find texture '%s'",fname);
 
 #endif