diff --git a/src/xrEngine/CameraBase.cpp b/src/xrEngine/CameraBase.cpp
index f058244ce20..b8e7c110ed1 100644
--- a/src/xrEngine/CameraBase.cpp
+++ b/src/xrEngine/CameraBase.cpp
@@ -9,23 +9,23 @@
 
 CCameraBase::CCameraBase(CObject* p, u32 flags)
 {
-	m_Flags.assign	(flags);
-	vPosition.set	(0,0,0);
-	vDirection.set	(0,0,1);
-	vNormal.set		(0,1,0);
-	yaw				= 0;
-	pitch			= 0;
-	roll			= 0;
-	lim_yaw.set		(0.f,0.f);
-	lim_pitch.set	(0.f,0.f);
-	lim_roll.set	(0.f,0.f);
-	bClampYaw		= false;
-	bClampPitch		= false;
-	bClampRoll		= false;
-	SetParent		(p);
-	f_fov			= 90;
-	f_aspect		= 1.f;
-	tag				= 0;
+    m_Flags.assign(flags);
+    vPosition.set(0, 0, 0);
+    vDirection.set(0, 0, 1);
+    vNormal.set(0, 1, 0);
+    yaw = 0;
+    pitch = 0;
+    roll = 0;
+    lim_yaw.set(0.f, 0.f);
+    lim_pitch.set(0.f, 0.f);
+    lim_roll.set(0.f, 0.f);
+    bClampYaw = false;
+    bClampPitch = false;
+    bClampRoll = false;
+    SetParent(p);
+    f_fov = 90;
+    f_aspect = 1.f;
+    tag = 0;
 }
 
 CCameraBase::~CCameraBase()
@@ -34,51 +34,61 @@ CCameraBase::~CCameraBase()
 
 void CCameraBase::Load(LPCSTR section)
 {
-	rot_speed			= pSettings->r_fvector3	(section,"rot_speed");
+    rot_speed = pSettings->r_fvector3(section, "rot_speed");
 
-	lim_yaw				= pSettings->r_fvector2	(section,"lim_yaw");
-	lim_pitch			= pSettings->r_fvector2	(section,"lim_pitch");
+    lim_yaw = pSettings->r_fvector2(section, "lim_yaw");
+    lim_pitch = pSettings->r_fvector2(section, "lim_pitch");
 
-	bClampPitch			= (0!=lim_pitch[0])||(0!=lim_pitch[1]);
-	bClampYaw			= (0!=lim_yaw[0])||(0!=lim_yaw[1]);
+    bClampPitch = (0 != lim_pitch[0]) || (0 != lim_pitch[1]);
+    bClampYaw = (0 != lim_yaw[0]) || (0 != lim_yaw[1]);
 
-	if (bClampPitch)	pitch = (lim_pitch[0]+lim_pitch[1])*0.5f;
-	if (bClampYaw)		yaw	  = (lim_yaw[0]+lim_yaw[1])*0.5f;
+    if (bClampPitch) pitch = (lim_pitch[0] + lim_pitch[1])*0.5f;
+    if (bClampYaw) yaw = (lim_yaw[0] + lim_yaw[1])*0.5f;
 }
 
-IC float AClamp(Fvector2& l, float v){
-	return (2*v-l[0]-l[1])/(l[1]-l[0]);
+IC float AClamp(Fvector2& l, float v)
+{
+    return (2 * v - l[0] - l[1]) / (l[1] - l[0]);
 }
 
-float CCameraBase::CheckLimYaw( ){
-	if (bClampYaw){
-		return AClamp(lim_yaw,yaw);
-	}else 
-		return 0;
+float CCameraBase::CheckLimYaw()
+{
+    if (bClampYaw)
+    {
+        return AClamp(lim_yaw, yaw);
+    }
+    else
+        return 0;
 }
 
-float CCameraBase::CheckLimPitch( ){
-	if (bClampYaw){
-		return AClamp(lim_pitch,pitch);
-	}else 
-		return 0;
+float CCameraBase::CheckLimPitch()
+{
+    if (bClampYaw)
+    {
+        return AClamp(lim_pitch, pitch);
+    }
+    else
+        return 0;
 }
 
-float CCameraBase::CheckLimRoll( ){
-	if (bClampYaw){
-		return AClamp(lim_roll,roll);
-	}else 
-		return 0;
+float CCameraBase::CheckLimRoll()
+{
+    if (bClampYaw)
+    {
+        return AClamp(lim_roll, roll);
+    }
+    else
+        return 0;
 }
 SCamEffectorInfo::SCamEffectorInfo()
 {
-	p.set				(0,0,0);
-	d.set				(0,0,1);
-	n.set				(0,1,0);
+    p.set(0, 0, 0);
+    d.set(0, 0, 1);
+    n.set(0, 1, 0);
 
-	fFov				= 90.0f;
-	fFar				= 100.0f;
-	fAspect				= 1.f;
-	dont_apply			= false;
-	affected_on_hud		= true;
+    fFov = 90.0f;
+    fFar = 100.0f;
+    fAspect = 1.f;
+    dont_apply = false;
+    affected_on_hud = true;
 }
\ No newline at end of file
diff --git a/src/xrEngine/CameraBase.h b/src/xrEngine/CameraBase.h
index fde61f92880..706fa4e675d 100644
--- a/src/xrEngine/CameraBase.h
+++ b/src/xrEngine/CameraBase.h
@@ -11,76 +11,77 @@
 // refs
 class CObject;
 
-class ENGINE_API	CCameraBase
+class ENGINE_API CCameraBase
 {
 protected:
-	CObject*		parent;
+    CObject* parent;
 
 public:
-	BOOL			bClampYaw, bClampPitch, bClampRoll;
-	float			yaw,pitch,roll;
+    BOOL bClampYaw, bClampPitch, bClampRoll;
+    float yaw, pitch, roll;
 
-	enum{
-		flRelativeLink		= (1<<0),
-		flPositionRigid		= (1<<1),
-		flDirectionRigid	= (1<<2),
-	};
-	Flags32			m_Flags;
+    enum
+    {
+        flRelativeLink = (1 << 0),
+        flPositionRigid = (1 << 1),
+        flDirectionRigid = (1 << 2),
+    };
+    Flags32 m_Flags;
 
-	ECameraStyle	style;
-	Fvector2		lim_yaw,lim_pitch,lim_roll;
-	Fvector			rot_speed;
+    ECameraStyle style;
+    Fvector2 lim_yaw, lim_pitch, lim_roll;
+    Fvector rot_speed;
 
-	Fvector			vPosition;
-	Fvector			vDirection;
-	Fvector			vNormal;
-	float			f_fov;
-	float			f_aspect;
+    Fvector vPosition;
+    Fvector vDirection;
+    Fvector vNormal;
+    float f_fov;
+    float f_aspect;
 
-IC 	Fvector			Position				()	const { return vPosition;	}
-IC 	Fvector			Direction				()	const { return vDirection;}
-IC 	Fvector			Up						()	const { return vNormal;	}
-IC 	Fvector			Right					()	const { return Fvector().crossproduct( vNormal, vDirection ); }
-IC 	float			Fov						()	const { return f_fov; }
-IC 	float			Aspect					()	const { return f_aspect; }
+    IC Fvector Position() const { return vPosition; }
+    IC Fvector Direction() const { return vDirection; }
+    IC Fvector Up() const { return vNormal; }
+    IC Fvector Right() const { return Fvector().crossproduct(vNormal, vDirection); }
+    IC float Fov() const { return f_fov; }
+    IC float Aspect() const { return f_aspect; }
 
-	int				tag;
+    int tag;
 public:
-					CCameraBase		( CObject* p, u32 flags );
-	virtual			~CCameraBase	( );
-	virtual void	Load			(LPCSTR section);
-	void			SetParent		( CObject* p )								{parent=p; VERIFY(p);}
-	virtual	void	OnActivate		( CCameraBase* old_cam )					{;}
-	virtual	void	OnDeactivate	( )											{;}
-	virtual void	Move			( int cmd, float val=0, float factor=1.0f)	{;}
-	virtual void	Update			( Fvector& point, Fvector& noise_angle )	{;}
-	virtual void	Get				( Fvector& P, Fvector& D, Fvector& N )		{P.set(vPosition);D.set(vDirection);N.set(vNormal);}
-	virtual void	Set				( const Fvector& P, const Fvector& D, const Fvector& N ){vPosition.set(P);vDirection.set(D);vNormal.set(N);}
-	virtual void	Set				( float Y, float P, float R )				{yaw=Y;pitch=P;roll=R;}
-	
-	virtual float	GetWorldYaw		( )	{ return 0; };
-	virtual float	GetWorldPitch	( )	{ return 0; };
+    CCameraBase(CObject* p, u32 flags);
+    virtual ~CCameraBase();
+    virtual void Load(LPCSTR section);
+    void SetParent(CObject* p) { parent = p; VERIFY(p); }
+    virtual void OnActivate(CCameraBase* old_cam) { ; }
+    virtual void OnDeactivate() { ; }
+    virtual void Move(int cmd, float val = 0, float factor = 1.0f) { ; }
+    virtual void Update(Fvector& point, Fvector& noise_angle) { ; }
+    virtual void Get(Fvector& P, Fvector& D, Fvector& N) { P.set(vPosition); D.set(vDirection); N.set(vNormal); }
+    virtual void Set(const Fvector& P, const Fvector& D, const Fvector& N) { vPosition.set(P); vDirection.set(D); vNormal.set(N); }
+    virtual void Set(float Y, float P, float R) { yaw = Y; pitch = P; roll = R; }
 
-	virtual float	CheckLimYaw		( );
-	virtual float	CheckLimPitch	( );
-	virtual float	CheckLimRoll	( );
+    virtual float GetWorldYaw() { return 0; };
+    virtual float GetWorldPitch() { return 0; };
+
+    virtual float CheckLimYaw();
+    virtual float CheckLimPitch();
+    virtual float CheckLimRoll();
 };
 
 
 template<typename T>
-IC void tviewport_size( CRenderDeviceBase& D, float _viewport_near, const T &cam_info, float& h_w, float& h_h)
+IC void tviewport_size(CRenderDeviceBase& D, float _viewport_near, const T& cam_info, float& h_w, float& h_h)
 {
-	h_h = _viewport_near*tan(deg2rad(cam_info.Fov())/2.f);
-	VERIFY2( _valid(h_h), make_string("invalide viewporrt params fov: %f ", cam_info.Fov()) );
-	float aspect = D.fASPECT;//cam_info.Aspect();
-	VERIFY( aspect>EPS );
-	h_w = h_h/aspect;
+    h_h = _viewport_near*tan(deg2rad(cam_info.Fov()) / 2.f);
+    VERIFY2(_valid(h_h), make_string("invalide viewporrt params fov: %f ", cam_info.Fov()));
+    float aspect = D.fASPECT;//cam_info.Aspect();
+    VERIFY(aspect > EPS);
+    h_w = h_h / aspect;
 }
 
 template<typename T>
-IC void viewport_size(  float _viewport_near, const T &cam_info, float& h_w, float& h_h)
+IC void viewport_size(float _viewport_near, const T& cam_info, float& h_w, float& h_h)
 {
-	tviewport_size<T>( Device, _viewport_near, cam_info, h_w, h_h );
+    tviewport_size<T>(Device, _viewport_near, cam_info, h_w, h_h);
 }
 
 #endif // !defined(AFX_CAMERABASE_H__B11F8AE1_1213_11D4_B4E3_4854E82A090D__INCLUDED_)
diff --git a/src/xrEngine/CameraDebug.h b/src/xrEngine/CameraDebug.h
index 2abf3fd7f28..0c233464bc7 100644
--- a/src/xrEngine/CameraDebug.h
+++ b/src/xrEngine/CameraDebug.h
@@ -10,24 +10,24 @@
 #include "iinputreceiver.h"
 
 class ENGINE_API CCameraDebug :
-	public CCameraBase,
-	public pureRender,
-	public IInputReceiver
+public CCameraBase,
+public pureRender,
+public IInputReceiver
 {
-	D3DXMATRIX      g_matPosition;
-    D3DXVECTOR3		g_vecVelocity;
-    D3DXVECTOR3		g_vecAngularVelocity;
-	Fvector			savedP,savedD,savedN;
-	ECameraStyle	savedStyle;
-	Flags32			savedDF;
+D3DXMATRIX g_matPosition;
+D3DXVECTOR3 g_vecVelocity;
+D3DXVECTOR3 g_vecAngularVelocity;
+Fvector savedP,savedD,savedN;
+ECameraStyle savedStyle;
+Flags32 savedDF;
 public:
-	virtual	void	OnMove				(void);
-	virtual	void	OnCameraActivate	( CCameraBase* old_cam );
-	virtual	void	OnCameraDeactivate	( );
-	virtual void	OnRender			( );
-	virtual void	IR_OnKeyboardPress		(int dik);
+virtual void OnMove (void);
+virtual void OnCameraActivate ( CCameraBase* old_cam );
+virtual void OnCameraDeactivate ( );
+virtual void OnRender ( );
+virtual void IR_OnKeyboardPress (int dik);
 
-	CCameraDebug();
-	virtual ~CCameraDebug();
+CCameraDebug();
+virtual ~CCameraDebug();
 };
 */
diff --git a/src/xrEngine/CameraDefs.h b/src/xrEngine/CameraDefs.h
index b037b1c5fea..9ac5f59bf42 100644
--- a/src/xrEngine/CameraDefs.h
+++ b/src/xrEngine/CameraDefs.h
@@ -5,54 +5,57 @@
 
 struct ENGINE_API SBaseEffector
 {
-	typedef fastdelegate::FastDelegate0<>		CB_ON_B_REMOVE;
-	CB_ON_B_REMOVE				m_on_b_remove_callback;
-	virtual ~SBaseEffector(){}
+    typedef fastdelegate::FastDelegate0<> CB_ON_B_REMOVE;
+    CB_ON_B_REMOVE m_on_b_remove_callback;
+    virtual ~SBaseEffector() {}
 };
 
 struct ENGINE_API SCamEffectorInfo
 {
-	Fvector		p; 
-	Fvector		d; 
-	Fvector		n;
-	Fvector		r;
-	float		fFov; 
-	float		fFar; 
-	float		fAspect; 
-	bool		dont_apply;
-	bool		affected_on_hud;
-	SCamEffectorInfo();
-	SCamEffectorInfo& operator	= (const SCamEffectorInfo& other)
-	{
-		p					= other.p; 
-		d					= other.d; 
-		n					= other.n;
-		r					= other.r;
-		fFov				= other.fFov; 
-		fFar				= other.fFar; 
-		fAspect				= other.fAspect; 
-		dont_apply			= other.dont_apply;
-		affected_on_hud		= other.affected_on_hud;
-		return				*this;
-	}
+    Fvector p;
+    Fvector d;
+    Fvector n;
+    Fvector r;
+    float fFov;
+    float fFar;
+    float fAspect;
+    bool dont_apply;
+    bool affected_on_hud;
+    SCamEffectorInfo();
+    SCamEffectorInfo& operator = (const SCamEffectorInfo& other)
+    {
+        p = other.p;
+        d = other.d;
+        n = other.n;
+        r = other.r;
+        fFov = other.fFov;
+        fFar = other.fFar;
+        fAspect = other.fAspect;
+        dont_apply = other.dont_apply;
+        affected_on_hud = other.affected_on_hud;
+        return *this;
+    }
 };
 
-enum ECameraStyle       {
-	csCamDebug,
-	csFirstEye,
-	csLookAt,
+enum ECameraStyle
+{
+    csCamDebug,
+    csFirstEye,
+    csLookAt,
     csMax,
-	csFixed,
-	cs_forcedword = u32(-1)
+    csFixed,
+    cs_forcedword = u32(-1)
 };
 
-enum ECamEffectorType		{
-	cefDemo		=0,
-	cefNext
+enum ECamEffectorType
+{
+    cefDemo = 0,
+    cefNext
 };
 
-enum EEffectorPPType	{
-	ppeNext		=0,
+enum EEffectorPPType
+{
+    ppeNext = 0,
 };
 
 // refs
diff --git a/src/xrEngine/CameraManager.cpp b/src/xrEngine/CameraManager.cpp
index 8b308f3723a..0b9c4b26506 100644
--- a/src/xrEngine/CameraManager.cpp
+++ b/src/xrEngine/CameraManager.cpp
@@ -16,468 +16,485 @@
 #include "gamefont.h"
 #include "render.h"
 
-float	psCamInert		= 0.f;
-float	psCamSlideInert	= 0.25f;
+float psCamInert = 0.f;
+float psCamSlideInert = 0.25f;
 
-SPPInfo		pp_identity;
-SPPInfo		pp_zero;
+SPPInfo pp_identity;
+SPPInfo pp_zero;
 
-SPPInfo& SPPInfo::add (const SPPInfo &ppi) 
+SPPInfo& SPPInfo::add(const SPPInfo& ppi)
 {
-	blur			+= ppi.blur;
-	gray			+= ppi.gray;
-	duality.h		+= ppi.duality.h; 
-	duality.v		+= ppi.duality.v;
-	
-	noise.intensity	= _max(noise.intensity, ppi.noise.intensity);
-	noise.grain		= _max(noise.grain, ppi.noise.grain);
-	noise.fps		= _max(noise.fps, ppi.noise.fps);
-	color_base		+= ppi.color_base;
-	color_gray		+= ppi.color_gray;
-	color_add		+= ppi.color_add;
-
-	if(ppi.cm_tex1.size())
-	{
-		if(cm_tex1.size())
-		{
-			cm_tex2			= ppi.cm_tex1;
-			cm_interpolate	= 1.0f - cm_influence/(cm_influence+ppi.cm_influence);
-		}else
-		{
-			cm_tex1			= ppi.cm_tex1;
-			cm_influence	= ppi.cm_influence;
-			cm_interpolate	= 0.0f;
-		}
-		cm_influence		= _max(cm_influence, ppi.cm_influence);
-	}
-	return			*this;
+    blur += ppi.blur;
+    gray += ppi.gray;
+    duality.h += ppi.duality.h;
+    duality.v += ppi.duality.v;
+
+    noise.intensity = _max(noise.intensity, ppi.noise.intensity);
+    noise.grain = _max(noise.grain, ppi.noise.grain);
+    noise.fps = _max(noise.fps, ppi.noise.fps);
+    color_base += ppi.color_base;
+    color_gray += ppi.color_gray;
+    color_add += ppi.color_add;
+
+    if (ppi.cm_tex1.size())
+    {
+        if (cm_tex1.size())
+        {
+            cm_tex2 = ppi.cm_tex1;
+            cm_interpolate = 1.0f - cm_influence / (cm_influence + ppi.cm_influence);
+        }
+        else
+        {
+            cm_tex1 = ppi.cm_tex1;
+            cm_influence = ppi.cm_influence;
+            cm_interpolate = 0.0f;
+        }
+        cm_influence = _max(cm_influence, ppi.cm_influence);
+    }
+    return *this;
 }
 
-SPPInfo& SPPInfo::sub (const SPPInfo &ppi) 
+SPPInfo& SPPInfo::sub(const SPPInfo& ppi)
 {
-	blur		-= ppi.blur;
-	gray		-= ppi.gray;
-	duality.h	-= ppi.duality.h; 
-	duality.v	-= ppi.duality.v;
-	color_base	-= ppi.color_base;
-	color_gray	-= ppi.color_gray;
-	color_add	-= ppi.color_add;
-	return *this;
+    blur -= ppi.blur;
+    gray -= ppi.gray;
+    duality.h -= ppi.duality.h;
+    duality.v -= ppi.duality.v;
+    color_base -= ppi.color_base;
+    color_gray -= ppi.color_gray;
+    color_add -= ppi.color_add;
+    return *this;
 }
 
-SPPInfo::SPPInfo				()
+SPPInfo::SPPInfo()
 {
-	blur = gray = duality.h = duality.v = 0;
-	noise.intensity=0; noise.grain = 1; noise.fps = 10;
-	color_base.set	(.5f,	.5f,	.5f);
-	color_gray.set	(.333f, .333f,	.333f);
-	color_add.set	(0.f,	0.f,	0.f);
-	cm_influence	= 0.0f;
-	cm_interpolate	= 0.0f;
+    blur = gray = duality.h = duality.v = 0;
+    noise.intensity = 0;
+    noise.grain = 1;
+    noise.fps = 10;
+    color_base.set(.5f, .5f, .5f);
+    color_gray.set(.333f, .333f, .333f);
+    color_add.set(0.f, 0.f, 0.f);
+    cm_influence = 0.0f;
+    cm_interpolate = 0.0f;
 }
-void SPPInfo::normalize() 
+void SPPInfo::normalize()
 {}
 
 void SPPInfo::validate(LPCSTR str)
 {
-	VERIFY2(_valid(duality.h),str);
-	VERIFY2(_valid(duality.v),str);
-	VERIFY2(_valid(blur),str);
-	VERIFY2(_valid(gray),str);
-	VERIFY2(_valid(noise.intensity),str);
-	VERIFY2(_valid(noise.grain),str);
-	VERIFY2(_valid(noise.fps),str);
-	VERIFY2(_valid(color_base.r),str);
-	VERIFY2(_valid(color_base.g),str);
-	VERIFY2(_valid(color_base.b),str);
-	VERIFY2(_valid(color_gray.r),str);
-	VERIFY2(_valid(color_gray.g),str);
-	VERIFY2(_valid(color_gray.b),str);
-	VERIFY2(_valid(color_add.r),str);
-	VERIFY2(_valid(color_add.g),str);
-	VERIFY2(_valid(color_add.b),str);
+    VERIFY2(_valid(duality.h), str);
+    VERIFY2(_valid(duality.v), str);
+    VERIFY2(_valid(blur), str);
+    VERIFY2(_valid(gray), str);
+    VERIFY2(_valid(noise.intensity), str);
+    VERIFY2(_valid(noise.grain), str);
+    VERIFY2(_valid(noise.fps), str);
+    VERIFY2(_valid(color_base.r), str);
+    VERIFY2(_valid(color_base.g), str);
+    VERIFY2(_valid(color_base.b), str);
+    VERIFY2(_valid(color_gray.r), str);
+    VERIFY2(_valid(color_gray.g), str);
+    VERIFY2(_valid(color_gray.b), str);
+    VERIFY2(_valid(color_add.r), str);
+    VERIFY2(_valid(color_add.g), str);
+    VERIFY2(_valid(color_add.b), str);
 }
 
 SPPInfo& SPPInfo::lerp(const SPPInfo& def, const SPPInfo& to, float factor)
 {
-	VERIFY(_valid(factor));
-	SPPInfo& pp = *this;
-	clamp(factor, 0.0f, 1.0f);
-
-	pp.duality.h		+= def.duality.h		+ (to.duality.h			- def.duality.h)		* factor; 			
-	pp.duality.v		+= def.duality.v		+ (to.duality.v			- def.duality.v)		* factor;
-	pp.gray				+= def.gray				+ (to.gray				- def.gray)				* factor;
-	pp.blur				+= def.blur				+ (to.blur				- def.blur)				* factor;
-	pp.noise.intensity	= to.noise.intensity;//	+ (to.noise.intensity	- def.noise.intensity)	* factor;
-	pp.noise.grain		= to.noise.grain;//		+ (to.noise.grain		- def.noise.grain)		* factor;
-	pp.noise.fps		= to.noise.fps; //		+ (to.noise.fps			- def.noise.fps)		* factor;	
-
-	pp.color_base.set	(
-		def.color_base.r	+ (to.color_base.r - def.color_base.r) * factor, 
-		def.color_base.g	+ (to.color_base.g - def.color_base.g) * factor, 
-		def.color_base.b	+ (to.color_base.b - def.color_base.b) * factor
-		);
-
-	pp.color_gray.set	(
-		def.color_gray.r	+ (to.color_gray.r - def.color_gray.r) * factor, 
-		def.color_gray.g	+ (to.color_gray.g - def.color_gray.g) * factor, 
-		def.color_gray.b	+ (to.color_gray.b - def.color_gray.b) * factor
-		);
-
-	pp.color_add.set	(
-		def.color_add.r	+ (to.color_add.r - def.color_add.r) * factor, 
-		def.color_add.g	+ (to.color_add.g - def.color_add.g) * factor, 
-		def.color_add.b	+ (to.color_add.b - def.color_add.b) * factor
-		);
-
-	pp.cm_tex1					= to.cm_tex1;
-	pp.cm_tex2					= to.cm_tex2;
-	pp.cm_influence				+= def.cm_influence	+ (to.cm_influence - def.cm_influence) * factor;
-	pp.cm_interpolate			+= def.cm_interpolate	+ (to.cm_interpolate - def.cm_interpolate) * factor;
-
-	return *this;
+    VERIFY(_valid(factor));
+    SPPInfo& pp = *this;
+    clamp(factor, 0.0f, 1.0f);
+
+    pp.duality.h += def.duality.h + (to.duality.h - def.duality.h) * factor;
+    pp.duality.v += def.duality.v + (to.duality.v - def.duality.v) * factor;
+    pp.gray += def.gray + (to.gray - def.gray) * factor;
+    pp.blur += def.blur + (to.blur - def.blur) * factor;
+    pp.noise.intensity = to.noise.intensity;// + (to.noise.intensity - def.noise.intensity) * factor;
+    pp.noise.grain = to.noise.grain;// + (to.noise.grain - def.noise.grain) * factor;
+    pp.noise.fps = to.noise.fps; // + (to.noise.fps - def.noise.fps) * factor;
+
+    pp.color_base.set(
+        def.color_base.r + (to.color_base.r - def.color_base.r) * factor,
+        def.color_base.g + (to.color_base.g - def.color_base.g) * factor,
+        def.color_base.b + (to.color_base.b - def.color_base.b) * factor
+    );
+
+    pp.color_gray.set(
+        def.color_gray.r + (to.color_gray.r - def.color_gray.r) * factor,
+        def.color_gray.g + (to.color_gray.g - def.color_gray.g) * factor,
+        def.color_gray.b + (to.color_gray.b - def.color_gray.b) * factor
+    );
+
+    pp.color_add.set(
+        def.color_add.r + (to.color_add.r - def.color_add.r) * factor,
+        def.color_add.g + (to.color_add.g - def.color_add.g) * factor,
+        def.color_add.b + (to.color_add.b - def.color_add.b) * factor
+    );
+
+    pp.cm_tex1 = to.cm_tex1;
+    pp.cm_tex2 = to.cm_tex2;
+    pp.cm_influence += def.cm_influence + (to.cm_influence - def.cm_influence) * factor;
+    pp.cm_interpolate += def.cm_interpolate + (to.cm_interpolate - def.cm_interpolate) * factor;
+
+    return *this;
 }
 
 CCameraManager::CCameraManager(bool bApplyOnUpdate)
 {
 #ifdef DEBUG
-	dbg_upd_frame					= 0;
+    dbg_upd_frame = 0;
 #endif
 
-	m_bAutoApply					= bApplyOnUpdate;
-
-	pp_identity.blur				= 0;
-	pp_identity.gray				= 0;
-	pp_identity.duality.h			= 0; 
-	pp_identity.duality.v			= 0;
-	pp_identity.noise.intensity		= 0;	
-	pp_identity.noise.grain			= 1.0f;	
-	pp_identity.noise.fps			= 30;
-	pp_identity.color_base.set		(.5f,	.5f,	.5f);
-	pp_identity.color_gray.set		(.333f,	.333f,	.333f);
-	pp_identity.color_add.set		(0,		0,		0);
-
-	pp_zero.blur = pp_zero.gray		= pp_zero.duality.h = pp_zero.duality.v = 0.0f;
-	pp_zero.noise.intensity			=0;
-	pp_zero.noise.grain				= 0.0f;	
-	pp_zero.noise.fps				= 0.0f;
-	pp_zero.color_base.set			(0,0,0);
-	pp_zero.color_gray.set			(0,0,0);
-	pp_zero.color_add.set			(0,0,0);
-
-	pp_affected						= pp_identity;
+    m_bAutoApply = bApplyOnUpdate;
+
+    pp_identity.blur = 0;
+    pp_identity.gray = 0;
+    pp_identity.duality.h = 0;
+    pp_identity.duality.v = 0;
+    pp_identity.noise.intensity = 0;
+    pp_identity.noise.grain = 1.0f;
+    pp_identity.noise.fps = 30;
+    pp_identity.color_base.set(.5f, .5f, .5f);
+    pp_identity.color_gray.set(.333f, .333f, .333f);
+    pp_identity.color_add.set(0, 0, 0);
+
+    pp_zero.blur = pp_zero.gray = pp_zero.duality.h = pp_zero.duality.v = 0.0f;
+    pp_zero.noise.intensity = 0;
+    pp_zero.noise.grain = 0.0f;
+    pp_zero.noise.fps = 0.0f;
+    pp_zero.color_base.set(0, 0, 0);
+    pp_zero.color_gray.set(0, 0, 0);
+    pp_zero.color_add.set(0, 0, 0);
+
+    pp_affected = pp_identity;
 }
 
 CCameraManager::~CCameraManager()
 {
-	for (EffectorCamIt it=m_EffectorsCam.begin(); it!=m_EffectorsCam.end(); it++ )
-		xr_delete(*it);
-	for (EffectorPPIt it=m_EffectorsPP.begin(); it!=m_EffectorsPP.end(); it++ )
-		xr_delete(*it);
+    for (EffectorCamIt it = m_EffectorsCam.begin(); it != m_EffectorsCam.end(); it++)
+        xr_delete(*it);
+    for (EffectorPPIt it = m_EffectorsPP.begin(); it != m_EffectorsPP.end(); it++)
+        xr_delete(*it);
 }
 
-CEffectorCam* CCameraManager::GetCamEffector(ECamEffectorType type)	
-{ 
-	for (EffectorCamIt it=m_EffectorsCam.begin(); it!=m_EffectorsCam.end(); it++ )
-		if ((*it)->eType==type)
-		{
-			return *it;
-		}
-	return 0;
+CEffectorCam* CCameraManager::GetCamEffector(ECamEffectorType type)
+{
+    for (EffectorCamIt it = m_EffectorsCam.begin(); it != m_EffectorsCam.end(); it++)
+        if ((*it)->eType == type)
+        {
+            return *it;
+        }
+    return 0;
 }
 
 CEffectorCam* CCameraManager::AddCamEffector(CEffectorCam* ef)
 {
-	m_EffectorsCam_added_deffered.push_back(ef);
-	return m_EffectorsCam_added_deffered.back();
+    m_EffectorsCam_added_deffered.push_back(ef);
+    return m_EffectorsCam_added_deffered.back();
 }
 
 void CCameraManager::UpdateDeffered()
 {
-	EffectorCamIt it		= m_EffectorsCam_added_deffered.begin();
-	EffectorCamIt it_e		= m_EffectorsCam_added_deffered.end();
-	for (; it!=it_e; ++it)
-	{
-		RemoveCamEffector			( (*it)->eType );
-		
-		if((*it)->AbsolutePositioning())
-			m_EffectorsCam.push_front(*it);
-		else
-			m_EffectorsCam.push_back	(*it);
-	}
-
-	m_EffectorsCam_added_deffered.clear	();
+    EffectorCamIt it = m_EffectorsCam_added_deffered.begin();
+    EffectorCamIt it_e = m_EffectorsCam_added_deffered.end();
+    for (; it != it_e; ++it)
+    {
+        RemoveCamEffector((*it)->eType);
+
+        if ((*it)->AbsolutePositioning())
+            m_EffectorsCam.push_front(*it);
+        else
+            m_EffectorsCam.push_back(*it);
+    }
+
+    m_EffectorsCam_added_deffered.clear();
 }
 
 void CCameraManager::RemoveCamEffector(ECamEffectorType type)
 {
-	for (EffectorCamIt it=m_EffectorsCam.begin(); it!=m_EffectorsCam.end(); it++ )
-		if ((*it)->eType==type)
-		{ 
-			OnEffectorReleased	(*it);
-			m_EffectorsCam.erase(it);
-			return;
-		}
+    for (EffectorCamIt it = m_EffectorsCam.begin(); it != m_EffectorsCam.end(); it++)
+        if ((*it)->eType == type)
+        {
+            OnEffectorReleased(*it);
+            m_EffectorsCam.erase(it);
+            return;
+        }
 }
 
-CEffectorPP* CCameraManager::GetPPEffector(EEffectorPPType type)	
-{ 
-	for (EffectorPPIt it=m_EffectorsPP.begin(); it!=m_EffectorsPP.end(); it++ )
-		if ((*it)->Type()==type) return *it;
-	return 0;
+CEffectorPP* CCameraManager::GetPPEffector(EEffectorPPType type)
+{
+    for (EffectorPPIt it = m_EffectorsPP.begin(); it != m_EffectorsPP.end(); it++)
+        if ((*it)->Type() == type) return *it;
+    return 0;
 }
 
-ECamEffectorType   CCameraManager::RequestCamEffectorId ()
+ECamEffectorType CCameraManager::RequestCamEffectorId()
 {
-	for ( ECamEffectorType	index	=	(ECamEffectorType)effCustomEffectorStartID;
-							GetCamEffector(index);
-							index	=	(ECamEffectorType)(index+1) ) { ; }
-	return index;
+    for (ECamEffectorType index = (ECamEffectorType)effCustomEffectorStartID;
+         GetCamEffector(index);
+         index = (ECamEffectorType)(index + 1))
+    {
+        ;
+    }
+    return index;
 }
 
-EEffectorPPType   CCameraManager::RequestPPEffectorId ()
+EEffectorPPType CCameraManager::RequestPPEffectorId()
 {
-	for ( EEffectorPPType	index	=	(EEffectorPPType)effCustomEffectorStartID;
-							GetPPEffector(index);
-							index	=	(EEffectorPPType)(index+1) ) { ; }
-	return index;
+    for (EEffectorPPType index = (EEffectorPPType)effCustomEffectorStartID;
+         GetPPEffector(index);
+         index = (EEffectorPPType)(index + 1))
+    {
+        ;
+    }
+    return index;
 }
 
-CEffectorPP* CCameraManager::AddPPEffector(CEffectorPP* ef) 
+CEffectorPP* CCameraManager::AddPPEffector(CEffectorPP* ef)
 {
-	RemovePPEffector				(ef->Type());
-	m_EffectorsPP.push_back			(ef);
-	return m_EffectorsPP.back		();
+    RemovePPEffector(ef->Type());
+    m_EffectorsPP.push_back(ef);
+    return m_EffectorsPP.back();
 }
 
 void CCameraManager::RemovePPEffector(EEffectorPPType type)
 {
-	for (EffectorPPIt it=m_EffectorsPP.begin(); it!=m_EffectorsPP.end(); it++ )
-		if ((*it)->Type()==type){ 
-			if ((*it)->FreeOnRemove())
-			{
-				OnEffectorReleased		(*it);
-//				xr_delete				(*it);
-			}
-			m_EffectorsPP.erase			(it);
-			return;
-		}
+    for (EffectorPPIt it = m_EffectorsPP.begin(); it != m_EffectorsPP.end(); it++)
+        if ((*it)->Type() == type)
+        {
+            if ((*it)->FreeOnRemove())
+            {
+                OnEffectorReleased(*it);
+                // xr_delete (*it);
+            }
+            m_EffectorsPP.erase(it);
+            return;
+        }
 }
 
 void CCameraManager::OnEffectorReleased(SBaseEffector* e)
 {
-	if(!e->m_on_b_remove_callback.empty())
-		e->m_on_b_remove_callback();
+    if (!e->m_on_b_remove_callback.empty())
+        e->m_on_b_remove_callback();
 
-	xr_delete(e);
+    xr_delete(e);
 }
 
 void CCameraManager::UpdateFromCamera(const CCameraBase* C)
-{	
-	Update(C->vPosition,C->vDirection,C->vNormal, C->f_fov, C->f_aspect, g_pGamePersistent->Environment().CurrentEnv->far_plane, C->m_Flags.flags); 
+{
+    Update(C->vPosition, C->vDirection, C->vNormal, C->f_fov, C->f_aspect, g_pGamePersistent->Environment().CurrentEnv->far_plane, C->m_Flags.flags);
 }
 
 void CCameraManager::Update(const Fvector& P, const Fvector& D, const Fvector& N, float fFOV_Dest, float fASPECT_Dest, float fFAR_Dest, u32 flags)
 {
 #ifdef DEBUG
-	if (!Device.Paused()) {
-		VERIFY				(dbg_upd_frame!=Device.dwFrame);// already updated !!!
-		dbg_upd_frame		= Device.dwFrame;
-	}
+    if (!Device.Paused())
+    {
+        VERIFY(dbg_upd_frame != Device.dwFrame);// already updated !!!
+        dbg_upd_frame = Device.dwFrame;
+    }
 #endif // DEBUG
-	// camera
-	if (flags&CCameraBase::flPositionRigid)
-		m_cam_info.p.set		(P);
-	else
-		m_cam_info.p.inertion	(P,	psCamInert);
-	if (flags&CCameraBase::flDirectionRigid)
-	{
-		m_cam_info.d.set		(D);
-		m_cam_info.n.set		(N);
-	}else{
-		m_cam_info.d.inertion	(D,	psCamInert);
-		m_cam_info.n.inertion	(N,	psCamInert);
-	}
-	
-	// Normalize
-	m_cam_info.d.normalize	();
-	m_cam_info.n.normalize	();
-	m_cam_info.r.crossproduct	(m_cam_info.n, m_cam_info.d);
-	m_cam_info.n.crossproduct	(m_cam_info.d, m_cam_info.r);
-
-	float aspect				= Device.fHeight_2/Device.fWidth_2;
-	float src					= 10*Device.fTimeDelta;	clamp(src,0.f,1.f);
-	float dst					= 1-src;
-	m_cam_info.fFov				= m_cam_info.fFov*dst		+ fFOV_Dest*src;
-	m_cam_info.fFar				= m_cam_info.fFar*dst		+ fFAR_Dest*src;
-	m_cam_info.fAspect			= m_cam_info.fAspect*dst	+ (fASPECT_Dest*aspect)*src;
-	m_cam_info.dont_apply			= false;
-
-	UpdateCamEffectors			();
-
-	UpdatePPEffectors			();
-
-	if (false==m_cam_info.dont_apply && m_bAutoApply)
-			ApplyDevice		(VIEWPORT_NEAR);
-
-	UpdateDeffered			();
+    // camera
+    if (flags&CCameraBase::flPositionRigid)
+        m_cam_info.p.set(P);
+    else
+        m_cam_info.p.inertion(P, psCamInert);
+    if (flags&CCameraBase::flDirectionRigid)
+    {
+        m_cam_info.d.set(D);
+        m_cam_info.n.set(N);
+    }
+    else
+    {
+        m_cam_info.d.inertion(D, psCamInert);
+        m_cam_info.n.inertion(N, psCamInert);
+    }
+
+    // Normalize
+    m_cam_info.d.normalize();
+    m_cam_info.n.normalize();
+    m_cam_info.r.crossproduct(m_cam_info.n, m_cam_info.d);
+    m_cam_info.n.crossproduct(m_cam_info.d, m_cam_info.r);
+
+    float aspect = Device.fHeight_2 / Device.fWidth_2;
+    float src = 10 * Device.fTimeDelta;
+    clamp(src, 0.f, 1.f);
+    float dst = 1 - src;
+    m_cam_info.fFov = m_cam_info.fFov*dst + fFOV_Dest*src;
+    m_cam_info.fFar = m_cam_info.fFar*dst + fFAR_Dest*src;
+    m_cam_info.fAspect = m_cam_info.fAspect*dst + (fASPECT_Dest*aspect)*src;
+    m_cam_info.dont_apply = false;
+
+    UpdateCamEffectors();
+
+    UpdatePPEffectors();
+
+    if (false == m_cam_info.dont_apply && m_bAutoApply)
+        ApplyDevice(VIEWPORT_NEAR);
+
+    UpdateDeffered();
 }
 
 bool CCameraManager::ProcessCameraEffector(CEffectorCam* eff)
 {
-	bool res = false;
-	if(eff->Valid() && eff->ProcessCam(m_cam_info))
-	{
-		res = true;
-	}else
-	{
-		if(eff->AllowProcessingIfInvalid())
-		{
-			eff->ProcessIfInvalid(m_cam_info);
-			res = true;
-		}
-
-		EffectorCamVec::iterator it = std::find(m_EffectorsCam.begin(), m_EffectorsCam.end(), eff);
-
-		m_EffectorsCam.erase(it);
-		OnEffectorReleased	(eff);
-	}
-	return res;
+    bool res = false;
+    if (eff->Valid() && eff->ProcessCam(m_cam_info))
+    {
+        res = true;
+    }
+    else
+    {
+        if (eff->AllowProcessingIfInvalid())
+        {
+            eff->ProcessIfInvalid(m_cam_info);
+            res = true;
+        }
+
+        EffectorCamVec::iterator it = std::find(m_EffectorsCam.begin(), m_EffectorsCam.end(), eff);
+
+        m_EffectorsCam.erase(it);
+        OnEffectorReleased(eff);
+    }
+    return res;
 }
 
 void CCameraManager::UpdateCamEffectors()
 {
-	if (m_EffectorsCam.empty()) 	return;
-	EffectorCamVec::reverse_iterator rit	= m_EffectorsCam.rbegin();
-	for(; rit!=m_EffectorsCam.rend(); ++rit)
-		ProcessCameraEffector(*rit);
-
-	m_cam_info.d.normalize			();
-	m_cam_info.n.normalize			();
-	m_cam_info.r.crossproduct		(m_cam_info.n,m_cam_info.d);
-	m_cam_info.n.crossproduct		(m_cam_info.d,m_cam_info.r);
+    if (m_EffectorsCam.empty()) return;
+    EffectorCamVec::reverse_iterator rit = m_EffectorsCam.rbegin();
+    for (; rit != m_EffectorsCam.rend(); ++rit)
+        ProcessCameraEffector(*rit);
+
+    m_cam_info.d.normalize();
+    m_cam_info.n.normalize();
+    m_cam_info.r.crossproduct(m_cam_info.n, m_cam_info.d);
+    m_cam_info.n.crossproduct(m_cam_info.d, m_cam_info.r);
 }
 
 void CCameraManager::UpdatePPEffectors()
 {
-	pp_affected.validate		("before applying pp");
-
-	int		_count	= 0;
-	if(m_EffectorsPP.size()) 
-	{
-		bool b = false;
-		pp_affected = pp_identity;
-		for(int i = m_EffectorsPP.size()-1; i >= 0; --i) 
-		{
-			CEffectorPP* eff	= m_EffectorsPP[i];
-			SPPInfo l_PPInf		= pp_zero;
-			if(eff->Valid() && eff->Process(l_PPInf))
-			{
-				++_count;
-				if(!b)
-				{
-					pp_affected.add		(l_PPInf);
-					pp_affected.sub		(pp_identity);
-					pp_affected.validate("in cycle");
-				}
-				if(!eff->bOverlap)
-				{
-					b				= true;
-					pp_affected		= l_PPInf;
-				}
-			}else 
-				RemovePPEffector	(eff->Type());
-		}
-		if (0==_count)	
-			pp_affected				= pp_identity;
-		else			
-			pp_affected.normalize	();
-	} else 
-	{
-		pp_affected					= pp_identity;
-	}
-
-	if( !positive(pp_affected.noise.grain) ) 
-		pp_affected.noise.grain		= pp_identity.noise.grain;
-	
-	pp_affected.validate			("after applying pp");
+    pp_affected.validate("before applying pp");
+
+    int _count = 0;
+    if (m_EffectorsPP.size())
+    {
+        bool b = false;
+        pp_affected = pp_identity;
+        for (int i = m_EffectorsPP.size() - 1; i >= 0; --i)
+        {
+            CEffectorPP* eff = m_EffectorsPP[i];
+            SPPInfo l_PPInf = pp_zero;
+            if (eff->Valid() && eff->Process(l_PPInf))
+            {
+                ++_count;
+                if (!b)
+                {
+                    pp_affected.add(l_PPInf);
+                    pp_affected.sub(pp_identity);
+                    pp_affected.validate("in cycle");
+                }
+                if (!eff->bOverlap)
+                {
+                    b = true;
+                    pp_affected = l_PPInf;
+                }
+            }
+            else
+                RemovePPEffector(eff->Type());
+        }
+        if (0 == _count)
+            pp_affected = pp_identity;
+        else
+            pp_affected.normalize();
+    }
+    else
+    {
+        pp_affected = pp_identity;
+    }
+
+    if (!positive(pp_affected.noise.grain))
+        pp_affected.noise.grain = pp_identity.noise.grain;
+
+    pp_affected.validate("after applying pp");
 }
 
 
 
-void CCameraManager::ApplyDevice (float _viewport_near)
+void CCameraManager::ApplyDevice(float _viewport_near)
 {
-	// Device params
-	Device.mView.build_camera_dir(m_cam_info.p, m_cam_info.d, m_cam_info.n);
-
-	Device.vCameraPosition.set	( m_cam_info.p );
-	Device.vCameraDirection.set	( m_cam_info.d );
-	Device.vCameraTop.set		( m_cam_info.n );
-	Device.vCameraRight.set		( m_cam_info.r );
-
-	// projection
-	Device.fFOV					= m_cam_info.fFov;
-	Device.fASPECT				= m_cam_info.fAspect;
-	Device.mProject.build_projection(deg2rad(m_cam_info.fFov), m_cam_info.fAspect, _viewport_near, m_cam_info.fFar);
-
-	if( g_pGamePersistent && g_pGamePersistent->m_pMainMenu->IsActive() )
-		ResetPP					();
-	else
-	{
-		pp_affected.validate		("apply device");
-		// postprocess
-		IRender_Target*		T		= ::Render->getTarget();
-		T->set_duality_h			(pp_affected.duality.h);
-		T->set_duality_v			(pp_affected.duality.v);
-		T->set_blur					(pp_affected.blur);
-		T->set_gray					(pp_affected.gray);
-		T->set_noise				(pp_affected.noise.intensity);
-
-		clamp						(pp_affected.noise.grain,EPS_L,1000.0f);
-
-		T->set_noise_scale			(pp_affected.noise.grain);
-
-		T->set_noise_fps			(pp_affected.noise.fps);
-		T->set_color_base			(pp_affected.color_base);
-		T->set_color_gray			(pp_affected.color_gray);
-		T->set_color_add			(pp_affected.color_add);
-
-		T->set_cm_imfluence			(pp_affected.cm_influence);
-		T->set_cm_interpolate		(pp_affected.cm_interpolate);
-		T->set_cm_textures			(pp_affected.cm_tex1, pp_affected.cm_tex2);
-	}
+    // Device params
+    Device.mView.build_camera_dir(m_cam_info.p, m_cam_info.d, m_cam_info.n);
+
+    Device.vCameraPosition.set(m_cam_info.p);
+    Device.vCameraDirection.set(m_cam_info.d);
+    Device.vCameraTop.set(m_cam_info.n);
+    Device.vCameraRight.set(m_cam_info.r);
+
+    // projection
+    Device.fFOV = m_cam_info.fFov;
+    Device.fASPECT = m_cam_info.fAspect;
+    Device.mProject.build_projection(deg2rad(m_cam_info.fFov), m_cam_info.fAspect, _viewport_near, m_cam_info.fFar);
+
+    if (g_pGamePersistent && g_pGamePersistent->m_pMainMenu->IsActive())
+        ResetPP();
+    else
+    {
+        pp_affected.validate("apply device");
+        // postprocess
+        IRender_Target* T = ::Render->getTarget();
+        T->set_duality_h(pp_affected.duality.h);
+        T->set_duality_v(pp_affected.duality.v);
+        T->set_blur(pp_affected.blur);
+        T->set_gray(pp_affected.gray);
+        T->set_noise(pp_affected.noise.intensity);
+
+        clamp(pp_affected.noise.grain, EPS_L, 1000.0f);
+
+        T->set_noise_scale(pp_affected.noise.grain);
+
+        T->set_noise_fps(pp_affected.noise.fps);
+        T->set_color_base(pp_affected.color_base);
+        T->set_color_gray(pp_affected.color_gray);
+        T->set_color_add(pp_affected.color_add);
+
+        T->set_cm_imfluence(pp_affected.cm_influence);
+        T->set_cm_interpolate(pp_affected.cm_interpolate);
+        T->set_cm_textures(pp_affected.cm_tex1, pp_affected.cm_tex2);
+    }
 }
 
 void CCameraManager::ResetPP()
 {
-	IRender_Target*		T	= ::Render->getTarget();
-	T->set_duality_h		(pp_identity.duality.h);
-	T->set_duality_v		(pp_identity.duality.v);
-	T->set_blur				(pp_identity.blur);
-	T->set_gray				(pp_identity.gray);
-	T->set_noise			(pp_identity.noise.intensity);
-	T->set_noise_scale		(pp_identity.noise.grain);
-	T->set_noise_fps		(pp_identity.noise.fps);
-	T->set_color_base		(pp_identity.color_base);
-	T->set_color_gray		(pp_identity.color_gray);
-	T->set_color_add		(pp_identity.color_add);
-	T->set_cm_imfluence		(0.0f);
-	T->set_cm_interpolate	(1.0f);
-	T->set_cm_textures		("", "");
+    IRender_Target* T = ::Render->getTarget();
+    T->set_duality_h(pp_identity.duality.h);
+    T->set_duality_v(pp_identity.duality.v);
+    T->set_blur(pp_identity.blur);
+    T->set_gray(pp_identity.gray);
+    T->set_noise(pp_identity.noise.intensity);
+    T->set_noise_scale(pp_identity.noise.grain);
+    T->set_noise_fps(pp_identity.noise.fps);
+    T->set_color_base(pp_identity.color_base);
+    T->set_color_gray(pp_identity.color_gray);
+    T->set_color_add(pp_identity.color_add);
+    T->set_cm_imfluence(0.0f);
+    T->set_cm_interpolate(1.0f);
+    T->set_cm_textures("", "");
 }
 
 void CCameraManager::Dump()
 {
-	Fmatrix mInvCamera;
-	Fvector _R,_U,_T,_P;
-	
-	mInvCamera.invert(Device.mView);
-	_R.set( mInvCamera._11, mInvCamera._12, mInvCamera._13 );
-	_U.set( mInvCamera._21, mInvCamera._22, mInvCamera._23 );
-	_T.set( mInvCamera._31, mInvCamera._32, mInvCamera._33 );
-	_P.set( mInvCamera._41, mInvCamera._42, mInvCamera._43 );
-	Log("CCameraManager::Dump::vPosition  = ",_P);
-	Log("CCameraManager::Dump::vDirection = ",_T);
-	Log("CCameraManager::Dump::vNormal    = ",_U);
-	Log("CCameraManager::Dump::vRight     = ",_R);
+    Fmatrix mInvCamera;
+    Fvector _R, _U, _T, _P;
+
+    mInvCamera.invert(Device.mView);
+    _R.set(mInvCamera._11, mInvCamera._12, mInvCamera._13);
+    _U.set(mInvCamera._21, mInvCamera._22, mInvCamera._23);
+    _T.set(mInvCamera._31, mInvCamera._32, mInvCamera._33);
+    _P.set(mInvCamera._41, mInvCamera._42, mInvCamera._43);
+    Log("CCameraManager::Dump::vPosition = ", _P);
+    Log("CCameraManager::Dump::vDirection = ", _T);
+    Log("CCameraManager::Dump::vNormal = ", _U);
+    Log("CCameraManager::Dump::vRight = ", _R);
 }
diff --git a/src/xrEngine/CameraManager.h b/src/xrEngine/CameraManager.h
index 7eeca1f1da0..db7ff31f2b8 100644
--- a/src/xrEngine/CameraManager.h
+++ b/src/xrEngine/CameraManager.h
@@ -2,136 +2,156 @@
 
 #include "CameraDefs.h"
 
-struct ENGINE_API SPPInfo {
-	struct SColor{
-		float r, g, b;
-		SColor					(){}
-		SColor					(float _r, float _g, float _b):r(_r),g(_g),b(_b){}
-		IC operator u32()										{
-			int		_r	= clampr	(iFloor(r*255.f+.5f),0,255);
-			int		_g	= clampr	(iFloor(g*255.f+.5f),0,255);
-			int		_b	= clampr	(iFloor(b*255.f+.5f),0,255);
-			return color_rgba		(_r,_g,_b,0);
-		}
-
-		IC operator const Fvector&()										{
-			return *((Fvector*)this);
-		}
-
-		IC SColor& operator +=	(const SColor &ppi)				{
-			r += ppi.r; g += ppi.g; b += ppi.b; 
-			return *this;
-		}
-		IC SColor& operator -=	(const SColor &ppi)				{
-			r -= ppi.r; g -= ppi.g; b -= ppi.b; 
-			return *this;
-		}
-		IC SColor& set			(float _r, float _g, float _b)	{
-			r=_r;g=_g;b=_b;
-			return *this;
-		}
-	};
-	float		blur, gray;
-	struct SDuality { 
-		float h, v; 
-		SDuality				(){}
-		SDuality				(float _h, float _v):h(_h),v(_v){}
-		IC SDuality& set		(float _h, float _v)			{
-			h=_h;v=_v;
-			return *this;
-		}
-	} duality;
-	struct SNoise	{
-		float		intensity, grain;
-		float		fps;
-		SNoise					(){}
-		SNoise					(float _i, float _g, float _f):intensity(_i),grain(_g),fps(_f){}
-		IC SNoise& set			(float _i, float _g, float _f){
-			intensity=_i;grain=_g;fps=_f;
-			return *this;
-		}
-	} noise;
-
-	SColor				color_base;
-	SColor				color_gray;
-	SColor				color_add;
-	float				cm_influence;
-	float				cm_interpolate;
-	shared_str			cm_tex1;
-	shared_str			cm_tex2;
-	
-	SPPInfo& add		(const SPPInfo &ppi);
-	SPPInfo& sub		(const SPPInfo &ppi);
-	void normalize		();
-	SPPInfo				();
-	SPPInfo&	lerp	(const SPPInfo& def, const SPPInfo& to, float factor);
-	void		validate(LPCSTR str);
+struct ENGINE_API SPPInfo
+{
+    struct SColor
+    {
+        float r, g, b;
+        SColor() {}
+        SColor(float _r, float _g, float _b) :r(_r), g(_g), b(_b) {}
+        IC operator u32()
+        {
+            int _r = clampr(iFloor(r*255.f + .5f), 0, 255);
+            int _g = clampr(iFloor(g*255.f + .5f), 0, 255);
+            int _b = clampr(iFloor(b*255.f + .5f), 0, 255);
+            return color_rgba(_r, _g, _b, 0);
+        }
+
+        IC operator const Fvector& ()
+        {
+            return *((Fvector*)this);
+        }
+
+        IC SColor& operator += (const SColor& ppi)
+        {
+            r += ppi.r;
+            g += ppi.g;
+            b += ppi.b;
+            return *this;
+        }
+        IC SColor& operator -= (const SColor& ppi)
+        {
+            r -= ppi.r;
+            g -= ppi.g;
+            b -= ppi.b;
+            return *this;
+        }
+        IC SColor& set(float _r, float _g, float _b)
+        {
+            r = _r;
+            g = _g;
+            b = _b;
+            return *this;
+        }
+    };
+    float blur, gray;
+    struct SDuality
+    {
+        float h, v;
+        SDuality() {}
+        SDuality(float _h, float _v) :h(_h), v(_v) {}
+        IC SDuality& set(float _h, float _v)
+        {
+            h = _h;
+            v = _v;
+            return *this;
+        }
+    } duality;
+    struct SNoise
+    {
+        float intensity, grain;
+        float fps;
+        SNoise() {}
+        SNoise(float _i, float _g, float _f) :intensity(_i), grain(_g), fps(_f) {}
+        IC SNoise& set(float _i, float _g, float _f)
+        {
+            intensity = _i;
+            grain = _g;
+            fps = _f;
+            return *this;
+        }
+    } noise;
+
+    SColor color_base;
+    SColor color_gray;
+    SColor color_add;
+    float cm_influence;
+    float cm_interpolate;
+    shared_str cm_tex1;
+    shared_str cm_tex2;
+
+    SPPInfo& add(const SPPInfo& ppi);
+    SPPInfo& sub(const SPPInfo& ppi);
+    void normalize();
+    SPPInfo();
+    SPPInfo& lerp(const SPPInfo& def, const SPPInfo& to, float factor);
+    void validate(LPCSTR str);
 };
 
-DEFINE_LIST				(CEffectorCam*,EffectorCamVec,EffectorCamIt);
-DEFINE_VECTOR				(CEffectorPP*,EffectorPPVec,EffectorPPIt);
+DEFINE_LIST(CEffectorCam*, EffectorCamVec, EffectorCamIt);
+DEFINE_VECTOR(CEffectorPP*, EffectorPPVec, EffectorPPIt);
 
-#define			effCustomEffectorStartID	10000
+#define effCustomEffectorStartID 10000
 
 struct SCamEffectorInfo;
 class ENGINE_API CCameraManager
 {
 protected:
-	SCamEffectorInfo		m_cam_info;
+    SCamEffectorInfo m_cam_info;
 
-	BENCH_SEC_SCRAMBLEMEMBER1
+    BENCH_SEC_SCRAMBLEMEMBER1
 
-	EffectorCamVec			m_EffectorsCam;
-	EffectorCamVec			m_EffectorsCam_added_deffered;
-	EffectorPPVec			m_EffectorsPP;
+    EffectorCamVec m_EffectorsCam;
+    EffectorCamVec m_EffectorsCam_added_deffered;
+    EffectorPPVec m_EffectorsPP;
 
-	bool					m_bAutoApply;
-	SPPInfo					pp_affected;
-	void					UpdateDeffered();
+    bool m_bAutoApply;
+    SPPInfo pp_affected;
+    void UpdateDeffered();
 
-	BENCH_SEC_SCRAMBLEVTBL1
-	virtual void			UpdateCamEffectors		();
-	virtual void			UpdatePPEffectors		();
-	virtual bool			ProcessCameraEffector	(CEffectorCam* eff);
-			void			OnEffectorReleased		(SBaseEffector* e);
+    BENCH_SEC_SCRAMBLEVTBL1
+    virtual void UpdateCamEffectors();
+    virtual void UpdatePPEffectors();
+    virtual bool ProcessCameraEffector(CEffectorCam* eff);
+    void OnEffectorReleased(SBaseEffector* e);
 public:
-#ifdef DEBUG	
-	u32						dbg_upd_frame;
+#ifdef DEBUG
+    u32 dbg_upd_frame;
 #endif
 
-	BENCH_SEC_SCRAMBLEMEMBER2
-
-	void					Dump					();
-	u32						Count					()	{return m_EffectorsCam.size()+m_EffectorsCam_added_deffered.size();}
-	CEffectorCam*			AddCamEffector			(CEffectorCam*		ef);
-	CEffectorCam*			GetCamEffector			(ECamEffectorType	type);
-	void					RemoveCamEffector		(ECamEffectorType	type);
-
-	ECamEffectorType		RequestCamEffectorId	();
-	EEffectorPPType			RequestPPEffectorId		();
-	CEffectorPP*			GetPPEffector			(EEffectorPPType	type);
-	CEffectorPP*			AddPPEffector			(CEffectorPP*		ef);
-	void					RemovePPEffector		(EEffectorPPType	type);
-
-	IC Fvector				Position				()	const { return m_cam_info.p;	}
-	IC Fvector				Direction				()	const { return m_cam_info.d;}
-	IC Fvector				Up						()	const { return m_cam_info.n;	}
-	IC Fvector				Right					()	const { return m_cam_info.r;	}
-	IC float				Fov						()	const { return m_cam_info.fFov; }
-	IC float				Aspect					()	const { return m_cam_info.fAspect; }
-
-	IC void					camera_Matrix			(Fmatrix& M){M.set(m_cam_info.r,m_cam_info.n,m_cam_info.d,m_cam_info.p);}
-	void					Update					(const Fvector& P, const Fvector& D, const Fvector& N, float fFOV_Dest, float fASPECT_Dest, float fFAR_Dest, u32 flags);
-	void					UpdateFromCamera		(const CCameraBase* C);
-	
-	void					ApplyDevice				(float _viewport_near);
-	static void				ResetPP					();
-
-							CCameraManager			(bool bApplyOnUpdate);
-	virtual					~CCameraManager			();
+    BENCH_SEC_SCRAMBLEMEMBER2
+
+    void Dump();
+    u32 Count() { return m_EffectorsCam.size() + m_EffectorsCam_added_deffered.size(); }
+    CEffectorCam* AddCamEffector(CEffectorCam* ef);
+    CEffectorCam* GetCamEffector(ECamEffectorType type);
+    void RemoveCamEffector(ECamEffectorType type);
+
+    ECamEffectorType RequestCamEffectorId();
+    EEffectorPPType RequestPPEffectorId();
+    CEffectorPP* GetPPEffector(EEffectorPPType type);
+    CEffectorPP* AddPPEffector(CEffectorPP* ef);
+    void RemovePPEffector(EEffectorPPType type);
+
+    IC Fvector Position() const { return m_cam_info.p; }
+    IC Fvector Direction() const { return m_cam_info.d; }
+    IC Fvector Up() const { return m_cam_info.n; }
+    IC Fvector Right() const { return m_cam_info.r; }
+    IC float Fov() const { return m_cam_info.fFov; }
+    IC float Aspect() const { return m_cam_info.fAspect; }
+
+    IC void camera_Matrix(Fmatrix& M) { M.set(m_cam_info.r, m_cam_info.n, m_cam_info.d, m_cam_info.p); }
+    void Update(const Fvector& P, const Fvector& D, const Fvector& N, float fFOV_Dest, float fASPECT_Dest, float fFAR_Dest, u32 flags);
+    void UpdateFromCamera(const CCameraBase* C);
+
+    void ApplyDevice(float _viewport_near);
+    static void ResetPP();
+
+    CCameraManager(bool bApplyOnUpdate);
+    virtual ~CCameraManager();
 };
-ENGINE_API extern SPPInfo					pp_identity;
-ENGINE_API extern SPPInfo					pp_zero;
+ENGINE_API extern SPPInfo pp_identity;
+ENGINE_API extern SPPInfo pp_zero;
 
-ENGINE_API extern float						psCamInert;
-ENGINE_API extern float						psCamSlideInert;
+ENGINE_API extern float psCamInert;
+ENGINE_API extern float psCamSlideInert;
diff --git a/src/xrEngine/CopyProtection.h b/src/xrEngine/CopyProtection.h
index d9070104673..0f8a63bcb3f 100644
--- a/src/xrEngine/CopyProtection.h
+++ b/src/xrEngine/CopyProtection.h
@@ -5,41 +5,47 @@
 #endif
 
 // [4/28/2004]
-#ifdef	USE_COPYPROTECTION
+#ifdef USE_COPYPROTECTION
 
 #pragma pack(push,1)
-typedef struct SECUROM_PID{
-	int pid_error;
-	unsigned long pid_version;
-	union{
-		unsigned char pid_buf[264];
-		struct{
-			unsigned char pid_reserved[3];
-			unsigned char pid_type;
-			unsigned long pid_length;
-			unsigned char pid_data[256];
-		};
-	};
-}tSECUROM_PID;
+typedef struct SECUROM_PID
+{
+    int pid_error;
+    unsigned long pid_version;
+    union
+    {
+        unsigned char pid_buf[264];
+        struct
+        {
+            unsigned char pid_reserved[3];
+            unsigned char pid_type;
+            unsigned long pid_length;
+            unsigned char pid_data[256];
+        };
+    };
+} tSECUROM_PID;
 #pragma pack(pop)
 
-IC	void	CheckCopyProtection	()
+IC void CheckCopyProtection()
 {
-	u32		ret;
+    u32 ret;
 
-	__asm{
-		mov eax,8791h;
-		mov ebx,2107h;
-		mov ecx,6345h;
-	};
-	ret=GetVersion();
+    __asm
+    {
+        mov eax, 8791h;
+        mov ebx, 2107h;
+        mov ecx, 6345h;
+    };
+    ret = GetVersion();
 
-	if(ret!=0x6345){
-		MessageBox(NULL,"Copy protection violation!","Error",MB_OK | MB_ICONHAND);
-		TerminateProcess(GetCurrentProcess(),0x66);
-	}
+    if (ret != 0x6345)
+    {
+        MessageBox(NULL, "Copy protection violation!", "Error", MB_OK | MB_ICONHAND);
+        TerminateProcess(GetCurrentProcess(), 0x66);
+    }
 }
 #else
-IC	void	CheckCopyProtection	()	{
+IC void CheckCopyProtection()
+{
 }
 #endif
diff --git a/src/xrEngine/CustomHUD.cpp b/src/xrEngine/CustomHUD.cpp
index 8ff11889857..427d17fa3cf 100644
--- a/src/xrEngine/CustomHUD.cpp
+++ b/src/xrEngine/CustomHUD.cpp
@@ -1,19 +1,19 @@
 #include "stdafx.h"
 #include "CustomHUD.h"
 
-Flags32 psHUD_Flags = {HUD_CROSSHAIR_RT|HUD_WEAPON_RT|HUD_WEAPON_RT2|HUD_CROSSHAIR_DYNAMIC|HUD_CROSSHAIR_RT2|HUD_DRAW_RT|HUD_DRAW_RT2};
+Flags32 psHUD_Flags = {HUD_CROSSHAIR_RT | HUD_WEAPON_RT | HUD_WEAPON_RT2 | HUD_CROSSHAIR_DYNAMIC | HUD_CROSSHAIR_RT2 | HUD_DRAW_RT | HUD_DRAW_RT2};
 
 ENGINE_API CCustomHUD* g_hud = NULL;
 
 CCustomHUD::CCustomHUD()
 {
-	g_hud = this;
-	Device.seqResolutionChanged.Add(this);
+    g_hud = this;
+    Device.seqResolutionChanged.Add(this);
 }
 
 CCustomHUD::~CCustomHUD()
 {
-	g_hud = NULL;
-	Device.seqResolutionChanged.Remove(this);
+    g_hud = NULL;
+    Device.seqResolutionChanged.Remove(this);
 }
 
diff --git a/src/xrEngine/CustomHUD.h b/src/xrEngine/CustomHUD.h
index e86fae2abcb..828b24c9e91 100644
--- a/src/xrEngine/CustomHUD.h
+++ b/src/xrEngine/CustomHUD.h
@@ -1,47 +1,47 @@
 #pragma once
 
-ENGINE_API extern Flags32		psHUD_Flags;
-#define HUD_CROSSHAIR			(1<<0)
-#define HUD_CROSSHAIR_DIST		(1<<1)
-#define HUD_WEAPON				(1<<2)
-#define HUD_INFO				(1<<3)
-#define HUD_DRAW				(1<<4)
-#define HUD_CROSSHAIR_RT		(1<<5)
-#define HUD_WEAPON_RT			(1<<6)
-#define HUD_CROSSHAIR_DYNAMIC	(1<<7)
-#define HUD_CROSSHAIR_RT2		(1<<9)
-#define HUD_DRAW_RT				(1<<10)
-#define HUD_WEAPON_RT2			(1<<11)
-#define HUD_DRAW_RT2			(1<<12)
+ENGINE_API extern Flags32 psHUD_Flags;
+#define HUD_CROSSHAIR (1<<0)
+#define HUD_CROSSHAIR_DIST (1<<1)
+#define HUD_WEAPON (1<<2)
+#define HUD_INFO (1<<3)
+#define HUD_DRAW (1<<4)
+#define HUD_CROSSHAIR_RT (1<<5)
+#define HUD_WEAPON_RT (1<<6)
+#define HUD_CROSSHAIR_DYNAMIC (1<<7)
+#define HUD_CROSSHAIR_RT2 (1<<9)
+#define HUD_DRAW_RT (1<<10)
+#define HUD_WEAPON_RT2 (1<<11)
+#define HUD_DRAW_RT2 (1<<12)
 
 class ENGINE_API IRender_Visual;
 class CUI;
 
-class ENGINE_API CCustomHUD:
-	public DLL_Pure,
-	public IEventReceiver,
-	public pureScreenResolutionChanged
+class ENGINE_API CCustomHUD :
+    public DLL_Pure,
+    public IEventReceiver,
+    public pureScreenResolutionChanged
 {
 public:
-					CCustomHUD				();
-	virtual			~CCustomHUD				();
-
-	BENCH_SEC_SCRAMBLEVTBL2
-	
-	virtual		void		Render_First			(){;}
-	virtual		void		Render_Last				(){;}
-
-	BENCH_SEC_SCRAMBLEVTBL1
-	
-	virtual		void		OnFrame					(){;}
-	virtual		void		OnEvent					(EVENT E, u64 P1, u64 P2){;}
-
-	virtual		void		Load					(){;}
-	virtual		void		OnDisconnected			()=0;
-	virtual		void		OnConnected				()=0;
-	virtual		void		RenderActiveItemUI		()=0;
-	virtual		bool		RenderActiveItemUIQuery	()=0;
-	virtual		void		net_Relcase				(CObject *object) = 0;
+    CCustomHUD();
+    virtual ~CCustomHUD();
+
+    BENCH_SEC_SCRAMBLEVTBL2
+
+    virtual void Render_First() { ; }
+    virtual void Render_Last() { ; }
+
+    BENCH_SEC_SCRAMBLEVTBL1
+
+    virtual void OnFrame() { ; }
+    virtual void OnEvent(EVENT E, u64 P1, u64 P2) { ; }
+
+    virtual void Load() { ; }
+    virtual void OnDisconnected() = 0;
+    virtual void OnConnected() = 0;
+    virtual void RenderActiveItemUI() = 0;
+    virtual bool RenderActiveItemUIQuery() = 0;
+    virtual void net_Relcase(CObject* object) = 0;
 };
 
 extern ENGINE_API CCustomHUD* g_hud;
\ No newline at end of file
diff --git a/src/xrEngine/Device_Initialize.cpp b/src/xrEngine/Device_Initialize.cpp
index 5e2668b6a00..864b8d31456 100644
--- a/src/xrEngine/Device_Initialize.cpp
+++ b/src/xrEngine/Device_Initialize.cpp
@@ -3,89 +3,91 @@
 #include "dedicated_server_only.h"
 
 #ifdef INGAME_EDITOR
-#	include "../include/editor/ide.hpp"
-#	include "engine_impl.hpp"
+# include "../include/editor/ide.hpp"
+# include "engine_impl.hpp"
 #endif // #ifdef INGAME_EDITOR
 
-extern LRESULT CALLBACK WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+extern LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 #ifdef INGAME_EDITOR
-void CRenderDevice::initialize_editor	()
+void CRenderDevice::initialize_editor()
 {
-	m_editor_module		= LoadLibrary("editor.dll");
-	if (!m_editor_module) {
-		Msg				("! cannot load library \"editor.dll\"");
-		return;
-	}
+    m_editor_module = LoadLibrary("editor.dll");
+    if (!m_editor_module)
+    {
+        Msg("! cannot load library \"editor.dll\"");
+        return;
+    }
 
-	m_editor_initialize	= (initialize_function_ptr)GetProcAddress(m_editor_module, "initialize");
-	VERIFY				(m_editor_initialize);
+    m_editor_initialize = (initialize_function_ptr)GetProcAddress(m_editor_module, "initialize");
+    VERIFY(m_editor_initialize);
 
-	m_editor_finalize	= (finalize_function_ptr)GetProcAddress(m_editor_module, "finalize");
-	VERIFY				(m_editor_finalize);
+    m_editor_finalize = (finalize_function_ptr)GetProcAddress(m_editor_module, "finalize");
+    VERIFY(m_editor_finalize);
 
-	m_engine			= xr_new<engine_impl>();
-	m_editor_initialize	(m_editor, m_engine);
-	VERIFY				(m_editor);
+    m_engine = xr_new<engine_impl>();
+    m_editor_initialize(m_editor, m_engine);
+    VERIFY(m_editor);
 
-	m_hWnd				= m_editor->view_handle();
-	VERIFY				(m_hWnd != INVALID_HANDLE_VALUE);
+    m_hWnd = m_editor->view_handle();
+    VERIFY(m_hWnd != INVALID_HANDLE_VALUE);
 }
 #endif // #ifdef INGAME_EDITOR
 
-PROTECT_API void CRenderDevice::Initialize			()
+PROTECT_API void CRenderDevice::Initialize()
 {
-	Log("Initializing Engine...");
-	TimerGlobal.Start			();
-	TimerMM.Start				();
+    Log("Initializing Engine...");
+    TimerGlobal.Start();
+    TimerMM.Start();
 
 #ifdef INGAME_EDITOR
-	if (strstr(Core.Params,"-editor"))
-		initialize_editor		();
+    if (strstr(Core.Params, "-editor"))
+        initialize_editor();
 #endif // #ifdef INGAME_EDITOR
 
-	// Unless a substitute hWnd has been specified, create a window to render into
-    if( m_hWnd == NULL)
+    // Unless a substitute hWnd has been specified, create a window to render into
+    if (m_hWnd == NULL)
     {
-		const char*	wndclass ="_XRAY_1.5";
+        const char* wndclass = "_XRAY_1.5";
 
         // Register the windows class
-		HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(0);
-        WNDCLASS wndClass = { 0, WndProc, 0, 0, hInstance,
-                              LoadIcon( hInstance, MAKEINTRESOURCE(IDI_ICON1) ),
-                              LoadCursor( NULL, IDC_ARROW ),
-                              (HBRUSH)GetStockObject(BLACK_BRUSH),
-                              NULL, wndclass };
-        RegisterClass( &wndClass );
+        HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(0);
+        WNDCLASS wndClass = {0, WndProc, 0, 0, hInstance,
+                             LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON1)),
+                             LoadCursor(NULL, IDC_ARROW),
+                             (HBRUSH)GetStockObject(BLACK_BRUSH),
+                             NULL, wndclass
+                            };
+        RegisterClass(&wndClass);
 
         // Set the window's initial style
         m_dwWindowStyle = WS_BORDER | WS_DLGFRAME;
 
         // Set the window's initial width
         RECT rc;
-        SetRect			( &rc, 0, 0, 640, 480 );
-        AdjustWindowRect( &rc, m_dwWindowStyle, FALSE );
+        SetRect(&rc, 0, 0, 640, 480);
+        AdjustWindowRect(&rc, m_dwWindowStyle, FALSE);
 
         // Create the render window
-		m_hWnd = CreateWindowEx( WS_EX_TOPMOST, 
-								wndclass, "S.T.A.L.K.E.R.: Call of Pripyat", m_dwWindowStyle,
-                               /*rc.left, rc.top, */CW_USEDEFAULT, CW_USEDEFAULT,
-                               (rc.right-rc.left), (rc.bottom-rc.top), 0L,
-                               0, hInstance, 0L );
+        m_hWnd = CreateWindowEx(WS_EX_TOPMOST,
+                                wndclass, "S.T.A.L.K.E.R.: Call of Pripyat", m_dwWindowStyle,
+                                /*rc.left, rc.top, */CW_USEDEFAULT, CW_USEDEFAULT,
+                                (rc.right - rc.left), (rc.bottom - rc.top), 0L,
+                                0, hInstance, 0L);
     }
 
     // Save window properties
-    m_dwWindowStyle = GetWindowLong( m_hWnd, GWL_STYLE );
-    GetWindowRect	( m_hWnd, &m_rcWindowBounds );
-    GetClientRect	( m_hWnd, &m_rcWindowClient );
-
-	/*
-	if (strstr(lpCmdLine,"-gpu_sw")!=NULL)		HW.Caps.bForceGPU_SW		= TRUE;
-	else										HW.Caps.bForceGPU_SW		= FALSE;
-	if (strstr(lpCmdLine,"-gpu_nopure")!=NULL)	HW.Caps.bForceGPU_NonPure	= TRUE;
-	else										HW.Caps.bForceGPU_NonPure	= FALSE;
-	if (strstr(lpCmdLine,"-gpu_ref")!=NULL)		HW.Caps.bForceGPU_REF		= TRUE;
-	else										HW.Caps.bForceGPU_REF		= FALSE;
-	*/
+    m_dwWindowStyle = GetWindowLong(m_hWnd, GWL_STYLE);
+    GetWindowRect(m_hWnd, &m_rcWindowBounds);
+    GetClientRect(m_hWnd, &m_rcWindowClient);
+
+    /*
+    if (strstr(lpCmdLine,"-gpu_sw")!=NULL) HW.Caps.bForceGPU_SW = TRUE;
+    else HW.Caps.bForceGPU_SW = FALSE;
+    if (strstr(lpCmdLine,"-gpu_nopure")!=NULL) HW.Caps.bForceGPU_NonPure = TRUE;
+    else HW.Caps.bForceGPU_NonPure = FALSE;
+    if (strstr(lpCmdLine,"-gpu_ref")!=NULL) HW.Caps.bForceGPU_REF = TRUE;
+    else HW.Caps.bForceGPU_REF = FALSE;
+    */
 }
 
diff --git a/src/xrEngine/Device_Misc.cpp b/src/xrEngine/Device_Misc.cpp
index b11bb9a5c52..bcae6e592f3 100644
--- a/src/xrEngine/Device_Misc.cpp
+++ b/src/xrEngine/Device_Misc.cpp
@@ -5,23 +5,26 @@
 // Error handling
 
 //----------------------------- FLAGS
-static struct _DF {
-	char *	name;
-	u32	mask;
-} DF[] = {
-	{"rsFullscreen",	rsFullscreen	},
-	{"rsClearBB",		rsClearBB 		},
-	{"rsVSync",			rsVSync 		},
-	{"rsWireframe",		rsWireframe		},
-    {NULL,0}
+static struct _DF
+{
+    char* name;
+    u32 mask;
+} DF[] =
+{
+    {"rsFullscreen", rsFullscreen},
+    {"rsClearBB", rsClearBB},
+    {"rsVSync", rsVSync},
+    {"rsWireframe", rsWireframe},
+    {NULL, 0}
 };
 
 void CRenderDevice::DumpFlags()
 {
-	Log("- Dumping device flags");
-	_DF *p = DF;
-	while (p->name) {
-		Msg("* %20s %s",p->name,psDeviceFlags.test(p->mask)?"on":"off");
-		p++;
-	}
+    Log("- Dumping device flags");
+    _DF* p = DF;
+    while (p->name)
+    {
+        Msg("* %20s %s", p->name, psDeviceFlags.test(p->mask) ? "on" : "off");
+        p++;
+    }
 }
diff --git a/src/xrEngine/Device_create.cpp b/src/xrEngine/Device_create.cpp
index ce7a188142b..bfa907a30ca 100644
--- a/src/xrEngine/Device_create.cpp
+++ b/src/xrEngine/Device_create.cpp
@@ -9,202 +9,202 @@
 
 #include "securom_api.h"
 
-extern XRCDB_API BOOL *cdb_bDebug;
+extern XRCDB_API BOOL* cdb_bDebug;
 
-void	SetupGPU(IRenderDeviceRender *pRender)
+void SetupGPU(IRenderDeviceRender* pRender)
 {
-	// Command line
-	char *lpCmdLine		= Core.Params;
+    // Command line
+    char* lpCmdLine = Core.Params;
 
-	BOOL bForceGPU_SW;
-	BOOL bForceGPU_NonPure;
-	BOOL bForceGPU_REF;
+    BOOL bForceGPU_SW;
+    BOOL bForceGPU_NonPure;
+    BOOL bForceGPU_REF;
 
-	if (strstr(lpCmdLine,"-gpu_sw")!=NULL)		bForceGPU_SW		= TRUE;
-	else										bForceGPU_SW		= FALSE;
-	if (strstr(lpCmdLine,"-gpu_nopure")!=NULL)	bForceGPU_NonPure	= TRUE;
-	else										bForceGPU_NonPure	= FALSE;
-	if (strstr(lpCmdLine,"-gpu_ref")!=NULL)		bForceGPU_REF		= TRUE;
-	else										bForceGPU_REF		= FALSE;
+    if (strstr(lpCmdLine, "-gpu_sw") != NULL) bForceGPU_SW = TRUE;
+    else bForceGPU_SW = FALSE;
+    if (strstr(lpCmdLine, "-gpu_nopure") != NULL) bForceGPU_NonPure = TRUE;
+    else bForceGPU_NonPure = FALSE;
+    if (strstr(lpCmdLine, "-gpu_ref") != NULL) bForceGPU_REF = TRUE;
+    else bForceGPU_REF = FALSE;
 
-	pRender->SetupGPU(bForceGPU_SW, bForceGPU_NonPure, bForceGPU_REF);
+    pRender->SetupGPU(bForceGPU_SW, bForceGPU_NonPure, bForceGPU_REF);
 }
 
-void CRenderDevice::_SetupStates	()
+void CRenderDevice::_SetupStates()
 {
-	// General Render States
-	mView.identity			();
-	mProject.identity		();
-	mFullTransform.identity	();
-	vCameraPosition.set		(0,0,0);
-	vCameraDirection.set	(0,0,1);
-	vCameraTop.set			(0,1,0);
-	vCameraRight.set		(1,0,0);
-
-	m_pRender->SetupStates();
-
-	/*
-	HW.Caps.Update			();
-	for (u32 i=0; i<HW.Caps.raster.dwStages; i++)				{
-		float fBias = -.5f	;
-		CHK_DX(HW.pDevice->SetSamplerState	( i, D3DSAMP_MAXANISOTROPY, 4				));
-		CHK_DX(HW.pDevice->SetSamplerState	( i, D3DSAMP_MIPMAPLODBIAS, *((LPDWORD) (&fBias))));
-		CHK_DX(HW.pDevice->SetSamplerState	( i, D3DSAMP_MINFILTER,	D3DTEXF_LINEAR 		));
-		CHK_DX(HW.pDevice->SetSamplerState	( i, D3DSAMP_MAGFILTER,	D3DTEXF_LINEAR 		));
-		CHK_DX(HW.pDevice->SetSamplerState	( i, D3DSAMP_MIPFILTER,	D3DTEXF_LINEAR		));
-	}
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_DITHERENABLE,		TRUE				));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_COLORVERTEX,		TRUE				));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_ZENABLE,			TRUE				));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_SHADEMODE,			D3DSHADE_GOURAUD	));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_CULLMODE,			D3DCULL_CCW			));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_ALPHAFUNC,			D3DCMP_GREATER		));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_LOCALVIEWER,		TRUE				));
-
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_MATERIAL	));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_SPECULARMATERIALSOURCE,D3DMCS_MATERIAL	));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL	));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_EMISSIVEMATERIALSOURCE,D3DMCS_COLOR1	));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_MULTISAMPLEANTIALIAS,	FALSE			));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_NORMALIZENORMALS,		TRUE			));
-
-	if (psDeviceFlags.test(rsWireframe))	{ CHK_DX(HW.pDevice->SetRenderState( D3DRS_FILLMODE,			D3DFILL_WIREFRAME	)); }
-	else									{ CHK_DX(HW.pDevice->SetRenderState( D3DRS_FILLMODE,			D3DFILL_SOLID		)); }
-
-	// ******************** Fog parameters
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGCOLOR,			0					));
-	CHK_DX(HW.pDevice->SetRenderState( D3DRS_RANGEFOGENABLE,	FALSE				));
-	if (HW.Caps.bTableFog)	{
-		CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGTABLEMODE,	D3DFOG_LINEAR		));
-		CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGVERTEXMODE,	D3DFOG_NONE			));
-	} else {
-		CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGTABLEMODE,	D3DFOG_NONE			));
-		CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGVERTEXMODE,	D3DFOG_LINEAR		));
-	}
-	*/
+    // General Render States
+    mView.identity();
+    mProject.identity();
+    mFullTransform.identity();
+    vCameraPosition.set(0, 0, 0);
+    vCameraDirection.set(0, 0, 1);
+    vCameraTop.set(0, 1, 0);
+    vCameraRight.set(1, 0, 0);
+
+    m_pRender->SetupStates();
+
+    /*
+    HW.Caps.Update ();
+    for (u32 i=0; i<HW.Caps.raster.dwStages; i++) {
+    float fBias = -.5f ;
+    CHK_DX(HW.pDevice->SetSamplerState ( i, D3DSAMP_MAXANISOTROPY, 4 ));
+    CHK_DX(HW.pDevice->SetSamplerState ( i, D3DSAMP_MIPMAPLODBIAS, *((LPDWORD) (&fBias))));
+    CHK_DX(HW.pDevice->SetSamplerState ( i, D3DSAMP_MINFILTER, D3DTEXF_LINEAR ));
+    CHK_DX(HW.pDevice->SetSamplerState ( i, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR ));
+    CHK_DX(HW.pDevice->SetSamplerState ( i, D3DSAMP_MIPFILTER, D3DTEXF_LINEAR ));
+    }
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_DITHERENABLE, TRUE ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_COLORVERTEX, TRUE ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_ZENABLE, TRUE ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_SHADEMODE, D3DSHADE_GOURAUD ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_ALPHAFUNC, D3DCMP_GREATER ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_LOCALVIEWER, TRUE ));
+
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_MATERIAL ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_SPECULARMATERIALSOURCE,D3DMCS_MATERIAL ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_AMBIENTMATERIALSOURCE, D3DMCS_MATERIAL ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_EMISSIVEMATERIALSOURCE,D3DMCS_COLOR1 ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_MULTISAMPLEANTIALIAS, FALSE ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_NORMALIZENORMALS, TRUE ));
+
+    if (psDeviceFlags.test(rsWireframe)) { CHK_DX(HW.pDevice->SetRenderState( D3DRS_FILLMODE, D3DFILL_WIREFRAME )); }
+    else { CHK_DX(HW.pDevice->SetRenderState( D3DRS_FILLMODE, D3DFILL_SOLID )); }
+
+    // ******************** Fog parameters
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGCOLOR, 0 ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_RANGEFOGENABLE, FALSE ));
+    if (HW.Caps.bTableFog) {
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGTABLEMODE, D3DFOG_LINEAR ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGVERTEXMODE, D3DFOG_NONE ));
+    } else {
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGTABLEMODE, D3DFOG_NONE ));
+    CHK_DX(HW.pDevice->SetRenderState( D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR ));
+    }
+    */
 }
 /*
-void CRenderDevice::_Create	(LPCSTR shName)
+void CRenderDevice::_Create (LPCSTR shName)
 {
-	Memory.mem_compact			();
+Memory.mem_compact ();
 
-	// after creation
-	b_is_Ready					= TRUE;
-	_SetupStates				();
+// after creation
+b_is_Ready = TRUE;
+_SetupStates ();
 
-	// Signal everyone - device created
-	RCache.OnDeviceCreate		();
-	Gamma.Update				();
-	Resources->OnDeviceCreate	(shName);
-	::Render->create			();
-	Statistic->OnDeviceCreate	();
+// Signal everyone - device created
+RCache.OnDeviceCreate ();
+Gamma.Update ();
+Resources->OnDeviceCreate (shName);
+::Render->create ();
+Statistic->OnDeviceCreate ();
 
 #ifndef DEDICATED_SERVER
-	m_WireShader.create			("editor\\wire");
-	m_SelectionShader.create	("editor\\selection");
+m_WireShader.create ("editor\\wire");
+m_SelectionShader.create ("editor\\selection");
 
-	DU.OnDeviceCreate			();
+DU.OnDeviceCreate ();
 #endif
 
-	dwFrame						= 0;
+dwFrame = 0;
 }
 */
 
-void CRenderDevice::_Create	(LPCSTR shName)
+void CRenderDevice::_Create(LPCSTR shName)
 {
-	Memory.mem_compact			();
+    Memory.mem_compact();
 
-	// after creation
-	b_is_Ready					= TRUE;
-	_SetupStates				();
+    // after creation
+    b_is_Ready = TRUE;
+    _SetupStates();
 
-	m_pRender->OnDeviceCreate(shName);
+    m_pRender->OnDeviceCreate(shName);
 
-	dwFrame						= 0;
+    dwFrame = 0;
 }
 
 /*
-void CRenderDevice::Create	() 
+void CRenderDevice::Create ()
 {
-	if (b_is_Ready)		return;		// prevent double call
-	Statistic			= xr_new<CStats>();
-	Log					("Starting RENDER device...");
+if (b_is_Ready) return; // prevent double call
+Statistic = xr_new<CStats>();
+Log ("Starting RENDER device...");
 
 #ifdef _EDITOR
-	psCurrentVidMode[0]	= dwWidth;
-	psCurrentVidMode[1] = dwHeight;
+psCurrentVidMode[0] = dwWidth;
+psCurrentVidMode[1] = dwHeight;
 #endif
 
-	HW.CreateDevice		(m_hWnd);
-	dwWidth				= HW.DevPP.BackBufferWidth	;
-	dwHeight			= HW.DevPP.BackBufferHeight	;
-	fWidth_2			= float(dwWidth/2)			;
-	fHeight_2			= float(dwHeight/2)			;
-	fFOV				= 90.f;
-	fASPECT				= 1.f;
+HW.CreateDevice (m_hWnd);
+dwWidth = HW.DevPP.BackBufferWidth ;
+dwHeight = HW.DevPP.BackBufferHeight ;
+fWidth_2 = float(dwWidth/2) ;
+fHeight_2 = float(dwHeight/2) ;
+fFOV = 90.f;
+fASPECT = 1.f;
 
-	string_path			fname; 
-	FS.update_path		(fname,"$game_data$","shaders.xr");
+string_path fname;
+FS.update_path (fname,"$game_data$","shaders.xr");
 
-	//////////////////////////////////////////////////////////////////////////
-	Resources			= xr_new<CResourceManager>		();
-	_Create				(fname);
+//////////////////////////////////////////////////////////////////////////
+Resources = xr_new<CResourceManager> ();
+_Create (fname);
 
-	PreCache			(0);
+PreCache (0);
 }
 */
 
 void CRenderDevice::ConnectToRender()
 {
-	if (!m_pRender)
-		m_pRender			= RenderFactory->CreateRenderDeviceRender();
+    if (!m_pRender)
+        m_pRender = RenderFactory->CreateRenderDeviceRender();
 }
 
-PROTECT_API void CRenderDevice::Create	() 
+PROTECT_API void CRenderDevice::Create()
 {
-	SECUROM_MARKER_SECURITY_ON(4)
+    SECUROM_MARKER_SECURITY_ON(4)
 
-	if (b_is_Ready)		return;		// prevent double call
-	Statistic			= xr_new<CStats>();
+    if (b_is_Ready) return; // prevent double call
+    Statistic = xr_new<CStats>();
 
-#ifdef	DEBUG
-cdb_clRAY		= &Statistic->clRAY;				// total: ray-testing
-cdb_clBOX		= &Statistic->clBOX;				// total: box query
-cdb_clFRUSTUM	= &Statistic->clFRUSTUM;			// total: frustum query
-cdb_bDebug		= &bDebug;
+#ifdef DEBUG
+    cdb_clRAY = &Statistic->clRAY; // total: ray-testing
+    cdb_clBOX = &Statistic->clBOX; // total: box query
+    cdb_clFRUSTUM = &Statistic->clFRUSTUM; // total: frustum query
+    cdb_bDebug = &bDebug;
 #endif
 
-	if (!m_pRender)
-		m_pRender			= RenderFactory->CreateRenderDeviceRender();
-	SetupGPU(m_pRender);
-	Log					("Starting RENDER device...");
+    if (!m_pRender)
+        m_pRender = RenderFactory->CreateRenderDeviceRender();
+    SetupGPU(m_pRender);
+    Log("Starting RENDER device...");
 
 #ifdef _EDITOR
-	psCurrentVidMode[0]	= dwWidth;
-	psCurrentVidMode[1] = dwHeight;
+    psCurrentVidMode[0] = dwWidth;
+    psCurrentVidMode[1] = dwHeight;
 #endif // #ifdef _EDITOR
 
-	fFOV				= 90.f;
-	fASPECT				= 1.f;
-	m_pRender->Create	(
-		m_hWnd,
-		dwWidth,
-		dwHeight,
-		fWidth_2,
-		fHeight_2,
+    fFOV = 90.f;
+    fASPECT = 1.f;
+    m_pRender->Create(
+        m_hWnd,
+        dwWidth,
+        dwHeight,
+        fWidth_2,
+        fHeight_2,
 #ifdef INGAME_EDITOR
-		editor() ? false :
+        editor() ? false :
 #endif // #ifdef INGAME_EDITOR
-		true
-	);
+        true
+    );
 
-	string_path			fname; 
-	FS.update_path		(fname,"$game_data$","shaders.xr");
+    string_path fname;
+    FS.update_path(fname, "$game_data$", "shaders.xr");
 
-	//////////////////////////////////////////////////////////////////////////
-	_Create				(fname);
+    //////////////////////////////////////////////////////////////////////////
+    _Create(fname);
 
-	PreCache			(0, false, false);
+    PreCache(0, false, false);
 
-	SECUROM_MARKER_SECURITY_OFF(4)
+    SECUROM_MARKER_SECURITY_OFF(4)
 }
\ No newline at end of file
diff --git a/src/xrEngine/Device_destroy.cpp b/src/xrEngine/Device_destroy.cpp
index 62fff55aa98..d0f64d8bf74 100644
--- a/src/xrEngine/Device_destroy.cpp
+++ b/src/xrEngine/Device_destroy.cpp
@@ -5,92 +5,94 @@
 #include "IGame_Persistent.h"
 #include "xr_IOConsole.h"
 
-void CRenderDevice::_Destroy	(BOOL bKeepTextures)
+void CRenderDevice::_Destroy(BOOL bKeepTextures)
 {
-	DU->OnDeviceDestroy();
+    DU->OnDeviceDestroy();
 
-	// before destroy
-	b_is_Ready					= FALSE;
-	Statistic->OnDeviceDestroy	();
-	::Render->destroy			();
-	m_pRender->OnDeviceDestroy(bKeepTextures);
-	//Resources->OnDeviceDestroy	(bKeepTextures);
-	//RCache.OnDeviceDestroy		();
+    // before destroy
+    b_is_Ready = FALSE;
+    Statistic->OnDeviceDestroy();
+    ::Render->destroy();
+    m_pRender->OnDeviceDestroy(bKeepTextures);
+    //Resources->OnDeviceDestroy (bKeepTextures);
+    //RCache.OnDeviceDestroy ();
 
-	Memory.mem_compact			();
+    Memory.mem_compact();
 }
 
-void CRenderDevice::Destroy	(void) {
-	if (!b_is_Ready)			return;
+void CRenderDevice::Destroy(void)
+{
+    if (!b_is_Ready) return;
 
-	Log("Destroying Direct3D...");
+    Log("Destroying Direct3D...");
 
-	ShowCursor	(TRUE);
-	m_pRender->ValidateHW();
+    ShowCursor(TRUE);
+    m_pRender->ValidateHW();
 
-	_Destroy					(FALSE);
+    _Destroy(FALSE);
 
-	// real destroy
-	m_pRender->DestroyHW();
+    // real destroy
+    m_pRender->DestroyHW();
 
-	//xr_delete					(Resources);
-	//HW.DestroyDevice			();
+    //xr_delete (Resources);
+    //HW.DestroyDevice ();
 
-	seqRender.R.clear			();
-	seqAppActivate.R.clear		();
-	seqAppDeactivate.R.clear	();
-	seqAppStart.R.clear			();
-	seqAppEnd.R.clear			();
-	seqFrame. R.clear			();
-	seqFrameMT.R.clear			();
-	seqDeviceReset.R.clear		();
-	seqParallel.clear			();
+    seqRender.R.clear();
+    seqAppActivate.R.clear();
+    seqAppDeactivate.R.clear();
+    seqAppStart.R.clear();
+    seqAppEnd.R.clear();
+    seqFrame.R.clear();
+    seqFrameMT.R.clear();
+    seqDeviceReset.R.clear();
+    seqParallel.clear();
 
-	RenderFactory->DestroyRenderDeviceRender(m_pRender);
-	m_pRender = 0;
-	xr_delete					(Statistic);
+    RenderFactory->DestroyRenderDeviceRender(m_pRender);
+    m_pRender = 0;
+    xr_delete(Statistic);
 }
 
 #include "IGame_Level.h"
 #include "CustomHUD.h"
 extern BOOL bNeed_re_create_env;
-void CRenderDevice::Reset		(bool precache)
+void CRenderDevice::Reset(bool precache)
 {
-	u32 dwWidth_before		= dwWidth;
-	u32 dwHeight_before		= dwHeight;
-
-	ShowCursor				(TRUE);
-	u32 tm_start			= TimerAsync();
-	if (g_pGamePersistent){
-
-//.		g_pGamePersistent->Environment().OnDeviceDestroy();
-	}
-
-	m_pRender->Reset( m_hWnd, dwWidth, dwHeight, fWidth_2, fHeight_2);
-
-	if (g_pGamePersistent)
-	{
-//.		g_pGamePersistent->Environment().OnDeviceCreate();
-		//bNeed_re_create_env = TRUE;
-		g_pGamePersistent->Environment().bNeed_re_create_env = TRUE;
-	}
-	_SetupStates			();
-	if (precache)
-		PreCache			(20, true, false);
-	u32 tm_end				= TimerAsync();
-	Msg						("*** RESET [%d ms]",tm_end-tm_start);
-
-	//	TODO: Remove this! It may hide crash
-	Memory.mem_compact();
+    u32 dwWidth_before = dwWidth;
+    u32 dwHeight_before = dwHeight;
+
+    ShowCursor(TRUE);
+    u32 tm_start = TimerAsync();
+    if (g_pGamePersistent)
+    {
+
+        //. g_pGamePersistent->Environment().OnDeviceDestroy();
+    }
+
+    m_pRender->Reset(m_hWnd, dwWidth, dwHeight, fWidth_2, fHeight_2);
+
+    if (g_pGamePersistent)
+    {
+        //. g_pGamePersistent->Environment().OnDeviceCreate();
+        //bNeed_re_create_env = TRUE;
+        g_pGamePersistent->Environment().bNeed_re_create_env = TRUE;
+    }
+    _SetupStates();
+    if (precache)
+        PreCache(20, true, false);
+    u32 tm_end = TimerAsync();
+    Msg("*** RESET [%d ms]", tm_end - tm_start);
+
+    // TODO: Remove this! It may hide crash
+    Memory.mem_compact();
 
 #ifndef DEDICATED_SERVER
-	ShowCursor	(FALSE);
+    ShowCursor(FALSE);
 #endif
-		
-	seqDeviceReset.Process(rp_DeviceReset);
 
-	if(dwWidth_before!=dwWidth || dwHeight_before!=dwHeight) 
-	{
-		seqResolutionChanged.Process(rp_ScreenResolutionChanged);
-	}
+    seqDeviceReset.Process(rp_DeviceReset);
+
+    if (dwWidth_before != dwWidth || dwHeight_before != dwHeight)
+    {
+        seqResolutionChanged.Process(rp_ScreenResolutionChanged);
+    }
 }
diff --git a/src/xrEngine/Device_overdraw.cpp b/src/xrEngine/Device_overdraw.cpp
index 85dcca4a397..d2a6b60b430 100644
--- a/src/xrEngine/Device_overdraw.cpp
+++ b/src/xrEngine/Device_overdraw.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 
-void CRenderDevice::overdrawBegin	()
+void CRenderDevice::overdrawBegin()
 {
-	VERIFY(0);
-	m_pRender->overdrawBegin();
+    VERIFY(0);
+    m_pRender->overdrawBegin();
 }
 
-void CRenderDevice::overdrawEnd		()
+void CRenderDevice::overdrawEnd()
 {
-	VERIFY(0);
-	m_pRender->overdrawEnd();
+    VERIFY(0);
+    m_pRender->overdrawEnd();
 }
diff --git a/src/xrEngine/Device_wndproc.cpp b/src/xrEngine/Device_wndproc.cpp
index 4bdb937d261..20af8b286ad 100644
--- a/src/xrEngine/Device_wndproc.cpp
+++ b/src/xrEngine/Device_wndproc.cpp
@@ -1,69 +1,77 @@
 #include "stdafx.h"
 
-bool CRenderDevice::on_message	(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &result)
+bool CRenderDevice::on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result)
 {
-	switch (uMsg) {
-		case WM_SYSKEYDOWN : {
-			return true;
-						   }
-		case WM_ACTIVATE : {
+    switch (uMsg)
+    {
+    case WM_SYSKEYDOWN:
+    {
+        return true;
+    }
+    case WM_ACTIVATE:
+    {
 #ifdef INGAME_EDITOR
-			if (editor()) {
-				Device.b_is_Active	= TRUE;
-				break;
-			}
+        if (editor())
+        {
+            Device.b_is_Active = TRUE;
+            break;
+        }
 #endif // #ifdef INGAME_EDITOR
-			OnWM_Activate	(wParam, lParam);
-			return			(false);
-		}
-		case WM_SETCURSOR : {
+        OnWM_Activate(wParam, lParam);
+        return (false);
+    }
+    case WM_SETCURSOR:
+    {
 #ifdef INGAME_EDITOR
-			if (editor())
-				break;
+        if (editor())
+            break;
 #endif // #ifdef INGAME_EDITOR
 
-			result			= 1;
-			return			(true);
-		}
-		case WM_SYSCOMMAND : {
+        result = 1;
+        return (true);
+    }
+    case WM_SYSCOMMAND:
+    {
 #ifdef INGAME_EDITOR
-			if (editor())
-				break;
+        if (editor())
+            break;
 #endif // #ifdef INGAME_EDITOR
 
-			// Prevent moving/sizing and power loss in fullscreen mode
-			switch (wParam) {
-				case SC_MOVE:
-				case SC_SIZE:
-				case SC_MAXIMIZE:
-				case SC_MONITORPOWER:
-					result	= 1;
-					return	(true);
-			}
-			return			(false);
-		}
-		case WM_CLOSE : {
+        // Prevent moving/sizing and power loss in fullscreen mode
+        switch (wParam)
+        {
+        case SC_MOVE:
+        case SC_SIZE:
+        case SC_MAXIMIZE:
+        case SC_MONITORPOWER:
+            result = 1;
+            return (true);
+        }
+        return (false);
+    }
+    case WM_CLOSE:
+    {
 #ifdef INGAME_EDITOR
-			if (editor())
-				break;
+        if (editor())
+            break;
 #endif // #ifdef INGAME_EDITOR
 
-			result			= 0;
-			return			(true);
-		}
-	}
+        result = 0;
+        return (true);
+    }
+    }
 
-	return					(false);
+    return (false);
 }
 //-----------------------------------------------------------------------------
 // Name: WndProc()
 // Desc: Static msg handler which passes messages to the application class.
 //-----------------------------------------------------------------------------
-LRESULT CALLBACK WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	LRESULT		result;
-	if (Device.on_message(hWnd, uMsg, wParam, lParam, result))
-		return	(result);
+    LRESULT result;
+    if (Device.on_message(hWnd, uMsg, wParam, lParam, result))
+        return (result);
 
-	return		(DefWindowProc(hWnd, uMsg, wParam, lParam));
+    return (DefWindowProc(hWnd, uMsg, wParam, lParam));
 }
diff --git a/src/xrEngine/Effector.h b/src/xrEngine/Effector.h
index 5a4cf6c8063..a92c21a881b 100644
--- a/src/xrEngine/Effector.h
+++ b/src/xrEngine/Effector.h
@@ -7,27 +7,27 @@
 class ENGINE_API CEffectorCam :public SBaseEffector
 {
 protected:
-	ECamEffectorType	eType;
-	
-	friend class		CCameraManager;
-	float				fLifeTime;
-	bool				bHudAffect;
+    ECamEffectorType eType;
+
+    friend class CCameraManager;
+    float fLifeTime;
+    bool bHudAffect;
 public:
-						CEffectorCam	(ECamEffectorType type, float tm)	{eType=type; fLifeTime=tm; bHudAffect=true;};
-						CEffectorCam	()									{eType=(ECamEffectorType)0; fLifeTime=0.0f; bHudAffect=true;};
-	virtual				~CEffectorCam	()									{};
-			void		SetType			(ECamEffectorType type)				{eType=type;}
-			void		SetHudAffect	(bool val)							{bHudAffect=val;}
-			bool		GetHudAffect	()									{return bHudAffect;}
-
-	IC ECamEffectorType	GetType			()									{return eType;}
-	virtual	BOOL		Valid			()									{return fLifeTime>0.0f;}
-
-	BENCH_SEC_SCRAMBLEVTBL1
-
-	virtual BOOL		ProcessCam		(SCamEffectorInfo& info)			{fLifeTime-=Device.fTimeDelta; return Valid();};;
-		
-	virtual	void		ProcessIfInvalid(SCamEffectorInfo& info)			{};
-	virtual BOOL		AllowProcessingIfInvalid()							{return FALSE;}
-	virtual bool		AbsolutePositioning()								{return false;}		
+    CEffectorCam(ECamEffectorType type, float tm) { eType = type; fLifeTime = tm; bHudAffect = true; };
+    CEffectorCam() { eType = (ECamEffectorType)0; fLifeTime = 0.0f; bHudAffect = true; };
+    virtual ~CEffectorCam() {};
+    void SetType(ECamEffectorType type) { eType = type; }
+    void SetHudAffect(bool val) { bHudAffect = val; }
+    bool GetHudAffect() { return bHudAffect; }
+
+    IC ECamEffectorType GetType() { return eType; }
+    virtual BOOL Valid() { return fLifeTime > 0.0f; }
+
+    BENCH_SEC_SCRAMBLEVTBL1
+
+    virtual BOOL ProcessCam(SCamEffectorInfo& info) { fLifeTime -= Device.fTimeDelta; return Valid(); };;
+
+    virtual void ProcessIfInvalid(SCamEffectorInfo& info) {};
+    virtual BOOL AllowProcessingIfInvalid() { return FALSE; }
+    virtual bool AbsolutePositioning() { return false; }
 };
diff --git a/src/xrEngine/EffectorPP.cpp b/src/xrEngine/EffectorPP.cpp
index 0b23716f1ed..af3873408f9 100644
--- a/src/xrEngine/EffectorPP.cpp
+++ b/src/xrEngine/EffectorPP.cpp
@@ -10,18 +10,18 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-CEffectorPP::CEffectorPP(EEffectorPPType type, f32 lifeTime, bool free_on_remove) 
-:bOverlap(true)
+CEffectorPP::CEffectorPP(EEffectorPPType type, f32 lifeTime, bool free_on_remove)
+    :bOverlap(true)
 {
-	eType			= type;
-	fLifeTime		= lifeTime;
-	bFreeOnRemove	= free_on_remove;
+    eType = type;
+    fLifeTime = lifeTime;
+    bFreeOnRemove = free_on_remove;
 }
 
 CEffectorPP::~CEffectorPP() {}
 
-BOOL CEffectorPP::Process(SPPInfo &PPInfo) 
+BOOL CEffectorPP::Process(SPPInfo& PPInfo)
 {
-	fLifeTime -= Device.fTimeDelta;
-	return TRUE;
+    fLifeTime -= Device.fTimeDelta;
+    return TRUE;
 }
diff --git a/src/xrEngine/EffectorPP.h b/src/xrEngine/EffectorPP.h
index c0ad923a74b..800b4305251 100644
--- a/src/xrEngine/EffectorPP.h
+++ b/src/xrEngine/EffectorPP.h
@@ -6,21 +6,21 @@ struct SPPInfo;
 // ïîñòïðîöåññ
 class ENGINE_API CEffectorPP :public SBaseEffector
 {
-	EEffectorPPType		eType;
-	bool				bFreeOnRemove;
+    EEffectorPPType eType;
+    bool bFreeOnRemove;
 protected:
-	float				fLifeTime;
+    float fLifeTime;
 public:
-						CEffectorPP		(EEffectorPPType type, f32 lifeTime, bool free_on_remove=true);
-						CEffectorPP		():bFreeOnRemove(true),fLifeTime(0.0f),bOverlap(true){};
-	virtual				~CEffectorPP	();
-	BENCH_SEC_SCRAMBLEVTBL1
-	virtual	BOOL		Process			(SPPInfo &PPInfo);
-	virtual	BOOL		Valid			()							{return fLifeTime>0.0f;}
-	IC EEffectorPPType	Type			()	const					{return eType;}
-	IC bool				FreeOnRemove	()	const					{return bFreeOnRemove;}
-	IC void				SetType			(EEffectorPPType t)			{eType=t;}
-	virtual void		Stop            (float speed)				{fLifeTime=0.0f;};
+    CEffectorPP(EEffectorPPType type, f32 lifeTime, bool free_on_remove = true);
+    CEffectorPP() :bFreeOnRemove(true), fLifeTime(0.0f), bOverlap(true) {};
+    virtual ~CEffectorPP();
+    BENCH_SEC_SCRAMBLEVTBL1
+    virtual BOOL Process(SPPInfo& PPInfo);
+    virtual BOOL Valid() { return fLifeTime > 0.0f; }
+    IC EEffectorPPType Type() const { return eType; }
+    IC bool FreeOnRemove() const { return bFreeOnRemove; }
+    IC void SetType(EEffectorPPType t) { eType = t; }
+    virtual void Stop(float speed) { fLifeTime = 0.0f; };
 
-	bool				bOverlap;
+    bool bOverlap;
 };
diff --git a/src/xrEngine/Engine.cpp b/src/xrEngine/Engine.cpp
index 41280ce9dc6..035781fb2de 100644
--- a/src/xrEngine/Engine.cpp
+++ b/src/xrEngine/Engine.cpp
@@ -6,8 +6,8 @@
 #include "Engine.h"
 #include "dedicated_server_only.h"
 
-CEngine				Engine;
-xrDispatchTable		PSGP;
+CEngine Engine;
+xrDispatchTable PSGP;
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -15,51 +15,53 @@ xrDispatchTable		PSGP;
 
 CEngine::CEngine()
 {
-	
+
 }
 
 CEngine::~CEngine()
 {
-	
+
 }
 
-extern	void msCreate		(LPCSTR name);
+extern void msCreate(LPCSTR name);
 
-PROTECT_API void CEngine::Initialize	(void)
+PROTECT_API void CEngine::Initialize(void)
 {
-	// Bind PSGP
-	hPSGP		= LoadLibrary("xrCPU_Pipe.dll");
-	R_ASSERT	(hPSGP);
-	xrBinder*	bindCPU	= (xrBinder*)	GetProcAddress(hPSGP,"xrBind_PSGP");	R_ASSERT(bindCPU);
-	bindCPU		(&PSGP, &CPU::ID );
+    // Bind PSGP
+    hPSGP = LoadLibrary("xrCPU_Pipe.dll");
+    R_ASSERT(hPSGP);
+    xrBinder* bindCPU = (xrBinder*)GetProcAddress(hPSGP, "xrBind_PSGP");
+    R_ASSERT(bindCPU);
+    bindCPU(&PSGP, &CPU::ID);
 
-	// Other stuff
-	Engine.Sheduler.Initialize			( );
-	// 
+    // Other stuff
+    Engine.Sheduler.Initialize();
+    //
 #ifdef DEBUG
-	msCreate							("game");
+    msCreate("game");
 #endif
 }
 
 typedef void __cdecl ttapi_Done_func(void);
 
-void CEngine::Destroy	()
+void CEngine::Destroy()
 {
-	Engine.Sheduler.Destroy				( );
+    Engine.Sheduler.Destroy();
 #ifdef DEBUG_MEMORY_MANAGER
-	extern void	dbg_dump_leaks_prepare	( );
-	if (Memory.debug_mode)				dbg_dump_leaks_prepare	();
+    extern void dbg_dump_leaks_prepare();
+    if (Memory.debug_mode) dbg_dump_leaks_prepare();
 #endif // DEBUG_MEMORY_MANAGER
-	Engine.External.Destroy				( );
-	
-	if (hPSGP)	
-	{ 
-		ttapi_Done_func*  ttapi_Done = (ttapi_Done_func*) GetProcAddress(hPSGP,"ttapi_Done");	R_ASSERT(ttapi_Done);
-		if (ttapi_Done)
-			ttapi_Done();
+    Engine.External.Destroy();
+
+    if (hPSGP)
+    {
+        ttapi_Done_func* ttapi_Done = (ttapi_Done_func*)GetProcAddress(hPSGP, "ttapi_Done");
+        R_ASSERT(ttapi_Done);
+        if (ttapi_Done)
+            ttapi_Done();
 
-		FreeLibrary	(hPSGP); 
-		hPSGP		=0; 
-		ZeroMemory	(&PSGP,sizeof(PSGP));
-	}
+        FreeLibrary(hPSGP);
+        hPSGP = 0;
+        ZeroMemory(&PSGP, sizeof(PSGP));
+    }
 }
diff --git a/src/xrEngine/Engine.h b/src/xrEngine/Engine.h
index 43cc1e2a857..f1f0dc72feb 100644
--- a/src/xrEngine/Engine.h
+++ b/src/xrEngine/Engine.h
@@ -13,22 +13,22 @@
 
 class ENGINE_API CEngine
 {
-	HMODULE				hPSGP;
+    HMODULE hPSGP;
 public:
-	BENCH_SEC_SCRAMBLEMEMBER1
-	// DLL api stuff
-	CEngineAPI			External;
-	CEventAPI			Event;
-	CSheduler			Sheduler;
+    BENCH_SEC_SCRAMBLEMEMBER1
+    // DLL api stuff
+    CEngineAPI External;
+    CEventAPI Event;
+    CSheduler Sheduler;
 
-	void				Initialize	();
-	void				Destroy		();
-	
-	CEngine();
-	~CEngine();
+    void Initialize();
+    void Destroy();
+
+    CEngine();
+    ~CEngine();
 };
 
-ENGINE_API extern xrDispatchTable	PSGP;
-ENGINE_API extern CEngine			Engine;
+ENGINE_API extern xrDispatchTable PSGP;
+ENGINE_API extern CEngine Engine;
 
 #endif // !defined(AFX_ENGINE_H__22802DD7_D7EB_4234_9781_E237657471AC__INCLUDED_)
diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp
index 8a8eca50125..9b4e0c7d0d6 100644
--- a/src/xrEngine/EngineAPI.cpp
+++ b/src/xrEngine/EngineAPI.cpp
@@ -14,373 +14,392 @@ extern xr_token* vid_quality_token;
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-void __cdecl dummy		(void)	{
+void __cdecl dummy(void)
+{
 };
-CEngineAPI::CEngineAPI	()
+CEngineAPI::CEngineAPI()
 {
-	hGame			= 0;
-	hRender			= 0;
-	hTuner			= 0;
-	pCreate			= 0;
-	pDestroy		= 0;
-	tune_pause		= dummy	;
-	tune_resume		= dummy	;
+    hGame = 0;
+    hRender = 0;
+    hTuner = 0;
+    pCreate = 0;
+    pDestroy = 0;
+    tune_pause = dummy;
+    tune_resume = dummy;
 }
 
 CEngineAPI::~CEngineAPI()
 {
-	// destroy quality token here
-	if (vid_quality_token)
-	{
-		for( int i=0; vid_quality_token[i].name; i++ )
-		{
-			xr_free					(vid_quality_token[i].name);
-		}
-		xr_free						(vid_quality_token);
-		vid_quality_token			= NULL;
-	}
+    // destroy quality token here
+    if (vid_quality_token)
+    {
+        for (int i = 0; vid_quality_token[i].name; i++)
+        {
+            xr_free(vid_quality_token[i].name);
+        }
+        xr_free(vid_quality_token);
+        vid_quality_token = NULL;
+    }
 }
 
 extern u32 renderer_value; //con cmd
 ENGINE_API int g_current_renderer = 0;
 
-ENGINE_API bool is_enough_address_space_available	()
+ENGINE_API bool is_enough_address_space_available()
 {
-	SYSTEM_INFO		system_info;
+    SYSTEM_INFO system_info;
 
-	SECUROM_MARKER_HIGH_SECURITY_ON(12)
+    SECUROM_MARKER_HIGH_SECURITY_ON(12)
 
-	GetSystemInfo	( &system_info );
+        GetSystemInfo(&system_info);
 
-	SECUROM_MARKER_HIGH_SECURITY_OFF(12)
+    SECUROM_MARKER_HIGH_SECURITY_OFF(12)
 
-	return			(*(u32*)&system_info.lpMaximumApplicationAddress) > 0x90000000;	
+        return (*(u32*)&system_info.lpMaximumApplicationAddress) > 0x90000000;
 }
 
 #ifndef DEDICATED_SERVER
 
 void CEngineAPI::InitializeNotDedicated()
 {
-	SECUROM_MARKER_HIGH_SECURITY_ON(2)
-
-	LPCSTR			r2_name	= "xrRender_R2.dll";
-	LPCSTR			r3_name	= "xrRender_R3.dll";
-	LPCSTR			r4_name	= "xrRender_R4.dll";
-
-	if (psDeviceFlags.test(rsR4))
-	{
-		// try to initialize R4
-		Log				("Loading DLL:",	r4_name);
-		hRender			= LoadLibrary		(r4_name);
-		if (0==hRender)	
-		{
-			// try to load R1
-			Msg			("! ...Failed - incompatible hardware/pre-Vista OS.");
-			psDeviceFlags.set	(rsR2,TRUE);
-		}
-	}
-
-	if (psDeviceFlags.test(rsR3))
-	{
-		// try to initialize R3
-		Log				("Loading DLL:",	r3_name);
-		hRender			= LoadLibrary		(r3_name);
-		if (0==hRender)	
-		{
-			// try to load R1
-			Msg			("! ...Failed - incompatible hardware/pre-Vista OS.");
-			psDeviceFlags.set	(rsR2,TRUE);
-		}
-		else
-			g_current_renderer	= 3;
-	}
-
-	if (psDeviceFlags.test(rsR2))	
-	{
-		// try to initialize R2
-		psDeviceFlags.set	(rsR4,FALSE);
-		psDeviceFlags.set	(rsR3,FALSE);
-		Log				("Loading DLL:",	r2_name);
-		hRender			= LoadLibrary		(r2_name);
-		if (0==hRender)	
-		{
-			// try to load R1
-			Msg			("! ...Failed - incompatible hardware.");
-		}
-		else
-			g_current_renderer	= 2;
-	}
-
-	SECUROM_MARKER_HIGH_SECURITY_OFF(2)
+    SECUROM_MARKER_HIGH_SECURITY_ON(2)
+
+        LPCSTR r2_name = "xrRender_R2.dll";
+    LPCSTR r3_name = "xrRender_R3.dll";
+    LPCSTR r4_name = "xrRender_R4.dll";
+
+    if (psDeviceFlags.test(rsR4))
+    {
+        // try to initialize R4
+        Log("Loading DLL:", r4_name);
+        hRender = LoadLibrary(r4_name);
+        if (0 == hRender)
+        {
+            // try to load R1
+            Msg("! ...Failed - incompatible hardware/pre-Vista OS.");
+            psDeviceFlags.set(rsR2, TRUE);
+        }
+    }
+
+    if (psDeviceFlags.test(rsR3))
+    {
+        // try to initialize R3
+        Log("Loading DLL:", r3_name);
+        hRender = LoadLibrary(r3_name);
+        if (0 == hRender)
+        {
+            // try to load R1
+            Msg("! ...Failed - incompatible hardware/pre-Vista OS.");
+            psDeviceFlags.set(rsR2, TRUE);
+        }
+        else
+            g_current_renderer = 3;
+    }
+
+    if (psDeviceFlags.test(rsR2))
+    {
+        // try to initialize R2
+        psDeviceFlags.set(rsR4, FALSE);
+        psDeviceFlags.set(rsR3, FALSE);
+        Log("Loading DLL:", r2_name);
+        hRender = LoadLibrary(r2_name);
+        if (0 == hRender)
+        {
+            // try to load R1
+            Msg("! ...Failed - incompatible hardware.");
+        }
+        else
+            g_current_renderer = 2;
+    }
+
+    SECUROM_MARKER_HIGH_SECURITY_OFF(2)
 }
 #endif // DEDICATED_SERVER
 
 
 void CEngineAPI::Initialize(void)
 {
-	//////////////////////////////////////////////////////////////////////////
-	// render
-	LPCSTR			r1_name	= "xrRender_R1.dll";
-
-	#ifndef DEDICATED_SERVER
-		InitializeNotDedicated();
-	#endif // DEDICATED_SERVER
-
-	if (0==hRender)		
-	{
-		// try to load R1
-		psDeviceFlags.set	(rsR4,FALSE);
-		psDeviceFlags.set	(rsR3,FALSE);
-		psDeviceFlags.set	(rsR2,FALSE);
-		renderer_value		= 0; //con cmd
-
-		Log				("Loading DLL:",	r1_name);
-		hRender			= LoadLibrary		(r1_name);
-		if (0==hRender)	R_CHK				(GetLastError());
-		R_ASSERT		(hRender);
-		g_current_renderer	= 1;
-	}
-
-	Device.ConnectToRender();
-
-	// game	
-	{
-		LPCSTR			g_name	= "xrGame.dll";
-		Log				("Loading DLL:",g_name);
-		hGame			= LoadLibrary	(g_name);
-		if (0==hGame)	R_CHK			(GetLastError());
-		R_ASSERT2		(hGame,"Game DLL raised exception during loading or there is no game DLL at all");
-		pCreate			= (Factory_Create*)		GetProcAddress(hGame,"xrFactory_Create"		);	R_ASSERT(pCreate);
-		pDestroy		= (Factory_Destroy*)	GetProcAddress(hGame,"xrFactory_Destroy"	);	R_ASSERT(pDestroy);
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// vTune
-	tune_enabled		= FALSE;
-	if (strstr(Core.Params,"-tune"))	{
-		LPCSTR			g_name	= "vTuneAPI.dll";
-		Log				("Loading DLL:",g_name);
-		hTuner			= LoadLibrary	(g_name);
-		if (0==hTuner)	R_CHK			(GetLastError());
-		R_ASSERT2		(hTuner,"Intel vTune is not installed");
-		tune_enabled	= TRUE;
-		tune_pause		= (VTPause*)	GetProcAddress(hTuner,"VTPause"		);	R_ASSERT(tune_pause);
-		tune_resume		= (VTResume*)	GetProcAddress(hTuner,"VTResume"	);	R_ASSERT(tune_resume);
-	}
+    //////////////////////////////////////////////////////////////////////////
+    // render
+    LPCSTR r1_name = "xrRender_R1.dll";
+
+#ifndef DEDICATED_SERVER
+    InitializeNotDedicated();
+#endif // DEDICATED_SERVER
+
+    if (0 == hRender)
+    {
+        // try to load R1
+        psDeviceFlags.set(rsR4, FALSE);
+        psDeviceFlags.set(rsR3, FALSE);
+        psDeviceFlags.set(rsR2, FALSE);
+        renderer_value = 0; //con cmd
+
+        Log("Loading DLL:", r1_name);
+        hRender = LoadLibrary(r1_name);
+        if (0 == hRender) R_CHK(GetLastError());
+        R_ASSERT(hRender);
+        g_current_renderer = 1;
+    }
+
+    Device.ConnectToRender();
+
+    // game
+    {
+        LPCSTR g_name = "xrGame.dll";
+        Log("Loading DLL:", g_name);
+        hGame = LoadLibrary(g_name);
+        if (0 == hGame) R_CHK(GetLastError());
+        R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");
+        pCreate = (Factory_Create*)GetProcAddress(hGame, "xrFactory_Create");
+        R_ASSERT(pCreate);
+        pDestroy = (Factory_Destroy*)GetProcAddress(hGame, "xrFactory_Destroy");
+        R_ASSERT(pDestroy);
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // vTune
+    tune_enabled = FALSE;
+    if (strstr(Core.Params, "-tune"))
+    {
+        LPCSTR g_name = "vTuneAPI.dll";
+        Log("Loading DLL:", g_name);
+        hTuner = LoadLibrary(g_name);
+        if (0 == hTuner) R_CHK(GetLastError());
+        R_ASSERT2(hTuner, "Intel vTune is not installed");
+        tune_enabled = TRUE;
+        tune_pause = (VTPause*)GetProcAddress(hTuner, "VTPause");
+        R_ASSERT(tune_pause);
+        tune_resume = (VTResume*)GetProcAddress(hTuner, "VTResume");
+        R_ASSERT(tune_resume);
+    }
 }
 
-void CEngineAPI::Destroy	(void)
+void CEngineAPI::Destroy(void)
 {
-	if (hGame)				{ FreeLibrary(hGame);	hGame	= 0; }
-	if (hRender)			{ FreeLibrary(hRender); hRender = 0; }
-	pCreate					= 0;
-	pDestroy				= 0;
-	Engine.Event._destroy	();
-	XRC.r_clear_compact		();
+    if (hGame) { FreeLibrary(hGame); hGame = 0; }
+    if (hRender) { FreeLibrary(hRender); hRender = 0; }
+    pCreate = 0;
+    pDestroy = 0;
+    Engine.Event._destroy();
+    XRC.r_clear_compact();
 }
 
 extern "C" {
-	typedef bool __cdecl SupportsAdvancedRendering	(void);
-	typedef bool _declspec(dllexport) SupportsDX10Rendering();
-	typedef bool _declspec(dllexport) SupportsDX11Rendering();
+    typedef bool __cdecl SupportsAdvancedRendering(void);
+    typedef bool _declspec(dllexport) SupportsDX10Rendering();
+    typedef bool _declspec(dllexport) SupportsDX11Rendering();
 };
 
 void CEngineAPI::CreateRendererList()
 {
 #ifdef DEDICATED_SERVER
 
-	vid_quality_token						= xr_alloc<xr_token>(2);
+    vid_quality_token = xr_alloc<xr_token>(2);
 
-	vid_quality_token[0].id			= 0;
-	vid_quality_token[0].name		= xr_strdup("renderer_r1");
+    vid_quality_token[0].id = 0;
+    vid_quality_token[0].name = xr_strdup("renderer_r1");
 
-	vid_quality_token[1].id			= -1;
-	vid_quality_token[1].name		= NULL;
+    vid_quality_token[1].id = -1;
+    vid_quality_token[1].name = NULL;
 
 #else
-	//	TODO: ask renderers if they are supported!
-	if(vid_quality_token != NULL)		return;
-	bool bSupports_r2 = false;
-	bool bSupports_r2_5 = false;
-	bool bSupports_r3 = false;
-	bool bSupports_r4 = false;
-
-	LPCSTR			r2_name	= "xrRender_R2.dll";
-	LPCSTR			r3_name	= "xrRender_R3.dll";
-	LPCSTR			r4_name	= "xrRender_R4.dll";
-
-	if (strstr(Core.Params,"-perfhud_hack"))
-	{
-		bSupports_r2 = true;
-		bSupports_r2_5 = true;
-		bSupports_r3 = true;
-		bSupports_r4 = true;
-	}
-	else
-	{
-		// try to initialize R2
-		Log				("Loading DLL:",	r2_name);
-		hRender			= LoadLibrary		(r2_name);
-		if (hRender)	
-		{
-			bSupports_r2 = true;
-			SupportsAdvancedRendering *test_rendering = (SupportsAdvancedRendering*) GetProcAddress(hRender,"SupportsAdvancedRendering");	
-			R_ASSERT(test_rendering);
-			bSupports_r2_5 = test_rendering();
-			FreeLibrary(hRender);
-		}
-
-		// try to initialize R3
-		Log				("Loading DLL:",	r3_name);
-		//	Hide "d3d10.dll not found" message box for XP
-		SetErrorMode(SEM_FAILCRITICALERRORS);
-		hRender			= LoadLibrary		(r3_name);
-		//	Restore error handling
-		SetErrorMode(0);
-		if (hRender)	
-		{
-			SupportsDX10Rendering *test_dx10_rendering = (SupportsDX10Rendering*) GetProcAddress(hRender,"SupportsDX10Rendering");
-			R_ASSERT(test_dx10_rendering);
-			bSupports_r3 = test_dx10_rendering();
-			FreeLibrary(hRender);
-		}
-
-		// try to initialize R4
-		Log				("Loading DLL:",	r4_name);
-		//	Hide "d3d10.dll not found" message box for XP
-		SetErrorMode	(SEM_FAILCRITICALERRORS);
-		hRender			= LoadLibrary		(r4_name);
-		//	Restore error handling
-		SetErrorMode	(0);
-		if (hRender)	
-		{
-			SupportsDX11Rendering *test_dx11_rendering = (SupportsDX11Rendering*) GetProcAddress(hRender,"SupportsDX11Rendering");
-			R_ASSERT(test_dx11_rendering);
-			bSupports_r4 = test_dx11_rendering();
-			FreeLibrary(hRender);
-		}
-	}
-
-	hRender = 0;
-
-	xr_vector<LPCSTR>			_tmp;
-	u32 i						= 0;
-	bool bBreakLoop = false;
-	for(; i<6; ++i)
-	{
-		switch (i)
-		{
-		case 1:
-			if (!bSupports_r2)
-				bBreakLoop = true;
-			break;
-		case 3:		//"renderer_r2.5"
-			if (!bSupports_r2_5)
-				bBreakLoop = true;
-			break;
-		case 4:		//"renderer_r_dx10"
-			if (!bSupports_r3)
-				bBreakLoop = true;
-			break;
-		case 5:		//"renderer_r_dx11"
-			if (!bSupports_r4)
-				bBreakLoop = true;
-			break;
-		default:	;
-		}
-
-		if (bBreakLoop) break;
-
-		_tmp.push_back				(NULL);
-		LPCSTR val					= NULL;
-		switch (i)
-		{
-		case 0: val ="renderer_r1";			break;
-		case 1: val ="renderer_r2a";		break;
-		case 2: val ="renderer_r2";			break;
-		case 3: val ="renderer_r2.5";		break;
-		case 4: val ="renderer_r3";			break; //  -)
-		case 5: val ="renderer_r4";			break; //  -)
-		}
-		if (bBreakLoop) break;
-		_tmp.back()					= xr_strdup(val);
-	}
-	u32 _cnt								= _tmp.size()+1;
-	vid_quality_token						= xr_alloc<xr_token>(_cnt);
-
-	vid_quality_token[_cnt-1].id			= -1;
-	vid_quality_token[_cnt-1].name			= NULL;
-
-#ifdef DEBUG
-	Msg("Available render modes[%d]:",_tmp.size());
-#endif // DEBUG
-	for(u32 i=0; i<_tmp.size();++i)
-	{
-		vid_quality_token[i].id				= i;
-		vid_quality_token[i].name			= _tmp[i];
-#ifdef DEBUG
-		Msg							("[%s]",_tmp[i]);
-#endif // DEBUG
-	}
-
-	/*
-	if(vid_quality_token != NULL)		return;
-
-	D3DCAPS9					caps;
-	CHW							_HW;
-	_HW.CreateD3D				();
-	_HW.pD3D->GetDeviceCaps		(D3DADAPTER_DEFAULT,D3DDEVTYPE_HAL,&caps);
-	_HW.DestroyD3D				();
-	u16		ps_ver_major		= u16 ( u32(u32(caps.PixelShaderVersion)&u32(0xf << 8ul))>>8 );
-
-	xr_vector<LPCSTR>			_tmp;
-	u32 i						= 0;
-	for(; i<5; ++i)
-	{
-		bool bBreakLoop = false;
-		switch (i)
-		{
-		case 3:		//"renderer_r2.5"
-			if (ps_ver_major < 3)
-				bBreakLoop = true;
-			break;
-		case 4:		//"renderer_r_dx10"
-			bBreakLoop = true;
-			break;
-		default:	;
-		}
-
-		if (bBreakLoop) break;
-
-		_tmp.push_back				(NULL);
-		LPCSTR val					= NULL;
-		switch (i)
-		{
-		case 0: val ="renderer_r1";			break;
-		case 1: val ="renderer_r2a";		break;
-		case 2: val ="renderer_r2";			break;
-		case 3: val ="renderer_r2.5";		break;
-		case 4: val ="renderer_r_dx10";		break; //  -)
-		}
-		_tmp.back()					= xr_strdup(val);
-	}
-	u32 _cnt								= _tmp.size()+1;
-	vid_quality_token						= xr_alloc<xr_token>(_cnt);
-
-	vid_quality_token[_cnt-1].id			= -1;
-	vid_quality_token[_cnt-1].name			= NULL;
+    // TODO: ask renderers if they are supported!
+    if (vid_quality_token != NULL) return;
+    bool bSupports_r2 = false;
+    bool bSupports_r2_5 = false;
+    bool bSupports_r3 = false;
+    bool bSupports_r4 = false;
+
+    LPCSTR r2_name = "xrRender_R2.dll";
+    LPCSTR r3_name = "xrRender_R3.dll";
+    LPCSTR r4_name = "xrRender_R4.dll";
+
+    if (strstr(Core.Params, "-perfhud_hack"))
+    {
+        bSupports_r2 = true;
+        bSupports_r2_5 = true;
+        bSupports_r3 = true;
+        bSupports_r4 = true;
+    }
+    else
+    {
+        // try to initialize R2
+        Log("Loading DLL:", r2_name);
+        hRender = LoadLibrary(r2_name);
+        if (hRender)
+        {
+            bSupports_r2 = true;
+            SupportsAdvancedRendering* test_rendering = (SupportsAdvancedRendering*)GetProcAddress(hRender, "SupportsAdvancedRendering");
+            R_ASSERT(test_rendering);
+            bSupports_r2_5 = test_rendering();
+            FreeLibrary(hRender);
+        }
+
+        // try to initialize R3
+        Log("Loading DLL:", r3_name);
+        // Hide "d3d10.dll not found" message box for XP
+        SetErrorMode(SEM_FAILCRITICALERRORS);
+        hRender = LoadLibrary(r3_name);
+        // Restore error handling
+        SetErrorMode(0);
+        if (hRender)
+        {
+            SupportsDX10Rendering* test_dx10_rendering = (SupportsDX10Rendering*)GetProcAddress(hRender, "SupportsDX10Rendering");
+            R_ASSERT(test_dx10_rendering);
+            bSupports_r3 = test_dx10_rendering();
+            FreeLibrary(hRender);
+        }
+
+        // try to initialize R4
+        Log("Loading DLL:", r4_name);
+        // Hide "d3d10.dll not found" message box for XP
+        SetErrorMode(SEM_FAILCRITICALERRORS);
+        hRender = LoadLibrary(r4_name);
+        // Restore error handling
+        SetErrorMode(0);
+        if (hRender)
+        {
+            SupportsDX11Rendering* test_dx11_rendering = (SupportsDX11Rendering*)GetProcAddress(hRender, "SupportsDX11Rendering");
+            R_ASSERT(test_dx11_rendering);
+            bSupports_r4 = test_dx11_rendering();
+            FreeLibrary(hRender);
+        }
+    }
+
+    hRender = 0;
+
+    xr_vector<LPCSTR> _tmp;
+    u32 i = 0;
+    bool bBreakLoop = false;
+    for (; i < 6; ++i)
+    {
+        switch (i)
+        {
+        case 1:
+            if (!bSupports_r2)
+                bBreakLoop = true;
+            break;
+        case 3: //"renderer_r2.5"
+            if (!bSupports_r2_5)
+                bBreakLoop = true;
+            break;
+        case 4: //"renderer_r_dx10"
+            if (!bSupports_r3)
+                bBreakLoop = true;
+            break;
+        case 5: //"renderer_r_dx11"
+            if (!bSupports_r4)
+                bBreakLoop = true;
+            break;
+        default:
+            ;
+        }
+
+        if (bBreakLoop) break;
+
+        _tmp.push_back(NULL);
+        LPCSTR val = NULL;
+        switch (i)
+        {
+        case 0:
+            val = "renderer_r1";
+            break;
+        case 1:
+            val = "renderer_r2a";
+            break;
+        case 2:
+            val = "renderer_r2";
+            break;
+        case 3:
+            val = "renderer_r2.5";
+            break;
+        case 4:
+            val = "renderer_r3";
+            break; // -)
+        case 5:
+            val = "renderer_r4";
+            break; // -)
+        }
+        if (bBreakLoop) break;
+        _tmp.back() = xr_strdup(val);
+    }
+    u32 _cnt = _tmp.size() + 1;
+    vid_quality_token = xr_alloc<xr_token>(_cnt);
+
+    vid_quality_token[_cnt - 1].id = -1;
+    vid_quality_token[_cnt - 1].name = NULL;
 
 #ifdef DEBUG
-	Msg("Available render modes[%d]:",_tmp.size());
+    Msg("Available render modes[%d]:", _tmp.size());
 #endif // DEBUG
-	for(u32 i=0; i<_tmp.size();++i)
-	{
-		vid_quality_token[i].id				= i;
-		vid_quality_token[i].name			= _tmp[i];
+    for (u32 i = 0; i < _tmp.size(); ++i)
+    {
+        vid_quality_token[i].id = i;
+        vid_quality_token[i].name = _tmp[i];
 #ifdef DEBUG
-		Msg							("[%s]",_tmp[i]);
+        Msg("[%s]", _tmp[i]);
 #endif // DEBUG
-	}
-	*/
+    }
+
+    /*
+    if(vid_quality_token != NULL) return;
+
+    D3DCAPS9 caps;
+    CHW _HW;
+    _HW.CreateD3D ();
+    _HW.pD3D->GetDeviceCaps (D3DADAPTER_DEFAULT,D3DDEVTYPE_HAL,&caps);
+    _HW.DestroyD3D ();
+    u16 ps_ver_major = u16 ( u32(u32(caps.PixelShaderVersion)&u32(0xf << 8ul))>>8 );
+
+    xr_vector<LPCSTR> _tmp;
+    u32 i = 0;
+    for(; i<5; ++i)
+    {
+    bool bBreakLoop = false;
+    switch (i)
+    {
+    case 3: //"renderer_r2.5"
+    if (ps_ver_major < 3)
+    bBreakLoop = true;
+    break;
+    case 4: //"renderer_r_dx10"
+    bBreakLoop = true;
+    break;
+    default: ;
+    }
+
+    if (bBreakLoop) break;
+
+    _tmp.push_back (NULL);
+    LPCSTR val = NULL;
+    switch (i)
+    {
+    case 0: val ="renderer_r1"; break;
+    case 1: val ="renderer_r2a"; break;
+    case 2: val ="renderer_r2"; break;
+    case 3: val ="renderer_r2.5"; break;
+    case 4: val ="renderer_r_dx10"; break; // -)
+    }
+    _tmp.back() = xr_strdup(val);
+    }
+    u32 _cnt = _tmp.size()+1;
+    vid_quality_token = xr_alloc<xr_token>(_cnt);
+
+    vid_quality_token[_cnt-1].id = -1;
+    vid_quality_token[_cnt-1].name = NULL;
+
+    #ifdef DEBUG
+    Msg("Available render modes[%d]:",_tmp.size());
+    #endif // DEBUG
+    for(u32 i=0; i<_tmp.size();++i)
+    {
+    vid_quality_token[i].id = i;
+    vid_quality_token[i].name = _tmp[i];
+    #ifdef DEBUG
+    Msg ("[%s]",_tmp[i]);
+    #endif // DEBUG
+    }
+    */
 #endif //#ifndef DEDICATED_SERVER
 }
\ No newline at end of file
diff --git a/src/xrEngine/EngineAPI.h b/src/xrEngine/EngineAPI.h
index 6e62c0511e2..1086c673c1e 100644
--- a/src/xrEngine/EngineAPI.h
+++ b/src/xrEngine/EngineAPI.h
@@ -9,56 +9,57 @@
 #pragma once
 
 // Abstract 'Pure' class for DLL interface
-class ENGINE_API DLL_Pure {
+class ENGINE_API DLL_Pure
+{
 public:
-	CLASS_ID				CLS_ID;
+    CLASS_ID CLS_ID;
 
-	DLL_Pure(void *params)	{CLS_ID=0; };
-	DLL_Pure()				{CLS_ID=0; };
-	virtual	DLL_Pure*		_construct		()	{ return this; 	}
-	virtual ~DLL_Pure()		{};
+    DLL_Pure(void* params) { CLS_ID = 0; };
+    DLL_Pure() { CLS_ID = 0; };
+    virtual DLL_Pure* _construct() { return this; }
+    virtual ~DLL_Pure() {};
 };
 
 // Class creation/destroying interface
 extern "C" {
-typedef DLL_API  DLL_Pure*	  __cdecl Factory_Create	(CLASS_ID	CLS_ID);
-typedef DLL_API  void		  __cdecl Factory_Destroy	(DLL_Pure*	O);
+    typedef DLL_API DLL_Pure* __cdecl Factory_Create(CLASS_ID CLS_ID);
+    typedef DLL_API void __cdecl Factory_Destroy(DLL_Pure* O);
 };
 
 // Tuning interface
 extern "C" {
-	typedef void __cdecl VTPause	(void);
-	typedef void __cdecl VTResume	(void);
+    typedef void __cdecl VTPause(void);
+    typedef void __cdecl VTResume(void);
 };
 
-class ENGINE_API		CEngineAPI
+class ENGINE_API CEngineAPI
 {
 private:
-	HMODULE				hGame;
-	HMODULE				hRender;
-	HMODULE				hTuner;
+    HMODULE hGame;
+    HMODULE hRender;
+    HMODULE hTuner;
 public:
-	BENCH_SEC_SCRAMBLEMEMBER1
-	Factory_Create*		pCreate;
-	Factory_Destroy*	pDestroy;
-	BOOL				tune_enabled;
-	VTPause*			tune_pause	;
-	VTResume*			tune_resume	;
-	void				Initialize	();
-	
-	#ifndef DEDICATED_SERVER
-		void				InitializeNotDedicated();
-	#endif // DEDICATED_SERVER
-	
-	void				Destroy		();
+    BENCH_SEC_SCRAMBLEMEMBER1
+        Factory_Create* pCreate;
+    Factory_Destroy* pDestroy;
+    BOOL tune_enabled;
+    VTPause* tune_pause;
+    VTResume* tune_resume;
+    void Initialize();
+
+#ifndef DEDICATED_SERVER
+    void InitializeNotDedicated();
+#endif // DEDICATED_SERVER
+
+    void Destroy();
 
-	void				CreateRendererList();
+    void CreateRendererList();
 
-	CEngineAPI	();
-	~CEngineAPI	();
+    CEngineAPI();
+    ~CEngineAPI();
 };
 
-#define NEW_INSTANCE(a)		Engine.External.pCreate(a)
-#define DEL_INSTANCE(a)		{ Engine.External.pDestroy(a); a=NULL; }
+#define NEW_INSTANCE(a) Engine.External.pCreate(a)
+#define DEL_INSTANCE(a) { Engine.External.pDestroy(a); a=NULL; }
 
 #endif // !defined(AFX_ENGINEAPI_H__CF21372B_C8B8_4891_82FC_D872C84E1DD4__INCLUDED_)
diff --git a/src/xrEngine/EnnumerateVertices.h b/src/xrEngine/EnnumerateVertices.h
index e43a85f970e..14e136d4dc0 100644
--- a/src/xrEngine/EnnumerateVertices.h
+++ b/src/xrEngine/EnnumerateVertices.h
@@ -2,6 +2,6 @@
 
 struct SEnumVerticesCallback
 {
-	virtual void operator () (const Fvector& p)		=	0;
+    virtual void operator () (const Fvector& p) = 0;
 };
 
diff --git a/src/xrEngine/Envelope.cpp b/src/xrEngine/Envelope.cpp
index eb683526775..e5f5de28f0c 100644
--- a/src/xrEngine/Envelope.cpp
+++ b/src/xrEngine/Envelope.cpp
@@ -5,80 +5,88 @@
 
 CEnvelope::~CEnvelope()
 {
-	Clear();
+    Clear();
 }
 
 CEnvelope::CEnvelope(CEnvelope* source)
 {
-	*this 		= *source;
-	for (u32 i=0; i<source->keys.size(); i++)
-    	keys[i]	= xr_new<st_Key> (*source->keys[i]);
+    *this = *source;
+    for (u32 i = 0; i < source->keys.size(); i++)
+        keys[i] = xr_new<st_Key>(*source->keys[i]);
 }
 
-void  CEnvelope::ClearAndFree()
+void CEnvelope::ClearAndFree()
 {
-	Clear();
+    Clear();
     keys.clear();
 }
 
 void CEnvelope::Clear()
 {
-	for (KeyIt k_it=keys.begin(); k_it!=keys.end(); k_it++)
-		xr_delete(*k_it);
+    for (KeyIt k_it = keys.begin(); k_it != keys.end(); k_it++)
+        xr_delete(*k_it);
 }
 
 void CEnvelope::FindNearestKey(float t, KeyIt& min_k, KeyIt& max_k, float eps)
 {
-	for (KeyIt k_it=keys.begin(); k_it!=keys.end(); k_it++){
-    	if (fsimilar((*k_it)->time,t,eps)){
-        	max_k = k_it+1;
-        	min_k = (k_it==keys.begin())?k_it:k_it-1;
-        	return;
+    for (KeyIt k_it = keys.begin(); k_it != keys.end(); k_it++)
+    {
+        if (fsimilar((*k_it)->time, t, eps))
+        {
+            max_k = k_it + 1;
+            min_k = (k_it == keys.begin()) ? k_it : k_it - 1;
+            return;
         }
-    	if ((*k_it)->time>t){ 
-        	max_k = k_it;
-        	min_k = (k_it==keys.begin())?k_it:k_it-1;
+        if ((*k_it)->time > t)
+        {
+            max_k = k_it;
+            min_k = (k_it == keys.begin()) ? k_it : k_it - 1;
             return;
         }
     }
-    min_k=keys.empty()?keys.end():keys.end()-1;
-    max_k=keys.end();
+    min_k = keys.empty() ? keys.end() : keys.end() - 1;
+    max_k = keys.end();
 }
 
 KeyIt CEnvelope::FindKey(float t, float eps)
 {
-	for (KeyIt k_it=keys.begin(); k_it!=keys.end(); k_it++){
-    	if (fsimilar((*k_it)->time,t,eps)) return k_it;
-    	if ((*k_it)->time>t) return keys.end();
+    for (KeyIt k_it = keys.begin(); k_it != keys.end(); k_it++)
+    {
+        if (fsimilar((*k_it)->time, t, eps)) return k_it;
+        if ((*k_it)->time > t) return keys.end();
     }
     return keys.end();
 }
 
 void CEnvelope::InsertKey(float t, float val)
-{	
-	for (KeyIt k_it=keys.begin(); k_it!=keys.end(); k_it++){
-    	if (fsimilar((*k_it)->time,t,EPS_L)){ 
-        	(*k_it)->value= val;
+{
+    for (KeyIt k_it = keys.begin(); k_it != keys.end(); k_it++)
+    {
+        if (fsimilar((*k_it)->time, t, EPS_L))
+        {
+            (*k_it)->value = val;
             return;
         }
         // insert before
-    	if ((*k_it)->time>t) break;
+        if ((*k_it)->time > t) break;
     }
     // create _new key
-    st_Key* K 	= xr_new<st_Key>();
-    K->time 	= t;
-    K->value 	= val;
-    K->shape	= SHAPE_TCB; 
-    behavior[0]	= BEH_CONSTANT;
-    behavior[1]	= BEH_CONSTANT;
-    keys.insert	(k_it,K);
+    st_Key* K = xr_new<st_Key>();
+    K->time = t;
+    K->value = val;
+    K->shape = SHAPE_TCB;
+    behavior[0] = BEH_CONSTANT;
+    behavior[1] = BEH_CONSTANT;
+    keys.insert(k_it, K);
 }
 
 void CEnvelope::DeleteKey(float t)
-{	
-	for (KeyIt k_it=keys.begin(); k_it!=keys.end(); k_it++){
-    	if (fsimilar((*k_it)->time,t,EPS_L)){ 
-        	xr_delete(*k_it);
+{
+    for (KeyIt k_it = keys.begin(); k_it != keys.end(); k_it++)
+    {
+        if (fsimilar((*k_it)->time, t, EPS_L))
+        {
+            xr_delete(*k_it);
             keys.erase(k_it);
             return;
         }
@@ -87,42 +95,48 @@ void CEnvelope::DeleteKey(float t)
 
 BOOL CEnvelope::ScaleKeys(float from_time, float to_time, float scale_factor, float eps)
 {
-	KeyIt min_k	= FindKey(from_time,eps);
-    if (min_k==keys.end()){
-	    KeyIt k0;
-		FindNearestKey(from_time, k0, min_k, eps);
+    KeyIt min_k = FindKey(from_time, eps);
+    if (min_k == keys.end())
+    {
+        KeyIt k0;
+        FindNearestKey(from_time, k0, min_k, eps);
     }
-    KeyIt max_k	= FindKey(to_time,eps);
-    if (max_k==keys.end()){
-	    KeyIt k1;
-		FindNearestKey(to_time, max_k, k1, eps);
+    KeyIt max_k = FindKey(to_time, eps);
+    if (max_k == keys.end())
+    {
+        KeyIt k1;
+        FindNearestKey(to_time, max_k, k1, eps);
     }
-    if (min_k!=keys.end()&&min_k!=max_k){
-    	if (max_k!=keys.end()) max_k++;
-        float t0		= (*min_k)->time;
-		float offset	= 0;
-    	for (KeyIt it=min_k+1; it!=max_k; it++){
-        	float new_time = offset+t0+((*it)->time-t0)*scale_factor;
-            offset		+= ((new_time-(*(it-1))->time)-((*it)->time-t0));
-            t0			= (*it)->time;
-        	(*it)->time = new_time;
+    if (min_k != keys.end() && min_k != max_k)
+    {
+        if (max_k != keys.end()) max_k++;
+        float t0 = (*min_k)->time;
+        float offset = 0;
+        for (KeyIt it = min_k + 1; it != max_k; it++)
+        {
+            float new_time = offset + t0 + ((*it)->time - t0)*scale_factor;
+            offset += ((new_time - (*(it - 1))->time) - ((*it)->time - t0));
+            t0 = (*it)->time;
+            (*it)->time = new_time;
         }
-    	for (; it!=keys.end(); it++){
-        	float new_time = offset+(*it)->time;
-            offset		+= ((new_time-(*(it-1))->time)-((*it)->time-t0));
-        	(*it)->time = new_time;
+        for (; it != keys.end(); it++)
+        {
+            float new_time = offset + (*it)->time;
+            offset += ((new_time - (*(it - 1))->time) - ((*it)->time - t0));
+            (*it)->time = new_time;
         }
-	    return TRUE;
+        return TRUE;
     }
     return FALSE;
 }
 
 float CEnvelope::GetLength(float* mn, float* mx)
 {
-	if (!keys.empty()){
-    	if (mn) *mn = keys.front()->time;
-    	if (mx) *mx = keys.back()->time;
-    	return keys.back()->time-keys.front()->time;
+    if (!keys.empty())
+    {
+        if (mn) *mn = keys.front()->time;
+        if (mx) *mx = keys.back()->time;
+        return keys.back()->time - keys.front()->time;
     }
     if (mn) *mn = 0.f;
     if (mx) *mx = 0.f;
@@ -131,115 +145,129 @@ float CEnvelope::GetLength(float* mn, float* mx)
 
 void CEnvelope::RotateKeys(float angle)
 {
-	for (u32 i=0; i<keys.size(); i++)
-    	keys[i]->value += angle;
+    for (u32 i = 0; i < keys.size(); i++)
+        keys[i]->value += angle;
 }
 
 
-extern float evalEnvelope( CEnvelope *env, float time );
-float CEnvelope::Evaluate(float time){
-	return evalEnvelope(this, time);
+extern float evalEnvelope(CEnvelope* env, float time);
+float CEnvelope::Evaluate(float time)
+{
+    return evalEnvelope(this, time);
 }
 
 void CEnvelope::Save(IWriter& F)
 {
-	F.w_u8		((u8)behavior[0]);
-	F.w_u8		((u8)behavior[1]);
-	F.w_u16		((u16)keys.size());
-	for (KeyIt k_it=keys.begin(); k_it!=keys.end(); k_it++)
-    	(*k_it)->Save(F);
+    F.w_u8((u8)behavior[0]);
+    F.w_u8((u8)behavior[1]);
+    F.w_u16((u16)keys.size());
+    for (KeyIt k_it = keys.begin(); k_it != keys.end(); k_it++)
+        (*k_it)->Save(F);
 }
 
 void CEnvelope::Load_1(IReader& F)
 {
-	Clear		();
-	F.r			(behavior,sizeof(int)*2);
-    int y		= F.r_u32();
-	keys.resize	(y);
-	for (u32 i=0; i<keys.size(); i++){
-    	keys[i]	= xr_new<st_Key> ();
+    Clear();
+    F.r(behavior, sizeof(int) * 2);
+    int y = F.r_u32();
+    keys.resize(y);
+    for (u32 i = 0; i < keys.size(); i++)
+    {
+        keys[i] = xr_new<st_Key>();
         keys[i]->Load_1(F);
     }
 }
 
 void CEnvelope::Load_2(IReader& F)
 {
-	Clear		();
-	behavior[0]	= F.r_u8();
-	behavior[1]	= F.r_u8();
-	keys.resize	(F.r_u16());
-	for (u32 i=0; i<keys.size(); i++){
-    	keys[i]	= xr_new<st_Key> ();
+    Clear();
+    behavior[0] = F.r_u8();
+    behavior[1] = F.r_u8();
+    keys.resize(F.r_u16());
+    for (u32 i = 0; i < keys.size(); i++)
+    {
+        keys[i] = xr_new<st_Key>();
         keys[i]->Load_2(F);
     }
 }
 
-void CEnvelope::SaveA(IWriter&){
+void CEnvelope::SaveA(IWriter&)
+{
 }
 
 void CEnvelope::LoadA(IReader& F)
 {
-	Clear		();
-	string512 	buf;
-    float		f[9];
-	F.r_string(buf,sizeof(buf));
-	if (strstr(buf,"{ Envelope")){
-		F.r_string(buf,sizeof(buf));
-        int nkeys=atoi(buf);
-		keys.resize(nkeys);
-		for (u32 i=0; i<keys.size(); i++){
-    		keys[i]	= xr_new<st_Key> ();
-            st_Key& K=*keys[i];
-			F.r_string(buf,sizeof(buf));
-            int cnt = sscanf	(buf,"Key %f %f %f %f %f %f %f %f %f", f+0, f+1, f+2, f+3, f+4, f+5, f+6, f+7, f+8);
-            R_ASSERT(cnt==9);
-			K.value = f[ 0 ];
-      		K.time  = f[ 1 ];
-      		K.shape = ( u8 ) f[ 2 ];
-			if ( K.shape == SHAPE_TCB ) {
-         		K.tension    = f[ 3 ];
-         		K.continuity = f[ 4 ];
-         		K.bias       = f[ 5 ];
-      		}
-            if ( K.shape == SHAPE_BEZ2 ) {
-         		K.param[ 0 ] = f[ 3 ];
-         		K.param[ 1 ] = f[ 4 ];
-         		K.param[ 2 ] = f[ 5 ];
-         		K.param[ 3 ] = f[ 6 ];
-      		}else{
-         		K.param[ 0 ] = f[ 6 ];
-                K.param[ 1 ] = f[ 7 ];
-      		}
-	    }
+    Clear();
+    string512 buf;
+    float f[9];
+    F.r_string(buf, sizeof(buf));
+    if (strstr(buf, "{ Envelope"))
+    {
+        F.r_string(buf, sizeof(buf));
+        int nkeys = atoi(buf);
+        keys.resize(nkeys);
+        for (u32 i = 0; i < keys.size(); i++)
+        {
+            keys[i] = xr_new<st_Key>();
+            st_Key& K = *keys[i];
+            F.r_string(buf, sizeof(buf));
+            int cnt = sscanf(buf, "Key %f %f %f %f %f %f %f %f %f", f + 0, f + 1, f + 2, f + 3, f + 4, f + 5, f + 6, f + 7, f + 8);
+            R_ASSERT(cnt == 9);
+            K.value = f[0];
+            K.time = f[1];
+            K.shape = (u8)f[2];
+            if (K.shape == SHAPE_TCB)
+            {
+                K.tension = f[3];
+                K.continuity = f[4];
+                K.bias = f[5];
+            }
+            if (K.shape == SHAPE_BEZ2)
+            {
+                K.param[0] = f[3];
+                K.param[1] = f[4];
+                K.param[2] = f[5];
+                K.param[3] = f[6];
+            }
+            else
+            {
+                K.param[0] = f[6];
+                K.param[1] = f[7];
+            }
+        }
         // behavior <pre> <post>
-		F.r_string(buf,sizeof(buf));
-		int cnt = sscanf(buf,"Behaviors %d %d", behavior[0], behavior[1] );
-        R_ASSERT(cnt==2);
+        F.r_string(buf, sizeof(buf));
+        int cnt = sscanf(buf, "Behaviors %d %d", behavior[0], behavior[1]);
+        R_ASSERT(cnt == 2);
     }
 }
 
 void CEnvelope::Optimize()
 {
-	if (keys.empty())
-		return;
+    if (keys.empty())
+        return;
 
-	KeyIt it 		= keys.begin();
-    st_Key K 		= **it;	it++;
-    bool equal		= true;
-	for (;it!=keys.end();it++){
-    	if (!(*it)->equal(K)){
-        	equal	= false;
+    KeyIt it = keys.begin();
+    st_Key K = **it;
+    it++;
+    bool equal = true;
+    for (; it != keys.end(); it++)
+    {
+        if (!(*it)->equal(K))
+        {
+            equal = false;
             break;
         }
     }
-    if (equal&&(keys.size()>2)){
-        KeyVec		new_keys;
-		new_keys.push_back(xr_new<st_Key>(*keys.front()));
-		new_keys.push_back(xr_new<st_Key>(*keys.back()));
-        for (KeyIt k_it=keys.begin(); k_it!=keys.end(); k_it++)
+    if (equal && (keys.size() > 2))
+    {
+        KeyVec new_keys;
+        new_keys.push_back(xr_new<st_Key>(*keys.front()));
+        new_keys.push_back(xr_new<st_Key>(*keys.back()));
+        for (KeyIt k_it = keys.begin(); k_it != keys.end(); k_it++)
             xr_delete(*k_it);
-		keys.clear_and_free	();
-        keys				= new_keys;
+        keys.clear_and_free();
+        keys = new_keys;
     }
 }
 
diff --git a/src/xrEngine/Environment.cpp b/src/xrEngine/Environment.cpp
index 1a355a6e2e9..9f7441de884 100644
--- a/src/xrEngine/Environment.cpp
+++ b/src/xrEngine/Environment.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 #ifndef _EDITOR
-    #include "render.h"
+#include "render.h"
 #endif
 
 #include "Environment.h"
@@ -17,7 +17,7 @@
 //#include "resourcemanager.h"
 
 #ifndef _EDITOR
-	#include "IGame_Level.h"
+#include "IGame_Level.h"
 #endif
 
 //#include "D3DUtils.h"
@@ -31,623 +31,665 @@
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
-ENGINE_API	float			psVisDistance	= 1.f;
-static const float			MAX_NOISE_FREQ	= 0.03f;
+ENGINE_API float psVisDistance = 1.f;
+static const float MAX_NOISE_FREQ = 0.03f;
 
 //#define WEATHER_LOGGING
 
 // real WEATHER->WFX transition time
-#define WFX_TRANS_TIME		5.f
+#define WFX_TRANS_TIME 5.f
 
 const float MAX_DIST_FACTOR = 0.95f;
 
 //////////////////////////////////////////////////////////////////////////
 // environment
-CEnvironment::CEnvironment	() :
-	CurrentEnv				(0),
-	m_ambients_config		(0)
+CEnvironment::CEnvironment() :
+CurrentEnv(0),
+m_ambients_config(0)
 {
-	bNeed_re_create_env = FALSE;
-	bWFX					= false;
-	Current[0]				= 0;
-	Current[1]				= 0;
-    CurrentWeather			= 0;
-    CurrentWeatherName		= 0;
-	eff_Rain				= 0;
-    eff_LensFlare 			= 0;
-    eff_Thunderbolt			= 0;
-	OnDeviceCreate			();
+    bNeed_re_create_env = FALSE;
+    bWFX = false;
+    Current[0] = 0;
+    Current[1] = 0;
+    CurrentWeather = 0;
+    CurrentWeatherName = 0;
+    eff_Rain = 0;
+    eff_LensFlare = 0;
+    eff_Thunderbolt = 0;
+    OnDeviceCreate();
 #ifdef _EDITOR
-	ed_from_time			= 0.f;
-	ed_to_time				= DAY_LENGTH;
+    ed_from_time = 0.f;
+    ed_to_time = DAY_LENGTH;
 #endif
 
 #ifndef _EDITOR
-	m_paused				= false;
+    m_paused = false;
 #endif
 
-	fGameTime				= 0.f;
-    fTimeFactor				= 12.f;
-
-	wind_strength_factor	= 0.f;
-	wind_gust_factor		= 0.f;
-
-	wind_blast_strength	= 0.f;
-	wind_blast_direction.set(1.f,0.f,0.f);
-
-	wind_blast_strength_start_value	= 0.f;
-	wind_blast_strength_stop_value	= 0.f;
-
-	// fill clouds hemi verts & faces 
-	const Fvector* verts;
-	CloudsVerts.resize		(xrHemisphereVertices(2,verts));
-	CopyMemory				(&CloudsVerts.front(),verts,CloudsVerts.size()*sizeof(Fvector));
-	const u16* indices;
-	CloudsIndices.resize	(xrHemisphereIndices(2,indices));
-	CopyMemory				(&CloudsIndices.front(),indices,CloudsIndices.size()*sizeof(u16));
-
-	// perlin noise
-	PerlinNoise1D			= xr_new<CPerlinNoise1D>(Random.randI(0,0xFFFF));
-	PerlinNoise1D->SetOctaves(2);
-	PerlinNoise1D->SetAmplitude(0.66666f);
-
-//	tsky0					= Device.Resources->_CreateTexture("$user$sky0");
-//	tsky1					= Device.Resources->_CreateTexture("$user$sky1");
-
-	string_path				file_name;
-	m_ambients_config		=
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\ambients.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-	m_sound_channels_config	=
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\sound_channels.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-	m_effects_config		=
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\effects.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-	m_suns_config			=
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\suns.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-	m_thunderbolt_collections_config	=
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\thunderbolt_collections.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-	m_thunderbolts_config	=
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\thunderbolts.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-
-	CInifile*		config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\environment.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
+    fGameTime = 0.f;
+    fTimeFactor = 12.f;
+
+    wind_strength_factor = 0.f;
+    wind_gust_factor = 0.f;
+
+    wind_blast_strength = 0.f;
+    wind_blast_direction.set(1.f, 0.f, 0.f);
+
+    wind_blast_strength_start_value = 0.f;
+    wind_blast_strength_stop_value = 0.f;
+
+    // fill clouds hemi verts & faces
+    const Fvector* verts;
+    CloudsVerts.resize(xrHemisphereVertices(2, verts));
+    CopyMemory(&CloudsVerts.front(), verts, CloudsVerts.size()*sizeof(Fvector));
+    const u16* indices;
+    CloudsIndices.resize(xrHemisphereIndices(2, indices));
+    CopyMemory(&CloudsIndices.front(), indices, CloudsIndices.size()*sizeof(u16));
+
+    // perlin noise
+    PerlinNoise1D = xr_new<CPerlinNoise1D>(Random.randI(0, 0xFFFF));
+    PerlinNoise1D->SetOctaves(2);
+    PerlinNoise1D->SetAmplitude(0.66666f);
+
+    // tsky0 = Device.Resources->_CreateTexture("$user$sky0");
+    // tsky1 = Device.Resources->_CreateTexture("$user$sky1");
+
+    string_path file_name;
+    m_ambients_config =
+        xr_new<CInifile>(
+        FS.update_path(
+        file_name,
+        "$game_config$",
+        "environment\\ambients.ltx"
+        ),
+        TRUE,
+        TRUE,
+        FALSE
+        );
+    m_sound_channels_config =
+        xr_new<CInifile>(
+        FS.update_path(
+        file_name,
+        "$game_config$",
+        "environment\\sound_channels.ltx"
+        ),
+        TRUE,
+        TRUE,
+        FALSE
+        );
+    m_effects_config =
+        xr_new<CInifile>(
+        FS.update_path(
+        file_name,
+        "$game_config$",
+        "environment\\effects.ltx"
+        ),
+        TRUE,
+        TRUE,
+        FALSE
+        );
+    m_suns_config =
+        xr_new<CInifile>(
+        FS.update_path(
+        file_name,
+        "$game_config$",
+        "environment\\suns.ltx"
+        ),
+        TRUE,
+        TRUE,
+        FALSE
+        );
+    m_thunderbolt_collections_config =
+        xr_new<CInifile>(
+        FS.update_path(
+        file_name,
+        "$game_config$",
+        "environment\\thunderbolt_collections.ltx"
+        ),
+        TRUE,
+        TRUE,
+        FALSE
+        );
+    m_thunderbolts_config =
+        xr_new<CInifile>(
+        FS.update_path(
+        file_name,
+        "$game_config$",
+        "environment\\thunderbolts.ltx"
+        ),
+        TRUE,
+        TRUE,
+        FALSE
+        );
+
+    CInifile* config =
+        xr_new<CInifile>(
+        FS.update_path(
+        file_name,
+        "$game_config$",
+        "environment\\environment.ltx"
+        ),
+        TRUE,
+        TRUE,
+        FALSE
+        );
     // params
-	p_var_alt		= deg2rad(config->r_float					( "environment","altitude" ));  
-	p_var_long		= deg2rad	(config->r_float				( "environment","delta_longitude" ));
-	p_min_dist		= _min		(.95f,config->r_float			( "environment","min_dist_factor" ));
-	p_tilt			= deg2rad	(config->r_float				( "environment","tilt" ));
-	p_second_prop	= config->r_float							( "environment","second_propability" );
-	clamp			(p_second_prop,0.f,1.f);
-	p_sky_color		= config->r_float							( "environment","sky_color" );
-	p_sun_color		= config->r_float							( "environment","sun_color" );
-	p_fog_color		= config->r_float							( "environment","fog_color" );
-
-	xr_delete		(config);
+    p_var_alt = deg2rad(config->r_float("environment", "altitude"));
+    p_var_long = deg2rad(config->r_float("environment", "delta_longitude"));
+    p_min_dist = _min(.95f, config->r_float("environment", "min_dist_factor"));
+    p_tilt = deg2rad(config->r_float("environment", "tilt"));
+    p_second_prop = config->r_float("environment", "second_propability");
+    clamp(p_second_prop, 0.f, 1.f);
+    p_sky_color = config->r_float("environment", "sky_color");
+    p_sun_color = config->r_float("environment", "sun_color");
+    p_fog_color = config->r_float("environment", "fog_color");
+
+    xr_delete(config);
 }
 
-CEnvironment::~CEnvironment	()
+CEnvironment::~CEnvironment()
 {
-	xr_delete				(PerlinNoise1D);
-	OnDeviceDestroy			();
+    xr_delete(PerlinNoise1D);
+    OnDeviceDestroy();
 
-	VERIFY					(m_ambients_config);
-	CInifile::Destroy		(m_ambients_config);
-	m_ambients_config		= 0;
+    VERIFY(m_ambients_config);
+    CInifile::Destroy(m_ambients_config);
+    m_ambients_config = 0;
 
-	VERIFY					(m_sound_channels_config);
-	CInifile::Destroy		(m_sound_channels_config);
-	m_sound_channels_config	= 0;
+    VERIFY(m_sound_channels_config);
+    CInifile::Destroy(m_sound_channels_config);
+    m_sound_channels_config = 0;
 
-	VERIFY					(m_effects_config);
-	CInifile::Destroy		(m_effects_config);
-	m_effects_config		= 0;
+    VERIFY(m_effects_config);
+    CInifile::Destroy(m_effects_config);
+    m_effects_config = 0;
 
-	VERIFY					(m_suns_config);
-	CInifile::Destroy		(m_suns_config);
-	m_suns_config			= 0;
+    VERIFY(m_suns_config);
+    CInifile::Destroy(m_suns_config);
+    m_suns_config = 0;
 
-	VERIFY					(m_thunderbolt_collections_config);
-	CInifile::Destroy		(m_thunderbolt_collections_config);
-	m_thunderbolt_collections_config	= 0;
+    VERIFY(m_thunderbolt_collections_config);
+    CInifile::Destroy(m_thunderbolt_collections_config);
+    m_thunderbolt_collections_config = 0;
 
-	VERIFY					(m_thunderbolts_config);
-	CInifile::Destroy		(m_thunderbolts_config);
-	m_thunderbolts_config	= 0;
+    VERIFY(m_thunderbolts_config);
+    CInifile::Destroy(m_thunderbolts_config);
+    m_thunderbolts_config = 0;
 
-	destroy_mixer			();
+    destroy_mixer();
 }
 
 void CEnvironment::Invalidate()
 {
-	bWFX					= false;
-	Current[0]				= 0;
-	Current[1]				= 0;
-	if (eff_LensFlare)		eff_LensFlare->Invalidate();
+    bWFX = false;
+    Current[0] = 0;
+    Current[1] = 0;
+    if (eff_LensFlare) eff_LensFlare->Invalidate();
 }
 
 float CEnvironment::TimeDiff(float prev, float cur)
 {
-	if (prev>cur)	return	(DAY_LENGTH-prev)+cur;
-	else			return	cur-prev;
+    if (prev > cur) return (DAY_LENGTH - prev) + cur;
+    else return cur - prev;
 }
 
 float CEnvironment::TimeWeight(float val, float min_t, float max_t)
 {
-	float weight	= 0.f;
-	float length	= TimeDiff(min_t,max_t);
-	if (!fis_zero(length,EPS)){
-		if (min_t>max_t){
-			if ((val>=min_t)||(val<=max_t))	weight = TimeDiff(min_t,val)/length;
-		}else{
-			if ((val>=min_t)&&(val<=max_t))	weight = TimeDiff(min_t,val)/length;
-		}
-		clamp		(weight,0.f,1.f);
-	}
-	return			weight;
+    float weight = 0.f;
+    float length = TimeDiff(min_t, max_t);
+    if (!fis_zero(length, EPS))
+    {
+        if (min_t > max_t)
+        {
+            if ((val >= min_t) || (val <= max_t)) weight = TimeDiff(min_t, val) / length;
+        }
+        else
+        {
+            if ((val >= min_t) && (val <= max_t)) weight = TimeDiff(min_t, val) / length;
+        }
+        clamp(weight, 0.f, 1.f);
+    }
+    return weight;
 }
 void CEnvironment::ChangeGameTime(float game_time)
 {
-	fGameTime				= NormalizeTime(fGameTime + game_time);
+    fGameTime = NormalizeTime(fGameTime + game_time);
 };
 
 void CEnvironment::SetGameTime(float game_time, float time_factor)
 {
 #ifndef _EDITOR
-	if (m_paused) {
-		g_pGameLevel->SetEnvironmentGameTimeFactor	(iFloor(fGameTime*1000.f), fTimeFactor);
-		return;
-	}
+    if (m_paused)
+    {
+        g_pGameLevel->SetEnvironmentGameTimeFactor(iFloor(fGameTime*1000.f), fTimeFactor);
+        return;
+    }
 #endif
-	if (bWFX)
-		wfx_time			-= TimeDiff(fGameTime,game_time);
-	fGameTime				= game_time;  
-	fTimeFactor				= time_factor;	
+    if (bWFX)
+        wfx_time -= TimeDiff(fGameTime, game_time);
+    fGameTime = game_time;
+    fTimeFactor = time_factor;
 }
 
 float CEnvironment::NormalizeTime(float tm)
 {
-	if (tm<0.f)				return tm+DAY_LENGTH;
-	else if (tm>DAY_LENGTH)	return tm-DAY_LENGTH;
-	else					return tm;
+    if (tm < 0.f) return tm + DAY_LENGTH;
+    else if (tm > DAY_LENGTH) return tm - DAY_LENGTH;
+    else return tm;
 }
 
 void CEnvironment::SetWeather(shared_str name, bool forced)
 {
-//.	static BOOL bAlready = FALSE;
-//.	if(bAlready)	return;
-	if (name.size())	{
-//.		bAlready = TRUE;
-        EnvsMapIt it		= WeatherCycles.find(name);
-		if (it == WeatherCycles.end())
-		{
-			Msg("! Invalid weather name: %s", name.c_str());
-			return;
-		}
-        R_ASSERT3			(it!=WeatherCycles.end(),"Invalid weather name.",*name);
-		CurrentCycleName	= it->first;
-		if (forced)			{Invalidate();			}
-		if (!bWFX){
-			CurrentWeather		= &it->second;
-			CurrentWeatherName	= it->first;
-		}
-		if (forced)			{SelectEnvs(fGameTime);	}
+    //. static BOOL bAlready = FALSE;
+    //. if(bAlready) return;
+    if (name.size())
+    {
+        //. bAlready = TRUE;
+        EnvsMapIt it = WeatherCycles.find(name);
+        if (it == WeatherCycles.end())
+        {
+            Msg("! Invalid weather name: %s", name.c_str());
+            return;
+        }
+        R_ASSERT3(it != WeatherCycles.end(), "Invalid weather name.", *name);
+        CurrentCycleName = it->first;
+        if (forced) { Invalidate(); }
+        if (!bWFX)
+        {
+            CurrentWeather = &it->second;
+            CurrentWeatherName = it->first;
+        }
+        if (forced) { SelectEnvs(fGameTime); }
 #ifdef WEATHER_LOGGING
-		Msg					("Starting Cycle: %s [%s]",*name,forced?"forced":"deferred");
+        Msg("Starting Cycle: %s [%s]", *name, forced ? "forced" : "deferred");
 #endif
-    }else{
+    }
+    else
+    {
 #ifndef _EDITOR
-		FATAL				("! Empty weather name");
+        FATAL("! Empty weather name");
 #endif
     }
 }
 
 bool CEnvironment::SetWeatherFX(shared_str name)
 {
-	if (bWFX)				return false;
-	if (name.size()){
-		EnvsMapIt it		= WeatherFXs.find(name);
-		R_ASSERT3			(it!=WeatherFXs.end(),"Invalid weather effect name.",*name);
-		EnvVec* PrevWeather = CurrentWeather; VERIFY(PrevWeather);
-		CurrentWeather		= &it->second;
-		CurrentWeatherName	= it->first;
-
-		float rewind_tm		= WFX_TRANS_TIME*fTimeFactor;
-		float start_tm		= fGameTime+rewind_tm;
-		float current_length;
-		float current_weight;
-		if (Current[0]->exec_time > Current[1]->exec_time){
-			float x			= fGameTime>Current[0]->exec_time?fGameTime-Current[0]->exec_time:(DAY_LENGTH-Current[0]->exec_time)+fGameTime;
-			current_length	= (DAY_LENGTH-Current[0]->exec_time)+Current[1]->exec_time;
-			current_weight	= x/current_length; 
-		}else{
-			current_length	= Current[1]->exec_time-Current[0]->exec_time;
-			current_weight	= (fGameTime-Current[0]->exec_time)/current_length; 
-		}
-		clamp				(current_weight,0.f,1.f);
-
-		std::sort			(CurrentWeather->begin(),CurrentWeather->end(),sort_env_etl_pred);
-		CEnvDescriptor* C0	= CurrentWeather->at(0);
-		CEnvDescriptor* C1	= CurrentWeather->at(1);
-		CEnvDescriptor* CE	= CurrentWeather->at(CurrentWeather->size()-2);
-		CEnvDescriptor* CT	= CurrentWeather->at(CurrentWeather->size()-1);
-		C0->copy			(*Current[0]);	C0->exec_time = NormalizeTime(fGameTime-((rewind_tm/(Current[1]->exec_time-fGameTime))*current_length-rewind_tm));
-		C1->copy			(*Current[1]);	C1->exec_time = NormalizeTime(start_tm);
-		for (EnvIt t_it=CurrentWeather->begin()+2; t_it!=CurrentWeather->end()-1; t_it++)
-			(*t_it)->exec_time= NormalizeTime(start_tm+(*t_it)->exec_time_loaded);
-		SelectEnv			(PrevWeather,WFX_end_desc[0],CE->exec_time);
-		SelectEnv			(PrevWeather,WFX_end_desc[1],WFX_end_desc[0]->exec_time+0.5f);
-		CT->copy			(*WFX_end_desc[0]);CT->exec_time = NormalizeTime(CE->exec_time+rewind_tm);
-		wfx_time			= TimeDiff(fGameTime,CT->exec_time);
-		bWFX				= true;
-
-		// sort wfx envs
-		std::sort			(CurrentWeather->begin(),CurrentWeather->end(),sort_env_pred);
-
-		Current[0]			= C0;
-		Current[1]			= C1;
+    if (bWFX) return false;
+    if (name.size())
+    {
+        EnvsMapIt it = WeatherFXs.find(name);
+        R_ASSERT3(it != WeatherFXs.end(), "Invalid weather effect name.", *name);
+        EnvVec* PrevWeather = CurrentWeather;
+        VERIFY(PrevWeather);
+        CurrentWeather = &it->second;
+        CurrentWeatherName = it->first;
+
+        float rewind_tm = WFX_TRANS_TIME*fTimeFactor;
+        float start_tm = fGameTime + rewind_tm;
+        float current_length;
+        float current_weight;
+        if (Current[0]->exec_time > Current[1]->exec_time)
+        {
+            float x = fGameTime > Current[0]->exec_time ? fGameTime - Current[0]->exec_time : (DAY_LENGTH - Current[0]->exec_time) + fGameTime;
+            current_length = (DAY_LENGTH - Current[0]->exec_time) + Current[1]->exec_time;
+            current_weight = x / current_length;
+        }
+        else
+        {
+            current_length = Current[1]->exec_time - Current[0]->exec_time;
+            current_weight = (fGameTime - Current[0]->exec_time) / current_length;
+        }
+        clamp(current_weight, 0.f, 1.f);
+
+        std::sort(CurrentWeather->begin(), CurrentWeather->end(), sort_env_etl_pred);
+        CEnvDescriptor* C0 = CurrentWeather->at(0);
+        CEnvDescriptor* C1 = CurrentWeather->at(1);
+        CEnvDescriptor* CE = CurrentWeather->at(CurrentWeather->size() - 2);
+        CEnvDescriptor* CT = CurrentWeather->at(CurrentWeather->size() - 1);
+        C0->copy(*Current[0]);
+        C0->exec_time = NormalizeTime(fGameTime - ((rewind_tm / (Current[1]->exec_time - fGameTime))*current_length - rewind_tm));
+        C1->copy(*Current[1]);
+        C1->exec_time = NormalizeTime(start_tm);
+        for (EnvIt t_it = CurrentWeather->begin() + 2; t_it != CurrentWeather->end() - 1; t_it++)
+            (*t_it)->exec_time = NormalizeTime(start_tm + (*t_it)->exec_time_loaded);
+        SelectEnv(PrevWeather, WFX_end_desc[0], CE->exec_time);
+        SelectEnv(PrevWeather, WFX_end_desc[1], WFX_end_desc[0]->exec_time + 0.5f);
+        CT->copy(*WFX_end_desc[0]);
+        CT->exec_time = NormalizeTime(CE->exec_time + rewind_tm);
+        wfx_time = TimeDiff(fGameTime, CT->exec_time);
+        bWFX = true;
+
+        // sort wfx envs
+        std::sort(CurrentWeather->begin(), CurrentWeather->end(), sort_env_pred);
+
+        Current[0] = C0;
+        Current[1] = C1;
 #ifdef WEATHER_LOGGING
-		Msg					("Starting WFX: '%s' - %3.2f sec",*name,wfx_time);
-//		for (EnvIt l_it=CurrentWeather->begin(); l_it!=CurrentWeather->end(); l_it++)
-//			Msg				(". Env: '%s' Tm: %3.2f",*(*l_it)->m_identifier.c_str(),(*l_it)->exec_time);
+        Msg("Starting WFX: '%s' - %3.2f sec", *name, wfx_time);
+        // for (EnvIt l_it=CurrentWeather->begin(); l_it!=CurrentWeather->end(); l_it++)
+        // Msg (". Env: '%s' Tm: %3.2f",*(*l_it)->m_identifier.c_str(),(*l_it)->exec_time);
 #endif
-	}else{
+    }
+    else
+    {
 #ifndef _EDITOR
-		FATAL				("! Empty weather effect name");
+        FATAL("! Empty weather effect name");
 #endif
-	}
-	return true;
+    }
+    return true;
 }
 
 bool CEnvironment::StartWeatherFXFromTime(shared_str name, float time)
 {
-	if(!SetWeatherFX(name))				
-		return false;
+    if (!SetWeatherFX(name))
+        return false;
 
-	for (EnvIt it=CurrentWeather->begin(); it!=CurrentWeather->end(); it++)
-		(*it)->exec_time = NormalizeTime((*it)->exec_time - wfx_time + time);
+    for (EnvIt it = CurrentWeather->begin(); it != CurrentWeather->end(); it++)
+        (*it)->exec_time = NormalizeTime((*it)->exec_time - wfx_time + time);
 
-	wfx_time = time;
-	return true;
+    wfx_time = time;
+    return true;
 }
 
-void CEnvironment::StopWFX	()
+void CEnvironment::StopWFX()
 {
-	VERIFY					(CurrentCycleName.size());
-	bWFX					= false;
-	SetWeather				(CurrentCycleName,false);
-	Current[0]				= WFX_end_desc[0];
-	Current[1]				= WFX_end_desc[1];
+    VERIFY(CurrentCycleName.size());
+    bWFX = false;
+    SetWeather(CurrentCycleName, false);
+    Current[0] = WFX_end_desc[0];
+    Current[1] = WFX_end_desc[1];
 #ifdef WEATHER_LOGGING
-	Msg						("WFX - end. Weather: '%s' Desc: '%s'/'%s' GameTime: %3.2f",CurrentWeatherName.c_str(),Current[0]->m_identifier.c_str(),Current[1]->m_identifier.c_str(),fGameTime);
+    Msg("WFX - end. Weather: '%s' Desc: '%s'/'%s' GameTime: %3.2f", CurrentWeatherName.c_str(), Current[0]->m_identifier.c_str(), Current[1]->m_identifier.c_str(), fGameTime);
 #endif
 }
 
 IC bool lb_env_pred(const CEnvDescriptor* x, float val)
-{	return x->exec_time < val;	}
+{
+    return x->exec_time < val;
+}
 
 void CEnvironment::SelectEnv(EnvVec* envs, CEnvDescriptor*& e, float gt)
 {
-	EnvIt env		= std::lower_bound(envs->begin(),envs->end(),gt,lb_env_pred);
-	if (env==envs->end()){
-		e			= envs->front();
-	}else{
-		e			= *env;
-	}
+    EnvIt env = std::lower_bound(envs->begin(), envs->end(), gt, lb_env_pred);
+    if (env == envs->end())
+    {
+        e = envs->front();
+    }
+    else
+    {
+        e = *env;
+    }
 }
 
 void CEnvironment::SelectEnvs(EnvVec* envs, CEnvDescriptor*& e0, CEnvDescriptor*& e1, float gt)
 {
-	EnvIt env		= std::lower_bound(envs->begin(),envs->end(),gt,lb_env_pred);
-	if (env==envs->end()){
-		e0			= *(envs->end()-1);
-		e1			= envs->front();
-	}else{
-		e1			= *env;
-		if (env==envs->begin())	e0 = *(envs->end()-1);
-		else					e0 = *(env-1);
-	}
+    EnvIt env = std::lower_bound(envs->begin(), envs->end(), gt, lb_env_pred);
+    if (env == envs->end())
+    {
+        e0 = *(envs->end() - 1);
+        e1 = envs->front();
+    }
+    else
+    {
+        e1 = *env;
+        if (env == envs->begin()) e0 = *(envs->end() - 1);
+        else e0 = *(env - 1);
+    }
 }
 
 void CEnvironment::SelectEnvs(float gt)
 {
-	VERIFY				(CurrentWeather);
-    if ((Current[0]==Current[1])&&(Current[0]==0)){
-		VERIFY			(!bWFX);
-		// first or forced start
-		SelectEnvs		(CurrentWeather,Current[0],Current[1],gt);
-    }else{
-		bool bSelect	= false;
-		if (Current[0]->exec_time>Current[1]->exec_time){
-			// terminator
-			bSelect		= (gt>Current[1]->exec_time)&&(gt<Current[0]->exec_time);
-		}else{
-			bSelect		= (gt>Current[1]->exec_time);
-		}
-		if (bSelect){
-			Current[0]	= Current[1];
-			SelectEnv	(CurrentWeather,Current[1],gt);
+    VERIFY(CurrentWeather);
+    if ((Current[0] == Current[1]) && (Current[0] == 0))
+    {
+        VERIFY(!bWFX);
+        // first or forced start
+        SelectEnvs(CurrentWeather, Current[0], Current[1], gt);
+    }
+    else
+    {
+        bool bSelect = false;
+        if (Current[0]->exec_time > Current[1]->exec_time)
+        {
+            // terminator
+            bSelect = (gt > Current[1]->exec_time) && (gt < Current[0]->exec_time);
+        }
+        else
+        {
+            bSelect = (gt > Current[1]->exec_time);
+        }
+        if (bSelect)
+        {
+            Current[0] = Current[1];
+            SelectEnv(CurrentWeather, Current[1], gt);
 #ifdef WEATHER_LOGGING
-			Msg			("Weather: '%s' Desc: '%s' Time: %3.2f/%3.2f",CurrentWeatherName.c_str(),Current[1]->m_identifier.c_str(),Current[1]->exec_time,fGameTime);
+            Msg("Weather: '%s' Desc: '%s' Time: %3.2f/%3.2f", CurrentWeatherName.c_str(), Current[1]->m_identifier.c_str(), Current[1]->exec_time, fGameTime);
 #endif
-		}
+        }
     }
 }
 
 int get_ref_count(IUnknown* ii)
 {
-	if(ii){
-		ii->AddRef();
-		return ii->Release();
-	}else
-	return 0;
+    if (ii)
+    {
+        ii->AddRef();
+        return ii->Release();
+    }
+    else
+        return 0;
 }
 
-void CEnvironment::lerp		(float& current_weight)
+void CEnvironment::lerp(float& current_weight)
 {
-	if (bWFX&&(wfx_time<=0.f)) StopWFX();
-
-	SelectEnvs				(fGameTime);
-    VERIFY					(Current[0]&&Current[1]);
-
-	current_weight			= TimeWeight(fGameTime,Current[0]->exec_time,Current[1]->exec_time);
-	// modifiers
-	CEnvModifier			EM;
-	EM.far_plane			= 0;
-	EM.fog_color.set		( 0,0,0 );
-	EM.fog_density			= 0;
-	EM.ambient.set			( 0,0,0 );
-	EM.sky_color.set		( 0,0,0 );
-	EM.hemi_color.set		( 0,0,0 );
-	EM.use_flags.zero		();
-
-	Fvector	view			= Device.vCameraPosition;
-	float	mpower			= 0;
-	for (xr_vector<CEnvModifier>::iterator mit=Modifiers.begin(); mit!=Modifiers.end(); mit++)
-		mpower				+= EM.sum(*mit,view);
-
-	// final lerp
-	CurrentEnv->lerp		(this,*Current[0],*Current[1],current_weight,EM,mpower);
+    if (bWFX && (wfx_time <= 0.f)) StopWFX();
+
+    SelectEnvs(fGameTime);
+    VERIFY(Current[0] && Current[1]);
+
+    current_weight = TimeWeight(fGameTime, Current[0]->exec_time, Current[1]->exec_time);
+    // modifiers
+    CEnvModifier EM;
+    EM.far_plane = 0;
+    EM.fog_color.set(0, 0, 0);
+    EM.fog_density = 0;
+    EM.ambient.set(0, 0, 0);
+    EM.sky_color.set(0, 0, 0);
+    EM.hemi_color.set(0, 0, 0);
+    EM.use_flags.zero();
+
+    Fvector view = Device.vCameraPosition;
+    float mpower = 0;
+    for (xr_vector<CEnvModifier>::iterator mit = Modifiers.begin(); mit != Modifiers.end(); mit++)
+        mpower += EM.sum(*mit, view);
+
+    // final lerp
+    CurrentEnv->lerp(this, *Current[0], *Current[1], current_weight, EM, mpower);
 }
 
 void CEnvironment::OnFrame()
 {
 #ifdef _EDITOR
-	SetGameTime				(fGameTime+Device.fTimeDelta*fTimeFactor,fTimeFactor);
-    if (fsimilar(ed_to_time,DAY_LENGTH)&&fsimilar(ed_from_time,0.f)){
-	    if (fGameTime>DAY_LENGTH)	fGameTime-=DAY_LENGTH;
-    }else{
-	    if (fGameTime>ed_to_time){	
-        	fGameTime=fGameTime-ed_to_time+ed_from_time;
-            Current[0]=Current[1]=0;
+    SetGameTime(fGameTime + Device.fTimeDelta*fTimeFactor, fTimeFactor);
+    if (fsimilar(ed_to_time, DAY_LENGTH) && fsimilar(ed_from_time, 0.f))
+    {
+        if (fGameTime > DAY_LENGTH) fGameTime -= DAY_LENGTH;
+    }
+    else
+    {
+        if (fGameTime > ed_to_time)
+        {
+            fGameTime = fGameTime - ed_to_time + ed_from_time;
+            Current[0] = Current[1] = 0;
         }
-    	if (fGameTime<ed_from_time){	
-        	fGameTime=ed_from_time;
-            Current[0]=Current[1]=0;
+        if (fGameTime < ed_from_time)
+        {
+            fGameTime = ed_from_time;
+            Current[0] = Current[1] = 0;
         }
     }
-	if (!psDeviceFlags.is(rsEnvironment))		return;
+    if (!psDeviceFlags.is(rsEnvironment)) return;
 #else
-	if (!g_pGameLevel)		return;
+    if (!g_pGameLevel) return;
 #endif
 
-//	if (pInput->iGetAsyncKeyState(DIK_O))		SetWeatherFX("surge_day"); 
-	float					current_weight;
-	lerp					(current_weight);
+    // if (pInput->iGetAsyncKeyState(DIK_O)) SetWeatherFX("surge_day");
+    float current_weight;
+    lerp(current_weight);
 
-	//	Igor. Dynamic sun position. 
-	if ( !::Render->is_sun_static())
-		calculate_dynamic_sun_dir();
+    // Igor. Dynamic sun position.
+    if (!::Render->is_sun_static())
+        calculate_dynamic_sun_dir();
 
 #ifndef MASTER_GOLD
-	if(CurrentEnv->sun_dir.y>0)
-	{
-		Log("CurrentEnv->sun_dir", CurrentEnv->sun_dir);
-//		Log("current_weight", current_weight);
-//		Log("mpower", mpower);
+    if (CurrentEnv->sun_dir.y > 0)
+    {
+        Log("CurrentEnv->sun_dir", CurrentEnv->sun_dir);
+        // Log("current_weight", current_weight);
+        // Log("mpower", mpower);
 
-		Log("Current[0]->sun_dir", Current[0]->sun_dir);
-		Log("Current[1]->sun_dir", Current[1]->sun_dir);
+        Log("Current[0]->sun_dir", Current[0]->sun_dir);
+        Log("Current[1]->sun_dir", Current[1]->sun_dir);
 
-	}
-	VERIFY2						(CurrentEnv->sun_dir.y<0,"Invalid sun direction settings in lerp");
+    }
+    VERIFY2(CurrentEnv->sun_dir.y < 0, "Invalid sun direction settings in lerp");
 #endif // #ifndef MASTER_GOLD
 
-	PerlinNoise1D->SetFrequency		(wind_gust_factor*MAX_NOISE_FREQ);
-	wind_strength_factor			= clampr(PerlinNoise1D->GetContinious(Device.fTimeGlobal)+0.5f,0.f,1.f); 
+    PerlinNoise1D->SetFrequency(wind_gust_factor*MAX_NOISE_FREQ);
+    wind_strength_factor = clampr(PerlinNoise1D->GetContinious(Device.fTimeGlobal) + 0.5f, 0.f, 1.f);
 
-    shared_str l_id						=	(current_weight<0.5f)?Current[0]->lens_flare_id:Current[1]->lens_flare_id;
-	eff_LensFlare->OnFrame				(l_id);
-	shared_str t_id						=	(current_weight<0.5f)?Current[0]->tb_id:Current[1]->tb_id;
-    eff_Thunderbolt->OnFrame			(t_id,CurrentEnv->bolt_period,CurrentEnv->bolt_duration);
-	eff_Rain->OnFrame					();
+    shared_str l_id = (current_weight < 0.5f) ? Current[0]->lens_flare_id : Current[1]->lens_flare_id;
+    eff_LensFlare->OnFrame(l_id);
+    shared_str t_id = (current_weight < 0.5f) ? Current[0]->tb_id : Current[1]->tb_id;
+    eff_Thunderbolt->OnFrame(t_id, CurrentEnv->bolt_period, CurrentEnv->bolt_duration);
+    eff_Rain->OnFrame();
 
-	// ******************** Environment params (setting)
-	m_pRender->OnFrame(*this);
+    // ******************** Environment params (setting)
+    m_pRender->OnFrame(*this);
 }
 
 void CEnvironment::calculate_dynamic_sun_dir()
 {
-	float g = (360.0f/365.25f)*(180.0f + fGameTime/DAY_LENGTH);
+    float g = (360.0f / 365.25f)*(180.0f + fGameTime / DAY_LENGTH);
 
-	g = deg2rad(g);
+    g = deg2rad(g);
 
-	//	Declination
-	float D = 0.396372f-22.91327f*_cos(g)+4.02543f*_sin(g)-0.387205f*_cos(2*g)+
-		0.051967f*_sin(2*g)-0.154527f*_cos(3*g) + 0.084798f*_sin(3*g);
+    // Declination
+    float D = 0.396372f - 22.91327f*_cos(g) + 4.02543f*_sin(g) - 0.387205f*_cos(2 * g) +
+        0.051967f*_sin(2 * g) - 0.154527f*_cos(3 * g) + 0.084798f*_sin(3 * g);
 
-	//	Now calculate the time correction for solar angle:
-	float TC = 0.004297f+0.107029f*_cos(g)-1.837877f*_sin(g)-0.837378f*_cos(2*g)-
-		2.340475f*_sin(2*g);
+    // Now calculate the time correction for solar angle:
+    float TC = 0.004297f + 0.107029f*_cos(g) - 1.837877f*_sin(g) - 0.837378f*_cos(2 * g) -
+        2.340475f*_sin(2 * g);
 
-	//	IN degrees
-	float Longitude = -30.4f;
+    // IN degrees
+    float Longitude = -30.4f;
 
-	float SHA = (fGameTime/(DAY_LENGTH/24)-12)*15 + Longitude + TC;
+    float SHA = (fGameTime / (DAY_LENGTH / 24) - 12) * 15 + Longitude + TC;
 
-	//	Need this to correctly determine SHA sign
-	if (SHA>180) SHA -= 360;
-	if (SHA<-180) SHA += 360;
+    // Need this to correctly determine SHA sign
+    if (SHA > 180) SHA -= 360;
+    if (SHA < -180) SHA += 360;
 
-	//	IN degrees
-	float const Latitude = 50.27f;
-	float const LatitudeR = deg2rad(Latitude);
+    // IN degrees
+    float const Latitude = 50.27f;
+    float const LatitudeR = deg2rad(Latitude);
 
-	//	Now we can calculate the Sun Zenith Angle (SZA):
-	float cosSZA = _sin(LatitudeR)
-		* _sin(deg2rad(D)) + _cos(LatitudeR)*
-		_cos(deg2rad(D)) * _cos(deg2rad(SHA));
+    // Now we can calculate the Sun Zenith Angle (SZA):
+    float cosSZA = _sin(LatitudeR)
+        * _sin(deg2rad(D)) + _cos(LatitudeR)*
+        _cos(deg2rad(D)) * _cos(deg2rad(SHA));
 
-	clamp( cosSZA, -1.0f, 1.0f);
+    clamp(cosSZA, -1.0f, 1.0f);
 
-	float SZA = acosf(cosSZA);
-	float SEA = PI/2-SZA;
+    float SZA = acosf(cosSZA);
+    float SEA = PI / 2 - SZA;
 
-	//	To finish we will calculate the Azimuth Angle (AZ):
-	float cosAZ = 0.f;
-	float const sin_SZA = _sin(SZA);
-	float const cos_Latitude = _cos(LatitudeR);
-	float const sin_SZA_X_cos_Latitude = sin_SZA*cos_Latitude;
-	if (!fis_zero(sin_SZA_X_cos_Latitude))
-		cosAZ	= (_sin(deg2rad(D))-_sin(LatitudeR)*_cos(SZA))/sin_SZA_X_cos_Latitude;
+    // To finish we will calculate the Azimuth Angle (AZ):
+    float cosAZ = 0.f;
+    float const sin_SZA = _sin(SZA);
+    float const cos_Latitude = _cos(LatitudeR);
+    float const sin_SZA_X_cos_Latitude = sin_SZA*cos_Latitude;
+    if (!fis_zero(sin_SZA_X_cos_Latitude))
+        cosAZ = (_sin(deg2rad(D)) - _sin(LatitudeR)*_cos(SZA)) / sin_SZA_X_cos_Latitude;
 
-	clamp( cosAZ, -1.0f, 1.0f);
-	float AZ = acosf(cosAZ);
+    clamp(cosAZ, -1.0f, 1.0f);
+    float AZ = acosf(cosAZ);
 
-	const Fvector2 minAngle = Fvector2().set(deg2rad(1.0f), deg2rad(3.0f));
+    const Fvector2 minAngle = Fvector2().set(deg2rad(1.0f), deg2rad(3.0f));
 
-	if (SEA<minAngle.x) SEA = minAngle.x;
+    if (SEA < minAngle.x) SEA = minAngle.x;
 
-	float fSunBlend = (SEA-minAngle.x)/(minAngle.y-minAngle.x);
-	clamp (  fSunBlend, 0.0f, 1.0f);
+    float fSunBlend = (SEA - minAngle.x) / (minAngle.y - minAngle.x);
+    clamp(fSunBlend, 0.0f, 1.0f);
 
-	SEA = -SEA;
+    SEA = -SEA;
 
-	if (SHA<0)
-		AZ = 2*PI-AZ;
+    if (SHA < 0)
+        AZ = 2 * PI - AZ;
 
-	R_ASSERT					( _valid(AZ) );
-	R_ASSERT					( _valid(SEA) );
-	CurrentEnv->sun_dir.setHP	(AZ,SEA);
-	R_ASSERT					( _valid(CurrentEnv->sun_dir) );
+    R_ASSERT(_valid(AZ));
+    R_ASSERT(_valid(SEA));
+    CurrentEnv->sun_dir.setHP(AZ, SEA);
+    R_ASSERT(_valid(CurrentEnv->sun_dir));
 
-	CurrentEnv->sun_color.mul	(fSunBlend);
+    CurrentEnv->sun_color.mul(fSunBlend);
 }
 
-void CEnvironment::create_mixer ()
+void CEnvironment::create_mixer()
 {
-	VERIFY					(!CurrentEnv);
-	CurrentEnv				= xr_new<CEnvDescriptorMixer>("00:00:00");
+    VERIFY(!CurrentEnv);
+    CurrentEnv = xr_new<CEnvDescriptorMixer>("00:00:00");
 }
 
 void CEnvironment::destroy_mixer()
 {
-	xr_delete				(CurrentEnv);
+    xr_delete(CurrentEnv);
 }
 
-SThunderboltDesc* CEnvironment::thunderbolt_description			(CInifile& config, shared_str const& section)
+SThunderboltDesc* CEnvironment::thunderbolt_description(CInifile& config, shared_str const& section)
 {
-	SThunderboltDesc*		result = xr_new<SThunderboltDesc>();
-	result->load			(config, section);
-	return					(result);
+    SThunderboltDesc* result = xr_new<SThunderboltDesc>();
+    result->load(config, section);
+    return (result);
 }
 
-SThunderboltCollection* CEnvironment::thunderbolt_collection	(CInifile* pIni, CInifile* thunderbolts, LPCSTR section)
+SThunderboltCollection* CEnvironment::thunderbolt_collection(CInifile* pIni, CInifile* thunderbolts, LPCSTR section)
 {
-	SThunderboltCollection*	result = xr_new<SThunderboltCollection>();
-	result->load			(pIni, thunderbolts, section);
-	return					(result);
+    SThunderboltCollection* result = xr_new<SThunderboltCollection>();
+    result->load(pIni, thunderbolts, section);
+    return (result);
 }
 
-SThunderboltCollection* CEnvironment::thunderbolt_collection	(xr_vector<SThunderboltCollection*>& collection,  shared_str const& id)
+SThunderboltCollection* CEnvironment::thunderbolt_collection(xr_vector<SThunderboltCollection*>& collection, shared_str const& id)
 {
-	typedef xr_vector<SThunderboltCollection*>	Container;
-	Container::iterator		i = collection.begin();
-	Container::iterator		e = collection.end();
-	for ( ; i != e; ++i)
-		if ((*i)->section == id)
-			return			(*i);
-
-	NODEFAULT;
+    typedef xr_vector<SThunderboltCollection*> Container;
+    Container::iterator i = collection.begin();
+    Container::iterator e = collection.end();
+    for (; i != e; ++i)
+        if ((*i)->section == id)
+            return (*i);
+
+    NODEFAULT;
 #ifdef DEBUG
-	return					(0);
+    return (0);
 #endif // #ifdef DEBUG
 }
 
-CLensFlareDescriptor* CEnvironment::add_flare					(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id)
+CLensFlareDescriptor* CEnvironment::add_flare(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id)
 {
-	typedef xr_vector<CLensFlareDescriptor*>	Flares;
-
-	Flares::const_iterator	i = collection.begin();
-	Flares::const_iterator	e = collection.end();
-	for ( ; i != e; ++i) {
-		if ((*i)->section == id)
-			return			(*i);
-	}
-
-	CLensFlareDescriptor*	result = xr_new<CLensFlareDescriptor>();
-	result->load			(m_suns_config, id.c_str());
-	collection.push_back	(result);	
-	return					(result);
+    typedef xr_vector<CLensFlareDescriptor*> Flares;
+
+    Flares::const_iterator i = collection.begin();
+    Flares::const_iterator e = collection.end();
+    for (; i != e; ++i)
+    {
+        if ((*i)->section == id)
+            return (*i);
+    }
+
+    CLensFlareDescriptor* result = xr_new<CLensFlareDescriptor>();
+    result->load(m_suns_config, id.c_str());
+    collection.push_back(result);
+    return (result);
 }
\ No newline at end of file
diff --git a/src/xrEngine/Environment.h b/src/xrEngine/Environment.h
index 23918b6add5..015eb9a1462 100644
--- a/src/xrEngine/Environment.h
+++ b/src/xrEngine/Environment.h
@@ -2,372 +2,381 @@
 #define EnvironmentH
 
 // refs
-class ENGINE_API	IRender_Visual;
-class ENGINE_API	CInifile;
-class ENGINE_API 	CEnvironment;
+class ENGINE_API IRender_Visual;
+class ENGINE_API CInifile;
+class ENGINE_API CEnvironment;
 
 // refs - effects
-class ENGINE_API	CEnvironment;
-class ENGINE_API	CLensFlare;
-class ENGINE_API	CEffect_Rain;
-class ENGINE_API	CEffect_Thunderbolt;
+class ENGINE_API CEnvironment;
+class ENGINE_API CLensFlare;
+class ENGINE_API CEffect_Rain;
+class ENGINE_API CEffect_Thunderbolt;
 
-class ENGINE_API	CPerlinNoise1D;
+class ENGINE_API CPerlinNoise1D;
 
 struct SThunderboltDesc;
 struct SThunderboltCollection;
 class CLensFlareDescriptor;
 
-#define DAY_LENGTH		86400.f
+#define DAY_LENGTH 86400.f
 
 #include "../Include/xrRender/FactoryPtr.h"
 #include "../Include/xrRender/EnvironmentRender.h"
 
 #ifdef INGAME_EDITOR
-#	define	INGAME_EDITOR_VIRTUAL	virtual
+# define INGAME_EDITOR_VIRTUAL virtual
 #else // #ifdef INGAME_EDITOR
-#	define	INGAME_EDITOR_VIRTUAL
+# define INGAME_EDITOR_VIRTUAL
 #endif // #ifdef INGAME_EDITOR
 
 // t-defs
-class ENGINE_API	CEnvModifier
+class ENGINE_API CEnvModifier
 {
 public:
-	Fvector3			position;
-	float				radius;
-	float				power;
-
-	float				far_plane;
-	Fvector3			fog_color;
-	float				fog_density;
-	Fvector3			ambient;
-	Fvector3			sky_color;		
-	Fvector3			hemi_color;
-	Flags16				use_flags;
-
-	void				load		(IReader* fs, u32 version);
-	float				sum			(CEnvModifier&	_another, Fvector3& view);
+    Fvector3 position;
+    float radius;
+    float power;
+
+    float far_plane;
+    Fvector3 fog_color;
+    float fog_density;
+    Fvector3 ambient;
+    Fvector3 sky_color;
+    Fvector3 hemi_color;
+    Flags16 use_flags;
+
+    void load(IReader* fs, u32 version);
+    float sum(CEnvModifier& _another, Fvector3& view);
 };
 
-class ENGINE_API	CEnvAmbient
+class ENGINE_API CEnvAmbient
 {
 public:
-	struct SEffect{
-		u32 			life_time;
-		ref_sound		sound;		
-		shared_str		particles;
-		Fvector			offset;
-		float			wind_gust_factor;
-		float			wind_blast_in_time;
-		float			wind_blast_out_time;
-		float			wind_blast_strength;
-		Fvector			wind_blast_direction;
-
-		INGAME_EDITOR_VIRTUAL	~SEffect				()	{}
-	};
-	DEFINE_VECTOR(SEffect*,EffectVec,EffectVecIt);
-	struct SSndChannel
-	{
-		shared_str				m_load_section;
-		Fvector2				m_sound_dist;
-		Ivector4				m_sound_period;
-
-		typedef xr_vector<ref_sound>	sounds_type;
-
-		void					load					(CInifile& config, LPCSTR sect);
-		ref_sound&				get_rnd_sound			()	{return sounds()[Random.randI(sounds().size())];}
-		u32						get_rnd_sound_time		()	{return (m_sound_period.z < m_sound_period.w) ? Random.randI(m_sound_period.z,m_sound_period.w) : 0;}
-		u32						get_rnd_sound_first_time()	{return (m_sound_period.x < m_sound_period.y) ? Random.randI(m_sound_period.x,m_sound_period.y) : 0;}
-		float					get_rnd_sound_dist		()	{return (m_sound_dist.x < m_sound_dist.y) ? Random.randF(m_sound_dist.x, m_sound_dist.y) : 0;}
-		INGAME_EDITOR_VIRTUAL	~SSndChannel			()	{}
-		inline INGAME_EDITOR_VIRTUAL sounds_type& sounds()  {return m_sounds;}
-
-	protected:
-		xr_vector<ref_sound>	m_sounds;
-	};
-	DEFINE_VECTOR(SSndChannel*,SSndChannelVec,SSndChannelVecIt);
+    struct SEffect
+    {
+        u32 life_time;
+        ref_sound sound;
+        shared_str particles;
+        Fvector offset;
+        float wind_gust_factor;
+        float wind_blast_in_time;
+        float wind_blast_out_time;
+        float wind_blast_strength;
+        Fvector wind_blast_direction;
+
+        INGAME_EDITOR_VIRTUAL ~SEffect() {}
+    };
+    DEFINE_VECTOR(SEffect*, EffectVec, EffectVecIt);
+    struct SSndChannel
+    {
+        shared_str m_load_section;
+        Fvector2 m_sound_dist;
+        Ivector4 m_sound_period;
+
+        typedef xr_vector<ref_sound> sounds_type;
+
+        void load(CInifile& config, LPCSTR sect);
+        ref_sound& get_rnd_sound() { return sounds()[Random.randI(sounds().size())]; }
+        u32 get_rnd_sound_time() { return (m_sound_period.z < m_sound_period.w) ? Random.randI(m_sound_period.z, m_sound_period.w) : 0; }
+        u32 get_rnd_sound_first_time() { return (m_sound_period.x < m_sound_period.y) ? Random.randI(m_sound_period.x, m_sound_period.y) : 0; }
+        float get_rnd_sound_dist() { return (m_sound_dist.x < m_sound_dist.y) ? Random.randF(m_sound_dist.x, m_sound_dist.y) : 0; }
+        INGAME_EDITOR_VIRTUAL ~SSndChannel() {}
+        inline INGAME_EDITOR_VIRTUAL sounds_type& sounds() { return m_sounds; }
+
+    protected:
+        xr_vector<ref_sound> m_sounds;
+    };
+    DEFINE_VECTOR(SSndChannel*, SSndChannelVec, SSndChannelVecIt);
 protected:
-	shared_str				m_load_section;
+    shared_str m_load_section;
 
-	EffectVec				m_effects;
-	Ivector2				m_effect_period;
+    EffectVec m_effects;
+    Ivector2 m_effect_period;
 
-	SSndChannelVec			m_sound_channels;
-	shared_str              m_ambients_config_filename;
+    SSndChannelVec m_sound_channels;
+    shared_str m_ambients_config_filename;
 
 public:
-	IC const shared_str&	name				()	{return m_load_section;}
-	IC const shared_str&	get_ambients_config_filename ()	{return m_ambients_config_filename;}
-
-	INGAME_EDITOR_VIRTUAL	void	load		(
-								CInifile& ambients_config,
-								CInifile& sound_channels_config,
-								CInifile& effects_config,
-								const shared_str& section
-							);
-	IC SEffect*				get_rnd_effect		()	{return effects().empty()?0:effects()[Random.randI(effects().size())];}
-	IC u32					get_rnd_effect_time ()	{return Random.randI(m_effect_period.x, m_effect_period.y);}
-
-	INGAME_EDITOR_VIRTUAL	SEffect*		create_effect			(CInifile& config, LPCSTR id);
-	INGAME_EDITOR_VIRTUAL	SSndChannel*	create_sound_channel	(CInifile& config, LPCSTR id);
-	INGAME_EDITOR_VIRTUAL					~CEnvAmbient			();
-							void			destroy					();
-	inline INGAME_EDITOR_VIRTUAL EffectVec&			effects			() { return m_effects; }
-	inline INGAME_EDITOR_VIRTUAL SSndChannelVec&	get_snd_channels() { return m_sound_channels; }
+    IC const shared_str& name() { return m_load_section; }
+    IC const shared_str& get_ambients_config_filename() { return m_ambients_config_filename; }
+
+    INGAME_EDITOR_VIRTUAL void load(
+        CInifile& ambients_config,
+        CInifile& sound_channels_config,
+        CInifile& effects_config,
+        const shared_str& section
+        );
+    IC SEffect* get_rnd_effect() { return effects().empty() ? 0 : effects()[Random.randI(effects().size())]; }
+    IC u32 get_rnd_effect_time() { return Random.randI(m_effect_period.x, m_effect_period.y); }
+
+    INGAME_EDITOR_VIRTUAL SEffect* create_effect(CInifile& config, LPCSTR id);
+    INGAME_EDITOR_VIRTUAL SSndChannel* create_sound_channel(CInifile& config, LPCSTR id);
+    INGAME_EDITOR_VIRTUAL ~CEnvAmbient();
+    void destroy();
+    inline INGAME_EDITOR_VIRTUAL EffectVec& effects() { return m_effects; }
+    inline INGAME_EDITOR_VIRTUAL SSndChannelVec& get_snd_channels() { return m_sound_channels; }
 };
 
-class ENGINE_API	CEnvDescriptor
+class ENGINE_API CEnvDescriptor
 {
 public:
-	float				exec_time;
-	float				exec_time_loaded;
+    float exec_time;
+    float exec_time_loaded;
 
-	shared_str			sky_texture_name	;
-	shared_str			sky_texture_env_name;
-	shared_str			clouds_texture_name	;
+    shared_str sky_texture_name;
+    shared_str sky_texture_env_name;
+    shared_str clouds_texture_name;
 
-	BENCH_SEC_SCRAMBLEMEMBER1
+    BENCH_SEC_SCRAMBLEMEMBER1
 
-	/*
-	ref_texture			sky_texture		;
-	ref_texture			sky_texture_env	;
-	ref_texture			clouds_texture	;
-	*/
-	FactoryPtr<IEnvDescriptorRender>	m_pDescriptor;
+        /*
+        ref_texture sky_texture ;
+        ref_texture sky_texture_env ;
+        ref_texture clouds_texture ;
+        */
+        FactoryPtr<IEnvDescriptorRender> m_pDescriptor;
 
-	Fvector4			clouds_color	;
-	Fvector3			sky_color		;
-	float				sky_rotation	;
+    Fvector4 clouds_color;
+    Fvector3 sky_color;
+    float sky_rotation;
 
-	float				far_plane;
+    float far_plane;
 
-	Fvector3			fog_color;
-	float				fog_density;
-	float				fog_distance;
+    Fvector3 fog_color;
+    float fog_density;
+    float fog_distance;
 
-	float				rain_density;
-	Fvector3			rain_color;
+    float rain_density;
+    Fvector3 rain_color;
 
-	float				bolt_period;
-	float				bolt_duration;
+    float bolt_period;
+    float bolt_duration;
 
-    float				wind_velocity;
-    float				wind_direction;  
-    
-	Fvector3			ambient		;
-	Fvector4			hemi_color	;	// w = R2 correction
-	Fvector3			sun_color	;
-	Fvector3			sun_dir		;
-	float				m_fSunShaftsIntensity;
-	float				m_fWaterIntensity;
+    float wind_velocity;
+    float wind_direction;
 
+    Fvector3 ambient;
+    Fvector4 hemi_color; // w = R2 correction
+    Fvector3 sun_color;
+    Fvector3 sun_dir;
+    float m_fSunShaftsIntensity;
+    float m_fWaterIntensity;
 
-//	int					lens_flare_id;
-//	int					tb_id;
-	shared_str			lens_flare_id;
-	shared_str			tb_id;
-    
-	CEnvAmbient*		env_ambient;
 
+    // int lens_flare_id;
+    // int tb_id;
+    shared_str lens_flare_id;
+    shared_str tb_id;
 
-						CEnvDescriptor	(shared_str const& identifier);
+    CEnvAmbient* env_ambient;
 
-	void				load			(CEnvironment& environment, CInifile& config);
-	void				copy			(const CEnvDescriptor& src)
-	{
-		float tm0		= exec_time;
-		float tm1		= exec_time_loaded; 
-		*this			= src;
-		exec_time		= tm0;
-		exec_time_loaded= tm1;
-	}
 
-	void				on_device_create	();
-	void				on_device_destroy	();
+    CEnvDescriptor(shared_str const& identifier);
 
-	shared_str			m_identifier;
+    void load(CEnvironment& environment, CInifile& config);
+    void copy(const CEnvDescriptor& src)
+    {
+        float tm0 = exec_time;
+        float tm1 = exec_time_loaded;
+        *this = src;
+        exec_time = tm0;
+        exec_time_loaded = tm1;
+    }
+
+    void on_device_create();
+    void on_device_destroy();
+
+    shared_str m_identifier;
 };
 
-class ENGINE_API		CEnvDescriptorMixer: public CEnvDescriptor{
+class ENGINE_API CEnvDescriptorMixer : public CEnvDescriptor
+{
 public:
-	/*
-	STextureList		sky_r_textures;		
-	STextureList		sky_r_textures_env;	
-	STextureList		clouds_r_textures;	
-	*/
-	FactoryPtr<IEnvDescriptorMixerRender>	m_pDescriptorMixer;
-	float				weight;				
-
-	float				fog_near;		
-	float				fog_far;		
+    /*
+    STextureList sky_r_textures;
+    STextureList sky_r_textures_env;
+    STextureList clouds_r_textures;
+    */
+    FactoryPtr<IEnvDescriptorMixerRender> m_pDescriptorMixer;
+    float weight;
+
+    float fog_near;
+    float fog_far;
 public:
-						CEnvDescriptorMixer	(shared_str const& identifier);
-	INGAME_EDITOR_VIRTUAL void lerp			(CEnvironment* parent, CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& M, float m_power);
-	void				clear				();
-	void				destroy				();
+    CEnvDescriptorMixer(shared_str const& identifier);
+    INGAME_EDITOR_VIRTUAL void lerp(CEnvironment* parent, CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& M, float m_power);
+    void clear();
+    void destroy();
 };
 
-class ENGINE_API	CEnvironment
+class ENGINE_API CEnvironment
 {
-	friend class dxEnvironmentRender;
-	struct str_pred : public std::binary_function<shared_str, shared_str, bool>	{	
-		IC bool operator()(const shared_str& x, const shared_str& y) const
-		{	return xr_strcmp(x,y)<0;	}
-	};
+    friend class dxEnvironmentRender;
+    struct str_pred : public std::binary_function < shared_str, shared_str, bool >
+    {
+        IC bool operator()(const shared_str& x, const shared_str& y) const
+        {
+            return xr_strcmp(x, y) < 0;
+        }
+    };
 public:
-	DEFINE_VECTOR			(CEnvAmbient*,EnvAmbVec,EnvAmbVecIt);
-	DEFINE_VECTOR			(CEnvDescriptor*,EnvVec,EnvIt);
-	DEFINE_MAP_PRED			(shared_str,EnvVec,EnvsMap,EnvsMapIt,str_pred);
+    DEFINE_VECTOR(CEnvAmbient*, EnvAmbVec, EnvAmbVecIt);
+    DEFINE_VECTOR(CEnvDescriptor*, EnvVec, EnvIt);
+    DEFINE_MAP_PRED(shared_str, EnvVec, EnvsMap, EnvsMapIt, str_pred);
 private:
-	// clouds
-	FvectorVec				CloudsVerts;
-	U16Vec					CloudsIndices;
+    // clouds
+    FvectorVec CloudsVerts;
+    U16Vec CloudsIndices;
 private:
-	float					NormalizeTime	(float tm);
-	float					TimeDiff		(float prev, float cur);
-	float					TimeWeight		(float val, float min_t, float max_t);
-	void					SelectEnvs		(EnvVec* envs, CEnvDescriptor*& e0, CEnvDescriptor*& e1, float tm);
-	void					SelectEnv		(EnvVec* envs, CEnvDescriptor*& e, float tm);
+    float NormalizeTime(float tm);
+    float TimeDiff(float prev, float cur);
+    float TimeWeight(float val, float min_t, float max_t);
+    void SelectEnvs(EnvVec* envs, CEnvDescriptor*& e0, CEnvDescriptor*& e1, float tm);
+    void SelectEnv(EnvVec* envs, CEnvDescriptor*& e, float tm);
 
-	void					calculate_dynamic_sun_dir();
+    void calculate_dynamic_sun_dir();
 public:
-	static bool sort_env_pred	(const CEnvDescriptor* x, const CEnvDescriptor* y)
-	{	return x->exec_time < y->exec_time;	}
-	static bool sort_env_etl_pred	(const CEnvDescriptor* x, const CEnvDescriptor* y)
-	{	return x->exec_time_loaded < y->exec_time_loaded;	}
+    static bool sort_env_pred(const CEnvDescriptor* x, const CEnvDescriptor* y)
+    {
+        return x->exec_time < y->exec_time;
+    }
+    static bool sort_env_etl_pred(const CEnvDescriptor* x, const CEnvDescriptor* y)
+    {
+        return x->exec_time_loaded < y->exec_time_loaded;
+    }
 protected:
-	CPerlinNoise1D*			PerlinNoise1D;
+    CPerlinNoise1D* PerlinNoise1D;
 
-	float					fGameTime;
+    float fGameTime;
 public:
-	FactoryPtr<IEnvironmentRender>	m_pRender;
-	BOOL					bNeed_re_create_env;
-
-	float					wind_strength_factor;	
-	float					wind_gust_factor;
-
-	// wind blast params
-	float					wind_blast_strength;
-	Fvector					wind_blast_direction;
-	Fquaternion				wind_blast_start_time;
-	Fquaternion				wind_blast_stop_time;
-	float					wind_blast_strength_start_value;
-	float					wind_blast_strength_stop_value;
-	Fquaternion				wind_blast_current;
-	// Environments
-	BENCH_SEC_SCRAMBLEMEMBER2
-	CEnvDescriptorMixer*	CurrentEnv;
-	CEnvDescriptor*			Current[2];
-
-	bool					bWFX;
-	float					wfx_time;
-	CEnvDescriptor*			WFX_end_desc[2];
-    
-    EnvVec*					CurrentWeather;
-    shared_str				CurrentWeatherName;
-	shared_str				CurrentCycleName;
-
-	EnvsMap					WeatherCycles;
-	EnvsMap					WeatherFXs;
-	xr_vector<CEnvModifier>	Modifiers;
-	EnvAmbVec				Ambients;
-
-	CEffect_Rain*			eff_Rain;
-	CLensFlare*				eff_LensFlare;
-	CEffect_Thunderbolt*	eff_Thunderbolt;
-
-	float					fTimeFactor;
-
-    void					SelectEnvs			(float gt);
-
-	void					UpdateAmbient		();
-	INGAME_EDITOR_VIRTUAL CEnvAmbient* AppendEnvAmb	(const shared_str& sect);
-
-	void					Invalidate			();
+    FactoryPtr<IEnvironmentRender> m_pRender;
+    BOOL bNeed_re_create_env;
+
+    float wind_strength_factor;
+    float wind_gust_factor;
+
+    // wind blast params
+    float wind_blast_strength;
+    Fvector wind_blast_direction;
+    Fquaternion wind_blast_start_time;
+    Fquaternion wind_blast_stop_time;
+    float wind_blast_strength_start_value;
+    float wind_blast_strength_stop_value;
+    Fquaternion wind_blast_current;
+    // Environments
+    BENCH_SEC_SCRAMBLEMEMBER2
+        CEnvDescriptorMixer* CurrentEnv;
+    CEnvDescriptor* Current[2];
+
+    bool bWFX;
+    float wfx_time;
+    CEnvDescriptor* WFX_end_desc[2];
+
+    EnvVec* CurrentWeather;
+    shared_str CurrentWeatherName;
+    shared_str CurrentCycleName;
+
+    EnvsMap WeatherCycles;
+    EnvsMap WeatherFXs;
+    xr_vector<CEnvModifier> Modifiers;
+    EnvAmbVec Ambients;
+
+    CEffect_Rain* eff_Rain;
+    CLensFlare* eff_LensFlare;
+    CEffect_Thunderbolt* eff_Thunderbolt;
+
+    float fTimeFactor;
+
+    void SelectEnvs(float gt);
+
+    void UpdateAmbient();
+    INGAME_EDITOR_VIRTUAL CEnvAmbient* AppendEnvAmb(const shared_str& sect);
+
+    void Invalidate();
 public:
-							CEnvironment		();
+    CEnvironment();
 
-	INGAME_EDITOR_VIRTUAL	~CEnvironment		();
+    INGAME_EDITOR_VIRTUAL ~CEnvironment();
 
-	INGAME_EDITOR_VIRTUAL void	load			();
-    INGAME_EDITOR_VIRTUAL void	unload			();
+    INGAME_EDITOR_VIRTUAL void load();
+    INGAME_EDITOR_VIRTUAL void unload();
 
-	void					mods_load			();
-	void					mods_unload			();
+    void mods_load();
+    void mods_unload();
 
-	void					OnFrame				();
-	void					lerp				(float& current_weight);
+    void OnFrame();
+    void lerp(float& current_weight);
 
-	void					RenderSky			();
-	void					RenderClouds		();
-	void					RenderFlares		();
-	void					RenderLast			();
+    void RenderSky();
+    void RenderClouds();
+    void RenderFlares();
+    void RenderLast();
 
-	bool					SetWeatherFX		(shared_str name);
-	bool					StartWeatherFXFromTime	(shared_str name, float time);
-	bool					IsWFXPlaying		(){return bWFX;}
-	void					StopWFX				();
+    bool SetWeatherFX(shared_str name);
+    bool StartWeatherFXFromTime(shared_str name, float time);
+    bool IsWFXPlaying() { return bWFX; }
+    void StopWFX();
 
-	void					SetWeather			(shared_str name, bool forced=false);
-    shared_str				GetWeather			()					{ return CurrentWeatherName;}
-	void					ChangeGameTime		(float game_time);
-	void					SetGameTime			(float game_time, float time_factor);
+    void SetWeather(shared_str name, bool forced = false);
+    shared_str GetWeather() { return CurrentWeatherName; }
+    void ChangeGameTime(float game_time);
+    void SetGameTime(float game_time, float time_factor);
 
-	void					OnDeviceCreate		();
-	void					OnDeviceDestroy		();
+    void OnDeviceCreate();
+    void OnDeviceDestroy();
 
-	// editor-related
+    // editor-related
 #ifdef _EDITOR
 public:
-	float					ed_from_time		;
-	float					ed_to_time			;
+    float ed_from_time;
+    float ed_to_time;
 public:
-    void					ED_Reload			();
-    float					GetGameTime			(){return fGameTime;}
+    void ED_Reload();
+    float GetGameTime() { return fGameTime; }
 #else // #ifdef _EDITOR
-#	ifdef INGAME_EDITOR
-		float				GetGameTime			(){return fGameTime;}
-#	endif // #ifdef INGAME_EDITOR
+# ifdef INGAME_EDITOR
+    float GetGameTime() { return fGameTime; }
+# endif // #ifdef INGAME_EDITOR
 
-	bool					m_paused;
+    bool m_paused;
 #endif // #ifdef _EDITOR
 
-	CInifile*				m_ambients_config;
-	CInifile*				m_sound_channels_config;
-	CInifile*				m_effects_config;
-	CInifile*				m_suns_config;
-	CInifile*				m_thunderbolt_collections_config;
-	CInifile*				m_thunderbolts_config;
+    CInifile* m_ambients_config;
+    CInifile* m_sound_channels_config;
+    CInifile* m_effects_config;
+    CInifile* m_suns_config;
+    CInifile* m_thunderbolt_collections_config;
+    CInifile* m_thunderbolts_config;
 
 protected:
-	INGAME_EDITOR_VIRTUAL	CEnvDescriptor* create_descriptor	(shared_str const& identifier, CInifile* config);
-	INGAME_EDITOR_VIRTUAL	void load_weathers					();
-	INGAME_EDITOR_VIRTUAL	void load_weather_effects			();
-	INGAME_EDITOR_VIRTUAL	void create_mixer					();
-							void destroy_mixer					();
+    INGAME_EDITOR_VIRTUAL CEnvDescriptor* create_descriptor(shared_str const& identifier, CInifile* config);
+    INGAME_EDITOR_VIRTUAL void load_weathers();
+    INGAME_EDITOR_VIRTUAL void load_weather_effects();
+    INGAME_EDITOR_VIRTUAL void create_mixer();
+    void destroy_mixer();
 
-							void load_level_specific_ambients   ();
+    void load_level_specific_ambients();
 
 public:
-	INGAME_EDITOR_VIRTUAL	SThunderboltDesc* thunderbolt_description		(CInifile& config, shared_str const& section);
-	INGAME_EDITOR_VIRTUAL	SThunderboltCollection* thunderbolt_collection	(CInifile* pIni, CInifile* thunderbolts, LPCSTR section);
-	INGAME_EDITOR_VIRTUAL	SThunderboltCollection* thunderbolt_collection	(xr_vector<SThunderboltCollection*>& collection,  shared_str const& id);
-	INGAME_EDITOR_VIRTUAL	CLensFlareDescriptor*	add_flare				(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id);
+    INGAME_EDITOR_VIRTUAL SThunderboltDesc* thunderbolt_description(CInifile& config, shared_str const& section);
+    INGAME_EDITOR_VIRTUAL SThunderboltCollection* thunderbolt_collection(CInifile* pIni, CInifile* thunderbolts, LPCSTR section);
+    INGAME_EDITOR_VIRTUAL SThunderboltCollection* thunderbolt_collection(xr_vector<SThunderboltCollection*>& collection, shared_str const& id);
+    INGAME_EDITOR_VIRTUAL CLensFlareDescriptor* add_flare(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id);
 
 public:
-	float						p_var_alt;
-	float						p_var_long;
-	float						p_min_dist;
-	float						p_tilt;
-	float						p_second_prop;
-	float						p_sky_color;
-	float						p_sun_color;
-	float						p_fog_color;
+    float p_var_alt;
+    float p_var_long;
+    float p_min_dist;
+    float p_tilt;
+    float p_second_prop;
+    float p_sky_color;
+    float p_sun_color;
+    float p_fog_color;
 };
 
 #undef INGAME_EDITOR_VIRTUAL
 
-ENGINE_API extern Flags32	psEnvFlags;
-ENGINE_API extern float		psVisDistance;
+ENGINE_API extern Flags32 psEnvFlags;
+ENGINE_API extern float psVisDistance;
 
 #endif //EnvironmentH
\ No newline at end of file
diff --git a/src/xrEngine/Environment_misc.cpp b/src/xrEngine/Environment_misc.cpp
index 91ed675b340..32351540750 100644
--- a/src/xrEngine/Environment_misc.cpp
+++ b/src/xrEngine/Environment_misc.cpp
@@ -12,70 +12,70 @@
 
 #include "securom_api.h"
 
-void CEnvModifier::load	(IReader* fs, u32 version)
+void CEnvModifier::load(IReader* fs, u32 version)
 {
-	use_flags.one					();
-	fs->r_fvector3	(position);
-	radius			= fs->r_float	();
-	power			= fs->r_float	();
-	far_plane		= fs->r_float	();
-	fs->r_fvector3	(fog_color);
-	fog_density		= fs->r_float	();
-	fs->r_fvector3	(ambient);
-	fs->r_fvector3	(sky_color);
-	fs->r_fvector3	(hemi_color);
-
-	if(version>=0x0016)
-	{
-		use_flags.assign(fs->r_u16());
-	}
+    use_flags.one();
+    fs->r_fvector3(position);
+    radius = fs->r_float();
+    power = fs->r_float();
+    far_plane = fs->r_float();
+    fs->r_fvector3(fog_color);
+    fog_density = fs->r_float();
+    fs->r_fvector3(ambient);
+    fs->r_fvector3(sky_color);
+    fs->r_fvector3(hemi_color);
+
+    if (version >= 0x0016)
+    {
+        use_flags.assign(fs->r_u16());
+    }
 }
 
-float	CEnvModifier::sum	(CEnvModifier& M, Fvector3& view)
+float CEnvModifier::sum(CEnvModifier& M, Fvector3& view)
 {
-	float	_dist_sq	=	view.distance_to_sqr(M.position);
-	if (_dist_sq>=(M.radius*M.radius))	
-		return			0;
-
-	float	_att		=	1-_sqrt(_dist_sq)/M.radius;	//[0..1];
-	float	_power		=	M.power*_att;
-	
-
-	if(M.use_flags.test(eViewDist))
-	{
-		far_plane			+=	M.far_plane*_power;
-		use_flags.set		(eViewDist, TRUE);
-	}
-	if(M.use_flags.test(eFogColor))
-	{
-		fog_color.mad		(M.fog_color,_power);
-		use_flags.set		(eFogColor, TRUE);
-	}
-	if(M.use_flags.test(eFogDensity))
-	{
-		fog_density			+=	M.fog_density*_power;
-		use_flags.set		(eFogDensity, TRUE);
-	}
-
-	if(M.use_flags.test(eAmbientColor))
-	{
-		ambient.mad			(M.ambient,_power);
-		use_flags.set		(eAmbientColor, TRUE);
-	}
-
-	if(M.use_flags.test(eSkyColor))
-	{
-		sky_color.mad		(M.sky_color,_power);
-		use_flags.set		(eSkyColor, TRUE);
-	}
-
-	if(M.use_flags.test(eHemiColor))
-	{
-		hemi_color.mad		(M.hemi_color,_power);
-		use_flags.set		(eHemiColor, TRUE);
-	}
-	
-	return				_power;
+    float _dist_sq = view.distance_to_sqr(M.position);
+    if (_dist_sq >= (M.radius*M.radius))
+        return 0;
+
+    float _att = 1 - _sqrt(_dist_sq) / M.radius; //[0..1];
+    float _power = M.power*_att;
+
+
+    if (M.use_flags.test(eViewDist))
+    {
+        far_plane += M.far_plane*_power;
+        use_flags.set(eViewDist, TRUE);
+    }
+    if (M.use_flags.test(eFogColor))
+    {
+        fog_color.mad(M.fog_color, _power);
+        use_flags.set(eFogColor, TRUE);
+    }
+    if (M.use_flags.test(eFogDensity))
+    {
+        fog_density += M.fog_density*_power;
+        use_flags.set(eFogDensity, TRUE);
+    }
+
+    if (M.use_flags.test(eAmbientColor))
+    {
+        ambient.mad(M.ambient, _power);
+        use_flags.set(eAmbientColor, TRUE);
+    }
+
+    if (M.use_flags.test(eSkyColor))
+    {
+        sky_color.mad(M.sky_color, _power);
+        use_flags.set(eSkyColor, TRUE);
+    }
+
+    if (M.use_flags.test(eHemiColor))
+    {
+        hemi_color.mad(M.hemi_color, _power);
+        use_flags.set(eHemiColor, TRUE);
+    }
+
+    return _power;
 }
 
 //-----------------------------------------------------------------------------
@@ -83,682 +83,699 @@ float	CEnvModifier::sum	(CEnvModifier& M, Fvector3& view)
 //-----------------------------------------------------------------------------
 void CEnvAmbient::SSndChannel::load(CInifile& config, LPCSTR sect)
 {
-	m_load_section			= sect;
-
-	m_sound_dist.x		= config.r_float		(m_load_section, "min_distance");
-	m_sound_dist.y		= config.r_float		(m_load_section, "max_distance");
-	m_sound_period.x	= config.r_s32			(m_load_section, "period0");
-	m_sound_period.y	= config.r_s32			(m_load_section, "period1");
-	m_sound_period.z	= config.r_s32			(m_load_section, "period2");
-	m_sound_period.w	= config.r_s32			(m_load_section, "period3");
-
-//	m_sound_period			= config.r_ivector4(sect,"sound_period");
-	R_ASSERT				(m_sound_period.x <= m_sound_period.y && m_sound_period.z <= m_sound_period.w);
-//	m_sound_period.mul		(1000);// now in ms
-//	m_sound_dist			= config.r_fvector2(sect,"sound_dist"); 
-	R_ASSERT2				(m_sound_dist.y > m_sound_dist.x, sect);
-
-	LPCSTR snds				= config.r_string	(sect,"sounds");
-	u32 cnt					= _GetItemCount			(snds);
-	string_path				tmp;
-	R_ASSERT3				(cnt,"sounds empty", sect);
-
-	m_sounds.resize			(cnt);
-
-	for (u32 k=0; k<cnt; ++k)
-	{
-		_GetItem			(snds,k,tmp);
-		m_sounds[k].create	(tmp,st_Effect,sg_SourceType);
-	}
+    m_load_section = sect;
+
+    m_sound_dist.x = config.r_float(m_load_section, "min_distance");
+    m_sound_dist.y = config.r_float(m_load_section, "max_distance");
+    m_sound_period.x = config.r_s32(m_load_section, "period0");
+    m_sound_period.y = config.r_s32(m_load_section, "period1");
+    m_sound_period.z = config.r_s32(m_load_section, "period2");
+    m_sound_period.w = config.r_s32(m_load_section, "period3");
+
+    // m_sound_period = config.r_ivector4(sect,"sound_period");
+    R_ASSERT(m_sound_period.x <= m_sound_period.y && m_sound_period.z <= m_sound_period.w);
+    // m_sound_period.mul (1000);// now in ms
+    // m_sound_dist = config.r_fvector2(sect,"sound_dist");
+    R_ASSERT2(m_sound_dist.y > m_sound_dist.x, sect);
+
+    LPCSTR snds = config.r_string(sect, "sounds");
+    u32 cnt = _GetItemCount(snds);
+    string_path tmp;
+    R_ASSERT3(cnt, "sounds empty", sect);
+
+    m_sounds.resize(cnt);
+
+    for (u32 k = 0; k < cnt; ++k)
+    {
+        _GetItem(snds, k, tmp);
+        m_sounds[k].create(tmp, st_Effect, sg_SourceType);
+    }
 }
 
-CEnvAmbient::SEffect* CEnvAmbient::create_effect	(CInifile& config, LPCSTR id)
+CEnvAmbient::SEffect* CEnvAmbient::create_effect(CInifile& config, LPCSTR id)
 {
-	SEffect*					result = xr_new<SEffect>();
-	result->life_time			= iFloor(config.r_float(id,"life_time")*1000.f);
-	result->particles			= config.r_string	(id,"particles");		
-	VERIFY						(result->particles.size());
-	result->offset				= config.r_fvector3	(id,"offset");
-	result->wind_gust_factor	= config.r_float(id,"wind_gust_factor");
-	
-	if (config.line_exist(id,"sound"))
-		result->sound.create	(config.r_string(id,"sound"),st_Effect,sg_SourceType);
-
-	if (config.line_exist(id,"wind_blast_strength")) {
-		result->wind_blast_strength		= config.r_float(id,"wind_blast_strength");
-		result->wind_blast_direction.setHP	(deg2rad(config.r_float(id,"wind_blast_longitude")), 0.f);
-		result->wind_blast_in_time		= config.r_float(id,"wind_blast_in_time");
-		result->wind_blast_out_time		= config.r_float(id,"wind_blast_out_time");
-		return							(result);
-	}
-
-	result->wind_blast_strength			= 0.f;
-	result->wind_blast_direction.set	(0.f, 0.f, 1.f);
-	result->wind_blast_in_time			= 0.f;
-	result->wind_blast_out_time			= 0.f;
-
-	return								(result);
+    SEffect* result = xr_new<SEffect>();
+    result->life_time = iFloor(config.r_float(id, "life_time")*1000.f);
+    result->particles = config.r_string(id, "particles");
+    VERIFY(result->particles.size());
+    result->offset = config.r_fvector3(id, "offset");
+    result->wind_gust_factor = config.r_float(id, "wind_gust_factor");
+
+    if (config.line_exist(id, "sound"))
+        result->sound.create(config.r_string(id, "sound"), st_Effect, sg_SourceType);
+
+    if (config.line_exist(id, "wind_blast_strength"))
+    {
+        result->wind_blast_strength = config.r_float(id, "wind_blast_strength");
+        result->wind_blast_direction.setHP(deg2rad(config.r_float(id, "wind_blast_longitude")), 0.f);
+        result->wind_blast_in_time = config.r_float(id, "wind_blast_in_time");
+        result->wind_blast_out_time = config.r_float(id, "wind_blast_out_time");
+        return (result);
+    }
+
+    result->wind_blast_strength = 0.f;
+    result->wind_blast_direction.set(0.f, 0.f, 1.f);
+    result->wind_blast_in_time = 0.f;
+    result->wind_blast_out_time = 0.f;
+
+    return (result);
 }
 
-CEnvAmbient::SSndChannel* CEnvAmbient::create_sound_channel	(CInifile& config, LPCSTR id)
+CEnvAmbient::SSndChannel* CEnvAmbient::create_sound_channel(CInifile& config, LPCSTR id)
 {
-	SSndChannel*			result = xr_new<SSndChannel>();
-	result->load			(config, id);
-	return					(result);
+    SSndChannel* result = xr_new<SSndChannel>();
+    result->load(config, id);
+    return (result);
 }
 
-CEnvAmbient::~CEnvAmbient						()
+CEnvAmbient::~CEnvAmbient()
 {
-	destroy					();
+    destroy();
 }
 
-void CEnvAmbient::destroy ()
+void CEnvAmbient::destroy()
 {
-	delete_data				(m_effects);
-	delete_data				(m_sound_channels);
+    delete_data(m_effects);
+    delete_data(m_sound_channels);
 }
 
-void CEnvAmbient::load( 
-		CInifile& ambients_config,
-		CInifile& sound_channels_config,
-		CInifile& effects_config,
-		const shared_str& sect
-	)
+void CEnvAmbient::load(
+    CInifile& ambients_config,
+    CInifile& sound_channels_config,
+    CInifile& effects_config,
+    const shared_str& sect
+    )
 {
-	m_ambients_config_filename = ambients_config.fname();
-	m_load_section		= sect;
-	string_path			tmp;
-	
-	// sounds
-	LPCSTR channels			= ambients_config.r_string	(sect,"sound_channels");
-	u32 cnt					= _GetItemCount(channels);
-//	R_ASSERT3				(cnt,"sound_channels empty", sect.c_str());
-	m_sound_channels.resize	(cnt);
-
-	for (u32 i=0; i<cnt; ++i)
-		m_sound_channels[i]	= create_sound_channel(sound_channels_config, _GetItem(channels,i,tmp));
-
-	// effects
-	m_effect_period.set		(
-		iFloor(
-			ambients_config.r_float(sect,"min_effect_period")*1000.f
-		),
-		iFloor(
-			ambients_config.r_float(sect,"max_effect_period")*1000.f
-		)
-	);
-	LPCSTR effs				= ambients_config.r_string	(sect,"effects");
-	cnt						= _GetItemCount(effs);
-//	R_ASSERT3				(cnt,"effects empty", sect.c_str());
-
-	m_effects.resize		(cnt);
-	for (u32 k=0; k<cnt; ++k)
-		m_effects[k]		= create_effect(effects_config, _GetItem(effs,k,tmp));
-
-	R_ASSERT					(!m_sound_channels.empty() || !m_effects.empty());
+    m_ambients_config_filename = ambients_config.fname();
+    m_load_section = sect;
+    string_path tmp;
+
+    // sounds
+    LPCSTR channels = ambients_config.r_string(sect, "sound_channels");
+    u32 cnt = _GetItemCount(channels);
+    // R_ASSERT3 (cnt,"sound_channels empty", sect.c_str());
+    m_sound_channels.resize(cnt);
+
+    for (u32 i = 0; i < cnt; ++i)
+        m_sound_channels[i] = create_sound_channel(sound_channels_config, _GetItem(channels, i, tmp));
+
+    // effects
+    m_effect_period.set(
+        iFloor(
+        ambients_config.r_float(sect, "min_effect_period")*1000.f
+        ),
+        iFloor(
+        ambients_config.r_float(sect, "max_effect_period")*1000.f
+        )
+        );
+    LPCSTR effs = ambients_config.r_string(sect, "effects");
+    cnt = _GetItemCount(effs);
+    // R_ASSERT3 (cnt,"effects empty", sect.c_str());
+
+    m_effects.resize(cnt);
+    for (u32 k = 0; k < cnt; ++k)
+        m_effects[k] = create_effect(effects_config, _GetItem(effs, k, tmp));
+
+    R_ASSERT(!m_sound_channels.empty() || !m_effects.empty());
 }
 
 //-----------------------------------------------------------------------------
 // Environment descriptor
 //-----------------------------------------------------------------------------
-CEnvDescriptor::CEnvDescriptor	(shared_str const& identifier) :
-	m_identifier		(identifier)
+CEnvDescriptor::CEnvDescriptor(shared_str const& identifier) :
+m_identifier(identifier)
 {
-	exec_time			= 0.0f;
-	exec_time_loaded	= 0.0f;
-	
-	clouds_color.set	(1,1,1,1);
-	sky_color.set		(1,1,1);
-	sky_rotation		= 0.0f;
-
-	far_plane			= 400.0f;;
-
-	fog_color.set		(1,1,1);
-	fog_density			= 0.0f;
-	fog_distance		= 400.0f;
-
-	rain_density		= 0.0f;
-	rain_color.set		(0,0,0);
-
-	bolt_period			= 0.0f;
-	bolt_duration		= 0.0f;
-
-    wind_velocity		= 0.0f;
-    wind_direction		= 0.0f;
-    
-	ambient.set			(0,0,0);
-	hemi_color.set		(1,1,1,1);
-	sun_color.set		(1,1,1);
-	sun_dir.set			(0,-1,0);
-
-	m_fSunShaftsIntensity = 0;
-	m_fWaterIntensity = 1;
-
-    lens_flare_id		= "";
-	tb_id				= "";
-    
-	env_ambient			= NULL;
+    exec_time = 0.0f;
+    exec_time_loaded = 0.0f;
+
+    clouds_color.set(1, 1, 1, 1);
+    sky_color.set(1, 1, 1);
+    sky_rotation = 0.0f;
+
+    far_plane = 400.0f;;
+
+    fog_color.set(1, 1, 1);
+    fog_density = 0.0f;
+    fog_distance = 400.0f;
+
+    rain_density = 0.0f;
+    rain_color.set(0, 0, 0);
+
+    bolt_period = 0.0f;
+    bolt_duration = 0.0f;
+
+    wind_velocity = 0.0f;
+    wind_direction = 0.0f;
+
+    ambient.set(0, 0, 0);
+    hemi_color.set(1, 1, 1, 1);
+    sun_color.set(1, 1, 1);
+    sun_dir.set(0, -1, 0);
+
+    m_fSunShaftsIntensity = 0;
+    m_fWaterIntensity = 1;
+
+    lens_flare_id = "";
+    tb_id = "";
+
+    env_ambient = NULL;
 }
 
-#define	C_CHECK(C)	if (C.x<0 || C.x>2 || C.y<0 || C.y>2 || C.z<0 || C.z>2)	{ Msg("! Invalid '%s' in env-section '%s'",#C,m_identifier.c_str());}
-void CEnvDescriptor::load	(CEnvironment& environment, CInifile& config)
+#define C_CHECK(C) if (C.x<0 || C.x>2 || C.y<0 || C.y>2 || C.z<0 || C.z>2) { Msg("! Invalid '%s' in env-section '%s'",#C,m_identifier.c_str());}
+void CEnvDescriptor::load(CEnvironment& environment, CInifile& config)
 {
-	Ivector3 tm				={0,0,0};
-	sscanf					(m_identifier.c_str(),"%d:%d:%d",&tm.x,&tm.y,&tm.z);
-	R_ASSERT3				((tm.x>=0)&&(tm.x<24)&&(tm.y>=0)&&(tm.y<60)&&(tm.z>=0)&&(tm.z<60),"Incorrect weather time",m_identifier.c_str());
-	exec_time				= tm.x*3600.f+tm.y*60.f+tm.z;
-	exec_time_loaded		= exec_time;
-	string_path				st,st_env;
-	xr_strcpy				(st,config.r_string	(m_identifier.c_str(),"sky_texture"));
-	strconcat				(sizeof(st_env),st_env,st,"#small"		);
-	sky_texture_name		= st;
-	sky_texture_env_name	= st_env;
-	clouds_texture_name		= config.r_string	(m_identifier.c_str(),"clouds_texture");
-	LPCSTR	cldclr			= config.r_string	(m_identifier.c_str(),"clouds_color");
-	float	multiplier		= 0, save=0;
-	sscanf					(cldclr,"%f,%f,%f,%f,%f",&clouds_color.x,&clouds_color.y,&clouds_color.z,&clouds_color.w,&multiplier);
-	save=clouds_color.w;	clouds_color.mul		(.5f*multiplier);		
-	clouds_color.w			= save; 
-	
-	sky_color				= config.r_fvector3	(m_identifier.c_str(),"sky_color");		
-	
-	if (config.line_exist(m_identifier.c_str(),"sky_rotation"))	sky_rotation	= deg2rad(config.r_float(m_identifier.c_str(),"sky_rotation"));
-	else											sky_rotation	= 0;
-	far_plane				= config.r_float	(m_identifier.c_str(),"far_plane");
-	fog_color				= config.r_fvector3	(m_identifier.c_str(),"fog_color");
-	fog_density				= config.r_float	(m_identifier.c_str(),"fog_density");
-	fog_distance			= config.r_float	(m_identifier.c_str(),"fog_distance");
-	rain_density			= config.r_float	(m_identifier.c_str(),"rain_density");		clamp(rain_density,0.f,1.f);
-	rain_color				= config.r_fvector3	(m_identifier.c_str(),"rain_color");            
-	wind_velocity			= config.r_float	(m_identifier.c_str(),"wind_velocity");
-	wind_direction			= deg2rad(config.r_float(m_identifier.c_str(),"wind_direction"));
-	ambient					= config.r_fvector3	(m_identifier.c_str(),"ambient_color");
-	hemi_color				= config.r_fvector4	(m_identifier.c_str(),"hemisphere_color");
-	sun_color				= config.r_fvector3	(m_identifier.c_str(),"sun_color");
-//	if (config.line_exist(m_identifier.c_str(),"sun_altitude"))
-		sun_dir.setHP			(
-			deg2rad(config.r_float(m_identifier.c_str(),"sun_altitude")),
-			deg2rad(config.r_float(m_identifier.c_str(),"sun_longitude"))
-		);
-	R_ASSERT				( _valid(sun_dir) );
-//	else
-//		sun_dir.setHP			(
-//			deg2rad(config.r_fvector2(m_identifier.c_str(),"sun_dir").y),
-//			deg2rad(config.r_fvector2(m_identifier.c_str(),"sun_dir").x)
-//		);
-	VERIFY2					(sun_dir.y < 0, "Invalid sun direction settings while loading");
-
-	lens_flare_id			= environment.eff_LensFlare->AppendDef(environment, environment.m_suns_config, config.r_string(m_identifier.c_str(),"sun"));
-	tb_id					= environment.eff_Thunderbolt->AppendDef(environment, environment.m_thunderbolt_collections_config, environment.m_thunderbolts_config, config.r_string(m_identifier.c_str(),"thunderbolt_collection"));
-	bolt_period				= (tb_id.size())?config.r_float	(m_identifier.c_str(),"thunderbolt_period"):0.f;
-	bolt_duration			= (tb_id.size())?config.r_float	(m_identifier.c_str(),"thunderbolt_duration"):0.f;
-	env_ambient				= config.line_exist(m_identifier.c_str(),"ambient")?environment.AppendEnvAmb	(config.r_string(m_identifier.c_str(),"ambient")):0;
-
-	if (config.line_exist(m_identifier.c_str(),"sun_shafts_intensity"))
-		m_fSunShaftsIntensity = config.r_float(m_identifier.c_str(),"sun_shafts_intensity");
-
-	if (config.line_exist(m_identifier.c_str(),"water_intensity"))
-		m_fWaterIntensity = config.r_float(m_identifier.c_str(),"water_intensity");
-
-	C_CHECK					(clouds_color);
-	C_CHECK					(sky_color	);
-	C_CHECK					(fog_color	);
-	C_CHECK					(rain_color	);
-	C_CHECK					(ambient	);
-	C_CHECK					(hemi_color	);
-	C_CHECK					(sun_color	);
-	on_device_create		();
+    Ivector3 tm = {0, 0, 0};
+    sscanf(m_identifier.c_str(), "%d:%d:%d", &tm.x, &tm.y, &tm.z);
+    R_ASSERT3((tm.x >= 0) && (tm.x < 24) && (tm.y >= 0) && (tm.y < 60) && (tm.z >= 0) && (tm.z < 60), "Incorrect weather time", m_identifier.c_str());
+    exec_time = tm.x*3600.f + tm.y*60.f + tm.z;
+    exec_time_loaded = exec_time;
+    string_path st, st_env;
+    xr_strcpy(st, config.r_string(m_identifier.c_str(), "sky_texture"));
+    strconcat(sizeof(st_env), st_env, st, "#small");
+    sky_texture_name = st;
+    sky_texture_env_name = st_env;
+    clouds_texture_name = config.r_string(m_identifier.c_str(), "clouds_texture");
+    LPCSTR cldclr = config.r_string(m_identifier.c_str(), "clouds_color");
+    float multiplier = 0, save = 0;
+    sscanf(cldclr, "%f,%f,%f,%f,%f", &clouds_color.x, &clouds_color.y, &clouds_color.z, &clouds_color.w, &multiplier);
+    save = clouds_color.w;
+    clouds_color.mul(.5f*multiplier);
+    clouds_color.w = save;
+
+    sky_color = config.r_fvector3(m_identifier.c_str(), "sky_color");
+
+    if (config.line_exist(m_identifier.c_str(), "sky_rotation")) sky_rotation = deg2rad(config.r_float(m_identifier.c_str(), "sky_rotation"));
+    else sky_rotation = 0;
+    far_plane = config.r_float(m_identifier.c_str(), "far_plane");
+    fog_color = config.r_fvector3(m_identifier.c_str(), "fog_color");
+    fog_density = config.r_float(m_identifier.c_str(), "fog_density");
+    fog_distance = config.r_float(m_identifier.c_str(), "fog_distance");
+    rain_density = config.r_float(m_identifier.c_str(), "rain_density");
+    clamp(rain_density, 0.f, 1.f);
+    rain_color = config.r_fvector3(m_identifier.c_str(), "rain_color");
+    wind_velocity = config.r_float(m_identifier.c_str(), "wind_velocity");
+    wind_direction = deg2rad(config.r_float(m_identifier.c_str(), "wind_direction"));
+    ambient = config.r_fvector3(m_identifier.c_str(), "ambient_color");
+    hemi_color = config.r_fvector4(m_identifier.c_str(), "hemisphere_color");
+    sun_color = config.r_fvector3(m_identifier.c_str(), "sun_color");
+    // if (config.line_exist(m_identifier.c_str(),"sun_altitude"))
+    sun_dir.setHP(
+        deg2rad(config.r_float(m_identifier.c_str(), "sun_altitude")),
+        deg2rad(config.r_float(m_identifier.c_str(), "sun_longitude"))
+        );
+    R_ASSERT(_valid(sun_dir));
+    // else
+    // sun_dir.setHP (
+    // deg2rad(config.r_fvector2(m_identifier.c_str(),"sun_dir").y),
+    // deg2rad(config.r_fvector2(m_identifier.c_str(),"sun_dir").x)
+    // );
+    VERIFY2(sun_dir.y < 0, "Invalid sun direction settings while loading");
+
+    lens_flare_id = environment.eff_LensFlare->AppendDef(environment, environment.m_suns_config, config.r_string(m_identifier.c_str(), "sun"));
+    tb_id = environment.eff_Thunderbolt->AppendDef(environment, environment.m_thunderbolt_collections_config, environment.m_thunderbolts_config, config.r_string(m_identifier.c_str(), "thunderbolt_collection"));
+    bolt_period = (tb_id.size()) ? config.r_float(m_identifier.c_str(), "thunderbolt_period") : 0.f;
+    bolt_duration = (tb_id.size()) ? config.r_float(m_identifier.c_str(), "thunderbolt_duration") : 0.f;
+    env_ambient = config.line_exist(m_identifier.c_str(), "ambient") ? environment.AppendEnvAmb(config.r_string(m_identifier.c_str(), "ambient")) : 0;
+
+    if (config.line_exist(m_identifier.c_str(), "sun_shafts_intensity"))
+        m_fSunShaftsIntensity = config.r_float(m_identifier.c_str(), "sun_shafts_intensity");
+
+    if (config.line_exist(m_identifier.c_str(), "water_intensity"))
+        m_fWaterIntensity = config.r_float(m_identifier.c_str(), "water_intensity");
+
+    C_CHECK(clouds_color);
+    C_CHECK(sky_color);
+    C_CHECK(fog_color);
+    C_CHECK(rain_color);
+    C_CHECK(ambient);
+    C_CHECK(hemi_color);
+    C_CHECK(sun_color);
+    on_device_create();
 }
 
-void CEnvDescriptor::on_device_create	()
+void CEnvDescriptor::on_device_create()
 {
-	m_pDescriptor->OnDeviceCreate(*this);
-	/*
-	if (sky_texture_name.size())	
-		sky_texture.create		(sky_texture_name.c_str());
+    m_pDescriptor->OnDeviceCreate(*this);
+    /*
+    if (sky_texture_name.size())
+    sky_texture.create (sky_texture_name.c_str());
 
-	if (sky_texture_env_name.size())
-		sky_texture_env.create	(sky_texture_env_name.c_str());
+    if (sky_texture_env_name.size())
+    sky_texture_env.create (sky_texture_env_name.c_str());
 
-	if (clouds_texture_name.size())	
-		clouds_texture.create	(clouds_texture_name.c_str());
-		*/
+    if (clouds_texture_name.size())
+    clouds_texture.create (clouds_texture_name.c_str());
+    */
 }
 
-void CEnvDescriptor::on_device_destroy	()
+void CEnvDescriptor::on_device_destroy()
 {
-	m_pDescriptor->OnDeviceDestroy();
-	/*
-	sky_texture.destroy		();
-	sky_texture_env.destroy	();
-	clouds_texture.destroy	();
-	*/
+    m_pDescriptor->OnDeviceDestroy();
+    /*
+    sky_texture.destroy ();
+    sky_texture_env.destroy ();
+    clouds_texture.destroy ();
+    */
 }
 
 //-----------------------------------------------------------------------------
 // Environment Mixer
 //-----------------------------------------------------------------------------
 CEnvDescriptorMixer::CEnvDescriptorMixer(shared_str const& identifier) :
-	CEnvDescriptor	(identifier)
+CEnvDescriptor(identifier)
 {
 }
 
 void CEnvDescriptorMixer::destroy()
 {
-	m_pDescriptorMixer->Destroy();
-	/*
-	sky_r_textures.clear		();
-	sky_r_textures_env.clear	();
-	clouds_r_textures.clear		();
-	*/
-
-	//	Reuse existing code
-	on_device_destroy();
-/*
-	sky_texture.destroy			();
-	sky_texture_env.destroy		();
-	clouds_texture.destroy		();
-	*/
+    m_pDescriptorMixer->Destroy();
+    /*
+    sky_r_textures.clear ();
+    sky_r_textures_env.clear ();
+    clouds_r_textures.clear ();
+    */
+
+    // Reuse existing code
+    on_device_destroy();
+    /*
+     sky_texture.destroy ();
+     sky_texture_env.destroy ();
+     clouds_texture.destroy ();
+     */
 }
 
-void CEnvDescriptorMixer::clear	()
+void CEnvDescriptorMixer::clear()
 {
-	m_pDescriptorMixer->Clear();
-	/*
-	std::pair<u32,ref_texture>	zero = mk_pair(u32(0),ref_texture(0));
-	sky_r_textures.clear		();
-	sky_r_textures.push_back	(zero);
-	sky_r_textures.push_back	(zero);
-	sky_r_textures.push_back	(zero);
-
-	sky_r_textures_env.clear	();
-	sky_r_textures_env.push_back(zero);
-	sky_r_textures_env.push_back(zero);
-	sky_r_textures_env.push_back(zero);
-
-	clouds_r_textures.clear		();
-	clouds_r_textures.push_back	(zero);
-	clouds_r_textures.push_back	(zero);
-	clouds_r_textures.push_back	(zero);
-	*/
+    m_pDescriptorMixer->Clear();
+    /*
+    std::pair<u32,ref_texture> zero = mk_pair(u32(0),ref_texture(0));
+    sky_r_textures.clear ();
+    sky_r_textures.push_back (zero);
+    sky_r_textures.push_back (zero);
+    sky_r_textures.push_back (zero);
+
+    sky_r_textures_env.clear ();
+    sky_r_textures_env.push_back(zero);
+    sky_r_textures_env.push_back(zero);
+    sky_r_textures_env.push_back(zero);
+
+    clouds_r_textures.clear ();
+    clouds_r_textures.push_back (zero);
+    clouds_r_textures.push_back (zero);
+    clouds_r_textures.push_back (zero);
+    */
 }
 
 int get_ref_count(IUnknown* ii);
 
-void CEnvDescriptorMixer::lerp	(CEnvironment* , CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& Mdf, float modifier_power)
+void CEnvDescriptorMixer::lerp(CEnvironment*, CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& Mdf, float modifier_power)
 {
-	float	modif_power		=	1.f/(modifier_power+1);	// the environment itself
-	float	fi				=	1-f;
-
-	m_pDescriptorMixer->lerp(&*A.m_pDescriptor, &*B.m_pDescriptor);
-	/*
-	sky_r_textures.clear		();
-	sky_r_textures.push_back	(mk_pair(0,A.sky_texture));
-	sky_r_textures.push_back	(mk_pair(1,B.sky_texture));
-
-	sky_r_textures_env.clear	();
-
-	sky_r_textures_env.push_back(mk_pair(0,A.sky_texture_env));
-	sky_r_textures_env.push_back(mk_pair(1,B.sky_texture_env));
-
-	clouds_r_textures.clear		();
-	clouds_r_textures.push_back	(mk_pair(0,A.clouds_texture));
-	clouds_r_textures.push_back	(mk_pair(1,B.clouds_texture));
-	*/
-
-	weight					=	f;
-
-	clouds_color.lerp		(A.clouds_color,B.clouds_color,f);
-
-	sky_rotation			=	(fi*A.sky_rotation + f*B.sky_rotation);
-
-//.	far_plane				=	(fi*A.far_plane + f*B.far_plane + Mdf.far_plane)*psVisDistance*modif_power;
-	if(Mdf.use_flags.test(eViewDist))
-		far_plane				=	(fi*A.far_plane + f*B.far_plane + Mdf.far_plane)*psVisDistance*modif_power;
-	else
-		far_plane				=	(fi*A.far_plane + f*B.far_plane)*psVisDistance;
-	
-//.	fog_color.lerp			(A.fog_color,B.fog_color,f).add(Mdf.fog_color).mul(modif_power);
-	fog_color.lerp			(A.fog_color,B.fog_color,f);
-	if(Mdf.use_flags.test(eFogColor))
-		fog_color.add(Mdf.fog_color).mul(modif_power);
-
-//.	fog_density				=	(fi*A.fog_density + f*B.fog_density + Mdf.fog_density)*modif_power;
-	fog_density				=	(fi*A.fog_density + f*B.fog_density);
-	if(Mdf.use_flags.test(eFogDensity))
-	{
-		fog_density			+= Mdf.fog_density;
-		fog_density			*= modif_power;
-	}
-
-	fog_distance			=	(fi*A.fog_distance + f*B.fog_distance);
-	fog_near				=	(1.0f - fog_density)*0.85f * fog_distance;
-	fog_far					=	0.99f * fog_distance;
-	
-	rain_density			=	fi*A.rain_density + f*B.rain_density;
-	rain_color.lerp			(A.rain_color,B.rain_color,f);
-	bolt_period				=	fi*A.bolt_period + f*B.bolt_period;
-	bolt_duration			=	fi*A.bolt_duration + f*B.bolt_duration;
-	// wind
-	wind_velocity			=	fi*A.wind_velocity + f*B.wind_velocity;
-	wind_direction			=	fi*A.wind_direction + f*B.wind_direction;
-
-	m_fSunShaftsIntensity	=	fi*A.m_fSunShaftsIntensity + f*B.m_fSunShaftsIntensity;
-	m_fWaterIntensity		=	fi*A.m_fWaterIntensity + f*B.m_fWaterIntensity;
-
-	// colors
-//.	sky_color.lerp			(A.sky_color,B.sky_color,f).add(Mdf.sky_color).mul(modif_power);
-	sky_color.lerp			(A.sky_color,B.sky_color,f);
-	if(Mdf.use_flags.test(eSkyColor))
-		sky_color.add(Mdf.sky_color).mul(modif_power);
-
-//.	ambient.lerp			(A.ambient,B.ambient,f).add(Mdf.ambient).mul(modif_power);
-	ambient.lerp			(A.ambient,B.ambient,f);
-	if(Mdf.use_flags.test(eAmbientColor))
-		ambient.add(Mdf.ambient).mul(modif_power);
-
-	hemi_color.lerp			(A.hemi_color,B.hemi_color,f);
-
-	if(Mdf.use_flags.test(eHemiColor))
-	{
-		hemi_color.x			+= Mdf.hemi_color.x;
-		hemi_color.y			+= Mdf.hemi_color.y; 
-		hemi_color.z			+= Mdf.hemi_color.z;
-		hemi_color.x			*= modif_power;
-		hemi_color.y			*= modif_power;
-		hemi_color.z			*= modif_power;
-	}
-
-	sun_color.lerp			(A.sun_color,B.sun_color,f);
-
-	R_ASSERT				( _valid(A.sun_dir) );
-	R_ASSERT				( _valid(B.sun_dir) );
-	sun_dir.lerp			(A.sun_dir,B.sun_dir,f).normalize();
-	R_ASSERT				( _valid(sun_dir) );
-
-	VERIFY2					(sun_dir.y<0,"Invalid sun direction settings while lerp");}
+    float modif_power = 1.f / (modifier_power + 1); // the environment itself
+    float fi = 1 - f;
+
+    m_pDescriptorMixer->lerp(&*A.m_pDescriptor, &*B.m_pDescriptor);
+    /*
+    sky_r_textures.clear ();
+    sky_r_textures.push_back (mk_pair(0,A.sky_texture));
+    sky_r_textures.push_back (mk_pair(1,B.sky_texture));
+
+    sky_r_textures_env.clear ();
+
+    sky_r_textures_env.push_back(mk_pair(0,A.sky_texture_env));
+    sky_r_textures_env.push_back(mk_pair(1,B.sky_texture_env));
+
+    clouds_r_textures.clear ();
+    clouds_r_textures.push_back (mk_pair(0,A.clouds_texture));
+    clouds_r_textures.push_back (mk_pair(1,B.clouds_texture));
+    */
+
+    weight = f;
+
+    clouds_color.lerp(A.clouds_color, B.clouds_color, f);
+
+    sky_rotation = (fi*A.sky_rotation + f*B.sky_rotation);
+
+    //. far_plane = (fi*A.far_plane + f*B.far_plane + Mdf.far_plane)*psVisDistance*modif_power;
+    if (Mdf.use_flags.test(eViewDist))
+        far_plane = (fi*A.far_plane + f*B.far_plane + Mdf.far_plane)*psVisDistance*modif_power;
+    else
+        far_plane = (fi*A.far_plane + f*B.far_plane)*psVisDistance;
+
+    //. fog_color.lerp (A.fog_color,B.fog_color,f).add(Mdf.fog_color).mul(modif_power);
+    fog_color.lerp(A.fog_color, B.fog_color, f);
+    if (Mdf.use_flags.test(eFogColor))
+        fog_color.add(Mdf.fog_color).mul(modif_power);
+
+    //. fog_density = (fi*A.fog_density + f*B.fog_density + Mdf.fog_density)*modif_power;
+    fog_density = (fi*A.fog_density + f*B.fog_density);
+    if (Mdf.use_flags.test(eFogDensity))
+    {
+        fog_density += Mdf.fog_density;
+        fog_density *= modif_power;
+    }
+
+    fog_distance = (fi*A.fog_distance + f*B.fog_distance);
+    fog_near = (1.0f - fog_density)*0.85f * fog_distance;
+    fog_far = 0.99f * fog_distance;
+
+    rain_density = fi*A.rain_density + f*B.rain_density;
+    rain_color.lerp(A.rain_color, B.rain_color, f);
+    bolt_period = fi*A.bolt_period + f*B.bolt_period;
+    bolt_duration = fi*A.bolt_duration + f*B.bolt_duration;
+    // wind
+    wind_velocity = fi*A.wind_velocity + f*B.wind_velocity;
+    wind_direction = fi*A.wind_direction + f*B.wind_direction;
+
+    m_fSunShaftsIntensity = fi*A.m_fSunShaftsIntensity + f*B.m_fSunShaftsIntensity;
+    m_fWaterIntensity = fi*A.m_fWaterIntensity + f*B.m_fWaterIntensity;
+
+    // colors
+    //. sky_color.lerp (A.sky_color,B.sky_color,f).add(Mdf.sky_color).mul(modif_power);
+    sky_color.lerp(A.sky_color, B.sky_color, f);
+    if (Mdf.use_flags.test(eSkyColor))
+        sky_color.add(Mdf.sky_color).mul(modif_power);
+
+    //. ambient.lerp (A.ambient,B.ambient,f).add(Mdf.ambient).mul(modif_power);
+    ambient.lerp(A.ambient, B.ambient, f);
+    if (Mdf.use_flags.test(eAmbientColor))
+        ambient.add(Mdf.ambient).mul(modif_power);
+
+    hemi_color.lerp(A.hemi_color, B.hemi_color, f);
+
+    if (Mdf.use_flags.test(eHemiColor))
+    {
+        hemi_color.x += Mdf.hemi_color.x;
+        hemi_color.y += Mdf.hemi_color.y;
+        hemi_color.z += Mdf.hemi_color.z;
+        hemi_color.x *= modif_power;
+        hemi_color.y *= modif_power;
+        hemi_color.z *= modif_power;
+    }
+
+    sun_color.lerp(A.sun_color, B.sun_color, f);
+
+    R_ASSERT(_valid(A.sun_dir));
+    R_ASSERT(_valid(B.sun_dir));
+    sun_dir.lerp(A.sun_dir, B.sun_dir, f).normalize();
+    R_ASSERT(_valid(sun_dir));
+
+    VERIFY2(sun_dir.y < 0, "Invalid sun direction settings while lerp");
+}
 
 //-----------------------------------------------------------------------------
 // Environment IO
 //-----------------------------------------------------------------------------
-CEnvAmbient* CEnvironment::AppendEnvAmb		(const shared_str& sect)
+CEnvAmbient* CEnvironment::AppendEnvAmb(const shared_str& sect)
 {
-	for (EnvAmbVecIt it=Ambients.begin(); it!=Ambients.end(); it++)
-		if ((*it)->name().equal(sect))
-			return						(*it);
-
-	Ambients.push_back		(xr_new<CEnvAmbient>());
-	Ambients.back()->load	(
-		*m_ambients_config,
-		*m_sound_channels_config,
-		*m_effects_config,
-		sect
-	);
-	return					(Ambients.back());
+    for (EnvAmbVecIt it = Ambients.begin(); it != Ambients.end(); it++)
+        if ((*it)->name().equal(sect))
+            return (*it);
+
+    Ambients.push_back(xr_new<CEnvAmbient>());
+    Ambients.back()->load(
+        *m_ambients_config,
+        *m_sound_channels_config,
+        *m_effects_config,
+        sect
+        );
+    return (Ambients.back());
 }
 
-void	CEnvironment::mods_load			()
+void CEnvironment::mods_load()
 {
-	Modifiers.clear_and_free			();
-	string_path							path;
-	if (FS.exist(path,"$level$","level.env_mod"))	
-	{
-		IReader*	fs	= FS.r_open		(path);
-		u32			id	= 0;
-		u32 ver		= 0x0015;
-		u32 sz;
-
-		while( 0!=(sz=fs->find_chunk(id)) )	
-		{
-			if(id==0 && sz==sizeof(u32))
-			{
-				ver				= fs->r_u32();
-			}else
-			{
-				CEnvModifier		E;
-				E.load				(fs, ver);
-				Modifiers.push_back	(E);
-			}
-			id					++;
-		}
-		FS.r_close	(fs);
-	}
-
-	load_level_specific_ambients ();
+    Modifiers.clear_and_free();
+    string_path path;
+    if (FS.exist(path, "$level$", "level.env_mod"))
+    {
+        IReader* fs = FS.r_open(path);
+        u32 id = 0;
+        u32 ver = 0x0015;
+        u32 sz;
+
+        while (0 != (sz = fs->find_chunk(id)))
+        {
+            if (id == 0 && sz == sizeof(u32))
+            {
+                ver = fs->r_u32();
+            }
+            else
+            {
+                CEnvModifier E;
+                E.load(fs, ver);
+                Modifiers.push_back(E);
+            }
+            id++;
+        }
+        FS.r_close(fs);
+    }
+
+    load_level_specific_ambients();
 }
 
-void	CEnvironment::mods_unload		()
+void CEnvironment::mods_unload()
 {
-	Modifiers.clear_and_free			();
+    Modifiers.clear_and_free();
 }
 
-void    CEnvironment::load_level_specific_ambients ()
+void CEnvironment::load_level_specific_ambients()
 {
-	SECUROM_MARKER_PERFORMANCE_ON(13)
+    SECUROM_MARKER_PERFORMANCE_ON(13)
 
-	const shared_str level_name = g_pGameLevel->name();
+        const shared_str level_name = g_pGameLevel->name();
 
-	string_path path;
-	strconcat(sizeof(path), path, "environment\\ambients\\", level_name.c_str(), ".ltx");
+    string_path path;
+    strconcat(sizeof(path), path, "environment\\ambients\\", level_name.c_str(), ".ltx");
 
-	string_path full_path;
-	CInifile* level_ambients = xr_new<CInifile>(
-			FS.update_path(full_path, "$game_config$", path),
-			TRUE,
-			TRUE,
-			FALSE);
+    string_path full_path;
+    CInifile* level_ambients = xr_new<CInifile>(
+        FS.update_path(full_path, "$game_config$", path),
+        TRUE,
+        TRUE,
+        FALSE);
 
-	for ( EnvAmbVecIt I=Ambients.begin(), E=Ambients.end(); I!=E; ++I )
-	{
-		CEnvAmbient* ambient = *I;
+    for (EnvAmbVecIt I = Ambients.begin(), E = Ambients.end(); I != E; ++I)
+    {
+        CEnvAmbient* ambient = *I;
 
-		shared_str section_name = ambient->name();
+        shared_str section_name = ambient->name();
 
-		// choose a source ini file
-		CInifile* source = (level_ambients && level_ambients->section_exist(section_name)) ? 
-							level_ambients : m_ambients_config;
+        // choose a source ini file
+        CInifile* source = (level_ambients && level_ambients->section_exist(section_name)) ?
+        level_ambients : m_ambients_config;
 
 
-		// check and reload if needed
-		if ( xr_strcmp( ambient->get_ambients_config_filename().c_str(), source->fname() ) )
-		{
-			ambient->destroy();
-			ambient->load(*source, *m_sound_channels_config, *m_effects_config, section_name);
-		}
-	}
+        // check and reload if needed
+        if (xr_strcmp(ambient->get_ambients_config_filename().c_str(), source->fname()))
+        {
+            ambient->destroy();
+            ambient->load(*source, *m_sound_channels_config, *m_effects_config, section_name);
+        }
+    }
 
-	xr_delete(level_ambients);
+    xr_delete(level_ambients);
 
-	SECUROM_MARKER_PERFORMANCE_OFF(13)
+    SECUROM_MARKER_PERFORMANCE_OFF(13)
 }
 
-CEnvDescriptor* CEnvironment::create_descriptor	(shared_str const& identifier, CInifile* config)
+CEnvDescriptor* CEnvironment::create_descriptor(shared_str const& identifier, CInifile* config)
 {
-	CEnvDescriptor*	result = xr_new<CEnvDescriptor>(identifier);
-	if (config)
-		result->load(*this, *config);
-	return			(result);
+    CEnvDescriptor* result = xr_new<CEnvDescriptor>(identifier);
+    if (config)
+        result->load(*this, *config);
+    return (result);
 }
 
-void CEnvironment::load_weathers		()
+void CEnvironment::load_weathers()
 {
-	if (!WeatherCycles.empty())
-		return;
+    if (!WeatherCycles.empty())
+        return;
 
-	typedef xr_vector<LPSTR>		file_list_type;
-	file_list_type*					file_list = FS.file_list_open("$game_weathers$","");
-	VERIFY							(file_list);
+    typedef xr_vector<LPSTR> file_list_type;
+    file_list_type* file_list = FS.file_list_open("$game_weathers$", "");
+    VERIFY(file_list);
     xr_string id;
-	file_list_type::const_iterator	i = file_list->begin();
-	file_list_type::const_iterator	e = file_list->end();
-	for ( ; i != e; ++i) {
-		u32							length = xr_strlen(*i);
-		VERIFY						(length >= 4);
-		VERIFY						((*i)[length - 4] == '.');
-		VERIFY						((*i)[length - 3] == 'l');
-		VERIFY						((*i)[length - 2] == 't');
-		VERIFY						((*i)[length - 1] == 'x');
-        id.assign(*i, length-4);
-		EnvVec& env					= WeatherCycles[id.c_str()];
-
-		string_path					file_name;
-		FS.update_path				(file_name, "$game_weathers$", id.c_str());
-		xr_strcat					(file_name, ".ltx");
-		CInifile*					config = CInifile::Create(file_name);
-
-		typedef CInifile::Root		sections_type;
-		sections_type&				sections = config->sections();
-
-		env.reserve					(sections.size());
-
-		sections_type::const_iterator	i = sections.begin();
-		sections_type::const_iterator	e = sections.end();
-		for ( ; i != e; ++i) {
-			CEnvDescriptor*			object = create_descriptor((*i)->Name, config);
-			env.push_back			(object);
-		}
-
-		CInifile::Destroy			(config);
-	}
-
-	FS.file_list_close				(file_list);
-
-	// sorting weather envs
-	EnvsMapIt _I=WeatherCycles.begin();
-	EnvsMapIt _E=WeatherCycles.end();
-	for (; _I!=_E; _I++){
-		R_ASSERT3	(_I->second.size()>1,"Environment in weather must >=2",*_I->first);
-		std::sort(_I->second.begin(),_I->second.end(),sort_env_etl_pred);
-	}
-	R_ASSERT2	(!WeatherCycles.empty(),"Empty weathers.");
-	SetWeather	((*WeatherCycles.begin()).first.c_str());
+    file_list_type::const_iterator i = file_list->begin();
+    file_list_type::const_iterator e = file_list->end();
+    for (; i != e; ++i)
+    {
+        u32 length = xr_strlen(*i);
+        VERIFY(length >= 4);
+        VERIFY((*i)[length - 4] == '.');
+        VERIFY((*i)[length - 3] == 'l');
+        VERIFY((*i)[length - 2] == 't');
+        VERIFY((*i)[length - 1] == 'x');
+        id.assign(*i, length - 4);
+        EnvVec& env = WeatherCycles[id.c_str()];
+
+        string_path file_name;
+        FS.update_path(file_name, "$game_weathers$", id.c_str());
+        xr_strcat(file_name, ".ltx");
+        CInifile* config = CInifile::Create(file_name);
+
+        typedef CInifile::Root sections_type;
+        sections_type& sections = config->sections();
+
+        env.reserve(sections.size());
+
+        sections_type::const_iterator i = sections.begin();
+        sections_type::const_iterator e = sections.end();
+        for (; i != e; ++i)
+        {
+            CEnvDescriptor* object = create_descriptor((*i)->Name, config);
+            env.push_back(object);
+        }
+
+        CInifile::Destroy(config);
+    }
+
+    FS.file_list_close(file_list);
+
+    // sorting weather envs
+    EnvsMapIt _I = WeatherCycles.begin();
+    EnvsMapIt _E = WeatherCycles.end();
+    for (; _I != _E; _I++)
+    {
+        R_ASSERT3(_I->second.size() > 1, "Environment in weather must >=2", *_I->first);
+        std::sort(_I->second.begin(), _I->second.end(), sort_env_etl_pred);
+    }
+    R_ASSERT2(!WeatherCycles.empty(), "Empty weathers.");
+    SetWeather((*WeatherCycles.begin()).first.c_str());
 }
 
-void CEnvironment::load_weather_effects	()
+void CEnvironment::load_weather_effects()
 {
-	if (!WeatherFXs.empty())
-		return;
+    if (!WeatherFXs.empty())
+        return;
 
-	typedef xr_vector<LPSTR>		file_list_type;
-	file_list_type*					file_list = FS.file_list_open("$game_weather_effects$","");
-	VERIFY							(file_list);
+    typedef xr_vector<LPSTR> file_list_type;
+    file_list_type* file_list = FS.file_list_open("$game_weather_effects$", "");
+    VERIFY(file_list);
     xr_string id;
-	file_list_type::const_iterator	i = file_list->begin();
-	file_list_type::const_iterator	e = file_list->end();
-	for ( ; i != e; ++i) {
-		u32							length = xr_strlen(*i);
-		VERIFY						(length >= 4);
-		VERIFY						((*i)[length - 4] == '.');
-		VERIFY						((*i)[length - 3] == 'l');
-		VERIFY						((*i)[length - 2] == 't');
-		VERIFY						((*i)[length - 1] == 'x');
-		id.assign(*i, length-4);
-		EnvVec& env					= WeatherFXs[id.c_str()];
-
-		string_path					file_name;
-		FS.update_path				(file_name, "$game_weather_effects$", id.c_str());
-		xr_strcat					(file_name, ".ltx");
-		CInifile*					config = CInifile::Create(file_name);
-
-		typedef CInifile::Root		sections_type;
-		sections_type&				sections = config->sections();
-
-		env.reserve					(sections.size() + 2);
-		env.push_back				(create_descriptor("00:00:00", false));
-
-		sections_type::const_iterator	i = sections.begin();
-		sections_type::const_iterator	e = sections.end();
-		for ( ; i != e; ++i) {
-			CEnvDescriptor*			object = create_descriptor((*i)->Name, config);
-			env.push_back			(object);
-		}
-
-		CInifile::Destroy			(config);
-
-		env.push_back				(create_descriptor("24:00:00", false));
-		env.back()->exec_time_loaded = DAY_LENGTH;
-
-	}
-
-	FS.file_list_close				(file_list);
+    file_list_type::const_iterator i = file_list->begin();
+    file_list_type::const_iterator e = file_list->end();
+    for (; i != e; ++i)
+    {
+        u32 length = xr_strlen(*i);
+        VERIFY(length >= 4);
+        VERIFY((*i)[length - 4] == '.');
+        VERIFY((*i)[length - 3] == 'l');
+        VERIFY((*i)[length - 2] == 't');
+        VERIFY((*i)[length - 1] == 'x');
+        id.assign(*i, length - 4);
+        EnvVec& env = WeatherFXs[id.c_str()];
+
+        string_path file_name;
+        FS.update_path(file_name, "$game_weather_effects$", id.c_str());
+        xr_strcat(file_name, ".ltx");
+        CInifile* config = CInifile::Create(file_name);
+
+        typedef CInifile::Root sections_type;
+        sections_type& sections = config->sections();
+
+        env.reserve(sections.size() + 2);
+        env.push_back(create_descriptor("00:00:00", false));
+
+        sections_type::const_iterator i = sections.begin();
+        sections_type::const_iterator e = sections.end();
+        for (; i != e; ++i)
+        {
+            CEnvDescriptor* object = create_descriptor((*i)->Name, config);
+            env.push_back(object);
+        }
+
+        CInifile::Destroy(config);
+
+        env.push_back(create_descriptor("24:00:00", false));
+        env.back()->exec_time_loaded = DAY_LENGTH;
+
+    }
+
+    FS.file_list_close(file_list);
 
 #if 0
-	int line_count	= pSettings->line_count("weather_effects");
-	for (int w_idx=0; w_idx<line_count; w_idx++){
-		LPCSTR weather, sect_w;
-		if (pSettings->r_line("weather_effects",w_idx,&weather,&sect_w)){
-			EnvVec& env		= WeatherFXs[weather];
-			env.push_back	(xr_new<CEnvDescriptor>("00:00:00")); env.back()->exec_time_loaded = 0;
-//. why?	env.push_back	(xr_new<CEnvDescriptor>("00:00:00")); env.back()->exec_time_loaded = 0;
-			int env_count	= pSettings->line_count(sect_w);
-			LPCSTR exec_tm, sect_e;
-			for (int env_idx=0; env_idx<env_count; env_idx++){
-				if (pSettings->r_line(sect_w,env_idx,&exec_tm,&sect_e))
-					env.push_back	(create_descriptor(sect_e));
-			}
-			env.push_back	(create_descriptor("23:59:59"));
-			env.back()->exec_time_loaded = DAY_LENGTH;
-		}
-	}
+    int line_count = pSettings->line_count("weather_effects");
+    for (int w_idx = 0; w_idx < line_count; w_idx++)
+    {
+        LPCSTR weather, sect_w;
+        if (pSettings->r_line("weather_effects", w_idx, &weather, &sect_w))
+        {
+            EnvVec& env = WeatherFXs[weather];
+            env.push_back(xr_new<CEnvDescriptor>("00:00:00"));
+            env.back()->exec_time_loaded = 0;
+            //. why? env.push_back (xr_new<CEnvDescriptor>("00:00:00")); env.back()->exec_time_loaded = 0;
+            int env_count = pSettings->line_count(sect_w);
+            LPCSTR exec_tm, sect_e;
+            for (int env_idx = 0; env_idx < env_count; env_idx++)
+            {
+                if (pSettings->r_line(sect_w, env_idx, &exec_tm, &sect_e))
+                    env.push_back(create_descriptor(sect_e));
+            }
+            env.push_back(create_descriptor("23:59:59"));
+            env.back()->exec_time_loaded = DAY_LENGTH;
+        }
+    }
 #endif // #if 0
 
-	// sorting weather envs
-	EnvsMapIt _I=WeatherFXs.begin();
-	EnvsMapIt _E=WeatherFXs.end();
-	for (; _I!=_E; _I++){
-		R_ASSERT3	(_I->second.size()>1,"Environment in weather must >=2",*_I->first);
-		std::sort	(_I->second.begin(),_I->second.end(),sort_env_etl_pred);
-	}
+    // sorting weather envs
+    EnvsMapIt _I = WeatherFXs.begin();
+    EnvsMapIt _E = WeatherFXs.end();
+    for (; _I != _E; _I++)
+    {
+        R_ASSERT3(_I->second.size() > 1, "Environment in weather must >=2", *_I->first);
+        std::sort(_I->second.begin(), _I->second.end(), sort_env_etl_pred);
+    }
 }
 
-void CEnvironment::load		()
+void CEnvironment::load()
 {
-	if (!CurrentEnv)
-		create_mixer		();
-
-	m_pRender->OnLoad();
-	//tonemap					= Device.Resources->_CreateTexture("$user$tonemap");	//. hack
-	if (!eff_Rain)    		eff_Rain 		= xr_new<CEffect_Rain>();
-	if (!eff_LensFlare)		eff_LensFlare 	= xr_new<CLensFlare>();
-	if (!eff_Thunderbolt)	eff_Thunderbolt	= xr_new<CEffect_Thunderbolt>();
-	
-	load_weathers			();
-	load_weather_effects	();
+    if (!CurrentEnv)
+        create_mixer();
+
+    m_pRender->OnLoad();
+    //tonemap = Device.Resources->_CreateTexture("$user$tonemap"); //. hack
+    if (!eff_Rain) eff_Rain = xr_new<CEffect_Rain>();
+    if (!eff_LensFlare) eff_LensFlare = xr_new<CLensFlare>();
+    if (!eff_Thunderbolt) eff_Thunderbolt = xr_new<CEffect_Thunderbolt>();
+
+    load_weathers();
+    load_weather_effects();
 }
 
-void CEnvironment::unload	()
+void CEnvironment::unload()
 {
-	EnvsMapIt _I,_E;
-	// clear weathers
-	_I		= WeatherCycles.begin();
-	_E		= WeatherCycles.end();
-	for (; _I!=_E; _I++){
-		for (EnvIt it=_I->second.begin(); it!=_I->second.end(); it++)
-			xr_delete	(*it);
-	}
-
-	WeatherCycles.clear		();
-	// clear weather effect
-	_I		= WeatherFXs.begin();
-	_E		= WeatherFXs.end();
-	for (; _I!=_E; _I++){
-		for (EnvIt it=_I->second.begin(); it!=_I->second.end(); it++)
-			xr_delete	(*it);
-	}
-	WeatherFXs.clear		();
-	// clear ambient
-	for (EnvAmbVecIt it=Ambients.begin(); it!=Ambients.end(); it++)
-		xr_delete		(*it);
-	Ambients.clear		();
-	// misc
-	xr_delete			(eff_Rain);
-	xr_delete			(eff_LensFlare);
-	xr_delete			(eff_Thunderbolt);
-	CurrentWeather		= 0;
-	CurrentWeatherName	= 0;
-	CurrentEnv->clear	();
-	Invalidate			();
-
-	m_pRender->OnUnload	();
-//	tonemap				= 0;
+    EnvsMapIt _I, _E;
+    // clear weathers
+    _I = WeatherCycles.begin();
+    _E = WeatherCycles.end();
+    for (; _I != _E; _I++)
+    {
+        for (EnvIt it = _I->second.begin(); it != _I->second.end(); it++)
+            xr_delete(*it);
+    }
+
+    WeatherCycles.clear();
+    // clear weather effect
+    _I = WeatherFXs.begin();
+    _E = WeatherFXs.end();
+    for (; _I != _E; _I++)
+    {
+        for (EnvIt it = _I->second.begin(); it != _I->second.end(); it++)
+            xr_delete(*it);
+    }
+    WeatherFXs.clear();
+    // clear ambient
+    for (EnvAmbVecIt it = Ambients.begin(); it != Ambients.end(); it++)
+        xr_delete(*it);
+    Ambients.clear();
+    // misc
+    xr_delete(eff_Rain);
+    xr_delete(eff_LensFlare);
+    xr_delete(eff_Thunderbolt);
+    CurrentWeather = 0;
+    CurrentWeatherName = 0;
+    CurrentEnv->clear();
+    Invalidate();
+
+    m_pRender->OnUnload();
+    // tonemap = 0;
 }
diff --git a/src/xrEngine/Environment_render.cpp b/src/xrEngine/Environment_render.cpp
index 5cdae2815cc..ef789b33b77 100644
--- a/src/xrEngine/Environment_render.cpp
+++ b/src/xrEngine/Environment_render.cpp
@@ -3,84 +3,84 @@
 
 #include "Environment.h"
 #ifndef _EDITOR
-    #include "render.h"
+#include "render.h"
 #endif
 #include "xr_efflensflare.h"
 #include "rain.h"
 #include "thunderbolt.h"
 
 #ifndef _EDITOR
-#	include "igame_level.h"
+# include "igame_level.h"
 #endif
 /*
 //////////////////////////////////////////////////////////////////////////
 // half box def
-static	Fvector3	hbox_verts[24]	=
+static Fvector3 hbox_verts[24] =
 {
-	{-1.f,	-1.f,	-1.f}, {-1.f,	-1.01f,	-1.f},	// down
-	{ 1.f,	-1.f,	-1.f}, { 1.f,	-1.01f,	-1.f},	// down
-	{-1.f,	-1.f,	 1.f}, {-1.f,	-1.01f,	 1.f},	// down
-	{ 1.f,	-1.f,	 1.f}, { 1.f,	-1.01f,	 1.f},	// down
-	{-1.f,	 1.f,	-1.f}, {-1.f,	 1.f,	-1.f},
-	{ 1.f,	 1.f,	-1.f}, { 1.f,	 1.f,	-1.f},
-	{-1.f,	 1.f,	 1.f}, {-1.f,	 1.f,	 1.f},
-	{ 1.f,	 1.f,	 1.f}, { 1.f,	 1.f,	 1.f},
-	{-1.f,	 0.f,	-1.f}, {-1.f,	-1.f,	-1.f},	// half
-	{ 1.f,	 0.f,	-1.f}, { 1.f,	-1.f,	-1.f},	// half
-	{ 1.f,	 0.f,	 1.f}, { 1.f,	-1.f,	 1.f},	// half
-	{-1.f,	 0.f,	 1.f}, {-1.f,	-1.f,	 1.f}	// half
+{-1.f, -1.f, -1.f}, {-1.f, -1.01f, -1.f}, // down
+{ 1.f, -1.f, -1.f}, { 1.f, -1.01f, -1.f}, // down
+{-1.f, -1.f, 1.f}, {-1.f, -1.01f, 1.f}, // down
+{ 1.f, -1.f, 1.f}, { 1.f, -1.01f, 1.f}, // down
+{-1.f, 1.f, -1.f}, {-1.f, 1.f, -1.f},
+{ 1.f, 1.f, -1.f}, { 1.f, 1.f, -1.f},
+{-1.f, 1.f, 1.f}, {-1.f, 1.f, 1.f},
+{ 1.f, 1.f, 1.f}, { 1.f, 1.f, 1.f},
+{-1.f, 0.f, -1.f}, {-1.f, -1.f, -1.f}, // half
+{ 1.f, 0.f, -1.f}, { 1.f, -1.f, -1.f}, // half
+{ 1.f, 0.f, 1.f}, { 1.f, -1.f, 1.f}, // half
+{-1.f, 0.f, 1.f}, {-1.f, -1.f, 1.f} // half
 };
-static	u16			hbox_faces[20*3]	=
+static u16 hbox_faces[20*3] =
 {
-	0,	 2,	 3,
-	3,	 1,	 0,
-	4,	 5,	 7,
-	7,	 6,	 4,
-	0,	 1,	 9,
-	9,	 8,	 0,
-	8,	 9,	 5,
-	5,	 4,	 8,
-	1,	 3,	10,
-	10,	 9,	 1,
-	9,	10,	 7,
-	7,	 5,	 9,
-	3,	 2,	11,
-	11,	10,	 3,
-	10,	11,	 6,
-	6,	 7,	10,
-	2,	 0,	 8,
-	8,	11,	 2,
-	11,	 8,	 4,
-	4,	 6,	11
+0, 2, 3,
+3, 1, 0,
+4, 5, 7,
+7, 6, 4,
+0, 1, 9,
+9, 8, 0,
+8, 9, 5,
+5, 4, 8,
+1, 3, 10,
+10, 9, 1,
+9, 10, 7,
+7, 5, 9,
+3, 2, 11,
+11, 10, 3,
+10, 11, 6,
+6, 7, 10,
+2, 0, 8,
+8, 11, 2,
+11, 8, 4,
+4, 6, 11
 };
 
 #pragma pack(push,1)
-struct v_skybox				{
-	Fvector3	p;
-	u32			color;
-	Fvector3	uv	[2];
-
-	void		set			(Fvector3& _p, u32 _c, Fvector3& _tc)
-	{
-		p					= _p;
-		color				= _c;
-		uv[0]				= _tc;
-		uv[1]				= _tc;
-	}
+struct v_skybox {
+Fvector3 p;
+u32 color;
+Fvector3 uv [2];
+
+void set (Fvector3& _p, u32 _c, Fvector3& _tc)
+{
+p = _p;
+color = _c;
+uv[0] = _tc;
+uv[1] = _tc;
+}
 };
-const	u32 v_skybox_fvf	= D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX2 | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEXCOORDSIZE3(1);
-struct v_clouds				{
-	Fvector3	p;
-	u32			color;
-	u32			intensity;
-	void		set			(Fvector3& _p, u32 _c, u32 _i)
-	{
-		p					= _p;
-		color				= _c;
-		intensity			= _i;
-	}
+const u32 v_skybox_fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX2 | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEXCOORDSIZE3(1);
+struct v_clouds {
+Fvector3 p;
+u32 color;
+u32 intensity;
+void set (Fvector3& _p, u32 _c, u32 _i)
+{
+p = _p;
+color = _c;
+intensity = _i;
+}
 };
-const	u32 v_clouds_fvf	= D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR;
+const u32 v_clouds_fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR;
 #pragma pack(pop)
 */
 
@@ -89,205 +89,205 @@ const	u32 v_clouds_fvf	= D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR;
 //-----------------------------------------------------------------------------
 extern ENGINE_API float psHUD_FOV;
 //BOOL bNeed_re_create_env = FALSE;
-void CEnvironment::RenderSky		()
+void CEnvironment::RenderSky()
 {
 #ifndef _EDITOR
-	if (0==g_pGameLevel)		return;
+    if (0 == g_pGameLevel) return;
 #endif
 
-	m_pRender->RenderSky(*this);
-	/*
-	// clouds_sh.create		("clouds","null");
-	//. this is the bug-fix for the case when the sky is broken
-	//. for some unknown reason the geoms happen to be invalid sometimes
-	//. if vTune show this in profile, please add simple cache (move-to-forward last found) 
-	//. to the following functions:
-	//.		CResourceManager::_CreateDecl
-	//.		CResourceManager::CreateGeom
-	if(bNeed_re_create_env)
-	{
-		sh_2sky.create			(&m_b_skybox,"skybox_2t");
-		sh_2geom.create			(v_skybox_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
-		clouds_sh.create		("clouds","null");
-		clouds_geom.create		(v_clouds_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
-		bNeed_re_create_env		= FALSE;
-	}
-	::Render->rmFar				();
-
-	// draw sky box
-	Fmatrix						mSky;
-	mSky.rotateY				(CurrentEnv->sky_rotation);
-	mSky.translate_over			(Device.vCameraPosition);
-
-	u32		i_offset,v_offset;
-	u32		C					= color_rgba(iFloor(CurrentEnv->sky_color.x*255.f), iFloor(CurrentEnv->sky_color.y*255.f), iFloor(CurrentEnv->sky_color.z*255.f), iFloor(CurrentEnv->weight*255.f));
-
-	// Fill index buffer
-	u16*	pib					= RCache.Index.Lock	(20*3,i_offset);
-	CopyMemory					(pib,hbox_faces,20*3*2);
-	RCache.Index.Unlock			(20*3);
-
-	// Fill vertex buffer
-	v_skybox* pv				= (v_skybox*)	RCache.Vertex.Lock	(12,sh_2geom.stride(),v_offset);
-	for (u32 v=0; v<12; v++)	pv[v].set		(hbox_verts[v*2],C,hbox_verts[v*2+1]);
-	RCache.Vertex.Unlock		(12,sh_2geom.stride());
-
-	// Render
-	RCache.set_xform_world		(mSky);
-	RCache.set_Geometry			(sh_2geom);
-	RCache.set_Shader			(sh_2sky);
-	RCache.set_Textures			(&CurrentEnv->sky_r_textures);
-	RCache.Render				(D3DPT_TRIANGLELIST,v_offset,0,12,i_offset,20);
-
-	// Sun
-	::Render->rmNormal			();
-	eff_LensFlare->Render		(TRUE,FALSE,FALSE);
-	*/
+    m_pRender->RenderSky(*this);
+    /*
+    // clouds_sh.create ("clouds","null");
+    //. this is the bug-fix for the case when the sky is broken
+    //. for some unknown reason the geoms happen to be invalid sometimes
+    //. if vTune show this in profile, please add simple cache (move-to-forward last found)
+    //. to the following functions:
+    //. CResourceManager::_CreateDecl
+    //. CResourceManager::CreateGeom
+    if(bNeed_re_create_env)
+    {
+    sh_2sky.create (&m_b_skybox,"skybox_2t");
+    sh_2geom.create (v_skybox_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
+    clouds_sh.create ("clouds","null");
+    clouds_geom.create (v_clouds_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
+    bNeed_re_create_env = FALSE;
+    }
+    ::Render->rmFar ();
+
+    // draw sky box
+    Fmatrix mSky;
+    mSky.rotateY (CurrentEnv->sky_rotation);
+    mSky.translate_over (Device.vCameraPosition);
+
+    u32 i_offset,v_offset;
+    u32 C = color_rgba(iFloor(CurrentEnv->sky_color.x*255.f), iFloor(CurrentEnv->sky_color.y*255.f), iFloor(CurrentEnv->sky_color.z*255.f), iFloor(CurrentEnv->weight*255.f));
+
+    // Fill index buffer
+    u16* pib = RCache.Index.Lock (20*3,i_offset);
+    CopyMemory (pib,hbox_faces,20*3*2);
+    RCache.Index.Unlock (20*3);
+
+    // Fill vertex buffer
+    v_skybox* pv = (v_skybox*) RCache.Vertex.Lock (12,sh_2geom.stride(),v_offset);
+    for (u32 v=0; v<12; v++) pv[v].set (hbox_verts[v*2],C,hbox_verts[v*2+1]);
+    RCache.Vertex.Unlock (12,sh_2geom.stride());
+
+    // Render
+    RCache.set_xform_world (mSky);
+    RCache.set_Geometry (sh_2geom);
+    RCache.set_Shader (sh_2sky);
+    RCache.set_Textures (&CurrentEnv->sky_r_textures);
+    RCache.Render (D3DPT_TRIANGLELIST,v_offset,0,12,i_offset,20);
+
+    // Sun
+    ::Render->rmNormal ();
+    eff_LensFlare->Render (TRUE,FALSE,FALSE);
+    */
 }
 
-void CEnvironment::RenderClouds			()
+void CEnvironment::RenderClouds()
 {
 #ifndef _EDITOR
-	if (0==g_pGameLevel)		return	;
+    if (0 == g_pGameLevel) return;
 #endif
-	// draw clouds
-	if (fis_zero(CurrentEnv->clouds_color.w,EPS_L))	return;
-
-	m_pRender->RenderClouds(*this);
-	/*
-
-	::Render->rmFar				();
-
-	Fmatrix						mXFORM, mScale;
-	mScale.scale				(10,0.4f,10);
-	mXFORM.rotateY				(CurrentEnv->sky_rotation);
-	mXFORM.mulB_43				(mScale);
-	mXFORM.translate_over		(Device.vCameraPosition);
-
-	Fvector wd0,wd1;
-	Fvector4 wind_dir;
-	wd0.setHP					(PI_DIV_4,0);
-	wd1.setHP					(PI_DIV_4+PI_DIV_8,0);
-	wind_dir.set				(wd0.x,wd0.z,wd1.x,wd1.z).mul(0.5f).add(0.5f).mul(255.f);
-	u32		i_offset,v_offset;
-	u32		C0					= color_rgba(iFloor(wind_dir.x),iFloor(wind_dir.y),iFloor(wind_dir.w),iFloor(wind_dir.z));
-	u32		C1					= color_rgba(iFloor(CurrentEnv->clouds_color.x*255.f),iFloor(CurrentEnv->clouds_color.y*255.f),iFloor(CurrentEnv->clouds_color.z*255.f),iFloor(CurrentEnv->clouds_color.w*255.f));
-
-	// Fill index buffer
-	u16*	pib					= RCache.Index.Lock	(CloudsIndices.size(),i_offset);
-	CopyMemory					(pib,&CloudsIndices.front(),CloudsIndices.size()*sizeof(u16));
-	RCache.Index.Unlock			(CloudsIndices.size());
-
-	// Fill vertex buffer
-	v_clouds* pv				= (v_clouds*)	RCache.Vertex.Lock	(CloudsVerts.size(),clouds_geom.stride(),v_offset);
-	for (FvectorIt it=CloudsVerts.begin(); it!=CloudsVerts.end(); it++,pv++)
-		pv->set					(*it,C0,C1);
-	RCache.Vertex.Unlock		(CloudsVerts.size(),clouds_geom.stride());
-
-	// Render
-	RCache.set_xform_world		(mXFORM);
-	RCache.set_Geometry			(clouds_geom);
-	RCache.set_Shader			(clouds_sh);
-	RCache.set_Textures			(&CurrentEnv->clouds_r_textures);
-	RCache.Render				(D3DPT_TRIANGLELIST,v_offset,0,CloudsVerts.size(),i_offset,CloudsIndices.size()/3);
-
-	::Render->rmNormal			();
-	*/
+    // draw clouds
+    if (fis_zero(CurrentEnv->clouds_color.w, EPS_L)) return;
+
+    m_pRender->RenderClouds(*this);
+    /*
+
+    ::Render->rmFar ();
+
+    Fmatrix mXFORM, mScale;
+    mScale.scale (10,0.4f,10);
+    mXFORM.rotateY (CurrentEnv->sky_rotation);
+    mXFORM.mulB_43 (mScale);
+    mXFORM.translate_over (Device.vCameraPosition);
+
+    Fvector wd0,wd1;
+    Fvector4 wind_dir;
+    wd0.setHP (PI_DIV_4,0);
+    wd1.setHP (PI_DIV_4+PI_DIV_8,0);
+    wind_dir.set (wd0.x,wd0.z,wd1.x,wd1.z).mul(0.5f).add(0.5f).mul(255.f);
+    u32 i_offset,v_offset;
+    u32 C0 = color_rgba(iFloor(wind_dir.x),iFloor(wind_dir.y),iFloor(wind_dir.w),iFloor(wind_dir.z));
+    u32 C1 = color_rgba(iFloor(CurrentEnv->clouds_color.x*255.f),iFloor(CurrentEnv->clouds_color.y*255.f),iFloor(CurrentEnv->clouds_color.z*255.f),iFloor(CurrentEnv->clouds_color.w*255.f));
+
+    // Fill index buffer
+    u16* pib = RCache.Index.Lock (CloudsIndices.size(),i_offset);
+    CopyMemory (pib,&CloudsIndices.front(),CloudsIndices.size()*sizeof(u16));
+    RCache.Index.Unlock (CloudsIndices.size());
+
+    // Fill vertex buffer
+    v_clouds* pv = (v_clouds*) RCache.Vertex.Lock (CloudsVerts.size(),clouds_geom.stride(),v_offset);
+    for (FvectorIt it=CloudsVerts.begin(); it!=CloudsVerts.end(); it++,pv++)
+    pv->set (*it,C0,C1);
+    RCache.Vertex.Unlock (CloudsVerts.size(),clouds_geom.stride());
+
+    // Render
+    RCache.set_xform_world (mXFORM);
+    RCache.set_Geometry (clouds_geom);
+    RCache.set_Shader (clouds_sh);
+    RCache.set_Textures (&CurrentEnv->clouds_r_textures);
+    RCache.Render (D3DPT_TRIANGLELIST,v_offset,0,CloudsVerts.size(),i_offset,CloudsIndices.size()/3);
+
+    ::Render->rmNormal ();
+    */
 }
 
-void CEnvironment::RenderFlares		()
+void CEnvironment::RenderFlares()
 {
 #ifndef _EDITOR
-	if (0==g_pGameLevel)			return	;
+    if (0 == g_pGameLevel) return;
 #endif
-	// 1
-	eff_LensFlare->Render			(FALSE,TRUE,TRUE);
+    // 1
+    eff_LensFlare->Render(FALSE, TRUE, TRUE);
 }
 
-void CEnvironment::RenderLast		()
+void CEnvironment::RenderLast()
 {
 #ifndef _EDITOR
-	if (0==g_pGameLevel)			return	;
+    if (0 == g_pGameLevel) return;
 #endif
-	// 2
-	eff_Rain->Render				();
-	eff_Thunderbolt->Render			();
+    // 2
+    eff_Rain->Render();
+    eff_Thunderbolt->Render();
 }
 
 void CEnvironment::OnDeviceCreate()
 {
-//.	bNeed_re_create_env			= TRUE;
-	m_pRender->OnDeviceCreate();
-	/*
-	sh_2sky.create			(&m_b_skybox,"skybox_2t");
-	sh_2geom.create			(v_skybox_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
-	clouds_sh.create		("clouds","null");
-	clouds_geom.create		(v_clouds_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
-	*/
-
-	// weathers
-	{
-		EnvsMapIt _I,_E;
-		_I		= WeatherCycles.begin();
-		_E		= WeatherCycles.end();
-		for (; _I!=_E; _I++)
-			for (EnvIt it=_I->second.begin(); it!=_I->second.end(); it++)
-				(*it)->on_device_create();
-	}
-	// effects
-	{
-		EnvsMapIt _I,_E;
-		_I		= WeatherFXs.begin();
-		_E		= WeatherFXs.end();
-		for (; _I!=_E; _I++)
-			for (EnvIt it=_I->second.begin(); it!=_I->second.end(); it++)
-				(*it)->on_device_create();
-	}
-
-
-	Invalidate	();
-	OnFrame		();
+    //. bNeed_re_create_env = TRUE;
+    m_pRender->OnDeviceCreate();
+    /*
+    sh_2sky.create (&m_b_skybox,"skybox_2t");
+    sh_2geom.create (v_skybox_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
+    clouds_sh.create ("clouds","null");
+    clouds_geom.create (v_clouds_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
+    */
+
+    // weathers
+    {
+        EnvsMapIt _I, _E;
+        _I = WeatherCycles.begin();
+        _E = WeatherCycles.end();
+        for (; _I != _E; _I++)
+            for (EnvIt it = _I->second.begin(); it != _I->second.end(); it++)
+                (*it)->on_device_create();
+    }
+    // effects
+    {
+        EnvsMapIt _I, _E;
+        _I = WeatherFXs.begin();
+        _E = WeatherFXs.end();
+        for (; _I != _E; _I++)
+            for (EnvIt it = _I->second.begin(); it != _I->second.end(); it++)
+                (*it)->on_device_create();
+    }
+
+
+    Invalidate();
+    OnFrame();
 }
 
 void CEnvironment::OnDeviceDestroy()
 {
-	m_pRender->OnDeviceDestroy();
-	/*
-	tsky0->surface_set						(NULL);
-	tsky1->surface_set						(NULL);
-	
-	sh_2sky.destroy							();
-	sh_2geom.destroy						();
-	clouds_sh.destroy						();
-	clouds_geom.destroy						();
-	*/
-	// weathers
-	{
-		EnvsMapIt _I,_E;
-		_I		= WeatherCycles.begin();
-		_E		= WeatherCycles.end();
-		for (; _I!=_E; _I++)
-			for (EnvIt it=_I->second.begin(); it!=_I->second.end(); it++)
-				(*it)->on_device_destroy();
-	}
-	// effects
-	{
-		EnvsMapIt _I,_E;
-		_I		= WeatherFXs.begin();
-		_E		= WeatherFXs.end();
-		for (; _I!=_E; _I++)
-			for (EnvIt it=_I->second.begin(); it!=_I->second.end(); it++)
-				(*it)->on_device_destroy();
-	}
-	CurrentEnv->destroy();
+    m_pRender->OnDeviceDestroy();
+    /*
+    tsky0->surface_set (NULL);
+    tsky1->surface_set (NULL);
+
+    sh_2sky.destroy ();
+    sh_2geom.destroy ();
+    clouds_sh.destroy ();
+    clouds_geom.destroy ();
+    */
+    // weathers
+    {
+        EnvsMapIt _I, _E;
+        _I = WeatherCycles.begin();
+        _E = WeatherCycles.end();
+        for (; _I != _E; _I++)
+            for (EnvIt it = _I->second.begin(); it != _I->second.end(); it++)
+                (*it)->on_device_destroy();
+    }
+    // effects
+    {
+        EnvsMapIt _I, _E;
+        _I = WeatherFXs.begin();
+        _E = WeatherFXs.end();
+        for (; _I != _E; _I++)
+            for (EnvIt it = _I->second.begin(); it != _I->second.end(); it++)
+                (*it)->on_device_destroy();
+    }
+    CurrentEnv->destroy();
 
 }
 
 #ifdef _EDITOR
 void CEnvironment::ED_Reload()
 {
-	OnDeviceDestroy			();
-	OnDeviceCreate			();
+    OnDeviceDestroy();
+    OnDeviceCreate();
 }
 #endif
 
diff --git a/src/xrEngine/EventAPI.cpp b/src/xrEngine/EventAPI.cpp
index 5bfe97d24ac..17a316ebad1 100644
--- a/src/xrEngine/EventAPI.cpp
+++ b/src/xrEngine/EventAPI.cpp
@@ -2,202 +2,214 @@
 #include "eventapi.h"
 #include "xr_ioconsole.h"
 
-extern	void msRead			();
-extern	void msCreate		(LPCSTR name);
+extern void msRead();
+extern void msCreate(LPCSTR name);
 
 //---------------------------------------------------------------------
 class ENGINE_API CEvent
 {
-	friend class CEventAPI;
+    friend class CEventAPI;
 private:
-	char*						Name;
-	xr_vector<IEventReceiver*>		Handlers;
-	u32							dwRefCount;
+    char* Name;
+    xr_vector<IEventReceiver*> Handlers;
+    u32 dwRefCount;
 public:
-	CEvent	(const char* S);
-	~CEvent	();
-
-	LPCSTR	GetFull()
-	{	return Name; }
-	u32	RefCount()
-	{	return dwRefCount; }
-
-	BOOL	Equal(CEvent& E)
-	{ return stricmp(Name,E.Name)==0; }
-
-	void	Attach(IEventReceiver* H)
-	{
-		if (std::find(Handlers.begin(),Handlers.end(),H)==Handlers.end())
-			Handlers.push_back(H);
-	}
-	void	Detach(IEventReceiver* H)
-	{
-		xr_vector<IEventReceiver*>::iterator I = std::find(Handlers.begin(),Handlers.end(),H);
-		if (I!=Handlers.end())
-			Handlers.erase(I);
-	}
-	void	Signal(u64 P1, u64 P2)
-	{
-		for (u32 I=0; I<Handlers.size(); I++)
-			Handlers[I]->OnEvent(this,P1,P2);
-	}
+    CEvent(const char* S);
+    ~CEvent();
+
+    LPCSTR GetFull()
+    {
+        return Name;
+    }
+    u32 RefCount()
+    {
+        return dwRefCount;
+    }
+
+    BOOL Equal(CEvent& E)
+    {
+        return stricmp(Name, E.Name) == 0;
+    }
+
+    void Attach(IEventReceiver* H)
+    {
+        if (std::find(Handlers.begin(), Handlers.end(), H) == Handlers.end())
+            Handlers.push_back(H);
+    }
+    void Detach(IEventReceiver* H)
+    {
+        xr_vector<IEventReceiver*>::iterator I = std::find(Handlers.begin(), Handlers.end(), H);
+        if (I != Handlers.end())
+            Handlers.erase(I);
+    }
+    void Signal(u64 P1, u64 P2)
+    {
+        for (u32 I = 0; I < Handlers.size(); I++)
+            Handlers[I]->OnEvent(this, P1, P2);
+    }
 };
 //-----------------------------------------
 CEvent::CEvent(const char* S)
-{	
-	Name=xr_strdup(S); 
-	_strupr(Name);
-	dwRefCount=1; 
+{
+    Name = xr_strdup(S);
+    _strupr(Name);
+    dwRefCount = 1;
 }
 CEvent::~CEvent()
-{	xr_free(Name); }
+{
+    xr_free(Name);
+}
 
 //-----------------------------------------
-IC bool ev_sort(CEvent*E1, CEvent*E2)
-{	return E1->GetFull() < E2->GetFull(); }
+IC bool ev_sort(CEvent* E1, CEvent* E2)
+{
+    return E1->GetFull() < E2->GetFull();
+}
 
 void CEventAPI::Dump()
 {
-	std::sort(Events.begin(),Events.end(),ev_sort);
-	for (u32 i=0; i<Events.size(); i++)
-		Msg("* [%d] %s",Events[i]->RefCount(),Events[i]->GetFull());
+    std::sort(Events.begin(), Events.end(), ev_sort);
+    for (u32 i = 0; i < Events.size(); i++)
+        Msg("* [%d] %s", Events[i]->RefCount(), Events[i]->GetFull());
 }
 
-EVENT	CEventAPI::Create(const char* N)
+EVENT CEventAPI::Create(const char* N)
 {
-	CS.Enter	();
-	CEvent	E	(N);
-	for (xr_vector<CEvent*>::iterator I=Events.begin(); I!=Events.end(); I++)
-	{
-		if ((*I)->Equal(E)) {
-			EVENT F		= *I;
-			F->dwRefCount++;
-			CS.Leave	();
-			return		F;
-		}
-	}
-
-	EVENT X = xr_new<CEvent>	(N);
-	Events.push_back			(X);
-	CS.Leave					( );
-	return X;
+    CS.Enter();
+    CEvent E(N);
+    for (xr_vector<CEvent*>::iterator I = Events.begin(); I != Events.end(); I++)
+    {
+        if ((*I)->Equal(E))
+        {
+            EVENT F = *I;
+            F->dwRefCount++;
+            CS.Leave();
+            return F;
+        }
+    }
+
+    EVENT X = xr_new<CEvent>(N);
+    Events.push_back(X);
+    CS.Leave();
+    return X;
 }
-void	CEventAPI::Destroy(EVENT& E)
+void CEventAPI::Destroy(EVENT& E)
 {
-	CS.Enter	();
-	E->dwRefCount--;
-	if (E->dwRefCount == 0) 
-	{
-		xr_vector<CEvent*>::iterator I = std::find(Events.begin(),Events.end(),E);
-		R_ASSERT(I!=Events.end());
-		Events.erase(I);
-		xr_delete	(E);
-	}
-	CS.Leave	();
+    CS.Enter();
+    E->dwRefCount--;
+    if (E->dwRefCount == 0)
+    {
+        xr_vector<CEvent*>::iterator I = std::find(Events.begin(), Events.end(), E);
+        R_ASSERT(I != Events.end());
+        Events.erase(I);
+        xr_delete(E);
+    }
+    CS.Leave();
 }
 
-EVENT	CEventAPI::Handler_Attach(const char* N, IEventReceiver* H)
+EVENT CEventAPI::Handler_Attach(const char* N, IEventReceiver* H)
 {
-	CS.Enter	();
-	EVENT	E = Create(N);
-	E->Attach(H);
-	CS.Leave	();
-	return E;
+    CS.Enter();
+    EVENT E = Create(N);
+    E->Attach(H);
+    CS.Leave();
+    return E;
 }
 
-void	CEventAPI::Handler_Detach(EVENT& E, IEventReceiver* H)
+void CEventAPI::Handler_Detach(EVENT& E, IEventReceiver* H)
 {
-	if (0==E)	return;
-	CS.Enter	();
-	E->Detach	(H);
-	Destroy		(E);
-	CS.Leave	();
+    if (0 == E) return;
+    CS.Enter();
+    E->Detach(H);
+    Destroy(E);
+    CS.Leave();
 }
-void	CEventAPI::Signal(EVENT E, u64 P1, u64 P2)
+void CEventAPI::Signal(EVENT E, u64 P1, u64 P2)
 {
-	CS.Enter	();
-	E->Signal	(P1,P2);	
-	CS.Leave	();
+    CS.Enter();
+    E->Signal(P1, P2);
+    CS.Leave();
 }
-void	CEventAPI::Signal(LPCSTR N, u64 P1, u64 P2)
+void CEventAPI::Signal(LPCSTR N, u64 P1, u64 P2)
 {
-	CS.Enter	();
-	EVENT		E = Create(N);
-	Signal		(E,P1,P2);
-	Destroy		(E);
-	CS.Leave	();
+    CS.Enter();
+    EVENT E = Create(N);
+    Signal(E, P1, P2);
+    Destroy(E);
+    CS.Leave();
 }
-void	CEventAPI::Defer(EVENT E, u64 P1, u64 P2)
+void CEventAPI::Defer(EVENT E, u64 P1, u64 P2)
 {
-	CS.Enter	();
-	E->dwRefCount++;
-	Events_Deferred.push_back	(Deferred());
-	Events_Deferred.back().E	= E;
-	Events_Deferred.back().P1	= P1;
-	Events_Deferred.back().P2	= P2;
-	CS.Leave	();
+    CS.Enter();
+    E->dwRefCount++;
+    Events_Deferred.push_back(Deferred());
+    Events_Deferred.back().E = E;
+    Events_Deferred.back().P1 = P1;
+    Events_Deferred.back().P2 = P2;
+    CS.Leave();
 }
-void	CEventAPI::Defer(LPCSTR N, u64 P1, u64 P2)
+void CEventAPI::Defer(LPCSTR N, u64 P1, u64 P2)
 {
-	CS.Enter	();
-	EVENT	E	= Create(N);
-	Defer		(E,P1,P2);
-	Destroy		(E);
-	CS.Leave	();
+    CS.Enter();
+    EVENT E = Create(N);
+    Defer(E, P1, P2);
+    Destroy(E);
+    CS.Leave();
 }
 
 #ifdef DEBUG
-void msParse			(LPCSTR c)
-{
-	if (0==stricmp(c,"exit")) 
-	{
-		Console->Execute	("quit");
-	}
-	if (0==stricmp(c,"quit"))
-	{
-		TerminateProcess	(GetCurrentProcess(),0);
-		Console->Execute	("quit");
-	}
+void msParse(LPCSTR c)
+{
+    if (0 == stricmp(c, "exit"))
+    {
+        Console->Execute("quit");
+    }
+    if (0 == stricmp(c, "quit"))
+    {
+        TerminateProcess(GetCurrentProcess(), 0);
+        Console->Execute("quit");
+    }
 }
 #endif
 
-void	CEventAPI::OnFrame	()
+void CEventAPI::OnFrame()
 {
 #ifdef DEBUG
-	msRead		();
+    msRead();
 #endif
-	CS.Enter	();
-	if (Events_Deferred.empty())	{ CS.Leave(); return; }
-	for (u32 I=0; I<Events_Deferred.size(); I++)
-	{
-		Deferred&	DEF = Events_Deferred[I];
-		Signal		(DEF.E,DEF.P1,DEF.P2);
-		Destroy		(Events_Deferred[I].E);
-	}
-	Events_Deferred.clear();
-	CS.Leave	();
+    CS.Enter();
+    if (Events_Deferred.empty()) { CS.Leave(); return; }
+    for (u32 I = 0; I < Events_Deferred.size(); I++)
+    {
+        Deferred& DEF = Events_Deferred[I];
+        Signal(DEF.E, DEF.P1, DEF.P2);
+        Destroy(Events_Deferred[I].E);
+    }
+    Events_Deferred.clear();
+    CS.Leave();
 }
 
 BOOL CEventAPI::Peek(LPCSTR EName)
 {
-	CS.Enter	();
-	if (Events_Deferred.empty())	{ CS.Leave(); return FALSE; }
-	for (u32 I=0; I<Events_Deferred.size(); I++)
-	{
-		Deferred&	DEF = Events_Deferred[I];
-		if(stricmp(DEF.E->GetFull(),EName)==0){
-			CS.Leave(); 
-			return TRUE;
-		}
-
-	}
-	CS.Leave	();
-	return FALSE;
+    CS.Enter();
+    if (Events_Deferred.empty()) { CS.Leave(); return FALSE; }
+    for (u32 I = 0; I < Events_Deferred.size(); I++)
+    {
+        Deferred& DEF = Events_Deferred[I];
+        if (stricmp(DEF.E->GetFull(), EName) == 0)
+        {
+            CS.Leave();
+            return TRUE;
+        }
+
+    }
+    CS.Leave();
+    return FALSE;
 }
 
 void CEventAPI::_destroy()
 {
-	Dump	();
-	if (Events.empty())				Events.clear();
-	if (Events_Deferred.empty())	Events_Deferred.clear();
+    Dump();
+    if (Events.empty()) Events.clear();
+    if (Events_Deferred.empty()) Events_Deferred.clear();
 }
diff --git a/src/xrEngine/EventAPI.h b/src/xrEngine/EventAPI.h
index 1ea00fa0956..9571a947545 100644
--- a/src/xrEngine/EventAPI.h
+++ b/src/xrEngine/EventAPI.h
@@ -2,46 +2,46 @@
 
 #include "../xrcore/xrSyncronize.h"
 
-class ENGINE_API	CEvent;
-typedef CEvent*		EVENT;
+class ENGINE_API CEvent;
+typedef CEvent* EVENT;
 
 //---------------------------------------------------------------------
-class ENGINE_API	IEventReceiver
+class ENGINE_API IEventReceiver
 {
 public:
-	virtual void	OnEvent(EVENT E, u64 P1, u64 P2) = 0;
+    virtual void OnEvent(EVENT E, u64 P1, u64 P2) = 0;
 };
 //---------------------------------------------------------------------
-class ENGINE_API	CEventAPI
+class ENGINE_API CEventAPI
 {
-	struct Deferred
-	{
-		EVENT		E;
-		u64			P1;
-		u64			P2;
-	};
+    struct Deferred
+    {
+        EVENT E;
+        u64 P1;
+        u64 P2;
+    };
 private:
-	xr_vector<EVENT>		Events;
-	xr_vector<Deferred>		Events_Deferred;
-	xrCriticalSection		CS;
+    xr_vector<EVENT> Events;
+    xr_vector<Deferred> Events_Deferred;
+    xrCriticalSection CS;
 public:
 #ifdef PROFILE_CRITICAL_SECTIONS
-			CEventAPI		() : CS(MUTEX_PROFILE_ID(CEventAPI)) {}
+    CEventAPI () : CS(MUTEX_PROFILE_ID(CEventAPI)) {}
 #endif // PROFILE_CRITICAL_SECTIONS
-	EVENT	Create			(const char* N);
-	void	Destroy			(EVENT& E);
+    EVENT Create(const char* N);
+    void Destroy(EVENT& E);
 
-	EVENT	Handler_Attach	(const char* N, IEventReceiver* H);
-	void	Handler_Detach	(EVENT& E, IEventReceiver* H);
+    EVENT Handler_Attach(const char* N, IEventReceiver* H);
+    void Handler_Detach(EVENT& E, IEventReceiver* H);
 
-	void	Signal			(EVENT	E, u64 P1=0, u64 P2=0);
-	void	Signal			(LPCSTR E, u64 P1=0, u64 P2=0);
-	void	Defer			(EVENT	E, u64 P1=0, u64 P2=0);
-	void	Defer			(LPCSTR E, u64 P1=0, u64 P2=0);
+    void Signal(EVENT E, u64 P1 = 0, u64 P2 = 0);
+    void Signal(LPCSTR E, u64 P1 = 0, u64 P2 = 0);
+    void Defer(EVENT E, u64 P1 = 0, u64 P2 = 0);
+    void Defer(LPCSTR E, u64 P1 = 0, u64 P2 = 0);
 
-	void	OnFrame			();
-	void	Dump			();
-	BOOL	Peek			(LPCSTR EName);
+    void OnFrame();
+    void Dump();
+    BOOL Peek(LPCSTR EName);
 
-	void	_destroy		();
+    void _destroy();
 };
diff --git a/src/xrEngine/FDemoPlay.cpp b/src/xrEngine/FDemoPlay.cpp
index 25639b98f54..ea0f861eddd 100644
--- a/src/xrEngine/FDemoPlay.cpp
+++ b/src/xrEngine/FDemoPlay.cpp
@@ -16,282 +16,300 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-CDemoPlay::CDemoPlay(const char *name, float ms, u32 cycles, float life_time) : CEffectorCam(cefDemo,life_time/*,FALSE*/)
+CDemoPlay::CDemoPlay(const char* name, float ms, u32 cycles, float life_time) : CEffectorCam(cefDemo, life_time/*,FALSE*/)
 {
-	Msg					("*** Playing demo: %s",name);
-	Console->Execute	("hud_weapon 0");
-	if( g_bBenchmark || g_SASH.IsRunning() )
-		Console->Execute	("hud_draw 0");
-
-	fSpeed				= ms;
-	dwCyclesLeft		= cycles?cycles:1;
-
-	m_pMotion			= 0;
-	m_MParam			= 0;
-	string_path			nm, fn;
-	xr_strcpy			(nm,sizeof(nm),name);	
-	LPSTR extp			=strext(nm);
-	if (extp)	
-		xr_strcpy			( nm, sizeof( nm ) - ( extp - nm ), ".anm");
-
-	if ( FS.exist(fn,"$level$",nm) || FS.exist(fn,"$game_anims$",nm) )
-	{
-		m_pMotion				= xr_new<COMotion>		();
-		m_pMotion->LoadMotion	(fn);
-		m_MParam				= xr_new<SAnimParams>	();
-		m_MParam->Set			(m_pMotion);
-		m_MParam->Play			();
-	}else{
-		if (!FS.exist(name))						{
-			g_pGameLevel->Cameras().RemoveCamEffector	(cefDemo);
-			return		;
-		}
-		IReader*	fs	= FS.r_open	(name);
-		u32 sz			= fs->length();
-		if				(sz%sizeof(Fmatrix) != 0)	{
-			FS.r_close	(fs);
-			g_pGameLevel->Cameras().RemoveCamEffector	(cefDemo);
-			return		;
-		}
-		
-		seq.resize		(sz/sizeof(Fmatrix));
-		m_count			= seq.size();
-		CopyMemory	(&*seq.begin(),fs->pointer(),sz);
-		FS.r_close		(fs);
-		Log				("~ Total key-frames: ",m_count);
-	}
-	stat_started		= FALSE;
-	Device.PreCache		(50, true, false);
+    Msg("*** Playing demo: %s", name);
+    Console->Execute("hud_weapon 0");
+    if (g_bBenchmark || g_SASH.IsRunning())
+        Console->Execute("hud_draw 0");
+
+    fSpeed = ms;
+    dwCyclesLeft = cycles ? cycles : 1;
+
+    m_pMotion = 0;
+    m_MParam = 0;
+    string_path nm, fn;
+    xr_strcpy(nm, sizeof(nm), name);
+    LPSTR extp = strext(nm);
+    if (extp)
+        xr_strcpy(nm, sizeof(nm) - (extp - nm), ".anm");
+
+    if (FS.exist(fn, "$level$", nm) || FS.exist(fn, "$game_anims$", nm))
+    {
+        m_pMotion = xr_new<COMotion>();
+        m_pMotion->LoadMotion(fn);
+        m_MParam = xr_new<SAnimParams>();
+        m_MParam->Set(m_pMotion);
+        m_MParam->Play();
+    }
+    else
+    {
+        if (!FS.exist(name))
+        {
+            g_pGameLevel->Cameras().RemoveCamEffector(cefDemo);
+            return;
+        }
+        IReader* fs = FS.r_open(name);
+        u32 sz = fs->length();
+        if (sz%sizeof(Fmatrix) != 0)
+        {
+            FS.r_close(fs);
+            g_pGameLevel->Cameras().RemoveCamEffector(cefDemo);
+            return;
+        }
+
+        seq.resize(sz / sizeof(Fmatrix));
+        m_count = seq.size();
+        CopyMemory(&*seq.begin(), fs->pointer(), sz);
+        FS.r_close(fs);
+        Log("~ Total key-frames: ", m_count);
+    }
+    stat_started = FALSE;
+    Device.PreCache(50, true, false);
 }
 
-CDemoPlay::~CDemoPlay		()
+CDemoPlay::~CDemoPlay()
 {
-	stat_Stop				();
-	xr_delete				(m_pMotion	);
-	xr_delete				(m_MParam	);
-	Console->Execute		("hud_weapon 1");
-	if(g_bBenchmark || g_SASH.IsRunning())		
-		Console->Execute	("hud_draw 1");
+    stat_Stop();
+    xr_delete(m_pMotion);
+    xr_delete(m_MParam);
+    Console->Execute("hud_weapon 1");
+    if (g_bBenchmark || g_SASH.IsRunning())
+        Console->Execute("hud_draw 1");
 }
 
-void CDemoPlay::stat_Start	()
+void CDemoPlay::stat_Start()
 {
-	//if (stat_started)		return;
-	VERIFY(!stat_started);
-	stat_started			= TRUE				;
-	Sleep					(1)					;
-	stat_StartFrame			=	Device.dwFrame	;
-	stat_Timer_frame.Start	()					;
-	stat_Timer_total.Start	()					;
-	stat_table.clear		()					;
-	stat_table.reserve		(1024)				;
-	fStartTime				= 0;
+    //if (stat_started) return;
+    VERIFY(!stat_started);
+    stat_started = TRUE;
+    Sleep(1);
+    stat_StartFrame = Device.dwFrame;
+    stat_Timer_frame.Start();
+    stat_Timer_total.Start();
+    stat_table.clear();
+    stat_table.reserve(1024);
+    fStartTime = 0;
 }
 
-extern string512		g_sBenchmarkName;
+extern string512 g_sBenchmarkName;
 
-void CDemoPlay::stat_Stop	()
+void CDemoPlay::stat_Stop()
 {
-	if (!stat_started)		return;
-
-	//g_SASH.EndBenchmark();
-
-	stat_started			= FALSE;
-	float	stat_total		= stat_Timer_total.GetElapsed_sec	();
-
-	float	rfps_min, rfps_max, rfps_middlepoint, rfps_average	;
-
-	// total
-	u32	dwFramesTotal		= Device.dwFrame-stat_StartFrame	;
-	rfps_average			= float(dwFramesTotal)/stat_total	;
-
-	// min/max/average
-	rfps_min				= flt_max;
-	rfps_max				= flt_min;
-	rfps_middlepoint		= 0;
-
-	//	Filtered FPS
-	const u32 iAvgFPS		=	_max((u32)rfps_average,10);
-	const u32 WindowSize	=	_max(16, iAvgFPS/2);
-
-	if ( stat_table.size() > WindowSize*4 )
-	{
-		for (u32	it=2; it<stat_table.size()-WindowSize+1; it++)
-		{
-			float	fTime = 0;
-			for (u32 i=0; i<WindowSize; ++i)
-				fTime += stat_table[it+i];
-			float	fps	= WindowSize / fTime;
-			if		(fps<rfps_min)	rfps_min = fps;
-			if		(fps>rfps_max)	rfps_max = fps;
-			rfps_middlepoint	+=	fps;
-		}
-
-		rfps_middlepoint		/= float(stat_table.size()-1-WindowSize+1);
-	}
-	else
-	{
-		for (u32	it=1; it<stat_table.size(); it++)
-		{
-			float	fps	= 1.f / stat_table[it];
-			if		(fps<rfps_min)	rfps_min = fps;
-			if		(fps>rfps_max)	rfps_max = fps;
-			rfps_middlepoint	+=	fps;
-		}
-		rfps_middlepoint		/= float(stat_table.size()-1);
-	}
-
-	/*
-	for (u32	it=1; it<stat_table.size(); it++)
-	{
-		float	fps	= 1.f / stat_table[it];
-		if		(fps<rfps_min)	rfps_min = fps;
-		if		(fps>rfps_max)	rfps_max = fps;
-		rfps_middlepoint	+=	fps;
-	}
-	rfps_middlepoint		/= float(stat_table.size()-1);
-	*/
-
-	Msg("* [DEMO] FPS: average[%f], min[%f], max[%f], middle[%f]",rfps_average,rfps_min,rfps_max,rfps_middlepoint);
-
-	if(g_bBenchmark)
-	{
-		string_path			fname;
-
-		if(xr_strlen(g_sBenchmarkName))
-			xr_sprintf	(fname,sizeof(fname),"%s.result",g_sBenchmarkName);
-		else
-			xr_strcpy	(fname,sizeof(fname),"benchmark.result");
-
-
-		FS.update_path		(fname,"$app_data_root$",fname);
-		CInifile			res		(fname,FALSE,FALSE,TRUE);
-		res.w_float			("general","renderer",	float(::Render->get_generation())/10.f,	"dx-level required"		);
-		res.w_float			("general","min",		rfps_min,								"absolute minimum"		);
-		res.w_float			("general","max",		rfps_max,								"absolute maximum"		);
-		res.w_float			("general","average",	rfps_average,							"average for this run"	);
-		res.w_float			("general","middle",	rfps_middlepoint,						"per-frame middle-point");
-		for (u32	it=1; it<stat_table.size(); it++)
-		{
-			string32		id;
-			xr_sprintf		(id,sizeof(id),"%7d",it);
-			for (u32 c=0; id[c]; c++) if (' '==id[c]) id[c] = '0';
-			res.w_float		("per_frame_stats",	id, 1.f / stat_table[it]);
-		}
-
-		Console->Execute	("quit");
-	}
+    if (!stat_started) return;
+
+    //g_SASH.EndBenchmark();
+
+    stat_started = FALSE;
+    float stat_total = stat_Timer_total.GetElapsed_sec();
+
+    float rfps_min, rfps_max, rfps_middlepoint, rfps_average;
+
+    // total
+    u32 dwFramesTotal = Device.dwFrame - stat_StartFrame;
+    rfps_average = float(dwFramesTotal) / stat_total;
+
+    // min/max/average
+    rfps_min = flt_max;
+    rfps_max = flt_min;
+    rfps_middlepoint = 0;
+
+    // Filtered FPS
+    const u32 iAvgFPS = _max((u32)rfps_average, 10);
+    const u32 WindowSize = _max(16, iAvgFPS / 2);
+
+    if (stat_table.size() > WindowSize * 4)
+    {
+        for (u32 it = 2; it < stat_table.size() - WindowSize + 1; it++)
+        {
+            float fTime = 0;
+            for (u32 i = 0; i < WindowSize; ++i)
+                fTime += stat_table[it + i];
+            float fps = WindowSize / fTime;
+            if (fps < rfps_min) rfps_min = fps;
+            if (fps > rfps_max) rfps_max = fps;
+            rfps_middlepoint += fps;
+        }
+
+        rfps_middlepoint /= float(stat_table.size() - 1 - WindowSize + 1);
+    }
+    else
+    {
+        for (u32 it = 1; it < stat_table.size(); it++)
+        {
+            float fps = 1.f / stat_table[it];
+            if (fps < rfps_min) rfps_min = fps;
+            if (fps > rfps_max) rfps_max = fps;
+            rfps_middlepoint += fps;
+        }
+        rfps_middlepoint /= float(stat_table.size() - 1);
+    }
+
+    /*
+    for (u32 it=1; it<stat_table.size(); it++)
+    {
+    float fps = 1.f / stat_table[it];
+    if (fps<rfps_min) rfps_min = fps;
+    if (fps>rfps_max) rfps_max = fps;
+    rfps_middlepoint += fps;
+    }
+    rfps_middlepoint /= float(stat_table.size()-1);
+    */
+
+    Msg("* [DEMO] FPS: average[%f], min[%f], max[%f], middle[%f]", rfps_average, rfps_min, rfps_max, rfps_middlepoint);
+
+    if (g_bBenchmark)
+    {
+        string_path fname;
+
+        if (xr_strlen(g_sBenchmarkName))
+            xr_sprintf(fname, sizeof(fname), "%s.result", g_sBenchmarkName);
+        else
+            xr_strcpy(fname, sizeof(fname), "benchmark.result");
+
+
+        FS.update_path(fname, "$app_data_root$", fname);
+        CInifile res(fname, FALSE, FALSE, TRUE);
+        res.w_float("general", "renderer", float(::Render->get_generation()) / 10.f, "dx-level required");
+        res.w_float("general", "min", rfps_min, "absolute minimum");
+        res.w_float("general", "max", rfps_max, "absolute maximum");
+        res.w_float("general", "average", rfps_average, "average for this run");
+        res.w_float("general", "middle", rfps_middlepoint, "per-frame middle-point");
+        for (u32 it = 1; it < stat_table.size(); it++)
+        {
+            string32 id;
+            xr_sprintf(id, sizeof(id), "%7d", it);
+            for (u32 c = 0; id[c]; c++) if (' ' == id[c]) id[c] = '0';
+            res.w_float("per_frame_stats", id, 1.f / stat_table[it]);
+        }
+
+        Console->Execute("quit");
+    }
 }
 
 #define FIX(a) while (a>=m_count) a-=m_count
-void spline1( float t, Fvector *p, Fvector *ret )
+void spline1(float t, Fvector* p, Fvector* ret)
 {
-	float     t2  = t * t;
-	float     t3  = t2 * t;
-	float     m[4];
-
-	ret->x=0.0f;
-	ret->y=0.0f;
-	ret->z=0.0f;
-	m[0] = ( 0.5f * ( (-1.0f * t3) + ( 2.0f * t2) + (-1.0f * t) ) );
-	m[1] = ( 0.5f * ( ( 3.0f * t3) + (-5.0f * t2) + ( 0.0f * t) + 2.0f ) );
-	m[2] = ( 0.5f * ( (-3.0f * t3) + ( 4.0f * t2) + ( 1.0f * t) ) );
-	m[3] = ( 0.5f * ( ( 1.0f * t3) + (-1.0f * t2) + ( 0.0f * t) ) );
-
-	for( int i=0; i<4; i++ )
-	{
-		ret->x += p[i].x * m[i];
-		ret->y += p[i].y * m[i];
-		ret->z += p[i].z * m[i];
-	}
+    float t2 = t * t;
+    float t3 = t2 * t;
+    float m[4];
+
+    ret->x = 0.0f;
+    ret->y = 0.0f;
+    ret->z = 0.0f;
+    m[0] = (0.5f * ((-1.0f * t3) + (2.0f * t2) + (-1.0f * t)));
+    m[1] = (0.5f * ((3.0f * t3) + (-5.0f * t2) + (0.0f * t) + 2.0f));
+    m[2] = (0.5f * ((-3.0f * t3) + (4.0f * t2) + (1.0f * t)));
+    m[3] = (0.5f * ((1.0f * t3) + (-1.0f * t2) + (0.0f * t)));
+
+    for (int i = 0; i < 4; i++)
+    {
+        ret->x += p[i].x * m[i];
+        ret->y += p[i].y * m[i];
+        ret->z += p[i].z * m[i];
+    }
 }
 
 BOOL CDemoPlay::ProcessCam(SCamEffectorInfo& info)
 {
-	// skeep a few frames before counting
-	if (Device.dwPrecacheFrame)	return	TRUE;
-
-	if (stat_started)
-	{
-		//g_SASH.DisplayFrame(Device.fTimeGlobal);
-	}
-	else
-	{
-		//g_SASH.StartBenchmark();
-		stat_Start();
-	}
-
-	// Per-frame statistics
-	{
-		stat_table.push_back		(stat_Timer_frame.GetElapsed_sec());
-		stat_Timer_frame.Start		();
-	}
-
-	// Process motion
-	if (m_pMotion)
-	{
-		Fvector R;
-		Fmatrix mRotate;
-		m_pMotion->_Evaluate	(m_MParam->Frame(),info.p,R);
-		m_MParam->Update		(Device.fTimeDelta,1.f,true);
-		fLifeTime				-= Device.fTimeDelta;
-		if (m_MParam->bWrapped)	{ stat_Stop(); stat_Start(); }
-		mRotate.setXYZi			(R.x,R.y,R.z);
-		info.d.set				(mRotate.k);
-		info.n.set				(mRotate.j);
-	}
-	else
-	{
-		if (seq.empty()) {
-			g_pGameLevel->Cameras().RemoveCamEffector(cefDemo);
-			return		TRUE;
-		}
-
-		fStartTime		+=	Device.fTimeDelta;
-		
-		float	ip;
-		float	p		=	fStartTime/fSpeed;
-		float	t		=	modff(p, &ip);
-		int		frame	=	iFloor(ip);
-		VERIFY	(t>=0);
-		
-		if (frame>=m_count)
-		{
-			dwCyclesLeft			--	;
-			if (0==dwCyclesLeft)	return FALSE;
-			fStartTime				= 0	;
-			// just continue
-			// stat_Stop			();
-			// stat_Start			();
-		}
-		
-		int f1=frame; FIX(f1);
-		int f2=f1+1;  FIX(f2);
-		int f3=f2+1;  FIX(f3);
-		int f4=f3+1;  FIX(f4);
-		
-		Fmatrix *m1,*m2,*m3,*m4;
-		Fvector v[4];
-		m1 = (Fmatrix *) &seq[f1];
-		m2 = (Fmatrix *) &seq[f2];
-		m3 = (Fmatrix *) &seq[f3];
-		m4 = (Fmatrix *) &seq[f4];
-		
-		for (int i=0; i<4; i++) {
-			v[0].x = m1->m[i][0]; v[0].y = m1->m[i][1];  v[0].z = m1->m[i][2];
-			v[1].x = m2->m[i][0]; v[1].y = m2->m[i][1];  v[1].z = m2->m[i][2];
-			v[2].x = m3->m[i][0]; v[2].y = m3->m[i][1];  v[2].z = m3->m[i][2];
-			v[3].x = m4->m[i][0]; v[3].y = m4->m[i][1];  v[3].z = m4->m[i][2];
-			spline1	( t, &(v[0]), (Fvector *) &(Device.mView.m[i][0]) );
-		}
-		
-		Fmatrix mInvCamera;
-		mInvCamera.invert(Device.mView);
-		info.n.set( mInvCamera._21, mInvCamera._22, mInvCamera._23 );
-		info.d.set( mInvCamera._31, mInvCamera._32, mInvCamera._33 );
-		info.p.set( mInvCamera._41, mInvCamera._42, mInvCamera._43 );
-		
-		fLifeTime-=Device.fTimeDelta;
-	}
-	return TRUE;
+    // skeep a few frames before counting
+    if (Device.dwPrecacheFrame) return TRUE;
+
+    if (stat_started)
+    {
+        //g_SASH.DisplayFrame(Device.fTimeGlobal);
+    }
+    else
+    {
+        //g_SASH.StartBenchmark();
+        stat_Start();
+    }
+
+    // Per-frame statistics
+    {
+        stat_table.push_back(stat_Timer_frame.GetElapsed_sec());
+        stat_Timer_frame.Start();
+    }
+
+    // Process motion
+    if (m_pMotion)
+    {
+        Fvector R;
+        Fmatrix mRotate;
+        m_pMotion->_Evaluate(m_MParam->Frame(), info.p, R);
+        m_MParam->Update(Device.fTimeDelta, 1.f, true);
+        fLifeTime -= Device.fTimeDelta;
+        if (m_MParam->bWrapped) { stat_Stop(); stat_Start(); }
+        mRotate.setXYZi(R.x, R.y, R.z);
+        info.d.set(mRotate.k);
+        info.n.set(mRotate.j);
+    }
+    else
+    {
+        if (seq.empty())
+        {
+            g_pGameLevel->Cameras().RemoveCamEffector(cefDemo);
+            return TRUE;
+        }
+
+        fStartTime += Device.fTimeDelta;
+
+        float ip;
+        float p = fStartTime / fSpeed;
+        float t = modff(p, &ip);
+        int frame = iFloor(ip);
+        VERIFY(t >= 0);
+
+        if (frame >= m_count)
+        {
+            dwCyclesLeft--;
+            if (0 == dwCyclesLeft) return FALSE;
+            fStartTime = 0;
+            // just continue
+            // stat_Stop ();
+            // stat_Start ();
+        }
+
+        int f1 = frame;
+        FIX(f1);
+        int f2 = f1 + 1;
+        FIX(f2);
+        int f3 = f2 + 1;
+        FIX(f3);
+        int f4 = f3 + 1;
+        FIX(f4);
+
+        Fmatrix* m1, *m2, *m3, *m4;
+        Fvector v[4];
+        m1 = (Fmatrix*)&seq[f1];
+        m2 = (Fmatrix*)&seq[f2];
+        m3 = (Fmatrix*)&seq[f3];
+        m4 = (Fmatrix*)&seq[f4];
+
+        for (int i = 0; i < 4; i++)
+        {
+            v[0].x = m1->m[i][0];
+            v[0].y = m1->m[i][1];
+            v[0].z = m1->m[i][2];
+            v[1].x = m2->m[i][0];
+            v[1].y = m2->m[i][1];
+            v[1].z = m2->m[i][2];
+            v[2].x = m3->m[i][0];
+            v[2].y = m3->m[i][1];
+            v[2].z = m3->m[i][2];
+            v[3].x = m4->m[i][0];
+            v[3].y = m4->m[i][1];
+            v[3].z = m4->m[i][2];
+            spline1(t, &(v[0]), (Fvector*)&(Device.mView.m[i][0]));
+        }
+
+        Fmatrix mInvCamera;
+        mInvCamera.invert(Device.mView);
+        info.n.set(mInvCamera._21, mInvCamera._22, mInvCamera._23);
+        info.d.set(mInvCamera._31, mInvCamera._32, mInvCamera._33);
+        info.p.set(mInvCamera._41, mInvCamera._42, mInvCamera._43);
+
+        fLifeTime -= Device.fTimeDelta;
+    }
+    return TRUE;
 }
diff --git a/src/xrEngine/FDemoPlay.h b/src/xrEngine/FDemoPlay.h
index ba373fa8619..420c6f47492 100644
--- a/src/xrEngine/FDemoPlay.h
+++ b/src/xrEngine/FDemoPlay.h
@@ -7,35 +7,35 @@
 #include "effector.h"
 
 // refs
-class	COMotion;
-struct	SAnimParams;
+class COMotion;
+struct SAnimParams;
 
 // class
-class ENGINE_API CDemoPlay :	public CEffectorCam
+class ENGINE_API CDemoPlay : public CEffectorCam
 {
-    COMotion*			m_pMotion			;
-    SAnimParams*		m_MParam			;
-
-	xr_vector<Fmatrix>	seq					;
-	int					m_count				;
-	float				fStartTime			;
-	float				fSpeed				;
-	u32					dwCyclesLeft		;
-
-	// statistics
-	BOOL				stat_started		;
-	CTimer				stat_Timer_frame	;
-	CTimer				stat_Timer_total	;
-	u32					stat_StartFrame		;
-	xr_vector<float>	stat_table			;
-	
-	void				stat_Start	()		;
-	void				stat_Stop	()		;
+    COMotion* m_pMotion;
+    SAnimParams* m_MParam;
+
+    xr_vector<Fmatrix> seq;
+    int m_count;
+    float fStartTime;
+    float fSpeed;
+    u32 dwCyclesLeft;
+
+    // statistics
+    BOOL stat_started;
+    CTimer stat_Timer_frame;
+    CTimer stat_Timer_total;
+    u32 stat_StartFrame;
+    xr_vector<float> stat_table;
+
+    void stat_Start();
+    void stat_Stop();
 public:
-	virtual BOOL		ProcessCam		(SCamEffectorInfo& info);
+    virtual BOOL ProcessCam(SCamEffectorInfo& info);
 
-						CDemoPlay	(const char *name, float ms, u32 cycles, float life_time=60*60*1000);
-	virtual				~CDemoPlay	();
+    CDemoPlay(const char* name, float ms, u32 cycles, float life_time = 60 * 60 * 1000);
+    virtual ~CDemoPlay();
 };
 
 #endif // !defined(AFX_FDEMOPLAY_H__9B07E6E0_FC3C_11D3_B4E3_4854E82A090D__INCLUDED_)
diff --git a/src/xrEngine/FDemoRecord.cpp b/src/xrEngine/FDemoRecord.cpp
index c49f4d56d70..72fc6ca03c2 100644
--- a/src/xrEngine/FDemoRecord.cpp
+++ b/src/xrEngine/FDemoRecord.cpp
@@ -12,529 +12,573 @@
 #include "CameraManager.h"
 
 extern BOOL g_bDisableRedText;
-static Flags32	s_hud_flag	= {0};
-static Flags32	s_dev_flags	= {0};
+static Flags32 s_hud_flag = {0};
+static Flags32 s_dev_flags = {0};
 
 BOOL stored_weapon;
 BOOL stored_cross;
 BOOL stored_red_text;
 
-CDemoRecord * xrDemoRecord = 0;
-CDemoRecord::force_position CDemoRecord:: g_position = { false, { 0, 0, 0 } };
+CDemoRecord* xrDemoRecord = 0;
+CDemoRecord::force_position CDemoRecord::g_position = {false, {0, 0, 0}};
 
 Fbox curr_lm_fbox;
 void setup_lm_screenshot_matrices()
 {
-	psHUD_Flags.assign	(0);
-
-	// build camera matrix
-	Fbox bb								= curr_lm_fbox;
-	bb.getcenter						(Device.vCameraPosition);
-
-	Device.vCameraDirection.set			( 0.f,-1.f,0.f	);
-	Device.vCameraTop.set				( 0.f,0.f,1.f	);
-	Device.vCameraRight.set				( 1.f,0.f,0.f	);
-	Device.mView.build_camera_dir		(Device.vCameraPosition,Device.vCameraDirection,Device.vCameraTop);
-
-	bb.xform					(Device.mView);
-	// build project matrix
-	Device.mProject.build_projection_ortho(	bb.max.x-bb.min.x,
-											bb.max.y-bb.min.y,
-											bb.min.z,
-											bb.max.z);
+    psHUD_Flags.assign(0);
+
+    // build camera matrix
+    Fbox bb = curr_lm_fbox;
+    bb.getcenter(Device.vCameraPosition);
+
+    Device.vCameraDirection.set(0.f, -1.f, 0.f);
+    Device.vCameraTop.set(0.f, 0.f, 1.f);
+    Device.vCameraRight.set(1.f, 0.f, 0.f);
+    Device.mView.build_camera_dir(Device.vCameraPosition, Device.vCameraDirection, Device.vCameraTop);
+
+    bb.xform(Device.mView);
+    // build project matrix
+    Device.mProject.build_projection_ortho(bb.max.x - bb.min.x,
+        bb.max.y - bb.min.y,
+        bb.min.z,
+        bb.max.z);
 }
 
 Fbox get_level_screenshot_bound()
 {
-	Fbox res			=  g_pGameLevel->ObjectSpace.GetBoundingVolume();
-	if(g_pGameLevel->pLevel->section_exist("level_map"))
-	{
-		Fvector4 res2d = g_pGameLevel->pLevel->r_fvector4("level_map","bound_rect");
-		res.min.x = res2d.x;
-		res.min.z = res2d.y;
-
-		res.max.x = res2d.z;
-		res.max.z = res2d.w;
-	}
-
-	return res;
+    Fbox res = g_pGameLevel->ObjectSpace.GetBoundingVolume();
+    if (g_pGameLevel->pLevel->section_exist("level_map"))
+    {
+        Fvector4 res2d = g_pGameLevel->pLevel->r_fvector4("level_map", "bound_rect");
+        res.min.x = res2d.x;
+        res.min.z = res2d.y;
+
+        res.max.x = res2d.z;
+        res.max.z = res2d.w;
+    }
+
+    return res;
 }
 void _InitializeFont(CGameFont*& F, LPCSTR section, u32 flags);
-CDemoRecord::CDemoRecord(const char *name,float life_time) : CEffectorCam(cefDemo,life_time/*,FALSE*/)
+CDemoRecord::CDemoRecord(const char* name, float life_time) : CEffectorCam(cefDemo, life_time/*,FALSE*/)
 {
-	stored_red_text = g_bDisableRedText;
-	g_bDisableRedText = TRUE;
-	m_iLMScreenshotFragment = -1;
-/*
-	stored_weapon = psHUD_Flags.test(HUD_WEAPON);
-	stored_cross = psHUD_Flags.test(HUD_CROSSHAIR);
-	psHUD_Flags.set(HUD_WEAPON, FALSE);
-	psHUD_Flags.set(HUD_CROSSHAIR, FALSE);
-*/
-	m_b_redirect_input_to_level = false;
-	_unlink	(name);
-	file	= FS.w_open	(name);
-	if (file) 
-	{
-		g_position.set_position  = false;
-		IR_Capture		();	// capture input
-		m_Camera.invert	(Device.mView);
-
-		// parse yaw
-		Fvector& dir	= m_Camera.k;
-		Fvector DYaw;	DYaw.set(dir.x,0.f,dir.z); DYaw.normalize_safe();
-		if (DYaw.x<0)	m_HPB.x = acosf(DYaw.z);
-		else			m_HPB.x = 2*PI-acosf(DYaw.z);
-
-		// parse pitch
-		dir.normalize_safe	();
-		m_HPB.y			= asinf(dir.y);
-		m_HPB.z			= 0;
-
-		m_Position.set	(m_Camera.c);
-
-		m_vVelocity.set	(0,0,0);
-		m_vAngularVelocity.set(0,0,0);
-		iCount			= 0;
-		
-		m_vT.set(0,0,0);
-		m_vR.set(0,0,0);
-		m_bMakeCubeMap		= FALSE;
-		m_bMakeScreenshot	= FALSE;
-		m_bMakeLevelMap		= FALSE;
-
-		m_fSpeed0		= pSettings->r_float("demo_record","speed0");
-		m_fSpeed1		= pSettings->r_float("demo_record","speed1");
-		m_fSpeed2		= pSettings->r_float("demo_record","speed2");
-		m_fSpeed3		= pSettings->r_float("demo_record","speed3");
-		m_fAngSpeed0	= pSettings->r_float("demo_record","ang_speed0");
-		m_fAngSpeed1	= pSettings->r_float("demo_record","ang_speed1");
-		m_fAngSpeed2	= pSettings->r_float("demo_record","ang_speed2");
-		m_fAngSpeed3	= pSettings->r_float("demo_record","ang_speed3");
-	} else {
-		fLifeTime = -1;
-	}
+    stored_red_text = g_bDisableRedText;
+    g_bDisableRedText = TRUE;
+    m_iLMScreenshotFragment = -1;
+    /*
+     stored_weapon = psHUD_Flags.test(HUD_WEAPON);
+     stored_cross = psHUD_Flags.test(HUD_CROSSHAIR);
+     psHUD_Flags.set(HUD_WEAPON, FALSE);
+     psHUD_Flags.set(HUD_CROSSHAIR, FALSE);
+     */
+    m_b_redirect_input_to_level = false;
+    _unlink(name);
+    file = FS.w_open(name);
+    if (file)
+    {
+        g_position.set_position = false;
+        IR_Capture(); // capture input
+        m_Camera.invert(Device.mView);
+
+        // parse yaw
+        Fvector& dir = m_Camera.k;
+        Fvector DYaw;
+        DYaw.set(dir.x, 0.f, dir.z);
+        DYaw.normalize_safe();
+        if (DYaw.x < 0) m_HPB.x = acosf(DYaw.z);
+        else m_HPB.x = 2 * PI - acosf(DYaw.z);
+
+        // parse pitch
+        dir.normalize_safe();
+        m_HPB.y = asinf(dir.y);
+        m_HPB.z = 0;
+
+        m_Position.set(m_Camera.c);
+
+        m_vVelocity.set(0, 0, 0);
+        m_vAngularVelocity.set(0, 0, 0);
+        iCount = 0;
+
+        m_vT.set(0, 0, 0);
+        m_vR.set(0, 0, 0);
+        m_bMakeCubeMap = FALSE;
+        m_bMakeScreenshot = FALSE;
+        m_bMakeLevelMap = FALSE;
+
+        m_fSpeed0 = pSettings->r_float("demo_record", "speed0");
+        m_fSpeed1 = pSettings->r_float("demo_record", "speed1");
+        m_fSpeed2 = pSettings->r_float("demo_record", "speed2");
+        m_fSpeed3 = pSettings->r_float("demo_record", "speed3");
+        m_fAngSpeed0 = pSettings->r_float("demo_record", "ang_speed0");
+        m_fAngSpeed1 = pSettings->r_float("demo_record", "ang_speed1");
+        m_fAngSpeed2 = pSettings->r_float("demo_record", "ang_speed2");
+        m_fAngSpeed3 = pSettings->r_float("demo_record", "ang_speed3");
+    }
+    else
+    {
+        fLifeTime = -1;
+    }
 }
 
 CDemoRecord::~CDemoRecord()
 {
-	if (file) 
-	{
-		IR_Release	();	// release input
-		FS.w_close	(file);
-	}
-	g_bDisableRedText	= stored_red_text;
-
-	Device.seqRender.Remove		( this		);
+    if (file)
+    {
+        IR_Release(); // release input
+        FS.w_close(file);
+    }
+    g_bDisableRedText = stored_red_text;
+
+    Device.seqRender.Remove(this);
 }
 
-//								+X,				-X,				+Y,				-Y,			+Z,				-Z
-static Fvector cmNorm[6]	= {{0.f,1.f,0.f}, {0.f,1.f,0.f}, {0.f,0.f,-1.f},{0.f,0.f,1.f}, {0.f,1.f,0.f}, {0.f,1.f,0.f}};
-static Fvector cmDir[6]		= {{1.f,0.f,0.f}, {-1.f,0.f,0.f},{0.f,1.f,0.f}, {0.f,-1.f,0.f},{0.f,0.f,1.f}, {0.f,0.f,-1.f}};
+// +X, -X, +Y, -Y, +Z, -Z
+static Fvector cmNorm[6] = {{0.f, 1.f, 0.f}, {0.f, 1.f, 0.f}, {0.f, 0.f, -1.f}, {0.f, 0.f, 1.f}, {0.f, 1.f, 0.f}, {0.f, 1.f, 0.f}};
+static Fvector cmDir[6] = {{1.f, 0.f, 0.f}, {-1.f, 0.f, 0.f}, {0.f, 1.f, 0.f}, {0.f, -1.f, 0.f}, {0.f, 0.f, 1.f}, {0.f, 0.f, -1.f}};
 
 
 void CDemoRecord::MakeScreenshotFace()
 {
-	switch (m_Stage){
-	case 0:
-		s_hud_flag.assign	(psHUD_Flags);
-		psHUD_Flags.assign	(0);
-	break;
-	case 1:
-		Render->Screenshot	();
-		psHUD_Flags.assign	(s_hud_flag);
-		m_bMakeScreenshot= FALSE;
-	break;
-	}
-	m_Stage++;
+    switch (m_Stage)
+    {
+    case 0:
+        s_hud_flag.assign(psHUD_Flags);
+        psHUD_Flags.assign(0);
+        break;
+    case 1:
+        Render->Screenshot();
+        psHUD_Flags.assign(s_hud_flag);
+        m_bMakeScreenshot = FALSE;
+        break;
+    }
+    m_Stage++;
 }
 
 
-void GetLM_BBox(Fbox &bb, INT Step)
+void GetLM_BBox(Fbox& bb, INT Step)
 {
-	float half_x = bb.min.x + (bb.max.x - bb.min.x)/2;
-	float half_z = bb.min.z + (bb.max.z - bb.min.z)/2;
-	switch (Step)
-	{
-	case 0:
-		{
-			bb.max.x = half_x;
-			bb.min.z = half_z;
-		}break;
-	case 1:
-		{
-			bb.min.x = half_x;
-			bb.min.z = half_z;
-		}break;
-	case 2:
-		{
-			bb.max.x = half_x;
-			bb.max.z = half_z;
-		}break;
-	case 3:
-		{
-			bb.min.x = half_x;
-			bb.max.z = half_z;
-		}break;
-	default:
-		{			
-		}break;
-		
-	}
+    float half_x = bb.min.x + (bb.max.x - bb.min.x) / 2;
+    float half_z = bb.min.z + (bb.max.z - bb.min.z) / 2;
+    switch (Step)
+    {
+    case 0:
+    {
+        bb.max.x = half_x;
+        bb.min.z = half_z;
+    }
+        break;
+    case 1:
+    {
+        bb.min.x = half_x;
+        bb.min.z = half_z;
+    }
+        break;
+    case 2:
+    {
+        bb.max.x = half_x;
+        bb.max.z = half_z;
+    }
+        break;
+    case 3:
+    {
+        bb.min.x = half_x;
+        bb.max.z = half_z;
+    }
+        break;
+    default:
+    {
+    } break;
+
+    }
 };
 
 void CDemoRecord::MakeLevelMapProcess()
 {
-	switch (m_Stage)
-	{
-	case 0:
-		{
-			s_dev_flags			= psDeviceFlags;
-			s_hud_flag.assign	(psHUD_Flags);
-			psDeviceFlags.zero	();
-			psDeviceFlags.set	(rsClearBB|rsFullscreen|rsDrawStatic,TRUE);
-			if (!psDeviceFlags.equal(s_dev_flags,rsFullscreen))
-				Device.Reset();
-
-		}break;
-
-	case DEVICE_RESET_PRECACHE_FRAME_COUNT+30:
-		{
-			setup_lm_screenshot_matrices		();
-
-			string_path					tmp;
-			if(m_iLMScreenshotFragment==-1)
-				xr_sprintf				(tmp, sizeof(tmp),"map_%s", *g_pGameLevel->name());
-			else
-				xr_sprintf				(tmp, sizeof(tmp),"map_%s#%d", *g_pGameLevel->name(), m_iLMScreenshotFragment);
-
-			if(m_iLMScreenshotFragment!=-1)
-			{
-				++m_iLMScreenshotFragment;
-				
-				if(m_iLMScreenshotFragment!=4)
-				{
-					curr_lm_fbox		= get_level_screenshot_bound();
-					GetLM_BBox			(curr_lm_fbox, m_iLMScreenshotFragment);
-					m_Stage				-= 20;
-				}
-			}
-
-			Render->Screenshot			(IRender_interface::SM_FOR_LEVELMAP,tmp);
-
-			if(m_iLMScreenshotFragment==-1 || m_iLMScreenshotFragment==4)
-			{
-				psHUD_Flags.assign			(s_hud_flag);
-
-				BOOL bDevReset				= !psDeviceFlags.equal(s_dev_flags,rsFullscreen);
-				psDeviceFlags				= s_dev_flags;
-				if (bDevReset)				Device.Reset();
-				m_bMakeLevelMap				= FALSE;
-				m_iLMScreenshotFragment		= -1;
-			}
-		}break;
-	default:
-		{
-			setup_lm_screenshot_matrices		();
-		}break;
-	}
-	m_Stage++;
+    switch (m_Stage)
+    {
+    case 0:
+    {
+        s_dev_flags = psDeviceFlags;
+        s_hud_flag.assign(psHUD_Flags);
+        psDeviceFlags.zero();
+        psDeviceFlags.set(rsClearBB | rsFullscreen | rsDrawStatic, TRUE);
+        if (!psDeviceFlags.equal(s_dev_flags, rsFullscreen))
+            Device.Reset();
+
+    }
+        break;
+
+    case DEVICE_RESET_PRECACHE_FRAME_COUNT + 30:
+    {
+        setup_lm_screenshot_matrices();
+
+        string_path tmp;
+        if (m_iLMScreenshotFragment == -1)
+            xr_sprintf(tmp, sizeof(tmp), "map_%s", *g_pGameLevel->name());
+        else
+            xr_sprintf(tmp, sizeof(tmp), "map_%s#%d", *g_pGameLevel->name(), m_iLMScreenshotFragment);
+
+        if (m_iLMScreenshotFragment != -1)
+        {
+            ++m_iLMScreenshotFragment;
+
+            if (m_iLMScreenshotFragment != 4)
+            {
+                curr_lm_fbox = get_level_screenshot_bound();
+                GetLM_BBox(curr_lm_fbox, m_iLMScreenshotFragment);
+                m_Stage -= 20;
+            }
+        }
+
+        Render->Screenshot(IRender_interface::SM_FOR_LEVELMAP, tmp);
+
+        if (m_iLMScreenshotFragment == -1 || m_iLMScreenshotFragment == 4)
+        {
+            psHUD_Flags.assign(s_hud_flag);
+
+            BOOL bDevReset = !psDeviceFlags.equal(s_dev_flags, rsFullscreen);
+            psDeviceFlags = s_dev_flags;
+            if (bDevReset) Device.Reset();
+            m_bMakeLevelMap = FALSE;
+            m_iLMScreenshotFragment = -1;
+        }
+    }
+        break;
+    default:
+    {
+        setup_lm_screenshot_matrices();
+    }
+        break;
+    }
+    m_Stage++;
 }
 
-void CDemoRecord::MakeCubeMapFace(Fvector &D, Fvector &N)
+void CDemoRecord::MakeCubeMapFace(Fvector& D, Fvector& N)
 {
-	string32 buf;
-	switch (m_Stage){
-	case 0:
-		N.set		(cmNorm[m_Stage]);
-		D.set		(cmDir[m_Stage]);
-		s_hud_flag.assign(psHUD_Flags);
-		psHUD_Flags.assign	(0);
-	break;
-	case 1:
-	case 2:
-	case 3:
-	case 4:
-	case 5:
-		N.set		(cmNorm[m_Stage]);
-		D.set		(cmDir[m_Stage]);
-		Render->Screenshot	(IRender_interface::SM_FOR_CUBEMAP,itoa(m_Stage,buf,10));
-	break;
-	case 6:
-		Render->Screenshot	(IRender_interface::SM_FOR_CUBEMAP,itoa(m_Stage,buf,10));
-		N.set		(m_Camera.j);
-		D.set		(m_Camera.k);
-		psHUD_Flags.assign(s_hud_flag);
-		m_bMakeCubeMap = FALSE;
-	break;
-	}
-	m_Stage++;
+    string32 buf;
+    switch (m_Stage)
+    {
+    case 0:
+        N.set(cmNorm[m_Stage]);
+        D.set(cmDir[m_Stage]);
+        s_hud_flag.assign(psHUD_Flags);
+        psHUD_Flags.assign(0);
+        break;
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+        N.set(cmNorm[m_Stage]);
+        D.set(cmDir[m_Stage]);
+        Render->Screenshot(IRender_interface::SM_FOR_CUBEMAP, itoa(m_Stage, buf, 10));
+        break;
+    case 6:
+        Render->Screenshot(IRender_interface::SM_FOR_CUBEMAP, itoa(m_Stage, buf, 10));
+        N.set(m_Camera.j);
+        D.set(m_Camera.k);
+        psHUD_Flags.assign(s_hud_flag);
+        m_bMakeCubeMap = FALSE;
+        break;
+    }
+    m_Stage++;
 }
 
 BOOL CDemoRecord::ProcessCam(SCamEffectorInfo& info)
 {
-	info.dont_apply					= false;
-	if (0==file)					return TRUE;
-
-	if (m_bMakeScreenshot)
-	{
-		MakeScreenshotFace();
-		// update camera
-		info.n.set(m_Camera.j);
-		info.d.set(m_Camera.k);
-		info.p.set(m_Camera.c);
-	}else if (m_bMakeLevelMap)
-	{
-		MakeLevelMapProcess();
-		info.dont_apply = true;
-	}else if (m_bMakeCubeMap)
-	{
-		MakeCubeMapFace	(info.d, info.n);
-		info.p.set		(m_Camera.c);
-		info.fAspect	= 1.f;
-	}else
-	{
-		if(IR_GetKeyState(DIK_F1))
-		{
-
-			pApp->pFontSystem->SetColor	(color_rgba(255,0,0,255));
-			pApp->pFontSystem->SetAligment(CGameFont::alCenter);
-			pApp->pFontSystem->OutSetI	(0,-.05f);
-			pApp->pFontSystem->OutNext	("%s","RECORDING");
-			pApp->pFontSystem->OutNext	("Key frames count: %d",iCount);
-			pApp->pFontSystem->SetAligment(CGameFont::alLeft);
-			pApp->pFontSystem->OutSetI	(-0.2f,+.05f);
-			pApp->pFontSystem->OutNext	("SPACE");
-			pApp->pFontSystem->OutNext	("BACK");
-			pApp->pFontSystem->OutNext	("ESC");
-			pApp->pFontSystem->OutNext	("F11");
-			pApp->pFontSystem->OutNext	("LCONTROL+F11");
-			pApp->pFontSystem->OutNext	("F12");
-			pApp->pFontSystem->SetAligment(CGameFont::alLeft);
-			pApp->pFontSystem->OutSetI	(0,+.05f);
-			pApp->pFontSystem->OutNext	("= Append Key");
-			pApp->pFontSystem->OutNext	("= Cube Map");
-			pApp->pFontSystem->OutNext	("= Quit");
-			pApp->pFontSystem->OutNext	("= Level Map ScreenShot");
-			pApp->pFontSystem->OutNext	("= Level Map ScreenShot(High Quality)");
-			pApp->pFontSystem->OutNext	("= ScreenShot");
-
-		}
-
-		m_vVelocity.lerp		(m_vVelocity,m_vT,0.3f);
-		m_vAngularVelocity.lerp	(m_vAngularVelocity,m_vR,0.3f);
-
-		float speed = m_fSpeed1, ang_speed = m_fAngSpeed1;
-
-		if (IR_GetKeyState(DIK_LSHIFT))		
-		{ 
-			speed=m_fSpeed0; 
-			ang_speed=m_fAngSpeed0;
-		}else 
-		if (IR_GetKeyState(DIK_LALT))		
-		{ 
-			speed=m_fSpeed2; 
-			ang_speed=m_fAngSpeed2;
-		}else 
-		if (IR_GetKeyState(DIK_LCONTROL)) 
-		{ 
-			speed=m_fSpeed3; 
-			ang_speed=m_fAngSpeed3;
-		}
-		
-		m_vT.mul				(m_vVelocity, Device.fTimeDelta * speed);
-		m_vR.mul				(m_vAngularVelocity, Device.fTimeDelta * ang_speed);
-
-		m_HPB.x -= m_vR.y;
-		m_HPB.y -= m_vR.x;
-		m_HPB.z += m_vR.z;
-		if(g_position.set_position)
-		{
-			m_Position.set(g_position.p);
-			g_position.set_position = false;
-		} else
-			g_position.p.set( m_Position );
-		// move
-		Fvector vmove;
-
-		vmove.set				(m_Camera.k);
-		vmove.normalize_safe	();
-		vmove.mul				(m_vT.z);
-		m_Position.add			(vmove);
-
-		vmove.set				(m_Camera.i);
-		vmove.normalize_safe	();
-		vmove.mul				(m_vT.x);
-		m_Position.add			(vmove);
-
-		vmove.set				(m_Camera.j);
-		vmove.normalize_safe	();
-		vmove.mul				(m_vT.y);
-		m_Position.add			(vmove);
-
-		m_Camera.setHPB			(m_HPB.x,m_HPB.y,m_HPB.z);
-		m_Camera.translate_over	(m_Position);
-
-		// update camera
-		info.n.set(m_Camera.j);
-		info.d.set(m_Camera.k);
-		info.p.set(m_Camera.c);
-
-		fLifeTime-=Device.fTimeDelta;
-
-		m_vT.set(0,0,0);
-		m_vR.set(0,0,0);
-	}
-	return TRUE;
+    info.dont_apply = false;
+    if (0 == file) return TRUE;
+
+    if (m_bMakeScreenshot)
+    {
+        MakeScreenshotFace();
+        // update camera
+        info.n.set(m_Camera.j);
+        info.d.set(m_Camera.k);
+        info.p.set(m_Camera.c);
+    }
+    else if (m_bMakeLevelMap)
+    {
+        MakeLevelMapProcess();
+        info.dont_apply = true;
+    }
+    else if (m_bMakeCubeMap)
+    {
+        MakeCubeMapFace(info.d, info.n);
+        info.p.set(m_Camera.c);
+        info.fAspect = 1.f;
+    }
+    else
+    {
+        if (IR_GetKeyState(DIK_F1))
+        {
+
+            pApp->pFontSystem->SetColor(color_rgba(255, 0, 0, 255));
+            pApp->pFontSystem->SetAligment(CGameFont::alCenter);
+            pApp->pFontSystem->OutSetI(0, -.05f);
+            pApp->pFontSystem->OutNext("%s", "RECORDING");
+            pApp->pFontSystem->OutNext("Key frames count: %d", iCount);
+            pApp->pFontSystem->SetAligment(CGameFont::alLeft);
+            pApp->pFontSystem->OutSetI(-0.2f, +.05f);
+            pApp->pFontSystem->OutNext("SPACE");
+            pApp->pFontSystem->OutNext("BACK");
+            pApp->pFontSystem->OutNext("ESC");
+            pApp->pFontSystem->OutNext("F11");
+            pApp->pFontSystem->OutNext("LCONTROL+F11");
+            pApp->pFontSystem->OutNext("F12");
+            pApp->pFontSystem->SetAligment(CGameFont::alLeft);
+            pApp->pFontSystem->OutSetI(0, +.05f);
+            pApp->pFontSystem->OutNext("= Append Key");
+            pApp->pFontSystem->OutNext("= Cube Map");
+            pApp->pFontSystem->OutNext("= Quit");
+            pApp->pFontSystem->OutNext("= Level Map ScreenShot");
+            pApp->pFontSystem->OutNext("= Level Map ScreenShot(High Quality)");
+            pApp->pFontSystem->OutNext("= ScreenShot");
+
+        }
+
+        m_vVelocity.lerp(m_vVelocity, m_vT, 0.3f);
+        m_vAngularVelocity.lerp(m_vAngularVelocity, m_vR, 0.3f);
+
+        float speed = m_fSpeed1, ang_speed = m_fAngSpeed1;
+
+        if (IR_GetKeyState(DIK_LSHIFT))
+        {
+            speed = m_fSpeed0;
+            ang_speed = m_fAngSpeed0;
+        }
+        else if (IR_GetKeyState(DIK_LALT))
+        {
+            speed = m_fSpeed2;
+            ang_speed = m_fAngSpeed2;
+        }
+        else if (IR_GetKeyState(DIK_LCONTROL))
+        {
+            speed = m_fSpeed3;
+            ang_speed = m_fAngSpeed3;
+        }
+
+        m_vT.mul(m_vVelocity, Device.fTimeDelta * speed);
+        m_vR.mul(m_vAngularVelocity, Device.fTimeDelta * ang_speed);
+
+        m_HPB.x -= m_vR.y;
+        m_HPB.y -= m_vR.x;
+        m_HPB.z += m_vR.z;
+        if (g_position.set_position)
+        {
+            m_Position.set(g_position.p);
+            g_position.set_position = false;
+        }
+        else
+            g_position.p.set(m_Position);
+        // move
+        Fvector vmove;
+
+        vmove.set(m_Camera.k);
+        vmove.normalize_safe();
+        vmove.mul(m_vT.z);
+        m_Position.add(vmove);
+
+        vmove.set(m_Camera.i);
+        vmove.normalize_safe();
+        vmove.mul(m_vT.x);
+        m_Position.add(vmove);
+
+        vmove.set(m_Camera.j);
+        vmove.normalize_safe();
+        vmove.mul(m_vT.y);
+        m_Position.add(vmove);
+
+        m_Camera.setHPB(m_HPB.x, m_HPB.y, m_HPB.z);
+        m_Camera.translate_over(m_Position);
+
+        // update camera
+        info.n.set(m_Camera.j);
+        info.d.set(m_Camera.k);
+        info.p.set(m_Camera.c);
+
+        fLifeTime -= Device.fTimeDelta;
+
+        m_vT.set(0, 0, 0);
+        m_vR.set(0, 0, 0);
+    }
+    return TRUE;
 }
 
-void CDemoRecord::IR_OnKeyboardPress	(int dik)
+void CDemoRecord::IR_OnKeyboardPress(int dik)
 {
-	if (dik == DIK_MULTIPLY)	m_b_redirect_input_to_level	= !m_b_redirect_input_to_level;
-
-	if(m_b_redirect_input_to_level)
-	{
-		g_pGameLevel->IR_OnKeyboardPress(dik);
-		return;
-	}
-	if (dik == DIK_GRAVE)
-							Console->Show			();
-	if (dik == DIK_SPACE)	RecordKey				();
-	if (dik == DIK_BACK)	MakeCubemap				();
-	if (dik == DIK_F11)		MakeLevelMapScreenshot	(IR_GetKeyState(DIK_LCONTROL));
-	if (dik == DIK_F12)		MakeScreenshot			();
-	if (dik == DIK_ESCAPE)	fLifeTime				= -1;
+    if (dik == DIK_MULTIPLY) m_b_redirect_input_to_level = !m_b_redirect_input_to_level;
+
+    if (m_b_redirect_input_to_level)
+    {
+        g_pGameLevel->IR_OnKeyboardPress(dik);
+        return;
+    }
+    if (dik == DIK_GRAVE)
+        Console->Show();
+    if (dik == DIK_SPACE) RecordKey();
+    if (dik == DIK_BACK) MakeCubemap();
+    if (dik == DIK_F11) MakeLevelMapScreenshot(IR_GetKeyState(DIK_LCONTROL));
+    if (dik == DIK_F12) MakeScreenshot();
+    if (dik == DIK_ESCAPE) fLifeTime = -1;
 
 #ifndef MASTER_GOLD
-	if (dik == DIK_RETURN)
-	{	
-		if (g_pGameLevel->CurrentEntity())
-		{
-			g_pGameLevel->CurrentEntity()->ForceTransform(m_Camera);
-			fLifeTime		= -1; 
-		}
-	}
+    if (dik == DIK_RETURN)
+    {
+        if (g_pGameLevel->CurrentEntity())
+        {
+            g_pGameLevel->CurrentEntity()->ForceTransform(m_Camera);
+            fLifeTime = -1;
+        }
+    }
 #endif // #ifndef MASTER_GOLD
 
-	if	(dik == DIK_PAUSE)		
-		Device.Pause(!Device.Paused(), TRUE, TRUE, "demo_record");
+    if (dik == DIK_PAUSE)
+        Device.Pause(!Device.Paused(), TRUE, TRUE, "demo_record");
 }
 
-static void update_whith_timescale( Fvector &v, const Fvector &v_delta )
+static void update_whith_timescale(Fvector& v, const Fvector& v_delta)
 {
-	VERIFY(!fis_zero(Device.time_factor()));
-	float scale = 1.f/Device.time_factor();
-	v.mad( v, v_delta, scale );
+    VERIFY(!fis_zero(Device.time_factor()));
+    float scale = 1.f / Device.time_factor();
+    v.mad(v, v_delta, scale);
 }
 
 
 
-void CDemoRecord::IR_OnKeyboardHold	(int dik)
+void CDemoRecord::IR_OnKeyboardHold(int dik)
 {
-	if(m_b_redirect_input_to_level)
-	{
-		g_pGameLevel->IR_OnKeyboardHold(dik);
-		return;
-	}
-	Fvector		vT_delta = Fvector().set(0,0,0);
-	Fvector		vR_delta = Fvector().set(0,0,0);
-
-	switch(dik){
-	case DIK_A:
-	case DIK_NUMPAD1:
-	case DIK_LEFT:		vT_delta.x -= 1.0f; break; // Slide Left
-	case DIK_D:
-	case DIK_NUMPAD3:
-	case DIK_RIGHT:		vT_delta.x += 1.0f; break; // Slide Right
-	case DIK_S:			vT_delta.y -= 1.0f; break; // Slide Down
-	case DIK_W:			vT_delta.y += 1.0f; break; // Slide Up
-	// rotate	
-	case DIK_NUMPAD2:	vR_delta.x -= 1.0f; break; // Pitch Down
-	case DIK_NUMPAD8:	vR_delta.x += 1.0f; break; // Pitch Up
-	case DIK_E:	
-	case DIK_NUMPAD6:	vR_delta.y += 1.0f; break; // Turn Left
-	case DIK_Q:	
-	case DIK_NUMPAD4:	vR_delta.y -= 1.0f; break; // Turn Right
-	case DIK_NUMPAD9:	vR_delta.z -= 2.0f; break; // Turn Right
-	case DIK_NUMPAD7:	vR_delta.z += 2.0f; break; // Turn Right
-	}
-
-	update_whith_timescale( m_vT, vT_delta );
-	update_whith_timescale( m_vR, vR_delta );
+    if (m_b_redirect_input_to_level)
+    {
+        g_pGameLevel->IR_OnKeyboardHold(dik);
+        return;
+    }
+    Fvector vT_delta = Fvector().set(0, 0, 0);
+    Fvector vR_delta = Fvector().set(0, 0, 0);
+
+    switch (dik)
+    {
+    case DIK_A:
+    case DIK_NUMPAD1:
+    case DIK_LEFT:
+        vT_delta.x -= 1.0f;
+        break; // Slide Left
+    case DIK_D:
+    case DIK_NUMPAD3:
+    case DIK_RIGHT:
+        vT_delta.x += 1.0f;
+        break; // Slide Right
+    case DIK_S:
+        vT_delta.y -= 1.0f;
+        break; // Slide Down
+    case DIK_W:
+        vT_delta.y += 1.0f;
+        break; // Slide Up
+        // rotate
+    case DIK_NUMPAD2:
+        vR_delta.x -= 1.0f;
+        break; // Pitch Down
+    case DIK_NUMPAD8:
+        vR_delta.x += 1.0f;
+        break; // Pitch Up
+    case DIK_E:
+    case DIK_NUMPAD6:
+        vR_delta.y += 1.0f;
+        break; // Turn Left
+    case DIK_Q:
+    case DIK_NUMPAD4:
+        vR_delta.y -= 1.0f;
+        break; // Turn Right
+    case DIK_NUMPAD9:
+        vR_delta.z -= 2.0f;
+        break; // Turn Right
+    case DIK_NUMPAD7:
+        vR_delta.z += 2.0f;
+        break; // Turn Right
+    }
+
+    update_whith_timescale(m_vT, vT_delta);
+    update_whith_timescale(m_vR, vR_delta);
 
 }
 
-void CDemoRecord::IR_OnMouseMove		(int dx, int dy)
+void CDemoRecord::IR_OnMouseMove(int dx, int dy)
 {
-	if(m_b_redirect_input_to_level)
-	{
-		g_pGameLevel->IR_OnMouseMove(dx, dy);
-		return;
-	}
-
-	Fvector		vR_delta = Fvector().set(0,0,0);
-
-	float scale			= .5f;//psMouseSens;
-	if (dx||dy){
-		vR_delta.y			+= float(dx)*scale; // heading
-		vR_delta.x			+= ((psMouseInvert.test(1))?-1:1)*float(dy)*scale*(3.f/4.f); // pitch
-	}
-	update_whith_timescale( m_vR, vR_delta );
+    if (m_b_redirect_input_to_level)
+    {
+        g_pGameLevel->IR_OnMouseMove(dx, dy);
+        return;
+    }
+
+    Fvector vR_delta = Fvector().set(0, 0, 0);
+
+    float scale = .5f;//psMouseSens;
+    if (dx || dy)
+    {
+        vR_delta.y += float(dx)*scale; // heading
+        vR_delta.x += ((psMouseInvert.test(1)) ? -1 : 1)*float(dy)*scale*(3.f / 4.f); // pitch
+    }
+    update_whith_timescale(m_vR, vR_delta);
 }
 
-void CDemoRecord::IR_OnMouseHold		(int btn)
+void CDemoRecord::IR_OnMouseHold(int btn)
 {
-	if(m_b_redirect_input_to_level)
-	{
-		g_pGameLevel->IR_OnMouseHold(btn);
-		return;
-	}
-	Fvector		vT_delta = Fvector().set(0,0,0);
-	switch (btn){
-	case 0:			vT_delta.z += 1.0f; break; // Move Backward
-	case 1:			vT_delta.z -= 1.0f; break; // Move Forward
-	}
-	update_whith_timescale( m_vT, vT_delta );
+    if (m_b_redirect_input_to_level)
+    {
+        g_pGameLevel->IR_OnMouseHold(btn);
+        return;
+    }
+    Fvector vT_delta = Fvector().set(0, 0, 0);
+    switch (btn)
+    {
+    case 0:
+        vT_delta.z += 1.0f;
+        break; // Move Backward
+    case 1:
+        vT_delta.z -= 1.0f;
+        break; // Move Forward
+    }
+    update_whith_timescale(m_vT, vT_delta);
 }
 
-void CDemoRecord::RecordKey			()
+void CDemoRecord::RecordKey()
 {
-	Fmatrix			g_matView;
- 
-	g_matView.invert(m_Camera);
-	file->w			(&g_matView,sizeof(Fmatrix));
-	iCount++;
+    Fmatrix g_matView;
+
+    g_matView.invert(m_Camera);
+    file->w(&g_matView, sizeof(Fmatrix));
+    iCount++;
 }
 
-void CDemoRecord::MakeCubemap		()
+void CDemoRecord::MakeCubemap()
 {
-	m_bMakeCubeMap	= TRUE;
-	m_Stage			= 0;
+    m_bMakeCubeMap = TRUE;
+    m_Stage = 0;
 }
 
-void CDemoRecord::MakeScreenshot	()
+void CDemoRecord::MakeScreenshot()
 {
-	m_bMakeScreenshot = TRUE;
-	m_Stage = 0;
+    m_bMakeScreenshot = TRUE;
+    m_Stage = 0;
 }
 
 void CDemoRecord::MakeLevelMapScreenshot(BOOL bHQ)
 {
-	Console->Execute("run_string level.set_weather(\"map\",true)");
-
-	if(!bHQ)
-		m_iLMScreenshotFragment = -1;
-	else
-		m_iLMScreenshotFragment	= 0;
-	
-	curr_lm_fbox		= get_level_screenshot_bound();
-	GetLM_BBox			(curr_lm_fbox, m_iLMScreenshotFragment);
-
-	m_bMakeLevelMap		= TRUE;
-	m_Stage				= 0;
+    Console->Execute("run_string level.set_weather(\"map\",true)");
+
+    if (!bHQ)
+        m_iLMScreenshotFragment = -1;
+    else
+        m_iLMScreenshotFragment = 0;
+
+    curr_lm_fbox = get_level_screenshot_bound();
+    GetLM_BBox(curr_lm_fbox, m_iLMScreenshotFragment);
+
+    m_bMakeLevelMap = TRUE;
+    m_Stage = 0;
 }
 
 void CDemoRecord::OnRender()
 {
-	pApp->pFontSystem->OnRender();
+    pApp->pFontSystem->OnRender();
 }
diff --git a/src/xrEngine/FDemoRecord.h b/src/xrEngine/FDemoRecord.h
index 41ed6f5af6a..f88652d4003 100644
--- a/src/xrEngine/FDemoRecord.h
+++ b/src/xrEngine/FDemoRecord.h
@@ -7,63 +7,63 @@
 #include "effector.h"
 
 class ENGINE_API CDemoRecord :
-	public CEffectorCam,
-	public IInputReceiver,
-	public pureRender
+    public CEffectorCam,
+    public IInputReceiver,
+    public pureRender
 {
 private:
-	static struct force_position 
-	{
-			bool	set_position;
-			Fvector p;
-	} g_position;
-	int			iCount;
-	IWriter*	file;
-	Fvector		m_HPB;
-	Fvector		m_Position;
-	Fmatrix		m_Camera;
-	u32			m_Stage;
+    static struct force_position
+    {
+        bool set_position;
+        Fvector p;
+    } g_position;
+    int iCount;
+    IWriter* file;
+    Fvector m_HPB;
+    Fvector m_Position;
+    Fmatrix m_Camera;
+    u32 m_Stage;
 
-	Fvector		m_vT;
-    Fvector		m_vR;
-	Fvector		m_vVelocity;
-	Fvector		m_vAngularVelocity;
+    Fvector m_vT;
+    Fvector m_vR;
+    Fvector m_vVelocity;
+    Fvector m_vAngularVelocity;
 
-	BOOL		m_bMakeCubeMap;
-	BOOL		m_bMakeScreenshot;
-	int			m_iLMScreenshotFragment;
-	BOOL		m_bMakeLevelMap;
+    BOOL m_bMakeCubeMap;
+    BOOL m_bMakeScreenshot;
+    int m_iLMScreenshotFragment;
+    BOOL m_bMakeLevelMap;
 
-	float		m_fSpeed0;
-	float		m_fSpeed1;
-	float		m_fSpeed2;
-	float		m_fSpeed3;
-	float		m_fAngSpeed0;
-	float		m_fAngSpeed1;
-	float		m_fAngSpeed2;
-	float		m_fAngSpeed3;
+    float m_fSpeed0;
+    float m_fSpeed1;
+    float m_fSpeed2;
+    float m_fSpeed3;
+    float m_fAngSpeed0;
+    float m_fAngSpeed1;
+    float m_fAngSpeed2;
+    float m_fAngSpeed3;
 
-	void		MakeCubeMapFace			(Fvector &D, Fvector &N);
-	void		MakeLevelMapProcess		();
-	void		MakeScreenshotFace		();
-	void		RecordKey				();
-	void		MakeCubemap				();
-	void		MakeScreenshot			();
-	void		MakeLevelMapScreenshot	(BOOL bHQ);
+    void MakeCubeMapFace(Fvector& D, Fvector& N);
+    void MakeLevelMapProcess();
+    void MakeScreenshotFace();
+    void RecordKey();
+    void MakeCubemap();
+    void MakeScreenshot();
+    void MakeLevelMapScreenshot(BOOL bHQ);
 public:
-				CDemoRecord				(const char *name, float life_time=60*60*1000);
-	virtual		~CDemoRecord();
+    CDemoRecord(const char* name, float life_time = 60 * 60 * 1000);
+    virtual ~CDemoRecord();
 
-	virtual void IR_OnKeyboardPress		(int dik);
-	virtual void IR_OnKeyboardHold		(int dik);
-	virtual void IR_OnMouseMove			(int dx, int dy);
-	virtual void IR_OnMouseHold			(int btn);
-	
-	virtual BOOL ProcessCam				(SCamEffectorInfo& info);
-	static	void SetGlobalPosition		( const Fvector &p ) { g_position.p.set(p), g_position.set_position= true; }
-	static	void GetGlobalPosition		( Fvector &p ) { p.set( g_position.p ); }
-	BOOL		 m_b_redirect_input_to_level;
-	virtual void OnRender				();
+    virtual void IR_OnKeyboardPress(int dik);
+    virtual void IR_OnKeyboardHold(int dik);
+    virtual void IR_OnMouseMove(int dx, int dy);
+    virtual void IR_OnMouseHold(int btn);
+
+    virtual BOOL ProcessCam(SCamEffectorInfo& info);
+    static void SetGlobalPosition(const Fvector& p) { g_position.p.set(p), g_position.set_position = true; }
+    static void GetGlobalPosition(Fvector& p) { p.set(g_position.p); }
+    BOOL m_b_redirect_input_to_level;
+    virtual void OnRender();
 };
 
 #endif // !defined(AFX_FDEMORECORD_H__D7638760_FB61_11D3_B4E3_4854E82A090D__INCLUDED_)
diff --git a/src/xrEngine/Feel_Sound.h b/src/xrEngine/Feel_Sound.h
index c638ad103a9..7afaf765b3e 100644
--- a/src/xrEngine/Feel_Sound.h
+++ b/src/xrEngine/Feel_Sound.h
@@ -4,9 +4,9 @@ class ENGINE_API CObject;
 
 namespace Feel
 {
-	class	ENGINE_API Sound
-	{
-	public:
-		virtual		void			feel_sound_new		(CObject* who, int type, CSound_UserDataPtr user_data, const Fvector& Position, float power) {};
-	};
+class ENGINE_API Sound
+{
+public:
+    virtual void feel_sound_new(CObject* who, int type, CSound_UserDataPtr user_data, const Fvector& Position, float power) {};
+};
 };
diff --git a/src/xrEngine/Feel_Touch.cpp b/src/xrEngine/Feel_Touch.cpp
index 5f2aecec71f..9151d4c4435 100644
--- a/src/xrEngine/Feel_Touch.cpp
+++ b/src/xrEngine/Feel_Touch.cpp
@@ -4,7 +4,7 @@
 #include "xr_object.h"
 using namespace Feel;
 
-Touch::Touch():pure_relcase(&Touch::feel_touch_relcase)
+Touch::Touch() :pure_relcase(&Touch::feel_touch_relcase)
 {
 }
 
@@ -12,82 +12,88 @@ Touch::~Touch()
 {
 }
 
-bool Touch::feel_touch_contact	(CObject* O)
-{ 
-	return true; 
+bool Touch::feel_touch_contact(CObject* O)
+{
+    return true;
 }
 
-void Touch::feel_touch_deny		(CObject* O, DWORD T)
+void Touch::feel_touch_deny(CObject* O, DWORD T)
 {
-	DenyTouch						D;
-	D.O								= O;
-	D.Expire						= Device.dwTimeGlobal + T;
-	feel_touch_disable.push_back	(D);
+    DenyTouch D;
+    D.O = O;
+    D.Expire = Device.dwTimeGlobal + T;
+    feel_touch_disable.push_back(D);
 }
 
-void Touch::feel_touch_update	(Fvector& C, float R)
+void Touch::feel_touch_update(Fvector& C, float R)
 {
-	// Check if denied objects expire in time
-	DWORD	dwT			= Device.dwTimeGlobal;
-	for (u32 dit=0; dit<feel_touch_disable.size(); dit++){
-		if (feel_touch_disable[dit].Expire<dwT){
-			feel_touch_disable.erase	(feel_touch_disable.begin()+dit);
-			dit--;
-		}
-	}
+    // Check if denied objects expire in time
+    DWORD dwT = Device.dwTimeGlobal;
+    for (u32 dit = 0; dit < feel_touch_disable.size(); dit++)
+    {
+        if (feel_touch_disable[dit].Expire < dwT)
+        {
+            feel_touch_disable.erase(feel_touch_disable.begin() + dit);
+            dit--;
+        }
+    }
 
-	// Find nearest objects
-	q_nearest.clear_not_free				();
-	q_nearest.reserve						(feel_touch.size());
-	g_pGameLevel->ObjectSpace.GetNearest	(q_nearest,C,R, NULL);
-	xr_vector<CObject*>::iterator	n_begin	= q_nearest.begin	();
-	xr_vector<CObject*>::iterator	n_end	= q_nearest.end		();
-	if (n_end!=n_begin)						{
-		// Process results (NEW)
-		for (xr_vector<CObject*>::iterator it = n_begin; it!=n_end; it++){
-			CObject* O = *it;
-			if (O->getDestroy())		continue;							// Don't touch candidates for destroy
-			if (!feel_touch_contact(O))	continue;							// Actual contact
+    // Find nearest objects
+    q_nearest.clear_not_free();
+    q_nearest.reserve(feel_touch.size());
+    g_pGameLevel->ObjectSpace.GetNearest(q_nearest, C, R, NULL);
+    xr_vector<CObject*>::iterator n_begin = q_nearest.begin();
+    xr_vector<CObject*>::iterator n_end = q_nearest.end();
+    if (n_end != n_begin)
+    {
+        // Process results (NEW)
+        for (xr_vector<CObject*>::iterator it = n_begin; it != n_end; it++)
+        {
+            CObject* O = *it;
+            if (O->getDestroy()) continue; // Don't touch candidates for destroy
+            if (!feel_touch_contact(O)) continue; // Actual contact
 
-			if (std::find(feel_touch.begin(),feel_touch.end(),O) == feel_touch.end()){
-				// check for deny
-				BOOL bDeny = FALSE;
-				for (dit=0; dit<feel_touch_disable.size(); dit++)
-					if (O == feel_touch_disable[dit].O)	{ bDeny=TRUE; break; }
+            if (std::find(feel_touch.begin(), feel_touch.end(), O) == feel_touch.end())
+            {
+                // check for deny
+                BOOL bDeny = FALSE;
+                for (dit = 0; dit < feel_touch_disable.size(); dit++)
+                    if (O == feel_touch_disable[dit].O) { bDeny = TRUE; break; }
 
-				// _new _
-				if (!bDeny)
-				{
-					feel_touch.push_back	(O);
-					feel_touch_new			(O);
-				}
-			}
-		}
-	}
+                // _new _
+                if (!bDeny)
+                {
+                    feel_touch.push_back(O);
+                    feel_touch_new(O);
+                }
+            }
+        }
+    }
 
-	// Process results (DELETE)
-	for (int d = 0; d<int(feel_touch.size()); d++)
-	{
-		CObject* O	= feel_touch[d];
-		if (O->getDestroy() || !feel_touch_contact(O) || (std::find(n_begin,n_end,O) == n_end))	// Don't touch candidates for destroy
-		{
-			// _delete_
-			feel_touch.erase		(feel_touch.begin()+d);
-			feel_touch_delete		(O);
-			d--;
-		}
-	}
+    // Process results (DELETE)
+    for (int d = 0; d<int(feel_touch.size()); d++)
+    {
+        CObject* O = feel_touch[d];
+        if (O->getDestroy() || !feel_touch_contact(O) || (std::find(n_begin, n_end, O) == n_end)) // Don't touch candidates for destroy
+        {
+            // _delete_
+            feel_touch.erase(feel_touch.begin() + d);
+            feel_touch_delete(O);
+            d--;
+        }
+    }
 
-	//. Engine.Sheduler.Slice	();	
+    //. Engine.Sheduler.Slice ();
 }
 
-void Touch::feel_touch_relcase	(CObject* O)
+void Touch::feel_touch_relcase(CObject* O)
 {
-	xr_vector<CObject*>::iterator I = std::find (feel_touch.begin(),feel_touch.end(),O);
-	if (I!=feel_touch.end()){
-		feel_touch.erase		(I);
-		feel_touch_delete		(O);
-		}
-	xr_vector<DenyTouch>::iterator Id=feel_touch_disable.begin(),IdE=feel_touch_disable.end();
-	for(;Id!=IdE;++Id)			if((*Id).O==O )	{ feel_touch_disable.erase(Id); break; }
+    xr_vector<CObject*>::iterator I = std::find(feel_touch.begin(), feel_touch.end(), O);
+    if (I != feel_touch.end())
+    {
+        feel_touch.erase(I);
+        feel_touch_delete(O);
+    }
+    xr_vector<DenyTouch>::iterator Id = feel_touch_disable.begin(), IdE = feel_touch_disable.end();
+    for (; Id != IdE; ++Id) if ((*Id).O == O) { feel_touch_disable.erase(Id); break; }
 }
diff --git a/src/xrEngine/Feel_Touch.h b/src/xrEngine/Feel_Touch.h
index a02a0d651fc..978768fc80a 100644
--- a/src/xrEngine/Feel_Touch.h
+++ b/src/xrEngine/Feel_Touch.h
@@ -5,32 +5,32 @@
 class ENGINE_API CObject;
 namespace Feel
 {
-	class ENGINE_API Touch: private pure_relcase
-	{
-	public:
-		struct DenyTouch
-		{
-			CObject*	O;
-			DWORD		Expire;
-		};
-	protected:
-		xr_vector<DenyTouch>	feel_touch_disable;
+class ENGINE_API Touch : private pure_relcase
+{
+public:
+    struct DenyTouch
+    {
+        CObject* O;
+        DWORD Expire;
+    };
+protected:
+    xr_vector<DenyTouch> feel_touch_disable;
 
-	public:
-		xr_vector<CObject*>		feel_touch;
-		xr_vector<CObject*>		q_nearest;
+public:
+    xr_vector<CObject*> feel_touch;
+    xr_vector<CObject*> q_nearest;
 
-	public:
-		void __stdcall			feel_touch_relcase			(CObject* O);
+public:
+    void __stdcall feel_touch_relcase(CObject* O);
 
-	public:
-								Touch						();
-		virtual					~Touch						();
+public:
+    Touch();
+    virtual ~Touch();
 
-		virtual bool			feel_touch_contact			(CObject* O);
-		virtual void			feel_touch_update			(Fvector& P, float	R);
-		virtual void			feel_touch_deny				(CObject* O, DWORD	T);
-		virtual void			feel_touch_new				(CObject* O)			{	};
-		virtual void			feel_touch_delete			(CObject* O)			{	};
-	};
+    virtual bool feel_touch_contact(CObject* O);
+    virtual void feel_touch_update(Fvector& P, float R);
+    virtual void feel_touch_deny(CObject* O, DWORD T);
+    virtual void feel_touch_new(CObject* O) { };
+    virtual void feel_touch_delete(CObject* O) { };
+};
 };
diff --git a/src/xrEngine/Feel_Vision.cpp b/src/xrEngine/Feel_Vision.cpp
index f00d493a7bc..69759ed1052 100644
--- a/src/xrEngine/Feel_Vision.cpp
+++ b/src/xrEngine/Feel_Vision.cpp
@@ -6,249 +6,270 @@
 #include "igame_level.h"
 #include "cl_intersect.h"
 
-namespace Feel {
-
-	Vision::Vision( CObject const* owner ) : 
-		pure_relcase( &Vision::feel_vision_relcase ),
-		m_owner(owner)
-	{	
-	}
-
-	Vision::~Vision()
-	{	
-	}
-
-	struct SFeelParam	{
-		Vision*						parent;
-		Vision::feel_visible_Item*	item;
-		float						vis;
-		float						vis_threshold;
-		SFeelParam(Vision* _parent, Vision::feel_visible_Item* _item, float _vis_threshold):parent(_parent),item(_item),vis(1.f),vis_threshold(_vis_threshold){}
-	};
-	IC BOOL feel_vision_callback(collide::rq_result& result, LPVOID params)
-	{
-		SFeelParam* fp	= (SFeelParam*)params;
-		float vis		= fp->parent->feel_vision_mtl_transp(result.O, result.element);
-		fp->vis			*= vis;
-		if (NULL==result.O && fis_zero(vis)){
-			CDB::TRI* T	= g_pGameLevel->ObjectSpace.GetStaticTris()+result.element;
-			Fvector* V	= g_pGameLevel->ObjectSpace.GetStaticVerts();
-			fp->item->Cache.verts[0].set	(V[T->verts[0]]);
-			fp->item->Cache.verts[1].set	(V[T->verts[1]]);
-			fp->item->Cache.verts[2].set	(V[T->verts[2]]);
-		}
-		return (fp->vis>fp->vis_threshold); 
-	}
-	void	Vision::o_new		(CObject* O)
-	{
-		feel_visible.push_back	(feel_visible_Item());
-		feel_visible_Item&	I	= feel_visible.back();
-		I.O						= O;
-		I.Cache_vis				= 1.f;
-		I.Cache.verts[0].set	(0,0,0);
-		I.Cache.verts[1].set	(0,0,0);
-		I.Cache.verts[2].set	(0,0,0);
-		I.fuzzy					= -EPS_S;
-		I.cp_LP					= O->get_new_local_point_on_mesh( I.bone_id );
-		I.cp_LAST				= O->get_last_local_point_on_mesh( I.cp_LP, I.bone_id );
-	}
-	void	Vision::o_delete	(CObject* O)
-	{
-		xr_vector<feel_visible_Item>::iterator I=feel_visible.begin(),TE=feel_visible.end();
-		for (; I!=TE; I++)
-			if (I->O==O) {
-				feel_visible.erase(I);
-				return;
-			}
-	}
-
-	void	Vision::feel_vision_clear	()
-	{
-		seen.clear			();
-		query.clear			();
-		diff.clear			();
-		feel_visible.clear	();
-	}
-
-	void	Vision::feel_vision_relcase	(CObject* object)
-	{
-		xr_vector<CObject*>::iterator Io;
-		Io = std::find		(seen.begin(),seen.end(),object);
-		if (Io!=seen.end())	seen.erase	(Io);
-		Io = std::find		(query.begin(),query.end(),object);
-		if (Io!=query.end())query.erase	(Io);
-		Io = std::find		(diff.begin(),diff.end(),object);
-		if (Io!=diff.end())	diff.erase	(Io);
-		xr_vector<feel_visible_Item>::iterator Ii=feel_visible.begin(),IiE=feel_visible.end();
-		for (; Ii!=IiE; ++Ii)if (Ii->O==object){ feel_visible.erase(Ii); break; }
-	}
-
-	void	Vision::feel_vision_query	(Fmatrix& mFull, Fvector& P)
-	{
-		CFrustum								Frustum		;
-		Frustum.CreateFromMatrix				(mFull,FRUSTUM_P_LRTB|FRUSTUM_P_FAR);
-
-		// Traverse object database
-		r_spatial.clear_not_free				();
-		g_SpatialSpace->q_frustum
-			(
-			r_spatial,
-			0,
-			STYPE_VISIBLEFORAI,
-			Frustum
-			);
-
-		// Determine visibility for dynamic part of scene
-		seen.clear_and_reserve					()	;
-		for (u32 o_it=0; o_it<r_spatial.size(); o_it++)
-		{
-			ISpatial*	spatial								= r_spatial					[o_it];
-			CObject*	object								= spatial->dcast_CObject	();
-			if (object && feel_vision_isRelevant(object))	seen.push_back				(object);
-		}
-		if (seen.size()>1) 
-		{
-			std::sort							(seen.begin(),seen.end());
-			xr_vector<CObject*>::iterator end	= std::unique	(seen.begin(),seen.end());
-			if (end!=seen.end()) seen.erase		(end,seen.end());
-		}
-	}
-
-	void	Vision::feel_vision_update	(CObject* parent, Fvector& P, float dt, float vis_threshold)
-	{
-		// B-A = objects, that become visible
-		if (!seen.empty()) 
-		{
-			xr_vector<CObject*>::iterator E		= std::remove(seen.begin(),seen.end(),parent);
-			seen.resize			(E-seen.begin());
-
-			{
-				diff.resize	(_max(seen.size(),query.size()));
-				xr_vector<CObject*>::iterator	E = std::set_difference(
-					seen.begin(), seen.end(),
-					query.begin(),query.end(),
-					diff.begin() );
-				diff.resize(E-diff.begin());
-				for (u32 i=0; i<diff.size(); i++)
-					o_new(diff[i]);
-			}
-		}
-
-		// A-B = objects, that are invisible
-		if (!query.empty()) 
-		{
-			diff.resize	(_max(seen.size(),query.size()));
-			xr_vector<CObject*>::iterator	E = std::set_difference(
-				query.begin(),query.end(),
-				seen.begin(), seen.end(),
-				diff.begin() );
-			diff.resize(E-diff.begin());
-			for (u32 i=0; i<diff.size(); i++)
-				o_delete(diff[i]);
-		}
-
-		// Copy results and perform traces
-		query				= seen;
-		o_trace				(P,dt,vis_threshold);
-	}
-	void Vision::o_trace	(Fvector& P, float dt, float vis_threshold)	{
-		RQR.r_clear			();
-		xr_vector<feel_visible_Item>::iterator I=feel_visible.begin(),E=feel_visible.end();
-		for (; I!=E; I++){
-			if (0==I->O->CFORM())	{ I->fuzzy = -1; continue; }
-
-			// verify relation
-//			if (positive(I->fuzzy) && I->O->Position().similar(I->cp_LR_dst,lr_granularity) && P.similar(I->cp_LR_src,lr_granularity))
-//				continue;
-
-			I->cp_LR_dst		= I->O->Position();
-			I->cp_LR_src		= P;
-			I->cp_LAST			= I->O->get_last_local_point_on_mesh( I->cp_LP, I->bone_id );
-
-			// 
-			Fvector				D, OP = I->cp_LAST;
-			D.sub				(OP,P);
-			if ( fis_zero(D.magnitude()) ) {
-				I->fuzzy		= 1.f;
-				continue;
-			}
-
-			float				f = D.magnitude() + .2f;
-			if (f>fuzzy_guaranteed){
-				D.div						(f);
-				// setup ray defs & feel params
-				collide::ray_defs RD		(P,D,f,CDB::OPT_CULL,collide::rq_target(collide::rqtStatic|/**/collide::rqtObject|/**/collide::rqtObstacle));
-				SFeelParam	feel_params		(this,&*I,vis_threshold);
-				// check cache
-				if (I->Cache.result&&I->Cache.similar(P,D,f)){
-					// similar with previous query
-					feel_params.vis			= I->Cache_vis;
-//					Log("cache 0");
-				}else{
-					float _u,_v,_range;
-					if (CDB::TestRayTri(P,D,I->Cache.verts,_u,_v,_range,false)&&(_range>0 && _range<f))	{
-						feel_params.vis		= 0.f;
-//						Log("cache 1");
-					}else{
-						// cache outdated. real query.
-						VERIFY(!fis_zero(RD.dir.magnitude()));
-
-						if (g_pGameLevel->ObjectSpace.RayQuery	(RQR, RD, feel_vision_callback, &feel_params, NULL, NULL))	{
-							I->Cache_vis	= feel_params.vis	;
-							I->Cache.set	(P,D,f,TRUE	)		;
-						}
-						else{
-//							feel_params.vis	= 0.f;
-//							I->Cache_vis	= feel_params.vis	;
-							I->Cache.set	(P,D,f,FALSE)		;
-						}
-//						Log("query");
-					}
-				}
-//				Log("Vis",feel_params.vis);
-				r_spatial.clear_not_free();
-				g_SpatialSpace->q_ray( r_spatial, 0, STYPE_VISIBLEFORAI, P, D, f );
-
-				RD.flags				= CDB::OPT_ONLYFIRST;
-
-				bool collision_found	= false;
-				xr_vector<ISpatial*>::const_iterator	i = r_spatial.begin();
-				xr_vector<ISpatial*>::const_iterator	e = r_spatial.end();
-				for ( ; i != e; ++i ) {
-					if ( *i == m_owner )
-						continue;
-
-					if ( *i == I->O )
-						continue;
-
-					CObject const* object	= (*i)->dcast_CObject();
-					RQR.r_clear				( );
-					if ( object && object->collidable.model && !object->collidable.model->_RayQuery(RD,RQR) )
-						continue;
-
-					collision_found		= true;
-					break;
-				}
-
-				if (collision_found)
-					feel_params.vis		= 0.f;
-
-				if (feel_params.vis<feel_params.vis_threshold){
-					// INVISIBLE, choose next point
-					I->fuzzy				-=	fuzzy_update_novis*dt;
-					clamp					(I->fuzzy,-.5f,1.f);
-					I->cp_LP				= I->O->get_new_local_point_on_mesh( I->bone_id );
-				}else{
-					// VISIBLE
-					I->fuzzy				+=	fuzzy_update_vis*dt;
-					clamp					(I->fuzzy,-.5f,1.f);
-				}
-			}
-			else {
-				// VISIBLE, 'cause near
-				I->fuzzy				+=	fuzzy_update_vis*dt;
-				clamp					(I->fuzzy,-.5f,1.f);
-			}
-		}
-	}
+namespace Feel
+{
+
+Vision::Vision(CObject const* owner) :
+pure_relcase(&Vision::feel_vision_relcase),
+m_owner(owner)
+{
+}
+
+Vision::~Vision()
+{
+}
+
+struct SFeelParam
+{
+    Vision* parent;
+    Vision::feel_visible_Item* item;
+    float vis;
+    float vis_threshold;
+    SFeelParam(Vision* _parent, Vision::feel_visible_Item* _item, float _vis_threshold) :parent(_parent), item(_item), vis(1.f), vis_threshold(_vis_threshold) {}
+};
+IC BOOL feel_vision_callback(collide::rq_result& result, LPVOID params)
+{
+    SFeelParam* fp = (SFeelParam*)params;
+    float vis = fp->parent->feel_vision_mtl_transp(result.O, result.element);
+    fp->vis *= vis;
+    if (NULL == result.O && fis_zero(vis))
+    {
+        CDB::TRI* T = g_pGameLevel->ObjectSpace.GetStaticTris() + result.element;
+        Fvector* V = g_pGameLevel->ObjectSpace.GetStaticVerts();
+        fp->item->Cache.verts[0].set(V[T->verts[0]]);
+        fp->item->Cache.verts[1].set(V[T->verts[1]]);
+        fp->item->Cache.verts[2].set(V[T->verts[2]]);
+    }
+    return (fp->vis > fp->vis_threshold);
+}
+void Vision::o_new(CObject* O)
+{
+    feel_visible.push_back(feel_visible_Item());
+    feel_visible_Item& I = feel_visible.back();
+    I.O = O;
+    I.Cache_vis = 1.f;
+    I.Cache.verts[0].set(0, 0, 0);
+    I.Cache.verts[1].set(0, 0, 0);
+    I.Cache.verts[2].set(0, 0, 0);
+    I.fuzzy = -EPS_S;
+    I.cp_LP = O->get_new_local_point_on_mesh(I.bone_id);
+    I.cp_LAST = O->get_last_local_point_on_mesh(I.cp_LP, I.bone_id);
+}
+void Vision::o_delete(CObject* O)
+{
+    xr_vector<feel_visible_Item>::iterator I = feel_visible.begin(), TE = feel_visible.end();
+    for (; I != TE; I++)
+        if (I->O == O)
+        {
+        feel_visible.erase(I);
+        return;
+        }
+}
+
+void Vision::feel_vision_clear()
+{
+    seen.clear();
+    query.clear();
+    diff.clear();
+    feel_visible.clear();
+}
+
+void Vision::feel_vision_relcase(CObject* object)
+{
+    xr_vector<CObject*>::iterator Io;
+    Io = std::find(seen.begin(), seen.end(), object);
+    if (Io != seen.end()) seen.erase(Io);
+    Io = std::find(query.begin(), query.end(), object);
+    if (Io != query.end())query.erase(Io);
+    Io = std::find(diff.begin(), diff.end(), object);
+    if (Io != diff.end()) diff.erase(Io);
+    xr_vector<feel_visible_Item>::iterator Ii = feel_visible.begin(), IiE = feel_visible.end();
+    for (; Ii != IiE; ++Ii)if (Ii->O == object) { feel_visible.erase(Ii); break; }
+}
+
+void Vision::feel_vision_query(Fmatrix& mFull, Fvector& P)
+{
+    CFrustum Frustum;
+    Frustum.CreateFromMatrix(mFull, FRUSTUM_P_LRTB | FRUSTUM_P_FAR);
+
+    // Traverse object database
+    r_spatial.clear_not_free();
+    g_SpatialSpace->q_frustum
+        (
+        r_spatial,
+        0,
+        STYPE_VISIBLEFORAI,
+        Frustum
+        );
+
+    // Determine visibility for dynamic part of scene
+    seen.clear_and_reserve();
+    for (u32 o_it = 0; o_it < r_spatial.size(); o_it++)
+    {
+        ISpatial* spatial = r_spatial[o_it];
+        CObject* object = spatial->dcast_CObject();
+        if (object && feel_vision_isRelevant(object)) seen.push_back(object);
+    }
+    if (seen.size()>1)
+    {
+        std::sort(seen.begin(), seen.end());
+        xr_vector<CObject*>::iterator end = std::unique(seen.begin(), seen.end());
+        if (end != seen.end()) seen.erase(end, seen.end());
+    }
+}
+
+void Vision::feel_vision_update(CObject* parent, Fvector& P, float dt, float vis_threshold)
+{
+    // B-A = objects, that become visible
+    if (!seen.empty())
+    {
+        xr_vector<CObject*>::iterator E = std::remove(seen.begin(), seen.end(), parent);
+        seen.resize(E - seen.begin());
+
+        {
+            diff.resize(_max(seen.size(), query.size()));
+            xr_vector<CObject*>::iterator E = std::set_difference(
+                seen.begin(), seen.end(),
+                query.begin(), query.end(),
+                diff.begin());
+            diff.resize(E - diff.begin());
+            for (u32 i = 0; i < diff.size(); i++)
+                o_new(diff[i]);
+        }
+    }
+
+    // A-B = objects, that are invisible
+    if (!query.empty())
+    {
+        diff.resize(_max(seen.size(), query.size()));
+        xr_vector<CObject*>::iterator E = std::set_difference(
+            query.begin(), query.end(),
+            seen.begin(), seen.end(),
+            diff.begin());
+        diff.resize(E - diff.begin());
+        for (u32 i = 0; i < diff.size(); i++)
+            o_delete(diff[i]);
+    }
+
+    // Copy results and perform traces
+    query = seen;
+    o_trace(P, dt, vis_threshold);
+}
+void Vision::o_trace(Fvector& P, float dt, float vis_threshold)
+{
+    RQR.r_clear();
+    xr_vector<feel_visible_Item>::iterator I = feel_visible.begin(), E = feel_visible.end();
+    for (; I != E; I++)
+    {
+        if (0 == I->O->CFORM()) { I->fuzzy = -1; continue; }
+
+        // verify relation
+        // if (positive(I->fuzzy) && I->O->Position().similar(I->cp_LR_dst,lr_granularity) && P.similar(I->cp_LR_src,lr_granularity))
+        // continue;
+
+        I->cp_LR_dst = I->O->Position();
+        I->cp_LR_src = P;
+        I->cp_LAST = I->O->get_last_local_point_on_mesh(I->cp_LP, I->bone_id);
+
+        //
+        Fvector D, OP = I->cp_LAST;
+        D.sub(OP, P);
+        if (fis_zero(D.magnitude()))
+        {
+            I->fuzzy = 1.f;
+            continue;
+        }
+
+        float f = D.magnitude() + .2f;
+        if (f > fuzzy_guaranteed)
+        {
+            D.div(f);
+            // setup ray defs & feel params
+            collide::ray_defs RD(P, D, f, CDB::OPT_CULL, collide::rq_target(collide::rqtStatic |/**/collide::rqtObject |/**/collide::rqtObstacle));
+            SFeelParam feel_params(this, &*I, vis_threshold);
+            // check cache
+            if (I->Cache.result&&I->Cache.similar(P, D, f))
+            {
+                // similar with previous query
+                feel_params.vis = I->Cache_vis;
+                // Log("cache 0");
+            }
+            else
+            {
+                float _u, _v, _range;
+                if (CDB::TestRayTri(P, D, I->Cache.verts, _u, _v, _range, false) && (_range > 0 && _range < f))
+                {
+                    feel_params.vis = 0.f;
+                    // Log("cache 1");
+                }
+                else
+                {
+                    // cache outdated. real query.
+                    VERIFY(!fis_zero(RD.dir.magnitude()));
+
+                    if (g_pGameLevel->ObjectSpace.RayQuery(RQR, RD, feel_vision_callback, &feel_params, NULL, NULL))
+                    {
+                        I->Cache_vis = feel_params.vis;
+                        I->Cache.set(P, D, f, TRUE);
+                    }
+                    else
+                    {
+                        // feel_params.vis = 0.f;
+                        // I->Cache_vis = feel_params.vis ;
+                        I->Cache.set(P, D, f, FALSE);
+                    }
+                    // Log("query");
+                }
+            }
+            // Log("Vis",feel_params.vis);
+            r_spatial.clear_not_free();
+            g_SpatialSpace->q_ray(r_spatial, 0, STYPE_VISIBLEFORAI, P, D, f);
+
+            RD.flags = CDB::OPT_ONLYFIRST;
+
+            bool collision_found = false;
+            xr_vector<ISpatial*>::const_iterator i = r_spatial.begin();
+            xr_vector<ISpatial*>::const_iterator e = r_spatial.end();
+            for (; i != e; ++i)
+            {
+                if (*i == m_owner)
+                    continue;
+
+                if (*i == I->O)
+                    continue;
+
+                CObject const* object = (*i)->dcast_CObject();
+                RQR.r_clear();
+                if (object && object->collidable.model && !object->collidable.model->_RayQuery(RD, RQR))
+                    continue;
+
+                collision_found = true;
+                break;
+            }
+
+            if (collision_found)
+                feel_params.vis = 0.f;
+
+            if (feel_params.vis < feel_params.vis_threshold)
+            {
+                // INVISIBLE, choose next point
+                I->fuzzy -= fuzzy_update_novis*dt;
+                clamp(I->fuzzy, -.5f, 1.f);
+                I->cp_LP = I->O->get_new_local_point_on_mesh(I->bone_id);
+            }
+            else
+            {
+                // VISIBLE
+                I->fuzzy += fuzzy_update_vis*dt;
+                clamp(I->fuzzy, -.5f, 1.f);
+            }
+        }
+        else
+        {
+            // VISIBLE, 'cause near
+            I->fuzzy += fuzzy_update_vis*dt;
+            clamp(I->fuzzy, -.5f, 1.f);
+        }
+    }
+}
 };
diff --git a/src/xrEngine/Feel_Vision.h b/src/xrEngine/Feel_Vision.h
index 0c965bfc793..64e5e578b6f 100644
--- a/src/xrEngine/Feel_Vision.h
+++ b/src/xrEngine/Feel_Vision.h
@@ -10,60 +10,63 @@ class ISpatial;
 
 namespace Feel
 {
-	const float fuzzy_update_vis	= 1000.f;		// speed of fuzzy-logic desisions
-	const float fuzzy_update_novis	= 1000.f;		// speed of fuzzy-logic desisions
-	const float fuzzy_guaranteed	= 0.001f;		// distance which is supposed 100% visible
-	const float lr_granularity		= 0.1f;			// assume similar positions
+const float fuzzy_update_vis = 1000.f; // speed of fuzzy-logic desisions
+const float fuzzy_update_novis = 1000.f; // speed of fuzzy-logic desisions
+const float fuzzy_guaranteed = 0.001f; // distance which is supposed 100% visible
+const float lr_granularity = 0.1f; // assume similar positions
 
-	class ENGINE_API Vision: private pure_relcase
-	{
-	private:
-		xr_vector<CObject*>			seen;
-		xr_vector<CObject*>			query;
-		xr_vector<CObject*>			diff;
-		collide::rq_results			RQR;
-		xr_vector<ISpatial*>		r_spatial;
-		CObject const*				m_owner;
+class ENGINE_API Vision : private pure_relcase
+{
+private:
+    xr_vector<CObject*> seen;
+    xr_vector<CObject*> query;
+    xr_vector<CObject*> diff;
+    collide::rq_results RQR;
+    xr_vector<ISpatial*> r_spatial;
+    CObject const* m_owner;
 
-		void						o_new		(CObject* E);
-		void						o_delete	(CObject* E);
-		void						o_trace		(Fvector& P, float dt, float vis_threshold);
-	public:
-									Vision		(CObject const* owner);
-		virtual					~	Vision		();
-		struct	 feel_visible_Item 
-		{
-			collide::ray_cache	Cache;
-			Fvector				cp_LP;
-			Fvector				cp_LR_src;
-			Fvector				cp_LR_dst;
-			Fvector				cp_LAST;	// last point found to be visible
-			CObject*			O;
-			float				fuzzy;		// note range: (-1[no]..1[yes])
-			float				Cache_vis;
-			u16					bone_id;
-		};
-		xr_vector<feel_visible_Item>	feel_visible;
-	public:
-		void						feel_vision_clear		();
-		void						feel_vision_query		(Fmatrix& mFull,	Fvector& P);
-		void						feel_vision_update		(CObject* parent,	Fvector& P, float dt, float vis_threshold);
-		void	__stdcall			feel_vision_relcase		(CObject* object);
-		void						feel_vision_get			(xr_vector<CObject*>& R)		{
-			R.clear					();
-			xr_vector<feel_visible_Item>::iterator I=feel_visible.begin(),E=feel_visible.end();
-			for (; I!=E; I++)	if (positive(I->fuzzy)) R.push_back(I->O);
-		}
-		Fvector						feel_vision_get_vispoint(CObject* _O)					{
-			xr_vector<feel_visible_Item>::iterator I=feel_visible.begin(),E=feel_visible.end();
-			for (; I!=E; I++)		if (_O == I->O) {
-				VERIFY	(positive(I->fuzzy));
-				return	I->cp_LAST;
-			}
-			VERIFY2		(0, "There is no such object in the potentially visible list" );
-			return		Fvector().set(flt_max,flt_max,flt_max);
-		}
-		virtual		bool			feel_vision_isRelevant	(CObject* O)					= 0;
-		virtual		float			feel_vision_mtl_transp	(CObject* O, u32 element)		= 0;	
-	};
+    void o_new(CObject* E);
+    void o_delete(CObject* E);
+    void o_trace(Fvector& P, float dt, float vis_threshold);
+public:
+    Vision(CObject const* owner);
+    virtual ~Vision();
+    struct feel_visible_Item
+    {
+        collide::ray_cache Cache;
+        Fvector cp_LP;
+        Fvector cp_LR_src;
+        Fvector cp_LR_dst;
+        Fvector cp_LAST; // last point found to be visible
+        CObject* O;
+        float fuzzy; // note range: (-1[no]..1[yes])
+        float Cache_vis;
+        u16 bone_id;
+    };
+    xr_vector<feel_visible_Item> feel_visible;
+public:
+    void feel_vision_clear();
+    void feel_vision_query(Fmatrix& mFull, Fvector& P);
+    void feel_vision_update(CObject* parent, Fvector& P, float dt, float vis_threshold);
+    void __stdcall feel_vision_relcase(CObject* object);
+    void feel_vision_get(xr_vector<CObject*>& R)
+    {
+        R.clear();
+        xr_vector<feel_visible_Item>::iterator I = feel_visible.begin(), E = feel_visible.end();
+        for (; I != E; I++) if (positive(I->fuzzy)) R.push_back(I->O);
+    }
+    Fvector feel_vision_get_vispoint(CObject* _O)
+    {
+        xr_vector<feel_visible_Item>::iterator I = feel_visible.begin(), E = feel_visible.end();
+        for (; I != E; I++) if (_O == I->O)
+        {
+            VERIFY(positive(I->fuzzy));
+            return I->cp_LAST;
+        }
+        VERIFY2(0, "There is no such object in the potentially visible list");
+        return Fvector().set(flt_max, flt_max, flt_max);
+    }
+    virtual bool feel_vision_isRelevant(CObject* O) = 0;
+    virtual float feel_vision_mtl_transp(CObject* O, u32 element) = 0;
+};
 };
diff --git a/src/xrEngine/Fmesh.h b/src/xrEngine/Fmesh.h
index 6f1bf2cbf47..6b15999d793 100644
--- a/src/xrEngine/Fmesh.h
+++ b/src/xrEngine/Fmesh.h
@@ -2,152 +2,161 @@
 #define fmeshH
 #pragma once
 
-//BOOL ValidateIndices		(u32 vCount, u32 iCount, u16* pIndices);
+//BOOL ValidateIndices (u32 vCount, u32 iCount, u16* pIndices);
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 // MESH as it is represented in file
-enum MT {
-	MT_NORMAL				=0,
-	MT_HIERRARHY			=1,
-	MT_PROGRESSIVE			=2,
-	MT_SKELETON_ANIM		=3,
-	MT_SKELETON_GEOMDEF_PM	=4,
-	MT_SKELETON_GEOMDEF_ST	=5,
-	MT_LOD					=6,
-	MT_TREE_ST				=7,
-	MT_PARTICLE_EFFECT		=8,
-	MT_PARTICLE_GROUP		=9,
-	MT_SKELETON_RIGID		=10,
-	MT_TREE_PM				=11,
-
-	MT_3DFLUIDVOLUME		=12,
+enum MT
+{
+    MT_NORMAL = 0,
+    MT_HIERRARHY = 1,
+    MT_PROGRESSIVE = 2,
+    MT_SKELETON_ANIM = 3,
+    MT_SKELETON_GEOMDEF_PM = 4,
+    MT_SKELETON_GEOMDEF_ST = 5,
+    MT_LOD = 6,
+    MT_TREE_ST = 7,
+    MT_PARTICLE_EFFECT = 8,
+    MT_PARTICLE_GROUP = 9,
+    MT_SKELETON_RIGID = 10,
+    MT_TREE_PM = 11,
+
+    MT_3DFLUIDVOLUME = 12,
 };
 
-enum OGF_Chuncks {
-	OGF_HEADER				= 1,
-	OGF_TEXTURE				= 2,
-	OGF_VERTICES			= 3,
-	OGF_INDICES				= 4,
-	OGF_P_MAP				= 5,	//---------------------- unused
-	OGF_SWIDATA				= 6,
-	OGF_VCONTAINER			= 7, // not used ??
-	OGF_ICONTAINER			= 8, // not used ??
-    OGF_CHILDREN			= 9,	// * For skeletons only
-	OGF_CHILDREN_L			= 10,	// Link to child visuals
-	OGF_LODDEF2				= 11,	// + 5 channel data
-	OGF_TREEDEF2			= 12,	// + 5 channel data
-	OGF_S_BONE_NAMES		= 13,	// * For skeletons only
-	OGF_S_MOTIONS 			= 14,	// * For skeletons only
-	OGF_S_SMPARAMS  		= 15,	// * For skeletons only
-	OGF_S_IKDATA			= 16,	// * For skeletons only
-	OGF_S_USERDATA			= 17,	// * For skeletons only (Ini-file)
-	OGF_S_DESC				= 18,	// * For skeletons only
-	OGF_S_MOTION_REFS		= 19,	// * For skeletons only
-	OGF_SWICONTAINER		= 20,	// * SlidingWindowItem record container
-	OGF_GCONTAINER			= 21,	// * both VB&IB
-	OGF_FASTPATH			= 22,	// * extended/fast geometry
-	OGF_S_LODS 				= 23,	// * For skeletons only (Ini-file)
-	OGF_S_MOTION_REFS2		= 24,	// * changes in format
-	OGF_COLLISION_VERTICES	= 25,
-	OGF_COLLISION_INDICES	= 26,
-    OGF_forcedword			= 0xFFFFFFFF         
-};							
-
-enum OGF_SkeletonVertType	{
-	OGF_VERTEXFORMAT_FVF_1L	= 1*0x12071980,
-	OGF_VERTEXFORMAT_FVF_2L	= 2*0x12071980,
-	OGF_VERTEXFORMAT_FVF_3L	= 4*0x12071980,
-	OGF_VERTEXFORMAT_FVF_4L	= 5*0x12071980,
-	OGF_VERTEXFORMAT_FVF_NL	= 3*0x12071980,
+enum OGF_Chuncks
+{
+    OGF_HEADER = 1,
+    OGF_TEXTURE = 2,
+    OGF_VERTICES = 3,
+    OGF_INDICES = 4,
+    OGF_P_MAP = 5, //---------------------- unused
+    OGF_SWIDATA = 6,
+    OGF_VCONTAINER = 7, // not used ??
+    OGF_ICONTAINER = 8, // not used ??
+    OGF_CHILDREN = 9, // * For skeletons only
+    OGF_CHILDREN_L = 10, // Link to child visuals
+    OGF_LODDEF2 = 11, // + 5 channel data
+    OGF_TREEDEF2 = 12, // + 5 channel data
+    OGF_S_BONE_NAMES = 13, // * For skeletons only
+    OGF_S_MOTIONS = 14, // * For skeletons only
+    OGF_S_SMPARAMS = 15, // * For skeletons only
+    OGF_S_IKDATA = 16, // * For skeletons only
+    OGF_S_USERDATA = 17, // * For skeletons only (Ini-file)
+    OGF_S_DESC = 18, // * For skeletons only
+    OGF_S_MOTION_REFS = 19, // * For skeletons only
+    OGF_SWICONTAINER = 20, // * SlidingWindowItem record container
+    OGF_GCONTAINER = 21, // * both VB&IB
+    OGF_FASTPATH = 22, // * extended/fast geometry
+    OGF_S_LODS = 23, // * For skeletons only (Ini-file)
+    OGF_S_MOTION_REFS2 = 24, // * changes in format
+    OGF_COLLISION_VERTICES = 25,
+    OGF_COLLISION_INDICES = 26,
+    OGF_forcedword = 0xFFFFFFFF
 };
 
-const u16	xrOGF_SMParamsVersion	= 4;
+enum OGF_SkeletonVertType
+{
+    OGF_VERTEXFORMAT_FVF_1L = 1 * 0x12071980,
+    OGF_VERTEXFORMAT_FVF_2L = 2 * 0x12071980,
+    OGF_VERTEXFORMAT_FVF_3L = 4 * 0x12071980,
+    OGF_VERTEXFORMAT_FVF_4L = 5 * 0x12071980,
+    OGF_VERTEXFORMAT_FVF_NL = 3 * 0x12071980,
+};
+
+const u16 xrOGF_SMParamsVersion = 4;
 
 // OGF_DESC
-struct ECORE_API ogf_desc	{
-	shared_str	source_file;
-    shared_str	build_name;
-    time_t		build_time;
-    shared_str	create_name;
-    time_t		create_time;
-    shared_str	modif_name;
-    time_t		modif_time;
-    		ogf_desc():build_time(0),create_time(0),modif_time(0){}
-    void 	Load	(IReader& F);
-    void 	Save	(IWriter& F);
+struct ECORE_API ogf_desc
+{
+    shared_str source_file;
+    shared_str build_name;
+    time_t build_time;
+    shared_str create_name;
+    time_t create_time;
+    shared_str modif_name;
+    time_t modif_time;
+    ogf_desc() :build_time(0), create_time(0), modif_time(0) {}
+    void Load(IReader& F);
+    void Save(IWriter& F);
 };
 
 // OGF_BBOX
-struct ogf_bbox		{
-	Fvector min;
-	Fvector max;
+struct ogf_bbox
+{
+    Fvector min;
+    Fvector max;
 };
 
 // OGF_BSPHERE
-struct ogf_bsphere	{
-	Fvector c;
-	float	r;
+struct ogf_bsphere
+{
+    Fvector c;
+    float r;
 };
 
 // OGF_HEADER
-const u8	xrOGF_FormatVersion		= 4;
-struct ogf_header {
-	u8			format_version;			// = xrOGF_FormatVersion
-	u8			type;					// MT
-	u16			shader_id;				// should not be ZERO
-	ogf_bbox	bb;
-	ogf_bsphere	bs;
+const u8 xrOGF_FormatVersion = 4;
+struct ogf_header
+{
+    u8 format_version; // = xrOGF_FormatVersion
+    u8 type; // MT
+    u16 shader_id; // should not be ZERO
+    ogf_bbox bb;
+    ogf_bsphere bs;
 };
 
 // Sliding Window Record
-struct ENGINE_API	FSlideWindow		{
-	u32				offset;
-	u16				num_tris;
-	u16				num_verts;
+struct ENGINE_API FSlideWindow
+{
+    u32 offset;
+    u16 num_tris;
+    u16 num_verts;
 };
-struct ENGINE_API	FSlideWindowItem	{
-	FSlideWindow*	sw;
-	u32				count;
-	u32				reserved[4];
-	FSlideWindowItem() : sw(0),count(0)	{};
+struct ENGINE_API FSlideWindowItem
+{
+    FSlideWindow* sw;
+    u32 count;
+    u32 reserved[4];
+    FSlideWindowItem() : sw(0), count(0) {};
 };
 
 // OGF_TEXTURE1
-//  Z-String - name
-//  Z-String - shader
+// Z-String - name
+// Z-String - shader
 
 // OGF_TEXTURE_L
-//	u32 T_link
-//  u32 S_link
+// u32 T_link
+// u32 S_link
 
 // OGF_MATERIAL
-//  Fmaterial
+// Fmaterial
 
 // OGF_CHIELDS_L
-//	u32	Count
-//	u32	idx[0...Count-1]
+// u32 Count
+// u32 idx[0...Count-1]
 
 // OGF_VERTICES
-//	u32		dwVertType;			// Type of vertices it contains
-//	u32		dwVertCount;		// Count of vertices
-//	..vertices itself
+// u32 dwVertType; // Type of vertices it contains
+// u32 dwVertCount; // Count of vertices
+// ..vertices itself
 
 // OGF_INDICES
-//	u32		Count
-//  ..indices itself (u16[Count]);
+// u32 Count
+// ..indices itself (u16[Count]);
 
 // OGF_VCONTAINER
-// u32		CID;		// Container ID
-// u32		Offset;		// Add for every IDX and use as the start vertex
-// u32		Count;		// Number of vertices
+// u32 CID; // Container ID
+// u32 Offset; // Add for every IDX and use as the start vertex
+// u32 Count; // Number of vertices
 
 // OGF_BONES
-// BYTE			Count;
-// BYTE			Indices[...]
+// BYTE Count;
+// BYTE Indices[...]
 
 // OGF_TREEDEF
 // xform : matrix4x4
 // scale : vec4
-// bias  : vec4
+// bias : vec4
 
 #endif // fmeshH
diff --git a/src/xrEngine/Frustum.cpp b/src/xrEngine/Frustum.cpp
index 227b2080f54..a9d798774c1 100644
--- a/src/xrEngine/Frustum.cpp
+++ b/src/xrEngine/Frustum.cpp
@@ -4,430 +4,476 @@
 #include "Frustum.h"
 
 //////////////////////////////////////////////////////////////////////
-void			CFrustum::fplane::cache	()	{
-	if(positive(n.x)) {
-		if(positive(n.y)) {
-			if(positive(n.z))	aabb_overlap_id	= 0;
-			else				aabb_overlap_id	= 1;
-		} else {
-			if(positive(n.z))	aabb_overlap_id	= 2;
-			else				aabb_overlap_id = 3;
-		}
-	} else {
-		if(positive(n.y)) {
-			if(positive(n.z))	aabb_overlap_id = 4;
-			else				aabb_overlap_id = 5;
-		} else {
-			if(positive(n.z))	aabb_overlap_id = 6;
-			else				aabb_overlap_id = 7;
-		}
-	}
+void CFrustum::fplane::cache()
+{
+    if (positive(n.x))
+    {
+        if (positive(n.y))
+        {
+            if (positive(n.z)) aabb_overlap_id = 0;
+            else aabb_overlap_id = 1;
+        }
+        else
+        {
+            if (positive(n.z)) aabb_overlap_id = 2;
+            else aabb_overlap_id = 3;
+        }
+    }
+    else
+    {
+        if (positive(n.y))
+        {
+            if (positive(n.z)) aabb_overlap_id = 4;
+            else aabb_overlap_id = 5;
+        }
+        else
+        {
+            if (positive(n.z)) aabb_overlap_id = 6;
+            else aabb_overlap_id = 7;
+        }
+    }
 }
-void			CFrustum::_add			(Fplane &P) 
-{ 
-	VERIFY(p_count<FRUSTUM_MAXPLANES); 
-	planes[p_count].set		(P);
-	planes[p_count].cache	();
-	p_count					++;
+void CFrustum::_add(Fplane& P)
+{
+    VERIFY(p_count < FRUSTUM_MAXPLANES);
+    planes[p_count].set(P);
+    planes[p_count].cache();
+    p_count++;
 }
-void			CFrustum::_add			(Fvector& P1, Fvector& P2, Fvector&P3)
+void CFrustum::_add(Fvector& P1, Fvector& P2, Fvector& P3)
 {
-	VERIFY(p_count<FRUSTUM_MAXPLANES);
-	planes[p_count].build_precise	(P1,P2,P3);
-	planes[p_count].cache			();
-	p_count							++;
+    VERIFY(p_count < FRUSTUM_MAXPLANES);
+    planes[p_count].build_precise(P1, P2, P3);
+    planes[p_count].cache();
+    p_count++;
 }
- 
-#define			mx			0
-#define			my			1
-#define			mz			2
-#define			Mx			3
-#define			My			4
-#define			Mz			5
-u32				frustum_aabb_remap [8][6]	=
+
+#define mx 0
+#define my 1
+#define mz 2
+#define Mx 3
+#define My 4
+#define Mz 5
+u32 frustum_aabb_remap[8][6] =
 {
-	{ Mx,My,Mz,mx,my,mz}, 
-	{ Mx,My,mz,mx,my,Mz}, 
-	{ Mx,my,Mz,mx,My,mz}, 
-	{ Mx,my,mz,mx,My,Mz}, 
-	{ mx,My,Mz,Mx,my,mz}, 
-	{ mx,My,mz,Mx,my,Mz}, 
-	{ mx,my,Mz,Mx,My,mz}, 
-	{ mx,my,mz,Mx,My,Mz}
+    {Mx, My, Mz, mx, my, mz},
+    {Mx, My, mz, mx, my, Mz},
+    {Mx, my, Mz, mx, My, mz},
+    {Mx, my, mz, mx, My, Mz},
+    {mx, My, Mz, Mx, my, mz},
+    {mx, My, mz, Mx, my, Mz},
+    {mx, my, Mz, Mx, My, mz},
+    {mx, my, mz, Mx, My, Mz}
 };
 
 //////////////////////////////////////////////////////////////////////
-EFC_Visible	CFrustum::testSphere			(Fvector& c, float r, u32& test_mask) const
+EFC_Visible CFrustum::testSphere(Fvector& c, float r, u32& test_mask) const
 {
-	u32	bit = 1;
-	for (int i=0; i<p_count; i++, bit<<=1)
-	{
-		if (test_mask&bit) {
-			float cls = planes[i].classify	(c);
-			if (cls>r) { test_mask=0; return fcvNone;}	// none  - return
-			if (_abs(cls)>=r) test_mask&=~bit;			// fully - no need to test this plane
-		}
-	}
-	return test_mask ? fcvPartial:fcvFully;
+    u32 bit = 1;
+    for (int i = 0; i < p_count; i++, bit <<= 1)
+    {
+        if (test_mask&bit)
+        {
+            float cls = planes[i].classify(c);
+            if (cls > r) { test_mask = 0; return fcvNone; } // none - return
+            if (_abs(cls) >= r) test_mask &= ~bit; // fully - no need to test this plane
+        }
+    }
+    return test_mask ? fcvPartial : fcvFully;
 }
 
-BOOL	CFrustum::testSphere_dirty		(Fvector& c, float r) const
+BOOL CFrustum::testSphere_dirty(Fvector& c, float r) const
 {
-	switch (p_count) {
-		case 12:if (planes[11].classify(c)>r)	return FALSE;
-		case 11:if (planes[10].classify(c)>r)	return FALSE;
-		case 10:if (planes[9].classify(c)>r)	return FALSE;
-		case 9:	if (planes[8].classify(c)>r)	return FALSE;
-		case 8:	if (planes[7].classify(c)>r)	return FALSE;
-		case 7:	if (planes[6].classify(c)>r)	return FALSE;
-		case 6:	if (planes[5].classify(c)>r)	return FALSE;
-		case 5:	if (planes[4].classify(c)>r)	return FALSE;
-		case 4:	if (planes[3].classify(c)>r)	return FALSE;
-		case 3:	if (planes[2].classify(c)>r)	return FALSE;
-		case 2:	if (planes[1].classify(c)>r)	return FALSE;
-		case 1:	if (planes[0].classify(c)>r)	return FALSE;
-		case 0:	break;
-		default:	NODEFAULT;
-	}
-	return TRUE;
+    switch (p_count)
+    {
+    case 12:
+        if (planes[11].classify(c) > r) return FALSE;
+    case 11:
+        if (planes[10].classify(c) > r) return FALSE;
+    case 10:
+        if (planes[9].classify(c) > r) return FALSE;
+    case 9:
+        if (planes[8].classify(c) > r) return FALSE;
+    case 8:
+        if (planes[7].classify(c) > r) return FALSE;
+    case 7:
+        if (planes[6].classify(c) > r) return FALSE;
+    case 6:
+        if (planes[5].classify(c) > r) return FALSE;
+    case 5:
+        if (planes[4].classify(c) > r) return FALSE;
+    case 4:
+        if (planes[3].classify(c) > r) return FALSE;
+    case 3:
+        if (planes[2].classify(c) > r) return FALSE;
+    case 2:
+        if (planes[1].classify(c) > r) return FALSE;
+    case 1:
+        if (planes[0].classify(c) > r) return FALSE;
+    case 0:
+        break;
+    default:
+        NODEFAULT;
+    }
+    return TRUE;
 }
 
-EFC_Visible	CFrustum::testAABB			(const float* mM, u32& test_mask) const
+EFC_Visible CFrustum::testAABB(const float* mM, u32& test_mask) const
 {
-	// go for trivial rejection or acceptance using "faster overlap test"
-	u32		bit = 1;
-
-	for (int i=0; i<p_count; i++, bit<<=1)
-	{
-		if (test_mask&bit) {
-			EFC_Visible	r	= AABB_OverlapPlane(planes[i],mM);
-			if (fcvFully==r)	test_mask&=~bit;					// fully - no need to test this plane
-			else if (fcvNone==r){ test_mask=0; return fcvNone;	}	// none - return
-		}
-	}
-	return test_mask ? fcvPartial:fcvFully;
+    // go for trivial rejection or acceptance using "faster overlap test"
+    u32 bit = 1;
+
+    for (int i = 0; i < p_count; i++, bit <<= 1)
+    {
+        if (test_mask&bit)
+        {
+            EFC_Visible r = AABB_OverlapPlane(planes[i], mM);
+            if (fcvFully == r) test_mask &= ~bit; // fully - no need to test this plane
+            else if (fcvNone == r) { test_mask = 0; return fcvNone; } // none - return
+        }
+    }
+    return test_mask ? fcvPartial : fcvFully;
 }
 
-EFC_Visible	CFrustum::testSAABB			(Fvector& c, float r, const float* mM, u32& test_mask) const
+EFC_Visible CFrustum::testSAABB(Fvector& c, float r, const float* mM, u32& test_mask) const
 {
-	u32	bit = 1;
-	for (int i=0; i<p_count; i++, bit<<=1)
-	{
-		if (test_mask&bit) {
-			float cls = planes[i].classify(c);
-			if (cls>r) { test_mask=0; return fcvNone;}	// none  - return
-			if (_abs(cls)>=r) test_mask&=~bit;			// fully - no need to test this plane
-			else {
-				EFC_Visible	r	= AABB_OverlapPlane(planes[i],mM);
-				if (fcvFully==r)	test_mask&=~bit;					// fully - no need to test this plane
-				else if (fcvNone==r){ test_mask=0; return fcvNone;	}	// none - return
-			}
-		}
-	}
-	return test_mask ? fcvPartial:fcvFully;
+    u32 bit = 1;
+    for (int i = 0; i < p_count; i++, bit <<= 1)
+    {
+        if (test_mask&bit)
+        {
+            float cls = planes[i].classify(c);
+            if (cls > r) { test_mask = 0; return fcvNone; } // none - return
+            if (_abs(cls) >= r) test_mask &= ~bit; // fully - no need to test this plane
+            else
+            {
+                EFC_Visible r = AABB_OverlapPlane(planes[i], mM);
+                if (fcvFully == r) test_mask &= ~bit; // fully - no need to test this plane
+                else if (fcvNone == r) { test_mask = 0; return fcvNone; } // none - return
+            }
+        }
+    }
+    return test_mask ? fcvPartial : fcvFully;
 }
 
-BOOL		CFrustum::testPolyInside_dirty(Fvector* p, int count) const
+BOOL CFrustum::testPolyInside_dirty(Fvector* p, int count) const
 {
-	Fvector* e = p+count;
-	for (int i=0; i<p_count; i++)
-	{
-		const fplane &P = planes[i];
-		for (Fvector* I=p; I!=e; I++)
-			if (P.classify(*I)>0) return false;
-	}
-	return true;
+    Fvector* e = p + count;
+    for (int i = 0; i < p_count; i++)
+    {
+        const fplane& P = planes[i];
+        for (Fvector* I = p; I != e; I++)
+            if (P.classify(*I) > 0) return false;
+    }
+    return true;
 }
 
 //////////////////////////////////////////////////////////////////////
 void CFrustum::CreateFromPoints(Fvector* p, int count, Fvector& COP)
 {
-	VERIFY(count<FRUSTUM_MAXPLANES);
-	VERIFY(count>=3);
+    VERIFY(count < FRUSTUM_MAXPLANES);
+    VERIFY(count >= 3);
 
-	_clear();
-	for (int i=1; i<count; i++)
-		_add(COP,p[i-1],p[i]);
-	_add(COP,p[count-1],p[0]);
+    _clear();
+    for (int i = 1; i < count; i++)
+        _add(COP, p[i - 1], p[i]);
+    _add(COP, p[count - 1], p[0]);
 }
 
-void CFrustum::CreateFromPlanes(Fplane* p, int count){
-	for (int k=0; k<count; k++)
-		planes[k].set(p[k]);
-
-	for (int i=0;i<count;i++)	{
-		float denom		=	1.0f / planes[i].n.magnitude();// Get magnitude of Vector
-		planes[i].n.x	*=	denom;
-		planes[i].n.y	*=	denom;
-		planes[i].n.z	*=	denom;
-		planes[i].d		*=	denom;
-		planes[i].cache	();
-	}
-
-	p_count = count;
+void CFrustum::CreateFromPlanes(Fplane* p, int count)
+{
+    for (int k = 0; k < count; k++)
+        planes[k].set(p[k]);
+
+    for (int i = 0; i < count; i++)
+    {
+        float denom = 1.0f / planes[i].n.magnitude();// Get magnitude of Vector
+        planes[i].n.x *= denom;
+        planes[i].n.y *= denom;
+        planes[i].n.z *= denom;
+        planes[i].d *= denom;
+        planes[i].cache();
+    }
+
+    p_count = count;
 }
 
 void CFrustum::CreateFromPortal(sPoly* poly, Fvector& vPN, Fvector& vBase, Fmatrix& mFullXFORM)
 {
-	Fplane	P;
-	P.build_precise	((*poly)[0],(*poly)[1],(*poly)[2]);
-
-	if (poly->size()>6) {
-		SimplifyPoly_AABB(poly,P);
-		P.build_precise	((*poly)[0],(*poly)[1],(*poly)[2]);
-	}
-
-	// Check plane orientation relative to viewer
-	// and reverse if needed
-	if (P.classify(vBase)<0)
-	{
-		std::reverse(poly->begin(),poly->end());
-		P.build_precise	((*poly)[0],(*poly)[1],(*poly)[2]);
-	}
-
-	// Base creation
-	CreateFromPoints(poly->begin(),poly->size(),vBase);
-
-	// Near clipping plane
-	_add		(P);
-
-	// Far clipping plane
-	Fmatrix &M	= mFullXFORM;
-	P.n.x		= -(M._14 - M._13);
-	P.n.y		= -(M._24 - M._23);
-	P.n.z		= -(M._34 - M._33);
-	P.d			= -(M._44 - M._43);
-	float denom = 1.0f / P.n.magnitude();
-	P.n.x		*= denom;
-	P.n.y		*= denom;
-	P.n.z		*= denom;
-	P.d			*= denom;
-	_add		(P);
+    Fplane P;
+    P.build_precise((*poly)[0], (*poly)[1], (*poly)[2]);
+
+    if (poly->size()>6)
+    {
+        SimplifyPoly_AABB(poly, P);
+        P.build_precise((*poly)[0], (*poly)[1], (*poly)[2]);
+    }
+
+    // Check plane orientation relative to viewer
+    // and reverse if needed
+    if (P.classify(vBase) < 0)
+    {
+        std::reverse(poly->begin(), poly->end());
+        P.build_precise((*poly)[0], (*poly)[1], (*poly)[2]);
+    }
+
+    // Base creation
+    CreateFromPoints(poly->begin(), poly->size(), vBase);
+
+    // Near clipping plane
+    _add(P);
+
+    // Far clipping plane
+    Fmatrix& M = mFullXFORM;
+    P.n.x = -(M._14 - M._13);
+    P.n.y = -(M._24 - M._23);
+    P.n.z = -(M._34 - M._33);
+    P.d = -(M._44 - M._43);
+    float denom = 1.0f / P.n.magnitude();
+    P.n.x *= denom;
+    P.n.y *= denom;
+    P.n.z *= denom;
+    P.d *= denom;
+    _add(P);
 }
 
 void CFrustum::SimplifyPoly_AABB(sPoly* poly, Fplane& plane)
 {
-	Fmatrix		mView,mInv;
-	Fvector		from,up,right,y;
-	from.set	((*poly)[0]);
-	y.set		(0,1,0);
-	if (_abs(plane.n.y)>0.99f) y.set(1,0,0);
-	right.crossproduct		(y,plane.n);
-	up.crossproduct			(plane.n,right);
-	mView.build_camera_dir	(from,plane.n,up);
-
-	// Project and find extents
-	Fvector2	min,max;
-	min.set		(flt_max,flt_max);
-	max.set		(flt_min,flt_min);
-	for (u32 i=0; i<poly->size(); i++)
-	{
-		Fvector2 tmp;
-		mView.transform_tiny32(tmp,(*poly)[i]);
-		min.min(tmp.x,tmp.y);
-		max.max(tmp.x,tmp.y);
-	}
-
-	// Build other 2 points and inverse project
-	Fvector2	p1,p2;
-	p1.set		(min.x,max.y);
-	p2.set		(max.x,min.y);
-	mInv.invert	(mView);
-	poly->clear	();
-
-	mInv.transform_tiny23(poly->last(),min);	poly->inc();
-	mInv.transform_tiny23(poly->last(),p1);		poly->inc();
-	mInv.transform_tiny23(poly->last(),max);	poly->inc();
-	mInv.transform_tiny23(poly->last(),p2);		poly->inc();
+    Fmatrix mView, mInv;
+    Fvector from, up, right, y;
+    from.set((*poly)[0]);
+    y.set(0, 1, 0);
+    if (_abs(plane.n.y) > 0.99f) y.set(1, 0, 0);
+    right.crossproduct(y, plane.n);
+    up.crossproduct(plane.n, right);
+    mView.build_camera_dir(from, plane.n, up);
+
+    // Project and find extents
+    Fvector2 min, max;
+    min.set(flt_max, flt_max);
+    max.set(flt_min, flt_min);
+    for (u32 i = 0; i < poly->size(); i++)
+    {
+        Fvector2 tmp;
+        mView.transform_tiny32(tmp, (*poly)[i]);
+        min.min(tmp.x, tmp.y);
+        max.max(tmp.x, tmp.y);
+    }
+
+    // Build other 2 points and inverse project
+    Fvector2 p1, p2;
+    p1.set(min.x, max.y);
+    p2.set(max.x, min.y);
+    mInv.invert(mView);
+    poly->clear();
+
+    mInv.transform_tiny23(poly->last(), min);
+    poly->inc();
+    mInv.transform_tiny23(poly->last(), p1);
+    poly->inc();
+    mInv.transform_tiny23(poly->last(), max);
+    poly->inc();
+    mInv.transform_tiny23(poly->last(), p2);
+    poly->inc();
 }
 
 void CFrustum::CreateOccluder(Fvector* p, int count, Fvector& vBase, CFrustum& clip)
 {
-	VERIFY(count<FRUSTUM_SAFE);
-	VERIFY(count>=3);
-
-	BOOL	edge[FRUSTUM_SAFE];
-	float	cls	[FRUSTUM_SAFE];
-	ZeroMemory	(edge,sizeof(edge));
-	for (int i=0; i<clip.p_count; i++)
-	{
-		// classify all points relative to plane #i
-		fplane &P = clip.planes[i];
-		for (int j=0; j<count; j++) cls[j]=_abs(P.classify(p[j]));
-
-		// test edges to see which lies directly on plane
-		for (j=0; j<count; j++) {
-			if (cls[j]<EPS_L)
-			{
-				int next = j+1; if (next>=count) next=0;
-				if (cls[next]<EPS_L) {
-					// both points lies on plane - mark as 'open'
-					edge[j] = true;
-				}
-			}
-		}
-	}
-
-	// here we have all edges marked accordenly to 'open' / 'closed' classification
-	_clear	();
-	_add	(p[0],p[1],p[2]);		// main plane
-	for (i=0; i<count; i++)
-	{
-		if (!edge[i]) {
-			int next = i+1; if (next>=count) next=0;
-			_add(vBase,p[i],p[next]);
-		}
-	}
+    VERIFY(count < FRUSTUM_SAFE);
+    VERIFY(count >= 3);
+
+    BOOL edge[FRUSTUM_SAFE];
+    float cls[FRUSTUM_SAFE];
+    ZeroMemory(edge, sizeof(edge));
+    for (int i = 0; i < clip.p_count; i++)
+    {
+        // classify all points relative to plane #i
+        fplane& P = clip.planes[i];
+        for (int j = 0; j < count; j++) cls[j] = _abs(P.classify(p[j]));
+
+        // test edges to see which lies directly on plane
+        for (j = 0; j < count; j++)
+        {
+            if (cls[j] < EPS_L)
+            {
+                int next = j + 1;
+                if (next >= count) next = 0;
+                if (cls[next] < EPS_L)
+                {
+                    // both points lies on plane - mark as 'open'
+                    edge[j] = true;
+                }
+            }
+        }
+    }
+
+    // here we have all edges marked accordenly to 'open' / 'closed' classification
+    _clear();
+    _add(p[0], p[1], p[2]); // main plane
+    for (i = 0; i < count; i++)
+    {
+        if (!edge[i])
+        {
+            int next = i + 1;
+            if (next >= count) next = 0;
+            _add(vBase, p[i], p[next]);
+        }
+    }
 }
 
-sPoly*	CFrustum::ClipPoly(sPoly& S, sPoly& D) const
+sPoly* CFrustum::ClipPoly(sPoly& S, sPoly& D) const
 {
-	sPoly*	src		= &D;
-	sPoly*	dest	= &S;
-	for (int i=0; i<p_count; i++)
-	{
-		// cache plane and swap lists
-		const fplane &P = planes[i];
-		std::swap		(src,dest);
-		dest->clear		();
-
-		// classify all points relative to plane #i
-		float	cls	[FRUSTUM_SAFE];
-		for (u32 j=0; j<src->size(); j++) cls[j]=P.classify((*src)[j]);
-
-		// clip everything to this plane
-		cls[src->size()] = cls[0];
-		src->push_back((*src)[0]);
-		Fvector D; float denum,t;
-		for (j=0; j<src->size()-1; j++)
-		{
-			if ((*src)[j].similar((*src)[j+1],EPS_S)) continue;
-
-			if (negative(cls[j]))
-			{
-				dest->push_back((*src)[j]);
-				if (positive(cls[j+1]))
-				{
-					// segment intersects plane
-					D.sub((*src)[j+1],(*src)[j]);
-					denum = P.n.dotproduct(D);
-					if (denum!=0) {
-						t = -cls[j]/denum; //VERIFY(t<=1.f && t>=0);
-						dest->last().mad((*src)[j],D,t);
-						dest->inc();
-					}
-				}
-			} else {
-				// J - outside
-				if (negative(cls[j+1]))
-				{
-					// J+1  - inside
-					// segment intersects plane
-					D.sub((*src)[j+1],(*src)[j]);
-					denum = P.n.dotproduct(D);
-					if (denum!=0) {
-						t = -cls[j]/denum; //VERIFY(t<=1.f && t>=0);
-						dest->last().mad((*src)[j],D,t);
-						dest->inc();
-					}
-				}
-			}
-		}
-
-		// here we end up with complete polygon in 'dest' which is inside plane #i
-		if (dest->size()<3) return 0;
-	}
-	return dest;
+    sPoly* src = &D;
+    sPoly* dest = &S;
+    for (int i = 0; i < p_count; i++)
+    {
+        // cache plane and swap lists
+        const fplane& P = planes[i];
+        std::swap(src, dest);
+        dest->clear();
+
+        // classify all points relative to plane #i
+        float cls[FRUSTUM_SAFE];
+        for (u32 j = 0; j < src->size(); j++) cls[j] = P.classify((*src)[j]);
+
+        // clip everything to this plane
+        cls[src->size()] = cls[0];
+        src->push_back((*src)[0]);
+        Fvector D;
+        float denum, t;
+        for (j = 0; j < src->size() - 1; j++)
+        {
+            if ((*src)[j].similar((*src)[j + 1], EPS_S)) continue;
+
+            if (negative(cls[j]))
+            {
+                dest->push_back((*src)[j]);
+                if (positive(cls[j + 1]))
+                {
+                    // segment intersects plane
+                    D.sub((*src)[j + 1], (*src)[j]);
+                    denum = P.n.dotproduct(D);
+                    if (denum != 0)
+                    {
+                        t = -cls[j] / denum; //VERIFY(t<=1.f && t>=0);
+                        dest->last().mad((*src)[j], D, t);
+                        dest->inc();
+                    }
+                }
+            }
+            else
+            {
+                // J - outside
+                if (negative(cls[j + 1]))
+                {
+                    // J+1 - inside
+                    // segment intersects plane
+                    D.sub((*src)[j + 1], (*src)[j]);
+                    denum = P.n.dotproduct(D);
+                    if (denum != 0)
+                    {
+                        t = -cls[j] / denum; //VERIFY(t<=1.f && t>=0);
+                        dest->last().mad((*src)[j], D, t);
+                        dest->inc();
+                    }
+                }
+            }
+        }
+
+        // here we end up with complete polygon in 'dest' which is inside plane #i
+        if (dest->size() < 3) return 0;
+    }
+    return dest;
 }
 
 BOOL CFrustum::CreateFromClipPoly(Fvector* p, int count, Fvector& vBase, CFrustum& clip)
 {
-	VERIFY(count<FRUSTUM_MAXPLANES);
-	VERIFY(count>=3);
+    VERIFY(count < FRUSTUM_MAXPLANES);
+    VERIFY(count >= 3);
 
-	sPoly	poly1	(p,count);
-	sPoly	poly2;
-	sPoly*	dest	= clip.ClipPoly(poly1,poly2);
+    sPoly poly1(p, count);
+    sPoly poly2;
+    sPoly* dest = clip.ClipPoly(poly1, poly2);
 
-	// here we end up with complete frustum-polygon in 'dest'
-	if (0==dest)	return false;
+    // here we end up with complete frustum-polygon in 'dest'
+    if (0 == dest) return false;
 
-	CreateFromPoints(dest->begin(),dest->size(),vBase);
-	return	true;
+    CreateFromPoints(dest->begin(), dest->size(), vBase);
+    return true;
 }
 
-void CFrustum::CreateFromMatrix(Fmatrix &M, u32 mask)
+void CFrustum::CreateFromMatrix(Fmatrix& M, u32 mask)
 {
-	VERIFY			(_valid(M));
-	p_count			= 0;
-
-	// Left clipping plane
-	if (mask&FRUSTUM_P_LEFT)
-	{
-		planes[p_count].n.x		= -(M._14 + M._11);
-		planes[p_count].n.y		= -(M._24 + M._21);
-		planes[p_count].n.z		= -(M._34 + M._31);
-		planes[p_count].d		= -(M._44 + M._41);
-		p_count++;
-	}
-
-	// Right clipping plane
-	if (mask&FRUSTUM_P_RIGHT)
-	{
-		planes[p_count].n.x		= -(M._14 - M._11);
-		planes[p_count].n.y		= -(M._24 - M._21);
-		planes[p_count].n.z		= -(M._34 - M._31);
-		planes[p_count].d		= -(M._44 - M._41);
-		p_count++;
-	}
-
-	// Top clipping plane
-	if (mask&FRUSTUM_P_TOP)
-	{
-		planes[p_count].n.x		= -(M._14 - M._12);
-		planes[p_count].n.y		= -(M._24 - M._22);
-		planes[p_count].n.z		= -(M._34 - M._32);
-		planes[p_count].d		= -(M._44 - M._42);
-		p_count++;
-	}
-
-	// Bottom clipping plane
-	if (mask&FRUSTUM_P_BOTTOM)
-	{
-		planes[p_count].n.x		= -(M._14 + M._12);
-		planes[p_count].n.y		= -(M._24 + M._22);
-		planes[p_count].n.z		= -(M._34 + M._32);
-		planes[p_count].d		= -(M._44 + M._42);
-		p_count++;
-	}
-
-	// Far clipping plane
-	if (mask&FRUSTUM_P_FAR)
-	{
-		planes[p_count].n.x		= -(M._14 - M._13);
-		planes[p_count].n.y		= -(M._24 - M._23);
-		planes[p_count].n.z		= -(M._34 - M._33);
-		planes[p_count].d		= -(M._44 - M._43);
-		p_count++;
-	}
-
-	// Near clipping plane
-	if (mask&FRUSTUM_P_NEAR)
-	{
-		planes[p_count].n.x		= -(M._14 + M._13);
-		planes[p_count].n.y		= -(M._24 + M._23);
-		planes[p_count].n.z		= -(M._34 + M._33);
-		planes[p_count].d		= -(M._44 + M._43);
-		p_count++;
-	}
-
-	for (int i=0;i<p_count;i++)
-	{
-		float denom		= 1.0f / planes[i].n.magnitude();// Get magnitude of Vector
-		planes[i].n.x	*= denom;
-		planes[i].n.y	*= denom;
-		planes[i].n.z	*= denom;
-		planes[i].d		*= denom;
-		planes[i].cache	();
-	}
+    VERIFY(_valid(M));
+    p_count = 0;
+
+    // Left clipping plane
+    if (mask&FRUSTUM_P_LEFT)
+    {
+        planes[p_count].n.x = -(M._14 + M._11);
+        planes[p_count].n.y = -(M._24 + M._21);
+        planes[p_count].n.z = -(M._34 + M._31);
+        planes[p_count].d = -(M._44 + M._41);
+        p_count++;
+    }
+
+    // Right clipping plane
+    if (mask&FRUSTUM_P_RIGHT)
+    {
+        planes[p_count].n.x = -(M._14 - M._11);
+        planes[p_count].n.y = -(M._24 - M._21);
+        planes[p_count].n.z = -(M._34 - M._31);
+        planes[p_count].d = -(M._44 - M._41);
+        p_count++;
+    }
+
+    // Top clipping plane
+    if (mask&FRUSTUM_P_TOP)
+    {
+        planes[p_count].n.x = -(M._14 - M._12);
+        planes[p_count].n.y = -(M._24 - M._22);
+        planes[p_count].n.z = -(M._34 - M._32);
+        planes[p_count].d = -(M._44 - M._42);
+        p_count++;
+    }
+
+    // Bottom clipping plane
+    if (mask&FRUSTUM_P_BOTTOM)
+    {
+        planes[p_count].n.x = -(M._14 + M._12);
+        planes[p_count].n.y = -(M._24 + M._22);
+        planes[p_count].n.z = -(M._34 + M._32);
+        planes[p_count].d = -(M._44 + M._42);
+        p_count++;
+    }
+
+    // Far clipping plane
+    if (mask&FRUSTUM_P_FAR)
+    {
+        planes[p_count].n.x = -(M._14 - M._13);
+        planes[p_count].n.y = -(M._24 - M._23);
+        planes[p_count].n.z = -(M._34 - M._33);
+        planes[p_count].d = -(M._44 - M._43);
+        p_count++;
+    }
+
+    // Near clipping plane
+    if (mask&FRUSTUM_P_NEAR)
+    {
+        planes[p_count].n.x = -(M._14 + M._13);
+        planes[p_count].n.y = -(M._24 + M._23);
+        planes[p_count].n.z = -(M._34 + M._33);
+        planes[p_count].d = -(M._44 + M._43);
+        p_count++;
+    }
+
+    for (int i = 0; i < p_count; i++)
+    {
+        float denom = 1.0f / planes[i].n.magnitude();// Get magnitude of Vector
+        planes[i].n.x *= denom;
+        planes[i].n.y *= denom;
+        planes[i].n.z *= denom;
+        planes[i].d *= denom;
+        planes[i].cache();
+    }
 }
diff --git a/src/xrEngine/Frustum.h b/src/xrEngine/Frustum.h
index 4216f9d4f03..4cd4bef58a9 100644
--- a/src/xrEngine/Frustum.h
+++ b/src/xrEngine/Frustum.h
@@ -10,87 +10,88 @@
 
 #pragma pack(push,4)
 
-enum EFC_Visible {
-	fcvNone = 0,
-	fcvPartial,
-	fcvFully,
-	fcv_forcedword = u32(-1)
+enum EFC_Visible
+{
+    fcvNone = 0,
+    fcvPartial,
+    fcvFully,
+    fcv_forcedword = u32(-1)
 };
 
-#define FRUSTUM_MAXPLANES	12
-#define FRUSTUM_P_LEFT		(1<<0)
-#define FRUSTUM_P_RIGHT		(1<<1)
-#define FRUSTUM_P_TOP		(1<<2)
-#define FRUSTUM_P_BOTTOM	(1<<3)
-#define FRUSTUM_P_NEAR		(1<<4)
-#define FRUSTUM_P_FAR		(1<<5)
+#define FRUSTUM_MAXPLANES 12
+#define FRUSTUM_P_LEFT (1<<0)
+#define FRUSTUM_P_RIGHT (1<<1)
+#define FRUSTUM_P_TOP (1<<2)
+#define FRUSTUM_P_BOTTOM (1<<3)
+#define FRUSTUM_P_NEAR (1<<4)
+#define FRUSTUM_P_FAR (1<<5)
 
-#define FRUSTUM_P_LRTB		(FRUSTUM_P_LEFT|FRUSTUM_P_RIGHT|FRUSTUM_P_TOP|FRUSTUM_P_BOTTOM)
-#define FRUSTUM_P_ALL		(FRUSTUM_P_LRTB|FRUSTUM_P_NEAR|FRUSTUM_P_FAR)
+#define FRUSTUM_P_LRTB (FRUSTUM_P_LEFT|FRUSTUM_P_RIGHT|FRUSTUM_P_TOP|FRUSTUM_P_BOTTOM)
+#define FRUSTUM_P_ALL (FRUSTUM_P_LRTB|FRUSTUM_P_NEAR|FRUSTUM_P_FAR)
 
-#define FRUSTUM_SAFE		(FRUSTUM_MAXPLANES*4)
-typedef svector<Fvector,FRUSTUM_SAFE>		sPoly;
-ENGINE_API		extern	u32	frustum_aabb_remap[8][6];
+#define FRUSTUM_SAFE (FRUSTUM_MAXPLANES*4)
+typedef svector<Fvector, FRUSTUM_SAFE> sPoly;
+ENGINE_API extern u32 frustum_aabb_remap[8][6];
 
-class ENGINE_API	CFrustum
+class ENGINE_API CFrustum
 {
 public:
-	struct fplane	: public Fplane
-	{
-		u32			aabb_overlap_id;	// [0..7]
-		void		cache	();	
-	};
-	fplane			planes	[FRUSTUM_MAXPLANES];
-	int				p_count;
+    struct fplane : public Fplane
+    {
+        u32 aabb_overlap_id; // [0..7]
+        void cache();
+    };
+    fplane planes[FRUSTUM_MAXPLANES];
+    int p_count;
 
 public:
-	ICF EFC_Visible		AABB_OverlapPlane	(const fplane& P, const float* mM) const
-	{
-		// calc extreme pts (neg,pos) along normal axis (pos in dir of norm, etc.)
-		u32*	id		= frustum_aabb_remap[P.aabb_overlap_id];
+    ICF EFC_Visible AABB_OverlapPlane(const fplane& P, const float* mM) const
+    {
+        // calc extreme pts (neg,pos) along normal axis (pos in dir of norm, etc.)
+        u32* id = frustum_aabb_remap[P.aabb_overlap_id];
 
-		Fvector			Neg;
-		Neg.set			(mM[id[3]],mM[id[4]],mM[id[5]]);
-		if				(P.classify(Neg) > 0)	return	fcvNone;
+        Fvector Neg;
+        Neg.set(mM[id[3]], mM[id[4]], mM[id[5]]);
+        if (P.classify(Neg) > 0) return fcvNone;
 
-		Fvector			Pos;
-		Pos.set			(mM[id[0]],mM[id[1]],mM[id[2]]);
-		if				(P.classify(Pos) <= 0)	return	fcvFully;
+        Fvector Pos;
+        Pos.set(mM[id[0]], mM[id[1]], mM[id[2]]);
+        if (P.classify(Pos) <= 0) return fcvFully;
 
-		return			fcvPartial;
-	}
+        return fcvPartial;
+    }
 public:
-	IC void			_clear				()				{ p_count=0; }
-	void			_add				(Fplane &P);
-	void			_add				(Fvector& P1, Fvector& P2, Fvector& P3);
+    IC void _clear() { p_count = 0; }
+    void _add(Fplane& P);
+    void _add(Fvector& P1, Fvector& P2, Fvector& P3);
 
-	void			SimplifyPoly_AABB	(sPoly* P, Fplane& plane);
+    void SimplifyPoly_AABB(sPoly* P, Fplane& plane);
 
-	void			CreateOccluder		(Fvector* p,	int count,		Fvector& vBase, CFrustum& clip);
-	BOOL			CreateFromClipPoly	(Fvector* p,	int count,		Fvector& vBase, CFrustum& clip);	// returns 'false' if creation failed
-	void			CreateFromPoints	(Fvector* p,	int count,		Fvector& vBase );
-	void			CreateFromMatrix	(Fmatrix &M,	u32 mask);
-	void			CreateFromPortal	(sPoly* P,		Fvector& vPN,	Fvector& vBase, Fmatrix& mFullXFORM);
-	void			CreateFromPlanes	(Fplane* p,		int count);
+    void CreateOccluder(Fvector* p, int count, Fvector& vBase, CFrustum& clip);
+    BOOL CreateFromClipPoly(Fvector* p, int count, Fvector& vBase, CFrustum& clip); // returns 'false' if creation failed
+    void CreateFromPoints(Fvector* p, int count, Fvector& vBase);
+    void CreateFromMatrix(Fmatrix& M, u32 mask);
+    void CreateFromPortal(sPoly* P, Fvector& vPN, Fvector& vBase, Fmatrix& mFullXFORM);
+    void CreateFromPlanes(Fplane* p, int count);
 
-	sPoly*			ClipPoly			(sPoly& src, sPoly& dest) const;
+    sPoly* ClipPoly(sPoly& src, sPoly& dest) const;
 
-	u32				getMask				() const { return (1<<p_count)-1; }
+    u32 getMask() const { return (1 << p_count) - 1; }
 
-	EFC_Visible		testSphere			(Fvector& c, float r, u32& test_mask)					const;
-	BOOL			testSphere_dirty	(Fvector& c, float r)									const;
-	EFC_Visible		testAABB			(const float* mM, u32& test_mask)						const;
-	EFC_Visible		testSAABB			(Fvector& c, float r, const float* mM, u32& test_mask)	const;
-	BOOL			testPolyInside_dirty(Fvector* p, int count)									const;
+    EFC_Visible testSphere(Fvector& c, float r, u32& test_mask) const;
+    BOOL testSphere_dirty(Fvector& c, float r) const;
+    EFC_Visible testAABB(const float* mM, u32& test_mask) const;
+    EFC_Visible testSAABB(Fvector& c, float r, const float* mM, u32& test_mask) const;
+    BOOL testPolyInside_dirty(Fvector* p, int count) const;
 
-	IC BOOL			testPolyInside		(sPoly& src)											const
+    IC BOOL testPolyInside(sPoly& src) const
     {
-    	sPoly d;
-        return !!ClipPoly(src,d);
+        sPoly d;
+        return !!ClipPoly(src, d);
     }
-   	IC BOOL			testPolyInside		(Fvector* p, int count)									const
+    IC BOOL testPolyInside(Fvector* p, int count) const
     {
-    	sPoly src(p,count);
+        sPoly src(p, count);
         return testPolyInside(src);
     }
 };
diff --git a/src/xrEngine/GameFont.cpp b/src/xrEngine/GameFont.cpp
index 39f18ff3e3d..b047bddb2fb 100644
--- a/src/xrEngine/GameFont.cpp
+++ b/src/xrEngine/GameFont.cpp
@@ -3,15 +3,15 @@
 
 #include "GameFont.h"
 #ifndef _EDITOR
-    #include "Render.h"
+#include "Render.h"
 #endif
 #ifdef _EDITOR
 unsigned short int mbhMulti2Wide
-	( wide_char *WideStr , wide_char *WidePos , const unsigned short int WideStrSize , const char *MultiStr  ){return 0;};
+( wide_char* WideStr , wide_char* WidePos , const unsigned short int WideStrSize , const char* MultiStr ) {return 0;};
 #endif
 
-extern ENGINE_API BOOL g_bRendering; 
-ENGINE_API Fvector2		g_current_font_scale={1.0f,1.0f};
+extern ENGINE_API BOOL g_bRendering;
+ENGINE_API Fvector2 g_current_font_scale = {1.0f, 1.0f};
 
 #include "../Include/xrAPI/xrAPI.h"
 #include "../Include/xrRender/RenderFactory.h"
@@ -19,359 +19,382 @@ ENGINE_API Fvector2		g_current_font_scale={1.0f,1.0f};
 
 CGameFont::CGameFont(LPCSTR section, u32 flags)
 {
-	pFontRender					= RenderFactory->CreateFontRender();
-	fCurrentHeight				= 0.0f;
-	fXStep						= 0.0f;
-	fYStep						= 0.0f;
-	uFlags						= flags;
-	nNumChars					= 0x100;
-	TCMap						= NULL;
-	Initialize	(pSettings->r_string(section,"shader"),pSettings->r_string(section,"texture"));
-	if (pSettings->line_exist(section,"size")){
-		float sz = pSettings->r_float(section,"size");
-		if (uFlags&fsDeviceIndependent)	SetHeightI(sz);
-		else							SetHeight(sz);
-	}
-	if (pSettings->line_exist(section,"interval"))
-		SetInterval(pSettings->r_fvector2(section,"interval"));
+    pFontRender = RenderFactory->CreateFontRender();
+    fCurrentHeight = 0.0f;
+    fXStep = 0.0f;
+    fYStep = 0.0f;
+    uFlags = flags;
+    nNumChars = 0x100;
+    TCMap = NULL;
+    Initialize(pSettings->r_string(section, "shader"), pSettings->r_string(section, "texture"));
+    if (pSettings->line_exist(section, "size"))
+    {
+        float sz = pSettings->r_float(section, "size");
+        if (uFlags&fsDeviceIndependent) SetHeightI(sz);
+        else SetHeight(sz);
+    }
+    if (pSettings->line_exist(section, "interval"))
+        SetInterval(pSettings->r_fvector2(section, "interval"));
 }
 
 CGameFont::CGameFont(LPCSTR shader, LPCSTR texture, u32 flags)
 {
-	pFontRender					= RenderFactory->CreateFontRender();
-	fCurrentHeight				= 0.0f;
-	fXStep						= 0.0f;
-	fYStep						= 0.0f;
-	uFlags						= flags;
-	nNumChars					= 0x100;
-	TCMap						= NULL;
-	Initialize					(shader,texture);
+    pFontRender = RenderFactory->CreateFontRender();
+    fCurrentHeight = 0.0f;
+    fXStep = 0.0f;
+    fYStep = 0.0f;
+    uFlags = flags;
+    nNumChars = 0x100;
+    TCMap = NULL;
+    Initialize(shader, texture);
 }
 
-void CGameFont::Initialize		(LPCSTR cShader, LPCSTR cTextureName)
+void CGameFont::Initialize(LPCSTR cShader, LPCSTR cTextureName)
 {
-	string_path					cTexture;
-
-	LPCSTR _lang				= pSettings->r_string("string_table", "font_prefix");
-	bool is_di					= strstr(cTextureName, "ui_font_hud_01") || 
-								  strstr(cTextureName, "ui_font_hud_02") ||
-								  strstr(cTextureName, "ui_font_console_02");
-	if(_lang && !is_di)
-		strconcat				(sizeof(cTexture),cTexture, cTextureName, _lang);
-	else
-		xr_strcpy				(cTexture, sizeof(cTexture), cTextureName);
-
-	uFlags						&=~fsValid;
-	vTS.set						(1.f,1.f); // îáÿçàòåëüíî !!!
-
-	eCurrentAlignment			= alLeft;
-	vInterval.set				(1.f,1.f);
-
-	strings.reserve				(128);
-
-	// check ini exist
-	string_path fn,buf;
-	xr_strcpy		(buf,cTexture); if (strext(buf)) *strext(buf)=0;
-	R_ASSERT2	(FS.exist(fn,"$game_textures$",buf,".ini"),fn);
-	CInifile* ini				= CInifile::Create(fn);
-
-	nNumChars = 0x100;
-	TCMap = ( Fvector* ) xr_realloc( ( void* ) TCMap , nNumChars * sizeof( Fvector ) );
-
-	if ( ini->section_exist( "mb_symbol_coords" ) ) {
-		nNumChars = 0x10000;
-		TCMap = ( Fvector* ) xr_realloc( ( void* ) TCMap , nNumChars * sizeof( Fvector ) );
-		uFlags |= fsMultibyte;
-		fHeight = ini->r_float( "mb_symbol_coords" , "height" );
-		
-		fXStep = ceil( fHeight / 2.0f );
-
-		// Searching for the first valid character
-
-		Fvector vFirstValid = {0,0,0};
-
-		if ( ini->line_exist( "mb_symbol_coords" , "09608" ) ) {
-			Fvector v = ini->r_fvector3( "mb_symbol_coords" , "09608" );
-			vFirstValid.set( v.x , v.y , 1 + v[2] - v[0] );
-		} else 
-		for ( u32 i=0 ; i < nNumChars ; i++ ) {
-			xr_sprintf( buf ,sizeof(buf), "%05d" , i );
-			if ( ini->line_exist( "mb_symbol_coords" , buf ) ) {
-				Fvector v = ini->r_fvector3( "mb_symbol_coords" , buf );
-				vFirstValid.set( v.x , v.y , 1 + v[2] - v[0] );
-				break;
-			}
-		}
-
-		// Filling entire character table
-
-		for ( u32 i=0 ; i < nNumChars ; i++ ) {
-			xr_sprintf( buf ,sizeof(buf), "%05d" , i );
-			if ( ini->line_exist( "mb_symbol_coords" , buf ) ) {
-				Fvector v = ini->r_fvector3( "mb_symbol_coords" , buf );
-				TCMap[i].set( v.x , v.y , 1 + v[2] - v[0] );
-			} else
-				TCMap[i] = vFirstValid; // "unassigned" unprintable characters
-		}
-
-		// Special case for space
-		TCMap[ 0x0020 ].set( 0 , 0 , 0 );
-		// Special case for ideographic space
-		TCMap[ 0x3000 ].set( 0 , 0 , 0 );
-
-
-	}else
-	if (ini->section_exist("symbol_coords"))
-	{
-		float d						= 0.0f;
-//.		if(ini->section_exist("width_correction"))
-//.			d						= ini->r_float("width_correction", "value");
-
-		fHeight						= ini->r_float("symbol_coords","height");
-		for (u32 i=0; i<nNumChars; i++){
-			xr_sprintf				(buf,sizeof(buf),"%03d",i);
-			Fvector v				= ini->r_fvector3("symbol_coords",buf);
-			TCMap[i].set			(v.x,v.y,v[2]-v[0]+d);
-		}
-	}else{
-	if (ini->section_exist("char widths")){
-		fHeight					= ini->r_float("char widths","height");
-		int cpl					= 16;
-		for (u32 i=0; i<nNumChars; i++){
-			xr_sprintf			(buf,sizeof(buf),"%d",i);
-			float w				= ini->r_float("char widths",buf);
-			TCMap[i].set		((i%cpl)*fHeight,(i/cpl)*fHeight,w);
-		}
-	}else{
-		R_ASSERT(ini->section_exist("font_size"));
-		fHeight					= ini->r_float("font_size","height");
-		float width				= ini->r_float("font_size","width");
-		const int cpl			= ini->r_s32	("font_size","cpl");
-		for (u32 i=0; i<nNumChars; i++)
-			TCMap[i].set		((i%cpl)*width,(i/cpl)*fHeight,width);
-		}
-	}
-
-	fCurrentHeight				= fHeight;
-
-	CInifile::Destroy			(ini);
-
-	// Shading
-	pFontRender->Initialize(cShader, cTexture);
+    string_path cTexture;
+
+    LPCSTR _lang = pSettings->r_string("string_table", "font_prefix");
+    bool is_di = strstr(cTextureName, "ui_font_hud_01") ||
+        strstr(cTextureName, "ui_font_hud_02") ||
+        strstr(cTextureName, "ui_font_console_02");
+    if (_lang && !is_di)
+        strconcat(sizeof(cTexture), cTexture, cTextureName, _lang);
+    else
+        xr_strcpy(cTexture, sizeof(cTexture), cTextureName);
+
+    uFlags &= ~fsValid;
+    vTS.set(1.f, 1.f); // îáÿçàòåëüíî !!!
+
+    eCurrentAlignment = alLeft;
+    vInterval.set(1.f, 1.f);
+
+    strings.reserve(128);
+
+    // check ini exist
+    string_path fn, buf;
+    xr_strcpy(buf, cTexture);
+    if (strext(buf)) *strext(buf) = 0;
+    R_ASSERT2(FS.exist(fn, "$game_textures$", buf, ".ini"), fn);
+    CInifile* ini = CInifile::Create(fn);
+
+    nNumChars = 0x100;
+    TCMap = (Fvector*)xr_realloc((void*)TCMap, nNumChars * sizeof(Fvector));
+
+    if (ini->section_exist("mb_symbol_coords"))
+    {
+        nNumChars = 0x10000;
+        TCMap = (Fvector*)xr_realloc((void*)TCMap, nNumChars * sizeof(Fvector));
+        uFlags |= fsMultibyte;
+        fHeight = ini->r_float("mb_symbol_coords", "height");
+
+        fXStep = ceil(fHeight / 2.0f);
+
+        // Searching for the first valid character
+
+        Fvector vFirstValid = {0, 0, 0};
+
+        if (ini->line_exist("mb_symbol_coords", "09608"))
+        {
+            Fvector v = ini->r_fvector3("mb_symbol_coords", "09608");
+            vFirstValid.set(v.x, v.y, 1 + v[2] - v[0]);
+        }
+        else
+            for (u32 i = 0; i < nNumChars; i++)
+            {
+            xr_sprintf(buf, sizeof(buf), "%05d", i);
+            if (ini->line_exist("mb_symbol_coords", buf))
+            {
+                Fvector v = ini->r_fvector3("mb_symbol_coords", buf);
+                vFirstValid.set(v.x, v.y, 1 + v[2] - v[0]);
+                break;
+            }
+            }
+
+        // Filling entire character table
+
+        for (u32 i = 0; i < nNumChars; i++)
+        {
+            xr_sprintf(buf, sizeof(buf), "%05d", i);
+            if (ini->line_exist("mb_symbol_coords", buf))
+            {
+                Fvector v = ini->r_fvector3("mb_symbol_coords", buf);
+                TCMap[i].set(v.x, v.y, 1 + v[2] - v[0]);
+            }
+            else
+                TCMap[i] = vFirstValid; // "unassigned" unprintable characters
+        }
+
+        // Special case for space
+        TCMap[0x0020].set(0, 0, 0);
+        // Special case for ideographic space
+        TCMap[0x3000].set(0, 0, 0);
+
+
+    }
+    else if (ini->section_exist("symbol_coords"))
+    {
+        float d = 0.0f;
+        //. if(ini->section_exist("width_correction"))
+        //. d = ini->r_float("width_correction", "value");
+
+        fHeight = ini->r_float("symbol_coords", "height");
+        for (u32 i = 0; i < nNumChars; i++)
+        {
+            xr_sprintf(buf, sizeof(buf), "%03d", i);
+            Fvector v = ini->r_fvector3("symbol_coords", buf);
+            TCMap[i].set(v.x, v.y, v[2] - v[0] + d);
+        }
+    }
+    else
+    {
+        if (ini->section_exist("char widths"))
+        {
+            fHeight = ini->r_float("char widths", "height");
+            int cpl = 16;
+            for (u32 i = 0; i < nNumChars; i++)
+            {
+                xr_sprintf(buf, sizeof(buf), "%d", i);
+                float w = ini->r_float("char widths", buf);
+                TCMap[i].set((i%cpl)*fHeight, (i / cpl)*fHeight, w);
+            }
+        }
+        else
+        {
+            R_ASSERT(ini->section_exist("font_size"));
+            fHeight = ini->r_float("font_size", "height");
+            float width = ini->r_float("font_size", "width");
+            const int cpl = ini->r_s32("font_size", "cpl");
+            for (u32 i = 0; i < nNumChars; i++)
+                TCMap[i].set((i%cpl)*width, (i / cpl)*fHeight, width);
+        }
+    }
+
+    fCurrentHeight = fHeight;
+
+    CInifile::Destroy(ini);
+
+    // Shading
+    pFontRender->Initialize(cShader, cTexture);
 }
 
 CGameFont::~CGameFont()
 {
-	if ( TCMap )
-		xr_free( TCMap );
+    if (TCMap)
+        xr_free(TCMap);
 
-	// Shading
-	RenderFactory->DestroyFontRender(pFontRender);
+    // Shading
+    RenderFactory->DestroyFontRender(pFontRender);
 }
 
 #define DI2PX(x) float(iFloor((x+1)*float(::Render->getTarget()->get_width())*0.5f))
 #define DI2PY(y) float(iFloor((y+1)*float(::Render->getTarget()->get_height())*0.5f))
 
-void CGameFont::OutSet			(float x, float y)
+void CGameFont::OutSet(float x, float y)
 {
-	fCurrentX=x;
-	fCurrentY=y;
+    fCurrentX = x;
+    fCurrentY = y;
 }
 
-void CGameFont::OutSetI			(float x, float y)
+void CGameFont::OutSetI(float x, float y)
 {
-	OutSet(DI2PX(x),DI2PY(y));
+    OutSet(DI2PX(x), DI2PY(y));
 }
 
-u32 CGameFont::smart_strlen( const char* S )
+u32 CGameFont::smart_strlen(const char* S)
 {
-	return ( IsMultibyte() ? mbhMulti2Wide( NULL , NULL , 0 , S ) : xr_strlen( S ) );
+    return (IsMultibyte() ? mbhMulti2Wide(NULL, NULL, 0, S) : xr_strlen(S));
 }
 
 void CGameFont::OnRender()
 {
-	pFontRender->OnRender(*this);
-	strings.clear_not_free();
+    pFontRender->OnRender(*this);
+    strings.clear_not_free();
 }
 
-u16 CGameFont::GetCutLengthPos( float fTargetWidth , const char * pszText )
+u16 CGameFont::GetCutLengthPos(float fTargetWidth, const char* pszText)
 {
-	VERIFY( pszText );
+    VERIFY(pszText);
 
-	wide_char wsStr[ MAX_MB_CHARS ], wsPos[ MAX_MB_CHARS ];
-	float fCurWidth = 0.0f , fDelta = 0.0f;
+    wide_char wsStr[MAX_MB_CHARS], wsPos[MAX_MB_CHARS];
+    float fCurWidth = 0.0f, fDelta = 0.0f;
 
-	u16	len	= mbhMulti2Wide( wsStr , wsPos , MAX_MB_CHARS , pszText );
+    u16 len = mbhMulti2Wide(wsStr, wsPos, MAX_MB_CHARS, pszText);
 
-	for ( u16 i = 1 ; i <= len ; i++ ) {
+    for (u16 i = 1; i <= len; i++)
+    {
 
-		fDelta = GetCharTC( wsStr[ i ] ).z - 2;
+        fDelta = GetCharTC(wsStr[i]).z - 2;
 
-		if ( IsNeedSpaceCharacter( wsStr[ i ] ) )
-			fDelta += fXStep;
+        if (IsNeedSpaceCharacter(wsStr[i]))
+            fDelta += fXStep;
 
-		if ( ( fCurWidth + fDelta ) > fTargetWidth )
-			break;
-		else 
-			fCurWidth += fDelta;
-	}
+        if ((fCurWidth + fDelta) > fTargetWidth)
+            break;
+        else
+            fCurWidth += fDelta;
+    }
 
-	return wsPos[ i - 1 ];
+    return wsPos[i - 1];
 }
 
-u16 CGameFont::SplitByWidth( u16 * puBuffer , u16 uBufferSize , float fTargetWidth , const char * pszText )
+u16 CGameFont::SplitByWidth(u16* puBuffer, u16 uBufferSize, float fTargetWidth, const char* pszText)
 {
-	VERIFY( puBuffer && uBufferSize && pszText );
+    VERIFY(puBuffer && uBufferSize && pszText);
 
-	wide_char wsStr[ MAX_MB_CHARS ] , wsPos[ MAX_MB_CHARS ];
-	float fCurWidth = 0.0f , fDelta = 0.0f;
-	u16 nLines = 0;
+    wide_char wsStr[MAX_MB_CHARS], wsPos[MAX_MB_CHARS];
+    float fCurWidth = 0.0f, fDelta = 0.0f;
+    u16 nLines = 0;
 
-	u16	len	= mbhMulti2Wide( wsStr , wsPos , MAX_MB_CHARS , pszText );
+    u16 len = mbhMulti2Wide(wsStr, wsPos, MAX_MB_CHARS, pszText);
 
-	for ( u16 i = 1 ; i <= len ; i++ ) {
+    for (u16 i = 1; i <= len; i++)
+    {
 
-		fDelta = GetCharTC( wsStr[ i ] ).z - 2;
+        fDelta = GetCharTC(wsStr[i]).z - 2;
 
-		if ( IsNeedSpaceCharacter( wsStr[ i ] ) )
-			fDelta += fXStep;
+        if (IsNeedSpaceCharacter(wsStr[i]))
+            fDelta += fXStep;
 
-		if ( 
-				( ( fCurWidth + fDelta ) > fTargetWidth ) && // overlength
-				( ! IsBadStartCharacter( wsStr[ i ] ) ) && // can start with this character
-				( i < len ) && // is not the last character
-				( ( i > 1 ) && ( ! IsBadEndCharacter( wsStr[ i - 1 ] ) ) ) // && // do not stop the string on a "bad" character
-//				( ( i > 1 ) && ( ! ( ( IsAlphaCharacter( wsStr[ i - 1 ] ) ) && (  IsAlphaCharacter( wsStr[ i ] ) ) ) ) ) // do not split numbers or words
-		) {
-			fCurWidth = fDelta;
-			VERIFY( nLines < uBufferSize );
-			puBuffer[ nLines++ ] = wsPos[ i - 1 ];
-		} else 
-			fCurWidth += fDelta;
-	}
+        if (
+            ((fCurWidth + fDelta) > fTargetWidth) && // overlength
+            (!IsBadStartCharacter(wsStr[i])) && // can start with this character
+            (i < len) && // is not the last character
+            ((i > 1) && (!IsBadEndCharacter(wsStr[i - 1]))) // && // do not stop the string on a "bad" character
+            // ( ( i > 1 ) && ( ! ( ( IsAlphaCharacter( wsStr[ i - 1 ] ) ) && ( IsAlphaCharacter( wsStr[ i ] ) ) ) ) ) // do not split numbers or words
+            )
+        {
+            fCurWidth = fDelta;
+            VERIFY(nLines < uBufferSize);
+            puBuffer[nLines++] = wsPos[i - 1];
+        }
+        else
+            fCurWidth += fDelta;
+    }
 
-	return nLines;
-}
+    return nLines;
+    }
 
 void CGameFont::MasterOut(
-	BOOL bCheckDevice , BOOL bUseCoords , BOOL bScaleCoords , BOOL bUseSkip , 
-	float _x , float _y , float _skip , LPCSTR fmt , va_list p )
+    BOOL bCheckDevice, BOOL bUseCoords, BOOL bScaleCoords, BOOL bUseSkip,
+    float _x, float _y, float _skip, LPCSTR fmt, va_list p)
 {
-	if ( bCheckDevice && ( ! RDEVICE.b_is_Active ) )
-		return;
-
-	String rs;
-
-	rs.x = ( bUseCoords ? ( bScaleCoords ? ( DI2PX( _x ) ) : _x ) : fCurrentX );
-	rs.y = ( bUseCoords ? ( bScaleCoords ? ( DI2PY( _y ) ) : _y ) : fCurrentY );
-	rs.c = dwCurrentColor;
-	rs.height = fCurrentHeight;
-	rs.align = eCurrentAlignment;
-#ifndef	_EDITOR
-	int vs_sz = vsprintf_s( rs.string , fmt , p );
+    if (bCheckDevice && (!RDEVICE.b_is_Active))
+        return;
+
+    String rs;
+
+    rs.x = (bUseCoords ? (bScaleCoords ? (DI2PX(_x)) : _x) : fCurrentX);
+    rs.y = (bUseCoords ? (bScaleCoords ? (DI2PY(_y)) : _y) : fCurrentY);
+    rs.c = dwCurrentColor;
+    rs.height = fCurrentHeight;
+    rs.align = eCurrentAlignment;
+#ifndef _EDITOR
+    int vs_sz = vsprintf_s(rs.string, fmt, p);
 #else
-	int vs_sz = vsprintf( rs.string , fmt , p );
+    int vs_sz = vsprintf(rs.string, fmt, p);
 #endif
-	//VERIFY( ( vs_sz != -1 ) && ( rs.string[ vs_sz ] == '\0' ) );
+    //VERIFY( ( vs_sz != -1 ) && ( rs.string[ vs_sz ] == '\0' ) );
 
-	rs.string[ sizeof(rs.string)-1 ] = 0;
-	if ( vs_sz == -1 )
-	{
-		return;
-	}
+    rs.string[sizeof(rs.string) - 1] = 0;
+    if (vs_sz == -1)
+    {
+        return;
+    }
 
-	if ( vs_sz )
-		strings.push_back( rs );
+    if (vs_sz)
+        strings.push_back(rs);
 
-	if ( bUseSkip )
-		OutSkip( _skip );
+    if (bUseSkip)
+        OutSkip(_skip);
 }
 
 #define MASTER_OUT(CHECK_DEVICE,USE_COORDS,SCALE_COORDS,USE_SKIP,X,Y,SKIP,FMT) \
-	{ va_list p; va_start ( p , fmt ); \
-	  MasterOut( CHECK_DEVICE , USE_COORDS , SCALE_COORDS , USE_SKIP , X , Y , SKIP , FMT, p ); \
-	  va_end( p ); }
+ { va_list p; va_start ( p , fmt ); \
+ MasterOut( CHECK_DEVICE , USE_COORDS , SCALE_COORDS , USE_SKIP , X , Y , SKIP , FMT, p ); \
+ va_end( p ); }
 
-void __cdecl CGameFont::OutI( float _x , float _y , LPCSTR fmt , ... )
+void __cdecl CGameFont::OutI(float _x, float _y, LPCSTR fmt, ...)
 {
-	MASTER_OUT( FALSE , TRUE , TRUE , FALSE , _x  , _y , 0.0f , fmt );
+    MASTER_OUT(FALSE, TRUE, TRUE, FALSE, _x, _y, 0.0f, fmt);
 };
 
-void __cdecl CGameFont::Out( float _x , float _y , LPCSTR fmt , ... )
+void __cdecl CGameFont::Out(float _x, float _y, LPCSTR fmt, ...)
 {
-	MASTER_OUT( TRUE , TRUE , FALSE , FALSE , _x , _y , 0.0f , fmt );
+    MASTER_OUT(TRUE, TRUE, FALSE, FALSE, _x, _y, 0.0f, fmt);
 };
 
-void __cdecl CGameFont::OutNext( LPCSTR fmt , ... )
+void __cdecl CGameFont::OutNext(LPCSTR fmt, ...)
 {
-	MASTER_OUT( TRUE , FALSE , FALSE , TRUE , 0.0f , 0.0f , 1.0f , fmt );
+    MASTER_OUT(TRUE, FALSE, FALSE, TRUE, 0.0f, 0.0f, 1.0f, fmt);
 };
 
 
-void CGameFont::OutSkip( float val )
+void CGameFont::OutSkip(float val)
 {
-	fCurrentY += val*CurrentHeight_();
+    fCurrentY += val*CurrentHeight_();
 }
 
-float CGameFont::SizeOf_( const char cChar )
+float CGameFont::SizeOf_(const char cChar)
 {
-	return ( GetCharTC( ( u16 ) ( u8 ) ( ( ( IsMultibyte() && cChar == ' ' ) ) ? 0 : cChar) ).z * vInterval.x );
+    return (GetCharTC((u16)(u8)(((IsMultibyte() && cChar == ' ')) ? 0 : cChar)).z * vInterval.x);
 }
 
-float CGameFont::SizeOf_( LPCSTR s )
+float CGameFont::SizeOf_(LPCSTR s)
 {
-	if ( ! ( s && s[ 0 ] ) )
-		return 0;
+    if (!(s && s[0]))
+        return 0;
 
-	if ( IsMultibyte() ) {
-		wide_char wsStr[ MAX_MB_CHARS ];
+    if (IsMultibyte())
+    {
+        wide_char wsStr[MAX_MB_CHARS];
 
-		mbhMulti2Wide( wsStr , NULL , MAX_MB_CHARS , s );
+        mbhMulti2Wide(wsStr, NULL, MAX_MB_CHARS, s);
 
-		return SizeOf_( wsStr );
-	}
+        return SizeOf_(wsStr);
+    }
 
-	int		len			= xr_strlen(s);
-	float	X			= 0;
-	if (len)
-		for (int j=0; j<len; j++)
-			X			+= GetCharTC( ( u16 ) ( u8 ) s[ j ] ).z;
+    int len = xr_strlen(s);
+    float X = 0;
+    if (len)
+        for (int j = 0; j < len; j++)
+            X += GetCharTC((u16)(u8)s[j]).z;
 
-	return				(X*vInterval.x);
+    return (X*vInterval.x);
 }
 
-float CGameFont::SizeOf_( const wide_char *wsStr )
+float CGameFont::SizeOf_(const wide_char* wsStr)
 {
-	if ( ! ( wsStr && wsStr[ 0 ] ) )
-		return 0;
-
-	unsigned int len = wsStr[ 0 ];
-	float X	= 0.0f , fDelta = 0.0f;
-
-	if ( len )
-		for ( unsigned int j=1 ; j <= len ; j++ ) {
-			fDelta = GetCharTC( wsStr[ j ] ).z - 2;
-			if ( IsNeedSpaceCharacter( wsStr[ j ] ) )
-				fDelta += fXStep;
-			X += fDelta;
-		}
-
-	return ( X * vInterval.x );
+    if (!(wsStr && wsStr[0]))
+        return 0;
+
+    unsigned int len = wsStr[0];
+    float X = 0.0f, fDelta = 0.0f;
+
+    if (len)
+        for (unsigned int j = 1; j <= len; j++)
+        {
+        fDelta = GetCharTC(wsStr[j]).z - 2;
+        if (IsNeedSpaceCharacter(wsStr[j]))
+            fDelta += fXStep;
+        X += fDelta;
+        }
+
+    return (X * vInterval.x);
 }
 
-float CGameFont::CurrentHeight_	()
+float CGameFont::CurrentHeight_()
 {
-	return fCurrentHeight * vInterval.y;
+    return fCurrentHeight * vInterval.y;
 }
 
 void CGameFont::SetHeightI(float S)
 {
-	VERIFY			( uFlags&fsDeviceIndependent );
-	fCurrentHeight	= S*RDEVICE.dwHeight;
+    VERIFY(uFlags&fsDeviceIndependent);
+    fCurrentHeight = S*RDEVICE.dwHeight;
 };
 
 void CGameFont::SetHeight(float S)
 {
-	VERIFY			( uFlags&fsDeviceIndependent );
-	fCurrentHeight	= S;
+    VERIFY(uFlags&fsDeviceIndependent);
+    fCurrentHeight = S;
 };
diff --git a/src/xrEngine/GameFont.h b/src/xrEngine/GameFont.h
index 687a6d0c9b7..9d01ea8eddf 100644
--- a/src/xrEngine/GameFont.h
+++ b/src/xrEngine/GameFont.h
@@ -8,107 +8,108 @@
 
 class ENGINE_API CGameFont
 {
-	friend class dxFontRender;
+    friend class dxFontRender;
 public:
-	enum EAligment{
-		alLeft				= 0,
-		alRight,
-		alCenter
-	};
+    enum EAligment
+    {
+        alLeft = 0,
+        alRight,
+        alCenter
+    };
 private:
-	struct String
-	{
-		string1024	string;
-		float		x,y;
-		float		height;
-		u32			c;
-		EAligment	align;
-	};
+    struct String
+    {
+        string1024 string;
+        float x, y;
+        float height;
+        u32 c;
+        EAligment align;
+    };
 protected:
-	Fvector2				vHalfPixel;
-	Ivector2				vTS;
+    Fvector2 vHalfPixel;
+    Ivector2 vTS;
 
-	EAligment				eCurrentAlignment;
-	u32						dwCurrentColor;
-	float					fCurrentHeight;
-	float					fCurrentX, fCurrentY;
-	Fvector2				vInterval;
+    EAligment eCurrentAlignment;
+    u32 dwCurrentColor;
+    float fCurrentHeight;
+    float fCurrentX, fCurrentY;
+    Fvector2 vInterval;
 
-	Fvector 				*TCMap;
-	float					fHeight;
-	float					fXStep;
-	float					fYStep;
-	float					fTCHeight;
-	xr_vector<String>		strings;
+    Fvector* TCMap;
+    float fHeight;
+    float fXStep;
+    float fYStep;
+    float fTCHeight;
+    xr_vector<String> strings;
 
-	IFontRender				*pFontRender;
+    IFontRender* pFontRender;
 
-	u32						nNumChars;
+    u32 nNumChars;
 
-	u32						uFlags;
+    u32 uFlags;
 
 public:
-	enum
-	{
-		fsGradient			= (1<<0),
-		fsDeviceIndependent	= (1<<1),
-		fsValid 			= (1<<2),
+    enum
+    {
+        fsGradient = (1 << 0),
+        fsDeviceIndependent = (1 << 1),
+        fsValid = (1 << 2),
 
-		fsMultibyte			= (1<<3),
+        fsMultibyte = (1 << 3),
 
-		fsForceDWORD		= u32(-1)
-	};
+        fsForceDWORD = u32(-1)
+    };
 
 protected:
-	IC const Fvector&		GetCharTC		(u16 c)		{return TCMap[c];}
+    IC const Fvector& GetCharTC(u16 c) { return TCMap[c]; }
 
 public:
-							CGameFont		(LPCSTR section, u32 flags=0);
-							CGameFont		(LPCSTR shader, LPCSTR texture, u32 flags=0);
-							~CGameFont		();
+    CGameFont(LPCSTR section, u32 flags = 0);
+    CGameFont(LPCSTR shader, LPCSTR texture, u32 flags = 0);
+    ~CGameFont();
 
-	void					Initialize		(LPCSTR shader, LPCSTR texture);
+    void Initialize(LPCSTR shader, LPCSTR texture);
 
-	IC void					SetColor		(u32 C)		{dwCurrentColor=C;};
+    IC void SetColor(u32 C) { dwCurrentColor = C; };
 
-	IC void					SetHeightI		(float S);
-	IC void					SetHeight		(float S);
+    IC void SetHeightI(float S);
+    IC void SetHeight(float S);
 
-	IC float				GetHeight		(){return fCurrentHeight;};
-	IC void					SetInterval		(float x, float y) {vInterval.set(x,y);};
-	IC void					SetInterval		(const Fvector2& v) {vInterval.set(v);};
-	IC void					SetAligment		(EAligment aligment){ eCurrentAlignment=aligment; }
+    IC float GetHeight() { return fCurrentHeight; };
+    IC void SetInterval(float x, float y) { vInterval.set(x, y); };
+    IC void SetInterval(const Fvector2& v) { vInterval.set(v); };
+    IC void SetAligment(EAligment aligment) { eCurrentAlignment = aligment; }
 
-	float					SizeOf_			( LPCSTR s );
-	float					SizeOf_			( const wide_char *wsStr );
+    float SizeOf_(LPCSTR s);
+    float SizeOf_(const wide_char* wsStr);
 
-	float					SizeOf_			( const char cChar );  // only ANSII 
+    float SizeOf_(const char cChar); // only ANSII
 
-	float					CurrentHeight_	();
+    float CurrentHeight_();
 
-	void					OutSetI			(float x, float y);
-	void					OutSet			(float x, float y);
+    void OutSetI(float x, float y);
+    void OutSet(float x, float y);
 
-	void 					MasterOut( 	BOOL bCheckDevice , BOOL bUseCoords , BOOL bScaleCoords , BOOL bUseSkip ,
-										float _x , float _y , float _skip , LPCSTR fmt , va_list p );
+    void MasterOut(BOOL bCheckDevice, BOOL bUseCoords, BOOL bScaleCoords, BOOL bUseSkip,
+        float _x, float _y, float _skip, LPCSTR fmt, va_list p);
 
-	u32						smart_strlen( const char* S );
-	BOOL					IsMultibyte() { return ( uFlags & fsMultibyte ); };
-	u16						SplitByWidth( u16 * puBuffer , u16 uBufferSize , float fTargetWidth , const char * pszText );
-	u16						GetCutLengthPos( float fTargetWidth , const char * pszText );
+    u32 smart_strlen(const char* S);
+    BOOL IsMultibyte() { return (uFlags & fsMultibyte); };
+    u16 SplitByWidth(u16* puBuffer, u16 uBufferSize, float fTargetWidth, const char* pszText);
+    u16 GetCutLengthPos(float fTargetWidth, const char* pszText);
 
-	void  					OutI			( float _x , float _y , LPCSTR fmt , ... );
-	void  					Out				( float _x , float _y , LPCSTR fmt , ... );
-	void             		OutNext			( LPCSTR fmt , ... );
+    void OutI(float _x, float _y, LPCSTR fmt, ...);
+    void Out(float _x, float _y, LPCSTR fmt, ...);
+    void OutNext(LPCSTR fmt, ...);
 
-	void					OutSkip			(float val=1.f);
+    void OutSkip(float val = 1.f);
 
-	void					OnRender		();
+    void OnRender();
 
-	IC	void				Clear			()  { strings.clear(); };
+    IC void Clear() { strings.clear(); };
 
 #ifdef DEBUG
-	shared_str				m_font_name;
+    shared_str m_font_name;
 #endif
 };
 
diff --git a/src/xrEngine/GameMtlLib.cpp b/src/xrEngine/GameMtlLib.cpp
index ecc9461fb3f..dd6afc10363 100644
--- a/src/xrEngine/GameMtlLib.cpp
+++ b/src/xrEngine/GameMtlLib.cpp
@@ -6,173 +6,186 @@
 //#include "../include/xrapi/xrapi.h"
 
 CGameMtlLibrary GMLib;
-//CSound_manager_interface*	Sound = NULL;
-#ifdef	_EDITOR
-CGameMtlLibrary*			PGMLib = NULL;
+//CSound_manager_interface* Sound = NULL;
+#ifdef _EDITOR
+CGameMtlLibrary* PGMLib = NULL;
 #endif
-CGameMtlLibrary::	CGameMtlLibrary		()
-	{
-	    material_index 		= 0;
-	    material_pair_index = 0;
+CGameMtlLibrary::CGameMtlLibrary()
+{
+    material_index = 0;
+    material_pair_index = 0;
 #ifndef _EDITOR
-        material_count	    = 0;
+    material_count = 0;
 #endif
-		PGMLib = &GMLib;
-    }
+    PGMLib = &GMLib;
+}
 
 void SGameMtl::Load(IReader& fs)
 {
-	R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_MAIN));
-	ID						= fs.r_u32();
-    fs.r_stringZ			(m_Name);
+    R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_MAIN));
+    ID = fs.r_u32();
+    fs.r_stringZ(m_Name);
 
-    if (fs.find_chunk(GAMEMTL_CHUNK_DESC)){
-		fs.r_stringZ		(m_Desc);
+    if (fs.find_chunk(GAMEMTL_CHUNK_DESC))
+    {
+        fs.r_stringZ(m_Desc);
     }
-    
-	R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_FLAGS));
-    Flags.assign			(fs.r_u32());
-
-	R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_PHYSICS));
-    fPHFriction				= fs.r_float();
-    fPHDamping				= fs.r_float();
-    fPHSpring				= fs.r_float();
-    fPHBounceStartVelocity 	= fs.r_float();
-    fPHBouncing				= fs.r_float();
-
-	R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_FACTORS));
-    fShootFactor			= fs.r_float();
-    fBounceDamageFactor		= fs.r_float();
-    fVisTransparencyFactor	= fs.r_float();
-    fSndOcclusionFactor		= fs.r_float();
-
-
-	if(fs.find_chunk(GAMEMTL_CHUNK_FACTORS_MP))
-	    fShootFactorMP	    = fs.r_float();
+
+    R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_FLAGS));
+    Flags.assign(fs.r_u32());
+
+    R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_PHYSICS));
+    fPHFriction = fs.r_float();
+    fPHDamping = fs.r_float();
+    fPHSpring = fs.r_float();
+    fPHBounceStartVelocity = fs.r_float();
+    fPHBouncing = fs.r_float();
+
+    R_ASSERT(fs.find_chunk(GAMEMTL_CHUNK_FACTORS));
+    fShootFactor = fs.r_float();
+    fBounceDamageFactor = fs.r_float();
+    fVisTransparencyFactor = fs.r_float();
+    fSndOcclusionFactor = fs.r_float();
+
+
+    if (fs.find_chunk(GAMEMTL_CHUNK_FACTORS_MP))
+        fShootFactorMP = fs.r_float();
     else
-	    fShootFactorMP	    = fShootFactor;
+        fShootFactorMP = fShootFactor;
 
-	if(fs.find_chunk(GAMEMTL_CHUNK_FLOTATION))
-	    fFlotationFactor	= fs.r_float();
+    if (fs.find_chunk(GAMEMTL_CHUNK_FLOTATION))
+        fFlotationFactor = fs.r_float();
 
-    if(fs.find_chunk(GAMEMTL_CHUNK_INJURIOUS))
-    	fInjuriousSpeed		= fs.r_float();
-    
-	if(fs.find_chunk(GAMEMTL_CHUNK_DENSITY))
-    	fDensityFactor		= fs.r_float();
+    if (fs.find_chunk(GAMEMTL_CHUNK_INJURIOUS))
+        fInjuriousSpeed = fs.r_float();
+
+    if (fs.find_chunk(GAMEMTL_CHUNK_DENSITY))
+        fDensityFactor = fs.r_float();
 }
 
 void CGameMtlLibrary::Load()
 {
-	string_path			name;
-	if (!FS.exist(name,	_game_data_,GAMEMTL_FILENAME)){
-    	Log				("! Can't find game material file: ",name);
-    	return;
+    string_path name;
+    if (!FS.exist(name, _game_data_, GAMEMTL_FILENAME))
+    {
+        Log("! Can't find game material file: ", name);
+        return;
     }
 
-    R_ASSERT			(material_pairs.empty());
-    R_ASSERT			(materials.empty());
+    R_ASSERT(material_pairs.empty());
+    R_ASSERT(materials.empty());
 
-	IReader*	F		= FS.r_open(name);
-    IReader& fs			= *F;
+    IReader* F = FS.r_open(name);
+    IReader& fs = *F;
 
     R_ASSERT(fs.find_chunk(GAMEMTLS_CHUNK_VERSION));
-    u16 version			= fs.r_u16();
-    if (GAMEMTL_CURRENT_VERSION!=version){
-        Log				("CGameMtlLibrary: invalid version. Library can't load.");
-		FS.r_close		(F);
-    	return;
+    u16 version = fs.r_u16();
+    if (GAMEMTL_CURRENT_VERSION != version)
+    {
+        Log("CGameMtlLibrary: invalid version. Library can't load.");
+        FS.r_close(F);
+        return;
     }
 
     R_ASSERT(fs.find_chunk(GAMEMTLS_CHUNK_AUTOINC));
-    material_index		= fs.r_u32();
-    material_pair_index	= fs.r_u32();
+    material_index = fs.r_u32();
+    material_pair_index = fs.r_u32();
 
-    materials.clear		();
+    materials.clear();
     material_pairs.clear();
 
-    IReader* OBJ 		= fs.open_chunk(GAMEMTLS_CHUNK_MTLS);
-    if (OBJ) {
-        u32				count;
-        for (IReader* O = OBJ->open_chunk_iterator(count); O; O = OBJ->open_chunk_iterator(count,O)) {
-        	SGameMtl*	M = xr_new<SGameMtl> ();
-	        M->Load		(*O);
-        	materials.push_back(M);
+    IReader* OBJ = fs.open_chunk(GAMEMTLS_CHUNK_MTLS);
+    if (OBJ)
+    {
+        u32 count;
+        for (IReader* O = OBJ->open_chunk_iterator(count); O; O = OBJ->open_chunk_iterator(count, O))
+        {
+            SGameMtl* M = xr_new<SGameMtl>();
+            M->Load(*O);
+            materials.push_back(M);
         }
-        OBJ->close		();
+        OBJ->close();
     }
 
-    OBJ 				= fs.open_chunk(GAMEMTLS_CHUNK_MTLS_PAIR);
-    if (OBJ){
-        u32				count;
-        for (IReader* O = OBJ->open_chunk_iterator(count); O; O = OBJ->open_chunk_iterator(count,O)) {
-        	SGameMtlPair* M	= xr_new<SGameMtlPair> (this);
-	        M->Load		(*O);
-        	material_pairs.push_back(M);
+    OBJ = fs.open_chunk(GAMEMTLS_CHUNK_MTLS_PAIR);
+    if (OBJ)
+    {
+        u32 count;
+        for (IReader* O = OBJ->open_chunk_iterator(count); O; O = OBJ->open_chunk_iterator(count, O))
+        {
+            SGameMtlPair* M = xr_new<SGameMtlPair>(this);
+            M->Load(*O);
+            material_pairs.push_back(M);
         }
-        OBJ->close		();
+        OBJ->close();
     }
 
 #ifndef _EDITOR
-	material_count		= (u32)materials.size();
-    material_pairs_rt.resize(material_count*material_count,0);
-    for (GameMtlPairIt p_it=material_pairs.begin(); material_pairs.end() != p_it; ++p_it){
-		SGameMtlPair* S	= *p_it;
-    	int idx0		= GetMaterialIdx(S->mtl0)*material_count+GetMaterialIdx(S->mtl1);
-    	int idx1		= GetMaterialIdx(S->mtl1)*material_count+GetMaterialIdx(S->mtl0);
-	    material_pairs_rt[idx0]=S;
-	    material_pairs_rt[idx1]=S;
+    material_count = (u32)materials.size();
+    material_pairs_rt.resize(material_count*material_count, 0);
+    for (GameMtlPairIt p_it = material_pairs.begin(); material_pairs.end() != p_it; ++p_it)
+    {
+        SGameMtlPair* S = *p_it;
+        int idx0 = GetMaterialIdx(S->mtl0)*material_count + GetMaterialIdx(S->mtl1);
+        int idx1 = GetMaterialIdx(S->mtl1)*material_count + GetMaterialIdx(S->mtl0);
+        material_pairs_rt[idx0] = S;
+        material_pairs_rt[idx1] = S;
     }
 #endif
 
-/*
-	for (GameMtlPairIt p_it=material_pairs.begin(); material_pairs.end() != p_it; ++p_it){
-		SGameMtlPair* S	= *p_it;
-		for (int k=0; k<S->StepSounds.size(); k++){
-			Msg("%40s - 0x%x", S->StepSounds[k].handle->file_name(), S->StepSounds[k].g_type);
-		}
-	}
-*/
-	FS.r_close		(F);
+    /*
+     for (GameMtlPairIt p_it=material_pairs.begin(); material_pairs.end() != p_it; ++p_it){
+     SGameMtlPair* S = *p_it;
+     for (int k=0; k<S->StepSounds.size(); k++){
+     Msg("%40s - 0x%x", S->StepSounds[k].handle->file_name(), S->StepSounds[k].g_type);
+     }
+     }
+     */
+    FS.r_close (F);
 }
 
 #ifdef GM_NON_GAME
-SGameMtlPair::~SGameMtlPair		()
+SGameMtlPair::~SGameMtlPair ()
 {
-}                
+}
 void SGameMtlPair::Load(IReader& fs)
 {
-	shared_str				buf;
-
-	R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_PAIR));
-	mtl0				= fs.r_u32();
-	mtl1				= fs.r_u32();
-	ID					= fs.r_u32();
-	ID_parent			= fs.r_u32();
-    u32 own_mask		= fs.r_u32(); 
-    if (GAMEMTL_NONE_ID==ID_parent) OwnProps.one	();
-    else							OwnProps.assign	(own_mask);
-
-	R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_BREAKING));
-	fs.r_stringZ		(buf); 	BreakingSounds	= buf.size()?*buf:"";
-
-	R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_STEP));
-	fs.r_stringZ		(buf);	StepSounds		= buf.size()?*buf:"";
-
-	R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_COLLIDE));
-	fs.r_stringZ		(buf);	CollideSounds	= buf.size()?*buf:"";
-	fs.r_stringZ		(buf);	CollideParticles= buf.size()?*buf:"";
-	fs.r_stringZ		(buf);	CollideMarks	= buf.size()?*buf:"";
+    shared_str buf;
+
+    R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_PAIR));
+    mtl0 = fs.r_u32();
+    mtl1 = fs.r_u32();
+    ID = fs.r_u32();
+    ID_parent = fs.r_u32();
+    u32 own_mask = fs.r_u32();
+    if (GAMEMTL_NONE_ID==ID_parent) OwnProps.one ();
+    else OwnProps.assign (own_mask);
+
+    R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_BREAKING));
+    fs.r_stringZ (buf);
+    BreakingSounds = buf.size()?*buf:"";
+
+    R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_STEP));
+    fs.r_stringZ(buf);
+    StepSounds = buf.size() ? *buf : "";
+
+    R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_COLLIDE));
+    fs.r_stringZ(buf);
+    CollideSounds = buf.size() ? *buf : "";
+    fs.r_stringZ(buf);
+    CollideParticles = buf.size() ? *buf : "";
+    fs.r_stringZ(buf);
+    CollideMarks = buf.size() ? *buf : "";
 }
 #endif
 
 #ifdef DEBUG
 LPCSTR SGameMtlPair::dbg_Name()
 {
-	static string256 nm;
-	SGameMtl* M0 = GMLib.GetMaterialByID(GetMtl0());
-	SGameMtl* M1 = GMLib.GetMaterialByID(GetMtl1());
-	xr_sprintf(nm,sizeof(nm),"Pair: %s - %s",*M0->m_Name,*M1->m_Name);
-	return nm;
+    static string256 nm;
+    SGameMtl* M0 = GMLib.GetMaterialByID(GetMtl0());
+    SGameMtl* M1 = GMLib.GetMaterialByID(GetMtl1());
+    xr_sprintf(nm, sizeof(nm), "Pair: %s - %s", *M0->m_Name, *M1->m_Name);
+    return nm;
 }
 #endif
diff --git a/src/xrEngine/GameMtlLib.h b/src/xrEngine/GameMtlLib.h
index baf34520a15..f13bd4f7a05 100644
--- a/src/xrEngine/GameMtlLib.h
+++ b/src/xrEngine/GameMtlLib.h
@@ -4,37 +4,37 @@
 //---------------------------------------------------------------------------
 #pragma once
 
-#define GAMEMTL_CURRENT_VERSION			0x0001
+#define GAMEMTL_CURRENT_VERSION 0x0001
 //----------------------------------------------------
 
-#define GAMEMTLS_CHUNK_VERSION        	0x1000
-#define GAMEMTLS_CHUNK_AUTOINC	        0x1001
-#define GAMEMTLS_CHUNK_MTLS	        	0x1002
-#define GAMEMTLS_CHUNK_MTLS_PAIR       	0x1003
+#define GAMEMTLS_CHUNK_VERSION 0x1000
+#define GAMEMTLS_CHUNK_AUTOINC 0x1001
+#define GAMEMTLS_CHUNK_MTLS 0x1002
+#define GAMEMTLS_CHUNK_MTLS_PAIR 0x1003
 //----------------------------------------------------
-#define GAMEMTL_CHUNK_MAIN	        	0x1000
-#define GAMEMTL_CHUNK_FLAGS	        	0x1001
-#define GAMEMTL_CHUNK_PHYSICS        	0x1002
-#define GAMEMTL_CHUNK_FACTORS        	0x1003
-#define GAMEMTL_CHUNK_FLOTATION   		0x1004
-#define GAMEMTL_CHUNK_DESC				0x1005
-#define GAMEMTL_CHUNK_INJURIOUS			0x1006
-#define GAMEMTL_CHUNK_DENSITY			0x1007
-#define GAMEMTL_CHUNK_FACTORS_MP       	0x1008
+#define GAMEMTL_CHUNK_MAIN 0x1000
+#define GAMEMTL_CHUNK_FLAGS 0x1001
+#define GAMEMTL_CHUNK_PHYSICS 0x1002
+#define GAMEMTL_CHUNK_FACTORS 0x1003
+#define GAMEMTL_CHUNK_FLOTATION 0x1004
+#define GAMEMTL_CHUNK_DESC 0x1005
+#define GAMEMTL_CHUNK_INJURIOUS 0x1006
+#define GAMEMTL_CHUNK_DENSITY 0x1007
+#define GAMEMTL_CHUNK_FACTORS_MP 0x1008
 //----------------------------------------------------
-#define GAMEMTLPAIR_CHUNK_PAIR   		0x1000
-//#define GAMEMTLPAIR_CHUNK_FLOTATION   0x1001 - obsolete
-#define GAMEMTLPAIR_CHUNK_BREAKING   	0x1002
-#define GAMEMTLPAIR_CHUNK_STEP   		0x1003
-//#define GAMEMTLPAIR_CHUNK_COLLIDE   	0x1004 - obsolete / rename HIT
-#define GAMEMTLPAIR_CHUNK_COLLIDE	  	0x1005
+#define GAMEMTLPAIR_CHUNK_PAIR 0x1000
+//#define GAMEMTLPAIR_CHUNK_FLOTATION 0x1001 - obsolete
+#define GAMEMTLPAIR_CHUNK_BREAKING 0x1002
+#define GAMEMTLPAIR_CHUNK_STEP 0x1003
+//#define GAMEMTLPAIR_CHUNK_COLLIDE 0x1004 - obsolete / rename HIT
+#define GAMEMTLPAIR_CHUNK_COLLIDE 0x1005
 //----------------------------------------------------
 
-#define GAMEMTL_SUBITEM_COUNT			4
+#define GAMEMTL_SUBITEM_COUNT 4
 
-#define GAMEMTL_NONE_ID					u32(-1)
-#define GAMEMTL_NONE_IDX				u16(-1)
-#define GAMEMTL_FILENAME				"gamemtl.xr"
+#define GAMEMTL_NONE_ID u32(-1)
+#define GAMEMTL_NONE_IDX u16(-1)
+#define GAMEMTL_FILENAME "gamemtl.xr"
 
 #ifdef _EDITOR
 #define GM_NON_GAME
@@ -49,316 +49,320 @@
 #define GM_NON_GAME
 #endif
 
-#ifndef	MTL_EXPORT_API
+#ifndef MTL_EXPORT_API
 #ifdef _EDITOR
-	#include "ElTree.hpp"
-	#define MTL_EXPORT_API ECORE_API
+#include "ElTree.hpp"
+#define MTL_EXPORT_API ECORE_API
 #else
-	#define MTL_EXPORT_API ENGINE_API
+#define MTL_EXPORT_API ENGINE_API
 #endif
 #endif
 
 #ifdef GM_NON_GAME
-	#define SoundVec	shared_str
-	#define PSVec 		shared_str
-	#define ShaderVec 	shared_str
-//	#define ShaderVec 	shared_str
+#define SoundVec shared_str
+#define PSVec shared_str
+#define ShaderVec shared_str
+// #define ShaderVec shared_str
 #else
-	DEFINE_VECTOR(ref_sound,SoundVec,SoundIt);
-	DEFINE_VECTOR(shared_str,PSVec,PSIt);
+DEFINE_VECTOR(ref_sound, SoundVec, SoundIt);
+DEFINE_VECTOR(shared_str, PSVec, PSIt);
 #include "../Include/xrRender/WallMarkArray.h"
 #include "../Include/xrRender/RenderFactory.h"
-//	DEFINE_VECTOR(ref_shader,ShaderVec,ShaderIt);
+// DEFINE_VECTOR(ref_shader,ShaderVec,ShaderIt);
 #endif
 
 struct MTL_EXPORT_API SGameMtl
 {
-	friend class CGameMtlLibrary;
+    friend class CGameMtlLibrary;
 protected:
-	int 				ID; 	// auto number
+    int ID; // auto number
 public:
-	enum{
-    	flBreakable		= (1ul<<0ul),
-//		flShootable 	= (1ul<<1ul),
-        flBounceable	= (1ul<<2ul),
-        flSkidmark		= (1ul<<3ul),
-        flBloodmark		= (1ul<<4ul),
-        flClimable		= (1ul<<5ul),
-//		flWalkOn		= (1ul<<6ul), // obsolette
-        flPassable		= (1ul<<7ul),
-        flDynamic		= (1ul<<8ul),
-        flLiquid 		= (1ul<<9ul),
-		flSuppressShadows	= (1ul<<10ul),
-		flSuppressWallmarks	= (1ul<<11ul),
-		flActorObstacle	= (1ul<<12ul),
-		flNoRicoshet	= (1ul<<13ul),
+    enum
+    {
+        flBreakable = (1ul << 0ul),
+        // flShootable = (1ul<<1ul),
+        flBounceable = (1ul << 2ul),
+        flSkidmark = (1ul << 3ul),
+        flBloodmark = (1ul << 4ul),
+        flClimable = (1ul << 5ul),
+        // flWalkOn = (1ul<<6ul), // obsolette
+        flPassable = (1ul << 7ul),
+        flDynamic = (1ul << 8ul),
+        flLiquid = (1ul << 9ul),
+        flSuppressShadows = (1ul << 10ul),
+        flSuppressWallmarks = (1ul << 11ul),
+        flActorObstacle = (1ul << 12ul),
+        flNoRicoshet = (1ul << 13ul),
+
 
 
-		
-        flInjurious		= (1ul<<28ul),// flInjurious = fInjuriousSpeed > 0.f
-		flShootable 	= (1ul<<29ul),
-        flTransparent	= (1ul<<30ul),
-        flSlowDown		= (1ul<<31ul) // flSlowDown = (fFlotationFactor<1.f)
+        flInjurious = (1ul << 28ul),// flInjurious = fInjuriousSpeed > 0.f
+        flShootable = (1ul << 29ul),
+        flTransparent = (1ul << 30ul),
+        flSlowDown = (1ul << 31ul) // flSlowDown = (fFlotationFactor<1.f)
     };
 public:
-	shared_str			m_Name;
-    shared_str			m_Desc;
+    shared_str m_Name;
+    shared_str m_Desc;
 
-    Flags32				Flags;
+    Flags32 Flags;
     // physics part
-    float				fPHFriction;            // ?
-    float				fPHDamping;             // ?
-    float				fPHSpring;              // ?
-    float				fPHBounceStartVelocity;	// ?
-	float				fPHBouncing;            // ?
-	// shoot&bounce&visibility&flotation
-    float		    	fFlotationFactor;		// 0.f - 1.f   	(1.f-ïîëíîñòüþ ïðîõîäèìûé)
-    float				fShootFactor;			// 0.f - 1.f	(1.f-ïîëíîñòüþ ïðîñòðåëèâàåìûé)
-    float				fShootFactorMP;			// 0.f - 1.f	(1.f-ïîëíîñòüþ ïðîñòðåëèâàåìûé)
-    float				fBounceDamageFactor;	// 0.f - 100.f
-    float				fInjuriousSpeed; 		// 0.f - ...	(0.f-íå îòáèðàåò çäîðîâüå (ñêîðîñòü óìåíüøåíèÿ çäîðîâüÿ))
-    float				fVisTransparencyFactor;	// 0.f - 1.f	(1.f-ïîëíîñòüþ ïðîçðà÷íûé)
-    float				fSndOcclusionFactor;	// 0.f - 1.f    (1.f-ïîëíîñòüþ ñëûøåí)
-	float				fDensityFactor;
+    float fPHFriction; // ?
+    float fPHDamping; // ?
+    float fPHSpring; // ?
+    float fPHBounceStartVelocity; // ?
+    float fPHBouncing; // ?
+    // shoot&bounce&visibility&flotation
+    float fFlotationFactor; // 0.f - 1.f (1.f-ïîëíîñòüþ ïðîõîäèìûé)
+    float fShootFactor; // 0.f - 1.f (1.f-ïîëíîñòüþ ïðîñòðåëèâàåìûé)
+    float fShootFactorMP; // 0.f - 1.f (1.f-ïîëíîñòüþ ïðîñòðåëèâàåìûé)
+    float fBounceDamageFactor; // 0.f - 100.f
+    float fInjuriousSpeed; // 0.f - ... (0.f-íå îòáèðàåò çäîðîâüå (ñêîðîñòü óìåíüøåíèÿ çäîðîâüÿ))
+    float fVisTransparencyFactor; // 0.f - 1.f (1.f-ïîëíîñòüþ ïðîçðà÷íûé)
+    float fSndOcclusionFactor; // 0.f - 1.f (1.f-ïîëíîñòüþ ñëûøåí)
+    float fDensityFactor;
 public:
-	SGameMtl			()
+    SGameMtl()
     {
-        ID						= -1;
-		m_Name					= "unknown";
-        Flags.zero				();
+        ID = -1;
+        m_Name = "unknown";
+        Flags.zero();
         // factors
-        fFlotationFactor		= 1.f;
-        fShootFactor			= 0.f;
-        fShootFactorMP			= 0.f;
-        fBounceDamageFactor		= 1.f;
-        fInjuriousSpeed 		= 0.f;
-        fVisTransparencyFactor	= 0.f;
-        fSndOcclusionFactor		= 0.f;
+        fFlotationFactor = 1.f;
+        fShootFactor = 0.f;
+        fShootFactorMP = 0.f;
+        fBounceDamageFactor = 1.f;
+        fInjuriousSpeed = 0.f;
+        fVisTransparencyFactor = 0.f;
+        fSndOcclusionFactor = 0.f;
         // physics
-        fPHFriction				= 1.f;
-        fPHDamping				= 1.f;
-        fPHSpring				= 1.f;
-        fPHBounceStartVelocity  = 0.f;
-        fPHBouncing				= 0.1f;
-		fDensityFactor			= 0.0f;
-	}
-    void 				Load			(IReader& fs);
-    void 				Save			(IWriter& fs);
-    IC int				GetID			(){return ID;}
+        fPHFriction = 1.f;
+        fPHDamping = 1.f;
+        fPHSpring = 1.f;
+        fPHBounceStartVelocity = 0.f;
+        fPHBouncing = 0.1f;
+        fDensityFactor = 0.0f;
+    }
+    void Load(IReader& fs);
+    void Save(IWriter& fs);
+    IC int GetID () {return ID;}
 #ifdef _EDITOR
-    void 				FillProp		(PropItemVec& values, ListItem* owner);
+    void FillProp(PropItemVec& values, ListItem* owner);
 #endif
 };
-DEFINE_VECTOR(SGameMtl*,GameMtlVec,GameMtlIt);
+DEFINE_VECTOR(SGameMtl*, GameMtlVec, GameMtlIt);
 
-struct MTL_EXPORT_API SGameMtlPair{
-	friend class CGameMtlLibrary;
-    CGameMtlLibrary*	m_Owner;
+struct MTL_EXPORT_API SGameMtlPair
+{
+    friend class CGameMtlLibrary;
+    CGameMtlLibrary* m_Owner;
 private:
-	int					mtl0;
-	int					mtl1;
+    int mtl0;
+    int mtl1;
 protected:
-	int 				ID; 	// auto number
-    int					ID_parent;
+    int ID; // auto number
+    int ID_parent;
 public:
-	enum{
-//		flFlotation		= (1<<0),
-        flBreakingSounds= (1<<1),
-        flStepSounds	= (1<<2),
-//		flCollideSounds	= (1<<3),
-        flCollideSounds		= (1<<4),
-        flCollideParticles	= (1<<5),
-        flCollideMarks		= (1<<6)
+    enum
+    {
+        // flFlotation = (1<<0),
+        flBreakingSounds = (1 << 1),
+        flStepSounds = (1 << 2),
+        // flCollideSounds = (1<<3),
+        flCollideSounds = (1 << 4),
+        flCollideParticles = (1 << 5),
+        flCollideMarks = (1 << 6)
     };
-    Flags32				OwnProps;
-//	properties
-    SoundVec			BreakingSounds;
-    SoundVec			StepSounds;
-    SoundVec			CollideSounds;
-    PSVec				CollideParticles;
+    Flags32 OwnProps;
+    // properties
+    SoundVec BreakingSounds;
+    SoundVec StepSounds;
+    SoundVec CollideSounds;
+    PSVec CollideParticles;
 
 
-#ifdef	GM_NON_GAME
-	#define ShaderVec 	shared_str
-    ShaderVec			CollideMarks;
-#else	//	GM_NON_GAME
-	FactoryPtr<IWallMarkArray> m_pCollideMarks;
-#endif	//	GM_NON_GAME
+#ifdef GM_NON_GAME
+#define ShaderVec shared_str
+    ShaderVec CollideMarks;
+#else // GM_NON_GAME
+    FactoryPtr<IWallMarkArray> m_pCollideMarks;
+#endif // GM_NON_GAME
 #ifdef _EDITOR
-    PropValue*			propBreakingSounds;
-    PropValue*			propStepSounds;
-    PropValue*			propCollideSounds;
-    PropValue*			propCollideParticles;
-    PropValue*			propCollideMarks;
-    void __stdcall	 	OnFlagChange	(PropValue* sender);
-	void __stdcall	 	OnParentClick	(ButtonValue* sender, bool& bModif, bool& bSafe);
-	void __stdcall	 	OnCommandClick	(ButtonValue* sender, bool& bModif, bool& bSafe);
-    void __stdcall	 	FillChooseMtl	(ChooseItemVec& items, void* param);
-	void 				CopyFrom		(SGameMtlPair* parent);
+    PropValue* propBreakingSounds;
+    PropValue* propStepSounds;
+    PropValue* propCollideSounds;
+    PropValue* propCollideParticles;
+    PropValue* propCollideMarks;
+    void __stdcall OnFlagChange (PropValue* sender);
+    void __stdcall OnParentClick (ButtonValue* sender, bool& bModif, bool& bSafe);
+    void __stdcall OnCommandClick(ButtonValue* sender, bool& bModif, bool& bSafe);
+    void __stdcall FillChooseMtl(ChooseItemVec& items, void* param);
+    void CopyFrom(SGameMtlPair* parent);
 #endif
 public:
-	SGameMtlPair		(CGameMtlLibrary* owner)
+    SGameMtlPair(CGameMtlLibrary* owner)
     {
-#ifndef	GM_NON_GAME
-		//m_pCollideMarks = RenderFactory->CreateGameMtlPair();
-#endif	//	GM_NON_GAME
-    	mtl0			= -1;
-    	mtl1			= -1;
-        ID				= -1;
-        ID_parent		= -1;
-        m_Owner			= owner;
-        OwnProps.one	();
-	}
-	~SGameMtlPair		();
-    IC int				GetMtl0			(){return mtl0;}
-    IC int				GetMtl1			(){return mtl1;}
-    IC int				GetID			(){return ID;}
-    IC void				SetPair			(int m0, int m1){mtl0=m0; mtl1=m1;}
-	IC bool				IsPair			(int m0, int m1){return !!(((mtl0==m0)&&(mtl1==m1))||((mtl0==m1)&&(mtl1==m0)));}
-    void				Save			(IWriter& fs);
-    void				Load			(IReader& fs);
-    IC int 				GetParent		(){return ID_parent;}
-    BOOL				SetParent		(int parent);
+#ifndef GM_NON_GAME
+        //m_pCollideMarks = RenderFactory->CreateGameMtlPair();
+#endif // GM_NON_GAME
+        mtl0 = -1;
+        mtl1 = -1;
+        ID = -1;
+        ID_parent = -1;
+        m_Owner = owner;
+        OwnProps.one();
+    }
+    ~SGameMtlPair();
+    IC int GetMtl0() { return mtl0; }
+    IC int GetMtl1() { return mtl1; }
+    IC int GetID() { return ID; }
+    IC void SetPair(int m0, int m1) { mtl0 = m0; mtl1 = m1; }
+    IC bool IsPair(int m0, int m1) { return !!(((mtl0 == m0) && (mtl1 == m1)) || ((mtl0 == m1) && (mtl1 == m0))); }
+    void Save(IWriter& fs);
+    void Load (IReader& fs);
+    IC int GetParent () {return ID_parent;}
+    BOOL SetParent (int parent);
 #ifdef _EDITOR
-	void 				FillProp		(PropItemVec& values);
-    void				TransferFromParent(SGameMtlPair* parent);
+    void FillProp(PropItemVec& values);
+    void TransferFromParent(SGameMtlPair* parent);
 #endif
 #ifdef DEBUG
-	LPCSTR				dbg_Name		();
+    LPCSTR dbg_Name();
 #endif
 };
 
-DEFINE_VECTOR(SGameMtlPair*,GameMtlPairVec,GameMtlPairIt);
+DEFINE_VECTOR(SGameMtlPair*, GameMtlPairVec, GameMtlPairIt);
 
-class MTL_EXPORT_API CGameMtlLibrary{
-	int					material_index;
-	int					material_pair_index;
-	BENCH_SEC_SCRAMBLEMEMBER1
+class MTL_EXPORT_API CGameMtlLibrary
+{
+    int material_index;
+    int material_pair_index;
+    BENCH_SEC_SCRAMBLEMEMBER1
 
-	GameMtlVec			materials;
-    GameMtlPairVec		material_pairs;
+        GameMtlVec materials;
+    GameMtlPairVec material_pairs;
 
 #ifndef _EDITOR
     // game part
-    u32					material_count;
-    GameMtlPairVec		material_pairs_rt;
+    u32 material_count;
+    GameMtlPairVec material_pairs_rt;
 #endif
 public:
-	CGameMtlLibrary		();
-	~CGameMtlLibrary	()
-	{
-		/*
-    	R_ASSERT		(0==material_pairs_rt.size());
-    	R_ASSERT		(0==material_pairs.size());
-    	R_ASSERT		(0==materials.size());
-		*/
+    CGameMtlLibrary();
+    ~CGameMtlLibrary()
+    {
+        /*
+        R_ASSERT (0==material_pairs_rt.size());
+        R_ASSERT (0==material_pairs.size());
+        R_ASSERT (0==materials.size());
+        */
     }
-	IC void				Unload			()
-	{
+    IC void Unload()
+    {
 #ifndef _EDITOR
-		material_count	= 0;
-		material_pairs_rt.clear();
+        material_count = 0;
+        material_pairs_rt.clear();
 #endif
-		for (GameMtlIt m_it=materials.begin(); materials.end() != m_it; ++m_it)
-			xr_delete	(*m_it);
-		materials.clear();
-		for (GameMtlPairIt p_it=material_pairs.begin(); material_pairs.end() != p_it; ++p_it)
-			xr_delete	(*p_it);
-		material_pairs.clear();
-	}
+        for (GameMtlIt m_it = materials.begin(); materials.end() != m_it; ++m_it)
+            xr_delete(*m_it);
+        materials.clear();
+        for (GameMtlPairIt p_it = material_pairs.begin(); material_pairs.end() != p_it; ++p_it)
+            xr_delete(*p_it);
+        material_pairs.clear();
+    }
     // material routine
-    IC GameMtlIt 		GetMaterialIt	(LPCSTR name)
+    IC GameMtlIt GetMaterialIt(LPCSTR name)
     {
-        for (GameMtlIt it=materials.begin(); materials.end() != it; ++it)
-            if (0==strcmpi(*(*it)->m_Name,name)) return it;
+        for (GameMtlIt it = materials.begin(); materials.end() != it; ++it)
+            if (0 == strcmpi(*(*it)->m_Name, name)) return it;
         return materials.end();
     }
-    IC GameMtlIt 		GetMaterialIt	(shared_str& name)
+    IC GameMtlIt GetMaterialIt(shared_str& name)
     {
-        for (GameMtlIt it=materials.begin(); materials.end() != it; ++it)
+        for (GameMtlIt it = materials.begin(); materials.end() != it; ++it)
             if (name.equal((*it)->m_Name)) return it;
         return materials.end();
     }
-    IC GameMtlIt 		GetMaterialItByID(int id)
+    IC GameMtlIt GetMaterialItByID(int id)
     {
-        for (GameMtlIt it=materials.begin(); materials.end() != it; ++it)
-            if ((*it)->ID==id) return it;
+        for (GameMtlIt it = materials.begin(); materials.end() != it; ++it)
+            if ((*it)->ID == id) return it;
         return materials.end();
     }
-	IC u32				GetMaterialID	(LPCSTR name)
+    IC u32 GetMaterialID(LPCSTR name)
     {
-    	GameMtlIt it	= GetMaterialIt	(name);
+        GameMtlIt it = GetMaterialIt (name);
         return (it==materials.end())?GAMEMTL_NONE_ID:(*it)->ID;
     }
 #ifdef _EDITOR
-	// editor
-	SGameMtl*			AppendMaterial	(SGameMtl* parent);
-	void				RemoveMaterial	(LPCSTR name);
-	IC SGameMtl*		GetMaterialByID	(int ID)
+    // editor
+    SGameMtl* AppendMaterial (SGameMtl* parent);
+    void RemoveMaterial (LPCSTR name);
+    IC SGameMtl* GetMaterialByID (int ID)
     {
-	    GameMtlIt it=GetMaterialItByID(ID);
-    	return materials.end() != it?*it:0;
+        GameMtlIt it=GetMaterialItByID(ID);
+        return materials.end() != it?*it:0;
     }
-	IC SGameMtl*		GetMaterial		(LPCSTR name)
+    IC SGameMtl* GetMaterial (LPCSTR name)
     {
-	    GameMtlIt it=GetMaterialIt(name);
-    	return materials.end() != it?*it:0;
-	}
+        GameMtlIt it = GetMaterialIt(name);
+        return materials.end() != it ? *it : 0;
+    }
 #else
-	// game
-	IC SGameMtl*		GetMaterialByID (s32 id)		{return GetMaterialByIdx(GetMaterialIdx(id));}
+    // game
+    IC SGameMtl* GetMaterialByID(s32 id) { return GetMaterialByIdx(GetMaterialIdx(id)); }
 #endif
-	IC u16				GetMaterialIdx	(int ID)		{GameMtlIt it=GetMaterialItByID(ID);VERIFY(materials.end() != it); return (u16)(it-materials.begin());}
-	IC u16				GetMaterialIdx	(LPCSTR name)	{GameMtlIt it=GetMaterialIt(name);VERIFY(materials.end() != it); return (u16)(it-materials.begin());}
-	IC SGameMtl*		GetMaterialByIdx(u16 idx)		{VERIFY(idx<(u16)materials.size()); return materials[idx];}
+    IC u16 GetMaterialIdx(int ID) { GameMtlIt it = GetMaterialItByID(ID); VERIFY(materials.end() != it); return (u16)(it - materials.begin()); }
+    IC u16 GetMaterialIdx(LPCSTR name) { GameMtlIt it = GetMaterialIt(name); VERIFY(materials.end() != it); return (u16)(it - materials.begin()); }
+    IC SGameMtl* GetMaterialByIdx(u16 idx) { VERIFY(idx < (u16)materials.size()); return materials[idx]; }
 
 
-	IC GameMtlIt		FirstMaterial	(){return materials.begin();}
-	IC GameMtlIt		LastMaterial	(){return materials.end();}
-	IC u32				CountMaterial	(){return materials.size();}
+    IC GameMtlIt FirstMaterial() { return materials.begin(); }
+    IC GameMtlIt LastMaterial () {return materials.end();}
+    IC u32 CountMaterial () {return materials.size();}
 
-// material pair routine
+    // material pair routine
 #ifdef _EDITOR
-	void 				CopyMtlPairs		(SGameMtl* from, SGameMtl* to);
-	BOOL				UpdateMtlPairs		(SGameMtl* src);
-	BOOL				UpdateMtlPairs		();
-	LPCSTR				MtlPairToName		(int mtl0, int mtl1);
-	void				NameToMtlPair		(LPCSTR name, int& mtl0, int& mtl1);
-	void				MtlNameToMtlPair	(LPCSTR name, int& mtl0, int& mtl1);
-	SGameMtlPair*		CreateMaterialPair	(int m0, int m1, SGameMtlPair* parent=0);
-	SGameMtlPair*		AppendMaterialPair	(int m0, int m1, SGameMtlPair* parent=0);
-	void				RemoveMaterialPair	(LPCSTR name);
-	void				RemoveMaterialPair	(GameMtlPairIt rem_it);
-	void				RemoveMaterialPair	(int mtl);
-	void				RemoveMaterialPair	(int mtl0, int mtl1);
-	GameMtlPairIt		GetMaterialPairIt	(int id);
-	SGameMtlPair*		GetMaterialPair		(int id);
-	GameMtlPairIt		GetMaterialPairIt	(int mtl0, int mtl1);
-	SGameMtlPair*		GetMaterialPair		(int mtl0, int mtl1);
-	SGameMtlPair*		GetMaterialPair		(LPCSTR name);
+    void CopyMtlPairs (SGameMtl* from, SGameMtl* to);
+    BOOL UpdateMtlPairs (SGameMtl* src);
+    BOOL UpdateMtlPairs ();
+    LPCSTR MtlPairToName (int mtl0, int mtl1);
+    void NameToMtlPair (LPCSTR name, int& mtl0, int& mtl1);
+    void MtlNameToMtlPair (LPCSTR name, int& mtl0, int& mtl1);
+    SGameMtlPair* CreateMaterialPair (int m0, int m1, SGameMtlPair* parent=0);
+    SGameMtlPair* AppendMaterialPair (int m0, int m1, SGameMtlPair* parent=0);
+    void RemoveMaterialPair (LPCSTR name);
+    void RemoveMaterialPair (GameMtlPairIt rem_it);
+    void RemoveMaterialPair (int mtl);
+    void RemoveMaterialPair (int mtl0, int mtl1);
+    GameMtlPairIt GetMaterialPairIt (int id);
+    SGameMtlPair* GetMaterialPair(int id);
+    GameMtlPairIt GetMaterialPairIt(int mtl0, int mtl1);
+    SGameMtlPair* GetMaterialPair(int mtl0, int mtl1);
+    SGameMtlPair* GetMaterialPair(LPCSTR name);
 #else
-	// game
-	IC SGameMtlPair*	GetMaterialPair		(u16 idx0, u16 idx1){R_ASSERT((idx0<material_count)&&(idx1<material_count)); return material_pairs_rt[idx1*material_count+idx0];}
+    // game
+    IC SGameMtlPair* GetMaterialPair(u16 idx0, u16 idx1) { R_ASSERT((idx0 < material_count) && (idx1 < material_count)); return material_pairs_rt[idx1*material_count + idx0]; }
 #endif
-	IC GameMtlPairIt	FirstMaterialPair	(){return material_pairs.begin();}
-	IC GameMtlPairIt	LastMaterialPair	(){return material_pairs.end();}
+    IC GameMtlPairIt FirstMaterialPair() { return material_pairs.begin(); }
+    IC GameMtlPairIt LastMaterialPair() { return material_pairs.end(); }
 
-	// IO routines
-	void				Load				();
-	bool				Save				();
+    // IO routines
+    void Load();
+    bool Save();
 };
 
-#define GET_RANDOM(a_vector)			(a_vector[Random.randI(a_vector.size())])
+#define GET_RANDOM(a_vector) (a_vector[Random.randI(a_vector.size())])
 
 #define CLONE_MTL_SOUND(_res_, _mtl_pair_, _a_vector_)\
-	{ VERIFY2(!_mtl_pair_##->_a_vector_.empty(),_mtl_pair_->dbg_Name());\
-	_res_.clone(GET_RANDOM(_mtl_pair_##->_a_vector_),st_Effect,sg_SourceType);\
-	}
+ { VERIFY2(!_mtl_pair_##->_a_vector_.empty(),_mtl_pair_->dbg_Name());\
+ _res_.clone(GET_RANDOM(_mtl_pair_##->_a_vector_),st_Effect,sg_SourceType);\
+ }
 
-extern MTL_EXPORT_API CGameMtlLibrary		GMLib;
+extern MTL_EXPORT_API CGameMtlLibrary GMLib;
 
-//#ifdef	_EDITOR
-//extern MTL_EXPORT_API CGameMtlLibrary*		PGMLib;
+//#ifdef _EDITOR
+//extern MTL_EXPORT_API CGameMtlLibrary* PGMLib;
 //#else
 #include "../include/xrapi/xrapi.h"
 //#endif
diff --git a/src/xrEngine/GameMtlLib_Engine.cpp b/src/xrEngine/GameMtlLib_Engine.cpp
index 2f123e5dab1..bb6c9eb17d9 100644
--- a/src/xrEngine/GameMtlLib_Engine.cpp
+++ b/src/xrEngine/GameMtlLib_Engine.cpp
@@ -6,94 +6,101 @@
 
 void DestroySounds(SoundVec& lst)
 {
-	for (SoundIt it=lst.begin(); lst.end() != it; ++it)	
-		it->destroy();
+    for (SoundIt it = lst.begin(); lst.end() != it; ++it)
+        it->destroy();
 }
 /*
 void DestroyMarks(ShaderVec& lst)
 {
-	for (ShaderIt it=lst.begin(); lst.end() != it; ++it)
-		it->destroy();
+for (ShaderIt it=lst.begin(); lst.end() != it; ++it)
+it->destroy();
 }
 */
 
 void DestroyPSs(PSVec& lst)
 {
-//	for (PSIt it=lst.begin(); lst.end() != it; ++it)
-//		Device.Resources->Delete(*it);
+    // for (PSIt it=lst.begin(); lst.end() != it; ++it)
+    // Device.Resources->Delete(*it);
 }
 
 void CreateSounds(SoundVec& lst, LPCSTR buf)
 {
-	string128 tmp;
-	int cnt			=	_GetItemCount(buf);	R_ASSERT(cnt<=GAMEMTL_SUBITEM_COUNT+2);
-	lst.resize		(cnt);
-	for (int k=0; k<cnt; ++k)
-		lst[k].create	(_GetItem(buf,k,tmp),st_Effect,sg_SourceType);
+    string128 tmp;
+    int cnt = _GetItemCount(buf);
+    R_ASSERT(cnt <= GAMEMTL_SUBITEM_COUNT + 2);
+    lst.resize(cnt);
+    for (int k = 0; k < cnt; ++k)
+        lst[k].create(_GetItem(buf, k, tmp), st_Effect, sg_SourceType);
 }
 /*
 void CreateMarks(ShaderVec& lst, LPCSTR buf)
 {
-	string256	tmp;
-	int cnt		=_GetItemCount(buf);	R_ASSERT(cnt<=GAMEMTL_SUBITEM_COUNT);
-	ref_shader	s;
-	for (int k=0; k<cnt; ++k)
-	{
-		s.create		("effects\\wallmark",_GetItem(buf,k,tmp));
-		lst.push_back	(s);
-	}
+string256 tmp;
+int cnt =_GetItemCount(buf); R_ASSERT(cnt<=GAMEMTL_SUBITEM_COUNT);
+ref_shader s;
+for (int k=0; k<cnt; ++k)
+{
+s.create ("effects\\wallmark",_GetItem(buf,k,tmp));
+lst.push_back (s);
+}
 }
 */
-void CreateMarks(IWallMarkArray *pMarks, LPCSTR buf)
+void CreateMarks(IWallMarkArray* pMarks, LPCSTR buf)
 {
-	string256	tmp;
-	int cnt		=_GetItemCount(buf);	R_ASSERT(cnt<=GAMEMTL_SUBITEM_COUNT);
-	for (int k=0; k<cnt; ++k)
-		pMarks->AppendMark(_GetItem(buf,k,tmp));
+    string256 tmp;
+    int cnt = _GetItemCount(buf);
+    R_ASSERT(cnt <= GAMEMTL_SUBITEM_COUNT);
+    for (int k = 0; k < cnt; ++k)
+        pMarks->AppendMark(_GetItem(buf, k, tmp));
 }
 
 
 void CreatePSs(PSVec& lst, LPCSTR buf)
 {
-	string256 tmp;
-	int cnt=_GetItemCount(buf);	R_ASSERT(cnt<=GAMEMTL_SUBITEM_COUNT);
-	for (int k=0; k<cnt; ++k)
-		lst.push_back	(_GetItem(buf,k,tmp));
+    string256 tmp;
+    int cnt = _GetItemCount(buf);
+    R_ASSERT(cnt <= GAMEMTL_SUBITEM_COUNT);
+    for (int k = 0; k < cnt; ++k)
+        lst.push_back(_GetItem(buf, k, tmp));
 }
 
 SGameMtlPair::~SGameMtlPair()
 {
-	// destroy all media
-	DestroySounds	(BreakingSounds);
-	DestroySounds	(StepSounds);
-	DestroySounds	(CollideSounds);
-	DestroyPSs		(CollideParticles);
-//	DestroyMarks	(CollideMarks);
-	//RenderFactory->DestroyGameMtlPair(m_pCollideMarks);
-	//m_pCollideMarks->
+    // destroy all media
+    DestroySounds(BreakingSounds);
+    DestroySounds(StepSounds);
+    DestroySounds(CollideSounds);
+    DestroyPSs(CollideParticles);
+    // DestroyMarks (CollideMarks);
+    //RenderFactory->DestroyGameMtlPair(m_pCollideMarks);
+    //m_pCollideMarks->
 }
 
 void SGameMtlPair::Load(IReader& fs)
 {
-	shared_str				buf;
+    shared_str buf;
+
+    R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_PAIR));
+    mtl0 = fs.r_u32();
+    mtl1 = fs.r_u32();
+    ID = fs.r_u32();
+    ID_parent = fs.r_u32();
+    OwnProps.assign(fs.r_u32());
 
-	R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_PAIR));
-    mtl0				= fs.r_u32();
-    mtl1				= fs.r_u32();
-    ID					= fs.r_u32();
-    ID_parent			= fs.r_u32();
-    OwnProps.assign		(fs.r_u32());
- 
     R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_BREAKING));
-    fs.r_stringZ			(buf); 		CreateSounds		(BreakingSounds,*buf);
-    
+    fs.r_stringZ(buf);
+    CreateSounds(BreakingSounds, *buf);
+
     R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_STEP));
-    fs.r_stringZ			(buf);		CreateSounds		(StepSounds,*buf);
-    
-	R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_COLLIDE));
-    fs.r_stringZ			(buf);		CreateSounds		(CollideSounds,*buf);
-    fs.r_stringZ			(buf);		CreatePSs			(CollideParticles,*buf);
-    fs.r_stringZ			(buf);		
-	//CreateMarks			(CollideMarks,*buf);
-	CreateMarks			(&*m_pCollideMarks,*buf);
+    fs.r_stringZ(buf);
+    CreateSounds(StepSounds, *buf);
+
+    R_ASSERT(fs.find_chunk(GAMEMTLPAIR_CHUNK_COLLIDE));
+    fs.r_stringZ(buf);
+    CreateSounds(CollideSounds, *buf);
+    fs.r_stringZ(buf);
+    CreatePSs(CollideParticles, *buf);
+    fs.r_stringZ(buf);
+    //CreateMarks (CollideMarks,*buf);
+    CreateMarks(&*m_pCollideMarks, *buf);
 }
diff --git a/src/xrEngine/ICollidable.cpp b/src/xrEngine/ICollidable.cpp
index 081a1605c01..959f08d34d4 100644
--- a/src/xrEngine/ICollidable.cpp
+++ b/src/xrEngine/ICollidable.cpp
@@ -3,13 +3,13 @@
 #include "icollidable.h"
 #include "xr_collide_form.h"
 
-ICollidable::ICollidable()		
+ICollidable::ICollidable()
 {
-	collidable.model					=	NULL;		
-	ISpatial*		self				=	dynamic_cast<ISpatial*> (this);
-	if (self)		self->spatial.type	|=	STYPE_COLLIDEABLE;
+    collidable.model = NULL;
+    ISpatial* self = dynamic_cast<ISpatial*> (this);
+    if (self) self->spatial.type |= STYPE_COLLIDEABLE;
 };
-ICollidable::~ICollidable()		
+ICollidable::~ICollidable()
 {
-	xr_delete		( collidable.model );	
+    xr_delete(collidable.model);
 };
diff --git a/src/xrEngine/ICollidable.h b/src/xrEngine/ICollidable.h
index 79c3e0344f1..936b42a47da 100644
--- a/src/xrEngine/ICollidable.h
+++ b/src/xrEngine/ICollidable.h
@@ -1,14 +1,15 @@
 #pragma once
 
-class	ENGINE_API	ICollisionForm;
+class ENGINE_API ICollisionForm;
 
-class	ENGINE_API	ICollidable	{
+class ENGINE_API ICollidable
+{
 public:
-	struct 
-	{
-		ICollisionForm*			model;
-	}							collidable;
+    struct
+    {
+        ICollisionForm* model;
+    } collidable;
 public:
-	ICollidable();
-	virtual ~ICollidable();
+    ICollidable();
+    virtual ~ICollidable();
 };
diff --git a/src/xrEngine/IGame_Level.cpp b/src/xrEngine/IGame_Level.cpp
index c835c26f065..177e58b29f6 100644
--- a/src/xrEngine/IGame_Level.cpp
+++ b/src/xrEngine/IGame_Level.cpp
@@ -14,334 +14,345 @@
 
 #include "securom_api.h"
 
-ENGINE_API	IGame_Level*	g_pGameLevel	= NULL;
-extern	BOOL g_bLoaded;
+ENGINE_API IGame_Level* g_pGameLevel = NULL;
+extern BOOL g_bLoaded;
 
-IGame_Level::IGame_Level	()
+IGame_Level::IGame_Level()
 {
-	m_pCameras					= xr_new<CCameraManager>(true);
-	g_pGameLevel				= this;
-	pLevel						= NULL;
-	bReady						= false;
-	pCurrentEntity				= NULL;
-	pCurrentViewEntity			= NULL;
-	Device.DumpResourcesMemoryUsage();
+    m_pCameras = xr_new<CCameraManager>(true);
+    g_pGameLevel = this;
+    pLevel = NULL;
+    bReady = false;
+    pCurrentEntity = NULL;
+    pCurrentViewEntity = NULL;
+    Device.DumpResourcesMemoryUsage();
 }
 
 //#include "resourcemanager.h"
 
-IGame_Level::~IGame_Level	()
+IGame_Level::~IGame_Level()
 {
-	if(strstr(Core.Params,"-nes_texture_storing") )
-		//Device.Resources->StoreNecessaryTextures();
-		Device.m_pRender->ResourcesStoreNecessaryTextures();
-	xr_delete					( pLevel		);
-
-	// Render-level unload
-	Render->level_Unload		();
-	xr_delete					(m_pCameras);
-	// Unregister
-	Device.seqRender.Remove		(this);
-	Device.seqFrame.Remove		(this);
-	CCameraManager::ResetPP		();
-///////////////////////////////////////////
-	Sound->set_geometry_occ		(NULL);
-	Sound->set_handler			(NULL);
-	Device.DumpResourcesMemoryUsage();
-
-	u32		m_base=0,c_base=0,m_lmaps=0,c_lmaps=0;
-	if (Device.m_pRender) 
-		Device.m_pRender->ResourcesGetMemoryUsage(m_base,c_base,m_lmaps,c_lmaps);
-
-	Msg		("* [ D3D ]: textures[%d K]", (m_base+m_lmaps)/1024);
+    if (strstr(Core.Params, "-nes_texture_storing"))
+        //Device.Resources->StoreNecessaryTextures();
+        Device.m_pRender->ResourcesStoreNecessaryTextures();
+    xr_delete(pLevel);
+
+    // Render-level unload
+    Render->level_Unload();
+    xr_delete(m_pCameras);
+    // Unregister
+    Device.seqRender.Remove(this);
+    Device.seqFrame.Remove(this);
+    CCameraManager::ResetPP();
+    ///////////////////////////////////////////
+    Sound->set_geometry_occ(NULL);
+    Sound->set_handler(NULL);
+    Device.DumpResourcesMemoryUsage();
+
+    u32 m_base = 0, c_base = 0, m_lmaps = 0, c_lmaps = 0;
+    if (Device.m_pRender)
+        Device.m_pRender->ResourcesGetMemoryUsage(m_base, c_base, m_lmaps, c_lmaps);
+
+    Msg("* [ D3D ]: textures[%d K]", (m_base + m_lmaps) / 1024);
 
 }
 
-void IGame_Level::net_Stop			()
+void IGame_Level::net_Stop()
 {
-	for (int i=0; i<6; i++)
-		Objects.Update			(false);
-	// Destroy all objects
-	Objects.Unload				( );
-	IR_Release					( );
+    for (int i = 0; i < 6; i++)
+        Objects.Update(false);
+    // Destroy all objects
+    Objects.Unload();
+    IR_Release();
 
-	bReady						= false;	
+    bReady = false;
 }
 
 //-------------------------------------------------------------------------------------------
-//extern CStatTimer				tscreate;
-void __stdcall _sound_event		(ref_sound_data_ptr S, float range)
+//extern CStatTimer tscreate;
+void __stdcall _sound_event(ref_sound_data_ptr S, float range)
 {
-	if ( g_pGameLevel && S && S->feedback )	g_pGameLevel->SoundEvent_Register	(S,range);
+    if (g_pGameLevel && S && S->feedback) g_pGameLevel->SoundEvent_Register(S, range);
 }
-static void __stdcall	build_callback	(Fvector* V, int Vcnt, CDB::TRI* T, int Tcnt, void* params)
+static void __stdcall build_callback(Fvector* V, int Vcnt, CDB::TRI* T, int Tcnt, void* params)
 {
-	g_pGameLevel->Load_GameSpecific_CFORM( T, Tcnt );
+    g_pGameLevel->Load_GameSpecific_CFORM(T, Tcnt);
 }
 
-bool IGame_Level::Load			(u32 dwNum) 
+bool IGame_Level::Load(u32 dwNum)
 {
-	SECUROM_MARKER_PERFORMANCE_ON(10)
-
-	// Initialize level data
-	pApp->Level_Set				( dwNum );
-	string_path					temp;
-	if (!FS.exist(temp, "$level$", "level.ltx"))
-		Debug.fatal	(DEBUG_INFO,"Can't find level configuration file '%s'.",temp);
-	pLevel						= xr_new<CInifile>	( temp );
-	
-	// Open
-//	g_pGamePersistent->LoadTitle	("st_opening_stream");
-	g_pGamePersistent->LoadTitle	();
-	IReader* LL_Stream			= FS.r_open	("$level$","level");
-	IReader	&fs					= *LL_Stream;
-
-	// Header
-	hdrLEVEL					H;
-	fs.r_chunk_safe				(fsL_HEADER,&H,sizeof(H));
-	R_ASSERT2					(XRCL_PRODUCTION_VERSION==H.XRLC_version,"Incompatible level version.");
-
-	// CForms
-//	g_pGamePersistent->LoadTitle	("st_loading_cform");
-	g_pGamePersistent->LoadTitle	();
-	ObjectSpace.Load			( build_callback );
-	//Sound->set_geometry_occ		( &Static );
-	Sound->set_geometry_occ		(ObjectSpace.GetStaticModel	());
-	Sound->set_handler			( _sound_event );
-
-	pApp->LoadSwitch			();
-
-
-	// HUD + Environment
-	if(!g_hud)
-		g_hud					= (CCustomHUD*)NEW_INSTANCE	(CLSID_HUDMANAGER);
-
-	// Render-level Load
-	Render->level_Load			(LL_Stream);
-	// tscreate.FrameEnd			();
-	// Msg						("* S-CREATE: %f ms, %d times",tscreate.result,tscreate.count);
-
-	// Objects
-	g_pGamePersistent->Environment().mods_load	();
-	R_ASSERT					(Load_GameSpecific_Before());
-	Objects.Load				();
-//. ANDY	R_ASSERT					(Load_GameSpecific_After ());
-
-	// Done
-	FS.r_close					( LL_Stream );
-	bReady						= true;
-	if (!g_dedicated_server)	IR_Capture();
+    SECUROM_MARKER_PERFORMANCE_ON(10)
+
+        // Initialize level data
+        pApp->Level_Set(dwNum);
+    string_path temp;
+    if (!FS.exist(temp, "$level$", "level.ltx"))
+        Debug.fatal(DEBUG_INFO, "Can't find level configuration file '%s'.", temp);
+    pLevel = xr_new<CInifile>(temp);
+
+    // Open
+    // g_pGamePersistent->LoadTitle ("st_opening_stream");
+    g_pGamePersistent->LoadTitle();
+    IReader* LL_Stream = FS.r_open("$level$", "level");
+    IReader& fs = *LL_Stream;
+
+    // Header
+    hdrLEVEL H;
+    fs.r_chunk_safe(fsL_HEADER, &H, sizeof(H));
+    R_ASSERT2(XRCL_PRODUCTION_VERSION == H.XRLC_version, "Incompatible level version.");
+
+    // CForms
+    // g_pGamePersistent->LoadTitle ("st_loading_cform");
+    g_pGamePersistent->LoadTitle();
+    ObjectSpace.Load(build_callback);
+    //Sound->set_geometry_occ ( &Static );
+    Sound->set_geometry_occ(ObjectSpace.GetStaticModel());
+    Sound->set_handler(_sound_event);
+
+    pApp->LoadSwitch();
+
+
+    // HUD + Environment
+    if (!g_hud)
+        g_hud = (CCustomHUD*)NEW_INSTANCE(CLSID_HUDMANAGER);
+
+    // Render-level Load
+    Render->level_Load(LL_Stream);
+    // tscreate.FrameEnd ();
+    // Msg ("* S-CREATE: %f ms, %d times",tscreate.result,tscreate.count);
+
+    // Objects
+    g_pGamePersistent->Environment().mods_load();
+    R_ASSERT(Load_GameSpecific_Before());
+    Objects.Load();
+    //. ANDY R_ASSERT (Load_GameSpecific_After ());
+
+    // Done
+    FS.r_close(LL_Stream);
+    bReady = true;
+    if (!g_dedicated_server) IR_Capture();
 #ifndef DEDICATED_SERVER
-	Device.seqRender.Add		(this);
+    Device.seqRender.Add (this);
 #endif
 
-	Device.seqFrame.Add			(this);
+    Device.seqFrame.Add(this);
 
-	SECUROM_MARKER_PERFORMANCE_OFF(10)
+    SECUROM_MARKER_PERFORMANCE_OFF(10)
 
-	return true;	
+        return true;
 }
 
 #ifndef _EDITOR
 #include "../xrCPU_Pipe/ttapi.h"
 #endif
 
-int		psNET_DedicatedSleep	= 5;
-void	IGame_Level::OnRender		( ) 
+int psNET_DedicatedSleep = 5;
+void IGame_Level::OnRender()
 {
 #ifndef DEDICATED_SERVER
-//	if (_abs(Device.fTimeDelta)<EPS_S) return;
-
-	#ifdef _GPA_ENABLED	
-		TAL_ID rtID = TAL_MakeID( 1 , Core.dwFrame , 0);	
-		TAL_CreateID( rtID );
-		TAL_BeginNamedVirtualTaskWithID( "GameRenderFrame" , rtID );
-		TAL_Parami( "Frame#" , Device.dwFrame );
-		TAL_EndVirtualTask();
-	#endif // _GPA_ENABLED
-
-	// Level render, only when no client output required
-	if (!g_dedicated_server)	{
-		Render->Calculate			();
-		Render->Render				();
-	} else {
-		Sleep						(psNET_DedicatedSleep);
-	}
-
-	#ifdef _GPA_ENABLED	
-		TAL_RetireID( rtID );
-	#endif // _GPA_ENABLED
-
-	// Font
-//	pApp->pFontSystem->SetSizeI(0.023f);
-//	pApp->pFontSystem->OnRender	();
+    // if (_abs(Device.fTimeDelta)<EPS_S) return;
+
+#ifdef _GPA_ENABLED
+    TAL_ID rtID = TAL_MakeID( 1 , Core.dwFrame , 0);
+    TAL_CreateID( rtID );
+    TAL_BeginNamedVirtualTaskWithID( "GameRenderFrame" , rtID );
+    TAL_Parami( "Frame#" , Device.dwFrame );
+    TAL_EndVirtualTask();
+#endif // _GPA_ENABLED
+
+    // Level render, only when no client output required
+    if (!g_dedicated_server)
+    {
+        Render->Calculate ();
+        Render->Render ();
+    }
+    else
+    {
+        Sleep (psNET_DedicatedSleep);
+    }
+
+#ifdef _GPA_ENABLED
+    TAL_RetireID( rtID );
+#endif // _GPA_ENABLED
+
+    // Font
+    // pApp->pFontSystem->SetSizeI(0.023f);
+    // pApp->pFontSystem->OnRender ();
 #endif
 }
 
-void	IGame_Level::OnFrame		( ) 
+void IGame_Level::OnFrame()
 {
-	// Log				("- level:on-frame: ",u32(Device.dwFrame));
-//	if (_abs(Device.fTimeDelta)<EPS_S) return;
-
-	// Update all objects
-	VERIFY						(bReady);
-	Objects.Update				(false);
-	g_hud->OnFrame				();
-
-	// Ambience
-	if (Sounds_Random.size() && (Device.dwTimeGlobal > Sounds_Random_dwNextTime))
-	{
-		Sounds_Random_dwNextTime		= Device.dwTimeGlobal + ::Random.randI	(10000,20000);
-		Fvector	pos;
-		pos.random_dir().normalize().mul(::Random.randF(30,100)).add	(Device.vCameraPosition);
-		int		id						= ::Random.randI(Sounds_Random.size());
-		if (Sounds_Random_Enabled)		{
-			Sounds_Random[id].play_at_pos	(0,pos,0);
-			Sounds_Random[id].set_volume	(1.f);
-			Sounds_Random[id].set_range		(10,200);
-		}
-	}
+    // Log ("- level:on-frame: ",u32(Device.dwFrame));
+    // if (_abs(Device.fTimeDelta)<EPS_S) return;
+
+    // Update all objects
+    VERIFY(bReady);
+    Objects.Update(false);
+    g_hud->OnFrame();
+
+    // Ambience
+    if (Sounds_Random.size() && (Device.dwTimeGlobal > Sounds_Random_dwNextTime))
+    {
+        Sounds_Random_dwNextTime = Device.dwTimeGlobal + ::Random.randI(10000, 20000);
+        Fvector pos;
+        pos.random_dir().normalize().mul(::Random.randF(30, 100)).add(Device.vCameraPosition);
+        int id = ::Random.randI(Sounds_Random.size());
+        if (Sounds_Random_Enabled)
+        {
+            Sounds_Random[id].play_at_pos(0, pos, 0);
+            Sounds_Random[id].set_volume(1.f);
+            Sounds_Random[id].set_range(10, 200);
+        }
+    }
 }
 // ==================================================================================================
 
-void CServerInfo::AddItem( LPCSTR name_, LPCSTR value_, u32 color_ )
+void CServerInfo::AddItem(LPCSTR name_, LPCSTR value_, u32 color_)
 {
-	shared_str s_name( name_ );
-	AddItem( s_name, value_, color_ );
+    shared_str s_name(name_);
+    AddItem(s_name, value_, color_);
 }
 
-void CServerInfo::AddItem( shared_str& name_, LPCSTR value_, u32 color_ )
+void CServerInfo::AddItem(shared_str& name_, LPCSTR value_, u32 color_)
 {
-	SItem_ServerInfo it;
-	//	shared_str s_name = CStringTable().translate( name_ );
-
-	//	xr_strcpy( it.name, s_name.c_str() );
-	xr_strcpy( it.name, name_.c_str() );
-	xr_strcat( it.name, " = " );
-	xr_strcat( it.name, value_ );
-	it.color = color_;
-
-	if ( data.size() < max_item )
-	{
-		data.push_back( it );
-	}
+    SItem_ServerInfo it;
+    // shared_str s_name = CStringTable().translate( name_ );
+
+    // xr_strcpy( it.name, s_name.c_str() );
+    xr_strcpy(it.name, name_.c_str());
+    xr_strcat(it.name, " = ");
+    xr_strcat(it.name, value_);
+    it.color = color_;
+
+    if (data.size() < max_item)
+    {
+        data.push_back(it);
+    }
 }
 
-void IGame_Level::SetEntity( CObject* O  )
+void IGame_Level::SetEntity(CObject* O)
 {
-	if (pCurrentEntity)
-		pCurrentEntity->On_LostEntity();
-	
-	if (O)
-		O->On_SetEntity();
+    if (pCurrentEntity)
+        pCurrentEntity->On_LostEntity();
 
-	pCurrentEntity=pCurrentViewEntity=O;
+    if (O)
+        O->On_SetEntity();
+
+    pCurrentEntity = pCurrentViewEntity = O;
 }
 
-void IGame_Level::SetViewEntity( CObject* O  )
+void IGame_Level::SetViewEntity(CObject* O)
 {
-	if (pCurrentViewEntity)
-		pCurrentViewEntity->On_LostEntity();
+    if (pCurrentViewEntity)
+        pCurrentViewEntity->On_LostEntity();
 
-	if (O)
-		O->On_SetEntity();
+    if (O)
+        O->On_SetEntity();
 
-	pCurrentViewEntity=O;
+    pCurrentViewEntity = O;
 }
 
-void	IGame_Level::SoundEvent_Register	( ref_sound_data_ptr S, float range )
+void IGame_Level::SoundEvent_Register(ref_sound_data_ptr S, float range)
 {
-	if (!g_bLoaded)									return;
-	if (!S)											return;
-	if (S->g_object && S->g_object->getDestroy())	{S->g_object=0; return;}
-	if (0==S->feedback)								return;
-
-	clamp					(range,0.1f,500.f);
-
-	const CSound_params* p	= S->feedback->get_params();
-	Fvector snd_position	= p->position;
-	if(S->feedback->is_2D()){
-		snd_position.add	(Sound->listener_position());
-	}
-
-	VERIFY					(p && _valid(range) );
-	range					= _min(range,p->max_ai_distance);
-	VERIFY					(_valid(snd_position));
-	VERIFY					(_valid(p->max_ai_distance));
-	VERIFY					(_valid(p->volume));
-
-	// Query objects
-	Fvector					bb_size	=	{range,range,range};
-	g_SpatialSpace->q_box	(snd_ER,0,STYPE_REACTTOSOUND,snd_position,bb_size);
-
-	// Iterate
-	xr_vector<ISpatial*>::iterator	it	= snd_ER.begin	();
-	xr_vector<ISpatial*>::iterator	end	= snd_ER.end	();
-	for (; it!=end; it++)	{
-		Feel::Sound* L		= (*it)->dcast_FeelSound	();
-		if (0==L)			continue;
-		CObject* CO = (*it)->dcast_CObject();	VERIFY(CO);
-		if (CO->getDestroy()) continue;
-
-		// Energy and signal
-		VERIFY				(_valid((*it)->spatial.sphere.P));
-		float dist			= snd_position.distance_to((*it)->spatial.sphere.P);
-		if (dist>p->max_ai_distance) continue;
-		VERIFY				(_valid(dist));
-		VERIFY2				(!fis_zero(p->max_ai_distance), S->handle->file_name());
-		float Power			= (1.f-dist/p->max_ai_distance)*p->volume;
-		VERIFY				(_valid(Power));
-		if (Power>EPS_S)	{
-			float occ		= Sound->get_occlusion_to((*it)->spatial.sphere.P,snd_position);
-			VERIFY			(_valid(occ))	;
-			Power			*= occ;
-			if (Power>EPS_S)	{
-				_esound_delegate	D	=	{ L, S, Power };
-				snd_Events.push_back	(D)	;
-			}
-		}
-	}
-	snd_ER.clear_not_free	();
+    if (!g_bLoaded) return;
+    if (!S) return;
+    if (S->g_object && S->g_object->getDestroy()) { S->g_object = 0; return; }
+    if (0 == S->feedback) return;
+
+    clamp(range, 0.1f, 500.f);
+
+    const CSound_params* p = S->feedback->get_params();
+    Fvector snd_position = p->position;
+    if (S->feedback->is_2D())
+    {
+        snd_position.add(Sound->listener_position());
+    }
+
+    VERIFY(p && _valid(range));
+    range = _min(range, p->max_ai_distance);
+    VERIFY(_valid(snd_position));
+    VERIFY(_valid(p->max_ai_distance));
+    VERIFY(_valid(p->volume));
+
+    // Query objects
+    Fvector bb_size = {range, range, range};
+    g_SpatialSpace->q_box(snd_ER, 0, STYPE_REACTTOSOUND, snd_position, bb_size);
+
+    // Iterate
+    xr_vector<ISpatial*>::iterator it = snd_ER.begin();
+    xr_vector<ISpatial*>::iterator end = snd_ER.end();
+    for (; it != end; it++)
+    {
+        Feel::Sound* L = (*it)->dcast_FeelSound();
+        if (0 == L) continue;
+        CObject* CO = (*it)->dcast_CObject();
+        VERIFY(CO);
+        if (CO->getDestroy()) continue;
+
+        // Energy and signal
+        VERIFY(_valid((*it)->spatial.sphere.P));
+        float dist = snd_position.distance_to((*it)->spatial.sphere.P);
+        if (dist > p->max_ai_distance) continue;
+        VERIFY(_valid(dist));
+        VERIFY2(!fis_zero(p->max_ai_distance), S->handle->file_name());
+        float Power = (1.f - dist / p->max_ai_distance)*p->volume;
+        VERIFY(_valid(Power));
+        if (Power > EPS_S)
+        {
+            float occ = Sound->get_occlusion_to((*it)->spatial.sphere.P, snd_position);
+            VERIFY(_valid(occ));
+            Power *= occ;
+            if (Power > EPS_S)
+            {
+                _esound_delegate D = {L, S, Power};
+                snd_Events.push_back(D);
+            }
+        }
+    }
+    snd_ER.clear_not_free();
 }
 
-void	IGame_Level::SoundEvent_Dispatch	( )
+void IGame_Level::SoundEvent_Dispatch()
 {
-	while	(!snd_Events.empty())	{
-		_esound_delegate&	D	= snd_Events.back	();
-		VERIFY				(D.dest && D.source);
-		if (D.source->feedback)	{
-			D.dest->feel_sound_new	(
-				D.source->g_object,
-				D.source->g_type,
-				D.source->g_userdata,
-
-				D.source->feedback->is_2D() ? Device.vCameraPosition : 
-					D.source->feedback->get_params()->position,
-				D.power
-				);
-		}
-		snd_Events.pop_back		();
-	}
+    while (!snd_Events.empty())
+    {
+        _esound_delegate& D = snd_Events.back();
+        VERIFY(D.dest && D.source);
+        if (D.source->feedback)
+        {
+            D.dest->feel_sound_new(
+                D.source->g_object,
+                D.source->g_type,
+                D.source->g_userdata,
+
+                D.source->feedback->is_2D() ? Device.vCameraPosition :
+                D.source->feedback->get_params()->position,
+                D.power
+                );
+        }
+        snd_Events.pop_back();
+    }
 }
 
 // Lain: added
-void   IGame_Level::SoundEvent_OnDestDestroy (Feel::Sound* obj)
+void IGame_Level::SoundEvent_OnDestDestroy(Feel::Sound* obj)
 {
-	struct rem_pred
-	{
-		rem_pred(Feel::Sound* obj) : m_obj(obj) {}
+    struct rem_pred
+    {
+        rem_pred(Feel::Sound* obj) : m_obj(obj) {}
 
-		bool operator () (const _esound_delegate& d)
-		{
-			return d.dest == m_obj;
-		}
+        bool operator () (const _esound_delegate& d)
+        {
+            return d.dest == m_obj;
+        }
 
-	private:
-		Feel::Sound* m_obj;
-	};
+    private:
+        Feel::Sound* m_obj;
+    };
 
-	snd_Events.erase( std::remove_if(snd_Events.begin(), snd_Events.end(), rem_pred(obj)),
-	                  snd_Events.end() );
+    snd_Events.erase(std::remove_if(snd_Events.begin(), snd_Events.end(), rem_pred(obj)),
+        snd_Events.end());
 }
 
 
diff --git a/src/xrEngine/IGame_Level.h b/src/xrEngine/IGame_Level.h
index 42491abf608..8835922fd3d 100644
--- a/src/xrEngine/IGame_Level.h
+++ b/src/xrEngine/IGame_Level.h
@@ -17,124 +17,125 @@ namespace Feel { class ENGINE_API Sound; }
 class ENGINE_API CServerInfo
 {
 private:
-	struct SItem_ServerInfo
-	{
-		string128	name;
-		u32			color;
-	};
-	enum { max_item = 15 };
-	svector<SItem_ServerInfo,max_item>	data;
+    struct SItem_ServerInfo
+    {
+        string128 name;
+        u32 color;
+    };
+    enum { max_item = 15 };
+    svector<SItem_ServerInfo, max_item> data;
 
 public:
-	u32		Size()			{ return data.size(); }
-	void	ResetData()		{ data.clear(); }
+    u32 Size() { return data.size(); }
+    void ResetData() { data.clear(); }
 
-	void	AddItem( LPCSTR name_,		LPCSTR value_, u32 color_ = RGB(255,255,255) );
-	void	AddItem( shared_str& name_,	LPCSTR value_, u32 color_ = RGB(255,255,255) );
+    void AddItem(LPCSTR name_, LPCSTR value_, u32 color_ = RGB(255, 255, 255));
+    void AddItem(shared_str& name_, LPCSTR value_, u32 color_ = RGB(255, 255, 255));
 
-	IC SItem_ServerInfo&	operator[] ( u32 id ) { VERIFY( id < max_item ); return data[id]; }
+    IC SItem_ServerInfo& operator[] (u32 id) { VERIFY(id < max_item); return data[id]; }
 
-	CServerInfo() {};
-	~CServerInfo() {};
+    CServerInfo() {};
+    ~CServerInfo() {};
 };
 
 //-----------------------------------------------------------------------------------------------------------
-class ENGINE_API	IGame_Level	:
-	public DLL_Pure,
-	public IInputReceiver,
-	public pureRender,
-	public pureFrame,
-	public IEventReceiver
+class ENGINE_API IGame_Level :
+    public DLL_Pure,
+    public IInputReceiver,
+    public pureRender,
+    public pureFrame,
+    public IEventReceiver
 {
 protected:
-	// Network interface
-	CObject*					pCurrentEntity;
-	CObject*					pCurrentViewEntity;
-   
-	// Static sounds
-	xr_vector<ref_sound>		Sounds_Random;
-	u32							Sounds_Random_dwNextTime;
-	BOOL						Sounds_Random_Enabled;
-	CCameraManager*				m_pCameras;
-
-	// temporary
-	xr_vector<ISpatial*>		snd_ER;
+    // Network interface
+    CObject* pCurrentEntity;
+    CObject* pCurrentViewEntity;
+
+    // Static sounds
+    xr_vector<ref_sound> Sounds_Random;
+    u32 Sounds_Random_dwNextTime;
+    BOOL Sounds_Random_Enabled;
+    CCameraManager* m_pCameras;
+
+    // temporary
+    xr_vector<ISpatial*> snd_ER;
 public:
-	CObjectList					Objects; 
-	CObjectSpace				ObjectSpace;
-	CCameraManager&				Cameras			()				{return *m_pCameras;};
-
-	BOOL						bReady;
-
-	CInifile*					pLevel;
-public:	// deferred sound events
-	struct	_esound_delegate	{
-		Feel::Sound*			dest	;
-		ref_sound_data_ptr		source	;
-		float					power	;
-	};
-	xr_vector<_esound_delegate>	snd_Events;
+    CObjectList Objects;
+    CObjectSpace ObjectSpace;
+    CCameraManager& Cameras() { return *m_pCameras; };
+
+    BOOL bReady;
+
+    CInifile* pLevel;
+public: // deferred sound events
+    struct _esound_delegate
+    {
+        Feel::Sound* dest;
+        ref_sound_data_ptr source;
+        float power;
+    };
+    xr_vector<_esound_delegate> snd_Events;
 public:
-	// Main, global functions
-	IGame_Level					();
-	virtual ~IGame_Level		();
-
-	virtual shared_str			name					() const = 0;
-	virtual void				GetLevelInfo			( CServerInfo* si ) = 0;
-
-	virtual bool				net_Start				( const char* op_server, const char* op_client)	= 0;
-	virtual void				net_Load				( const char* name )							= 0;
-	virtual void				net_Save				( const char* name )							= 0;
-	virtual void				net_Stop				( );
-	virtual void				net_Update				( )										= 0;
-
-	virtual bool				Load					( u32 dwNum );
-	virtual bool				Load_GameSpecific_Before( )										{ return TRUE; };		// before object loading
-	virtual bool				Load_GameSpecific_After	( )										{ return TRUE; };		// after object loading
-	virtual void				Load_GameSpecific_CFORM	( CDB::TRI* T, u32 count )				= 0;
-
-	virtual void	_BCL		OnFrame					( void );
-	virtual void				OnRender				( void );
-
-	virtual	shared_str			OpenDemoFile			(const char* demo_file_name) = 0;
-	virtual void				net_StartPlayDemo		() = 0;
-
-	// Main interface
-	CObject*					CurrentEntity			( void ) const							{ return pCurrentEntity;				}
-	CObject*					CurrentViewEntity		( void ) const							{ return pCurrentViewEntity;			}
-	void						SetEntity				( CObject* O  );//							{ pCurrentEntity=pCurrentViewEntity=O;	}
-	void						SetViewEntity			( CObject* O  );//							{ pCurrentViewEntity=O;					}
-	
-	void						SoundEvent_Register		( ref_sound_data_ptr S, float range );
-	void						SoundEvent_Dispatch		( );
-	void                        SoundEvent_OnDestDestroy (Feel::Sound*);
-
-	// Loader interface
-	//ref_shader					LL_CreateShader			(int S, int T, int M, int C);
-	void						LL_CheckTextures		();
-	virtual void				SetEnvironmentGameTimeFactor(u64 const& GameTime, float const& fTimeFactor) = 0;
+    // Main, global functions
+    IGame_Level();
+    virtual ~IGame_Level();
+
+    virtual shared_str name() const = 0;
+    virtual void GetLevelInfo(CServerInfo* si) = 0;
+
+    virtual bool net_Start(const char* op_server, const char* op_client) = 0;
+    virtual void net_Load(const char* name) = 0;
+    virtual void net_Save(const char* name) = 0;
+    virtual void net_Stop();
+    virtual void net_Update() = 0;
+
+    virtual bool Load(u32 dwNum);
+    virtual bool Load_GameSpecific_Before() { return TRUE; }; // before object loading
+    virtual bool Load_GameSpecific_After() { return TRUE; }; // after object loading
+    virtual void Load_GameSpecific_CFORM(CDB::TRI* T, u32 count) = 0;
+
+    virtual void _BCL OnFrame(void);
+    virtual void OnRender(void);
+
+    virtual shared_str OpenDemoFile(const char* demo_file_name) = 0;
+    virtual void net_StartPlayDemo() = 0;
+
+    // Main interface
+    CObject* CurrentEntity(void) const { return pCurrentEntity; }
+    CObject* CurrentViewEntity(void) const { return pCurrentViewEntity; }
+    void SetEntity(CObject* O);// { pCurrentEntity=pCurrentViewEntity=O; }
+    void SetViewEntity(CObject* O);// { pCurrentViewEntity=O; }
+
+    void SoundEvent_Register(ref_sound_data_ptr S, float range);
+    void SoundEvent_Dispatch();
+    void SoundEvent_OnDestDestroy(Feel::Sound*);
+
+    // Loader interface
+    //ref_shader LL_CreateShader (int S, int T, int M, int C);
+    void LL_CheckTextures();
+    virtual void SetEnvironmentGameTimeFactor(u64 const& GameTime, float const& fTimeFactor) = 0;
 };
 
 //-----------------------------------------------------------------------------------------------------------
-extern ENGINE_API	IGame_Level*	g_pGameLevel;
+extern ENGINE_API IGame_Level* g_pGameLevel;
 
 template <typename _class_type>
-	void relcase_register	(_class_type *self, void (xr_stdcall _class_type::* function_to_bind)(CObject*))
-	{
-		g_pGameLevel->Objects.relcase_register	(
-			CObjectList::RELCASE_CALLBACK (
-				self,
-				function_to_bind)
-		);
-	}
+void relcase_register(_class_type* self, void (xr_stdcall _class_type::* function_to_bind)(CObject*))
+{
+    g_pGameLevel->Objects.relcase_register(
+        CObjectList::RELCASE_CALLBACK(
+        self,
+        function_to_bind)
+        );
+}
 
 template <typename _class_type>
-	void relcase_unregister	(_class_type *self, void (xr_stdcall _class_type::* function_to_bind)(CObject*))
-	{
-		g_pGameLevel->Objects.relcase_unregister	(
-			CObjectList::RELCASE_CALLBACK (
-				self,
-				function_to_bind)
-		);
-	}
-#endif    
+void relcase_unregister(_class_type* self, void (xr_stdcall _class_type::* function_to_bind)(CObject*))
+{
+    g_pGameLevel->Objects.relcase_unregister(
+        CObjectList::RELCASE_CALLBACK(
+        self,
+        function_to_bind)
+        );
+}
+#endif
diff --git a/src/xrEngine/IGame_Level_check_textures.cpp b/src/xrEngine/IGame_Level_check_textures.cpp
index c238614db6f..f20fc93a69d 100644
--- a/src/xrEngine/IGame_Level_check_textures.cpp
+++ b/src/xrEngine/IGame_Level_check_textures.cpp
@@ -4,25 +4,25 @@
 
 void IGame_Level::LL_CheckTextures()
 {
-	u32	m_base,c_base,m_lmaps,c_lmaps;
-	//Device.Resources->_GetMemoryUsage		(m_base,c_base,m_lmaps,c_lmaps);
-	Device.m_pRender->ResourcesGetMemoryUsage(m_base,c_base,m_lmaps,c_lmaps);
+    u32 m_base, c_base, m_lmaps, c_lmaps;
+    //Device.Resources->_GetMemoryUsage (m_base,c_base,m_lmaps,c_lmaps);
+    Device.m_pRender->ResourcesGetMemoryUsage(m_base, c_base, m_lmaps, c_lmaps);
 
-	Msg	("* t-report - base: %d, %d K",	c_base,		m_base/1024);
-	Msg	("* t-report - lmap: %d, %d K",	c_lmaps,	m_lmaps/1024);
-	BOOL	bError	= FALSE;
-	if (m_base>64*1024*1024 || c_base>400)
-	{
-		// LPCSTR msg	= "Too many base-textures (limit: 400 textures or 64M).\n        Reduce number of textures (better) or their resolution (worse).";
-		// Msg		("***FATAL***: %s",msg);
-		bError		= TRUE;
-	}
-	if (m_lmaps>32*1024*1024 || c_lmaps>8)
-	{
+    Msg("* t-report - base: %d, %d K", c_base, m_base / 1024);
+    Msg("* t-report - lmap: %d, %d K", c_lmaps, m_lmaps / 1024);
+    BOOL bError = FALSE;
+    if (m_base > 64 * 1024 * 1024 || c_base > 400)
+    {
+        // LPCSTR msg = "Too many base-textures (limit: 400 textures or 64M).\n        Reduce number of textures (better) or their resolution (worse).";
+        // Msg ("***FATAL***: %s",msg);
+        bError = TRUE;
+    }
+    if (m_lmaps > 32 * 1024 * 1024 || c_lmaps > 8)
+    {
 #ifdef DEBUG
-		LPCSTR msg	= "Too many lmap-textures (limit: 8 textures or 32M).\n        Reduce pixel density (worse) or use more vertex lighting (better).";
-		Msg			("***FATAL***: %s",msg);
+        LPCSTR msg = "Too many lmap-textures (limit: 8 textures or 32M).\n        Reduce pixel density (worse) or use more vertex lighting (better).";
+        Msg("***FATAL***: %s", msg);
 #endif // #ifdef DEBUG
-		bError		= TRUE;
-	}
+        bError = TRUE;
+    }
 }
diff --git a/src/xrEngine/IGame_ObjectPool.cpp b/src/xrEngine/IGame_ObjectPool.cpp
index de0f1e12eb1..0b0af84f70d 100644
--- a/src/xrEngine/IGame_ObjectPool.cpp
+++ b/src/xrEngine/IGame_ObjectPool.cpp
@@ -10,130 +10,131 @@ IGame_ObjectPool::IGame_ObjectPool(void)
 
 IGame_ObjectPool::~IGame_ObjectPool(void)
 {
-	R_ASSERT			(m_PrefetchObjects.empty());
+    R_ASSERT(m_PrefetchObjects.empty());
 }
 
-void IGame_ObjectPool::prefetch	()
+void IGame_ObjectPool::prefetch()
 {
-	R_ASSERT			(m_PrefetchObjects.empty());
-
-	int	p_count			= 0;
-	::Render->model_Logging	(FALSE);
-
-	string256				section;
-	// prefetch objects
-	strconcat				(sizeof(section),section,"prefetch_objects_",g_pGamePersistent->m_game_params.m_game_type);
-	CInifile::Sect const & sect	= pSettings->r_section(section);
-	for (CInifile::SectCIt I=sect.Data.begin(); I!=sect.Data.end(); I++)	{
-		const CInifile::Item& item= *I;
-		CLASS_ID CLS		= pSettings->r_clsid(item.first.c_str(),"class");
-		p_count				++;
-		CObject* pObject	= (CObject*) NEW_INSTANCE(CLS);
-		pObject->Load		(item.first.c_str());
-		VERIFY2				(pObject->cNameSect().c_str(),item.first.c_str());
-		m_PrefetchObjects.push_back	(pObject);
-	}
-
-	// out statistic
-	::Render->model_Logging	(TRUE);
+    R_ASSERT(m_PrefetchObjects.empty());
+
+    int p_count = 0;
+    ::Render->model_Logging(FALSE);
+
+    string256 section;
+    // prefetch objects
+    strconcat(sizeof(section), section, "prefetch_objects_", g_pGamePersistent->m_game_params.m_game_type);
+    CInifile::Sect const& sect = pSettings->r_section(section);
+    for (CInifile::SectCIt I = sect.Data.begin(); I != sect.Data.end(); I++)
+    {
+        const CInifile::Item& item = *I;
+        CLASS_ID CLS = pSettings->r_clsid(item.first.c_str(), "class");
+        p_count++;
+        CObject* pObject = (CObject*)NEW_INSTANCE(CLS);
+        pObject->Load(item.first.c_str());
+        VERIFY2(pObject->cNameSect().c_str(), item.first.c_str());
+        m_PrefetchObjects.push_back(pObject);
+    }
+
+    // out statistic
+    ::Render->model_Logging(TRUE);
 }
 
 void IGame_ObjectPool::clear()
 {
-	// Clear POOL
-	ObjectVecIt it			= m_PrefetchObjects.begin();
-	ObjectVecIt itE			= m_PrefetchObjects.end();
-	for (; it!=itE; it++)	
-		xr_delete			(*it);
-	m_PrefetchObjects.clear	(); 
+    // Clear POOL
+    ObjectVecIt it = m_PrefetchObjects.begin();
+    ObjectVecIt itE = m_PrefetchObjects.end();
+    for (; it != itE; it++)
+        xr_delete(*it);
+    m_PrefetchObjects.clear();
 }
 
-CObject*	IGame_ObjectPool::create			( LPCSTR	name	)
+CObject* IGame_ObjectPool::create(LPCSTR name)
 {
-	CLASS_ID CLS		=	pSettings->r_clsid		(name,"class");
-	CObject* O			=	(CObject*) NEW_INSTANCE	(CLS);
-	O->cNameSect_set	(name);
-	O->Load				(name);
-	return				O;
+    CLASS_ID CLS = pSettings->r_clsid(name, "class");
+    CObject* O = (CObject*)NEW_INSTANCE(CLS);
+    O->cNameSect_set(name);
+    O->Load(name);
+    return O;
 }
 
-void		IGame_ObjectPool::destroy			( CObject*	O		)
+void IGame_ObjectPool::destroy(CObject* O)
 {
-	xr_delete				(O);
+    xr_delete(O);
 }
 
 /*
-void IGame_ObjectPool::prefetch	()
+void IGame_ObjectPool::prefetch ()
 {
-	R_ASSERT			(map_POOL.empty());
-
-	u32	mem_0			= Memory.mem_usage();
-	float	p_time		= 1000.f*Device.GetTimerGlobal()->GetElapsed_sec();
-	int	p_count			= 0;
-	::Render->model_Logging	(FALSE);
-
-	string256 section;
-	// prefetch objects
-	strconcat				(section,"prefetch_objects_",g_pGamePersistent->m_game_params.m_game_type);
-	CInifile::Sect& sect	= pSettings->r_section(section);
-	for (CInifile::SectIt I=sect.begin(); I!=sect.end(); I++)	{
-		CInifile::Item& item= *I;
-		CLASS_ID CLS		= pSettings->r_clsid(item.first.c_str(),"class");
-		int count			= atoi(item.second.c_str());
-		count				+= (count==0)?1:0;
-		R_ASSERT2			((count>0) && (count<=128), "Too many objects for prefetching");
-		p_count				+=	count;
-		for (int c=0; c<count; c++){
-			CObject* pObject= (CObject*) NEW_INSTANCE(CLS);
-			pObject->Load	(item.first.c_str());
-			VERIFY2			(pObject->cNameSect().c_str(),item.first.c_str());
-			map_POOL.insert	(mk_pair(pObject->cNameSect(),pObject));
-		}
-	}
-
-	// out statistic
-	::Render->model_Logging	(TRUE);
-	p_time = 1000.f*Device.GetTimerGlobal()->GetElapsed_sec() - p_time;
-	u32		p_mem		= Memory.mem_usage() - mem_0;
-	if (p_count){
-		float 	a_time		= float(p_time)/float(p_count);
-		Msg					("* [Object-prefetch] objects: %d",		p_count);
-		Msg					("* [Object-prefetch] time:    %d ms",	iFloor(p_time));
-		Msg					("* [Object-prefetch] memory:  %dKb",	p_mem/1024);
-		Msg					("* [Object-prefetch] average: %2.2f ms, %d bytes", a_time, p_mem/p_count);
-	}
+R_ASSERT (map_POOL.empty());
+
+u32 mem_0 = Memory.mem_usage();
+float p_time = 1000.f*Device.GetTimerGlobal()->GetElapsed_sec();
+int p_count = 0;
+::Render->model_Logging (FALSE);
+
+string256 section;
+// prefetch objects
+strconcat (section,"prefetch_objects_",g_pGamePersistent->m_game_params.m_game_type);
+CInifile::Sect& sect = pSettings->r_section(section);
+for (CInifile::SectIt I=sect.begin(); I!=sect.end(); I++) {
+CInifile::Item& item= *I;
+CLASS_ID CLS = pSettings->r_clsid(item.first.c_str(),"class");
+int count = atoi(item.second.c_str());
+count += (count==0)?1:0;
+R_ASSERT2 ((count>0) && (count<=128), "Too many objects for prefetching");
+p_count += count;
+for (int c=0; c<count; c++){
+CObject* pObject= (CObject*) NEW_INSTANCE(CLS);
+pObject->Load (item.first.c_str());
+VERIFY2 (pObject->cNameSect().c_str(),item.first.c_str());
+map_POOL.insert (mk_pair(pObject->cNameSect(),pObject));
+}
+}
+
+// out statistic
+::Render->model_Logging (TRUE);
+p_time = 1000.f*Device.GetTimerGlobal()->GetElapsed_sec() - p_time;
+u32 p_mem = Memory.mem_usage() - mem_0;
+if (p_count){
+float a_time = float(p_time)/float(p_count);
+Msg ("* [Object-prefetch] objects: %d", p_count);
+Msg ("* [Object-prefetch] time: %d ms", iFloor(p_time));
+Msg ("* [Object-prefetch] memory: %dKb", p_mem/1024);
+Msg ("* [Object-prefetch] average: %2.2f ms, %d bytes", a_time, p_mem/p_count);
+}
 }
 
-void IGame_ObjectPool::clear	( )
+void IGame_ObjectPool::clear ( )
 {
-	// Clear POOL
-	for (POOL_IT it=map_POOL.begin(); it!=map_POOL.end(); it++)	
-		xr_delete	(it->second);
-	map_POOL.clear(); 
+// Clear POOL
+for (POOL_IT it=map_POOL.begin(); it!=map_POOL.end(); it++)
+xr_delete (it->second);
+map_POOL.clear();
 }
 
-CObject*	IGame_ObjectPool::create			( LPCSTR	name	)
+CObject* IGame_ObjectPool::create ( LPCSTR name )
+{
+string256 l_name;
+POOL_IT it = map_POOL.find (shared_str(strlwr(xr_strcpy(l_name,name))));
+if (it!=map_POOL.end())
 {
-	string256			l_name;
-	POOL_IT	it			=	map_POOL.find	(shared_str(strlwr(xr_strcpy(l_name,name))));
-	if (it!=map_POOL.end())
-	{
-		// Instance found
-		CObject* O			=	it->second;
-		map_POOL.erase		(it);
-		return				O;
-	} else {
-		// Create and load _new instance
-		// Msg				("! Uncached loading '%s'...",name);
-		CLASS_ID CLS		=	pSettings->r_clsid		(name,"class");
-		CObject* O			=	(CObject*) NEW_INSTANCE	(CLS);
-		O->Load				(name);
-		return				O;
-	}
+// Instance found
+CObject* O = it->second;
+map_POOL.erase (it);
+return O;
+} else {
+// Create and load _new instance
+// Msg ("! Uncached loading '%s'...",name);
+CLASS_ID CLS = pSettings->r_clsid (name,"class");
+CObject* O = (CObject*) NEW_INSTANCE (CLS);
+O->Load (name);
+return O;
+}
 }
 
-void		IGame_ObjectPool::destroy			( CObject*	O		)
+void IGame_ObjectPool::destroy ( CObject* O )
 {
-	map_POOL.insert			(mk_pair(O->cNameSect(),O));
+map_POOL.insert (mk_pair(O->cNameSect(),O));
 }
 */
\ No newline at end of file
diff --git a/src/xrEngine/IGame_ObjectPool.h b/src/xrEngine/IGame_ObjectPool.h
index 53db880be13..da912a4a808 100644
--- a/src/xrEngine/IGame_ObjectPool.h
+++ b/src/xrEngine/IGame_ObjectPool.h
@@ -1,34 +1,34 @@
 #pragma once
 
 // refs
-class ENGINE_API				CObject;
+class ENGINE_API CObject;
 
 //-----------------------------------------------------------------------------------------------------------
-class ENGINE_API 				IGame_ObjectPool
+class ENGINE_API IGame_ObjectPool
 {
-/*
-private:
-	struct str_pred : public std::binary_function<shared_str&, shared_str&, bool> 
-	{	
-		IC bool operator()(const shared_str& x, const shared_str& y) const
-		{	return xr_strcmp(x,y)<0;	}
-	};
-	typedef xr_multimap<shared_str,CObject*,str_pred>	POOL;
-	typedef POOL::iterator							POOL_IT;
-private:
-	POOL						map_POOL;
-*/
-	typedef xr_vector<CObject*>	ObjectVec;
-	typedef ObjectVec::iterator	ObjectVecIt;
-	ObjectVec					m_PrefetchObjects;
+    /*
+    private:
+    struct str_pred : public std::binary_function<shared_str&, shared_str&, bool>
+    {
+    IC bool operator()(const shared_str& x, const shared_str& y) const
+    { return xr_strcmp(x,y)<0; }
+    };
+    typedef xr_multimap<shared_str,CObject*,str_pred> POOL;
+    typedef POOL::iterator POOL_IT;
+    private:
+    POOL map_POOL;
+    */
+    typedef xr_vector<CObject*> ObjectVec;
+    typedef ObjectVec::iterator ObjectVecIt;
+    ObjectVec m_PrefetchObjects;
 public:
-	void						prefetch			( );
-	void						clear				( );
+    void prefetch();
+    void clear();
 
-	CObject*					create				( LPCSTR	name	);
-	void						destroy				( CObject*	O		);
+    CObject* create(LPCSTR name);
+    void destroy(CObject* O);
 
-	IGame_ObjectPool			();
-	virtual ~IGame_ObjectPool	();
+    IGame_ObjectPool();
+    virtual ~IGame_ObjectPool();
 };
 //-----------------------------------------------------------------------------------------------------------
diff --git a/src/xrEngine/IGame_Persistent.cpp b/src/xrEngine/IGame_Persistent.cpp
index de06a5a3d59..682bc7b0ab6 100644
--- a/src/xrEngine/IGame_Persistent.cpp
+++ b/src/xrEngine/IGame_Persistent.cpp
@@ -5,250 +5,254 @@
 
 #ifndef _EDITOR
 #include "environment.h"
-#	include "x_ray.h"
-#	include "IGame_Level.h"
-#	include "XR_IOConsole.h"
-#	include "Render.h"
-#	include "ps_instance.h"
-#	include "CustomHUD.h"
+# include "x_ray.h"
+# include "IGame_Level.h"
+# include "XR_IOConsole.h"
+# include "Render.h"
+# include "ps_instance.h"
+# include "CustomHUD.h"
 #endif
 
 #ifdef _EDITOR
-	bool g_dedicated_server	= false;
+bool g_dedicated_server = false;
 #endif
 
 #ifdef INGAME_EDITOR
-#	include "editor_environment_manager.hpp"
+# include "editor_environment_manager.hpp"
 #endif // INGAME_EDITOR
 
-ENGINE_API	IGame_Persistent*		g_pGamePersistent	= NULL;
+ENGINE_API IGame_Persistent* g_pGamePersistent = NULL;
 
-IGame_Persistent::IGame_Persistent	()
+IGame_Persistent::IGame_Persistent()
 {
-	RDEVICE.seqAppStart.Add			(this);
-	RDEVICE.seqAppEnd.Add			(this);
-	RDEVICE.seqFrame.Add			(this,REG_PRIORITY_HIGH+1);
-	RDEVICE.seqAppActivate.Add		(this);
-	RDEVICE.seqAppDeactivate.Add	(this);
+    RDEVICE.seqAppStart.Add(this);
+    RDEVICE.seqAppEnd.Add(this);
+    RDEVICE.seqFrame.Add(this, REG_PRIORITY_HIGH + 1);
+    RDEVICE.seqAppActivate.Add(this);
+    RDEVICE.seqAppDeactivate.Add(this);
 
-	m_pMainMenu						= NULL;
+    m_pMainMenu = NULL;
 
 #ifndef INGAME_EDITOR
-	#ifndef _EDITOR
-	pEnvironment					= xr_new<CEnvironment>();
-	#endif
+#ifndef _EDITOR
+    pEnvironment = xr_new<CEnvironment>();
+#endif
 #else // #ifdef INGAME_EDITOR
-	if (RDEVICE.editor())
-		pEnvironment				= xr_new<editor::environment::manager>();
-	else
-		pEnvironment				= xr_new<CEnvironment>();
+    if (RDEVICE.editor())
+        pEnvironment = xr_new<editor::environment::manager>();
+    else
+        pEnvironment = xr_new<CEnvironment>();
 #endif // #ifdef INGAME_EDITOR
 }
 
-IGame_Persistent::~IGame_Persistent	()
+IGame_Persistent::~IGame_Persistent()
 {
-	RDEVICE.seqFrame.Remove			(this);
-	RDEVICE.seqAppStart.Remove		(this);
-	RDEVICE.seqAppEnd.Remove			(this);
-	RDEVICE.seqAppActivate.Remove	(this);
-	RDEVICE.seqAppDeactivate.Remove	(this);
+    RDEVICE.seqFrame.Remove(this);
+    RDEVICE.seqAppStart.Remove(this);
+    RDEVICE.seqAppEnd.Remove(this);
+    RDEVICE.seqAppActivate.Remove(this);
+    RDEVICE.seqAppDeactivate.Remove(this);
 #ifndef _EDITOR
-	xr_delete						(pEnvironment);
+    xr_delete(pEnvironment);
 #endif
 }
 
-void IGame_Persistent::OnAppActivate		()
+void IGame_Persistent::OnAppActivate()
 {
 }
 
-void IGame_Persistent::OnAppDeactivate		()
+void IGame_Persistent::OnAppDeactivate()
 {
 }
 
-void IGame_Persistent::OnAppStart	()
+void IGame_Persistent::OnAppStart()
 {
 #ifndef _EDITOR
-	Environment().load				();
-#endif    
+    Environment().load();
+#endif
 }
 
-void IGame_Persistent::OnAppEnd		()
+void IGame_Persistent::OnAppEnd()
 {
 #ifndef _EDITOR
-	Environment().unload			 ();
-#endif    
-	OnGameEnd						();
+    Environment().unload();
+#endif
+    OnGameEnd();
 
 #ifndef _EDITOR
-	DEL_INSTANCE					(g_hud);
-#endif    
+    DEL_INSTANCE(g_hud);
+#endif
 }
 
 
-void IGame_Persistent::PreStart		(LPCSTR op)
+void IGame_Persistent::PreStart(LPCSTR op)
 {
-	string256						prev_type;
-	params							new_game_params;
-	xr_strcpy							(prev_type,m_game_params.m_game_type);
-	new_game_params.parse_cmd_line	(op);
-
-	// change game type
-	if (0!=xr_strcmp(prev_type,new_game_params.m_game_type)){
-		OnGameEnd					();
-	}
+    string256 prev_type;
+    params new_game_params;
+    xr_strcpy(prev_type, m_game_params.m_game_type);
+    new_game_params.parse_cmd_line(op);
+
+    // change game type
+    if (0 != xr_strcmp(prev_type, new_game_params.m_game_type))
+    {
+        OnGameEnd();
+    }
 }
-void IGame_Persistent::Start		(LPCSTR op)
+void IGame_Persistent::Start(LPCSTR op)
 {
-	string256						prev_type;
-	xr_strcpy							(prev_type,m_game_params.m_game_type);
-	m_game_params.parse_cmd_line	(op);
-	// change game type
-	if ((0!=xr_strcmp(prev_type,m_game_params.m_game_type))) 
-	{
-		if (*m_game_params.m_game_type)
-			OnGameStart					();
+    string256 prev_type;
+    xr_strcpy(prev_type, m_game_params.m_game_type);
+    m_game_params.parse_cmd_line(op);
+    // change game type
+    if ((0 != xr_strcmp(prev_type, m_game_params.m_game_type)))
+    {
+        if (*m_game_params.m_game_type)
+            OnGameStart();
 #ifndef _EDITOR
-		if(g_hud)
-			DEL_INSTANCE			(g_hud);
-#endif            
-	}
-	else UpdateGameType();
+        if (g_hud)
+            DEL_INSTANCE(g_hud);
+#endif
+    }
+    else UpdateGameType();
 
-	VERIFY							(ps_destroy.empty());
+    VERIFY(ps_destroy.empty());
 }
 
-void IGame_Persistent::Disconnect	()
+void IGame_Persistent::Disconnect()
 {
 #ifndef _EDITOR
-	// clear "need to play" particles
-	destroy_particles					(true);
+    // clear "need to play" particles
+    destroy_particles(true);
 
-	if(g_hud)
-			DEL_INSTANCE			(g_hud);
-//.		g_hud->OnDisconnected			();
+    if (g_hud)
+        DEL_INSTANCE(g_hud);
+    //. g_hud->OnDisconnected ();
 #endif
 }
 
 void IGame_Persistent::OnGameStart()
 {
 #ifndef _EDITOR
-//	LoadTitle("st_prefetching_objects");
-	LoadTitle();
-	if(!strstr(Core.Params,"-noprefetch"))
-		Prefetch();
+    // LoadTitle("st_prefetching_objects");
+    LoadTitle();
+    if (!strstr(Core.Params, "-noprefetch"))
+        Prefetch();
 #endif
 }
 
 #ifndef _EDITOR
 void IGame_Persistent::Prefetch()
 {
-	// prefetch game objects & models
-	float	p_time		=			1000.f*Device.GetTimerGlobal()->GetElapsed_sec();
-	u32	mem_0			=			Memory.mem_usage()	;
-
-	Log				("Loading objects...");
-	ObjectPool.prefetch					();
-	Log				("Loading models...");
-	Render->models_Prefetch				();
-	//Device.Resources->DeferredUpload	();
-	Device.m_pRender->ResourcesDeferredUpload();
-
-	p_time				=			1000.f*Device.GetTimerGlobal()->GetElapsed_sec() - p_time;
-	u32		p_mem		=			Memory.mem_usage() - mem_0	;
-
-	Msg					("* [prefetch] time:    %d ms",	iFloor(p_time));
-	Msg					("* [prefetch] memory:  %dKb",	p_mem/1024);
+    // prefetch game objects & models
+    float p_time = 1000.f*Device.GetTimerGlobal()->GetElapsed_sec();
+    u32 mem_0 = Memory.mem_usage();
+
+    Log("Loading objects...");
+    ObjectPool.prefetch();
+    Log("Loading models...");
+    Render->models_Prefetch();
+    //Device.Resources->DeferredUpload ();
+    Device.m_pRender->ResourcesDeferredUpload();
+
+    p_time = 1000.f*Device.GetTimerGlobal()->GetElapsed_sec() - p_time;
+    u32 p_mem = Memory.mem_usage() - mem_0;
+
+    Msg("* [prefetch] time:   %d ms", iFloor(p_time));
+    Msg("* [prefetch] memory: %dKb", p_mem / 1024);
 }
 #endif
 
 
-void IGame_Persistent::OnGameEnd	()
+void IGame_Persistent::OnGameEnd()
 {
 #ifndef _EDITOR
-	ObjectPool.clear					();
-	Render->models_Clear				(TRUE);
+    ObjectPool.clear();
+    Render->models_Clear(TRUE);
 #endif
 }
 
-void IGame_Persistent::OnFrame		()
+void IGame_Persistent::OnFrame()
 {
 #ifndef _EDITOR
 
-	if(!Device.Paused() || Device.dwPrecacheFrame)
-		Environment().OnFrame	();
-
-
-	Device.Statistic->Particles_starting= ps_needtoplay.size	();
-	Device.Statistic->Particles_active	= ps_active.size		();
-	Device.Statistic->Particles_destroy	= ps_destroy.size		();
-
-	// Play req particle systems
-	while (ps_needtoplay.size())
-	{
-		CPS_Instance*	psi		= ps_needtoplay.back	();
-		ps_needtoplay.pop_back	();
-		psi->Play				(false);
-	}
-	// Destroy inactive particle systems
-	while (ps_destroy.size())
-	{
-//		u32 cnt					= ps_destroy.size();
-		CPS_Instance*	psi		= ps_destroy.back();
-		VERIFY					(psi);
-		if (psi->Locked())
-		{
-			Log("--locked");
-			break;
-		}
-		ps_destroy.pop_back		();
-		psi->PSI_internal_delete();
-	}
+    if (!Device.Paused() || Device.dwPrecacheFrame)
+        Environment().OnFrame();
+
+
+    Device.Statistic->Particles_starting = ps_needtoplay.size();
+    Device.Statistic->Particles_active = ps_active.size();
+    Device.Statistic->Particles_destroy = ps_destroy.size();
+
+    // Play req particle systems
+    while (ps_needtoplay.size())
+    {
+        CPS_Instance* psi = ps_needtoplay.back();
+        ps_needtoplay.pop_back();
+        psi->Play(false);
+    }
+    // Destroy inactive particle systems
+    while (ps_destroy.size())
+    {
+        // u32 cnt = ps_destroy.size();
+        CPS_Instance* psi = ps_destroy.back();
+        VERIFY(psi);
+        if (psi->Locked())
+        {
+            Log("--locked");
+            break;
+        }
+        ps_destroy.pop_back();
+        psi->PSI_internal_delete();
+    }
 #endif
 }
 
-void IGame_Persistent::destroy_particles		(const bool &all_particles)
+void IGame_Persistent::destroy_particles(const bool& all_particles)
 {
 #ifndef _EDITOR
-	ps_needtoplay.clear				();
-
-	while (ps_destroy.size())
-	{
-		CPS_Instance*	psi		= ps_destroy.back	();		
-		VERIFY					(psi);
-		VERIFY					(!psi->Locked());
-		ps_destroy.pop_back		();
-		psi->PSI_internal_delete();
-	}
-
-	// delete active particles
-	if (all_particles) {
-		for (;!ps_active.empty();)
-			(*ps_active.begin())->PSI_internal_delete	();
-	}
-	else {
-		u32								active_size = ps_active.size();
-		CPS_Instance					**I = (CPS_Instance**)_alloca(active_size*sizeof(CPS_Instance*));
-		std::copy						(ps_active.begin(),ps_active.end(),I);
-
-		struct destroy_on_game_load {
-			static IC bool predicate (CPS_Instance*const& object)
-			{
-				return					(!object->destroy_on_game_load());
-			}
-		};
-
-		CPS_Instance					**E = std::remove_if(I,I + active_size,&destroy_on_game_load::predicate);
-		for ( ; I != E; ++I)
-			(*I)->PSI_internal_delete	();
-	}
-
-	VERIFY								(ps_needtoplay.empty() && ps_destroy.empty() && (!all_particles || ps_active.empty()));
+    ps_needtoplay.clear();
+
+    while (ps_destroy.size())
+    {
+        CPS_Instance* psi = ps_destroy.back();
+        VERIFY(psi);
+        VERIFY(!psi->Locked());
+        ps_destroy.pop_back();
+        psi->PSI_internal_delete();
+    }
+
+    // delete active particles
+    if (all_particles)
+    {
+        for (; !ps_active.empty();)
+            (*ps_active.begin())->PSI_internal_delete();
+    }
+    else
+    {
+        u32 active_size = ps_active.size();
+        CPS_Instance** I = (CPS_Instance**)_alloca(active_size*sizeof(CPS_Instance*));
+        std::copy(ps_active.begin(), ps_active.end(), I);
+
+        struct destroy_on_game_load
+        {
+            static IC bool predicate(CPS_Instance* const& object)
+            {
+                return (!object->destroy_on_game_load());
+            }
+        };
+
+        CPS_Instance** E = std::remove_if(I, I + active_size, &destroy_on_game_load::predicate);
+        for (; I != E; ++I)
+            (*I)->PSI_internal_delete();
+    }
+
+    VERIFY(ps_needtoplay.empty() && ps_destroy.empty() && (!all_particles || ps_active.empty()));
 #endif
 }
 
 void IGame_Persistent::OnAssetsChanged()
 {
 #ifndef _EDITOR
-	Device.m_pRender->OnAssetsChanged(); //Resources->m_textures_description.Load();
-#endif    
+    Device.m_pRender->OnAssetsChanged(); //Resources->m_textures_description.Load();
+#endif
 }
diff --git a/src/xrEngine/IGame_Persistent.h b/src/xrEngine/IGame_Persistent.h
index d36b3166c99..e816bf63352 100644
--- a/src/xrEngine/IGame_Persistent.h
+++ b/src/xrEngine/IGame_Persistent.h
@@ -12,122 +12,125 @@ class IRenderVisual;
 class IMainMenu;
 class ENGINE_API CPS_Instance;
 //-----------------------------------------------------------------------------------------------------------
-class ENGINE_API IGame_Persistent	: 
+class ENGINE_API IGame_Persistent :
 #ifndef _EDITOR
-	public DLL_Pure,
+    public DLL_Pure,
 #endif
-	public pureAppStart, 
-	public pureAppEnd,
-	public pureAppActivate, 
-	public pureAppDeactivate,
-	public pureFrame
+    public pureAppStart,
+    public pureAppEnd,
+    public pureAppActivate,
+    public pureAppDeactivate,
+    public pureFrame
 {
 public:
-	union params {
-		struct {
-			string256	m_game_or_spawn;
-			string256	m_game_type;
-			string256	m_alife;
-			string256	m_new_or_load;
-			EGameIDs	m_e_game_type;
-		};
-		string256		m_params[4];
-						params		()	{	reset();	}
-		void			reset		()
-		{
-			for (int i=0; i<4; ++i)
-				xr_strcpy	(m_params[i],"");
-		}
-		void						parse_cmd_line		(LPCSTR cmd_line)
-		{
-			reset					();
-			int						n = _min(4,_GetItemCount(cmd_line,'/'));
-			for (int i=0; i<n; ++i) {
-				_GetItem			(cmd_line,i,m_params[i],'/');
-				strlwr				(m_params[i]);
-			}
-		}
-	};
-	params							m_game_params;
+    union params
+    {
+        struct
+        {
+            string256 m_game_or_spawn;
+            string256 m_game_type;
+            string256 m_alife;
+            string256 m_new_or_load;
+            EGameIDs m_e_game_type;
+        };
+        string256 m_params[4];
+        params() { reset(); }
+        void reset()
+        {
+            for (int i = 0; i < 4; ++i)
+                xr_strcpy(m_params[i], "");
+        }
+        void parse_cmd_line(LPCSTR cmd_line)
+        {
+            reset();
+            int n = _min(4, _GetItemCount(cmd_line, '/'));
+            for (int i = 0; i < n; ++i)
+            {
+                _GetItem(cmd_line, i, m_params[i], '/');
+                strlwr(m_params[i]);
+            }
+        }
+    };
+    params m_game_params;
 public:
-	xr_set<CPS_Instance*>			ps_active;
-	xr_vector<CPS_Instance*>		ps_destroy;
-	xr_vector<CPS_Instance*>		ps_needtoplay;
+    xr_set<CPS_Instance*> ps_active;
+    xr_vector<CPS_Instance*> ps_destroy;
+    xr_vector<CPS_Instance*> ps_needtoplay;
 
 public:
-			void					destroy_particles	(const bool &all_particles);
+    void destroy_particles(const bool& all_particles);
 
 public:
-	virtual void					PreStart			(LPCSTR op);
-	virtual void					Start				(LPCSTR op);
-	virtual void					Disconnect			();
+    virtual void PreStart(LPCSTR op);
+    virtual void Start(LPCSTR op);
+    virtual void Disconnect();
 #ifndef _EDITOR
-	IGame_ObjectPool				ObjectPool;
-	CEnvironment*					pEnvironment;
-	CEnvironment&					Environment()	{return *pEnvironment;};
-	void							Prefetch			( );
+    IGame_ObjectPool ObjectPool;
+    CEnvironment* pEnvironment;
+    CEnvironment& Environment() { return *pEnvironment; };
+    void Prefetch();
 #endif
-	IMainMenu*						m_pMainMenu;	
+    IMainMenu* m_pMainMenu;
 
 
-	virtual bool					OnRenderPPUI_query	() { return FALSE; };	// should return true if we want to have second function called
-	virtual void					OnRenderPPUI_main	() {};
-	virtual void					OnRenderPPUI_PP		() {};
+    virtual bool OnRenderPPUI_query() { return FALSE; }; // should return true if we want to have second function called
+    virtual void OnRenderPPUI_main() {};
+    virtual void OnRenderPPUI_PP() {};
 
-	virtual	void					OnAppStart			();
-	virtual void					OnAppEnd			();
-	virtual	void					OnAppActivate		();
-	virtual void					OnAppDeactivate		();
-	virtual void		_BCL		OnFrame				();
+    virtual void OnAppStart();
+    virtual void OnAppEnd();
+    virtual void OnAppActivate();
+    virtual void OnAppDeactivate();
+    virtual void _BCL OnFrame();
 
-	// âûçûâàåòñÿ òîëüêî êîãäà èçìåíÿåòñÿ òèï èãðû
-	virtual	void					OnGameStart			(); 
-	virtual void					OnGameEnd			();
+    // âûçûâàåòñÿ òîëüêî êîãäà èçìåíÿåòñÿ òèï èãðû
+    virtual void OnGameStart();
+    virtual void OnGameEnd();
 
-	virtual void					UpdateGameType		() {};
-	virtual void					GetCurrentDof		(Fvector3& dof){dof.set(-1.4f, 0.0f, 250.f);};
-	virtual void					SetBaseDof			(const Fvector3& dof){};
-	virtual void					OnSectorChanged		(int sector){};
-	virtual void					OnAssetsChanged		();
+    virtual void UpdateGameType() {};
+    virtual void GetCurrentDof(Fvector3& dof) { dof.set(-1.4f, 0.0f, 250.f); };
+    virtual void SetBaseDof(const Fvector3& dof) {};
+    virtual void OnSectorChanged(int sector) {};
+    virtual void OnAssetsChanged();
 
-	virtual void					RegisterModel		(IRenderVisual* V)
+    virtual void RegisterModel(IRenderVisual* V)
 #ifndef _EDITOR
-     = 0;
+        = 0;
 #else
-	{}
+    {}
 #endif
-	virtual	float					MtlTransparent		(u32 mtl_idx)
+    virtual float MtlTransparent(u32 mtl_idx)
 #ifndef _EDITOR
-	= 0;
+        = 0;
 #else
-	{return 1.f;}
+    {return 1.f; }
 #endif
 
-	IGame_Persistent				();
-	virtual ~IGame_Persistent		();
+    IGame_Persistent();
+    virtual ~IGame_Persistent();
 
-	ICF		u32						GameType			() {return m_game_params.m_e_game_type;};
-	virtual void					Statistics			(CGameFont* F)
+    ICF u32 GameType() { return m_game_params.m_e_game_type; };
+    virtual void Statistics(CGameFont* F)
 #ifndef _EDITOR
-     = 0;
+        = 0;
 #else
-	{}
+    {}
 #endif
-	virtual	void					LoadTitle			(bool change_tip=false, shared_str map_name=""){}
-	virtual bool					CanBePaused			()		{ return true;}
+    virtual void LoadTitle(bool change_tip = false, shared_str map_name = "") {}
+    virtual bool CanBePaused() { return true; }
 };
 
 class IMainMenu
 {
 public:
-	virtual			~IMainMenu						()													{};
-	virtual void	Activate						(bool bActive)										=0; 
-	virtual	bool	IsActive						()													=0; 
-	virtual	bool	CanSkipSceneRendering			()													=0; 
-	virtual void	DestroyInternal					(bool bForce)										=0;
+    virtual ~IMainMenu() {};
+    virtual void Activate(bool bActive) = 0;
+    virtual bool IsActive() = 0;
+    virtual bool CanSkipSceneRendering() = 0;
+    virtual void DestroyInternal(bool bForce) = 0;
 };
 
-extern ENGINE_API	bool g_dedicated_server;
-extern ENGINE_API	IGame_Persistent*	g_pGamePersistent;
+extern ENGINE_API bool g_dedicated_server;
+extern ENGINE_API IGame_Persistent* g_pGamePersistent;
 #endif //IGame_PersistentH
 
diff --git a/src/xrEngine/IInputReceiver.cpp b/src/xrEngine/IInputReceiver.cpp
index 66544a7cff5..8f6059e8ccf 100644
--- a/src/xrEngine/IInputReceiver.cpp
+++ b/src/xrEngine/IInputReceiver.cpp
@@ -4,36 +4,36 @@
 #include "xr_input.h"
 #include "iinputreceiver.h"
 
-void	IInputReceiver::IR_Capture						(void)
+void IInputReceiver::IR_Capture(void)
 {
-	VERIFY(pInput);
-	pInput->iCapture(this);
+    VERIFY(pInput);
+    pInput->iCapture(this);
 }
 
-void	IInputReceiver::IR_Release						(void)
+void IInputReceiver::IR_Release(void)
 {
-	VERIFY(pInput);
-	pInput->iRelease(this);
+    VERIFY(pInput);
+    pInput->iRelease(this);
 }
 
-void	IInputReceiver::IR_GetLastMouseDelta			(Ivector2& p)
+void IInputReceiver::IR_GetLastMouseDelta(Ivector2& p)
 {
-	VERIFY(pInput);
-	pInput->iGetLastMouseDelta( p );
+    VERIFY(pInput);
+    pInput->iGetLastMouseDelta(p);
 }
 
-void IInputReceiver::IR_OnDeactivate					(void)
+void IInputReceiver::IR_OnDeactivate(void)
 {
-	int i;
-	for (i = 0; i < CInput::COUNT_KB_BUTTONS; i++ )
-		if (IR_GetKeyState(i))	
-			IR_OnKeyboardRelease	(i);
+    int i;
+    for (i = 0; i < CInput::COUNT_KB_BUTTONS; i++)
+        if (IR_GetKeyState(i))
+            IR_OnKeyboardRelease(i);
 
-	for (i = 0; i < CInput::COUNT_MOUSE_BUTTONS; i++ )
-		if(IR_GetBtnState(i))   
-			IR_OnMouseRelease( i );
-	IR_OnMouseStop	( DIMOFS_X, 0 );
-	IR_OnMouseStop	( DIMOFS_Y, 0 );
+    for (i = 0; i < CInput::COUNT_MOUSE_BUTTONS; i++)
+        if (IR_GetBtnState(i))
+            IR_OnMouseRelease(i);
+    IR_OnMouseStop(DIMOFS_X, 0);
+    IR_OnMouseStop(DIMOFS_Y, 0);
 }
 
 void IInputReceiver::IR_OnActivate(void)
@@ -42,43 +42,43 @@ void IInputReceiver::IR_OnActivate(void)
 
 BOOL IInputReceiver::IR_GetKeyState(int dik)
 {
-	VERIFY(pInput);
-	return pInput->iGetAsyncKeyState(dik);
+    VERIFY(pInput);
+    return pInput->iGetAsyncKeyState(dik);
 }
 
 BOOL IInputReceiver::IR_GetBtnState(int btn)
 {
-	VERIFY(pInput);
-	return pInput->iGetAsyncBtnState(btn);
+    VERIFY(pInput);
+    return pInput->iGetAsyncBtnState(btn);
 }
 
-void	IInputReceiver::IR_GetMousePosScreen			(Ivector2& p)
+void IInputReceiver::IR_GetMousePosScreen(Ivector2& p)
 {
-	GetCursorPos((LPPOINT)&p);
+    GetCursorPos((LPPOINT)&p);
 }
-void	IInputReceiver::IR_GetMousePosReal				(HWND hwnd, Ivector2 &p)
+void IInputReceiver::IR_GetMousePosReal(HWND hwnd, Ivector2& p)
 {
-	IR_GetMousePosScreen(p);
-	if (hwnd) ScreenToClient(hwnd,(LPPOINT)&p);
+    IR_GetMousePosScreen(p);
+    if (hwnd) ScreenToClient(hwnd, (LPPOINT)&p);
 }
-void	IInputReceiver::IR_GetMousePosReal				(Ivector2 &p)
+void IInputReceiver::IR_GetMousePosReal(Ivector2& p)
 {
-	IR_GetMousePosReal(RDEVICE.m_hWnd,p);
+    IR_GetMousePosReal(RDEVICE.m_hWnd, p);
 }
-void	IInputReceiver::IR_GetMousePosIndependent		(Fvector2 &f)
+void IInputReceiver::IR_GetMousePosIndependent(Fvector2& f)
 {
-	Ivector2 p;
-	IR_GetMousePosReal(p);
-	f.set(
-		2.f*float(p.x)/float(RDEVICE.dwWidth)-1.f,
-		2.f*float(p.y)/float(RDEVICE.dwHeight)-1.f
-		);
+    Ivector2 p;
+    IR_GetMousePosReal(p);
+    f.set(
+        2.f*float(p.x) / float(RDEVICE.dwWidth) - 1.f,
+        2.f*float(p.y) / float(RDEVICE.dwHeight) - 1.f
+        );
 }
-void	IInputReceiver::IR_GetMousePosIndependentCrop	(Fvector2 &f)
+void IInputReceiver::IR_GetMousePosIndependentCrop(Fvector2& f)
 {
-	IR_GetMousePosIndependent(f);
-	if (f.x<-1.f) f.x=-1.f;
-	if (f.x> 1.f) f.x= 1.f;
-	if (f.y<-1.f) f.y=-1.f;
-	if (f.y> 1.f) f.y= 1.f;
+    IR_GetMousePosIndependent(f);
+    if (f.x < -1.f) f.x = -1.f;
+    if (f.x > 1.f) f.x = 1.f;
+    if (f.y < -1.f) f.y = -1.f;
+    if (f.y > 1.f) f.y = 1.f;
 }
diff --git a/src/xrEngine/IInputReceiver.h b/src/xrEngine/IInputReceiver.h
index 695bda8c813..df5638cdcb8 100644
--- a/src/xrEngine/IInputReceiver.h
+++ b/src/xrEngine/IInputReceiver.h
@@ -6,37 +6,37 @@
 #define IINPUTRECEIVERH
 #pragma once
 
-class ENGINE_API	IInputReceiver
+class ENGINE_API IInputReceiver
 {
 public:
-	static void		IR_GetLastMouseDelta			(Ivector2& p);
-	static void		IR_GetMousePosScreen			(Ivector2& p);
-	static void		IR_GetMousePosReal				(HWND hwnd, Ivector2 &p);
-	static void		IR_GetMousePosReal				(Ivector2 &p);
-	static void		IR_GetMousePosIndependent		(Fvector2 &f);
-	static void		IR_GetMousePosIndependentCrop	(Fvector2 &f);
-	BOOL			IR_GetKeyState					(int dik);
-	BOOL			IR_GetBtnState					(int btn);
-	void			IR_Capture						(void);
-	void			IR_Release						(void);
+    static void IR_GetLastMouseDelta(Ivector2& p);
+    static void IR_GetMousePosScreen(Ivector2& p);
+    static void IR_GetMousePosReal(HWND hwnd, Ivector2& p);
+    static void IR_GetMousePosReal(Ivector2& p);
+    static void IR_GetMousePosIndependent(Fvector2& f);
+    static void IR_GetMousePosIndependentCrop(Fvector2& f);
+    BOOL IR_GetKeyState(int dik);
+    BOOL IR_GetBtnState(int btn);
+    void IR_Capture(void);
+    void IR_Release(void);
 
-	virtual void	IR_OnDeactivate					(void);
-	virtual void	IR_OnActivate					(void);
+    virtual void IR_OnDeactivate(void);
+    virtual void IR_OnActivate(void);
 
-	virtual void	IR_OnMousePress					(int btn)		{};
-	virtual void	IR_OnMouseRelease				(int btn)		{};
-	virtual void	IR_OnMouseHold					(int btn)		{};
-	virtual void	IR_OnMouseWheel					(int direction)	{};
-	virtual void	IR_OnMouseMove					(int x, int y)	{};
-	virtual void	IR_OnMouseStop					(int x, int y)	{};
+    virtual void IR_OnMousePress(int btn) {};
+    virtual void IR_OnMouseRelease(int btn) {};
+    virtual void IR_OnMouseHold(int btn) {};
+    virtual void IR_OnMouseWheel(int direction) {};
+    virtual void IR_OnMouseMove(int x, int y) {};
+    virtual void IR_OnMouseStop(int x, int y) {};
 
-	virtual void	IR_OnKeyboardPress				(int dik)		{};
-	virtual void	IR_OnKeyboardRelease			(int dik)		{};
-	virtual void	IR_OnKeyboardHold				(int dik)		{};
+    virtual void IR_OnKeyboardPress(int dik) {};
+    virtual void IR_OnKeyboardRelease(int dik) {};
+    virtual void IR_OnKeyboardHold(int dik) {};
 };
 
-ENGINE_API extern float			psMouseSens;
-ENGINE_API extern float			psMouseSensScale;
-ENGINE_API extern Flags32		psMouseInvert;
+ENGINE_API extern float psMouseSens;
+ENGINE_API extern float psMouseSensScale;
+ENGINE_API extern Flags32 psMouseInvert;
 
 #endif
diff --git a/src/xrEngine/IObjectPhysicsCollision.h b/src/xrEngine/IObjectPhysicsCollision.h
index 00474f0407a..63cf5be1f2b 100644
--- a/src/xrEngine/IObjectPhysicsCollision.h
+++ b/src/xrEngine/IObjectPhysicsCollision.h
@@ -5,6 +5,6 @@ class IPhysicsElement;
 xr_pure_interface IObjectPhysicsCollision
 {
 public:
-	virtual	const IPhysicsShell		*physics_shell()const		= 0;
-	virtual const IPhysicsElement	*physics_character()const	= 0;//depricated
+    virtual const IPhysicsShell *physics_shell()const = 0;
+    virtual const IPhysicsElement *physics_character()const = 0;//depricated
 };
\ No newline at end of file
diff --git a/src/xrEngine/IPHdebug.h b/src/xrEngine/IPHdebug.h
index b2ba876545c..5f5eaded926 100644
--- a/src/xrEngine/IPHdebug.h
+++ b/src/xrEngine/IPHdebug.h
@@ -2,9 +2,9 @@
 
 xr_pure_interface IPhDebugRender
 {
-	virtual void	open_cashed_draw	()																				= 0;
-	virtual void	close_cashed_draw	( u32 remove_time)																= 0;
-	virtual	void	draw_tri			( const Fvector &v0, const Fvector &v1, const Fvector &v2, u32 c, bool solid )	= 0;
+    virtual void open_cashed_draw() = 0;
+    virtual void close_cashed_draw(u32 remove_time) = 0;
+    virtual void draw_tri(const Fvector &v0, const Fvector &v1, const Fvector &v2, u32 c, bool solid) = 0;
 };
 
-extern	ENGINE_API IPhDebugRender* ph_debug_render;
\ No newline at end of file
+extern ENGINE_API IPhDebugRender* ph_debug_render;
\ No newline at end of file
diff --git a/src/xrEngine/IPhysicsGeometry.h b/src/xrEngine/IPhysicsGeometry.h
index e1c51ddb7a3..5619295c3cd 100644
--- a/src/xrEngine/IPhysicsGeometry.h
+++ b/src/xrEngine/IPhysicsGeometry.h
@@ -1,11 +1,11 @@
-#ifndef	__IPHYSICS_GEOMETRY_H__
-#define	__IPHYSICS_GEOMETRY_H__
+#ifndef __IPHYSICS_GEOMETRY_H__
+#define __IPHYSICS_GEOMETRY_H__
 
-class	IPhysicsGeometry
+class IPhysicsGeometry
 {
 public:
-	virtual		void		get_Box				(  Fmatrix& form, Fvector&	sz )const	=0;
-	virtual		bool		collide_fluids		() const								=0;
+    virtual void get_Box(Fmatrix& form, Fvector& sz)const = 0;
+    virtual bool collide_fluids() const = 0;
 };
 
 #endif
\ No newline at end of file
diff --git a/src/xrEngine/IPhysicsShell.h b/src/xrEngine/IPhysicsShell.h
index 668463508be..914b063288a 100644
--- a/src/xrEngine/IPhysicsShell.h
+++ b/src/xrEngine/IPhysicsShell.h
@@ -3,24 +3,24 @@
 #pragma once
 
 class IPhysicsGeometry;
-class	IPhysicsElement
+class IPhysicsElement
 {
 public:
-	virtual	const	Fmatrix			&XFORM				()							const			= 0;
-	virtual			void			get_LinearVel		( Fvector& velocity )		const			= 0;
-	virtual			void			get_AngularVel		( Fvector& velocity )		const			= 0;
-	virtual			void			get_Box				( Fvector&	sz, Fvector& c )const			= 0;
-	virtual	const	Fvector			&mass_Center		()							const			= 0;
-	virtual			u16				numberOfGeoms		()							const			= 0;
-	virtual	const	IPhysicsGeometry*geometry			( u16 i )					const			= 0;
+    virtual const Fmatrix& XFORM() const = 0;
+    virtual void get_LinearVel(Fvector& velocity) const = 0;
+    virtual void get_AngularVel(Fvector& velocity) const = 0;
+    virtual void get_Box(Fvector& sz, Fvector& c)const = 0;
+    virtual const Fvector& mass_Center() const = 0;
+    virtual u16 numberOfGeoms() const = 0;
+    virtual const IPhysicsGeometry* geometry(u16 i) const = 0;
 };
 
-class	IPhysicsShell
+class IPhysicsShell
 {
 public:
-	virtual	const	Fmatrix				&XFORM				()				const	= 0;
-	virtual	const	IPhysicsElement		&Element			( u16 index )	const	= 0;
-	virtual			u16					get_ElementsNumber	( )				const	= 0;
+    virtual const Fmatrix& XFORM() const = 0;
+    virtual const IPhysicsElement& Element(u16 index) const = 0;
+    virtual u16 get_ElementsNumber() const = 0;
 };
 
 
diff --git a/src/xrEngine/IRenderable.cpp b/src/xrEngine/IRenderable.cpp
index afe3d327f35..e9dbd311e7f 100644
--- a/src/xrEngine/IRenderable.cpp
+++ b/src/xrEngine/IRenderable.cpp
@@ -4,26 +4,26 @@
 
 IRenderable::IRenderable()
 {
-	renderable.xform.identity			();
-	renderable.visual					= NULL;
-	renderable.pROS						= NULL;
-	renderable.pROS_Allowed				= TRUE;
-	ISpatial*		self				= dynamic_cast<ISpatial*> (this);
-	if (self)		self->spatial.type	|= STYPE_RENDERABLE;
+    renderable.xform.identity();
+    renderable.visual = NULL;
+    renderable.pROS = NULL;
+    renderable.pROS_Allowed = TRUE;
+    ISpatial* self = dynamic_cast<ISpatial*> (this);
+    if (self) self->spatial.type |= STYPE_RENDERABLE;
 }
 
-extern ENGINE_API BOOL g_bRendering; 
+extern ENGINE_API BOOL g_bRendering;
 IRenderable::~IRenderable()
 {
-	VERIFY								(!g_bRendering); 
-	Render->model_Delete				(renderable.visual);
-	if (renderable.pROS)				Render->ros_destroy					(renderable.pROS);
-	renderable.visual					= NULL;
-	renderable.pROS						= NULL;
+    VERIFY(!g_bRendering);
+    Render->model_Delete(renderable.visual);
+    if (renderable.pROS) Render->ros_destroy(renderable.pROS);
+    renderable.visual = NULL;
+    renderable.pROS = NULL;
 }
 
-IRender_ObjectSpecific*				IRenderable::renderable_ROS				()	
+IRender_ObjectSpecific* IRenderable::renderable_ROS()
 {
-	if (0==renderable.pROS && renderable.pROS_Allowed)		renderable.pROS	= Render->ros_create(this);
-	return renderable.pROS	;
+    if (0 == renderable.pROS && renderable.pROS_Allowed) renderable.pROS = Render->ros_create(this);
+    return renderable.pROS;
 }
diff --git a/src/xrEngine/IRenderable.h b/src/xrEngine/IRenderable.h
index 9db14c62f63..009a48be061 100644
--- a/src/xrEngine/IRenderable.h
+++ b/src/xrEngine/IRenderable.h
@@ -5,23 +5,24 @@
 
 //////////////////////////////////////////////////////////////////////////
 // definition ("Renderable")
-class	ENGINE_API	IRenderable			{
+class ENGINE_API IRenderable
+{
 public:
-	struct 
-	{
-		Fmatrix							xform						;
-		IRenderVisual*					visual						;
-		IRender_ObjectSpecific*			pROS						;
-		BOOL							pROS_Allowed				;
-	}	renderable;
+    struct
+    {
+        Fmatrix xform;
+        IRenderVisual* visual;
+        IRender_ObjectSpecific* pROS;
+        BOOL pROS_Allowed;
+    } renderable;
 public:
-										IRenderable					();
-	virtual								~IRenderable				();
-	IRender_ObjectSpecific*				renderable_ROS				()	;
-	BENCH_SEC_SCRAMBLEVTBL2
-	virtual	void						renderable_Render			()	= 0;
-	virtual	BOOL						renderable_ShadowGenerate	()	{ return FALSE; };
-	virtual	BOOL						renderable_ShadowReceive	()	{ return FALSE; };
+    IRenderable();
+    virtual ~IRenderable();
+    IRender_ObjectSpecific* renderable_ROS();
+    BENCH_SEC_SCRAMBLEVTBL2
+        virtual void renderable_Render() = 0;
+    virtual BOOL renderable_ShadowGenerate() { return FALSE; };
+    virtual BOOL renderable_ShadowReceive() { return FALSE; };
 };
 
 #endif // IRENDERABLE_H_INCLUDED
\ No newline at end of file
diff --git a/src/xrEngine/ISheduled.cpp b/src/xrEngine/ISheduled.cpp
index a304f2d525f..d4d3c9e4f38 100644
--- a/src/xrEngine/ISheduled.cpp
+++ b/src/xrEngine/ISheduled.cpp
@@ -2,52 +2,52 @@
 #include "xrSheduler.h"
 #include "xr_object.h"
 
-ISheduled::ISheduled	()	
+ISheduled::ISheduled()
 {
-	shedule.t_min		= 20;
-	shedule.t_max		= 1000;
-	shedule.b_locked	= FALSE;
+    shedule.t_min = 20;
+    shedule.t_max = 1000;
+    shedule.b_locked = FALSE;
 #ifdef DEBUG
-	dbg_startframe		= 1;
-	dbg_update_shedule	= 0;
+    dbg_startframe = 1;
+    dbg_update_shedule = 0;
 #endif
 }
 
-extern		BOOL		g_bSheduleInProgress;
-ISheduled::~ISheduled	()
+extern BOOL g_bSheduleInProgress;
+ISheduled::~ISheduled()
 {
-	VERIFY2				(
-		!Engine.Sheduler.Registered(this),
-		make_string("0x%08x : %s",this,*shedule_Name())
-	);
+    VERIFY2(
+        !Engine.Sheduler.Registered(this),
+        make_string("0x%08x : %s", this, *shedule_Name())
+        );
 
-	// sad, but true
-	// we need this to become MASTER_GOLD
+    // sad, but true
+    // we need this to become MASTER_GOLD
 #ifndef DEBUG
-	Engine.Sheduler.Unregister				(this);
+    Engine.Sheduler.Unregister(this);
 #endif // DEBUG
 }
 
-void	ISheduled::shedule_register			()
+void ISheduled::shedule_register()
 {
-	Engine.Sheduler.Register				(this);
+    Engine.Sheduler.Register(this);
 }
 
-void	ISheduled::shedule_unregister		()
+void ISheduled::shedule_unregister()
 {
-	Engine.Sheduler.Unregister				(this);
+    Engine.Sheduler.Unregister(this);
 }
 
-void	ISheduled::shedule_Update			(u32 dt)
+void ISheduled::shedule_Update(u32 dt)
 {
 #ifdef DEBUG
-	if (dbg_startframe==dbg_update_shedule)	
-	{
-		LPCSTR		name	= "unknown";
-		CObject*	O		= dynamic_cast<CObject*>	(this);
-		if			(O)		name	= *O->cName();
-		Debug.fatal	(DEBUG_INFO,"'shedule_Update' called twice per frame for %s",name);
-	}
-	dbg_update_shedule	= dbg_startframe;
+    if (dbg_startframe == dbg_update_shedule)
+    {
+        LPCSTR name = "unknown";
+        CObject* O = dynamic_cast<CObject*> (this);
+        if (O) name = *O->cName();
+        Debug.fatal(DEBUG_INFO, "'shedule_Update' called twice per frame for %s", name);
+    }
+    dbg_update_shedule = dbg_startframe;
 #endif
 }
diff --git a/src/xrEngine/ISheduled.h b/src/xrEngine/ISheduled.h
index 8f2ea615fdc..8771523c03d 100644
--- a/src/xrEngine/ISheduled.h
+++ b/src/xrEngine/ISheduled.h
@@ -1,31 +1,32 @@
 #ifndef XRENGINE_ISHEDULED_H_INCLUDED
 #define XRENGINE_ISHEDULED_H_INCLUDED
 
-class	ENGINE_API	ISheduled
+class ENGINE_API ISheduled
 {
 public:
-	struct {
-		u32		t_min		:	14;		// minimal bound of update time (sample: 20ms)
-		u32		t_max		:	14;		// maximal bound of update time (sample: 200ms)
-		u32		b_RT		:	1;
-		u32		b_locked	:	1;
-	}	shedule;
+    struct
+    {
+        u32 t_min : 14; // minimal bound of update time (sample: 20ms)
+        u32 t_max : 14; // maximal bound of update time (sample: 200ms)
+        u32 b_RT : 1;
+        u32 b_locked : 1;
+    } shedule;
 
 #ifdef DEBUG
-	u32									dbg_startframe;
-	u32									dbg_update_shedule;
+    u32 dbg_startframe;
+    u32 dbg_update_shedule;
 #endif
 
-				ISheduled				();
-	virtual ~	ISheduled				();
+    ISheduled();
+    virtual ~ISheduled();
 
-	void								shedule_register	();
-	void								shedule_unregister	();
+    void shedule_register();
+    void shedule_unregister();
 
-	virtual float						shedule_Scale		()			= 0;
-	virtual void						shedule_Update		(u32 dt);
-	virtual	shared_str					shedule_Name		() const	{ return shared_str("unknown"); };
-	virtual bool						shedule_Needed		()			= 0;
+    virtual float shedule_Scale() = 0;
+    virtual void shedule_Update(u32 dt);
+    virtual shared_str shedule_Name() const { return shared_str("unknown"); };
+    virtual bool shedule_Needed() = 0;
 
 };
 
diff --git a/src/xrEngine/ISpatial.cpp b/src/xrEngine/ISpatial.cpp
index c06402302f7..6a868bccf2f 100644
--- a/src/xrEngine/ISpatial.cpp
+++ b/src/xrEngine/ISpatial.cpp
@@ -4,331 +4,343 @@
 #include "xr_object.h"
 #include "PS_Instance.h"
 
-ENGINE_API ISpatial_DB*		g_SpatialSpace			= NULL;
-ENGINE_API ISpatial_DB*		g_SpatialSpacePhysic	= NULL;
+ENGINE_API ISpatial_DB* g_SpatialSpace = NULL;
+ENGINE_API ISpatial_DB* g_SpatialSpacePhysic = NULL;
 
-Fvector	c_spatial_offset	[8]	= 
+Fvector c_spatial_offset[8] =
 {
-	{ -1, -1, -1	},
-	{  1, -1, -1	},
-	{ -1,  1, -1	},
-	{  1,  1, -1	},
-	{ -1, -1,  1	},
-	{  1, -1,  1	},
-	{ -1,  1,  1	},
-	{  1,  1,  1	}
+    {-1, -1, -1},
+    {1, -1, -1},
+    {-1, 1, -1},
+    {1, 1, -1},
+    {-1, -1, 1},
+    {1, -1, 1},
+    {-1, 1, 1},
+    {1, 1, 1}
 };
 
 //////////////////////////////////////////////////////////////////////////
-ISpatial::ISpatial			(ISpatial_DB* space)
+ISpatial::ISpatial(ISpatial_DB* space)
 {
-	spatial.sphere.P.set	(0,0,0);
-	spatial.sphere.R		= 0;
-	spatial.node_center.set	(0,0,0);
-	spatial.node_radius		= 0;
-	spatial.node_ptr		= NULL;
-	spatial.sector			= NULL;
-	spatial.space			= space;
+    spatial.sphere.P.set(0, 0, 0);
+    spatial.sphere.R = 0;
+    spatial.node_center.set(0, 0, 0);
+    spatial.node_radius = 0;
+    spatial.node_ptr = NULL;
+    spatial.sector = NULL;
+    spatial.space = space;
 }
-ISpatial::~ISpatial			(void)
+ISpatial::~ISpatial(void)
 {
-	spatial_unregister		();
+    spatial_unregister();
 }
-BOOL	ISpatial::spatial_inside()
+BOOL ISpatial::spatial_inside()
 {
-	float	dr	= -(- spatial.node_radius + spatial.sphere.R);
-	if (spatial.sphere.P.x < spatial.node_center.x - dr)	return FALSE;
-	if (spatial.sphere.P.x > spatial.node_center.x + dr)	return FALSE;
-	if (spatial.sphere.P.y < spatial.node_center.y - dr)	return FALSE;
-	if (spatial.sphere.P.y > spatial.node_center.y + dr)	return FALSE;
-	if (spatial.sphere.P.z < spatial.node_center.z - dr)	return FALSE;
-	if (spatial.sphere.P.z > spatial.node_center.z + dr)	return FALSE;
-	return TRUE;
+    float dr = -(-spatial.node_radius + spatial.sphere.R);
+    if (spatial.sphere.P.x < spatial.node_center.x - dr) return FALSE;
+    if (spatial.sphere.P.x > spatial.node_center.x + dr) return FALSE;
+    if (spatial.sphere.P.y < spatial.node_center.y - dr) return FALSE;
+    if (spatial.sphere.P.y > spatial.node_center.y + dr) return FALSE;
+    if (spatial.sphere.P.z < spatial.node_center.z - dr) return FALSE;
+    if (spatial.sphere.P.z > spatial.node_center.z + dr) return FALSE;
+    return TRUE;
 }
 
-BOOL	verify_sp	(ISpatial* sp, Fvector& node_center, float node_radius)
+BOOL verify_sp(ISpatial* sp, Fvector& node_center, float node_radius)
 {
-	float	dr	= -(- node_radius + sp->spatial.sphere.R);
-	if (sp->spatial.sphere.P.x < node_center.x - dr)	return FALSE;
-	if (sp->spatial.sphere.P.x > node_center.x + dr)	return FALSE;
-	if (sp->spatial.sphere.P.y < node_center.y - dr)	return FALSE;
-	if (sp->spatial.sphere.P.y > node_center.y + dr)	return FALSE;
-	if (sp->spatial.sphere.P.z < node_center.z - dr)	return FALSE;
-	if (sp->spatial.sphere.P.z > node_center.z + dr)	return FALSE;
-	return TRUE;
+    float dr = -(-node_radius + sp->spatial.sphere.R);
+    if (sp->spatial.sphere.P.x < node_center.x - dr) return FALSE;
+    if (sp->spatial.sphere.P.x > node_center.x + dr) return FALSE;
+    if (sp->spatial.sphere.P.y < node_center.y - dr) return FALSE;
+    if (sp->spatial.sphere.P.y > node_center.y + dr) return FALSE;
+    if (sp->spatial.sphere.P.z < node_center.z - dr) return FALSE;
+    if (sp->spatial.sphere.P.z > node_center.z + dr) return FALSE;
+    return TRUE;
 }
 
-void	ISpatial::spatial_register	()
+void ISpatial::spatial_register()
 {
-	spatial.type			|=	STYPEFLAG_INVALIDSECTOR;
-	if (spatial.node_ptr)
-	{
-		// already registered - nothing to do
-	} else {
-		// register
-		R_ASSERT				(spatial.space);
-		spatial.space->insert	(this);
-		spatial.sector			=	0;
-	}
+    spatial.type |= STYPEFLAG_INVALIDSECTOR;
+    if (spatial.node_ptr)
+    {
+        // already registered - nothing to do
+    }
+    else
+    {
+        // register
+        R_ASSERT(spatial.space);
+        spatial.space->insert(this);
+        spatial.sector = 0;
+    }
 }
 
-void	ISpatial::spatial_unregister()
+void ISpatial::spatial_unregister()
 {
-	if (spatial.node_ptr)
-	{
-		// remove
-		spatial.space->remove	(this);
-		spatial.node_ptr		= NULL;
-		spatial.sector			= NULL;
-	} else {
-		// already unregistered
-	}
+    if (spatial.node_ptr)
+    {
+        // remove
+        spatial.space->remove(this);
+        spatial.node_ptr = NULL;
+        spatial.sector = NULL;
+    }
+    else
+    {
+        // already unregistered
+    }
 }
 
-void	ISpatial::spatial_move	()
+void ISpatial::spatial_move()
 {
-	if (spatial.node_ptr)
-	{
-		//*** somehow it was determined that object has been moved
-		spatial.type		|=				STYPEFLAG_INVALIDSECTOR;
-
-		//*** check if we are supposed to correct it's spatial location
-		if						(spatial_inside())	return;		// ???
-		spatial.space->remove	(this);
-		spatial.space->insert	(this);
-	} else {
-		//*** we are not registered yet, or already unregistered
-		//*** ignore request
-	}
+    if (spatial.node_ptr)
+    {
+        //*** somehow it was determined that object has been moved
+        spatial.type |= STYPEFLAG_INVALIDSECTOR;
+
+        //*** check if we are supposed to correct it's spatial location
+        if (spatial_inside()) return; // ???
+        spatial.space->remove(this);
+        spatial.space->insert(this);
+    }
+    else
+    {
+        //*** we are not registered yet, or already unregistered
+        //*** ignore request
+    }
 }
 
-void	ISpatial::spatial_updatesector_internal()
+void ISpatial::spatial_updatesector_internal()
 {
-	IRender_Sector*		S				=	::Render->detectSector(spatial_sector_point());
-	spatial.type						&=	~STYPEFLAG_INVALIDSECTOR;
-	if (S)				spatial.sector	=	S;
+    IRender_Sector* S = ::Render->detectSector(spatial_sector_point());
+    spatial.type &= ~STYPEFLAG_INVALIDSECTOR;
+    if (S) spatial.sector = S;
 }
 
 //////////////////////////////////////////////////////////////////////////
-void			ISpatial_NODE::_init			(ISpatial_NODE* _parent)
+void ISpatial_NODE::_init(ISpatial_NODE* _parent)
 {
-	parent		=	_parent;
-	children[0]	=	children[1]	=	children[2]	=	children[3]	=
-	children[4]	=	children[5]	=	children[6]	=	children[7]	=	NULL;
-	items.clear();
+    parent = _parent;
+    children[0] = children[1] = children[2] = children[3] =
+        children[4] = children[5] = children[6] = children[7] = NULL;
+    items.clear();
 }
 
-void			ISpatial_NODE::_insert			(ISpatial* S)			
-{	
-	S->spatial.node_ptr			=	this;
-	items.push_back					(S);
-	S->spatial.space->stat_objects	++;
+void ISpatial_NODE::_insert(ISpatial* S)
+{
+    S->spatial.node_ptr = this;
+    items.push_back(S);
+    S->spatial.space->stat_objects++;
 }
 
-void			ISpatial_NODE::_remove			(ISpatial* S)			
-{	
-	S->spatial.node_ptr			=	NULL;
-	xr_vector<ISpatial*>::iterator	it = std::find(items.begin(),items.end(),S);
-	VERIFY				(it!=items.end());
-	items.erase			(it);
-	S->spatial.space->stat_objects	--;
+void ISpatial_NODE::_remove(ISpatial* S)
+{
+    S->spatial.node_ptr = NULL;
+    xr_vector<ISpatial*>::iterator it = std::find(items.begin(), items.end(), S);
+    VERIFY(it != items.end());
+    items.erase(it);
+    S->spatial.space->stat_objects--;
 }
 
 //////////////////////////////////////////////////////////////////////////
 
 ISpatial_DB::ISpatial_DB()
 #ifdef PROFILE_CRITICAL_SECTIONS
-	:cs(MUTEX_PROFILE_ID(ISpatial_DB))
+    :cs(MUTEX_PROFILE_ID(ISpatial_DB))
 #endif // PROFILE_CRITICAL_SECTIONS
 {
-	m_root					= NULL;
-	stat_nodes				= 0;
-	stat_objects			= 0;
+    m_root = NULL;
+    stat_nodes = 0;
+    stat_objects = 0;
 }
 
 ISpatial_DB::~ISpatial_DB()
 {
-	if ( m_root )
-	{
-		_node_destroy(m_root);
-	}
-
-	while (!allocator_pool.empty()){
-		allocator.destroy		(allocator_pool.back());
-		allocator_pool.pop_back	();
-	}
+    if (m_root)
+    {
+        _node_destroy(m_root);
+    }
+
+    while (!allocator_pool.empty())
+    {
+        allocator.destroy(allocator_pool.back());
+        allocator_pool.pop_back();
+    }
 }
 
-void			ISpatial_DB::initialize(Fbox& BB)
+void ISpatial_DB::initialize(Fbox& BB)
 {
-	if (0==m_root)			
-	{
-		// initialize
-		Fvector bbc,bbd;
-		BB.get_CD				(bbc,bbd);
-
-		bbc.set					(0,0,0);			// generic
-		bbd.set					(1024,1024,1024);	// generic
-
-		allocator_pool.reserve	(128);
-		m_center.set			(bbc);
-		m_bounds				= _max(_max(bbd.x,bbd.y),bbd.z);
-		rt_insert_object		= NULL;
-		if (0==m_root)	m_root	= _node_create();
-		m_root->_init			(NULL);
-	}
+    if (0 == m_root)
+    {
+        // initialize
+        Fvector bbc, bbd;
+        BB.get_CD(bbc, bbd);
+
+        bbc.set(0, 0, 0); // generic
+        bbd.set(1024, 1024, 1024); // generic
+
+        allocator_pool.reserve(128);
+        m_center.set(bbc);
+        m_bounds = _max(_max(bbd.x, bbd.y), bbd.z);
+        rt_insert_object = NULL;
+        if (0 == m_root) m_root = _node_create();
+        m_root->_init(NULL);
+    }
 }
-ISpatial_NODE*	ISpatial_DB::_node_create		()
+ISpatial_NODE* ISpatial_DB::_node_create()
 {
-	stat_nodes	++;
-	if (allocator_pool.empty())			return allocator.create();
-	else								
-	{
-		ISpatial_NODE*	N		= allocator_pool.back();
-		allocator_pool.pop_back	();
-		return			N;
-	}
+    stat_nodes++;
+    if (allocator_pool.empty()) return allocator.create();
+    else
+    {
+        ISpatial_NODE* N = allocator_pool.back();
+        allocator_pool.pop_back();
+        return N;
+    }
 }
-void			ISpatial_DB::_node_destroy(ISpatial_NODE* &P)
+void ISpatial_DB::_node_destroy(ISpatial_NODE*& P)
 {
-	VERIFY						(P->_empty());
-	stat_nodes					--;
-	allocator_pool.push_back	(P);
-	P							= NULL;
+    VERIFY(P->_empty());
+    stat_nodes--;
+    allocator_pool.push_back(P);
+    P = NULL;
 }
 
-void			ISpatial_DB::_insert	(ISpatial_NODE* N, Fvector& n_C, float n_R)
+void ISpatial_DB::_insert(ISpatial_NODE* N, Fvector& n_C, float n_R)
 {
-	//*** we are assured that object lives inside our node
-	float	n_vR	= 2*n_R;
-	VERIFY	(N);
-	VERIFY	(verify_sp(rt_insert_object,n_C,n_vR));
-
-	// we have to make sure we aren't the leaf node
-	if (n_R<=c_spatial_min)
-	{
-		// this is leaf node
-		N->_insert									(rt_insert_object);
-		rt_insert_object->spatial.node_center.set	(n_C);
-		rt_insert_object->spatial.node_radius		= n_vR;		// vR
-		return;
-	}
-
-	// we have to check if it can be putted further down
-	float	s_R			= rt_insert_object->spatial.sphere.R;	// spatial bounds
-	float	c_R			= n_R/2;								// children bounds
-	if (s_R<c_R)
-	{
-		// object can be pushed further down - select "octant", calc node position
-		Fvector&	s_C					=	rt_insert_object->spatial.sphere.P;
-		u32			octant				=	_octant	(n_C,s_C);
-		Fvector		c_C;				c_C.mad	(n_C,c_spatial_offset[octant],c_R);
-		VERIFY			(octant == _octant(n_C,c_C));				// check table assosiations
-		ISpatial_NODE*	&chield			= N->children[octant];
-
-		if (0==chield)	{
-			chield			=	_node_create();
-			VERIFY			(chield);
-			chield->_init	(N);
-			VERIFY			(chield);
-		}
-		VERIFY			(chield);
-		_insert			(chield, c_C, c_R);
-		VERIFY			(chield);
-	}
-	else
-	{
-		// we have to "own" this object (potentially it can be putted down sometimes...)
-		N->_insert									(rt_insert_object);
-		rt_insert_object->spatial.node_center.set	(n_C);
-		rt_insert_object->spatial.node_radius		= n_vR;
-	}
+    //*** we are assured that object lives inside our node
+    float n_vR = 2 * n_R;
+    VERIFY(N);
+    VERIFY(verify_sp(rt_insert_object, n_C, n_vR));
+
+    // we have to make sure we aren't the leaf node
+    if (n_R <= c_spatial_min)
+    {
+        // this is leaf node
+        N->_insert(rt_insert_object);
+        rt_insert_object->spatial.node_center.set(n_C);
+        rt_insert_object->spatial.node_radius = n_vR; // vR
+        return;
+    }
+
+    // we have to check if it can be putted further down
+    float s_R = rt_insert_object->spatial.sphere.R; // spatial bounds
+    float c_R = n_R / 2; // children bounds
+    if (s_R < c_R)
+    {
+        // object can be pushed further down - select "octant", calc node position
+        Fvector& s_C = rt_insert_object->spatial.sphere.P;
+        u32 octant = _octant(n_C, s_C);
+        Fvector c_C;
+        c_C.mad(n_C, c_spatial_offset[octant], c_R);
+        VERIFY(octant == _octant(n_C, c_C)); // check table assosiations
+        ISpatial_NODE*& chield = N->children[octant];
+
+        if (0 == chield)
+        {
+            chield = _node_create();
+            VERIFY(chield);
+            chield->_init(N);
+            VERIFY(chield);
+        }
+        VERIFY(chield);
+        _insert(chield, c_C, c_R);
+        VERIFY(chield);
+    }
+    else
+    {
+        // we have to "own" this object (potentially it can be putted down sometimes...)
+        N->_insert(rt_insert_object);
+        rt_insert_object->spatial.node_center.set(n_C);
+        rt_insert_object->spatial.node_radius = n_vR;
+    }
 }
 
-void			ISpatial_DB::insert		(ISpatial* S)
+void ISpatial_DB::insert(ISpatial* S)
 {
-	cs.Enter			();
+    cs.Enter();
 #ifdef DEBUG
-	stat_insert.Begin	();
-
-	BOOL		bValid	= _valid(S->spatial.sphere.R) && _valid(S->spatial.sphere.P);
-	if (!bValid)	
-	{
-		CObject*	O	= dynamic_cast<CObject*>(S);
-		if	(O)			Debug.fatal(DEBUG_INFO,"Invalid OBJECT position or radius (%s)",O->cName());
-		else			{
-			CPS_Instance* P = dynamic_cast<CPS_Instance*>(S);
-			if (P)		Debug.fatal(DEBUG_INFO,"Invalid PS spatial position{%3.2f,%3.2f,%3.2f} or radius{%3.2f}",VPUSH(S->spatial.sphere.P),S->spatial.sphere.R);
-			else		Debug.fatal(DEBUG_INFO,"Invalid OTHER spatial position{%3.2f,%3.2f,%3.2f} or radius{%3.2f}",VPUSH(S->spatial.sphere.P),S->spatial.sphere.R);
-		}
-	}
+    stat_insert.Begin();
+
+    BOOL bValid = _valid(S->spatial.sphere.R) && _valid(S->spatial.sphere.P);
+    if (!bValid)
+    {
+        CObject* O = dynamic_cast<CObject*>(S);
+        if (O) Debug.fatal(DEBUG_INFO, "Invalid OBJECT position or radius (%s)", O->cName());
+        else
+        {
+            CPS_Instance* P = dynamic_cast<CPS_Instance*>(S);
+            if (P) Debug.fatal(DEBUG_INFO, "Invalid PS spatial position{%3.2f,%3.2f,%3.2f} or radius{%3.2f}", VPUSH(S->spatial.sphere.P), S->spatial.sphere.R);
+            else Debug.fatal(DEBUG_INFO, "Invalid OTHER spatial position{%3.2f,%3.2f,%3.2f} or radius{%3.2f}", VPUSH(S->spatial.sphere.P), S->spatial.sphere.R);
+        }
+    }
 #endif
 
-	if (verify_sp(S,m_center,m_bounds))
-	{
-		// Object inside our DB
-		rt_insert_object			= S;
-		_insert						(m_root,m_center,m_bounds);
-		VERIFY						(S->spatial_inside());
-	} else {
-		// Object outside our DB, put it into root node and hack bounds
-		// Object will reinsert itself until fits into "real", "controlled" space
-		m_root->_insert				(S);
-		S->spatial.node_center.set	(m_center);
-		S->spatial.node_radius		=	m_bounds;
-	}
+    if (verify_sp(S, m_center, m_bounds))
+    {
+        // Object inside our DB
+        rt_insert_object = S;
+        _insert(m_root, m_center, m_bounds);
+        VERIFY(S->spatial_inside());
+    }
+    else
+    {
+        // Object outside our DB, put it into root node and hack bounds
+        // Object will reinsert itself until fits into "real", "controlled" space
+        m_root->_insert(S);
+        S->spatial.node_center.set(m_center);
+        S->spatial.node_radius = m_bounds;
+    }
 #ifdef DEBUG
-	stat_insert.End		();
+    stat_insert.End();
 #endif
-	cs.Leave			();
+    cs.Leave();
 }
 
-void			ISpatial_DB::_remove	(ISpatial_NODE* N, ISpatial_NODE* N_sub)
+void ISpatial_DB::_remove(ISpatial_NODE* N, ISpatial_NODE* N_sub)
 {
-	if (0==N)							return;
-
-	//*** we are assured that node contains N_sub and this subnode is empty
-	u32 octant	= u32(-1);
-	if (N_sub==N->children[0])			octant = 0;
-	else if (N_sub==N->children[1])		octant = 1;
-	else if (N_sub==N->children[2])		octant = 2;
-	else if (N_sub==N->children[3])		octant = 3;
-	else if (N_sub==N->children[4])		octant = 4;
-	else if (N_sub==N->children[5])		octant = 5;
-	else if (N_sub==N->children[6])		octant = 6;
-	else if (N_sub==N->children[7])		octant = 7;
-	VERIFY		(octant<8);
-	VERIFY		(N_sub->_empty());
-	_node_destroy						(N->children[octant]);
-
-	// Recurse
-	if (N->_empty())					_remove(N->parent,N);
+    if (0 == N) return;
+
+    //*** we are assured that node contains N_sub and this subnode is empty
+    u32 octant = u32(-1);
+    if (N_sub == N->children[0]) octant = 0;
+    else if (N_sub == N->children[1]) octant = 1;
+    else if (N_sub == N->children[2]) octant = 2;
+    else if (N_sub == N->children[3]) octant = 3;
+    else if (N_sub == N->children[4]) octant = 4;
+    else if (N_sub == N->children[5]) octant = 5;
+    else if (N_sub == N->children[6]) octant = 6;
+    else if (N_sub == N->children[7]) octant = 7;
+    VERIFY(octant < 8);
+    VERIFY(N_sub->_empty());
+    _node_destroy(N->children[octant]);
+
+    // Recurse
+    if (N->_empty()) _remove(N->parent, N);
 }
 
-void			ISpatial_DB::remove		(ISpatial* S)
+void ISpatial_DB::remove(ISpatial* S)
 {
-	cs.Enter			();
+    cs.Enter();
 #ifdef DEBUG
-	stat_remove.Begin	();
+    stat_remove.Begin();
 #endif
-	ISpatial_NODE* N	= S->spatial.node_ptr;
-	N->_remove			(S);
+    ISpatial_NODE* N = S->spatial.node_ptr;
+    N->_remove(S);
 
-	// Recurse
-	if (N->_empty())	_remove(N->parent,N);
+    // Recurse
+    if (N->_empty()) _remove(N->parent, N);
 
 #ifdef DEBUG
-	stat_remove.End		();
+    stat_remove.End();
 #endif
-	cs.Leave			();
+    cs.Leave();
 }
 
-void			ISpatial_DB::update		(u32 nodes/* =8 */)
+void ISpatial_DB::update(u32 nodes/* =8 */)
 {
 #ifdef DEBUG
-	if (0==m_root)	return;
-	cs.Enter		();
-	VERIFY			(verify());
-	cs.Leave		();
+    if (0 == m_root) return;
+    cs.Enter();
+    VERIFY(verify());
+    cs.Leave();
 #endif
 }
diff --git a/src/xrEngine/ISpatial.h b/src/xrEngine/ISpatial.h
index ce55c5137de..6f9c148e5c9 100644
--- a/src/xrEngine/ISpatial.h
+++ b/src/xrEngine/ISpatial.h
@@ -11,185 +11,186 @@
 /*
 Requirements:
 0. Generic
-	* O(1) insertion
-		- radius completely determines	"level"
-		- position completely detemines "node"
-	* O(1) removal
-	* 
+* O(1) insertion
+- radius completely determines "level"
+- position completely detemines "node"
+* O(1) removal
+*
 1. Rendering
-	* Should live inside spatial DB
-	* Should have at least "bounding-sphere" or "bounding-box"
-	* Should have pointer to "sector" it lives in
-	* Approximate traversal order relative to point ("camera")
+* Should live inside spatial DB
+* Should have at least "bounding-sphere" or "bounding-box"
+* Should have pointer to "sector" it lives in
+* Approximate traversal order relative to point ("camera")
 2. Spatial queries
-	* Should live inside spatial DB
-	* Should have at least "bounding-sphere" or "bounding-box"
+* Should live inside spatial DB
+* Should have at least "bounding-sphere" or "bounding-box"
 */
 
-const float						c_spatial_min	= 8.f;
+const float c_spatial_min = 8.f;
 //////////////////////////////////////////////////////////////////////////
 enum
 {
-	STYPE_RENDERABLE			= (1<<0),
-	STYPE_LIGHTSOURCE			= (1<<1),
-	STYPE_COLLIDEABLE			= (1<<2),
-	STYPE_VISIBLEFORAI			= (1<<3),
-	STYPE_REACTTOSOUND			= (1<<4),
-	STYPE_PHYSIC				= (1<<5),
-	STYPE_OBSTACLE				= (1<<6),
-	STYPE_SHAPE					= (1<<7),
-	STYPE_LIGHTSOURCEHEMI		= (1<<8),
-
-	STYPEFLAG_INVALIDSECTOR		= (1<<16)
+    STYPE_RENDERABLE = (1 << 0),
+    STYPE_LIGHTSOURCE = (1 << 1),
+    STYPE_COLLIDEABLE = (1 << 2),
+    STYPE_VISIBLEFORAI = (1 << 3),
+    STYPE_REACTTOSOUND = (1 << 4),
+    STYPE_PHYSIC = (1 << 5),
+    STYPE_OBSTACLE = (1 << 6),
+    STYPE_SHAPE = (1 << 7),
+    STYPE_LIGHTSOURCEHEMI = (1 << 8),
+
+    STYPEFLAG_INVALIDSECTOR = (1 << 16)
 };
 //////////////////////////////////////////////////////////////////////////
-// Comment: 
-//		ordinal objects			- renderable?, collideable?, visibleforAI?
-//		physical-decorations	- renderable, collideable
-//		lights					- lightsource
-//		particles(temp-objects)	- renderable
-//		glow					- renderable
-//		sound					- ???
+// Comment:
+// ordinal objects - renderable?, collideable?, visibleforAI?
+// physical-decorations - renderable, collideable
+// lights - lightsource
+// particles(temp-objects) - renderable
+// glow - renderable
+// sound - ???
 //////////////////////////////////////////////////////////////////////////
-class ENGINE_API				IRender_Sector;
-class ENGINE_API				ISpatial;
-class ENGINE_API				ISpatial_NODE;
-class ENGINE_API				ISpatial_DB;
+class ENGINE_API IRender_Sector;
+class ENGINE_API ISpatial;
+class ENGINE_API ISpatial_NODE;
+class ENGINE_API ISpatial_DB;
 
 //////////////////////////////////////////////////////////////////////////
 // Fast type conversion
-class ENGINE_API				CObject;
-class ENGINE_API				IRenderable;
-class ENGINE_API				IRender_Light;
+class ENGINE_API CObject;
+class ENGINE_API IRenderable;
+class ENGINE_API IRender_Light;
 namespace Feel { class ENGINE_API Sound; }
 
 //////////////////////////////////////////////////////////////////////////
-class ENGINE_API				ISpatial
+class ENGINE_API ISpatial
 {
 public:
-	struct	_spatial
-	{
-		u32						type;
-		Fsphere					sphere;
-		Fvector					node_center;	// Cached node center for TBV optimization
-		float					node_radius;	// Cached node bounds for TBV optimization
-		ISpatial_NODE*			node_ptr;		// Cached parent node for "empty-members" optimization
-		IRender_Sector*			sector;
-		ISpatial_DB*			space;			// allow different spaces
-
-		_spatial() : type(0)	{}				// safe way to enhure type is zero before any contstructors takes place
-	}							spatial;
+    struct _spatial
+    {
+        u32 type;
+        Fsphere sphere;
+        Fvector node_center; // Cached node center for TBV optimization
+        float node_radius; // Cached node bounds for TBV optimization
+        ISpatial_NODE* node_ptr; // Cached parent node for "empty-members" optimization
+        IRender_Sector* sector;
+        ISpatial_DB* space; // allow different spaces
+
+        _spatial() : type(0) {} // safe way to enhure type is zero before any contstructors takes place
+    } spatial;
 public:
-	BOOL						spatial_inside		()			;
-				void			spatial_updatesector_internal()	;
+    BOOL spatial_inside();
+    void spatial_updatesector_internal();
 public:
-	virtual		void			spatial_register	()	;
-	virtual		void			spatial_unregister	()	;
-	virtual		void			spatial_move		()	;
-	virtual		Fvector			spatial_sector_point()	{ return spatial.sphere.P; }
-	ICF			void			spatial_updatesector()	{
-		if (0== (spatial.type&STYPEFLAG_INVALIDSECTOR))	return;
-		spatial_updatesector_internal				()	;
-	};
-
-	virtual		CObject*		dcast_CObject		()	{ return 0;	}
-	virtual		Feel::Sound*	dcast_FeelSound		()	{ return 0;	}
-	virtual		IRenderable*	dcast_Renderable	()	{ return 0;	}
-	virtual		IRender_Light*	dcast_Light			()	{ return 0; }
-
-				ISpatial		(ISpatial_DB* space	);
-	virtual		~ISpatial		();
+    virtual void spatial_register();
+    virtual void spatial_unregister();
+    virtual void spatial_move();
+    virtual Fvector spatial_sector_point() { return spatial.sphere.P; }
+    ICF void spatial_updatesector()
+    {
+        if (0 == (spatial.type&STYPEFLAG_INVALIDSECTOR)) return;
+        spatial_updatesector_internal();
+    };
+
+    virtual CObject* dcast_CObject() { return 0; }
+    virtual Feel::Sound* dcast_FeelSound() { return 0; }
+    virtual IRenderable* dcast_Renderable() { return 0; }
+    virtual IRender_Light* dcast_Light() { return 0; }
+
+    ISpatial(ISpatial_DB* space);
+    virtual ~ISpatial();
 };
 
 //////////////////////////////////////////////////////////////////////////
-class ENGINE_API				ISpatial_NODE
+class ENGINE_API ISpatial_NODE
 {
 public:
-	typedef	_W64 unsigned		ptrt;
+    typedef _W64 unsigned ptrt;
 public:
-	ISpatial_NODE*				parent;					// parent node for "empty-members" optimization
-	ISpatial_NODE*				children		[8];	// children nodes
-	xr_vector<ISpatial*>		items;					// own items
+    ISpatial_NODE* parent; // parent node for "empty-members" optimization
+    ISpatial_NODE* children[8]; // children nodes
+    xr_vector<ISpatial*> items; // own items
 public:
-	void						_init			(ISpatial_NODE* _parent);
-	void						_remove			(ISpatial*		_S);
-	void						_insert			(ISpatial*		_S);
-	BOOL						_empty			()						
-	{
-		return items.empty() && (
-			0==(
-				ptrt(children[0])|ptrt(children[1])|
-				ptrt(children[2])|ptrt(children[3])|
-				ptrt(children[4])|ptrt(children[5])|
-				ptrt(children[6])|ptrt(children[7])
-				)
-			);	
-	}
+    void _init(ISpatial_NODE* _parent);
+    void _remove(ISpatial* _S);
+    void _insert(ISpatial* _S);
+    BOOL _empty()
+    {
+        return items.empty() && (
+            0 == (
+            ptrt(children[0]) | ptrt(children[1]) |
+            ptrt(children[2]) | ptrt(children[3]) |
+            ptrt(children[4]) | ptrt(children[5]) |
+            ptrt(children[6]) | ptrt(children[7])
+            )
+            );
+    }
 };
 
 //////////////////////////////////////////////////////////////////////////
-class ENGINE_API					ISpatial_DB
+class ENGINE_API ISpatial_DB
 {
 private:
-	xrCriticalSection				cs;
-	poolSS<ISpatial_NODE,128>		allocator;
-	xr_vector<ISpatial_NODE*>		allocator_pool;
-	ISpatial*						rt_insert_object;
+    xrCriticalSection cs;
+    poolSS<ISpatial_NODE, 128> allocator;
+    xr_vector<ISpatial_NODE*> allocator_pool;
+    ISpatial* rt_insert_object;
 public:
-	ISpatial_NODE*					m_root;
-	Fvector							m_center;
-	float							m_bounds;
-	xr_vector<ISpatial*>*			q_result;
-	u32								stat_nodes;
-	u32								stat_objects;
-	CStatTimer						stat_insert;
-	CStatTimer						stat_remove;
+    ISpatial_NODE* m_root;
+    Fvector m_center;
+    float m_bounds;
+    xr_vector<ISpatial*>* q_result;
+    u32 stat_nodes;
+    u32 stat_objects;
+    CStatTimer stat_insert;
+    CStatTimer stat_remove;
 private:
-	IC u32							_octant			(u32 x, u32 y, u32 z)			{	return z*4 + y*2 + x;	}
-	IC u32							_octant			(Fvector& base, Fvector& rel)
-	{
-		u32 o	= 0;
-		if (rel.x > base.x) o+=1;
-		if (rel.y > base.y) o+=2;
-		if (rel.z > base.z) o+=4;
-		return	o;
-	}
-
-	ISpatial_NODE*					_node_create	();
-	void 							_node_destroy	(ISpatial_NODE* &P);
-
-	void							_insert			(ISpatial_NODE* N, Fvector& n_center, float n_radius);
-	void							_remove			(ISpatial_NODE* N, ISpatial_NODE* N_sub);
+    IC u32 _octant(u32 x, u32 y, u32 z) { return z * 4 + y * 2 + x; }
+    IC u32 _octant(Fvector& base, Fvector& rel)
+    {
+        u32 o = 0;
+        if (rel.x > base.x) o += 1;
+        if (rel.y > base.y) o += 2;
+        if (rel.z > base.z) o += 4;
+        return o;
+    }
+
+    ISpatial_NODE* _node_create();
+    void _node_destroy(ISpatial_NODE*& P);
+
+    void _insert(ISpatial_NODE* N, Fvector& n_center, float n_radius);
+    void _remove(ISpatial_NODE* N, ISpatial_NODE* N_sub);
 public:
-	ISpatial_DB();
-	~ISpatial_DB();
+    ISpatial_DB();
+    ~ISpatial_DB();
 
-	// managing
-	void							initialize		(Fbox& BB);
-	//void							destroy			();
-	void							insert			(ISpatial* S);
-	void							remove			(ISpatial* S);
-	void							update			(u32 nodes=8);
-	BOOL							verify			();
+    // managing
+    void initialize(Fbox& BB);
+    //void destroy ();
+    void insert(ISpatial* S);
+    void remove(ISpatial* S);
+    void update(u32 nodes = 8);
+    BOOL verify();
 
 public:
-	enum
-	{
-		O_ONLYFIRST		= (1<<0),
-		O_ONLYNEAREST	= (1<<1),
-		O_ORDERED		= (1<<2),
-		O_force_u32		= u32(-1)
-	};
-
-	// query
-	void							q_ray			(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_and, const Fvector&		_start,  const Fvector&	_dir, float _range);
-	void							q_box			(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_or,  const Fvector&		_center, const Fvector& _size);
-	void							q_sphere		(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_or,  const Fvector&		_center, const float _radius);
-	void							q_frustum		(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_or,  const CFrustum&	_frustum);
+    enum
+    {
+        O_ONLYFIRST = (1 << 0),
+        O_ONLYNEAREST = (1 << 1),
+        O_ORDERED = (1 << 2),
+        O_force_u32 = u32(-1)
+    };
+
+    // query
+    void q_ray(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_and, const Fvector& _start, const Fvector& _dir, float _range);
+    void q_box(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_or, const Fvector& _center, const Fvector& _size);
+    void q_sphere(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_or, const Fvector& _center, const float _radius);
+    void q_frustum(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_or, const CFrustum& _frustum);
 };
 
-ENGINE_API extern ISpatial_DB*		g_SpatialSpace			;
-ENGINE_API extern ISpatial_DB*		g_SpatialSpacePhysic	;
+ENGINE_API extern ISpatial_DB* g_SpatialSpace;
+ENGINE_API extern ISpatial_DB* g_SpatialSpacePhysic;
 
 #pragma pack(pop)
 
diff --git a/src/xrEngine/ISpatial_q_box.cpp b/src/xrEngine/ISpatial_q_box.cpp
index 51b131ae9c8..f7e36e559f9 100644
--- a/src/xrEngine/ISpatial_q_box.cpp
+++ b/src/xrEngine/ISpatial_q_box.cpp
@@ -1,74 +1,77 @@
 #include "stdafx.h"
 #include "ISpatial.h"
 
-extern Fvector	c_spatial_offset[8];
+extern Fvector c_spatial_offset[8];
 
 template <bool b_first>
-class	walker
+class walker
 {
 public:
-	u32				mask;
-	Fvector			center;
-	Fvector			size;
-	Fbox			box;
-	ISpatial_DB*	space;
+    u32 mask;
+    Fvector center;
+    Fvector size;
+    Fbox box;
+    ISpatial_DB* space;
 public:
-	walker					(ISpatial_DB*	_space, u32 _mask, const Fvector& _center, const Fvector&	_size)
-	{
-		mask	= _mask;
-		center	= _center;
-		size	= _size;
-		box.setb(center,size);
-		space	= _space;
-	}
-	void		walk		(ISpatial_NODE* N, Fvector& n_C, float n_R)
-	{
-		// box
-		float	n_vR	=		2*n_R;
-		Fbox	BB;		BB.set	(n_C.x-n_vR, n_C.y-n_vR, n_C.z-n_vR, n_C.x+n_vR, n_C.y+n_vR, n_C.z+n_vR);
-		if		(!BB.intersect(box))			return;
+    walker(ISpatial_DB* _space, u32 _mask, const Fvector& _center, const Fvector& _size)
+    {
+        mask = _mask;
+        center = _center;
+        size = _size;
+        box.setb(center, size);
+        space = _space;
+    }
+    void walk(ISpatial_NODE* N, Fvector& n_C, float n_R)
+    {
+        // box
+        float n_vR = 2 * n_R;
+        Fbox BB;
+        BB.set(n_C.x - n_vR, n_C.y - n_vR, n_C.z - n_vR, n_C.x + n_vR, n_C.y + n_vR, n_C.z + n_vR);
+        if (!BB.intersect(box)) return;
 
-		// test items
-		xr_vector<ISpatial*>::iterator _it	=	N->items.begin	();
-		xr_vector<ISpatial*>::iterator _end	=	N->items.end	();
-		for (; _it!=_end; _it++)
-		{
-			ISpatial*		S	= *_it;
-			if (0==(S->spatial.type&mask))	continue;
+        // test items
+        xr_vector<ISpatial*>::iterator _it = N->items.begin();
+        xr_vector<ISpatial*>::iterator _end = N->items.end();
+        for (; _it != _end; _it++)
+        {
+            ISpatial* S = *_it;
+            if (0 == (S->spatial.type&mask)) continue;
 
-			Fvector&		sC		= S->spatial.sphere.P;
-			float			sR		= S->spatial.sphere.R;
-			Fbox			sB;		sB.set	(sC.x-sR, sC.y-sR, sC.z-sR, sC.x+sR, sC.y+sR, sC.z+sR);
-			if (!sB.intersect(box))	continue;
+            Fvector& sC = S->spatial.sphere.P;
+            float sR = S->spatial.sphere.R;
+            Fbox sB;
+            sB.set(sC.x - sR, sC.y - sR, sC.z - sR, sC.x + sR, sC.y + sR, sC.z + sR);
+            if (!sB.intersect(box)) continue;
 
-			space->q_result->push_back	(S);
-			if (b_first)			return;
-		}
+            space->q_result->push_back(S);
+            if (b_first) return;
+        }
 
-		// recurse
-		float	c_R		= n_R/2;
-		for (u32 octant=0; octant<8; octant++)
-		{
-			if (0==N->children[octant])	continue;
-			Fvector		c_C;			c_C.mad	(n_C,c_spatial_offset[octant],c_R);
-			walk						(N->children[octant],c_C,c_R);
-			if (b_first && !space->q_result->empty())	return;
-		}
-	}
+        // recurse
+        float c_R = n_R / 2;
+        for (u32 octant = 0; octant < 8; octant++)
+        {
+            if (0 == N->children[octant]) continue;
+            Fvector c_C;
+            c_C.mad(n_C, c_spatial_offset[octant], c_R);
+            walk(N->children[octant], c_C, c_R);
+            if (b_first && !space->q_result->empty()) return;
+        }
+    }
 };
 
-void	ISpatial_DB::q_box			(xr_vector<ISpatial*>& R, u32 _o, u32 _mask, const Fvector& _center, const Fvector& _size)
+void ISpatial_DB::q_box(xr_vector<ISpatial*>& R, u32 _o, u32 _mask, const Fvector& _center, const Fvector& _size)
 {
-	cs.Enter			();
-	q_result			= &R;
-	q_result->clear_not_free		();
-	if (_o & O_ONLYFIRST)			{ walker<true>	W(this,_mask,_center,_size);	W.walk(m_root,m_center,m_bounds); } 
-	else							{ walker<false>	W(this,_mask,_center,_size);	W.walk(m_root,m_center,m_bounds); } 
-	cs.Leave			();
+    cs.Enter();
+    q_result = &R;
+    q_result->clear_not_free();
+    if (_o & O_ONLYFIRST) { walker<true> W(this, _mask, _center, _size); W.walk(m_root, m_center, m_bounds); }
+    else { walker<false> W(this, _mask, _center, _size); W.walk(m_root, m_center, m_bounds); }
+    cs.Leave();
 }
 
-void	ISpatial_DB::q_sphere		(xr_vector<ISpatial*>& R, u32 _o, u32 _mask, const Fvector& _center, const float _radius)
+void ISpatial_DB::q_sphere(xr_vector<ISpatial*>& R, u32 _o, u32 _mask, const Fvector& _center, const float _radius)
 {
-	Fvector			_size			= {_radius,_radius,_radius};
-	q_box							(R,_o,_mask,_center,_size);
+    Fvector _size = {_radius, _radius, _radius};
+    q_box(R, _o, _mask, _center, _size);
 }
diff --git a/src/xrEngine/ISpatial_q_frustum.cpp b/src/xrEngine/ISpatial_q_frustum.cpp
index 54474ae4f30..ac02f591aa8 100644
--- a/src/xrEngine/ISpatial_q_frustum.cpp
+++ b/src/xrEngine/ISpatial_q_frustum.cpp
@@ -2,60 +2,63 @@
 #include "ISpatial.h"
 #include "frustum.h"
 
-extern Fvector	c_spatial_offset[8];
+extern Fvector c_spatial_offset[8];
 
-class	walker
+class walker
 {
 public:
-	u32				mask;
-	CFrustum*		F;
-	ISpatial_DB*	space;
+    u32 mask;
+    CFrustum* F;
+    ISpatial_DB* space;
 public:
-	walker					(ISpatial_DB*	_space, u32 _mask, const CFrustum* _F)
-	{
-		mask	= _mask;
-		F		= (CFrustum*)_F;
-		space	= _space;
-	}
-	void		walk		(ISpatial_NODE* N, Fvector& n_C, float n_R, u32 fmask)
-	{
-		// box
-		float	n_vR	=		2*n_R;
-		Fbox	BB;		BB.set	(n_C.x-n_vR, n_C.y-n_vR, n_C.z-n_vR, n_C.x+n_vR, n_C.y+n_vR, n_C.z+n_vR);
-		if		(fcvNone==F->testAABB(BB.data(),fmask))	return;
+    walker(ISpatial_DB* _space, u32 _mask, const CFrustum* _F)
+    {
+        mask = _mask;
+        F = (CFrustum*)_F;
+        space = _space;
+    }
+    void walk(ISpatial_NODE* N, Fvector& n_C, float n_R, u32 fmask)
+    {
+        // box
+        float n_vR = 2 * n_R;
+        Fbox BB;
+        BB.set(n_C.x - n_vR, n_C.y - n_vR, n_C.z - n_vR, n_C.x + n_vR, n_C.y + n_vR, n_C.z + n_vR);
+        if (fcvNone == F->testAABB(BB.data(), fmask)) return;
 
-		// test items
-		xr_vector<ISpatial*>::iterator _it	=	N->items.begin	();
-		xr_vector<ISpatial*>::iterator _end	=	N->items.end	();
-		for (; _it!=_end; _it++)
-		{
-			ISpatial*		S	= *_it;
-			if (0==(S->spatial.type&mask))	continue;
+        // test items
+        xr_vector<ISpatial*>::iterator _it = N->items.begin();
+        xr_vector<ISpatial*>::iterator _end = N->items.end();
+        for (; _it != _end; _it++)
+        {
+            ISpatial* S = *_it;
+            if (0 == (S->spatial.type&mask)) continue;
 
-			Fvector&		sC		= S->spatial.sphere.P;
-			float			sR		= S->spatial.sphere.R;
-			u32				tmask	= fmask;
-			if (fcvNone==F->testSphere(sC,sR,tmask))	continue;
+            Fvector& sC = S->spatial.sphere.P;
+            float sR = S->spatial.sphere.R;
+            u32 tmask = fmask;
+            if (fcvNone == F->testSphere(sC, sR, tmask)) continue;
 
-			space->q_result->push_back	(S);
-		}
+            space->q_result->push_back(S);
+        }
 
-		// recurse
-		float	c_R		= n_R/2;
-		for (u32 octant=0; octant<8; octant++)
-		{
-			if (0==N->children[octant])	continue;
-			Fvector		c_C;			c_C.mad	(n_C,c_spatial_offset[octant],c_R);
-			walk						(N->children[octant],c_C,c_R,fmask);
-		}
-	}
+        // recurse
+        float c_R = n_R / 2;
+        for (u32 octant = 0; octant < 8; octant++)
+        {
+            if (0 == N->children[octant]) continue;
+            Fvector c_C;
+            c_C.mad(n_C, c_spatial_offset[octant], c_R);
+            walk(N->children[octant], c_C, c_R, fmask);
+        }
+    }
 };
 
-void	ISpatial_DB::q_frustum		(xr_vector<ISpatial*>& R, u32 _o, u32 _mask, const CFrustum& _frustum)	
+void ISpatial_DB::q_frustum(xr_vector<ISpatial*>& R, u32 _o, u32 _mask, const CFrustum& _frustum)
 {
-	cs.Enter			();
-	q_result			= &R;
-	q_result->clear_not_free();
-	walker				W(this,_mask,&_frustum); W.walk(m_root,m_center,m_bounds,_frustum.getMask()); 
-	cs.Leave			();
+    cs.Enter();
+    q_result = &R;
+    q_result->clear_not_free();
+    walker W(this, _mask, &_frustum);
+    W.walk(m_root, m_center, m_bounds, _frustum.getMask());
+    cs.Leave();
 }
diff --git a/src/xrEngine/ISpatial_q_ray.cpp b/src/xrEngine/ISpatial_q_ray.cpp
index 9e1205361ed..8caef9c11ba 100644
--- a/src/xrEngine/ISpatial_q_ray.cpp
+++ b/src/xrEngine/ISpatial_q_ray.cpp
@@ -7,287 +7,330 @@
 
 // can you say "barebone"?
 #ifndef _MM_ALIGN16
-#	define _MM_ALIGN16		__declspec(align(16))
+# define _MM_ALIGN16 __declspec(align(16))
 #endif // _MM_ALIGN16
 
-struct	_MM_ALIGN16		vec_t	: public Fvector3	{ 
-	float		pad; 
+struct _MM_ALIGN16 vec_t : public Fvector3
+{
+    float pad;
 };
-vec_t	vec_c	( float _x, float _y, float _z)	{ vec_t v; v.x=_x;v.y=_y;v.z=_z;v.pad=0; return v; }
-struct _MM_ALIGN16		aabb_t	{ 
-	vec_t		min;
-	vec_t		max;
+vec_t vec_c(float _x, float _y, float _z) { vec_t v; v.x = _x; v.y = _y; v.z = _z; v.pad = 0; return v; }
+struct _MM_ALIGN16 aabb_t
+{
+    vec_t min;
+    vec_t max;
 };
-struct _MM_ALIGN16		ray_t	{
-	vec_t		pos;
-	vec_t		inv_dir;
-	vec_t		fwd_dir;
+struct _MM_ALIGN16 ray_t
+{
+    vec_t pos;
+    vec_t inv_dir;
+    vec_t fwd_dir;
 };
-struct ray_segment_t {
-	float		t_near,t_far;
+struct ray_segment_t
+{
+    float t_near, t_far;
 };
 
-ICF u32&	uf			(float &x)	{ return (u32&)x; }
-ICF BOOL	isect_fpu	(const Fvector& min, const Fvector& max, const ray_t &ray, Fvector& coord)
+ICF u32& uf(float& x) { return (u32&)x; }
+ICF BOOL isect_fpu(const Fvector& min, const Fvector& max, const ray_t& ray, Fvector& coord)
 {
-	Fvector				MaxT;
-	MaxT.x=MaxT.y=MaxT.z=-1.0f;
-	BOOL Inside			= TRUE;
+    Fvector MaxT;
+    MaxT.x = MaxT.y = MaxT.z = -1.0f;
+    BOOL Inside = TRUE;
 
-	// Find candidate planes.
-	if(ray.pos[0] < min[0]) {
-		coord[0]	= min[0];
-		Inside		= FALSE;
-		if(uf(ray.inv_dir[0]))	MaxT[0] = (min[0] - ray.pos[0]) * ray.inv_dir[0]; // Calculate T distances to candidate planes
-	} else if(ray.pos[0] > max[0]) {
-		coord[0]	= max[0];
-		Inside		= FALSE;
-		if(uf(ray.inv_dir[0]))	MaxT[0] = (max[0] - ray.pos[0]) * ray.inv_dir[0]; // Calculate T distances to candidate planes
-	}
-	if(ray.pos[1] < min[1]) {
-		coord[1]	= min[1];
-		Inside		= FALSE;
-		if(uf(ray.inv_dir[1]))	MaxT[1] = (min[1] - ray.pos[1]) * ray.inv_dir[1]; // Calculate T distances to candidate planes
-	} else if(ray.pos[1] > max[1]) {
-		coord[1]	= max[1];
-		Inside		= FALSE;
-		if(uf(ray.inv_dir[1]))	MaxT[1] = (max[1] - ray.pos[1]) * ray.inv_dir[1]; // Calculate T distances to candidate planes
-	}
-	if(ray.pos[2] < min[2]) {
-		coord[2]	= min[2];
-		Inside		= FALSE;
-		if(uf(ray.inv_dir[2]))	MaxT[2] = (min[2] - ray.pos[2]) * ray.inv_dir[2]; // Calculate T distances to candidate planes
-	} else if(ray.pos[2] > max[2]) {
-		coord[2]	= max[2];
-		Inside		= FALSE;
-		if(uf(ray.inv_dir[2]))	MaxT[2] = (max[2] - ray.pos[2]) * ray.inv_dir[2]; // Calculate T distances to candidate planes
-	}
+    // Find candidate planes.
+    if (ray.pos[0] < min[0])
+    {
+        coord[0] = min[0];
+        Inside = FALSE;
+        if (uf(ray.inv_dir[0])) MaxT[0] = (min[0] - ray.pos[0]) * ray.inv_dir[0]; // Calculate T distances to candidate planes
+    }
+    else if (ray.pos[0] > max[0])
+    {
+        coord[0] = max[0];
+        Inside = FALSE;
+        if (uf(ray.inv_dir[0])) MaxT[0] = (max[0] - ray.pos[0]) * ray.inv_dir[0]; // Calculate T distances to candidate planes
+    }
+    if (ray.pos[1] < min[1])
+    {
+        coord[1] = min[1];
+        Inside = FALSE;
+        if (uf(ray.inv_dir[1])) MaxT[1] = (min[1] - ray.pos[1]) * ray.inv_dir[1]; // Calculate T distances to candidate planes
+    }
+    else if (ray.pos[1] > max[1])
+    {
+        coord[1] = max[1];
+        Inside = FALSE;
+        if (uf(ray.inv_dir[1])) MaxT[1] = (max[1] - ray.pos[1]) * ray.inv_dir[1]; // Calculate T distances to candidate planes
+    }
+    if (ray.pos[2] < min[2])
+    {
+        coord[2] = min[2];
+        Inside = FALSE;
+        if (uf(ray.inv_dir[2])) MaxT[2] = (min[2] - ray.pos[2]) * ray.inv_dir[2]; // Calculate T distances to candidate planes
+    }
+    else if (ray.pos[2] > max[2])
+    {
+        coord[2] = max[2];
+        Inside = FALSE;
+        if (uf(ray.inv_dir[2])) MaxT[2] = (max[2] - ray.pos[2]) * ray.inv_dir[2]; // Calculate T distances to candidate planes
+    }
 
-	// Ray ray.pos inside bounding box
-	if(Inside)		{
-		coord		= ray.pos;
-		return		true;
-	}
+    // Ray ray.pos inside bounding box
+    if (Inside)
+    {
+        coord = ray.pos;
+        return true;
+    }
 
-	// Get largest of the maxT's for final choice of intersection
-	u32 WhichPlane = 0;
-	if	(MaxT[1] > MaxT[0])				WhichPlane = 1;
-	if	(MaxT[2] > MaxT[WhichPlane])	WhichPlane = 2;
+    // Get largest of the maxT's for final choice of intersection
+    u32 WhichPlane = 0;
+    if (MaxT[1] > MaxT[0]) WhichPlane = 1;
+    if (MaxT[2] > MaxT[WhichPlane]) WhichPlane = 2;
 
-	// Check final candidate actually inside box (if max < 0)
-	if(uf(MaxT[WhichPlane])&0x80000000) return false;
+    // Check final candidate actually inside box (if max < 0)
+    if (uf(MaxT[WhichPlane]) & 0x80000000) return false;
 
-	if  (0==WhichPlane)	{	// 1 & 2
-		coord[1] = ray.pos[1] + MaxT[0] * ray.fwd_dir[1];
-		if((coord[1] < min[1]) || (coord[1] > max[1]))	return false;
-		coord[2] = ray.pos[2] + MaxT[0] * ray.fwd_dir[2];
-		if((coord[2] < min[2]) || (coord[2] > max[2]))	return false;
-		return true;
-	}
-	if (1==WhichPlane)	{	// 0 & 2
-		coord[0] = ray.pos[0] + MaxT[1] * ray.fwd_dir[0];
-		if((coord[0] < min[0]) || (coord[0] > max[0]))	return false;
-		coord[2] = ray.pos[2] + MaxT[1] * ray.fwd_dir[2];
-		if((coord[2] < min[2]) || (coord[2] > max[2]))	return false;
-		return true;
-	}
-	if (2==WhichPlane)	{	// 0 & 1
-		coord[0] = ray.pos[0] + MaxT[2] * ray.fwd_dir[0];
-		if((coord[0] < min[0]) || (coord[0] > max[0]))	return false;
-		coord[1] = ray.pos[1] + MaxT[2] * ray.fwd_dir[1];
-		if((coord[1] < min[1]) || (coord[1] > max[1]))	return false;
-		return true;
-	}
-	return false;
+    if (0 == WhichPlane)   // 1 & 2
+    {
+        coord[1] = ray.pos[1] + MaxT[0] * ray.fwd_dir[1];
+        if ((coord[1] < min[1]) || (coord[1] > max[1])) return false;
+        coord[2] = ray.pos[2] + MaxT[0] * ray.fwd_dir[2];
+        if ((coord[2] < min[2]) || (coord[2] > max[2])) return false;
+        return true;
+    }
+    if (1 == WhichPlane)   // 0 & 2
+    {
+        coord[0] = ray.pos[0] + MaxT[1] * ray.fwd_dir[0];
+        if ((coord[0] < min[0]) || (coord[0] > max[0])) return false;
+        coord[2] = ray.pos[2] + MaxT[1] * ray.fwd_dir[2];
+        if ((coord[2] < min[2]) || (coord[2] > max[2])) return false;
+        return true;
+    }
+    if (2 == WhichPlane)   // 0 & 1
+    {
+        coord[0] = ray.pos[0] + MaxT[2] * ray.fwd_dir[0];
+        if ((coord[0] < min[0]) || (coord[0] > max[0])) return false;
+        coord[1] = ray.pos[1] + MaxT[2] * ray.fwd_dir[1];
+        if ((coord[1] < min[1]) || (coord[1] > max[1])) return false;
+        return true;
+    }
+    return false;
 }
 
 // turn those verbose intrinsics into something readable.
-#define loadps(mem)			_mm_load_ps((const float * const)(mem))
-#define storess(ss,mem)		_mm_store_ss((float * const)(mem),(ss))
-#define minss				_mm_min_ss
-#define maxss				_mm_max_ss
-#define minps				_mm_min_ps
-#define maxps				_mm_max_ps
-#define mulps				_mm_mul_ps
-#define subps				_mm_sub_ps
-#define rotatelps(ps)		_mm_shuffle_ps((ps),(ps), 0x39)	// a,b,c,d -> b,c,d,a
-#define muxhps(low,high)	_mm_movehl_ps((low),(high))		// low{a,b,c,d}|high{e,f,g,h} = {c,d,g,h}
+#define loadps(mem) _mm_load_ps((const float * const)(mem))
+#define storess(ss,mem) _mm_store_ss((float * const)(mem),(ss))
+#define minss _mm_min_ss
+#define maxss _mm_max_ss
+#define minps _mm_min_ps
+#define maxps _mm_max_ps
+#define mulps _mm_mul_ps
+#define subps _mm_sub_ps
+#define rotatelps(ps) _mm_shuffle_ps((ps),(ps), 0x39) // a,b,c,d -> b,c,d,a
+#define muxhps(low,high) _mm_movehl_ps((low),(high)) // low{a,b,c,d}|high{e,f,g,h} = {c,d,g,h}
 
 
-static const float flt_plus_inf = -logf(0);	// let's keep C and C++ compilers happy.
+static const float flt_plus_inf = -logf(0); // let's keep C and C++ compilers happy.
 static const float _MM_ALIGN16
-ps_cst_plus_inf	[4]	=	{  flt_plus_inf,  flt_plus_inf,  flt_plus_inf,  flt_plus_inf },
-ps_cst_minus_inf[4]	=	{ -flt_plus_inf, -flt_plus_inf, -flt_plus_inf, -flt_plus_inf };
+ps_cst_plus_inf[4] = {flt_plus_inf, flt_plus_inf, flt_plus_inf, flt_plus_inf},
+ps_cst_minus_inf[4] = {-flt_plus_inf, -flt_plus_inf, -flt_plus_inf, -flt_plus_inf};
 
-ICF BOOL isect_sse			(const aabb_t &box, const ray_t &ray, float &dist)	{
-	// you may already have those values hanging around somewhere
-	const __m128
-		plus_inf	= loadps(ps_cst_plus_inf),
-		minus_inf	= loadps(ps_cst_minus_inf);
+ICF BOOL isect_sse(const aabb_t& box, const ray_t& ray, float& dist)
+{
+    // you may already have those values hanging around somewhere
+    const __m128
+        plus_inf = loadps(ps_cst_plus_inf),
+        minus_inf = loadps(ps_cst_minus_inf);
 
-	// use whatever's apropriate to load.
-	const __m128
-		box_min		= loadps(&box.min),
-		box_max		= loadps(&box.max),
-		pos			= loadps(&ray.pos),
-		inv_dir		= loadps(&ray.inv_dir);
+    // use whatever's apropriate to load.
+    const __m128
+        box_min = loadps(&box.min),
+        box_max = loadps(&box.max),
+        pos = loadps(&ray.pos),
+        inv_dir = loadps(&ray.inv_dir);
 
-	// use a div if inverted directions aren't available
-	const __m128 l1 = mulps(subps(box_min, pos), inv_dir);
-	const __m128 l2 = mulps(subps(box_max, pos), inv_dir);
+    // use a div if inverted directions aren't available
+    const __m128 l1 = mulps(subps(box_min, pos), inv_dir);
+    const __m128 l2 = mulps(subps(box_max, pos), inv_dir);
 
-	// the order we use for those min/max is vital to filter out
-	// NaNs that happens when an inv_dir is +/- inf and
-	// (box_min - pos) is 0. inf * 0 = NaN
-	const __m128 filtered_l1a = minps(l1, plus_inf);
-	const __m128 filtered_l2a = minps(l2, plus_inf);
+    // the order we use for those min/max is vital to filter out
+    // NaNs that happens when an inv_dir is +/- inf and
+    // (box_min - pos) is 0. inf * 0 = NaN
+    const __m128 filtered_l1a = minps(l1, plus_inf);
+    const __m128 filtered_l2a = minps(l2, plus_inf);
 
-	const __m128 filtered_l1b = maxps(l1, minus_inf);
-	const __m128 filtered_l2b = maxps(l2, minus_inf);
+    const __m128 filtered_l1b = maxps(l1, minus_inf);
+    const __m128 filtered_l2b = maxps(l2, minus_inf);
 
-	// now that we're back on our feet, test those slabs.
-	__m128 lmax = maxps(filtered_l1a, filtered_l2a);
-	__m128 lmin = minps(filtered_l1b, filtered_l2b);
+    // now that we're back on our feet, test those slabs.
+    __m128 lmax = maxps(filtered_l1a, filtered_l2a);
+    __m128 lmin = minps(filtered_l1b, filtered_l2b);
 
-	// unfold back. try to hide the latency of the shufps & co.
-	const __m128 lmax0 = rotatelps(lmax);
-	const __m128 lmin0 = rotatelps(lmin);
-	lmax = minss(lmax, lmax0);
-	lmin = maxss(lmin, lmin0);
+    // unfold back. try to hide the latency of the shufps & co.
+    const __m128 lmax0 = rotatelps(lmax);
+    const __m128 lmin0 = rotatelps(lmin);
+    lmax = minss(lmax, lmax0);
+    lmin = maxss(lmin, lmin0);
 
-	const __m128 lmax1 = muxhps(lmax,lmax);
-	const __m128 lmin1 = muxhps(lmin,lmin);
-	lmax = minss(lmax, lmax1);
-	lmin = maxss(lmin, lmin1);
+    const __m128 lmax1 = muxhps(lmax, lmax);
+    const __m128 lmin1 = muxhps(lmin, lmin);
+    lmax = minss(lmax, lmax1);
+    lmin = maxss(lmin, lmin1);
 
-	const BOOL ret = _mm_comige_ss(lmax, _mm_setzero_ps()) & _mm_comige_ss(lmax,lmin);
+    const BOOL ret = _mm_comige_ss(lmax, _mm_setzero_ps()) & _mm_comige_ss(lmax, lmin);
 
-	storess		(lmin, &dist);
-	//storess	(lmax, &rs.t_far);
+    storess(lmin, &dist);
+    //storess (lmax, &rs.t_far);
 
-	return  ret;
+    return ret;
 }
 
-extern Fvector	c_spatial_offset[8];
+extern Fvector c_spatial_offset[8];
 
 template <bool b_use_sse, bool b_first, bool b_nearest>
-class	_MM_ALIGN16			walker
+class _MM_ALIGN16 walker
 {
 public:
-	ray_t			ray;
-	u32				mask;
-	float			range;
-	float			range2;
-	ISpatial_DB*	space;
+    ray_t ray;
+    u32 mask;
+    float range;
+    float range2;
+    ISpatial_DB* space;
 public:
-	walker					(ISpatial_DB*	_space, u32 _mask, const Fvector& _start, const Fvector&	_dir, float _range)
-	{
-		mask			= _mask;
-		ray.pos.set		(_start);
-		ray.inv_dir.set	(1.f,1.f,1.f).div(_dir);
-		ray.fwd_dir.set (_dir);
-		if (!b_use_sse)	{
-			// for FPU - zero out inf
-			if (_abs(_dir.x)>flt_eps){}	else ray.inv_dir.x=0;
-			if (_abs(_dir.y)>flt_eps){}	else ray.inv_dir.y=0;
-			if (_abs(_dir.z)>flt_eps){}	else ray.inv_dir.z=0;
-		}
-		range	= _range;
-		range2	= _range*_range;
-		space	= _space;
-	}
-	// fpu
-	ICF BOOL		_box_fpu	(const Fvector& n_C, const float n_R, Fvector& coord)
-	{
-		// box
-		float		n_vR	=		2*n_R;
-		Fbox		BB;		BB.set	(n_C.x-n_vR, n_C.y-n_vR, n_C.z-n_vR, n_C.x+n_vR, n_C.y+n_vR, n_C.z+n_vR);
-		return 		isect_fpu		(BB.min,BB.max,ray,coord);
-	}
-	// sse
-	ICF BOOL		_box_sse	(const Fvector& n_C, const float n_R, float&  dist )
-	{
-		aabb_t		box;
-		float		n_vR	=		2*n_R;
-		box.min.set	(n_C.x-n_vR, n_C.y-n_vR, n_C.z-n_vR);	box.min.pad = 0;
-		box.max.set	(n_C.x+n_vR, n_C.y+n_vR, n_C.z+n_vR);	box.max.pad = 0;
-		return 		isect_sse		(box,ray,dist);
-	}
-	void			walk		(ISpatial_NODE* N, Fvector& n_C, float n_R)
-	{
-		// Actual ray/aabb test
-		if (b_use_sse)		{
-			// use SSE
-			float		d;
-			if (!_box_sse(n_C,n_R,d))				return;
-			if (d>range)							return;
-		} else {
-			// use FPU
-			Fvector		P;
-			if (!_box_fpu(n_C,n_R,P))				return;
-			if (P.distance_to_sqr(ray.pos)>range2)	return;
-		}
+    walker(ISpatial_DB* _space, u32 _mask, const Fvector& _start, const Fvector& _dir, float _range)
+    {
+        mask = _mask;
+        ray.pos.set(_start);
+        ray.inv_dir.set(1.f, 1.f, 1.f).div(_dir);
+        ray.fwd_dir.set(_dir);
+        if (!b_use_sse)
+        {
+            // for FPU - zero out inf
+            if (_abs(_dir.x) > flt_eps) {}
+            else ray.inv_dir.x = 0;
+            if (_abs(_dir.y) > flt_eps) {}
+            else ray.inv_dir.y = 0;
+            if (_abs(_dir.z) > flt_eps) {}
+            else ray.inv_dir.z = 0;
+        }
+        range = _range;
+        range2 = _range*_range;
+        space = _space;
+    }
+    // fpu
+    ICF BOOL _box_fpu(const Fvector& n_C, const float n_R, Fvector& coord)
+    {
+        // box
+        float n_vR = 2 * n_R;
+        Fbox BB;
+        BB.set(n_C.x - n_vR, n_C.y - n_vR, n_C.z - n_vR, n_C.x + n_vR, n_C.y + n_vR, n_C.z + n_vR);
+        return isect_fpu(BB.min, BB.max, ray, coord);
+    }
+    // sse
+    ICF BOOL _box_sse(const Fvector& n_C, const float n_R, float& dist)
+    {
+        aabb_t box;
+        float n_vR = 2 * n_R;
+        box.min.set(n_C.x - n_vR, n_C.y - n_vR, n_C.z - n_vR);
+        box.min.pad = 0;
+        box.max.set(n_C.x + n_vR, n_C.y + n_vR, n_C.z + n_vR);
+        box.max.pad = 0;
+        return isect_sse(box, ray, dist);
+    }
+    void walk(ISpatial_NODE* N, Fvector& n_C, float n_R)
+    {
+        // Actual ray/aabb test
+        if (b_use_sse)
+        {
+            // use SSE
+            float d;
+            if (!_box_sse(n_C, n_R, d)) return;
+            if (d > range) return;
+        }
+        else
+        {
+            // use FPU
+            Fvector P;
+            if (!_box_fpu(n_C, n_R, P)) return;
+            if (P.distance_to_sqr(ray.pos) > range2) return;
+        }
 
-		// test items
-		xr_vector<ISpatial*>::iterator _it	=	N->items.begin	();
-		xr_vector<ISpatial*>::iterator _end	=	N->items.end	();
-		for (; _it!=_end; _it++)
-		{
-			ISpatial*		S	= *_it;
-			if (mask!=(S->spatial.type&mask))	continue;
-			Fsphere&		sS	= S->spatial.sphere;
-			int				quantity;
-			float			afT[2];
-			Fsphere::ERP_Result	result	= sS.intersect(ray.pos,ray.fwd_dir,range,quantity,afT);
+        // test items
+        xr_vector<ISpatial*>::iterator _it = N->items.begin();
+        xr_vector<ISpatial*>::iterator _end = N->items.end();
+        for (; _it != _end; _it++)
+        {
+            ISpatial* S = *_it;
+            if (mask != (S->spatial.type&mask)) continue;
+            Fsphere& sS = S->spatial.sphere;
+            int quantity;
+            float afT[2];
+            Fsphere::ERP_Result result = sS.intersect(ray.pos, ray.fwd_dir, range, quantity, afT);
 
-			if (result==Fsphere::rpOriginInside || ((result==Fsphere::rpOriginOutside)&&(afT[0]<range))){
-				if (b_nearest)				{ 
-					switch(result){
-					case Fsphere::rpOriginInside:	range	= afT[0]<range?afT[0]:range;	break;
-					case Fsphere::rpOriginOutside:	range	= afT[0];						break;
-					}
-					range2			=range*range; 
-				}
-				space->q_result->push_back	(S);
-				if (b_first)				return;
-			}
-		}
+            if (result == Fsphere::rpOriginInside || ((result == Fsphere::rpOriginOutside) && (afT[0] < range)))
+            {
+                if (b_nearest)
+                {
+                    switch (result)
+                    {
+                    case Fsphere::rpOriginInside:
+                        range = afT[0] < range ? afT[0] : range;
+                        break;
+                    case Fsphere::rpOriginOutside:
+                        range = afT[0];
+                        break;
+                    }
+                    range2 = range*range;
+                }
+                space->q_result->push_back(S);
+                if (b_first) return;
+            }
+        }
 
-		// recurse
-		float	c_R		= n_R/2;
-		for (u32 octant=0; octant<8; octant++)
-		{
-			if (0==N->children[octant])	continue;
-			Fvector		c_C;			c_C.mad	(n_C,c_spatial_offset[octant],c_R);
-			walk						(N->children[octant],c_C,c_R);
-			if (b_first && !space->q_result->empty())	return;
-		}
-	}
+        // recurse
+        float c_R = n_R / 2;
+        for (u32 octant = 0; octant < 8; octant++)
+        {
+            if (0 == N->children[octant]) continue;
+            Fvector c_C;
+            c_C.mad(n_C, c_spatial_offset[octant], c_R);
+            walk(N->children[octant], c_C, c_R);
+            if (b_first && !space->q_result->empty()) return;
+        }
+    }
 };
 
-void	ISpatial_DB::q_ray	(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_and, const Fvector&	_start,  const Fvector&	_dir, float _range)
+void ISpatial_DB::q_ray(xr_vector<ISpatial*>& R, u32 _o, u32 _mask_and, const Fvector& _start, const Fvector& _dir, float _range)
 {
-	cs.Enter						();
-	q_result						= &R;
-	q_result->clear_not_free		();
-	if (CPU::ID.feature&_CPU_FEATURE_SSE)	{
-		if (_o & O_ONLYFIRST)
-		{
-			if (_o & O_ONLYNEAREST)		{ walker<true,true,true>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-			else						{ walker<true,true,false>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-		} else {
-			if (_o & O_ONLYNEAREST)		{ walker<true,false,true>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-			else						{ walker<true,false,false>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-		}
-	} else {
-		if (_o & O_ONLYFIRST)
-		{
-			if (_o & O_ONLYNEAREST)		{ walker<false,true,true>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-			else						{ walker<false,true,false>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-		} else {
-			if (_o & O_ONLYNEAREST)		{ walker<false,false,true>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-			else						{ walker<false,false,false>	W(this,_mask_and,_start,_dir,_range);	W.walk(m_root,m_center,m_bounds); } 
-		}
-	}
-	cs.Leave		();
+    cs.Enter();
+    q_result = &R;
+    q_result->clear_not_free();
+    if (CPU::ID.feature&_CPU_FEATURE_SSE)
+    {
+        if (_o & O_ONLYFIRST)
+        {
+            if (_o & O_ONLYNEAREST) { walker<true, true, true> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+            else { walker<true, true, false> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+        }
+        else
+        {
+            if (_o & O_ONLYNEAREST) { walker<true, false, true> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+            else { walker<true, false, false> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+        }
+    }
+    else
+    {
+        if (_o & O_ONLYFIRST)
+        {
+            if (_o & O_ONLYNEAREST) { walker<false, true, true> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+            else { walker<false, true, false> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+        }
+        else
+        {
+            if (_o & O_ONLYNEAREST) { walker<false, false, true> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+            else { walker<false, false, false> W(this, _mask_and, _start, _dir, _range); W.walk(m_root, m_center, m_bounds); }
+        }
+    }
+    cs.Leave();
 }
diff --git a/src/xrEngine/ISpatial_verify.cpp b/src/xrEngine/ISpatial_verify.cpp
index 6cdd8b31f5f..c6306aeae35 100644
--- a/src/xrEngine/ISpatial_verify.cpp
+++ b/src/xrEngine/ISpatial_verify.cpp
@@ -1,40 +1,42 @@
 #include "stdafx.h"
 #include "ISpatial.h"
 
-extern Fvector	c_spatial_offset[8];
+extern Fvector c_spatial_offset[8];
 
-class	walker
+class walker
 {
 public:
-	u32			o_count;
-	u32			n_count;
+    u32 o_count;
+    u32 n_count;
 public:
-	walker					()
-	{
-		o_count	= 0;
-		n_count	= 0;
-	}
-	void		walk		(ISpatial_NODE* N, Fvector& n_C, float n_R)
-	{
-		// test items
-		n_count			+=		1;
-		o_count			+=		N->items.size();
+    walker()
+    {
+        o_count = 0;
+        n_count = 0;
+    }
+    void walk(ISpatial_NODE* N, Fvector& n_C, float n_R)
+    {
+        // test items
+        n_count += 1;
+        o_count += N->items.size();
 
-		// recurse
-		float	c_R		=		n_R/2;
-		for (u32 octant=0; octant<8; octant++)
-		{
-			if (0==N->children[octant])	continue;
-			Fvector		c_C;			c_C.mad	(n_C,c_spatial_offset[octant],c_R);
-			walk						(N->children[octant],c_C,c_R);
-		}
-	}
+        // recurse
+        float c_R = n_R / 2;
+        for (u32 octant = 0; octant < 8; octant++)
+        {
+            if (0 == N->children[octant]) continue;
+            Fvector c_C;
+            c_C.mad(n_C, c_spatial_offset[octant], c_R);
+            walk(N->children[octant], c_C, c_R);
+        }
+    }
 };
 
-BOOL	ISpatial_DB::verify			()
+BOOL ISpatial_DB::verify()
 {
-	walker		W;		W.walk		(m_root,m_center,m_bounds);
-	BOOL		bResult = (W.o_count == stat_objects) && (W.n_count == stat_nodes);
-	VERIFY		(bResult);
-	return		bResult;
+    walker W;
+    W.walk(m_root, m_center, m_bounds);
+    BOOL bResult = (W.o_count == stat_objects) && (W.n_count == stat_nodes);
+    VERIFY(bResult);
+    return bResult;
 }
diff --git a/src/xrEngine/LightAnimLibrary.cpp b/src/xrEngine/LightAnimLibrary.cpp
index ddbb6ffd49f..baed3d65fad 100644
--- a/src/xrEngine/LightAnimLibrary.cpp
+++ b/src/xrEngine/LightAnimLibrary.cpp
@@ -4,96 +4,104 @@
 
 #include "LightAnimLibrary.h"
 //---------------------------------------------------------------------------
-#define LANIM_VERSION		0x0001
+#define LANIM_VERSION 0x0001
 //---------------------------------------------------------------------------
-#define CHUNK_VERSION		0x0000
-#define CHUNK_ITEM_LIST		0x0001
+#define CHUNK_VERSION 0x0000
+#define CHUNK_ITEM_LIST 0x0001
 //---------------------------------------------------------------------------
-#define CHUNK_ITEM_COMMON	0x0001
-#define CHUNK_ITEM_KEYS		0x0002
+#define CHUNK_ITEM_COMMON 0x0001
+#define CHUNK_ITEM_KEYS 0x0002
 //---------------------------------------------------------------------------
 
 ELightAnimLibrary LALib;
 
 CLAItem::CLAItem()
 {
-	fFPS		= 15.f;
-	iFrameCount	= 1;
+    fFPS = 15.f;
+    iFrameCount = 1;
 }
 
-void CLAItem::InitDefault(){
-	Keys[0]		= 0x00000000;
+void CLAItem::InitDefault()
+{
+    Keys[0] = 0x00000000;
 }
 
 void CLAItem::Load(IReader& F)
 {
-	R_ASSERT(F.find_chunk(CHUNK_ITEM_COMMON));
-    F.r_stringZ		(cName);
-    fFPS			= F.r_float();
-    iFrameCount		= F.r_u32();
-
-    int key_cnt,key;
-	R_ASSERT(F.find_chunk(CHUNK_ITEM_KEYS));
-	key_cnt			= F.r_u32();
-    for (int i=0; i<key_cnt; i++){
-    	key			= F.r_u32	();
-        Keys[key]	= F.r_u32();
+    R_ASSERT(F.find_chunk(CHUNK_ITEM_COMMON));
+    F.r_stringZ(cName);
+    fFPS = F.r_float();
+    iFrameCount = F.r_u32();
+
+    int key_cnt, key;
+    R_ASSERT(F.find_chunk(CHUNK_ITEM_KEYS));
+    key_cnt = F.r_u32();
+    for (int i = 0; i < key_cnt; i++)
+    {
+        key = F.r_u32();
+        Keys[key] = F.r_u32();
     }
 }
 
 void CLAItem::Save(IWriter& F)
 {
-    F.open_chunk	(CHUNK_ITEM_COMMON);
-    F.w_stringZ		(cName);
-    F.w_float		(fFPS);
-    F.w_u32		(iFrameCount);
-	F.close_chunk	();
-
-    F.open_chunk	(CHUNK_ITEM_KEYS);
-    F.w_u32		(Keys.size());
-    for (KeyPairIt it=Keys.begin(); it!=Keys.end(); it++){
-		F.w_u32	(it->first);
-		F.w_u32	(it->second);
+    F.open_chunk(CHUNK_ITEM_COMMON);
+    F.w_stringZ(cName);
+    F.w_float(fFPS);
+    F.w_u32(iFrameCount);
+    F.close_chunk();
+
+    F.open_chunk(CHUNK_ITEM_KEYS);
+    F.w_u32(Keys.size());
+    for (KeyPairIt it = Keys.begin(); it != Keys.end(); it++)
+    {
+        F.w_u32(it->first);
+        F.w_u32(it->second);
     }
-	F.close_chunk	();
+    F.close_chunk();
 }
 
 void CLAItem::InsertKey(int frame, u32 color)
 {
-	R_ASSERT(frame<=iFrameCount);
-	Keys[frame] = color;
+    R_ASSERT(frame <= iFrameCount);
+    Keys[frame] = color;
 }
 
 void CLAItem::DeleteKey(int frame)
 {
-	R_ASSERT(frame<=iFrameCount);
-    if (0==frame) return;
-	KeyPairIt it=Keys.find(frame);
-    if (it!=Keys.end()) Keys.erase(it);
+    R_ASSERT(frame <= iFrameCount);
+    if (0 == frame) return;
+    KeyPairIt it = Keys.find(frame);
+    if (it != Keys.end()) Keys.erase(it);
 }
 
 void CLAItem::MoveKey(int from, int to)
 {
-	R_ASSERT(from<=iFrameCount);
-	R_ASSERT(to<=iFrameCount);
-	KeyPairIt it=Keys.find(from);
-    if (it!=Keys.end()){
-    	Keys[to]=it->second;
-		Keys.erase(it);
+    R_ASSERT(from <= iFrameCount);
+    R_ASSERT(to <= iFrameCount);
+    KeyPairIt it = Keys.find(from);
+    if (it != Keys.end())
+    {
+        Keys[to] = it->second;
+        Keys.erase(it);
     }
 }
 
 void CLAItem::Resize(int new_len)
 {
-	VERIFY((new_len>=1));
-	if (new_len!=iFrameCount){
-    	if (new_len>iFrameCount){
-        	int old_len=iFrameCount;
-			iFrameCount = new_len;
-        	MoveKey(old_len,new_len);
-        }else{
-			KeyPairIt I = Keys.upper_bound(new_len-1);
-            if (I!=Keys.end()) Keys.erase(I, Keys.end());
+    VERIFY((new_len >= 1));
+    if (new_len != iFrameCount)
+    {
+        if (new_len > iFrameCount)
+        {
+            int old_len = iFrameCount;
+            iFrameCount = new_len;
+            MoveKey(old_len, new_len);
+        }
+        else
+        {
+            KeyPairIt I = Keys.upper_bound(new_len - 1);
+            if (I != Keys.end()) Keys.erase(I, Keys.end());
             iFrameCount = new_len;
         }
     }
@@ -101,71 +109,82 @@ void CLAItem::Resize(int new_len)
 
 u32 CLAItem::InterpolateRGB(int frame)
 {
-    R_ASSERT(frame<=iFrameCount);
+    R_ASSERT(frame <= iFrameCount);
 
-    KeyPairIt A=Keys.find(frame);
+    KeyPairIt A = Keys.find(frame);
     KeyPairIt B;
-    if (A!=Keys.end()){  			// êëþ÷ - âîçâðàùàåì öâåò êëþ÷à
-    	return A->second;
-    }else{							// íå êëþ÷
-    	B=Keys.upper_bound(frame);  // èùåì ñëåäóþùèé êëþ÷
-        if (B==Keys.end()){			// åñëè åãî íåò âåðíåì öâåò ïîñëåäíåãî êëþ÷à
-	    	B--;
-        	return B->second;
+    if (A != Keys.end())  // êëþ÷ - âîçâðàùàåì öâåò êëþ÷à
+    {
+        return A->second;
+    }
+    else   // íå êëþ÷
+    {
+        B = Keys.upper_bound(frame); // èùåì ñëåäóþùèé êëþ÷
+        if (B == Keys.end())  // åñëè åãî íåò âåðíåì öâåò ïîñëåäíåãî êëþ÷à
+        {
+            B--;
+            return B->second;
         }
-    	A=B;        				// èíà÷å â A çàíåñåì ïðåäûäóùèé êëþ÷
+        A = B; // èíà÷å â A çàíåñåì ïðåäûäóùèé êëþ÷
         A--;
     }
 
-    R_ASSERT(Keys.size()>1);
+    R_ASSERT(Keys.size() > 1);
     // èíòåðïîëèðóåì öâåò
     Fcolor c, c0, c1;
-    float a0=(float)A->first;
-    float a1=(float)B->first;
+    float a0 = (float)A->first;
+    float a1 = (float)B->first;
     c0.set(A->second);
     c1.set(B->second);
-    float t = float(frame-a0)/float(a1-a0);
-    c.lerp(c0,c1,t);
+    float t = float(frame - a0) / float(a1 - a0);
+    c.lerp(c0, c1, t);
     return c.get();
 }
 
 u32 CLAItem::InterpolateBGR(int frame)
 {
-	u32 c 	= InterpolateRGB(frame);
-    return color_rgba(color_get_B(c),color_get_G(c),color_get_R(c),color_get_A(c));
+    u32 c = InterpolateRGB(frame);
+    return color_rgba(color_get_B(c), color_get_G(c), color_get_R(c), color_get_A(c));
 }
 
 u32 CLAItem::CalculateRGB(float T, int& frame)
 {
-    frame	= iFloor(fmodf(T,float(iFrameCount)/fFPS)*fFPS);
+    frame = iFloor(fmodf(T, float(iFrameCount) / fFPS)*fFPS);
     return InterpolateRGB(frame);
 }
 
 u32 CLAItem::CalculateBGR(float T, int& frame)
 {
-    frame	= iFloor(fmodf(T,float(iFrameCount)/fFPS)*fFPS);
+    frame = iFloor(fmodf(T, float(iFrameCount) / fFPS)*fFPS);
     return InterpolateBGR(frame);
 }
 
 int CLAItem::PrevKeyFrame(int frame)
 {
-    KeyPairIt A=Keys.lower_bound(frame);
-    if (A!=Keys.end()){
-    	KeyPairIt B=A; B--;
-        if (B!=Keys.end()) return B->first;
+    KeyPairIt A = Keys.lower_bound(frame);
+    if (A != Keys.end())
+    {
+        KeyPairIt B = A;
+        B--;
+        if (B != Keys.end()) return B->first;
         return A->first;
-    }else{
-    	return Keys.rbegin()->first;
+    }
+    else
+    {
+        return Keys.rbegin()->first;
     }
 }
 
 int CLAItem::NextKeyFrame(int frame)
 {
-    KeyPairIt A=Keys.upper_bound(frame);
-    if (A!=Keys.end()){
+    KeyPairIt A = Keys.upper_bound(frame);
+    if (A != Keys.end())
+    {
         return A->first;
-    }else{
-    	return Keys.rbegin()->first;
+    }
+    else
+    {
+        return Keys.rbegin()->first;
     }
 }
 
@@ -182,131 +201,146 @@ ELightAnimLibrary::~ELightAnimLibrary()
 
 void ELightAnimLibrary::OnCreate()
 {
-	Load();
+    Load();
 }
 
 void ELightAnimLibrary::OnDestroy()
 {
-	Unload();
+    Unload();
 }
 
 void ELightAnimLibrary::Unload()
 {
-	for (LAItemIt it=Items.begin(); it!=Items.end(); it++)
-    	xr_delete(*it);
+    for (LAItemIt it = Items.begin(); it != Items.end(); it++)
+        xr_delete(*it);
     Items.clear();
 }
 
 __declspec(dllexport) void ELightAnimLibrary::Load()
 {
-	string_path fn;
-    FS.update_path(fn,_game_data_,"lanims.xr");
-	IReader* fs=FS.r_open(fn);
-    if (fs){
-    	u16 version	= 0;
-    	if (fs->find_chunk(CHUNK_VERSION)){
-        	version	= fs->r_u16();
+    string_path fn;
+    FS.update_path(fn, _game_data_, "lanims.xr");
+    IReader* fs = FS.r_open(fn);
+    if (fs)
+    {
+        u16 version = 0;
+        if (fs->find_chunk(CHUNK_VERSION))
+        {
+            version = fs->r_u16();
         }
         IReader* OBJ = fs->open_chunk(CHUNK_ITEM_LIST);
-        if (OBJ){
-	        IReader* O   = OBJ->open_chunk(0);
-    	    for (int count=1; O; count++) {
-        	    CLAItem* I = xr_new<CLAItem>();
+        if (OBJ)
+        {
+            IReader* O = OBJ->open_chunk(0);
+            for (int count = 1; O; count++)
+            {
+                CLAItem* I = xr_new<CLAItem>();
                 I->Load(*O);
-                if (version==0){
-                    for (CLAItem::KeyPairIt it=I->Keys.begin(); it!=I->Keys.end(); it++)
-                        it->second	= subst_alpha(bgr2rgb(it->second),color_get_A(it->second));
+                if (version == 0)
+                {
+                    for (CLAItem::KeyPairIt it = I->Keys.begin(); it != I->Keys.end(); it++)
+                        it->second = subst_alpha(bgr2rgb(it->second), color_get_A(it->second));
                 }
                 Items.push_back(I);
-            	O->close();
-	            O = OBJ->open_chunk(count);
-    	    }
-	        OBJ->close();
+                O->close();
+                O = OBJ->open_chunk(count);
+            }
+            OBJ->close();
         }
 
-		FS.r_close(fs);
+        FS.r_close(fs);
     }
 }
 
 void ELightAnimLibrary::Save()
 {
-	CMemoryWriter F;
-    F.open_chunk	(CHUNK_VERSION);
-    F.w_u16			(LANIM_VERSION);
-	F.close_chunk	();
-    F.open_chunk	(CHUNK_ITEM_LIST);
+    CMemoryWriter F;
+    F.open_chunk(CHUNK_VERSION);
+    F.w_u16(LANIM_VERSION);
+    F.close_chunk();
+    F.open_chunk(CHUNK_ITEM_LIST);
     int count = 0;
-	for (LAItemIt it=Items.begin(); it!=Items.end(); it++){
+    for (LAItemIt it = Items.begin(); it != Items.end(); it++)
+    {
         F.open_chunk(count++);
-		(*it)->Save		(F);
+        (*it)->Save(F);
         F.close_chunk();
     }
-	F.close_chunk	();
+    F.close_chunk();
 
-	string_path		fn;
-    FS.update_path	(fn,_game_data_,"lanims.xr");
+    string_path fn;
+    FS.update_path(fn, _game_data_, "lanims.xr");
 
     if (!F.save_to(fn))
-        Log			("!Can't save color animations:",fn);
+        Log("!Can't save color animations:", fn);
 }
 
 void ELightAnimLibrary::Reload()
 {
-	Unload();
-	Load();
+    Unload();
+    Load();
 }
 
 LAItemIt ELightAnimLibrary::FindItemI(LPCSTR name)
 {
-	if (name&&name[0])
-		for (LAItemIt it=Items.begin(); it!=Items.end(); it++)
-			if (0==xr_strcmp((*it)->cName,name)) return it;
-	return Items.end();
+    if (name&&name[0])
+        for (LAItemIt it=Items.begin(); it!=Items.end(); it++)
+            if (0==xr_strcmp((*it)->cName,name)) return it;
+    return Items.end();
 }
 
 CLAItem* ELightAnimLibrary::FindItem(LPCSTR name)
 {
-	LAItemIt it=FindItemI(name);
-	return (it!=Items.end())?*it:0;
+    LAItemIt it=FindItemI(name);
+    return (it!=Items.end())?*it:0;
 }
 
 CLAItem* ELightAnimLibrary::AppendItem(LPCSTR name, CLAItem* src)
 {
-    VERIFY2				(FindItem(name)==0,"Duplicate name found.");
-    CLAItem* I			= xr_new<CLAItem>();
-    if (src)			*I = *src;
-    else			    I->InitDefault();
-    I->cName			= name;
-    Items.push_back		(I);
-	return I;
+    VERIFY2 (FindItem(name)==0,"Duplicate name found.");
+    CLAItem* I = xr_new<CLAItem>();
+    if (src) *I = *src;
+    else I->InitDefault();
+    I->cName = name;
+    Items.push_back (I);
+    return I;
 }
 
 #ifdef _EDITOR
-void ELightAnimLibrary::RemoveObject(LPCSTR _fname, EItemType type, bool& res)   
+void ELightAnimLibrary::RemoveObject(LPCSTR _fname, EItemType type, bool& res)
 {
-	if (TYPE_FOLDER==type){
+    if (TYPE_FOLDER == type)
+    {
         res = true;
-		return;
-    }else if (TYPE_OBJECT==type){
-        LAItemIt it=FindItemI(_fname); 
-        if (it!=Items.end()){
-	        xr_delete(*it);
-    	    Items.erase(it);
+        return;
+    }
+    else if (TYPE_OBJECT == type)
+    {
+        LAItemIt it = FindItemI(_fname);
+        if (it != Items.end())
+        {
+            xr_delete(*it);
+            Items.erase(it);
             res = true;
             return;
         }
-    }else THROW;
+    }
+    else THROW;
     res = false;
 }
 //---------------------------------------------------------------------------
 
 void ELightAnimLibrary::RenameObject(LPCSTR nm0, LPCSTR nm1, EItemType type)
 {
-	if (TYPE_FOLDER==type){
-    }else if (TYPE_OBJECT==type){
-		CLAItem* I=FindItem(nm0); R_ASSERT(I);
-		I->cName	= nm1;
-	}
+    if (TYPE_FOLDER == type)
+    {
+    }
+    else if (TYPE_OBJECT == type)
+    {
+        CLAItem* I = FindItem(nm0);
+        R_ASSERT(I);
+        I->cName = nm1;
+    }
 }
 //---------------------------------------------------------------------------
 #endif
\ No newline at end of file
diff --git a/src/xrEngine/LightAnimLibrary.h b/src/xrEngine/LightAnimLibrary.h
index b1b2b38007c..adb7051951f 100644
--- a/src/xrEngine/LightAnimLibrary.h
+++ b/src/xrEngine/LightAnimLibrary.h
@@ -4,62 +4,64 @@
 #define LightAnimLibraryH
 //---------------------------------------------------------------------------
 #ifdef _EDITOR
-	#include "../xrEProps/FolderLib.h"              
+#include "../xrEProps/FolderLib.h"
 #endif
 
-class ENGINE_API CLAItem				{
+class ENGINE_API CLAItem
+{
 public:
-    shared_str		cName;
-    float   		fFPS;
-    DEFINE_MAP		(int,u32,KeyMap,KeyPairIt);
-    KeyMap			Keys;
-    int				iFrameCount;
+    shared_str cName;
+    float fFPS;
+    DEFINE_MAP(int, u32, KeyMap, KeyPairIt);
+    KeyMap Keys;
+    int iFrameCount;
 public:
-                	CLAItem				();
-                    
-	void			InitDefault			();
-    void			Load				(IReader& F);
-    void			Save				(IWriter& F);
-	float			Length_sec			(){return float(iFrameCount)/fFPS;}
-	u32				Length_ms			(){return iFloor(Length_sec()*1000.f);}
-    u32				InterpolateRGB		(int frame);
-    u32				InterpolateBGR		(int frame);
-    u32				CalculateRGB		(float T, int& frame);
-    u32				CalculateBGR		(float T, int& frame);
-    void		    Resize				(int new_len);
-    void		    InsertKey			(int frame, u32 color);
-    void		    DeleteKey			(int frame);
-    void		    MoveKey				(int from, int to);
-    bool		    IsKey				(int frame){return (Keys.end()!=Keys.find(frame));}
-    int		 	    PrevKeyFrame		(int frame);
-    int		 	    NextKeyFrame 		(int frame);
-    int		 	    FirstKeyFrame		(){return Keys.rend()->first;}
-    int		 	    LastKeyFrame		(){return Keys.rbegin()->first;}
-    u32*			GetKey				(int frame){KeyPairIt it=Keys.find(frame); return (it!=Keys.end())?&(it->second):0;}
+    CLAItem();
+
+    void InitDefault();
+    void Load(IReader& F);
+    void Save(IWriter& F);
+    float Length_sec() { return float(iFrameCount) / fFPS; }
+    u32 Length_ms() { return iFloor(Length_sec()*1000.f); }
+    u32 InterpolateRGB(int frame);
+    u32 InterpolateBGR(int frame);
+    u32 CalculateRGB(float T, int& frame);
+    u32 CalculateBGR(float T, int& frame);
+    void Resize(int new_len);
+    void InsertKey(int frame, u32 color);
+    void DeleteKey(int frame);
+    void MoveKey(int from, int to);
+    bool IsKey(int frame) { return (Keys.end() != Keys.find(frame)); }
+    int PrevKeyFrame(int frame);
+    int NextKeyFrame(int frame);
+    int FirstKeyFrame() { return Keys.rend()->first; }
+    int LastKeyFrame() { return Keys.rbegin()->first; }
+    u32* GetKey(int frame) { KeyPairIt it = Keys.find(frame); return (it != Keys.end()) ? &(it->second) : 0; }
 };
-DEFINE_VECTOR(CLAItem*,LAItemVec,LAItemIt);
+DEFINE_VECTOR(CLAItem*, LAItemVec, LAItemIt);
 
-class ENGINE_API ELightAnimLibrary{
+class ENGINE_API ELightAnimLibrary
+{
 public:
-    LAItemVec       Items;
-    LAItemIt		FindItemI			(LPCSTR name);
-    CLAItem*		FindItem			(LPCSTR name);
+    LAItemVec Items;
+    LAItemIt FindItemI(LPCSTR name);
+    CLAItem* FindItem(LPCSTR name);
 public:
-					ELightAnimLibrary	();
-					~ELightAnimLibrary	();
-#ifdef _EDITOR       
-    void  			RemoveObject		(LPCSTR fname, EItemType type, bool& res);
-    void		 	RenameObject		(LPCSTR fn0, LPCSTR fn1, EItemType type);
+    ELightAnimLibrary ();
+    ~ELightAnimLibrary ();
+#ifdef _EDITOR
+    void RemoveObject(LPCSTR fname, EItemType type, bool& res);
+    void RenameObject(LPCSTR fn0, LPCSTR fn1, EItemType type);
 #endif
 
-    void			OnCreate			();
-    void			OnDestroy			();
-    void			Load				();
-    void			Save				();
-    void			Reload				();
-    void			Unload				();
-    CLAItem*		AppendItem			(LPCSTR name, CLAItem* src);
-    LAItemVec&		Objects				(){return Items;}
+    void OnCreate();
+    void OnDestroy();
+    void Load();
+    void Save();
+    void Reload();
+    void Unload();
+    CLAItem* AppendItem(LPCSTR name, CLAItem* src);
+    LAItemVec& Objects() { return Items; }
 };
 
 extern ENGINE_API ELightAnimLibrary LALib;
diff --git a/src/xrEngine/MbHelpers.cpp b/src/xrEngine/MbHelpers.cpp
index 8d77623ce8f..afce4ee8379 100644
--- a/src/xrEngine/MbHelpers.cpp
+++ b/src/xrEngine/MbHelpers.cpp
@@ -17,134 +17,145 @@
 
 #ifdef MB_DUMB_CONVERSION
 
-unsigned short int mbhMulti2WideDumb
-	( wide_char *WideStr , wide_char *WidePos , const unsigned short int WideStrSize , const char *MultiStr  )
+unsigned short int mbhMulti2WideDumb(wide_char* WideStr, wide_char* WidePos,
+    const unsigned short int WideStrSize, const char* MultiStr)
 {
-	unsigned short int spos = 0;
-	unsigned short int dpos = 0;
-	unsigned char b1;
-	wide_char wc = 0 ;
+    unsigned short int spos = 0;
+    unsigned short int dpos = 0;
+    unsigned char b1;
+    wide_char wc = 0;
 
-	VERIFY( MultiStr );
+    VERIFY(MultiStr);
 
-	if ( ! MultiStr[ 0 ] )
-		return 0;
+    if (!MultiStr[0])
+        return 0;
 
-	if ( WideStr || WidePos )
-		VERIFY2( ( ( WideStrSize > 0 ) && ( WideStrSize < 0xFFFF ) ) , make_string( "'WideStrSize'=%hu" , WideStrSize ) );
+    if (WideStr || WidePos)
+        VERIFY2(((WideStrSize > 0) && (WideStrSize < 0xFFFF)), make_string("'WideStrSize'=%hu", WideStrSize));
 
-	while ( ( b1	= MultiStr[ spos++ ] ) != 0x00 ) {
+    while ((b1 = MultiStr[spos++]) != 0x00)
+    {
 
-		if ( WidePos )
-			WidePos[ dpos ] = spos;
-		
-		dpos++;
+        if (WidePos)
+            WidePos[dpos] = spos;
 
-		wc = b1;
+        dpos++;
 
-		if ( WideStr ) {
-			VERIFY2( ( dpos < WideStrSize ) , make_string( "S1: '%s',%hu<%hu" , MultiStr , dpos , WideStrSize ) );
-			WideStr[ dpos ] = wc;
-		}
-	}
+        wc = b1;
 
-	if ( WidePos )
-		WidePos[ dpos ] = spos;
+        if (WideStr)
+        {
+            VERIFY2((dpos < WideStrSize), make_string("S1: '%s',%hu<%hu", MultiStr, dpos, WideStrSize));
+            WideStr[dpos] = wc;
+        }
+    }
 
-	if ( WideStr ) {
-		VERIFY2( ( dpos < WideStrSize ) , make_string( "S2: '%s',%hu<%hu" , MultiStr , dpos , WideStrSize ) );
-		WideStr[ dpos + 1 ] = 0x0000;
-	}
+    if (WidePos)
+        WidePos[dpos] = spos;
 
-	if ( WideStr )
-		WideStr[ 0 ] = dpos;
+    if (WideStr)
+    {
+        VERIFY2((dpos < WideStrSize), make_string("S2: '%s',%hu<%hu", MultiStr, dpos, WideStrSize));
+        WideStr[dpos + 1] = 0x0000;
+    }
 
-	return dpos;
+    if (WideStr)
+        WideStr[0] = dpos;
+
+    return dpos;
 }
 
 #endif // MB_DUMB_CONVERSION
 
 ENGINE_API unsigned short int mbhMulti2Wide
-	( wide_char *WideStr , wide_char *WidePos , const unsigned short int WideStrSize , const char *MultiStr  )
+(wide_char* WideStr, wide_char* WidePos, const unsigned short int WideStrSize, const char* MultiStr)
 {
-	unsigned short int spos = 0;
-	unsigned short int dpos = 0;
-	unsigned char b1, b2, b3;
-	wide_char wc = 0 ;
-
-	VERIFY( MultiStr );
-
-	if ( ! MultiStr[ 0 ] )
-		return 0;
-
-	if ( WideStr || WidePos )
-		VERIFY2( ( ( WideStrSize > 0 ) && ( WideStrSize < 0xFFFF ) ) , make_string( "'WideStrSize'=%hu" , WideStrSize ) );
-
-	while ( ( b1 = MultiStr[ spos ] ) != 0x00 ) {
-
-		if ( WidePos )
-			WidePos[ dpos ] = spos;
-
-		spos++;
-		
-		if ( ( b1 & BITS1_MASK ) == BITS1_EXP ) {
-			wc = b1;
-		} else
-		if ( ( b1 & BITS3_MASK ) == BITS3_EXP ) {
-			b2 = MultiStr[ spos++ ];
-			#ifdef MB_DUMB_CONVERSION
-				if ( ! ( b2 && ( ( b2 & BITS2_MASK ) == BITS2_EXP ) ) )
-					return mbhMulti2WideDumb( WideStr , WidePos , WideStrSize , MultiStr );
-			#else // MB_DUMB_CONVERSION
-				VERIFY2( ( b2 && ( ( b2 & BITS2_MASK ) == BITS2_EXP ) ) , 
-					make_string( "B2: '%s',@%hu,[%hc][%hc]" , MultiStr , spos , b1 , b2 ) );
-			#endif // MB_DUMB_CONVERSION
-			wc = ( ( b1 & ~ BITS3_MASK ) << 6 ) | ( b2 & ~ BITS2_MASK );
-		} else
-		if ( ( b1 & BITS4_MASK ) == BITS4_EXP ) {
-			b2 = MultiStr[ spos++ ];
-			#ifdef MB_DUMB_CONVERSION
-				if ( ! ( b2 && ( ( b2 & BITS2_MASK ) == BITS2_EXP ) ) )
-					return mbhMulti2WideDumb( WideStr , WidePos , WideStrSize , MultiStr );
-			#else // MB_DUMB_CONVERSION
-				VERIFY2( ( b2 && ( ( b2 & BITS2_MASK ) == BITS2_EXP ) ) ,
-					make_string( "B31: '%s',@%hu,[%hc][%hc]" , MultiStr , spos , b1 , b2 ) );
-			#endif // MB_DUMB_CONVERSION
-			b3 = MultiStr[ spos++ ];
-			#ifdef MB_DUMB_CONVERSION
-				if ( ! ( b3 && ( ( b3 & BITS2_MASK ) == BITS2_EXP ) ) ) 
-					return mbhMulti2WideDumb( WideStr , WidePos , WideStrSize , MultiStr );
-			#else // MB_DUMB_CONVERSION
-				VERIFY2( ( b3 && ( ( b3 & BITS2_MASK ) == BITS2_EXP ) ) ,
-					make_string( "B32: '%s',@%hu,[%hc][%hc][%hc]" , MultiStr , spos , b1 , b2 , b3 ) );
-			#endif // MB_DUMB_CONVERSION
-			wc = ( ( b1 & ~ BITS4_MASK ) << 12 ) | ( ( b2 & ~ BITS2_MASK ) << 6 ) | ( b3 & ~ BITS2_MASK );
-		} else {
-			#ifdef MB_DUMB_CONVERSION
-				return mbhMulti2WideDumb( WideStr , WidePos , WideStrSize , MultiStr );
-			#else // MB_DUMB_CONVERSION
-				VERIFY2( 0 , make_string( "B1: '%s',@%hu,[%hc]" , MultiStr , spos , b1 ) );
-			#endif // MB_DUMB_CONVERSION
-		}
-
-		dpos++;
-
-		if ( WideStr ) {
-			VERIFY2( ( dpos < WideStrSize ) , make_string( "S1: '%s',%hu<%hu" , MultiStr , dpos , WideStrSize ) );
-			WideStr[ dpos ] = wc;
-		}
-	}
-
-	if ( WidePos )
-		WidePos[ dpos ] = spos;
-
-	if ( WideStr ) {
-		VERIFY2( ( dpos < WideStrSize ) , make_string( "S2: '%s',%hu<%hu" , MultiStr , dpos , WideStrSize ) );
-		WideStr[ dpos + 1 ] = 0x0000;
-	}
-
-	if ( WideStr )
-		WideStr[ 0 ] = dpos;
-
-	return dpos;
+    unsigned short int spos = 0;
+    unsigned short int dpos = 0;
+    unsigned char b1, b2, b3;
+    wide_char wc = 0;
+
+    VERIFY(MultiStr);
+
+    if (!MultiStr[0])
+        return 0;
+
+    if (WideStr || WidePos)
+        VERIFY2(((WideStrSize > 0) && (WideStrSize < 0xFFFF)), make_string("'WideStrSize'=%hu", WideStrSize));
+
+    while ((b1 = MultiStr[spos]) != 0x00)
+    {
+
+        if (WidePos)
+            WidePos[dpos] = spos;
+
+        spos++;
+
+        if ((b1 & BITS1_MASK) == BITS1_EXP)
+        {
+            wc = b1;
+        }
+        else if ( ( b1 & BITS3_MASK ) == BITS3_EXP )
+        {
+            b2 = MultiStr[ spos++ ];
+#ifdef MB_DUMB_CONVERSION
+            if (!(b2 && ((b2 & BITS2_MASK) == BITS2_EXP)))
+                return mbhMulti2WideDumb(WideStr, WidePos, WideStrSize, MultiStr);
+#else // MB_DUMB_CONVERSION
+            VERIFY2((b2 && ((b2 & BITS2_MASK) == BITS2_EXP)),
+                make_string("B2: '%s',@%hu,[%hc][%hc]", MultiStr, spos, b1, b2));
+#endif // MB_DUMB_CONVERSION
+            wc = ((b1 & ~BITS3_MASK) << 6) | (b2 & ~BITS2_MASK);
+        }
+        else if ( ( b1 & BITS4_MASK ) == BITS4_EXP )
+        {
+            b2 = MultiStr[ spos++ ];
+#ifdef MB_DUMB_CONVERSION
+            if (!(b2 && ((b2 & BITS2_MASK) == BITS2_EXP)))
+                return mbhMulti2WideDumb(WideStr, WidePos, WideStrSize, MultiStr);
+#else // MB_DUMB_CONVERSION
+            VERIFY2( ( b2 && ( ( b2 & BITS2_MASK ) == BITS2_EXP ) ) ,
+                make_string( "B31: '%s',@%hu,[%hc][%hc]" , MultiStr , spos , b1 , b2 ) );
+#endif // MB_DUMB_CONVERSION
+            b3 = MultiStr[ spos++ ];
+#ifdef MB_DUMB_CONVERSION
+            if (!(b3 && ((b3 & BITS2_MASK) == BITS2_EXP)))
+                return mbhMulti2WideDumb(WideStr, WidePos, WideStrSize, MultiStr);
+#else // MB_DUMB_CONVERSION
+            VERIFY2( ( b3 && ( ( b3 & BITS2_MASK ) == BITS2_EXP ) ) ,
+                make_string( "B32: '%s',@%hu,[%hc][%hc][%hc]" , MultiStr , spos , b1 , b2 , b3 ) );
+#endif // MB_DUMB_CONVERSION
+            wc = ((b1 & ~BITS4_MASK) << 12) | ((b2 & ~BITS2_MASK) << 6) | (b3 & ~BITS2_MASK);
+    }
+        else
+        {
+#ifdef MB_DUMB_CONVERSION
+            return mbhMulti2WideDumb(WideStr, WidePos, WideStrSize, MultiStr);
+#else // MB_DUMB_CONVERSION
+            VERIFY2(0, make_string("B1: '%s',@%hu,[%hc]", MultiStr, spos, b1));
+#endif // MB_DUMB_CONVERSION
+        }
+
+        dpos++;
+
+        if (WideStr)
+        {
+            VERIFY2((dpos < WideStrSize), make_string("S1: '%s',%hu<%hu", MultiStr, dpos, WideStrSize));
+            WideStr[dpos] = wc;
+        }
+}
+
+    if (WidePos)
+        WidePos[dpos] = spos;
+
+    if (WideStr)
+    {
+        VERIFY2((dpos < WideStrSize), make_string("S2: '%s',%hu<%hu", MultiStr, dpos, WideStrSize));
+        WideStr[dpos + 1] = 0x0000;
+    }
+
+    if (WideStr)
+        WideStr[0] = dpos;
+
+    return dpos;
 }
diff --git a/src/xrEngine/MbHelpers.h b/src/xrEngine/MbHelpers.h
index c8d0ff3e2c8..a643e42c92d 100644
--- a/src/xrEngine/MbHelpers.h
+++ b/src/xrEngine/MbHelpers.h
@@ -6,70 +6,70 @@
 typedef unsigned short int wide_char;
 
 ENGINE_API unsigned short int mbhMulti2Wide
-	( wide_char *WideStr , wide_char *WidePos , const unsigned short int WideStrSize , const char *MultiStr  );
+(wide_char* WideStr, wide_char* WidePos, const unsigned short int WideStrSize, const char* MultiStr);
 
-__inline BOOL IsNeedSpaceCharacter( wide_char wc )
+__inline BOOL IsNeedSpaceCharacter(wide_char wc)
 {
-	return ( 
-		( wc == 0x0020 )  ||
+    return (
+        (wc == 0x0020) ||
 
-		( wc == 0x3000 )  ||
+        (wc == 0x3000) ||
 
-		( wc == 0xFF01 )  ||
-		( wc == 0xFF0C )  ||
-//		( wc == 0xFF0D )  ||
-		( wc == 0xFF0E )  ||
-		( wc == 0xFF1A )  ||
-		( wc == 0xFF1B )  ||
-		( wc == 0xFF1F )  ||
+        (wc == 0xFF01) ||
+        (wc == 0xFF0C) ||
+        // ( wc == 0xFF0D ) ||
+        (wc == 0xFF0E) ||
+        (wc == 0xFF1A) ||
+        (wc == 0xFF1B) ||
+        (wc == 0xFF1F) ||
 
-		( wc == 0x2026 )  ||
+        (wc == 0x2026) ||
 
-		( wc == 0x3002 )  ||
-		( wc == 0x3001 ) 
-	);
+        (wc == 0x3002) ||
+        (wc == 0x3001)
+        );
 }
 
-__inline BOOL IsBadStartCharacter( wide_char wc )
+__inline BOOL IsBadStartCharacter(wide_char wc)
 {
-	return ( 
-		IsNeedSpaceCharacter( wc ) ||
-
-		( wc == 0x0021 )  ||
-		( wc == 0x002C )  ||
-//		( wc == 0x002D )  ||
-		( wc == 0x002E )  ||
-		( wc == 0x003A )  ||
-		( wc == 0x003B )  ||
-		( wc == 0x003F )  ||
-
-		( wc == 0x0029 )  ||
-		( wc == 0xFF09 )
-	);
+    return (
+        IsNeedSpaceCharacter(wc) ||
+
+        (wc == 0x0021) ||
+        (wc == 0x002C) ||
+        // ( wc == 0x002D ) ||
+        (wc == 0x002E) ||
+        (wc == 0x003A) ||
+        (wc == 0x003B) ||
+        (wc == 0x003F) ||
+
+        (wc == 0x0029) ||
+        (wc == 0xFF09)
+        );
 }
 
-__inline BOOL IsBadEndCharacter( wide_char wc )
+__inline BOOL IsBadEndCharacter(wide_char wc)
 {
-	return ( 
-		( wc == 0x0028 )  ||
+    return (
+        (wc == 0x0028) ||
 
-		( wc == 0xFF08 )  ||
+        (wc == 0xFF08) ||
 
-		( wc == 0x4E00 ) 
-	);
+        (wc == 0x4E00)
+        );
 }
 
-__inline BOOL IsAlphaCharacter( wide_char wc )
+__inline BOOL IsAlphaCharacter(wide_char wc)
 {
-	return ( 
-		( ( wc >= 0x0030 ) && ( wc <= 0x0039 ) ) ||
-		( ( wc >= 0x0041 ) && ( wc <= 0x005A ) ) ||
-		( ( wc >= 0x0061 ) && ( wc <= 0x007A ) ) ||
-
-		( ( wc >= 0xFF10 ) && ( wc <= 0xFF19 ) ) ||
-		( ( wc >= 0xFF21 ) && ( wc <= 0xFF3A ) ) ||
-		( ( wc >= 0xFF41 ) && ( wc <= 0xFF5A ) )
-	);
+    return (
+        ((wc >= 0x0030) && (wc <= 0x0039)) ||
+        ((wc >= 0x0041) && (wc <= 0x005A)) ||
+        ((wc >= 0x0061) && (wc <= 0x007A)) ||
+
+        ((wc >= 0xFF10) && (wc <= 0xFF19)) ||
+        ((wc >= 0xFF21) && (wc <= 0xFF3A)) ||
+        ((wc >= 0xFF41) && (wc <= 0xFF5A))
+        );
 }
 
 
diff --git a/src/xrEngine/ObjectAnimator.cpp b/src/xrEngine/ObjectAnimator.cpp
index 3992f52d71a..c704413df6b 100644
--- a/src/xrEngine/ObjectAnimator.cpp
+++ b/src/xrEngine/ObjectAnimator.cpp
@@ -3,109 +3,125 @@
 
 #include "ObjectAnimator.h"
 #include "motion.h"
- 
-bool motion_sort_pred	(COMotion* a, 	COMotion* b)	{	return a->name<b->name;}
-bool motion_find_pred	(COMotion* a, 	shared_str b)	{	return a->name<b;}
+
+bool motion_sort_pred(COMotion* a, COMotion* b) { return a->name < b->name; }
+bool motion_find_pred(COMotion* a, shared_str b) { return a->name < b; }
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 CObjectAnimator::CObjectAnimator()
 {
-	bLoop			= false;
-    m_Current		= 0;
-    m_Speed			= 1.f;
-	m_Name			= "";
+    bLoop = false;
+    m_Current = 0;
+    m_Speed = 1.f;
+    m_Name = "";
 }
 
 CObjectAnimator::~CObjectAnimator()
-{	
-	Clear				();
+{
+    Clear();
 }
 
 void CObjectAnimator::Clear()
 {
-	for(MotionIt m_it=m_Motions.begin(); m_it!=m_Motions.end(); m_it++)
-		xr_delete		(*m_it);
-	m_Motions.clear		();
-    SetActiveMotion		(0);
+    for (MotionIt m_it = m_Motions.begin(); m_it != m_Motions.end(); m_it++)
+        xr_delete(*m_it);
+    m_Motions.clear();
+    SetActiveMotion(0);
 }
 
 void CObjectAnimator::SetActiveMotion(COMotion* mot)
 {
-	m_Current			= mot;
-    if (m_Current) 		m_MParam.Set(m_Current);
-	m_XFORM.identity	();
+    m_Current = mot;
+    if (m_Current) m_MParam.Set(m_Current);
+    m_XFORM.identity();
 }
 
 void CObjectAnimator::LoadMotions(LPCSTR fname)
 {
-	string_path			full_path;
-	if (!FS.exist( full_path, "$level$", fname ))
-		if (!FS.exist( full_path, "$game_anims$", fname ))
-			Debug.fatal(DEBUG_INFO,"Can't find motion file '%s'.",fname);
-            
-    LPCSTR  ext			= strext(full_path);
-    if (ext){
-		Clear			();
-    	if (0==xr_strcmp(ext,".anm")){
-            COMotion* M	= xr_new<COMotion> ();
+    string_path full_path;
+    if (!FS.exist(full_path, "$level$", fname))
+        if (!FS.exist(full_path, "$game_anims$", fname))
+            Debug.fatal(DEBUG_INFO, "Can't find motion file '%s'.", fname);
+
+    LPCSTR ext = strext(full_path);
+    if (ext)
+    {
+        Clear();
+        if (0 == xr_strcmp(ext, ".anm"))
+        {
+            COMotion* M = xr_new<COMotion>();
             if (M->LoadMotion(full_path)) m_Motions.push_back(M);
-            else				FATAL("ERROR: Can't load motion. Incorrect file version.");
-        }else if (0==xr_strcmp(ext,".anms")){
-            IReader* F			= FS.r_open(full_path);
-            u32 dwMCnt			= F->r_u32(); VERIFY(dwMCnt);
-            for (u32 i=0; i<dwMCnt; i++){
-                COMotion* M		= xr_new<COMotion> ();
-                bool bRes		= M->Load(*F);
-                if (!bRes)		FATAL("ERROR: Can't load motion. Incorrect file version.");
+            else FATAL("ERROR: Can't load motion. Incorrect file version.");
+        }
+        else if (0 == xr_strcmp(ext, ".anms"))
+        {
+            IReader* F = FS.r_open(full_path);
+            u32 dwMCnt = F->r_u32();
+            VERIFY(dwMCnt);
+            for (u32 i = 0; i < dwMCnt; i++)
+            {
+                COMotion* M = xr_new<COMotion>();
+                bool bRes = M->Load(*F);
+                if (!bRes) FATAL("ERROR: Can't load motion. Incorrect file version.");
                 m_Motions.push_back(M);
             }
-            FS.r_close		(F);
+            FS.r_close(F);
         }
-        std::sort(m_Motions.begin(),m_Motions.end(),motion_sort_pred);
+        std::sort(m_Motions.begin(), m_Motions.end(), motion_sort_pred);
     }
 }
 
-void CObjectAnimator::Load(const char * name)
+void CObjectAnimator::Load(const char* name)
 {
-	m_Name				= name;
-	LoadMotions			(name); 
-	SetActiveMotion		(0);
+    m_Name = name;
+    LoadMotions(name);
+    SetActiveMotion(0);
 }
 
 void CObjectAnimator::Update(float dt)
 {
-	if (m_Current){
-		Fvector R,P;
-		m_Current->_Evaluate(m_MParam.Frame(),P,R);
-		m_MParam.Update	(dt,m_Speed,bLoop);
-		m_XFORM.setXYZi	(R.x,R.y,R.z);
+    if (m_Current)
+    {
+        Fvector R, P;
+        m_Current->_Evaluate(m_MParam.Frame(), P, R);
+        m_MParam.Update(dt, m_Speed, bLoop);
+        m_XFORM.setXYZi(R.x, R.y, R.z);
         m_XFORM.translate_over(P);
-	}
+    }
 }
 
 COMotion* CObjectAnimator::Play(bool loop, LPCSTR name)
 {
-	if (name&&name[0]){
-		MotionIt it = std::lower_bound(m_Motions.begin(),m_Motions.end(),name,motion_find_pred);
-        if ((it!=m_Motions.end())&&(0==xr_strcmp((*it)->Name(),name))){
-            bLoop 		= loop;
+    if (name&&name[0])
+    {
+        MotionIt it = std::lower_bound(m_Motions.begin(), m_Motions.end(), name, motion_find_pred);
+        if ((it != m_Motions.end()) && (0 == xr_strcmp((*it)->Name(), name)))
+        {
+            bLoop = loop;
             SetActiveMotion(*it);
-			m_MParam.Play	();
-            return 		*it;
-        }else{
-            Debug.fatal	(DEBUG_INFO,"OBJ ANIM::Cycle '%s' not found.",name);
+            m_MParam.Play();
+            return *it;
+        }
+        else
+        {
+            Debug.fatal(DEBUG_INFO, "OBJ ANIM::Cycle '%s' not found.", name);
             return NULL;
         }
-    }else{
-        if (!m_Motions.empty()){
-            bLoop 		= loop;
+    }
+    else
+    {
+        if (!m_Motions.empty())
+        {
+            bLoop = loop;
             SetActiveMotion(m_Motions.front());
-			m_MParam.Play	();
-            return 		m_Motions.front();
-        }else{
-            Debug.fatal	(DEBUG_INFO,"OBJ ANIM::Cycle '%s' not found.",name);
+            m_MParam.Play();
+            return m_Motions.front();
+        }
+        else
+        {
+            Debug.fatal(DEBUG_INFO, "OBJ ANIM::Cycle '%s' not found.", name);
             return NULL;
         }
     }
@@ -113,15 +129,15 @@ COMotion* CObjectAnimator::Play(bool loop, LPCSTR name)
 
 void CObjectAnimator::Stop()
 {
-	SetActiveMotion		(0);
-	m_MParam.Stop		();
+    SetActiveMotion (0);
+    m_MParam.Stop ();
 }
 
-float CObjectAnimator::GetLength		()
+float CObjectAnimator::GetLength ()
 {
-	if(!m_Current) return 0.0f;
-	float res = m_Current->Length()/m_Current->FPS();
-	return res; 
+    if(!m_Current) return 0.0f;
+    float res = m_Current->Length()/m_Current->FPS();
+    return res;
 }
 
 #ifdef _EDITOR
@@ -134,31 +150,35 @@ static FvectorVec path_points;
 void CObjectAnimator::DrawPath()
 {
     // motion path
-	if (m_Current){
-        float fps 				= m_Current->FPS();
-        float min_t				= (float)m_Current->FrameStart()/fps;
-        float max_t				= (float)m_Current->FrameEnd()/fps;
-
-        Fvector 				T,r;
-        u32 clr					= 0xffffffff;
-        path_points.clear		();
-        for (float t=min_t; (t<max_t)||fsimilar(t,max_t,EPS_L); t+=1/30.f){
-            m_Current->_Evaluate(t,T,r);
+    if (m_Current)
+    {
+        float fps = m_Current->FPS();
+        float min_t = (float)m_Current->FrameStart()/fps;
+        float max_t = (float)m_Current->FrameEnd()/fps;
+
+        Fvector T,r;
+        u32 clr = 0xffffffff;
+        path_points.clear ();
+        for (float t=min_t; (t<max_t)||fsimilar(t,max_t,EPS_L); t+=1/30.f)
+        {
+            m_Current->_Evaluate(t, T, r);
             path_points.push_back(T);
-        }
+    }
 
-        EDevice.SetShader		(EDevice.m_WireShader);
-        RCache.set_xform_world	(Fidentity);
+        EDevice.SetShader(EDevice.m_WireShader);
+        RCache.set_xform_world(Fidentity);
         if (!path_points.empty())
-        	DU_impl.DrawPrimitiveL		(D3DPT_LINESTRIP,path_points.size()-1,path_points.begin(),path_points.size(),clr,true,false);
-        CEnvelope* E 			= m_Current->Envelope	();
-        for (KeyIt k_it=E->keys.begin(); k_it!=E->keys.end(); k_it++){
-            m_Current->_Evaluate((*k_it)->time,T,r);
-            if (EDevice.m_Camera.GetPosition().distance_to_sqr(T)<50.f*50.f){
-                DU_impl.DrawCross	(T,0.1f,0.1f,0.1f, 0.1f,0.1f,0.1f, clr,false);
-                DU_impl.OutText		(T,AnsiString().sprintf("K: %3.3f",(*k_it)->time).c_str(),0xffffffff,0x00000000);
+            DU_impl.DrawPrimitiveL(D3DPT_LINESTRIP, path_points.size() - 1, path_points.begin(), path_points.size(), clr, true, false);
+        CEnvelope* E = m_Current->Envelope();
+        for (KeyIt k_it = E->keys.begin(); k_it != E->keys.end(); k_it++)
+        {
+            m_Current->_Evaluate((*k_it)->time, T, r);
+            if (EDevice.m_Camera.GetPosition().distance_to_sqr(T) < 50.f*50.f)
+            {
+                DU_impl.DrawCross(T, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, clr, false);
+                DU_impl.OutText(T, AnsiString().sprintf("K: %3.3f", (*k_it)->time).c_str(), 0xffffffff, 0x00000000);
             }
         }
-    }
+}
 }
 #endif
diff --git a/src/xrEngine/ObjectAnimator.h b/src/xrEngine/ObjectAnimator.h
index 30cff774267..806c81ce7e6 100644
--- a/src/xrEngine/ObjectAnimator.h
+++ b/src/xrEngine/ObjectAnimator.h
@@ -8,40 +8,40 @@
 class ENGINE_API CObjectAnimator
 {
 private:
-	DEFINE_VECTOR		(COMotion*,MotionVec,MotionIt);
+    DEFINE_VECTOR(COMotion*, MotionVec, MotionIt);
 protected:
-	bool				bLoop;
-
-    shared_str			m_Name;
-    
-	Fmatrix				m_XFORM;
-    SAnimParams			m_MParam;
-	MotionVec			m_Motions;
-    float				m_Speed;
-
-    COMotion*			m_Current;
-	void				LoadMotions		(LPCSTR fname);
-	void				SetActiveMotion	(COMotion* mot);
-	COMotion*			FindMotionByName(LPCSTR name);
+    bool bLoop;
+
+    shared_str m_Name;
+
+    Fmatrix m_XFORM;
+    SAnimParams m_MParam;
+    MotionVec m_Motions;
+    float m_Speed;
+
+    COMotion* m_Current;
+    void LoadMotions(LPCSTR fname);
+    void SetActiveMotion(COMotion* mot);
+    COMotion* FindMotionByName(LPCSTR name);
 public:
-						CObjectAnimator	();
-	virtual				~CObjectAnimator();
-
-	void				Clear			();
-	void				Load			(LPCSTR name);
-    IC LPCSTR			Name			(){return *m_Name;}
-    float&				Speed			(){return m_Speed;}
-
-	COMotion*			Play			(bool bLoop, LPCSTR name=0);
-	void				Pause			(bool val){return m_MParam.Pause(val);}
-	void				Stop			();
-	IC BOOL				IsPlaying		(){return m_MParam.bPlay;}
-
-    IC const Fmatrix&	XFORM			(){return m_XFORM;}
-	float				GetLength		();
-	// Update
-	void				Update			(float dt);
-    void				DrawPath		();
+    CObjectAnimator();
+    virtual ~CObjectAnimator();
+
+    void Clear();
+    void Load(LPCSTR name);
+    IC LPCSTR Name() { return *m_Name; }
+    float& Speed() { return m_Speed; }
+
+    COMotion* Play(bool bLoop, LPCSTR name = 0);
+    void Pause(bool val) { return m_MParam.Pause(val); }
+    void Stop();
+    IC BOOL IsPlaying() { return m_MParam.bPlay; }
+
+    IC const Fmatrix& XFORM() { return m_XFORM; }
+    float GetLength();
+    // Update
+    void Update(float dt);
+    void DrawPath();
 };
 
 #endif //ObjectAnimatorH
diff --git a/src/xrEngine/ObjectDump.cpp b/src/xrEngine/ObjectDump.cpp
index c72b7345afe..87f018dac5c 100644
--- a/src/xrEngine/ObjectDump.cpp
+++ b/src/xrEngine/ObjectDump.cpp
@@ -3,89 +3,90 @@
 #ifdef DEBUG
 #include "ObjectDump.h"
 
-ENGINE_API std::string dbg_object_base_dump_string( const CObject *obj )
+ENGINE_API std::string dbg_object_base_dump_string(const CObject* obj)
 {
-	if( !obj )
-		return make_string("object: NULL ptr");
-	return make_string( "object name: %s, section name: %s, visual name: %s \n",
-		                 obj->cName().c_str(), 
-						 obj->cNameSect().c_str(), 
-						 obj->Visual() ? obj->cNameVisual().c_str() : "none" );
+    if (!obj)
+        return make_string("object: NULL ptr");
+    return make_string("object name: %s, section name: %s, visual name: %s \n",
+        obj->cName().c_str(),
+        obj->cNameSect().c_str(),
+        obj->Visual() ? obj->cNameVisual().c_str() : "none");
 }
 
-ENGINE_API std::string dbg_object_poses_dump_string( const CObject *obj )
+ENGINE_API std::string dbg_object_poses_dump_string(const CObject* obj)
 {
-	if(!obj)
-		return std::string("");
-	
-	u32 ps_size = obj->ps_Size();
-	std::string buf("");
-	for (u32 i = 0; i < ps_size; ++i )
-	{
-		const CObject::SavedPosition &svp = obj->ps_Element( i );
-		buf +=( make_string(" \n %d, time: %d pos: %s  ", i, svp.dwTime, get_string(svp.vPosition).c_str() ) );
-	}
+    if (!obj)
+        return std::string("");
 
-	return make_string( "\n XFORM: %s \n position stack : %s \n,  ", get_string(obj->XFORM()).c_str(), buf.c_str() );
+    u32 ps_size = obj->ps_Size();
+    std::string buf("");
+    for (u32 i = 0; i < ps_size; ++i)
+    {
+        const CObject::SavedPosition& svp = obj->ps_Element(i);
+        buf += (make_string(" \n %d, time: %d pos: %s ", i, svp.dwTime, get_string(svp.vPosition).c_str()));
+    }
+
+    return make_string("\n XFORM: %s \n position stack : %s \n, ", get_string(obj->XFORM()).c_str(), buf.c_str());
 }
 
-ENGINE_API std::string dbg_object_visual_geom_dump_string( const CObject *obj )
+ENGINE_API std::string dbg_object_visual_geom_dump_string(const CObject* obj)
 {
-	if( !obj || !obj->Visual() )
-			return std::string("");
-	const Fbox &box = obj->BoundingBox();
-	Fvector c;obj->Center( c );
+    if (!obj || !obj->Visual())
+        return std::string("");
+    const Fbox& box = obj->BoundingBox();
+    Fvector c;
+    obj->Center(c);
 
-	return make_string( "\n visual box: %s \n visual center: %s \n visual radius: %f ", 
-		get_string(box).c_str(), get_string( c ).c_str(), obj->Radius() );
+    return make_string("\n visual box: %s \n visual center: %s \n visual radius: %f ",
+        get_string(box).c_str(), get_string(c).c_str(), obj->Radius());
 }
 
 /*
-		struct 
-		{
-			u32	net_ID			:	16;
-			u32	bActiveCounter	:	8;
-			u32	bEnabled		:	1;
-			u32	bVisible		:	1;
-			u32	bDestroy		:	1;
-			u32	net_Local		:	1;
-			u32	net_Ready		:	1;
-			u32 net_SV_Update	:	1;
-			u32 crow			:	1;
-			u32	bPreDestroy		:	1;
-		};
-			u32									dbg_update_cl;
-#endif
-	u32									dwFrame_UpdateCL;
-	u32									dwFrame_AsCrow;
-*/
-ENGINE_API std::string dbg_object_props_dump_string( const CObject *obj )
+ struct
+ {
+ u32 net_ID : 16;
+ u32 bActiveCounter : 8;
+ u32 bEnabled : 1;
+ u32 bVisible : 1;
+ u32 bDestroy : 1;
+ u32 net_Local : 1;
+ u32 net_Ready : 1;
+ u32 net_SV_Update : 1;
+ u32 crow : 1;
+ u32 bPreDestroy : 1;
+ };
+ u32 dbg_update_cl;
+ #endif
+ u32 dwFrame_UpdateCL;
+ u32 dwFrame_AsCrow;
+ */
+ENGINE_API std::string dbg_object_props_dump_string(const CObject* obj)
 {
-	if( !obj )
-		return  std::string("");
-	CObject::ObjectProperties props;
-	obj->DBGGetProps( props );
+    if (!obj)
+        return std::string("");
+    CObject::ObjectProperties props;
+    obj->DBGGetProps(props);
 
-	return make_string( " net_ID :%d, bActiveCounter :%d, bEnabled :%s, bVisible :%s, bDestroy :%s, \n net_Local %s, net_Ready :%s, net_SV_Update :%s, crow :%s, bPreDestroy : %s ", 
-		props.net_ID, props.bActiveCounter, get_string(bool (!!props.bEnabled ) ).c_str(), get_string(bool (!!props.bVisible ) ).c_str(), 
-		get_string(bool (!!props.bDestroy ) ).c_str() , get_string(bool (!!props.net_Local ) ).c_str(), get_string( bool (!!props.net_Ready ) ).c_str(),
-		get_string(bool (!!props.net_SV_Update ) ).c_str(), get_string( bool (!!props.crow ) ).c_str(), get_string( bool (!!props.bPreDestroy ) ).c_str() 
-		)
-		+
-		make_string( "\n dbg_update_cl: %d, dwFrame_UpdateCL: %d, dwFrame_AsCrow :%d, Device.dwFrame :%d, Device.dwTimeGlobal: %d  \n",
-		obj->dbg_update_cl, obj->dwFrame_UpdateCL, obj->dwFrame_AsCrow, Device.dwFrame, Device.dwTimeGlobal );
+    return make_string(" net_ID :%d, bActiveCounter :%d, bEnabled :%s, bVisible :%s, bDestroy :%s, \n net_Local %s, net_Ready :%s, net_SV_Update :%s, crow :%s, bPreDestroy : %s ",
+        props.net_ID, props.bActiveCounter, get_string(bool(!!props.bEnabled)).c_str(), get_string(bool(!!props.bVisible)).c_str(),
+        get_string(bool(!!props.bDestroy)).c_str(), get_string(bool(!!props.net_Local)).c_str(), get_string(bool(!!props.net_Ready)).c_str(),
+        get_string(bool(!!props.net_SV_Update)).c_str(), get_string(bool(!!props.crow)).c_str(), get_string(bool(!!props.bPreDestroy)).c_str()
+        )
+        +
+        make_string("\n dbg_update_cl: %d, dwFrame_UpdateCL: %d, dwFrame_AsCrow :%d, Device.dwFrame :%d, Device.dwTimeGlobal: %d \n",
+        obj->dbg_update_cl, obj->dwFrame_UpdateCL, obj->dwFrame_AsCrow, Device.dwFrame, Device.dwTimeGlobal);
 }
-ENGINE_API std::string dbg_object_full_dump_string( const CObject *obj )
+ENGINE_API std::string dbg_object_full_dump_string(const CObject* obj)
 {
-	return	dbg_object_base_dump_string( obj ) + 
-			dbg_object_props_dump_string( obj )+
-			dbg_object_poses_dump_string( obj ) +
-			dbg_object_visual_geom_dump_string( obj );
-			 
+    return dbg_object_base_dump_string(obj) +
+        dbg_object_props_dump_string(obj) +
+        dbg_object_poses_dump_string(obj) +
+        dbg_object_visual_geom_dump_string(obj);
+
 }
-ENGINE_API std::string dbg_object_full_capped_dump_string( const CObject *obj )
+ENGINE_API std::string dbg_object_full_capped_dump_string(const CObject* obj)
 {
-	return	std::string("\n object dump: \n" ) +
-			dbg_object_full_dump_string( obj );
+    return std::string("\n object dump: \n") +
+        dbg_object_full_dump_string(obj);
 }
 #endif
diff --git a/src/xrEngine/ObjectDump.h b/src/xrEngine/ObjectDump.h
index c4c40644545..e9f7bfdfa0b 100644
--- a/src/xrEngine/ObjectDump.h
+++ b/src/xrEngine/ObjectDump.h
@@ -1,10 +1,10 @@
 #pragma once
 #ifdef DEBUG
 
-ENGINE_API std::string dbg_object_base_dump_string( const CObject *obj );
-ENGINE_API std::string dbg_object_poses_dump_string( const CObject *obj );
-ENGINE_API std::string dbg_object_visual_geom_dump_string( const CObject *obj );
-ENGINE_API std::string dbg_object_props_dump_string( const CObject *obj );
-ENGINE_API std::string dbg_object_full_dump_string( const CObject *obj );
-ENGINE_API std::string dbg_object_full_capped_dump_string( const CObject *obj );
+ENGINE_API std::string dbg_object_base_dump_string(const CObject* obj);
+ENGINE_API std::string dbg_object_poses_dump_string(const CObject* obj);
+ENGINE_API std::string dbg_object_visual_geom_dump_string(const CObject* obj);
+ENGINE_API std::string dbg_object_props_dump_string(const CObject* obj);
+ENGINE_API std::string dbg_object_full_dump_string(const CObject* obj);
+ENGINE_API std::string dbg_object_full_capped_dump_string(const CObject* obj);
 #endif
\ No newline at end of file
diff --git a/src/xrEngine/PS_instance.cpp b/src/xrEngine/PS_instance.cpp
index a66d3a3c350..5b6dc03fa41 100644
--- a/src/xrEngine/PS_instance.cpp
+++ b/src/xrEngine/PS_instance.cpp
@@ -7,58 +7,58 @@
 #include "ps_instance.h"
 #include "IGame_Persistent.h"
 
-CPS_Instance::CPS_Instance			(bool destroy_on_game_load)	:
-	ISpatial				(g_SpatialSpace),
-	m_destroy_on_game_load	(destroy_on_game_load)
+CPS_Instance::CPS_Instance(bool destroy_on_game_load) :
+    ISpatial(g_SpatialSpace),
+    m_destroy_on_game_load(destroy_on_game_load)
 {
-	g_pGamePersistent->ps_active.insert		(this);
-	renderable.pROS_Allowed					= FALSE;
+    g_pGamePersistent->ps_active.insert(this);
+    renderable.pROS_Allowed = FALSE;
 
-	m_iLifeTime								= int_max;
-	m_bAutoRemove							= TRUE;
-	m_bDead									= FALSE;
+    m_iLifeTime = int_max;
+    m_bAutoRemove = TRUE;
+    m_bDead = FALSE;
 }
-extern ENGINE_API BOOL						g_bRendering; 
+extern ENGINE_API BOOL g_bRendering;
 
 //----------------------------------------------------
-CPS_Instance::~CPS_Instance					()
+CPS_Instance::~CPS_Instance()
 {
-	VERIFY									(!g_bRendering);
-	xr_set<CPS_Instance*>::iterator it		= g_pGamePersistent->ps_active.find(this);
-	VERIFY									(it!=g_pGamePersistent->ps_active.end());
-	g_pGamePersistent->ps_active.erase		(it);
+    VERIFY(!g_bRendering);
+    xr_set<CPS_Instance*>::iterator it = g_pGamePersistent->ps_active.find(this);
+    VERIFY(it != g_pGamePersistent->ps_active.end());
+    g_pGamePersistent->ps_active.erase(it);
 
-	xr_vector<CPS_Instance*>::iterator it2	= std::find( g_pGamePersistent->ps_destroy.begin(),
-													g_pGamePersistent->ps_destroy.end(), this);
+    xr_vector<CPS_Instance*>::iterator it2 = std::find(g_pGamePersistent->ps_destroy.begin(),
+            g_pGamePersistent->ps_destroy.end(), this);
 
-	VERIFY									(it2==g_pGamePersistent->ps_destroy.end());
+    VERIFY(it2 == g_pGamePersistent->ps_destroy.end());
 
-	spatial_unregister						();
-	shedule_unregister						();
+    spatial_unregister();
+    shedule_unregister();
 }
 //----------------------------------------------------
-void CPS_Instance::shedule_Update	(u32 dt)
+void CPS_Instance::shedule_Update(u32 dt)
 {
-	if (renderable.pROS)			::Render->ros_destroy	(renderable.pROS);	//. particles doesn't need ROS
+    if (renderable.pROS) ::Render->ros_destroy(renderable.pROS); //. particles doesn't need ROS
 
-	ISheduled::shedule_Update		(dt);
-	m_iLifeTime						-= dt;
+    ISheduled::shedule_Update(dt);
+    m_iLifeTime -= dt;
 
-	// remove???
-	if (m_bDead)					return;
-	if (m_bAutoRemove && m_iLifeTime<=0)
-		PSI_destroy					();
+    // remove???
+    if (m_bDead) return;
+    if (m_bAutoRemove && m_iLifeTime <= 0)
+        PSI_destroy();
 }
 //----------------------------------------------------
-void CPS_Instance::PSI_destroy		()
+void CPS_Instance::PSI_destroy()
 {
-	m_bDead								= TRUE;
-	m_iLifeTime							= 0;
-	g_pGamePersistent->ps_destroy.push_back	(this);
+    m_bDead = TRUE;
+    m_iLifeTime = 0;
+    g_pGamePersistent->ps_destroy.push_back(this);
 }
 //----------------------------------------------------
-void CPS_Instance::PSI_internal_delete		()
+void CPS_Instance::PSI_internal_delete()
 {
-	CPS_Instance*	self = this;
-	xr_delete		(self);
+    CPS_Instance* self = this;
+    xr_delete(self);
 }
diff --git a/src/xrEngine/PS_instance.h b/src/xrEngine/PS_instance.h
index bc8521e7381..f0736b55882 100644
--- a/src/xrEngine/PS_instance.h
+++ b/src/xrEngine/PS_instance.h
@@ -5,44 +5,44 @@
 #include "isheduled.h"
 #include "irenderable.h"
 
-class ENGINE_API CPS_Instance	:
-	public ISpatial,
-	public ISheduled,
-	public IRenderable
+class ENGINE_API CPS_Instance :
+    public ISpatial,
+    public ISheduled,
+    public IRenderable
 {
-	friend class			IGame_Persistent;
+    friend class IGame_Persistent;
 
-	template <bool _is_pm, typename T>
-	friend struct xr_special_free;
+    template <bool _is_pm, typename T>
+    friend struct xr_special_free;
 
 private:
-	bool					m_destroy_on_game_load;
+    bool m_destroy_on_game_load;
 
 protected:
-	int						m_iLifeTime			;
-	BOOL					m_bAutoRemove		;
-	BOOL					m_bDead				;
+    int m_iLifeTime;
+    BOOL m_bAutoRemove;
+    BOOL m_bDead;
 
 protected:
-	virtual					~CPS_Instance		();
-	virtual void			PSI_internal_delete	();
+    virtual ~CPS_Instance();
+    virtual void PSI_internal_delete();
 
 public:
-							CPS_Instance		(bool destroy_on_game_load);
+    CPS_Instance(bool destroy_on_game_load);
 
-	IC		const bool		&destroy_on_game_load() const				{	return m_destroy_on_game_load;	}
-	virtual void			PSI_destroy			();
-	IC BOOL					PSI_alive			()						{	return m_iLifeTime>0;				}
-	IC BOOL					PSI_IsAutomatic		()						{	return m_bAutoRemove;				}
-	IC void					PSI_SetLifeTime		(float life_time)		{	m_iLifeTime=iFloor(life_time*1000);	}
+    IC const bool& destroy_on_game_load() const { return m_destroy_on_game_load; }
+    virtual void PSI_destroy();
+    IC BOOL PSI_alive() { return m_iLifeTime > 0; }
+    IC BOOL PSI_IsAutomatic() { return m_bAutoRemove; }
+    IC void PSI_SetLifeTime(float life_time) { m_iLifeTime = iFloor(life_time * 1000); }
 
-	virtual void			Play				(bool bHudMode)	= 0;
-	virtual BOOL			Locked				()				{ return FALSE; }
+    virtual void Play(bool bHudMode) = 0;
+    virtual BOOL Locked() { return FALSE; }
 
-	virtual	shared_str		shedule_Name		() const		{ return shared_str("particle_instance"); };
+    virtual shared_str shedule_Name() const { return shared_str("particle_instance"); };
 
-	virtual void			shedule_Update		(u32 dt);
-	virtual	IRenderable*	dcast_Renderable	()				{ return this;	}
+    virtual void shedule_Update(u32 dt);
+    virtual IRenderable* dcast_Renderable() { return this; }
 };
 
 #endif
diff --git a/src/xrEngine/Properties.h b/src/xrEngine/Properties.h
index c1f3182f5a4..9f1272bf8b6 100644
--- a/src/xrEngine/Properties.h
+++ b/src/xrEngine/Properties.h
@@ -7,79 +7,80 @@
 // Parameter/Property specifications
 
 // *** FORMAT ***
-// u32	type
-// stringZ	name
-// []		data
+// u32 type
+// stringZ name
+// [] data
 
-enum	xrProperties
+enum xrProperties
 {
-	xrPID_MARKER	= 0,
-	xrPID_MATRIX,		// really only name(stringZ) is written into stream
-	xrPID_CONSTANT,		// really only name(stringZ) is written into stream
-	xrPID_TEXTURE,		// really only name(stringZ) is written into stream
-	xrPID_INTEGER,
-	xrPID_FLOAT,
-	xrPID_BOOL,
-	xrPID_TOKEN,
-	xrPID_CLSID,
-	xrPID_OBJECT,		// really only name(stringZ) is written into stream
-	xrPID_STRING,		// really only name(stringZ) is written into stream
-	xrPID_MARKER_TEMPLATE,
-	xrPID_FORCEDWORD=u32(-1)
+    xrPID_MARKER = 0,
+    xrPID_MATRIX, // really only name(stringZ) is written into stream
+    xrPID_CONSTANT, // really only name(stringZ) is written into stream
+    xrPID_TEXTURE, // really only name(stringZ) is written into stream
+    xrPID_INTEGER,
+    xrPID_FLOAT,
+    xrPID_BOOL,
+    xrPID_TOKEN,
+    xrPID_CLSID,
+    xrPID_OBJECT, // really only name(stringZ) is written into stream
+    xrPID_STRING, // really only name(stringZ) is written into stream
+    xrPID_MARKER_TEMPLATE,
+    xrPID_FORCEDWORD = u32(-1)
 };
 
-struct	xrP_Integer
+struct xrP_Integer
 {
-	int					value;
-	int					min;
-	int					max;
+    int value;
+    int min;
+    int max;
 
-	xrP_Integer() : value(0), min(0), max(255)	{}
+    xrP_Integer() : value(0), min(0), max(255) {}
 };
 
-struct	xrP_Float
+struct xrP_Float
 {
-	float				value;
-	float				min;
-	float				max;
+    float value;
+    float min;
+    float max;
 
-	xrP_Float()	: value(0), min(0), max(1)		{}
+    xrP_Float() : value(0), min(0), max(1) {}
 };
 
-struct	xrP_BOOL
+struct xrP_BOOL
 {
-	BOOL				value;
-	xrP_BOOL() : value(FALSE)					{}
+    BOOL value;
+    xrP_BOOL() : value(FALSE) {}
 };
 
-struct	xrP_TOKEN
+struct xrP_TOKEN
 {
-	struct Item {
-		u32			ID;
-		string64	str;
-	};
+    struct Item
+    {
+        u32 ID;
+        string64 str;
+    };
 
-	u32				IDselected;
-	u32				Count;
+    u32 IDselected;
+    u32 Count;
 
-	//--- elements:		(ID,string64)
+    //--- elements: (ID,string64)
 
-	xrP_TOKEN()	: IDselected(0), Count(0)		{}
+    xrP_TOKEN() : IDselected(0), Count(0) {}
 };
 
-struct	xrP_CLSID
+struct xrP_CLSID
 {
-	CLASS_ID			Selected;
-	u32				Count;
-	//--- elements:		(...)
+    CLASS_ID Selected;
+    u32 Count;
+    //--- elements: (...)
 
-	xrP_CLSID()	: Selected(0), Count(0)			{}
+    xrP_CLSID() : Selected(0), Count(0) {}
 };
 
-struct	xrP_Template
+struct xrP_Template
 {
-	u32				Type;
-	u32				Limit;
+    u32 Type;
+    u32 Limit;
 };
 
 // Base class
@@ -88,67 +89,67 @@ class CPropertyBase
 protected:
 
 public:
-	virtual 	LPCSTR		getName			()								= 0;
-	virtual		LPCSTR		getComment		()								= 0;
+    virtual LPCSTR getName() = 0;
+    virtual LPCSTR getComment() = 0;
 
-	virtual		void		Save			(IWriter&	fs)					= 0;
-	virtual		void		Load			(IReader&	fs, u16 version)	= 0;
+    virtual void Save(IWriter& fs) = 0;
+    virtual void Load(IReader& fs, u16 version) = 0;
 };
 
 // Writers
-IC void		xrPWRITE		(IWriter& fs, u32 ID, LPCSTR name, LPCVOID data, u32 size )
+IC void xrPWRITE(IWriter& fs, u32 ID, LPCSTR name, LPCVOID data, u32 size)
 {
-	fs.w_u32			(ID);
-	fs.w_stringZ		(name);
-	if (data && size)	fs.w(data,size);
+    fs.w_u32(ID);
+    fs.w_stringZ(name);
+    if (data && size) fs.w(data, size);
 }
-IC void		xrPWRITE_MARKER	(IWriter& fs, LPCSTR name)
+IC void xrPWRITE_MARKER(IWriter& fs, LPCSTR name)
 {
-	xrPWRITE	(fs,xrPID_MARKER,name,0,0);
+    xrPWRITE(fs, xrPID_MARKER, name, 0, 0);
 }
 
 #define xrPWRITE_PROP(FS,name,ID,data)\
 {\
-	xrPWRITE	(fs,ID,name,&data,sizeof(data));\
+ xrPWRITE (fs,ID,name,&data,sizeof(data));\
 }
 
 // Readers
-IC u32	xrPREAD			(IReader& fs)
+IC u32 xrPREAD(IReader& fs)
 {
-	u32 T		= fs.r_u32();
-	fs.skip_stringZ	();
-	return		T;
+    u32 T = fs.r_u32();
+    fs.skip_stringZ();
+    return T;
 }
-IC void		xrPREAD_MARKER	(IReader& fs)
+IC void xrPREAD_MARKER(IReader& fs)
 {
-	R_ASSERT(xrPID_MARKER==xrPREAD(fs));
+    R_ASSERT(xrPID_MARKER == xrPREAD(fs));
 }
 
 #define xrPREAD_PROP(fs,ID,data) \
 { \
-	R_ASSERT(ID==xrPREAD(fs)); fs.r(&data,sizeof(data)); \
-	switch (ID) \
-	{ \
-	case xrPID_TOKEN:	fs.advance(((xrP_TOKEN*)&data)->Count * sizeof(xrP_TOKEN::Item));	break; \
-	case xrPID_CLSID:	fs.advance(((xrP_CLSID*)&data)->Count * sizeof(CLASS_ID));			break; \
-	}; \
+ R_ASSERT(ID==xrPREAD(fs)); fs.r(&data,sizeof(data)); \
+ switch (ID) \
+ { \
+ case xrPID_TOKEN: fs.advance(((xrP_TOKEN*)&data)->Count * sizeof(xrP_TOKEN::Item)); break; \
+ case xrPID_CLSID: fs.advance(((xrP_CLSID*)&data)->Count * sizeof(CLASS_ID)); break; \
+ }; \
 }
 
 //template <class T>
-//IC void		xrPWRITE_PROP	(IWriter& FS, LPCSTR name, u32 ID, T& data)
+//IC void xrPWRITE_PROP (IWriter& FS, LPCSTR name, u32 ID, T& data)
 //{
-//	xrPWRITE	(FS,ID,name,&data,sizeof(data));
+// xrPWRITE (FS,ID,name,&data,sizeof(data));
 //}
 
 //template <class T>
-//IC void		xrPREAD_PROP	(IReader& FS, u32 ID, T& data)
+//IC void xrPREAD_PROP (IReader& FS, u32 ID, T& data)
 //{
-//	R_ASSERT(ID==xrPREAD(FS)); FS.Read(&data,sizeof(data));
-//	switch (ID)
-//	{
-//	case xrPID_TOKEN:	FS.Advance(((xrP_TOKEN*)&data)->Count * sizeof(xrP_TOKEN::Item));	break;
-//	case xrPID_CLSID:	FS.Advance(((xrP_CLSID*)&data)->Count * sizeof(CLASS_ID));			break;
-//	};
+// R_ASSERT(ID==xrPREAD(FS)); FS.Read(&data,sizeof(data));
+// switch (ID)
+// {
+// case xrPID_TOKEN: FS.Advance(((xrP_TOKEN*)&data)->Count * sizeof(xrP_TOKEN::Item)); break;
+// case xrPID_CLSID: FS.Advance(((xrP_CLSID*)&data)->Count * sizeof(CLASS_ID)); break;
+// };
 //}
 #pragma pack(pop)
 #endif // xrPROPERTIES_H
diff --git a/src/xrEngine/Rain.cpp b/src/xrEngine/Rain.cpp
index 1a1bed47053..55d7b6daeb9 100644
--- a/src/xrEngine/Rain.cpp
+++ b/src/xrEngine/Rain.cpp
@@ -6,481 +6,489 @@
 #include "environment.h"
 
 #ifdef _EDITOR
-    #include "ui_toolscustom.h"
+#include "ui_toolscustom.h"
 #else
-    #include "render.h"
-	#include "igame_level.h"
-	#include "../xrcdb/xr_area.h"
-	#include "xr_object.h"
+#include "render.h"
+#include "igame_level.h"
+#include "../xrcdb/xr_area.h"
+#include "xr_object.h"
 #endif
 
-//	Warning: duplicated in dxRainRender
-static const int	max_desired_items	= 2500;
-static const float	source_radius		= 12.5f;
-static const float	source_offset		= 40.f;
-static const float	max_distance		= source_offset*1.25f;
-static const float	sink_offset			= -(max_distance-source_offset);
-static const float	drop_length			= 5.f;
-static const float	drop_width			= 0.30f;
-static const float	drop_angle			= 3.0f;
-static const float	drop_max_angle		= deg2rad(10.f);
-static const float	drop_max_wind_vel	= 20.0f;
-static const float	drop_speed_min		= 40.f;
-static const float	drop_speed_max		= 80.f;
-
-const int	max_particles		= 1000;
-const int	particles_cache		= 400;
-const float particles_time		= .3f;
- 
+// Warning: duplicated in dxRainRender
+static const int max_desired_items = 2500;
+static const float source_radius = 12.5f;
+static const float source_offset = 40.f;
+static const float max_distance = source_offset*1.25f;
+static const float sink_offset = -(max_distance - source_offset);
+static const float drop_length = 5.f;
+static const float drop_width = 0.30f;
+static const float drop_angle = 3.0f;
+static const float drop_max_angle = deg2rad(10.f);
+static const float drop_max_wind_vel = 20.0f;
+static const float drop_speed_min = 40.f;
+static const float drop_speed_max = 80.f;
+
+const int max_particles = 1000;
+const int particles_cache = 400;
+const float particles_time = .3f;
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
 CEffect_Rain::CEffect_Rain()
 {
-	state							= stIdle;
-	
-	snd_Ambient.create				("ambient\\rain",st_Effect,sg_Undefined);
-
-	//	Moced to p_Render constructor
-	/*
-	IReader*	F					= FS.r_open("$game_meshes$","dm\\rain.dm"); 
-	VERIFY3							(F,"Can't open file.","dm\\rain.dm");
-	DM_Drop							= ::Render->model_CreateDM		(F);
-
-	//
-	SH_Rain.create					("effects\\rain","fx\\fx_rain");
-	hGeom_Rain.create				(FVF::F_LIT, RCache.Vertex.Buffer(), RCache.QuadIB);
-	hGeom_Drops.create				(D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1, RCache.Vertex.Buffer(), RCache.Index.Buffer());
-	*/
-	p_create						();
-	//FS.r_close						(F);
+    state = stIdle;
+
+    snd_Ambient.create("ambient\\rain", st_Effect, sg_Undefined);
+
+    // Moced to p_Render constructor
+    /*
+    IReader* F = FS.r_open("$game_meshes$","dm\\rain.dm");
+    VERIFY3 (F,"Can't open file.","dm\\rain.dm");
+    DM_Drop = ::Render->model_CreateDM (F);
+
+    //
+    SH_Rain.create ("effects\\rain","fx\\fx_rain");
+    hGeom_Rain.create (FVF::F_LIT, RCache.Vertex.Buffer(), RCache.QuadIB);
+    hGeom_Drops.create (D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1, RCache.Vertex.Buffer(), RCache.Index.Buffer());
+    */
+    p_create();
+    //FS.r_close (F);
 }
 
 CEffect_Rain::~CEffect_Rain()
 {
-	snd_Ambient.destroy				();
+    snd_Ambient.destroy();
 
-	// Cleanup
-	p_destroy						();
-	//	Moved to p_Render destructor
-	//::Render->model_Delete			(DM_Drop);
+    // Cleanup
+    p_destroy();
+    // Moved to p_Render destructor
+    //::Render->model_Delete (DM_Drop);
 }
 
 // Born
-void	CEffect_Rain::Born		(Item& dest, float radius)
+void CEffect_Rain::Born(Item& dest, float radius)
 {
-	Fvector		axis;	
-    axis.set			(0,-1,0);
-	float gust			= g_pGamePersistent->Environment().wind_strength_factor/10.f;
-	float k				= g_pGamePersistent->Environment().CurrentEnv->wind_velocity*gust/drop_max_wind_vel;
-	clamp				(k,0.f,1.f);
-	float	pitch		= drop_max_angle*k-PI_DIV_2;
-    axis.setHP			(g_pGamePersistent->Environment().CurrentEnv->wind_direction,pitch);
-    
-	Fvector&	view	= Device.vCameraPosition;
-	float		angle	= ::Random.randF	(0,PI_MUL_2);
-	float		dist	= ::Random.randF	(); dist = _sqrt(dist)*radius; 
-	float		x		= dist*_cos		(angle);
-	float		z		= dist*_sin		(angle);
-	dest.D.random_dir	(axis,deg2rad(drop_angle));
-	dest.P.set			(x+view.x-dest.D.x*source_offset,source_offset+view.y,z+view.z-dest.D.z*source_offset);
-//	dest.P.set			(x+view.x,height+view.y,z+view.z);
-	dest.fSpeed			= ::Random.randF	(drop_speed_min,drop_speed_max);
-
-	float height		= max_distance;
-	RenewItem			(dest,height,RayPick(dest.P,dest.D,height,collide::rqtBoth));
+    Fvector axis;
+    axis.set(0, -1, 0);
+    float gust = g_pGamePersistent->Environment().wind_strength_factor / 10.f;
+    float k = g_pGamePersistent->Environment().CurrentEnv->wind_velocity*gust / drop_max_wind_vel;
+    clamp(k, 0.f, 1.f);
+    float pitch = drop_max_angle*k - PI_DIV_2;
+    axis.setHP(g_pGamePersistent->Environment().CurrentEnv->wind_direction, pitch);
+
+    Fvector& view = Device.vCameraPosition;
+    float angle = ::Random.randF(0, PI_MUL_2);
+    float dist = ::Random.randF();
+    dist = _sqrt(dist)*radius;
+    float x = dist*_cos(angle);
+    float z = dist*_sin(angle);
+    dest.D.random_dir(axis, deg2rad(drop_angle));
+    dest.P.set(x + view.x - dest.D.x*source_offset, source_offset + view.y, z + view.z - dest.D.z*source_offset);
+    // dest.P.set (x+view.x,height+view.y,z+view.z);
+    dest.fSpeed = ::Random.randF(drop_speed_min, drop_speed_max);
+
+    float height = max_distance;
+    RenewItem(dest, height, RayPick(dest.P, dest.D, height, collide::rqtBoth));
 }
 
 BOOL CEffect_Rain::RayPick(const Fvector& s, const Fvector& d, float& range, collide::rq_target tgt)
 {
-	BOOL bRes 			= TRUE;
+    BOOL bRes = TRUE;
 #ifdef _EDITOR
-    Tools->RayPick		(s,d,range);
+    Tools->RayPick (s,d,range);
 #else
-	collide::rq_result	RQ;
-	CObject* E 			= g_pGameLevel->CurrentViewEntity();
-	bRes 				= g_pGameLevel->ObjectSpace.RayPick( s,d,range,tgt,RQ,E);	
-    if (bRes) range 	= RQ.range;
+    collide::rq_result RQ;
+    CObject* E = g_pGameLevel->CurrentViewEntity();
+    bRes = g_pGameLevel->ObjectSpace.RayPick(s, d, range, tgt, RQ, E);
+    if (bRes) range = RQ.range;
 #endif
     return bRes;
 }
 
 void CEffect_Rain::RenewItem(Item& dest, float height, BOOL bHit)
 {
-	dest.uv_set			= Random.randI(2);
-    if (bHit){
-		dest.dwTime_Life= Device.dwTimeGlobal + iFloor(1000.f*height/dest.fSpeed) - Device.dwTimeDelta;
-		dest.dwTime_Hit	= Device.dwTimeGlobal + iFloor(1000.f*height/dest.fSpeed) - Device.dwTimeDelta;
-		dest.Phit.mad	(dest.P,dest.D,height);
-	}else{
-		dest.dwTime_Life= Device.dwTimeGlobal + iFloor(1000.f*height/dest.fSpeed) - Device.dwTimeDelta;
-		dest.dwTime_Hit	= Device.dwTimeGlobal + iFloor(2*1000.f*height/dest.fSpeed)-Device.dwTimeDelta;
-		dest.Phit.set	(dest.P);
-	}
+    dest.uv_set = Random.randI(2);
+    if (bHit)
+    {
+        dest.dwTime_Life = Device.dwTimeGlobal + iFloor(1000.f*height / dest.fSpeed) - Device.dwTimeDelta;
+        dest.dwTime_Hit = Device.dwTimeGlobal + iFloor(1000.f*height / dest.fSpeed) - Device.dwTimeDelta;
+        dest.Phit.mad(dest.P, dest.D, height);
+    }
+    else
+    {
+        dest.dwTime_Life = Device.dwTimeGlobal + iFloor(1000.f*height / dest.fSpeed) - Device.dwTimeDelta;
+        dest.dwTime_Hit = Device.dwTimeGlobal + iFloor(2 * 1000.f*height / dest.fSpeed) - Device.dwTimeDelta;
+        dest.Phit.set(dest.P);
+    }
 }
 
-void	CEffect_Rain::OnFrame	()
+void CEffect_Rain::OnFrame()
 {
 #ifndef _EDITOR
-	if (!g_pGameLevel)			return;
+    if (!g_pGameLevel) return;
 #endif
 
 #ifdef DEDICATED_SERVER
-	return;
+    return;
 #endif
 
-	// Parse states
-	float	factor				= g_pGamePersistent->Environment().CurrentEnv->rain_density;
-	static float hemi_factor	= 0.f;
+    // Parse states
+    float factor = g_pGamePersistent->Environment().CurrentEnv->rain_density;
+    static float hemi_factor = 0.f;
 #ifndef _EDITOR
-	CObject* E 					= g_pGameLevel->CurrentViewEntity();
-	if (E&&E->renderable_ROS())
-	{
-//		hemi_factor				= 1.f-2.0f*(0.3f-_min(_min(1.f,E->renderable_ROS()->get_luminocity_hemi()),0.3f));
-		float* hemi_cube		= E->renderable_ROS()->get_luminocity_hemi_cube();
-		float hemi_val			= _max(hemi_cube[0],hemi_cube[1]);
-		hemi_val				= _max(hemi_val, hemi_cube[2]);
-		hemi_val				= _max(hemi_val, hemi_cube[3]);
-		hemi_val				= _max(hemi_val, hemi_cube[5]);
-		
-//		float f					= 0.9f*hemi_factor + 0.1f*hemi_val;
-		float f					= hemi_val;
-		float t					= Device.fTimeDelta;
-		clamp					(t, 0.001f, 1.0f);
-		hemi_factor				= hemi_factor*(1.0f-t) + f*t;
-	}
+    CObject* E = g_pGameLevel->CurrentViewEntity();
+    if (E&&E->renderable_ROS())
+    {
+        // hemi_factor = 1.f-2.0f*(0.3f-_min(_min(1.f,E->renderable_ROS()->get_luminocity_hemi()),0.3f));
+        float* hemi_cube = E->renderable_ROS()->get_luminocity_hemi_cube();
+        float hemi_val = _max(hemi_cube[0], hemi_cube[1]);
+        hemi_val = _max(hemi_val, hemi_cube[2]);
+        hemi_val = _max(hemi_val, hemi_cube[3]);
+        hemi_val = _max(hemi_val, hemi_cube[5]);
+
+        // float f = 0.9f*hemi_factor + 0.1f*hemi_val;
+        float f = hemi_val;
+        float t = Device.fTimeDelta;
+        clamp(t, 0.001f, 1.0f);
+        hemi_factor = hemi_factor*(1.0f - t) + f*t;
+    }
 #endif
 
-	switch (state)
-	{
-	case stIdle:		
-		if (factor<EPS_L)		return;
-		state					= stWorking;
-		snd_Ambient.play		(0,sm_Looped);
-		snd_Ambient.set_position(Fvector().set(0,0,0));
-		snd_Ambient.set_range	(source_offset,source_offset*2.f);
-	break;
-	case stWorking:
-		if (factor<EPS_L){
-			state				= stIdle;
-			snd_Ambient.stop	();
-			return;
-		}
-		break;
-	}
-
-	// ambient sound
-	if (snd_Ambient._feedback())
-	{
-//		Fvector					sndP;
-//		sndP.mad				(Device.vCameraPosition,Fvector().set(0,1,0),source_offset);
-//		snd_Ambient.set_position(sndP);
-		snd_Ambient.set_volume	(_max(0.1f,factor) * hemi_factor );
-	}
+    switch (state)
+    {
+    case stIdle:
+        if (factor < EPS_L) return;
+        state = stWorking;
+        snd_Ambient.play(0, sm_Looped);
+        snd_Ambient.set_position(Fvector().set(0, 0, 0));
+        snd_Ambient.set_range(source_offset, source_offset*2.f);
+        break;
+    case stWorking:
+        if (factor < EPS_L)
+        {
+            state = stIdle;
+            snd_Ambient.stop();
+            return;
+        }
+        break;
+    }
+
+    // ambient sound
+    if (snd_Ambient._feedback())
+    {
+        // Fvector sndP;
+        // sndP.mad (Device.vCameraPosition,Fvector().set(0,1,0),source_offset);
+        // snd_Ambient.set_position(sndP);
+        snd_Ambient.set_volume(_max(0.1f, factor) * hemi_factor);
+    }
 }
 
 //#include "xr_input.h"
-void	CEffect_Rain::Render	()
+void CEffect_Rain::Render()
 {
 #ifndef _EDITOR
-	if (!g_pGameLevel)			return;
+    if (!g_pGameLevel) return;
 #endif
 
-	m_pRender->Render(*this);
-
-	/*
-	float	factor				= g_pGamePersistent->Environment().CurrentEnv->rain_density;
-	if (factor<EPS_L)			return;
-
-	u32 desired_items			= iFloor	(0.5f*(1.f+factor)*float(max_desired_items));
-	// visual
-	float		factor_visual	= factor/2.f+.5f;
-	Fvector3	f_rain_color	= g_pGamePersistent->Environment().CurrentEnv->rain_color;
-	u32			u_rain_color	= color_rgba_f(f_rain_color.x,f_rain_color.y,f_rain_color.z,factor_visual);
-
-	// born _new_ if needed
-	float	b_radius_wrap_sqr	= _sqr((source_radius+.5f));
-	if (items.size()<desired_items)	{
-		// items.reserve		(desired_items);
-		while (items.size()<desired_items)	{
-			Item				one;
-			Born				(one,source_radius);
-			items.push_back		(one);
-		}
-	}
-
-	// build source plane
+    m_pRender->Render(*this);
+
+    /*
+    float factor = g_pGamePersistent->Environment().CurrentEnv->rain_density;
+    if (factor<EPS_L) return;
+
+    u32 desired_items = iFloor (0.5f*(1.f+factor)*float(max_desired_items));
+    // visual
+    float factor_visual = factor/2.f+.5f;
+    Fvector3 f_rain_color = g_pGamePersistent->Environment().CurrentEnv->rain_color;
+    u32 u_rain_color = color_rgba_f(f_rain_color.x,f_rain_color.y,f_rain_color.z,factor_visual);
+
+    // born _new_ if needed
+    float b_radius_wrap_sqr = _sqr((source_radius+.5f));
+    if (items.size()<desired_items) {
+    // items.reserve (desired_items);
+    while (items.size()<desired_items) {
+    Item one;
+    Born (one,source_radius);
+    items.push_back (one);
+    }
+    }
+
+    // build source plane
     Fplane src_plane;
-    Fvector norm	={0.f,-1.f,0.f};
-    Fvector upper; 	upper.set(Device.vCameraPosition.x,Device.vCameraPosition.y+source_offset,Device.vCameraPosition.z);
+    Fvector norm ={0.f,-1.f,0.f};
+    Fvector upper; upper.set(Device.vCameraPosition.x,Device.vCameraPosition.y+source_offset,Device.vCameraPosition.z);
     src_plane.build(upper,norm);
-	
-	// perform update
-	u32			vOffset;
-	FVF::LIT	*verts		= (FVF::LIT	*) RCache.Vertex.Lock(desired_items*4,hGeom_Rain->vb_stride,vOffset);
-	FVF::LIT	*start		= verts;
-	const Fvector&	vEye	= Device.vCameraPosition;
-	for (u32 I=0; I<items.size(); I++){
-		// physics and time control
-		Item&	one		=	items[I];
-
-		if (one.dwTime_Hit<Device.dwTimeGlobal)		Hit (one.Phit);
-		if (one.dwTime_Life<Device.dwTimeGlobal)	Born(one,source_radius);
-
-// ïîñëåäíÿÿ äåëüòà ??
-//.		float xdt		= float(one.dwTime_Hit-Device.dwTimeGlobal)/1000.f;
-//.		float dt		= Device.fTimeDelta;//xdt<Device.fTimeDelta?xdt:Device.fTimeDelta;
-		float dt		= Device.fTimeDelta;
-		one.P.mad		(one.D,one.fSpeed*dt);
-
-		Device.Statistic->TEST1.Begin();
-		Fvector	wdir;	wdir.set(one.P.x-vEye.x,0,one.P.z-vEye.z);
-		float	wlen	= wdir.square_magnitude();
-		if (wlen>b_radius_wrap_sqr)	{
-			wlen		= _sqrt(wlen);
-//.			Device.Statistic->TEST3.Begin();
-			if ((one.P.y-vEye.y)<sink_offset){
-				// need born
-				one.invalidate();
-			}else{
-				Fvector		inv_dir, src_p;
-				inv_dir.invert(one.D);
-				wdir.div	(wlen);
-				one.P.mad	(one.P, wdir, -(wlen+source_radius));
-				if (src_plane.intersectRayPoint(one.P,inv_dir,src_p)){
-					float dist_sqr	= one.P.distance_to_sqr(src_p);
-					float height	= max_distance;
-					if (RayPick(src_p,one.D,height,collide::rqtBoth)){	
-						if (_sqr(height)<=dist_sqr){ 
-							one.invalidate	();								// need born
-//							Log("1");
-						}else{	
-							RenewItem	(one,height-_sqrt(dist_sqr),TRUE);		// fly to point
-//							Log("2",height-dist);
-						}
-					}else{
-						RenewItem		(one,max_distance-_sqrt(dist_sqr),FALSE);		// fly ...
-//						Log("3",1.5f*b_height-dist);
-					}
-				}else{
-					// need born
-					one.invalidate();
-//					Log("4");
-				}
-			}
-//.			Device.Statistic->TEST3.End();
-		}
-		Device.Statistic->TEST1.End();
-
-		// Build line
-		Fvector&	pos_head	= one.P;
-		Fvector		pos_trail;	pos_trail.mad	(pos_head,one.D,-drop_length*factor_visual);
-		
-		// Culling
-		Fvector sC,lineD;	float sR; 
-		sC.sub			(pos_head,pos_trail);
-		lineD.normalize	(sC);
-		sC.mul			(.5f);
-		sR				= sC.magnitude();
-		sC.add			(pos_trail);
-		if (!::Render->ViewBase.testSphere_dirty(sC,sR))	continue;
-		
-		static Fvector2 UV[2][4]={
-			{{0,1},{0,0},{1,1},{1,0}},
-			{{1,0},{1,1},{0,0},{0,1}}
-		};
-
-		// Everything OK - build vertices
-		Fvector	P,lineTop,camDir;
-		camDir.sub			(sC,vEye);
-		camDir.normalize	();
-		lineTop.crossproduct(camDir,lineD);
-		float w = drop_width;
-		u32 s	= one.uv_set;
-		P.mad(pos_trail,lineTop,-w);	verts->set(P,u_rain_color,UV[s][0].x,UV[s][0].y);	verts++;
-		P.mad(pos_trail,lineTop,w);		verts->set(P,u_rain_color,UV[s][1].x,UV[s][1].y);	verts++;
-		P.mad(pos_head, lineTop,-w);	verts->set(P,u_rain_color,UV[s][2].x,UV[s][2].y);	verts++;
-		P.mad(pos_head, lineTop,w);		verts->set(P,u_rain_color,UV[s][3].x,UV[s][3].y);	verts++;
-	}
-	u32 vCount					= (u32)(verts-start);
-	RCache.Vertex.Unlock		(vCount,hGeom_Rain->vb_stride);
-	
-	// Render if needed
-	if (vCount)	{
-		HW.pDevice->SetRenderState	(D3DRS_CULLMODE,D3DCULL_NONE);
-		RCache.set_xform_world		(Fidentity);
-		RCache.set_Shader			(SH_Rain);
-		RCache.set_Geometry			(hGeom_Rain);
-		RCache.Render				(D3DPT_TRIANGLELIST,vOffset,0,vCount,0,vCount/2);
-		HW.pDevice->SetRenderState	(D3DRS_CULLMODE,D3DCULL_CCW);
-	}
-	
-	// Particles
-	Particle*	P		= particle_active;
-	if (0==P)			return;
-	
-	{
-		float	dt				= Device.fTimeDelta;
-		_IndexStream& _IS		= RCache.Index;
-		RCache.set_Shader		(DM_Drop->shader);
-		
-		Fmatrix					mXform,mScale;
-		int						pcount  = 0;
-		u32						v_offset,i_offset;
-		u32						vCount_Lock		= particles_cache*DM_Drop->number_vertices;
-		u32						iCount_Lock		= particles_cache*DM_Drop->number_indices;
-		IRender_DetailModel::fvfVertexOut* v_ptr= (IRender_DetailModel::fvfVertexOut*) RCache.Vertex.Lock	(vCount_Lock, hGeom_Drops->vb_stride, v_offset);
-		u16*					i_ptr			= _IS.Lock													(iCount_Lock, i_offset);
-		while (P)	{
-			Particle*	next	=	P->next;
-			
-			// Update
-			// P can be zero sometimes and it crashes
-			P->time				-=	dt;
-			if (P->time<0)	{
-				p_free			(P);
-				P				=	next;
-				continue;
-			}
-
-			// Render
-			if (::Render->ViewBase.testSphere_dirty(P->bounds.P, P->bounds.R))
-			{
-				// Build matrix
-				float scale			=	P->time / particles_time;
-				mScale.scale		(scale,scale,scale);
-				mXform.mul_43		(P->mXForm,mScale);
-				
-				// XForm verts
-				DM_Drop->transfer	(mXform,v_ptr,u_rain_color,i_ptr,pcount*DM_Drop->number_vertices);
-				v_ptr			+=	DM_Drop->number_vertices;
-				i_ptr			+=	DM_Drop->number_indices;
-				pcount			++;
-
-				if (pcount >= particles_cache) {
-					// flush
-					u32	dwNumPrimitives		= iCount_Lock/3;
-					RCache.Vertex.Unlock	(vCount_Lock,hGeom_Drops->vb_stride);
-					_IS.Unlock				(iCount_Lock);
-					RCache.set_Geometry		(hGeom_Drops);
-					RCache.Render			(D3DPT_TRIANGLELIST,v_offset, 0,vCount_Lock,i_offset,dwNumPrimitives);
-					
-					v_ptr					= (IRender_DetailModel::fvfVertexOut*)			RCache.Vertex.Lock	(vCount_Lock, hGeom_Drops->vb_stride, v_offset);
-					i_ptr					= _IS.Lock										(iCount_Lock, i_offset);
-					
-					pcount	= 0;
-				}
-			}
-			
-			P = next;
-		}
-
-		// Flush if needed
-		vCount_Lock						= pcount*DM_Drop->number_vertices;
-		iCount_Lock						= pcount*DM_Drop->number_indices;
-		u32	dwNumPrimitives				= iCount_Lock/3;
-		RCache.Vertex.Unlock			(vCount_Lock,hGeom_Drops->vb_stride);
-		_IS.Unlock						(iCount_Lock);
-		if (pcount)	{
-			RCache.set_Geometry		(hGeom_Drops);
-			RCache.Render			(D3DPT_TRIANGLELIST,v_offset,0,vCount_Lock,i_offset,dwNumPrimitives);
-		}
-	}
-	*/
+
+    // perform update
+    u32 vOffset;
+    FVF::LIT *verts = (FVF::LIT *) RCache.Vertex.Lock(desired_items*4,hGeom_Rain->vb_stride,vOffset);
+    FVF::LIT *start = verts;
+    const Fvector& vEye = Device.vCameraPosition;
+    for (u32 I=0; I<items.size(); I++){
+    // physics and time control
+    Item& one = items[I];
+
+    if (one.dwTime_Hit<Device.dwTimeGlobal) Hit (one.Phit);
+    if (one.dwTime_Life<Device.dwTimeGlobal) Born(one,source_radius);
+
+    // ïîñëåäíÿÿ äåëüòà ??
+    //. float xdt = float(one.dwTime_Hit-Device.dwTimeGlobal)/1000.f;
+    //. float dt = Device.fTimeDelta;//xdt<Device.fTimeDelta?xdt:Device.fTimeDelta;
+    float dt = Device.fTimeDelta;
+    one.P.mad (one.D,one.fSpeed*dt);
+
+    Device.Statistic->TEST1.Begin();
+    Fvector wdir; wdir.set(one.P.x-vEye.x,0,one.P.z-vEye.z);
+    float wlen = wdir.square_magnitude();
+    if (wlen>b_radius_wrap_sqr) {
+    wlen = _sqrt(wlen);
+    //. Device.Statistic->TEST3.Begin();
+    if ((one.P.y-vEye.y)<sink_offset){
+    // need born
+    one.invalidate();
+    }else{
+    Fvector inv_dir, src_p;
+    inv_dir.invert(one.D);
+    wdir.div (wlen);
+    one.P.mad (one.P, wdir, -(wlen+source_radius));
+    if (src_plane.intersectRayPoint(one.P,inv_dir,src_p)){
+    float dist_sqr = one.P.distance_to_sqr(src_p);
+    float height = max_distance;
+    if (RayPick(src_p,one.D,height,collide::rqtBoth)){
+    if (_sqr(height)<=dist_sqr){
+    one.invalidate (); // need born
+    // Log("1");
+    }else{
+    RenewItem (one,height-_sqrt(dist_sqr),TRUE); // fly to point
+    // Log("2",height-dist);
+    }
+    }else{
+    RenewItem (one,max_distance-_sqrt(dist_sqr),FALSE); // fly ...
+    // Log("3",1.5f*b_height-dist);
+    }
+    }else{
+    // need born
+    one.invalidate();
+    // Log("4");
+    }
+    }
+    //. Device.Statistic->TEST3.End();
+    }
+    Device.Statistic->TEST1.End();
+
+    // Build line
+    Fvector& pos_head = one.P;
+    Fvector pos_trail; pos_trail.mad (pos_head,one.D,-drop_length*factor_visual);
+
+    // Culling
+    Fvector sC,lineD; float sR;
+    sC.sub (pos_head,pos_trail);
+    lineD.normalize (sC);
+    sC.mul (.5f);
+    sR = sC.magnitude();
+    sC.add (pos_trail);
+    if (!::Render->ViewBase.testSphere_dirty(sC,sR)) continue;
+
+    static Fvector2 UV[2][4]={
+    {{0,1},{0,0},{1,1},{1,0}},
+    {{1,0},{1,1},{0,0},{0,1}}
+    };
+
+    // Everything OK - build vertices
+    Fvector P,lineTop,camDir;
+    camDir.sub (sC,vEye);
+    camDir.normalize ();
+    lineTop.crossproduct(camDir,lineD);
+    float w = drop_width;
+    u32 s = one.uv_set;
+    P.mad(pos_trail,lineTop,-w); verts->set(P,u_rain_color,UV[s][0].x,UV[s][0].y); verts++;
+    P.mad(pos_trail,lineTop,w); verts->set(P,u_rain_color,UV[s][1].x,UV[s][1].y); verts++;
+    P.mad(pos_head, lineTop,-w); verts->set(P,u_rain_color,UV[s][2].x,UV[s][2].y); verts++;
+    P.mad(pos_head, lineTop,w); verts->set(P,u_rain_color,UV[s][3].x,UV[s][3].y); verts++;
+    }
+    u32 vCount = (u32)(verts-start);
+    RCache.Vertex.Unlock (vCount,hGeom_Rain->vb_stride);
+
+    // Render if needed
+    if (vCount) {
+    HW.pDevice->SetRenderState (D3DRS_CULLMODE,D3DCULL_NONE);
+    RCache.set_xform_world (Fidentity);
+    RCache.set_Shader (SH_Rain);
+    RCache.set_Geometry (hGeom_Rain);
+    RCache.Render (D3DPT_TRIANGLELIST,vOffset,0,vCount,0,vCount/2);
+    HW.pDevice->SetRenderState (D3DRS_CULLMODE,D3DCULL_CCW);
+    }
+
+    // Particles
+    Particle* P = particle_active;
+    if (0==P) return;
+
+    {
+    float dt = Device.fTimeDelta;
+    _IndexStream& _IS = RCache.Index;
+    RCache.set_Shader (DM_Drop->shader);
+
+    Fmatrix mXform,mScale;
+    int pcount = 0;
+    u32 v_offset,i_offset;
+    u32 vCount_Lock = particles_cache*DM_Drop->number_vertices;
+    u32 iCount_Lock = particles_cache*DM_Drop->number_indices;
+    IRender_DetailModel::fvfVertexOut* v_ptr= (IRender_DetailModel::fvfVertexOut*) RCache.Vertex.Lock (vCount_Lock, hGeom_Drops->vb_stride, v_offset);
+    u16* i_ptr = _IS.Lock (iCount_Lock, i_offset);
+    while (P) {
+    Particle* next = P->next;
+
+    // Update
+    // P can be zero sometimes and it crashes
+    P->time -= dt;
+    if (P->time<0) {
+    p_free (P);
+    P = next;
+    continue;
+    }
+
+    // Render
+    if (::Render->ViewBase.testSphere_dirty(P->bounds.P, P->bounds.R))
+    {
+    // Build matrix
+    float scale = P->time / particles_time;
+    mScale.scale (scale,scale,scale);
+    mXform.mul_43 (P->mXForm,mScale);
+
+    // XForm verts
+    DM_Drop->transfer (mXform,v_ptr,u_rain_color,i_ptr,pcount*DM_Drop->number_vertices);
+    v_ptr += DM_Drop->number_vertices;
+    i_ptr += DM_Drop->number_indices;
+    pcount ++;
+
+    if (pcount >= particles_cache) {
+    // flush
+    u32 dwNumPrimitives = iCount_Lock/3;
+    RCache.Vertex.Unlock (vCount_Lock,hGeom_Drops->vb_stride);
+    _IS.Unlock (iCount_Lock);
+    RCache.set_Geometry (hGeom_Drops);
+    RCache.Render (D3DPT_TRIANGLELIST,v_offset, 0,vCount_Lock,i_offset,dwNumPrimitives);
+
+    v_ptr = (IRender_DetailModel::fvfVertexOut*) RCache.Vertex.Lock (vCount_Lock, hGeom_Drops->vb_stride, v_offset);
+    i_ptr = _IS.Lock (iCount_Lock, i_offset);
+
+    pcount = 0;
+    }
+    }
+
+    P = next;
+    }
+
+    // Flush if needed
+    vCount_Lock = pcount*DM_Drop->number_vertices;
+    iCount_Lock = pcount*DM_Drop->number_indices;
+    u32 dwNumPrimitives = iCount_Lock/3;
+    RCache.Vertex.Unlock (vCount_Lock,hGeom_Drops->vb_stride);
+    _IS.Unlock (iCount_Lock);
+    if (pcount) {
+    RCache.set_Geometry (hGeom_Drops);
+    RCache.Render (D3DPT_TRIANGLELIST,v_offset,0,vCount_Lock,i_offset,dwNumPrimitives);
+    }
+    }
+    */
 }
 
 // startup _new_ particle system
-void	CEffect_Rain::Hit		(Fvector& pos)
+void CEffect_Rain::Hit(Fvector& pos)
 {
-	if (0!=::Random.randI(2))	return;
-	Particle*	P	= p_allocate();
-	if (0==P)	return;
+    if (0 != ::Random.randI(2)) return;
+    Particle* P = p_allocate();
+    if (0 == P) return;
 
-	const Fsphere &bv_sphere = m_pRender->GetDropBounds();
+    const Fsphere& bv_sphere = m_pRender->GetDropBounds();
 
-	P->time						= particles_time;
-	P->mXForm.rotateY			(::Random.randF(PI_MUL_2));
-	P->mXForm.translate_over	(pos);
-	P->mXForm.transform_tiny	(P->bounds.P, bv_sphere.P);
-	P->bounds.R					= bv_sphere.R;
+    P->time = particles_time;
+    P->mXForm.rotateY(::Random.randF(PI_MUL_2));
+    P->mXForm.translate_over(pos);
+    P->mXForm.transform_tiny(P->bounds.P, bv_sphere.P);
+    P->bounds.R = bv_sphere.R;
 
 }
 
 // initialize particles pool
-void CEffect_Rain::p_create		()
+void CEffect_Rain::p_create()
 {
-	// pool
-	particle_pool.resize	(max_particles);
-	for (u32 it=0; it<particle_pool.size(); it++)
-	{
-		Particle&	P	= particle_pool[it];
-		P.prev			= it?(&particle_pool[it-1]):0;
-		P.next			= (it<(particle_pool.size()-1))?(&particle_pool[it+1]):0;
-	}
-	
-	// active and idle lists
-	particle_active	= 0;
-	particle_idle	= &particle_pool.front();
+    // pool
+    particle_pool.resize(max_particles);
+    for (u32 it = 0; it < particle_pool.size(); it++)
+    {
+        Particle& P = particle_pool[it];
+        P.prev = it ? (&particle_pool[it - 1]) : 0;
+        P.next = (it < (particle_pool.size() - 1)) ? (&particle_pool[it + 1]) : 0;
+    }
+
+    // active and idle lists
+    particle_active = 0;
+    particle_idle = &particle_pool.front();
 }
 
 // destroy particles pool
-void CEffect_Rain::p_destroy	()
+void CEffect_Rain::p_destroy()
 {
-	// active and idle lists
-	particle_active	= 0;
-	particle_idle	= 0;
-	
-	// pool
-	particle_pool.clear	();
+    // active and idle lists
+    particle_active = 0;
+    particle_idle = 0;
+
+    // pool
+    particle_pool.clear();
 }
 
 // _delete_ node from _list_
-void CEffect_Rain::p_remove	(Particle* P, Particle* &LST)
+void CEffect_Rain::p_remove(Particle* P, Particle*& LST)
 {
-	VERIFY		(P);
-	Particle*	prev		= P->prev;	P->prev = NULL;
-	Particle*	next		= P->next;	P->next	= NULL;
-	if (prev) prev->next	= next;
-	if (next) next->prev	= prev;
-	if (LST==P)	LST			= next;
+    VERIFY(P);
+    Particle* prev = P->prev;
+    P->prev = NULL;
+    Particle* next = P->next;
+    P->next = NULL;
+    if (prev) prev->next = next;
+    if (next) next->prev = prev;
+    if (LST == P) LST = next;
 }
 
 // insert node at the top of the head
-void CEffect_Rain::p_insert	(Particle* P, Particle* &LST)
+void CEffect_Rain::p_insert(Particle* P, Particle*& LST)
 {
-	VERIFY		(P);
-	P->prev					= 0;
-	P->next					= LST;
-	if (LST)	LST->prev	= P;
-	LST						= P;
+    VERIFY(P);
+    P->prev = 0;
+    P->next = LST;
+    if (LST) LST->prev = P;
+    LST = P;
 }
 
 // determine size of _list_
-int CEffect_Rain::p_size	(Particle* P)
+int CEffect_Rain::p_size(Particle* P)
 {
-	if (0==P)	return 0;
-	int cnt = 0;
-	while (P)	{
-		P	=	P->next;
-		cnt +=	1;
-	}
-	return cnt;
+    if (0 == P) return 0;
+    int cnt = 0;
+    while (P)
+    {
+        P = P->next;
+        cnt += 1;
+    }
+    return cnt;
 }
 
 // alloc node
-CEffect_Rain::Particle*	CEffect_Rain::p_allocate	()
+CEffect_Rain::Particle* CEffect_Rain::p_allocate()
 {
-	Particle*	P			= particle_idle;
-	if (0==P)				return NULL;
-	p_remove	(P,particle_idle);
-	p_insert	(P,particle_active);
-	return		P;
+    Particle* P = particle_idle;
+    if (0 == P) return NULL;
+    p_remove(P, particle_idle);
+    p_insert(P, particle_active);
+    return P;
 }
 
 // xr_free node
-void	CEffect_Rain::p_free(Particle* P)
+void CEffect_Rain::p_free(Particle* P)
 {
-	p_remove	(P,particle_active);
-	p_insert	(P,particle_idle);
+    p_remove(P, particle_active);
+    p_insert(P, particle_idle);
 }
diff --git a/src/xrEngine/Rain.h b/src/xrEngine/Rain.h
index cb9aef54612..f1cdae81b17 100644
--- a/src/xrEngine/Rain.h
+++ b/src/xrEngine/Rain.h
@@ -16,80 +16,80 @@ class ENGINE_API IRender_DetailModel;
 //
 class ENGINE_API CEffect_Rain
 {
-	friend class dxRainRender;
+    friend class dxRainRender;
 private:
-	struct	Item
-	{
-		Fvector			P;
-		Fvector			Phit;
-		Fvector			D;
-		float			fSpeed;
-		u32				dwTime_Life;
-		u32				dwTime_Hit;
-		u32				uv_set;
-		void			invalidate	()
-		{
-			dwTime_Life	= 0;
-		}
-	};
-	struct	Particle
-	{
-		Particle		*next,*prev;
-		Fmatrix			mXForm;
-		Fsphere			bounds;
-		float			time;
-	};
-	enum	States
-	{
-		stIdle		= 0,
-		stWorking
-	};
+    struct Item
+    {
+        Fvector P;
+        Fvector Phit;
+        Fvector D;
+        float fSpeed;
+        u32 dwTime_Life;
+        u32 dwTime_Hit;
+        u32 uv_set;
+        void invalidate()
+        {
+            dwTime_Life = 0;
+        }
+    };
+    struct Particle
+    {
+        Particle* next, *prev;
+        Fmatrix mXForm;
+        Fsphere bounds;
+        float time;
+    };
+    enum States
+    {
+        stIdle = 0,
+        stWorking
+    };
 private:
-	// Visualization	(rain) and (drops)
-	FactoryPtr<IRainRender>	m_pRender;
-	/*
-	// Visualization	(rain)
-	ref_shader						SH_Rain;
-	ref_geom						hGeom_Rain;
+    // Visualization (rain) and (drops)
+    FactoryPtr<IRainRender> m_pRender;
+    /*
+    // Visualization (rain)
+    ref_shader SH_Rain;
+    ref_geom hGeom_Rain;
 
-	// Visualization	(drops)
-	IRender_DetailModel*			DM_Drop;
-	ref_geom						hGeom_Drops;
-	*/
-	
-	// Data and logic
-	xr_vector<Item>					items;
-	States							state;
+    // Visualization (drops)
+    IRender_DetailModel* DM_Drop;
+    ref_geom hGeom_Drops;
+    */
 
-	// Particles
-	xr_vector<Particle>				particle_pool;
-	Particle*						particle_active;
-	Particle*						particle_idle;
+    // Data and logic
+    xr_vector<Item> items;
+    States state;
 
-	// Sounds
-	ref_sound						snd_Ambient;
+    // Particles
+    xr_vector<Particle> particle_pool;
+    Particle* particle_active;
+    Particle* particle_idle;
 
-	// Utilities
-	void							p_create		();
-	void							p_destroy		();
+    // Sounds
+    ref_sound snd_Ambient;
 
-	void							p_remove		(Particle* P, Particle* &LST);
-	void							p_insert		(Particle* P, Particle* &LST);
-	int								p_size			(Particle* LST);
-	Particle*						p_allocate		();
-	void							p_free			(Particle* P);
+    // Utilities
+    void p_create();
+    void p_destroy();
 
-	// Some methods
-	void							Born			(Item& dest, float radius);
-	void							Hit				(Fvector& pos);
-	BOOL							RayPick			(const Fvector& s, const Fvector& d, float& range, collide::rq_target tgt);
-	void							RenewItem		(Item& dest, float height, BOOL bHit);
+    void p_remove(Particle* P, Particle*& LST);
+    void p_insert(Particle* P, Particle*& LST);
+    int p_size(Particle* LST);
+    Particle* p_allocate();
+    void p_free(Particle* P);
+
+    // Some methods
+    void Born(Item& dest, float radius);
+    void Hit(Fvector& pos);
+    BOOL RayPick(const Fvector& s, const Fvector& d, float& range, collide::rq_target tgt);
+    void RenewItem(Item& dest, float height, BOOL bHit);
 public:
-									CEffect_Rain	();
-									~CEffect_Rain	();
+    CEffect_Rain();
+    ~CEffect_Rain();
 
-	void							Render			();
-	void							OnFrame			();
+    void Render();
+    void OnFrame();
 };
 
 #endif //RainH
diff --git a/src/xrEngine/Render.cpp b/src/xrEngine/Render.cpp
index f0462eab581..00ac77d9431 100644
--- a/src/xrEngine/Render.cpp
+++ b/src/xrEngine/Render.cpp
@@ -1,14 +1,16 @@
 #include "stdafx.h"
 #include "render.h"
 
-IRender_interface::~IRender_interface()		{};
+IRender_interface::~IRender_interface() {};
 
-//ENGINE_API	IRender_interface*	Render		= NULL;
+//ENGINE_API IRender_interface* Render = NULL;
 
 // resources
-IRender_Light::~IRender_Light	()			{	
-	::Render->light_destroy		(this	);
+IRender_Light::~IRender_Light()
+{
+    ::Render->light_destroy(this);
 }
-IRender_Glow::~IRender_Glow		()			{	
-	::Render->glow_destroy		(this	);	
+IRender_Glow::~IRender_Glow()
+{
+    ::Render->glow_destroy(this);
 }
diff --git a/src/xrEngine/Render.h b/src/xrEngine/Render.h
index 60cf09f910f..8c7d729cecf 100644
--- a/src/xrEngine/Render.h
+++ b/src/xrEngine/Render.h
@@ -12,292 +12,298 @@ typedef FactoryPtr<IUIShader> wm_shader;
 //#include "../Include/xrRender/WallMarkArray.h"
 
 #ifdef _EDITOR
-//.    #error you cant include this file in borland
+//. #error you cant include this file in borland
 #endif
 // refs
-class ENGINE_API	IRenderable;
-//class ENGINE_API	IRenderVisual;
+class ENGINE_API IRenderable;
+//class ENGINE_API IRenderVisual;
 
-//class ENGINE_API	IBlender;
-//class ENGINE_API	CSkeletonWallmark;
-//class ENGINE_API	CKinematics;
-struct ENGINE_API	FSlideWindowItem;
+//class ENGINE_API IBlender;
+//class ENGINE_API CSkeletonWallmark;
+//class ENGINE_API CKinematics;
+struct ENGINE_API FSlideWindowItem;
 
-//	Igor
+// Igor
 class IRenderVisual;
 class IKinematics;
 class CGameFont;
 //class IRenderDetailModel;
 
 #ifndef _EDITOR
-extern const	float		fLightSmoothFactor;
+extern const float fLightSmoothFactor;
 #else
-const	float		fLightSmoothFactor = 4.f;
+const float fLightSmoothFactor = 4.f;
 #endif
 //////////////////////////////////////////////////////////////////////////
 // definition (Dynamic Light)
-class	ENGINE_API	IRender_Light	: public xr_resource									{
+class ENGINE_API IRender_Light : public xr_resource
+{
 public:
-	enum LT
-	{
-		DIRECT		= 0,
-		POINT		= 1,
-		SPOT		= 2,
-		OMNIPART	= 3,
-		REFLECTED	= 4,
-	};
+    enum LT
+    {
+        DIRECT = 0,
+        POINT = 1,
+        SPOT = 2,
+        OMNIPART = 3,
+        REFLECTED = 4,
+    };
 public:
-	virtual void					set_type			(LT type)							= 0;
-	virtual void					set_active			(bool)								= 0;
-	virtual bool					get_active			()									= 0;
-	virtual void					set_shadow			(bool)								= 0;
-	virtual void					set_volumetric		(bool)								= 0;
-	virtual void					set_volumetric_quality(float)							= 0;
-	virtual void					set_volumetric_intensity(float)							= 0;
-	virtual void					set_volumetric_distance(float)							= 0;
-	virtual void					set_indirect		(bool)								{};
-	virtual void					set_position		(const Fvector& P)					= 0;
-	virtual void					set_rotation		(const Fvector& D, const Fvector& R)= 0;
-	virtual void					set_cone			(float angle)						= 0;
-	virtual void					set_range			(float R)							= 0;
-	virtual void					set_virtual_size	(float R)							= 0;
-	virtual void					set_texture			(LPCSTR name)						= 0;
-	virtual void					set_color			(const Fcolor& C)					= 0;
-	virtual void					set_color			(float r, float g, float b)			= 0;
-	virtual void					set_hud_mode		(bool b)							= 0;
-	virtual bool					get_hud_mode		()									= 0;
-	virtual ~IRender_Light()		;
+    virtual void set_type(LT type) = 0;
+    virtual void set_active(bool) = 0;
+    virtual bool get_active() = 0;
+    virtual void set_shadow(bool) = 0;
+    virtual void set_volumetric(bool) = 0;
+    virtual void set_volumetric_quality(float) = 0;
+    virtual void set_volumetric_intensity(float) = 0;
+    virtual void set_volumetric_distance(float) = 0;
+    virtual void set_indirect(bool) {};
+    virtual void set_position(const Fvector& P) = 0;
+    virtual void set_rotation(const Fvector& D, const Fvector& R) = 0;
+    virtual void set_cone(float angle) = 0;
+    virtual void set_range(float R) = 0;
+    virtual void set_virtual_size(float R) = 0;
+    virtual void set_texture(LPCSTR name) = 0;
+    virtual void set_color(const Fcolor& C) = 0;
+    virtual void set_color(float r, float g, float b) = 0;
+    virtual void set_hud_mode(bool b) = 0;
+    virtual bool get_hud_mode() = 0;
+    virtual ~IRender_Light();
 };
-struct ENGINE_API		resptrcode_light	: public resptr_base<IRender_Light>
+struct ENGINE_API resptrcode_light : public resptr_base < IRender_Light >
 {
-	void				destroy			()				{ _set(NULL);						}
+    void destroy() { _set(NULL); }
 };
-typedef	resptr_core<IRender_Light,resptrcode_light >	ref_light;
+typedef resptr_core<IRender_Light, resptrcode_light > ref_light;
 
 //////////////////////////////////////////////////////////////////////////
 // definition (Dynamic Glow)
-class	ENGINE_API		IRender_Glow	: public xr_resource									{
+class ENGINE_API IRender_Glow : public xr_resource
+{
 public:
-	virtual void					set_active			(bool)								= 0;
-	virtual bool					get_active			()									= 0;
-	virtual void					set_position		(const Fvector& P)					= 0;
-	virtual void					set_direction		(const Fvector& P)					= 0;
-	virtual void					set_radius			(float R)							= 0;
-	virtual void					set_texture			(LPCSTR name)						= 0;
-	virtual void					set_color			(const Fcolor& C)					= 0;
-	virtual void					set_color			(float r, float g, float b)			= 0;
-	virtual ~IRender_Glow()			;
+    virtual void set_active(bool) = 0;
+    virtual bool get_active() = 0;
+    virtual void set_position(const Fvector& P) = 0;
+    virtual void set_direction(const Fvector& P) = 0;
+    virtual void set_radius(float R) = 0;
+    virtual void set_texture(LPCSTR name) = 0;
+    virtual void set_color(const Fcolor& C) = 0;
+    virtual void set_color(float r, float g, float b) = 0;
+    virtual ~IRender_Glow();
 };
-struct ENGINE_API		resptrcode_glow	: public resptr_base<IRender_Glow>
+struct ENGINE_API resptrcode_glow : public resptr_base < IRender_Glow >
 {
-	void				destroy			()					{ _set(NULL);					}
+    void destroy() { _set(NULL); }
 };
-typedef	resptr_core<IRender_Glow,resptrcode_glow >		ref_glow;
+typedef resptr_core<IRender_Glow, resptrcode_glow > ref_glow;
 
 //////////////////////////////////////////////////////////////////////////
 // definition (Per-object render-specific data)
-class	ENGINE_API	IRender_ObjectSpecific		{
+class ENGINE_API IRender_ObjectSpecific
+{
 public:
-	enum mode
-	{
-		TRACE_LIGHTS	= (1<<0),
-		TRACE_SUN		= (1<<1),
-		TRACE_HEMI		= (1<<2),
-		TRACE_ALL		= (TRACE_LIGHTS|TRACE_SUN|TRACE_HEMI),
-	};
+    enum mode
+    {
+        TRACE_LIGHTS = (1 << 0),
+        TRACE_SUN = (1 << 1),
+        TRACE_HEMI = (1 << 2),
+        TRACE_ALL = (TRACE_LIGHTS | TRACE_SUN | TRACE_HEMI),
+    };
 public:
-	virtual	void						force_mode			(u32 mode)							= 0;
-	virtual float						get_luminocity		()									= 0;
-	virtual float						get_luminocity_hemi	()									= 0;
-	virtual float*						get_luminocity_hemi_cube		()									= 0;
+    virtual void force_mode(u32 mode) = 0;
+    virtual float get_luminocity() = 0;
+    virtual float get_luminocity_hemi() = 0;
+    virtual float* get_luminocity_hemi_cube() = 0;
 
-	virtual ~IRender_ObjectSpecific()	{};
+    virtual ~IRender_ObjectSpecific() {};
 };
 
 //////////////////////////////////////////////////////////////////////////
 // definition (Portal)
-class	ENGINE_API	IRender_Portal				{
+class ENGINE_API IRender_Portal
+{
 public:
-	virtual ~IRender_Portal()			{};
+    virtual ~IRender_Portal() {};
 };
 
 //////////////////////////////////////////////////////////////////////////
 // definition (Sector)
-class	ENGINE_API	IRender_Sector				{
+class ENGINE_API IRender_Sector
+{
 public:
-	virtual ~IRender_Sector()			{};
+    virtual ~IRender_Sector() {};
 };
 
 //////////////////////////////////////////////////////////////////////////
 // definition (Target)
-class	ENGINE_API	IRender_Target				{
+class ENGINE_API IRender_Target
+{
 public:
-	virtual	void					set_blur			(float	f)							= 0;
-	virtual	void					set_gray			(float	f)							= 0;
-	virtual void					set_duality_h		(float	f)							= 0;
-	virtual void					set_duality_v		(float	f)							= 0;
-	virtual void					set_noise			(float	f)							= 0;
-	virtual void					set_noise_scale		(float	f)							= 0;
-	virtual void					set_noise_fps		(float	f)							= 0;
-	virtual void					set_color_base		(u32	f)							= 0;
-	virtual void					set_color_gray		(u32	f)							= 0;
-	//virtual void					set_color_add		(u32	f)							= 0;
-	virtual void					set_color_add		(const Fvector	&f)					= 0;
-	virtual u32						get_width			()									= 0;
-	virtual u32						get_height			()									= 0;
-	virtual void					set_cm_imfluence	(float	f)							= 0;
-	virtual void					set_cm_interpolate	(float	f)							= 0;
-	virtual void					set_cm_textures		(const shared_str &tex0, const shared_str &tex1)= 0;
-	virtual ~IRender_Target()		{};
+    virtual void set_blur(float f) = 0;
+    virtual void set_gray(float f) = 0;
+    virtual void set_duality_h(float f) = 0;
+    virtual void set_duality_v(float f) = 0;
+    virtual void set_noise(float f) = 0;
+    virtual void set_noise_scale(float f) = 0;
+    virtual void set_noise_fps(float f) = 0;
+    virtual void set_color_base(u32 f) = 0;
+    virtual void set_color_gray(u32 f) = 0;
+    //virtual void set_color_add (u32 f) = 0;
+    virtual void set_color_add(const Fvector& f) = 0;
+    virtual u32 get_width() = 0;
+    virtual u32 get_height() = 0;
+    virtual void set_cm_imfluence(float f) = 0;
+    virtual void set_cm_interpolate(float f) = 0;
+    virtual void set_cm_textures(const shared_str& tex0, const shared_str& tex1) = 0;
+    virtual ~IRender_Target() {};
 };
 
 //////////////////////////////////////////////////////////////////////////
 // definition (Renderer)
-class	ENGINE_API	IRender_interface
+class ENGINE_API IRender_interface
 {
 public:
-	enum GenerationLevel
-	{
-		GENERATION_R1				= 81,
-		GENERATION_DX81				= 81,
-		GENERATION_R2				= 90,
-		GENERATION_DX90				= 90,
-		GENERATION_forcedword		= u32(-1)
-	};
-	enum ScreenshotMode
-	{
-		SM_NORMAL					= 0,		// jpeg,	name ignored
-		SM_FOR_CUBEMAP				= 1,		// tga,		name used as postfix
-		SM_FOR_GAMESAVE				= 2,		// dds/dxt1,name used as full-path
-		SM_FOR_LEVELMAP				= 3,		// tga,		name used as postfix (level_name)
-		SM_FOR_MPSENDING			= 4,
-		SM_forcedword				= u32(-1)
-	};
+    enum GenerationLevel
+    {
+        GENERATION_R1 = 81,
+        GENERATION_DX81 = 81,
+        GENERATION_R2 = 90,
+        GENERATION_DX90 = 90,
+        GENERATION_forcedword = u32(-1)
+    };
+    enum ScreenshotMode
+    {
+        SM_NORMAL = 0, // jpeg, name ignored
+        SM_FOR_CUBEMAP = 1, // tga, name used as postfix
+        SM_FOR_GAMESAVE = 2, // dds/dxt1,name used as full-path
+        SM_FOR_LEVELMAP = 3, // tga, name used as postfix (level_name)
+        SM_FOR_MPSENDING = 4,
+        SM_forcedword = u32(-1)
+    };
 public:
-	// options
-	s32								m_skinning;
-	s32								m_MSAASample;
+    // options
+    s32 m_skinning;
+    s32 m_MSAASample;
 
-	BENCH_SEC_SCRAMBLEMEMBER1
+    BENCH_SEC_SCRAMBLEMEMBER1
 
-	// data
-	CFrustum						ViewBase;
-	CFrustum*						View;
+    // data
+    CFrustum ViewBase;
+    CFrustum* View;
 public:
-	// feature level
-	virtual	GenerationLevel			get_generation			()											= 0;
-
-	virtual bool					is_sun_static			() =0;
-	virtual DWORD					get_dx_level			() =0;
-
-	// Loading / Unloading
-	virtual	void					create					()											= 0;
-	virtual	void					destroy					()											= 0;
-	virtual	void					reset_begin				()											= 0;
-	virtual	void					reset_end				()											= 0;
-
-	BENCH_SEC_SCRAMBLEVTBL1
-	BENCH_SEC_SCRAMBLEVTBL3
-
-	virtual	void					level_Load				(IReader*)									= 0;
-	virtual void					level_Unload			()											= 0;
-
-	//virtual IDirect3DBaseTexture9*	texture_load			(LPCSTR	fname, u32& msize)					= 0;
-			void					shader_option_skinning	(s32 mode)									{ m_skinning=mode;	}
-	virtual HRESULT					shader_compile			(
-		LPCSTR							name,
-		DWORD const*                    pSrcData,
-		UINT                            SrcDataLen,
-		LPCSTR                          pFunctionName,
-		LPCSTR                          pTarget,
-		DWORD                           Flags,
-		void*&							result
-	)																									= 0;
-
-	// Information
-	virtual	void					Statistics				(CGameFont* F	)							{};
-
-	virtual LPCSTR					getShaderPath			()											= 0;
-//	virtual ref_shader				getShader				(int id)									= 0;
-	virtual IRender_Sector*			getSector				(int id)									= 0;
-	virtual IRenderVisual*			getVisual				(int id)									= 0;
-	virtual IRender_Sector*			detectSector			(const Fvector& P)							= 0;
-	virtual IRender_Target*			getTarget				()											= 0;
-
-	// Main 
-	IC		void					set_Frustum				(CFrustum*	O	)							{ VERIFY(O);	View = O;			}
-	virtual void					set_Transform			(Fmatrix*	M	)							= 0;
-	virtual void					set_HUD					(BOOL 		V	)							= 0;
-	virtual BOOL					get_HUD					()											= 0;
-	virtual void					set_Invisible			(BOOL 		V	)							= 0;
-	virtual void					flush					()											= 0;	
-	virtual void					set_Object				(IRenderable*		O	)					= 0;
-	virtual	void					add_Occluder			(Fbox2&	bb_screenspace	)					= 0;	// mask screen region as oclluded (-1..1, -1..1)
-	virtual void					add_Visual				(IRenderVisual*	V	)					= 0;	// add visual leaf	(no culling performed at all)
-	virtual void					add_Geometry			(IRenderVisual*	V	)					= 0;	// add visual(s)	(all culling performed)
-//	virtual void					add_StaticWallmark		(ref_shader& S, const Fvector& P, float s, CDB::TRI* T, Fvector* V)=0;
-	virtual void					add_StaticWallmark		(const wm_shader& S, const Fvector& P, float s, CDB::TRI* T, Fvector* V)=0;
-	//	Prefer this function when possible
-	virtual void					add_StaticWallmark		(IWallMarkArray *pArray, const Fvector& P, float s, CDB::TRI* T, Fvector* V)=0;
-	virtual void					clear_static_wallmarks	()=0;
-	//virtual void					add_SkeletonWallmark	(intrusive_ptr<CSkeletonWallmark> wm)						= 0;
-	//virtual void					add_SkeletonWallmark	(const Fmatrix* xf, CKinematics* obj, ref_shader& sh, const Fvector& start, const Fvector& dir, float size)=0;
-	//	Prefer this function when possible
-	virtual void					add_SkeletonWallmark	(const Fmatrix* xf, IKinematics* obj, IWallMarkArray *pArray, const Fvector& start, const Fvector& dir, float size)=0;
-
-	//virtual IBlender*				blender_create			(CLASS_ID cls)								= 0;
-	//virtual void					blender_destroy			(IBlender* &)								= 0;
-
-	virtual IRender_ObjectSpecific*	ros_create				(IRenderable* parent)						= 0;
-	virtual void					ros_destroy				(IRender_ObjectSpecific* &)					= 0;
-
-	// Lighting/glowing
-	virtual IRender_Light*			light_create			()											= 0;
-	virtual void					light_destroy			(IRender_Light* p_)							{ };
-	virtual IRender_Glow*			glow_create				()											= 0;
-	virtual void					glow_destroy			(IRender_Glow* p_)							{ };
-
-	// Models
-	virtual IRenderVisual*			model_CreateParticles	(LPCSTR name)								= 0;
-//	virtual IRender_DetailModel*	model_CreateDM			(IReader*	F)								= 0;
-	//virtual IRenderDetailModel*		model_CreateDM			(IReader*	F)								= 0;
-	//virtual IRenderVisual*			model_Create			(LPCSTR name, IReader*	data=0)				= 0;
-	virtual IRenderVisual*			model_Create			(LPCSTR name, IReader*	data=0)				= 0;
-	virtual IRenderVisual*			model_CreateChild		(LPCSTR name, IReader*	data)				= 0;
-	virtual IRenderVisual*			model_Duplicate			(IRenderVisual*	V)						= 0;
-	//virtual void					model_Delete			(IRenderVisual* &	V, BOOL bDiscard=FALSE)	= 0;
-	virtual void					model_Delete			(IRenderVisual* &	V, BOOL bDiscard=FALSE)	= 0;
-//	virtual void 					model_Delete			(IRender_DetailModel* & F)					= 0;
-	virtual void					model_Logging			(BOOL bEnable)								= 0;
-	virtual void					models_Prefetch			()											= 0;
-	virtual void					models_Clear			(BOOL b_complete)							= 0;
-
-	// Occlusion culling
-	virtual BOOL					occ_visible				(vis_data&	V)								= 0;
-	virtual BOOL					occ_visible				(Fbox&		B)								= 0;
-	virtual BOOL					occ_visible				(sPoly&		P)								= 0;
-
-	// Main
-	virtual void					Calculate				()											= 0;
-	virtual void					Render					()											= 0;
-	
-	virtual void					Screenshot				(ScreenshotMode mode=SM_NORMAL, LPCSTR name = 0) = 0;
-	virtual	void					Screenshot				(ScreenshotMode mode, CMemoryWriter& memory_writer) = 0;
-	virtual void					ScreenshotAsyncBegin	() = 0;
-	virtual void					ScreenshotAsyncEnd		(CMemoryWriter& memory_writer) = 0;
-
-	// Render mode
-	virtual void					rmNear					()											= 0;
-	virtual void					rmFar					()											= 0;
-	virtual void					rmNormal				()											= 0;
-	virtual u32						memory_usage			()											= 0;
-
-	// Constructor/destructor
-	virtual ~IRender_interface();
+    // feature level
+    virtual GenerationLevel get_generation() = 0;
+
+    virtual bool is_sun_static() = 0;
+    virtual DWORD get_dx_level() = 0;
+
+    // Loading / Unloading
+    virtual void create() = 0;
+    virtual void destroy() = 0;
+    virtual void reset_begin() = 0;
+    virtual void reset_end() = 0;
+
+    BENCH_SEC_SCRAMBLEVTBL1
+    BENCH_SEC_SCRAMBLEVTBL3
+
+    virtual void level_Load(IReader*) = 0;
+    virtual void level_Unload() = 0;
+
+    //virtual IDirect3DBaseTexture9* texture_load (LPCSTR fname, u32& msize) = 0;
+    void shader_option_skinning(s32 mode) { m_skinning = mode; }
+    virtual HRESULT shader_compile(
+        LPCSTR name,
+        DWORD const* pSrcData,
+        UINT SrcDataLen,
+        LPCSTR pFunctionName,
+        LPCSTR pTarget,
+        DWORD Flags,
+        void*& result
+    ) = 0;
+
+    // Information
+    virtual void Statistics(CGameFont* F) {};
+
+    virtual LPCSTR getShaderPath() = 0;
+    // virtual ref_shader getShader (int id) = 0;
+    virtual IRender_Sector* getSector(int id) = 0;
+    virtual IRenderVisual* getVisual(int id) = 0;
+    virtual IRender_Sector* detectSector(const Fvector& P) = 0;
+    virtual IRender_Target* getTarget() = 0;
+
+    // Main
+    IC void set_Frustum(CFrustum* O) { VERIFY(O); View = O; }
+    virtual void set_Transform(Fmatrix* M) = 0;
+    virtual void set_HUD(BOOL V) = 0;
+    virtual BOOL get_HUD() = 0;
+    virtual void set_Invisible(BOOL V) = 0;
+    virtual void flush() = 0;
+    virtual void set_Object(IRenderable* O) = 0;
+    virtual void add_Occluder(Fbox2& bb_screenspace) = 0; // mask screen region as oclluded (-1..1, -1..1)
+    virtual void add_Visual(IRenderVisual* V) = 0; // add visual leaf (no culling performed at all)
+    virtual void add_Geometry(IRenderVisual* V) = 0; // add visual(s) (all culling performed)
+    // virtual void add_StaticWallmark (ref_shader& S, const Fvector& P, float s, CDB::TRI* T, Fvector* V)=0;
+    virtual void add_StaticWallmark(const wm_shader& S, const Fvector& P, float s, CDB::TRI* T, Fvector* V) = 0;
+    // Prefer this function when possible
+    virtual void add_StaticWallmark(IWallMarkArray* pArray, const Fvector& P, float s, CDB::TRI* T, Fvector* V) = 0;
+    virtual void clear_static_wallmarks() = 0;
+    //virtual void add_SkeletonWallmark (intrusive_ptr<CSkeletonWallmark> wm) = 0;
+    //virtual void add_SkeletonWallmark (const Fmatrix* xf, CKinematics* obj, ref_shader& sh, const Fvector& start, const Fvector& dir, float size)=0;
+    // Prefer this function when possible
+    virtual void add_SkeletonWallmark(const Fmatrix* xf, IKinematics* obj, IWallMarkArray* pArray, const Fvector& start, const Fvector& dir, float size) = 0;
+
+    //virtual IBlender* blender_create (CLASS_ID cls) = 0;
+    //virtual void blender_destroy (IBlender* &) = 0;
+
+    virtual IRender_ObjectSpecific* ros_create(IRenderable* parent) = 0;
+    virtual void ros_destroy(IRender_ObjectSpecific*&) = 0;
+
+    // Lighting/glowing
+    virtual IRender_Light* light_create() = 0;
+    virtual void light_destroy(IRender_Light* p_) { };
+    virtual IRender_Glow* glow_create() = 0;
+    virtual void glow_destroy(IRender_Glow* p_) { };
+
+    // Models
+    virtual IRenderVisual* model_CreateParticles(LPCSTR name) = 0;
+    // virtual IRender_DetailModel* model_CreateDM (IReader* F) = 0;
+    //virtual IRenderDetailModel* model_CreateDM (IReader* F) = 0;
+    //virtual IRenderVisual* model_Create (LPCSTR name, IReader* data=0) = 0;
+    virtual IRenderVisual* model_Create(LPCSTR name, IReader* data = 0) = 0;
+    virtual IRenderVisual* model_CreateChild(LPCSTR name, IReader* data) = 0;
+    virtual IRenderVisual* model_Duplicate(IRenderVisual* V) = 0;
+    //virtual void model_Delete (IRenderVisual* & V, BOOL bDiscard=FALSE) = 0;
+    virtual void model_Delete(IRenderVisual*& V, BOOL bDiscard = FALSE) = 0;
+    // virtual void model_Delete (IRender_DetailModel* & F) = 0;
+    virtual void model_Logging(BOOL bEnable) = 0;
+    virtual void models_Prefetch() = 0;
+    virtual void models_Clear(BOOL b_complete) = 0;
+
+    // Occlusion culling
+    virtual BOOL occ_visible(vis_data& V) = 0;
+    virtual BOOL occ_visible(Fbox& B) = 0;
+    virtual BOOL occ_visible(sPoly& P) = 0;
+
+    // Main
+    virtual void Calculate() = 0;
+    virtual void Render() = 0;
+
+    virtual void Screenshot(ScreenshotMode mode = SM_NORMAL, LPCSTR name = 0) = 0;
+    virtual void Screenshot(ScreenshotMode mode, CMemoryWriter& memory_writer) = 0;
+    virtual void ScreenshotAsyncBegin() = 0;
+    virtual void ScreenshotAsyncEnd(CMemoryWriter& memory_writer) = 0;
+
+    // Render mode
+    virtual void rmNear() = 0;
+    virtual void rmFar() = 0;
+    virtual void rmNormal() = 0;
+    virtual u32 memory_usage() = 0;
+
+    // Constructor/destructor
+    virtual ~IRender_interface();
 protected:
-	virtual	void					ScreenshotImpl			(ScreenshotMode mode, LPCSTR name, CMemoryWriter* memory_writer) = 0;
+    virtual void ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* memory_writer) = 0;
 };
 
-//extern ENGINE_API	IRender_interface*	Render;
+//extern ENGINE_API IRender_interface* Render;
 
 #endif
\ No newline at end of file
diff --git a/src/xrEngine/Shader_xrLC.h b/src/xrEngine/Shader_xrLC.h
index 71b1b1f77ed..1a73900ad59 100644
--- a/src/xrEngine/Shader_xrLC.h
+++ b/src/xrEngine/Shader_xrLC.h
@@ -5,119 +5,128 @@
 struct Shader_xrLC
 {
 public:
-	enum {
-		flCollision			= 1<<0,
-		flRendering			= 1<<1,
-		flOptimizeUV		= 1<<2,
-		flLIGHT_Vertex		= 1<<3,
-		flLIGHT_CastShadow	= 1<<4,
-		flLIGHT_Sharp		= 1<<5,
-	};
-	struct Flags {
-		u32 bCollision				: 1;
-		u32 bRendering				: 1;
-		u32 bOptimizeUV				: 1;
-		u32 bLIGHT_Vertex			: 1;
-		u32 bLIGHT_CastShadow		: 1;
-		u32 bLIGHT_Sharp			: 1;
-	};
+    enum
+    {
+        flCollision = 1 << 0,
+        flRendering = 1 << 1,
+        flOptimizeUV = 1 << 2,
+        flLIGHT_Vertex = 1 << 3,
+        flLIGHT_CastShadow = 1 << 4,
+        flLIGHT_Sharp = 1 << 5,
+    };
+    struct Flags
+    {
+        u32 bCollision : 1;
+        u32 bRendering : 1;
+        u32 bOptimizeUV : 1;
+        u32 bLIGHT_Vertex : 1;
+        u32 bLIGHT_CastShadow : 1;
+        u32 bLIGHT_Sharp : 1;
+    };
 public:
-	char		Name		[128];
-	union{
-		Flags32	m_Flags;
-        Flags	flags;
+    char Name[128];
+    union
+    {
+        Flags32 m_Flags;
+        Flags flags;
     };
-	float		vert_translucency;
-	float		vert_ambient;
-	float		lm_density;
+    float vert_translucency;
+    float vert_ambient;
+    float lm_density;
 
-	Shader_xrLC()	{
-		xr_strcpy					(Name,"unknown");
-		m_Flags.assign			(0);
-		flags.bCollision		= TRUE;
-		flags.bRendering		= TRUE;
-		flags.bOptimizeUV		= TRUE;
-		flags.bLIGHT_Vertex		= FALSE;
-		flags.bLIGHT_CastShadow = TRUE;
-		flags.bLIGHT_Sharp		= TRUE;
-		vert_translucency		= .5f;
-		vert_ambient			= .0f;
-		lm_density				= 1.f;
-	}
+    Shader_xrLC()
+    {
+        xr_strcpy(Name, "unknown");
+        m_Flags.assign(0);
+        flags.bCollision = TRUE;
+        flags.bRendering = TRUE;
+        flags.bOptimizeUV = TRUE;
+        flags.bLIGHT_Vertex = FALSE;
+        flags.bLIGHT_CastShadow = TRUE;
+        flags.bLIGHT_Sharp = TRUE;
+        vert_translucency = .5f;
+        vert_ambient = .0f;
+        lm_density = 1.f;
+    }
 };
 
-DEFINE_VECTOR(Shader_xrLC,Shader_xrLCVec,Shader_xrLCIt);
+DEFINE_VECTOR(Shader_xrLC, Shader_xrLCVec, Shader_xrLCIt);
 class Shader_xrLC_LIB
 {
-	Shader_xrLCVec			library;
+    Shader_xrLCVec library;
 public:
-	void					Load	(LPCSTR name)
-	{
-		IReader* fs			= FS.r_open(name);
-		if(NULL==fs){
-			string256		inf;
-			extern HWND		logWindow;
-			xr_sprintf			(inf,sizeof(inf),"Build failed!\nCan't load shaders library: '%s'",name);
-//			clMsg			(inf);
-//			MessageBox		(logWindow,inf,"Error!",MB_OK|MB_ICONERROR);
-			FATAL			(inf);
-			return;
-		};
+    void Load(LPCSTR name)
+    {
+        IReader* fs = FS.r_open(name);
+        if (NULL == fs)
+        {
+            string256 inf;
+            extern HWND logWindow;
+            xr_sprintf(inf, sizeof(inf), "Build failed!\nCan't load shaders library: '%s'", name);
+            // clMsg (inf);
+            // MessageBox (logWindow,inf,"Error!",MB_OK|MB_ICONERROR);
+            FATAL(inf);
+            return;
+        };
 
-		int count			= fs->length()/sizeof(Shader_xrLC);
-		R_ASSERT			(int(fs->length()) == int(count*sizeof(Shader_xrLC)));
-		library.resize		(count);
-		fs->r				(&*library.begin(),fs->length());
-        FS.r_close			(fs);
-	}
-	bool					Save	(LPCSTR name)
-	{
-		IWriter* F			= FS.w_open(name);
-        if (F){
-			F->w			(&*library.begin(),(u32)library.size()*sizeof(Shader_xrLC));
-    	    FS.w_close		(F);
-            return 			true;
-        }else{
-        	return 			false;
+        int count = fs->length() / sizeof(Shader_xrLC);
+        R_ASSERT(int(fs->length()) == int(count*sizeof(Shader_xrLC)));
+        library.resize(count);
+        fs->r(&*library.begin(), fs->length());
+        FS.r_close(fs);
+    }
+    bool Save(LPCSTR name)
+    {
+        IWriter* F = FS.w_open(name);
+        if (F)
+        {
+            F->w(&*library.begin(), (u32)library.size()*sizeof(Shader_xrLC));
+            FS.w_close(F);
+            return true;
+        }
+        else
+        {
+            return false;
         }
-	}
-	void					Unload	()
-	{
-		library.clear		();
-	}
-	u32						GetID	(LPCSTR name)
-	{
-		for (Shader_xrLCIt it=library.begin(); it!=library.end(); it++)
-			if (0==stricmp(name,it->Name)) return u32(it-library.begin());
-		return u32(-1);
-	}
-	Shader_xrLC*			Get		(LPCSTR name)
-	{
-		for (Shader_xrLCIt it=library.begin(); it!=library.end(); it++)
-			if (0==stricmp(name,it->Name)) return &(*it);
-		return NULL;
-	}
-	Shader_xrLC*			Get		(int id)
-	{
-		return &library[id];
-	}
-	Shader_xrLC*			Append	(Shader_xrLC* parent=0)
-	{
-		library.push_back(parent?Shader_xrLC(*parent):Shader_xrLC());
-		return &library.back();
-	}
-	void					Remove	(LPCSTR name)
-	{
-		for (Shader_xrLCIt it=library.begin(); it!=library.end(); it++)
-			if (0==stricmp(name,it->Name)){
-            	library.erase(it);
+    }
+    void Unload()
+    {
+        library.clear();
+    }
+    u32 GetID(LPCSTR name)
+    {
+        for (Shader_xrLCIt it = library.begin(); it != library.end(); it++)
+            if (0 == stricmp(name, it->Name)) return u32(it - library.begin());
+        return u32(-1);
+    }
+    Shader_xrLC* Get(LPCSTR name)
+    {
+        for (Shader_xrLCIt it = library.begin(); it != library.end(); it++)
+            if (0 == stricmp(name, it->Name)) return &(*it);
+        return NULL;
+    }
+    Shader_xrLC* Get(int id)
+    {
+        return &library[id];
+    }
+    Shader_xrLC* Append(Shader_xrLC* parent = 0)
+    {
+        library.push_back(parent ? Shader_xrLC(*parent) : Shader_xrLC());
+        return &library.back();
+    }
+    void Remove(LPCSTR name)
+    {
+        for (Shader_xrLCIt it = library.begin(); it != library.end(); it++)
+            if (0 == stricmp(name, it->Name))
+            {
+                library.erase(it);
                 break;
             }
-	}
-	void					Remove	(int id)
-	{
-		library.erase(library.begin()+id);
-	}
-	Shader_xrLCVec&			Library	(){return library;}
+    }
+    void Remove(int id)
+    {
+        library.erase(library.begin() + id);
+    }
+    Shader_xrLCVec& Library() { return library; }
 };
 #endif
diff --git a/src/xrEngine/SkeletonMotionDefs.h b/src/xrEngine/SkeletonMotionDefs.h
index e0621a5b277..200c33b5642 100644
--- a/src/xrEngine/SkeletonMotionDefs.h
+++ b/src/xrEngine/SkeletonMotionDefs.h
@@ -3,12 +3,12 @@
 
 #pragma once
 
-const	u32		MAX_PARTS			=	4;
+const u32 MAX_PARTS = 4;
 
-const	f32		SAMPLE_FPS			=	30.f;
-const	f32		SAMPLE_SPF			=	(1.f/SAMPLE_FPS);
-f32		const	END_EPS				=	SAMPLE_SPF+EPS;
-const	f32		KEY_Quant			=	32767.f;
-const	f32		KEY_QuantI			=	1.f/KEY_Quant;
+const f32 SAMPLE_FPS = 30.f;
+const f32 SAMPLE_SPF = (1.f / SAMPLE_FPS);
+f32 const END_EPS = SAMPLE_SPF + EPS;
+const f32 KEY_Quant = 32767.f;
+const f32 KEY_QuantI = 1.f / KEY_Quant;
 
 #endif
diff --git a/src/xrEngine/SkeletonMotions.cpp b/src/xrEngine/SkeletonMotions.cpp
index b56d6cfe61f..14c3013c823 100644
--- a/src/xrEngine/SkeletonMotions.cpp
+++ b/src/xrEngine/SkeletonMotions.cpp
@@ -1,245 +1,255 @@
 //---------------------------------------------------------------------------
-#include 	"stdafx.h"
+#include "stdafx.h"
 #pragma hdrstop
 
-#include 	"SkeletonMotions.h"
-//#include 	"SkeletonAnimated.h"
-#include	"Fmesh.h"
-#include	"motion.h"
-#include	"..\Include\xrRender\Kinematics.h"
+#include "SkeletonMotions.h"
+//#include "SkeletonAnimated.h"
+#include "Fmesh.h"
+#include "motion.h"
+#include "..\Include\xrRender\Kinematics.h"
 
-motions_container*	g_pMotionsContainer	= 0;
+motions_container* g_pMotionsContainer = 0;
 
 u16 CPartition::part_id(const shared_str& name) const
 {
-	for(u16 i=0; i<MAX_PARTS; ++i)
-	{
-		const CPartDef& pd = part(i);
-		if(pd.Name == name)
-			return i;
-	}
-	Msg("!there is no part named [%s]", name.c_str() );
-	return u16(-1);
+    for (u16 i = 0; i < MAX_PARTS; ++i)
+    {
+        const CPartDef& pd = part(i);
+        if (pd.Name == name)
+            return i;
+    }
+    Msg("!there is no part named [%s]", name.c_str());
+    return u16(-1);
 }
 
 void CPartition::load(IKinematics* V, LPCSTR model_name)
 {
-	string_path fn, fn_full;
-	xr_strcpy(fn, sizeof(fn), model_name);
-	if(strext(fn))
-		*strext(fn) = 0;
-	xr_strcat(fn, sizeof(fn), ".ltx");
-	
-	FS.update_path(fn_full,"$game_meshes$", fn);
-
-	CInifile ini(fn_full, TRUE, TRUE, FALSE);
-
-	if(ini.sections().size()==0)	return;
-	shared_str part_name = "partition_name";
-	for(u32 i=0; i<MAX_PARTS; ++i)
-	{
-		string64			buff;
-		xr_sprintf			(buff,sizeof(buff), "part_%d", i);
-		
-		CInifile::Sect S		= ini.r_section(buff);
-		CInifile::SectCIt it	= S.Data.begin();
-		CInifile::SectCIt it_e	= S.Data.end();
-		if(S.Data.size())
-		{
-			P[i].bones.clear_not_free();
-		}
-		for(;it!=it_e; ++it)
-		{
-			const CInifile::Item& I = *it;
-			if(I.first==part_name)
-			{
-				P[i].Name = I.second;
-			}else
-			{
-				u32 bid = V->LL_BoneID(I.first.c_str());
-				P[i].bones.push_back(bid);
-			}
-		}
-		
-	}
+    string_path fn, fn_full;
+    xr_strcpy(fn, sizeof(fn), model_name);
+    if (strext(fn))
+        *strext(fn) = 0;
+    xr_strcat(fn, sizeof(fn), ".ltx");
+
+    FS.update_path(fn_full, "$game_meshes$", fn);
+
+    CInifile ini(fn_full, TRUE, TRUE, FALSE);
+
+    if (ini.sections().size() == 0) return;
+    shared_str part_name = "partition_name";
+    for (u32 i = 0; i < MAX_PARTS; ++i)
+    {
+        string64 buff;
+        xr_sprintf(buff, sizeof(buff), "part_%d", i);
+
+        CInifile::Sect S = ini.r_section(buff);
+        CInifile::SectCIt it = S.Data.begin();
+        CInifile::SectCIt it_e = S.Data.end();
+        if (S.Data.size())
+        {
+            P[i].bones.clear_not_free();
+        }
+        for (; it != it_e; ++it)
+        {
+            const CInifile::Item& I = *it;
+            if (I.first == part_name)
+            {
+                P[i].Name = I.second;
+            }
+            else
+            {
+                u32 bid = V->LL_BoneID(I.first.c_str());
+                P[i].bones.push_back(bid);
+            }
+        }
+
+    }
 }
 
 u16 find_bone_id(vecBones* bones, shared_str nm)
 {
-	for (u16 i=0; i<(u16)bones->size(); i++)
-		if (bones->at(i)->name==nm) return i;
-	return BI_NONE;
+    for (u16 i = 0; i < (u16)bones->size(); i++)
+        if (bones->at(i)->name == nm) return i;
+    return BI_NONE;
 }
 
 //-----------------------------------------------------------------------
-BOOL motions_value::load		(LPCSTR N, IReader *data, vecBones* bones)
+BOOL motions_value::load(LPCSTR N, IReader* data, vecBones* bones)
 {
 
-	m_id						= N;
-
-	bool bRes					= true;
-	// Load definitions
-	U16Vec rm_bones				(bones->size(),BI_NONE);
-	IReader* MP 				= data->open_chunk(OGF_S_SMPARAMS);
-
-	if (MP)
-	{
-		u16 vers 				= MP->r_u16();
-		u16 part_bone_cnt		= 0;
-		string128 				buf;
-		R_ASSERT3				(vers<=xrOGF_SMParamsVersion,"Invalid OGF/OMF version:",N);
-		
-		// partitions
-		u16						part_count;
-		part_count 				= MP->r_u16();
-
-		for (u16 part_i=0; part_i<part_count; part_i++)
-		{
-			CPartDef& PART		= m_partition[part_i];
-			MP->r_stringZ		(buf,sizeof(buf));
-			PART.Name			= _strlwr(buf);
-			PART.bones.resize	(MP->r_u16());
-
-			for (xr_vector<u32>::iterator b_it=PART.bones.begin(); b_it<PART.bones.end(); b_it++)
-			{
-				MP->r_stringZ	(buf,sizeof(buf));
-				u16 m_idx 		= u16			(MP->r_u32());
-				*b_it			= find_bone_id	(bones,buf);
+    m_id = N;
+
+    bool bRes = true;
+    // Load definitions
+    U16Vec rm_bones(bones->size(), BI_NONE);
+    IReader* MP = data->open_chunk(OGF_S_SMPARAMS);
+
+    if (MP)
+    {
+        u16 vers = MP->r_u16();
+        u16 part_bone_cnt = 0;
+        string128 buf;
+        R_ASSERT3(vers <= xrOGF_SMParamsVersion, "Invalid OGF/OMF version:", N);
+
+        // partitions
+        u16 part_count;
+        part_count = MP->r_u16();
+
+        for (u16 part_i = 0; part_i < part_count; part_i++)
+        {
+            CPartDef& PART = m_partition[part_i];
+            MP->r_stringZ(buf, sizeof(buf));
+            PART.Name = _strlwr(buf);
+            PART.bones.resize(MP->r_u16());
+
+            for (xr_vector<u32>::iterator b_it = PART.bones.begin(); b_it < PART.bones.end(); b_it++)
+            {
+                MP->r_stringZ(buf, sizeof(buf));
+                u16 m_idx = u16(MP->r_u32());
+                *b_it = find_bone_id(bones, buf);
 #ifdef _EDITOR
-				if (*b_it==BI_NONE )
+                if (*b_it==BI_NONE )
                 {
-					bRes		= false;
-					Msg			("!Can't find bone: '%s'", buf);
-				}
+                    bRes = false;
+                    Msg ("!Can't find bone: '%s'", buf);
+                }
 
-				if (rm_bones.size() <= m_idx)
+                if (rm_bones.size() <= m_idx)
                 {
-					bRes		= false;
-					Msg			("!Can't load: '%s' invalid bones count", N);
-				}
+                    bRes = false;
+                    Msg ("!Can't load: '%s' invalid bones count", N);
+                }
 #else
-				VERIFY3			(*b_it!=BI_NONE,"Can't find bone:", buf);
+                VERIFY3(*b_it != BI_NONE, "Can't find bone:", buf);
 #endif
-				if (bRes)		rm_bones[m_idx] = u16(*b_it);
-			}
-			part_bone_cnt		= u16(part_bone_cnt + (u16)PART.bones.size());
-		}
+                if (bRes) rm_bones[m_idx] = u16(*b_it);
+            }
+            part_bone_cnt = u16(part_bone_cnt + (u16)PART.bones.size());
+        }
 
 #ifdef _EDITOR
-		if (part_bone_cnt!=(u16)bones->size()){
-			bRes = false;
-			Msg("!Different bone count[%s] [Object: '%d' <-> Motions: '%d']", N, bones->size(),part_bone_cnt);
-		}
+        if (part_bone_cnt!=(u16)bones->size())
+        {
+            bRes = false;
+            Msg("!Different bone count[%s] [Object: '%d' <-> Motions: '%d']", N, bones->size(),part_bone_cnt);
+        }
 #else
-		VERIFY3(part_bone_cnt==(u16)bones->size(),"Different bone count '%s'",N);
+        VERIFY3(part_bone_cnt == (u16)bones->size(), "Different bone count '%s'", N);
 #endif
-		if (bRes)
-		{
-			// motion defs (cycle&fx)
-			u16 mot_count			= MP->r_u16();
-            m_mdefs.resize			(mot_count);
-
-			for (u16 mot_i=0; mot_i<mot_count; mot_i++)
-			{
-				MP->r_stringZ		(buf,sizeof(buf));
-				shared_str nm		= _strlwr		(buf);
-				u32 dwFlags			= MP->r_u32		();
-				CMotionDef&	D		= m_mdefs[mot_i];
-                D.Load				(MP,dwFlags,vers);
-//.             m_mdefs.push_back	(D);
-				
-				if (dwFlags&esmFX)	
-					m_fx.insert		(mk_pair(nm,mot_i));
-				else				
-					m_cycle.insert	(mk_pair(nm,mot_i));
-
-                m_motion_map.insert	(mk_pair(nm,mot_i));
-			}
-		}
-		MP->close();
-	}else
-	{
-		Debug.fatal	(DEBUG_INFO,"Old skinned model version unsupported! (%s)",N);
-	}
-	if (!bRes)	return false;
-
-	// Load animation
-	IReader*	MS		= data->open_chunk(OGF_S_MOTIONS);
-	if (!MS) 			return false;
-
-	u32			dwCNT	= 0;
-	MS->r_chunk_safe	(0,&dwCNT,sizeof(dwCNT));
-    VERIFY		(dwCNT<0x3FFF); // MotionID 2 bit - slot, 14 bit - motion index
-
-	// set per bone motion size
-	for (u32 i=0; i<bones->size(); i++)
-		m_motions[bones->at(i)->name].resize(dwCNT);
-
-	// load motions
-	for (u16 m_idx=0; m_idx<(u16)dwCNT; m_idx++){
-		string128			mname;
-		R_ASSERT			(MS->find_chunk(m_idx+1));             
-		MS->r_stringZ		(mname,sizeof(mname));
-#ifdef _DEBUG        
-		// sanity check
-		xr_strlwr			(mname);
-        accel_map::iterator I= m_motion_map.find(mname); 
-        VERIFY3				(I!=m_motion_map.end(),"Can't find motion:",mname);
-        VERIFY3				(I->second==m_idx,"Invalid motion index:",mname);
+        if (bRes)
+        {
+            // motion defs (cycle&fx)
+            u16 mot_count = MP->r_u16();
+            m_mdefs.resize(mot_count);
+
+            for (u16 mot_i = 0; mot_i < mot_count; mot_i++)
+            {
+                MP->r_stringZ(buf, sizeof(buf));
+                shared_str nm = _strlwr(buf);
+                u32 dwFlags = MP->r_u32();
+                CMotionDef& D = m_mdefs[mot_i];
+                D.Load(MP, dwFlags, vers);
+                //. m_mdefs.push_back (D);
+
+                if (dwFlags&esmFX)
+                    m_fx.insert(mk_pair(nm, mot_i));
+                else
+                    m_cycle.insert(mk_pair(nm, mot_i));
+
+                m_motion_map.insert(mk_pair(nm, mot_i));
+            }
+        }
+        MP->close();
+    }
+    else
+    {
+        Debug.fatal(DEBUG_INFO, "Old skinned model version unsupported! (%s)", N);
+    }
+    if (!bRes) return false;
+
+    // Load animation
+    IReader* MS = data->open_chunk(OGF_S_MOTIONS);
+    if (!MS) return false;
+
+    u32 dwCNT = 0;
+    MS->r_chunk_safe(0, &dwCNT, sizeof(dwCNT));
+    VERIFY(dwCNT < 0x3FFF); // MotionID 2 bit - slot, 14 bit - motion index
+
+    // set per bone motion size
+    for (u32 i = 0; i < bones->size(); i++)
+        m_motions[bones->at(i)->name].resize(dwCNT);
+
+    // load motions
+    for (u16 m_idx = 0; m_idx < (u16)dwCNT; m_idx++)
+    {
+        string128 mname;
+        R_ASSERT(MS->find_chunk(m_idx + 1));
+        MS->r_stringZ(mname, sizeof(mname));
+#ifdef _DEBUG
+        // sanity check
+        xr_strlwr (mname);
+        accel_map::iterator I= m_motion_map.find(mname);
+        VERIFY3 (I!=m_motion_map.end(),"Can't find motion:",mname);
+        VERIFY3 (I->second==m_idx,"Invalid motion index:",mname);
 #endif
-		u32 dwLen			= MS->r_u32();
-		for (u32 i=0; i<bones->size(); i++){
-			u16 bone_id		= rm_bones[i];
-			VERIFY2			(bone_id!=BI_NONE,"Invalid remap index.");
-			CMotion&		M	= m_motions[bones->at(bone_id)->name][m_idx];
-			M.set_count			(dwLen);
-			M.set_flags			(MS->r_u8());
-            
-            if (M.test_flag(flRKeyAbsent))	{
-                CKeyQR* r 		= (CKeyQR*)MS->pointer();
-				u32 crc_q		= crc32(r,sizeof(CKeyQR));
-				M._keysR.create	(crc_q,1,r);
-                MS->advance		(1 * sizeof(CKeyQR));
-            }else{
-                u32 crc_q		= MS->r_u32	();
-                M._keysR.create	(crc_q,dwLen,(CKeyQR*)MS->pointer());
-                MS->advance		(dwLen * sizeof(CKeyQR));
+        u32 dwLen = MS->r_u32();
+        for (u32 i = 0; i < bones->size(); i++)
+        {
+            u16 bone_id = rm_bones[i];
+            VERIFY2(bone_id != BI_NONE, "Invalid remap index.");
+            CMotion& M = m_motions[bones->at(bone_id)->name][m_idx];
+            M.set_count(dwLen);
+            M.set_flags(MS->r_u8());
+
+            if (M.test_flag(flRKeyAbsent))
+            {
+                CKeyQR* r = (CKeyQR*)MS->pointer();
+                u32 crc_q = crc32(r, sizeof(CKeyQR));
+                M._keysR.create(crc_q, 1, r);
+                MS->advance(1 * sizeof(CKeyQR));
             }
-            if (M.test_flag(flTKeyPresent))	
+            else
             {
-                u32 crc_t		= MS->r_u32	();
-                if(M.test_flag(flTKey16IsBit))
+                u32 crc_q = MS->r_u32();
+                M._keysR.create(crc_q, dwLen, (CKeyQR*)MS->pointer());
+                MS->advance(dwLen * sizeof(CKeyQR));
+            }
+            if (M.test_flag(flTKeyPresent))
+            {
+                u32 crc_t = MS->r_u32();
+                if (M.test_flag(flTKey16IsBit))
                 {
-                    M._keysT16.create	(crc_t,dwLen,(CKeyQT16*)MS->pointer());
-                    MS->advance			(dwLen * sizeof(CKeyQT16));
-                }else
+                    M._keysT16.create(crc_t, dwLen, (CKeyQT16*)MS->pointer());
+                    MS->advance(dwLen * sizeof(CKeyQT16));
+                }
+                else
                 {
-                    M._keysT8.create	(crc_t,dwLen,(CKeyQT8*)MS->pointer());
-                    MS->advance			(dwLen * sizeof(CKeyQT8));
+                    M._keysT8.create(crc_t, dwLen, (CKeyQT8*)MS->pointer());
+                    MS->advance(dwLen * sizeof(CKeyQT8));
                 };
-                
-                MS->r_fvector3	(M._sizeT);
-                MS->r_fvector3	(M._initT);
-            }else
+
+                MS->r_fvector3(M._sizeT);
+                MS->r_fvector3(M._initT);
+            }
+            else
             {
-                MS->r_fvector3	(M._initT);
+                MS->r_fvector3(M._initT);
             }
-		}
-	}
-//	Msg("Motions %d/%d %4d/%4d/%d, %s",p_cnt,m_cnt, m_load,m_total,m_r,N);
-	MS->close();
+        }
+    }
+    // Msg("Motions %d/%d %4d/%4d/%d, %s",p_cnt,m_cnt, m_load,m_total,m_r,N);
+    MS->close();
 
-	return bRes;
+    return bRes;
 }
 
 MotionVec* motions_value::bone_motions(shared_str bone_name)
 {
-	BoneMotionMapIt I = m_motions.find(bone_name);
-//	VERIFY			(I != m_motions.end());
-	if (I == m_motions.end())
-		return		(0);
+    BoneMotionMapIt I = m_motions.find(bone_name);
+    // VERIFY (I != m_motions.end());
+    if (I == m_motions.end())
+        return (0);
 
-	return			(&(*I).second);
+    return (&(*I).second);
 }
 //-----------------------------------
 motions_container::motions_container()
@@ -248,218 +258,230 @@ motions_container::motions_container()
 //extern shared_str s_bones_array_const;
 motions_container::~motions_container()
 {
-//	clean	(false);
-//	clean	(true);
-//	dump	();
-	VERIFY	(container.empty());
-	//	Igor:
-	//s_bones_array_const = 0;
+    // clean (false);
+    // clean (true);
+    // dump ();
+    VERIFY(container.empty());
+    // Igor:
+    //s_bones_array_const = 0;
 }
 
 bool motions_container::has(shared_str key)
 {
-	return (container.find(key)!=container.end());
+    return (container.find(key) != container.end());
 }
 
-motions_value* motions_container::dock(shared_str key, IReader *data, vecBones* bones)
+motions_value* motions_container::dock(shared_str key, IReader* data, vecBones* bones)
 {
-	motions_value*	result		= 0	;
-	SharedMotionsMapIt	I		= container.find	(key);
-	if (I!=container.end())		result = I->second;
-	if (0==result)				{
-		// loading motions
-		VERIFY					(data);
-		result					= xr_new<motions_value>();
-		result->m_dwReference	= 0;
-		BOOL bres				= result->load	(key.c_str(),data,bones);
-		if (bres)
-        	container.insert(mk_pair(key,result));
-		else
-        	xr_delete		(result);
-	}
-	return result;
+    motions_value* result = 0;
+    SharedMotionsMapIt I = container.find(key);
+    if (I != container.end()) result = I->second;
+    if (0 == result)
+    {
+        // loading motions
+        VERIFY(data);
+        result = xr_new<motions_value>();
+        result->m_dwReference = 0;
+        BOOL bres = result->load(key.c_str(), data, bones);
+        if (bres)
+            container.insert(mk_pair(key, result));
+        else
+            xr_delete(result);
+    }
+    return result;
 }
 void motions_container::clean(bool force_destroy)
 {
-	SharedMotionsMapIt it	= container.begin();
-	SharedMotionsMapIt _E	= container.end();
-	if (force_destroy){
-		for (; it!=_E; it++){
-			motions_value*	sv = it->second;
-			xr_delete		(sv);
-		}
-		container.clear		();
-	}else{
-		for (; it!=_E; )	{
-			motions_value*	sv = it->second;
-			if (0==sv->m_dwReference)	
-			{
-				SharedMotionsMapIt	i_current	= it;
-				SharedMotionsMapIt	i_next		= ++it;
-				xr_delete			(sv);
-				container.erase		(i_current);
-				it					= i_next;
-			} else {
-				it++;
-			}
-		}
-	}
+    SharedMotionsMapIt it = container.begin();
+    SharedMotionsMapIt _E = container.end();
+    if (force_destroy)
+    {
+        for (; it != _E; it++)
+        {
+            motions_value* sv = it->second;
+            xr_delete(sv);
+        }
+        container.clear();
+    }
+    else
+    {
+        for (; it != _E;)
+        {
+            motions_value* sv = it->second;
+            if (0 == sv->m_dwReference)
+            {
+                SharedMotionsMapIt i_current = it;
+                SharedMotionsMapIt i_next = ++it;
+                xr_delete(sv);
+                container.erase(i_current);
+                it = i_next;
+            }
+            else
+            {
+                it++;
+            }
+        }
+    }
 }
 void motions_container::dump()
 {
-	SharedMotionsMapIt it	= container.begin();
-	SharedMotionsMapIt _E	= container.end();
-	Log	("--- motion container --- begin:");
-	u32 sz					= sizeof(*this);
-	for (u32 k=0; it!=_E; k++,it++){
-		sz					+= it->second->mem_usage();
-		Msg("#%3d: [%3d/%5d Kb] - %s",k,it->second->m_dwReference,it->second->mem_usage()/1024,it->first.c_str());
-	}
-	Msg ("--- items: %d, mem usage: %d Kb ",container.size(),sz/1024);
-	Log	("--- motion container --- end.");
+    SharedMotionsMapIt it = container.begin();
+    SharedMotionsMapIt _E = container.end();
+    Log("--- motion container --- begin:");
+    u32 sz = sizeof(*this);
+    for (u32 k = 0; it != _E; k++, it++)
+    {
+        sz += it->second->mem_usage();
+        Msg("#%3d: [%3d/%5d Kb] - %s", k, it->second->m_dwReference, it->second->mem_usage() / 1024, it->first.c_str());
+    }
+    Msg("--- items: %d, mem usage: %d Kb ", container.size(), sz / 1024);
+    Log("--- motion container --- end.");
 }
 
 //////////////////////////////////////////////////////////////////////////
 // High level control
 void CMotionDef::Load(IReader* MP, u32 fl, u16 version)
 {
-	// params
-	bone_or_part= MP->r_u16(); // bCycle?part_id:bone_id;
-	motion		= MP->r_u16(); // motion_id
-	speed		= Quantize(MP->r_float());
-	power		= Quantize(MP->r_float());
-	accrue		= Quantize(MP->r_float());
-	falloff		= Quantize(MP->r_float());
-	flags		= (u16)fl;
-	if (!(flags&esmFX) && (falloff>=accrue)) falloff = u16(accrue-1);
-
-	if(version>=4)
-	{
-		u32	cnt				= MP->r_u32();
-        if(cnt>0)
+    // params
+    bone_or_part = MP->r_u16(); // bCycle?part_id:bone_id;
+    motion = MP->r_u16(); // motion_id
+    speed = Quantize(MP->r_float());
+    power = Quantize(MP->r_float());
+    accrue = Quantize(MP->r_float());
+    falloff = Quantize(MP->r_float());
+    flags = (u16)fl;
+    if (!(flags&esmFX) && (falloff >= accrue)) falloff = u16(accrue - 1);
+
+    if (version >= 4)
+    {
+        u32 cnt = MP->r_u32();
+        if (cnt > 0)
         {
-            marks.resize		(cnt);
+            marks.resize(cnt);
 
-            for(u32 i=0; i<cnt; ++i)
-                marks[i].Load	(MP);
+            for (u32 i = 0; i < cnt; ++i)
+                marks[i].Load(MP);
         }
-	}
+    }
 }
 
 bool CMotionDef::StopAtEnd()
 {
-	return !!(flags&esmStopAtEnd);
+    return !!(flags&esmStopAtEnd);
 }
 
-bool shared_motions::create(shared_str key, IReader *data, vecBones* bones)
+bool shared_motions::create(shared_str key, IReader* data, vecBones* bones)
 {
-	motions_value* v = g_pMotionsContainer->dock(key,data,bones);
-	if (0!=v)
-		v->m_dwReference++;
-	destroy			();
-	p_				= v;
-    return (0!=v);
+    motions_value* v = g_pMotionsContainer->dock(key, data, bones);
+    if (0 != v)
+        v->m_dwReference++;
+    destroy();
+    p_ = v;
+    return (0 != v);
 }
 
-bool shared_motions::create(shared_motions const &rhs)
+bool shared_motions::create(shared_motions const& rhs)
 {
-	motions_value* v = rhs.p_;
-	if (0!=v)
-		v->m_dwReference++;
-	destroy			();
-	p_				= v;
-    return (0!=v);
+    motions_value* v = rhs.p_;
+    if (0 != v)
+        v->m_dwReference++;
+    destroy();
+    p_ = v;
+    return (0 != v);
 }
 
 const motion_marks::interval* motion_marks::pick_mark(const float& t) const
 {
-	C_ITERATOR	it		= intervals.begin();
-	C_ITERATOR	it_e	= intervals.end();
-
-	for( ;it!=it_e; ++it)
-	{
-		const interval& I = (*it);
-		if( I.first<=t && I.second>=t )
-			return &I;
-		
-		if(I.first>t)
-			break;
-	}
-	return NULL;
+    C_ITERATOR it = intervals.begin();
+    C_ITERATOR it_e = intervals.end();
+
+    for (; it != it_e; ++it)
+    {
+        const interval& I = (*it);
+        if (I.first <= t && I.second >= t)
+            return &I;
+
+        if (I.first > t)
+            break;
+    }
+    return NULL;
 }
 
-bool motion_marks::is_mark_between	(float const &t0, float const &t1) const
+bool motion_marks::is_mark_between(float const& t0, float const& t1) const
 {
-	VERIFY				(t0 <= t1);
+    VERIFY(t0 <= t1);
 
-	C_ITERATOR			i = intervals.begin();
-	C_ITERATOR			e = intervals.end();
-	for ( ; i != e; ++i) {
-		VERIFY			((*i).first <= (*i).second);
+    C_ITERATOR i = intervals.begin();
+    C_ITERATOR e = intervals.end();
+    for (; i != e; ++i)
+    {
+        VERIFY((*i).first <= (*i).second);
 
-		if ((*i).first == t0)
-			return		(true);
+        if ((*i).first == t0)
+            return (true);
 
-		if ((*i).first > t0) {
-			if ((*i).second <= t1)
-				return	(true);
+        if ((*i).first > t0)
+        {
+            if ((*i).second <= t1)
+                return (true);
 
-			if ((*i).first <= t1)
-				return	(true);
+            if ((*i).first <= t1)
+                return (true);
 
-			return		(false);
-		}
+            return (false);
+        }
 
-		if ((*i).second < t0)
-			continue;
+        if ((*i).second < t0)
+            continue;
 
-		if ((*i).second == t0)
-			return		(true);
+        if ((*i).second == t0)
+            return (true);
 
-		return			(true);
-	}
+        return (true);
+    }
 
-	return				(false);
+    return (false);
 }
 
-float	motion_marks::	time_to_next_mark	(float time) const
+float motion_marks::time_to_next_mark(float time) const
 {
-	C_ITERATOR			i = intervals.begin();
-	C_ITERATOR			e = intervals.end();
-	float result_dist = FLT_MAX;
-	for ( ; i != e; ++i) {
-		float dist = (*i).first - time;
-		if( dist > 0.f && dist < result_dist )
-			result_dist = dist;
-	}
-	return result_dist;
+    C_ITERATOR i = intervals.begin();
+    C_ITERATOR e = intervals.end();
+    float result_dist = FLT_MAX;
+    for (; i != e; ++i)
+    {
+        float dist = (*i).first - time;
+        if (dist > 0.f && dist < result_dist)
+            result_dist = dist;
+    }
+    return result_dist;
 }
 
 void ENGINE_API motion_marks::Load(IReader* R)
 {
-	xr_string 			tmp;
-	R->r_string			(tmp);
-    name				= tmp.c_str();
-	u32 cnt				= R->r_u32();
-	intervals.resize	(cnt);
-	for(u32 i=0; i<cnt; ++i)
-	{
-		interval& item		= intervals[i];
-		item.first			= R->r_float();
-		item.second			= R->r_float();
-	}
+    xr_string tmp;
+    R->r_string(tmp);
+    name = tmp.c_str();
+    u32 cnt = R->r_u32();
+    intervals.resize(cnt);
+    for (u32 i = 0; i < cnt; ++i)
+    {
+        interval& item = intervals[i];
+        item.first = R->r_float();
+        item.second = R->r_float();
+    }
 }
 #ifdef _EDITOR
 void motion_marks::Save(IWriter* W)
 {
-	W->w_string			(name.c_str());
-	u32 cnt				= intervals.size();
-    W->w_u32			(cnt);
-	for(u32 i=0; i<cnt; ++i)
-	{
-		interval& item		= intervals[i];
-		W->w_float			(item.first);
-		W->w_float			(item.second);
-	}
+    W->w_string (name.c_str());
+    u32 cnt = intervals.size();
+    W->w_u32 (cnt);
+    for(u32 i=0; i<cnt; ++i)
+    {
+        interval& item = intervals[i];
+        W->w_float (item.first);
+        W->w_float (item.second);
+    }
 }
 #endif
diff --git a/src/xrEngine/SkeletonMotions.h b/src/xrEngine/SkeletonMotions.h
index 48ac2353d5b..24f949188a4 100644
--- a/src/xrEngine/SkeletonMotions.h
+++ b/src/xrEngine/SkeletonMotions.h
@@ -2,241 +2,246 @@
 #ifndef SkeletonMotionsH
 #define SkeletonMotionsH
 
-//#include		"skeletoncustom.h"
+//#include "skeletoncustom.h"
 #include "bone.h"
-#include "skeletonmotiondefs.h"	
+#include "skeletonmotiondefs.h"
 // refs
 class CKinematicsAnimated;
 class CBlend;
 class IKinematics;
 
 // callback
-typedef void	( * PlayCallback)		(CBlend*		P);
+typedef void(*PlayCallback) (CBlend* P);
 
 
 //*** Key frame definition ************************************************************************
-enum{
-    flTKeyPresent 	= (1<<0),
-    flRKeyAbsent 	= (1<<1),
-    flTKey16IsBit 	= (1<<2),
+enum
+{
+    flTKeyPresent = (1 << 0),
+    flRKeyAbsent = (1 << 1),
+    flTKey16IsBit = (1 << 2),
 };
 #pragma pack(push,2)
-struct  CKey
+struct CKey
 {
-	Fquaternion	Q;			// rotation
-	Fvector		T;			// translation
+    Fquaternion Q; // rotation
+    Fvector T; // translation
 };
-struct  CKeyQR
+struct CKeyQR
 {
-	s16			x,y,z,w;	// rotation
+    s16 x, y, z, w; // rotation
 };
-struct  CKeyQT8
+struct CKeyQT8
 {
-	s8			x1,y1,z1;
+    s8 x1, y1, z1;
 };
-struct  CKeyQT16
+struct CKeyQT16
 {
-	s16			x1,y1,z1;
+    s16 x1, y1, z1;
 };
 /*
-struct  CKeyQT
+struct CKeyQT
 {
-//	s8			x,y,z;
-	s16			x1,y1,z1;
+// s8 x,y,z;
+s16 x1,y1,z1;
 };
 */
 #pragma pack(pop)
 
 //*** Motion Data *********************************************************************************
-class 	ENGINE_API	CMotion
+class ENGINE_API CMotion
 {
-	struct{
-    	u32				_flags	: 8;
-		u32				_count 	: 24;
+    struct
+    {
+        u32 _flags : 8;
+        u32 _count : 24;
     };
 public:
-    ref_smem<CKeyQR>	_keysR;
-    ref_smem<CKeyQT8>	_keysT8;
-    ref_smem<CKeyQT16>	_keysT16;
-	Fvector				_initT;
-    Fvector				_sizeT;
-public:    
-    void				set_flags			(u8 val)			{_flags=val;}
-    void				set_flag			(u8 mask, u8 val)	{if (val)_flags|=mask; else _flags&=~mask;}
-    BOOL				test_flag			(u8 mask) const		{return BOOL(_flags&mask);}
-
-    void				set_count			(u32 cnt){VERIFY(cnt); _count=cnt;}
-    ICF u32					get_count			() const {return (u32(_count)&0x00FFFFFF);}
-
-	float				GetLength			(){ return float(_count)*SAMPLE_SPF; }
-
-	u32					mem_usage			(){ 
-		u32 sz			= sizeof(*this);
-		if (_keysR.size()) sz += _keysR.size()*sizeof(CKeyQR)/_keysR.ref_count();
-		if (_keysT8.size()) sz += _keysT8.size()*sizeof(CKeyQT8)/_keysT8.ref_count();
-		if (_keysT16.size()) sz += _keysT16.size()*sizeof(CKeyQT16)/_keysT16.ref_count();
-		return			sz;
-	}
+    ref_smem<CKeyQR> _keysR;
+    ref_smem<CKeyQT8> _keysT8;
+    ref_smem<CKeyQT16> _keysT16;
+    Fvector _initT;
+    Fvector _sizeT;
+public:
+    void set_flags(u8 val) { _flags = val; }
+    void set_flag(u8 mask, u8 val) { if (val)_flags |= mask; else _flags &= ~mask; }
+    BOOL test_flag(u8 mask) const { return BOOL(_flags&mask); }
+
+    void set_count(u32 cnt) { VERIFY(cnt); _count = cnt; }
+    ICF u32 get_count() const { return (u32(_count) & 0x00FFFFFF); }
+
+    float GetLength() { return float(_count)*SAMPLE_SPF; }
+
+    u32 mem_usage()
+    {
+        u32 sz = sizeof(*this);
+        if (_keysR.size()) sz += _keysR.size()*sizeof(CKeyQR) / _keysR.ref_count();
+        if (_keysT8.size()) sz += _keysT8.size()*sizeof(CKeyQT8) / _keysT8.ref_count();
+        if (_keysT16.size()) sz += _keysT16.size()*sizeof(CKeyQT16) / _keysT16.ref_count();
+        return sz;
+    }
 };
 
 class ENGINE_API motion_marks
 {
 public:
-	typedef					std::pair<  float, float > 				interval;
+    typedef std::pair< float, float > interval;
 #ifdef _EDITOR
 public:
 #else
 private:
 #endif
-	typedef xr_vector< interval >									STORAGE;
-	typedef STORAGE::iterator										ITERATOR;
-	typedef STORAGE::const_iterator									C_ITERATOR;
+    typedef xr_vector< interval > STORAGE;
+    typedef STORAGE::iterator ITERATOR;
+    typedef STORAGE::const_iterator C_ITERATOR;
 
-	STORAGE			intervals;	
+    STORAGE intervals;
 public:
-	shared_str		name;
-	void			Load				(IReader*);
+    shared_str name;
+    void Load(IReader*);
 
 #ifdef _EDITOR
-	void			Save				(IWriter*);
+    void Save(IWriter*);
 #endif
-	bool			is_empty			() const { return intervals.empty(); }
-	const interval*	pick_mark			(float const &t) const;
-	bool			is_mark_between		(float const &t0, float const &t1) const;
-	float			time_to_next_mark	(float time) const;
+    bool is_empty() const { return intervals.empty(); }
+    const interval* pick_mark(float const& t) const;
+    bool is_mark_between(float const& t0, float const& t1) const;
+    float time_to_next_mark(float time) const;
 };
 
 
-const float	fQuantizerRangeExt	= 1.5f;
-class 	ENGINE_API	CMotionDef
+const float fQuantizerRangeExt = 1.5f;
+class ENGINE_API CMotionDef
 {
 public:
-    u16						bone_or_part;
-	u16						motion;
-	u16						speed;				// quantized: 0..10
-	u16						power;				// quantized: 0..10
-	u16						accrue;				// quantized: 0..10
-	u16						falloff;			// quantized: 0..10
-    u16						flags;
-	xr_vector<motion_marks>	marks;
-
-	IC float				Dequantize			(u16 V)	const	{	return  float(V)/655.35f; }
-	IC u16					Quantize			(float V) const		{	s32		t = iFloor(V*655.35f); clamp(t,0,65535); return u16(t); }
-
-	void					Load				(IReader* MP, u32 fl, u16 vers);
-	u32						mem_usage			(){ return sizeof(*this);}
-
-    ICF float				Accrue				(){return fQuantizerRangeExt*Dequantize(accrue);}
-    ICF float				Falloff				(){return fQuantizerRangeExt*Dequantize(falloff);}
-    ICF float				Speed				(){return Dequantize(speed);}
-    ICF float				Power				(){return Dequantize(power);}
-    bool					StopAtEnd			();
+    u16 bone_or_part;
+    u16 motion;
+    u16 speed; // quantized: 0..10
+    u16 power; // quantized: 0..10
+    u16 accrue; // quantized: 0..10
+    u16 falloff; // quantized: 0..10
+    u16 flags;
+    xr_vector<motion_marks> marks;
+
+    IC float Dequantize(u16 V) const { return float(V) / 655.35f; }
+    IC u16 Quantize(float V) const { s32 t = iFloor(V*655.35f); clamp(t, 0, 65535); return u16(t); }
+
+    void Load(IReader* MP, u32 fl, u16 vers);
+    u32 mem_usage() { return sizeof(*this); }
+
+    ICF float Accrue() { return fQuantizerRangeExt*Dequantize(accrue); }
+    ICF float Falloff() { return fQuantizerRangeExt*Dequantize(falloff); }
+    ICF float Speed() { return Dequantize(speed); }
+    ICF float Power() { return Dequantize(power); }
+    bool StopAtEnd();
 };
-struct accel_str_pred : public std::binary_function<shared_str, shared_str, bool>	{	
-	IC bool operator()(const shared_str& x, const shared_str& y) const	{	return xr_strcmp(x,y)<0;	}
+struct accel_str_pred : public std::binary_function < shared_str, shared_str, bool >
+{
+    IC bool operator()(const shared_str& x, const shared_str& y) const { return xr_strcmp(x, y) < 0; }
 };
-typedef xr_map<shared_str,u16,accel_str_pred> 	accel_map;
-DEFINE_VECTOR			(CMotionDef,MotionDefVec,MotionDefVecIt);
+typedef xr_map<shared_str, u16, accel_str_pred> accel_map;
+DEFINE_VECTOR(CMotionDef, MotionDefVec, MotionDefVecIt);
 
-DEFINE_VECTOR			(CMotion,MotionVec,MotionVecIt);
-DEFINE_VECTOR			(MotionVec*,BoneMotionsVec,BoneMotionsVecIt);
-DEFINE_MAP				(shared_str,MotionVec,BoneMotionMap,BoneMotionMapIt);
+DEFINE_VECTOR(CMotion, MotionVec, MotionVecIt);
+DEFINE_VECTOR(MotionVec*, BoneMotionsVec, BoneMotionsVecIt);
+DEFINE_MAP(shared_str, MotionVec, BoneMotionMap, BoneMotionMapIt);
 
 // partition
-class 	ENGINE_API	CPartDef
+class ENGINE_API CPartDef
 {
 public:
-	shared_str			Name;
-	xr_vector<u32>		bones;
-	CPartDef()			: Name(0) {};
+    shared_str Name;
+    xr_vector<u32> bones;
+    CPartDef() : Name(0) {};
 
-	u32					mem_usage			(){ return sizeof(*this)+bones.size()*sizeof(u32)+sizeof(Name);}
+    u32 mem_usage() { return sizeof(*this) + bones.size()*sizeof(u32) + sizeof(Name); }
 };
-class 	ENGINE_API	CPartition
+class ENGINE_API CPartition
 {
-	CPartDef			P[MAX_PARTS];
+    CPartDef P[MAX_PARTS];
 public:
-	IC CPartDef&		operator[] 			(u16 id)						{ return P[id]; }
-	IC const CPartDef&	part				(u16 id)				const	{ return P[id]; }
-	u16					part_id				(const shared_str& name) const	;
-	u32					mem_usage			()		{ return P[0].mem_usage()*MAX_PARTS;}
-	void				load				(IKinematics* V, LPCSTR model_name);
-    u8					count				() const {u8 ret=0;for(u8 i=0;i<MAX_PARTS;++i) if(P[i].Name.size())ret++; return ret;};
+    IC CPartDef& operator[] (u16 id) { return P[id]; }
+    IC const CPartDef& part(u16 id) const { return P[id]; }
+    u16 part_id(const shared_str& name) const;
+    u32 mem_usage() { return P[0].mem_usage()*MAX_PARTS; }
+    void load(IKinematics* V, LPCSTR model_name);
+    u8 count() const { u8 ret = 0; for (u8 i = 0; i < MAX_PARTS; ++i) if (P[i].Name.size())ret++; return ret; };
 };
 
 // shared motions
-struct 	ENGINE_API	motions_value
+struct ENGINE_API motions_value
 {
-	accel_map			m_motion_map;		// motion associations
-	accel_map			m_cycle;			// motion data itself	(shared)
-	accel_map			m_fx;				// motion data itself	(shared)
-	CPartition			m_partition;		// partition
-	u32					m_dwReference;
-	BoneMotionMap		m_motions;
-    MotionDefVec		m_mdefs;
-
-	shared_str			m_id;
-
-
-	BOOL				load				(LPCSTR N, IReader *data, vecBones* bones);
-	MotionVec*			bone_motions		(shared_str bone_name);
-
-	u32					mem_usage			(){ 
-		u32 sz			=	sizeof(*this)+m_motion_map.size()*6+m_partition.mem_usage();
-        for (MotionDefVecIt it=m_mdefs.begin(); it!=m_mdefs.end(); it++)
-			sz			+=	it->mem_usage();
-		for (BoneMotionMapIt bm_it=m_motions.begin(); bm_it!=m_motions.end(); bm_it++)
-			for (MotionVecIt m_it=bm_it->second.begin(); m_it!=bm_it->second.end(); m_it++)
-				sz		+=	m_it->mem_usage();
-		return sz;
-	}
+    accel_map m_motion_map; // motion associations
+    accel_map m_cycle; // motion data itself (shared)
+    accel_map m_fx; // motion data itself (shared)
+    CPartition m_partition; // partition
+    u32 m_dwReference;
+    BoneMotionMap m_motions;
+    MotionDefVec m_mdefs;
+
+    shared_str m_id;
+
+
+    BOOL load(LPCSTR N, IReader* data, vecBones* bones);
+    MotionVec* bone_motions(shared_str bone_name);
+
+    u32 mem_usage()
+    {
+        u32 sz = sizeof(*this) + m_motion_map.size() * 6 + m_partition.mem_usage();
+        for (MotionDefVecIt it = m_mdefs.begin(); it != m_mdefs.end(); it++)
+            sz += it->mem_usage();
+        for (BoneMotionMapIt bm_it = m_motions.begin(); bm_it != m_motions.end(); bm_it++)
+            for (MotionVecIt m_it = bm_it->second.begin(); m_it != bm_it->second.end(); m_it++)
+                sz += m_it->mem_usage();
+        return sz;
+    }
 };
 
-class 	ENGINE_API	motions_container
+class ENGINE_API motions_container
 {
-	DEFINE_MAP			(shared_str,motions_value*,SharedMotionsMap,SharedMotionsMapIt);
-	SharedMotionsMap	container;
+    DEFINE_MAP(shared_str, motions_value*, SharedMotionsMap, SharedMotionsMapIt);
+    SharedMotionsMap container;
 public:
-						motions_container	();
-						~motions_container	();
-	bool				has					(shared_str key);
-	motions_value*		dock				(shared_str key, IReader *data, vecBones* bones);
-	void				dump				();
-	void				clean				(bool force_destroy);
+    motions_container();
+    ~motions_container();
+    bool has(shared_str key);
+    motions_value* dock(shared_str key, IReader* data, vecBones* bones);
+    void dump();
+    void clean(bool force_destroy);
 };
 
- extern	ENGINE_API	motions_container*	g_pMotionsContainer;
+extern ENGINE_API motions_container* g_pMotionsContainer;
 
-class 	ENGINE_API	shared_motions
+class ENGINE_API shared_motions
 {
 private:
-	motions_value*		p_;
+    motions_value* p_;
 protected:
-	// ref-counting
-	void				destroy			()							{	if (0==p_) return;	p_->m_dwReference--; 	if (0==p_->m_dwReference)	p_=0;	}
+    // ref-counting
+    void destroy() { if (0 == p_) return; p_->m_dwReference--; if (0 == p_->m_dwReference) p_ = 0; }
 public:
-	bool				create			(shared_str key, IReader *data, vecBones* bones);//{	motions_value* v = g_pMotionsContainer->dock(key,data,bones); if (0!=v) v->m_dwReference++; destroy(); p_ = v;	}
-	bool				create			(shared_motions const &rhs);//	{	motions_value* v = rhs.p_; if (0!=v) v->m_dwReference++; destroy(); p_ = v;	}
+    bool create(shared_str key, IReader* data, vecBones* bones);//{ motions_value* v = g_pMotionsContainer->dock(key,data,bones); if (0!=v) v->m_dwReference++; destroy(); p_ = v; }
+    bool create(shared_motions const& rhs);// { motions_value* v = rhs.p_; if (0!=v) v->m_dwReference++; destroy(); p_ = v; }
 public:
-	// construction
-						shared_motions	()							{	p_ = 0;											}
-						shared_motions	(shared_motions const &rhs)	{	p_ = 0;	create(rhs);							}
-						~shared_motions	()							{	destroy();										}
-
-	// assignment & accessors
-	shared_motions&		operator=		(shared_motions const &rhs)	{	create(rhs);return *this;	}
-	bool				operator==		(shared_motions const &rhs)	const {return (p_ == rhs.p_);}
-
-	// misc func
-	MotionVec*			bone_motions	(shared_str bone_name)		{	VERIFY(p_); return p_->bone_motions(bone_name);	}
-	accel_map*			motion_map		()							{	VERIFY(p_); return &p_->m_motion_map;			}
-	accel_map*			cycle			()							{	VERIFY(p_); return &p_->m_cycle;				}
-	accel_map*			fx				()							{	VERIFY(p_); return &p_->m_fx;					}
-	CPartition*			partition		()							{	VERIFY(p_); return &p_->m_partition;			}
-    MotionDefVec*		motion_defs		()							{	VERIFY(p_); return &p_->m_mdefs;				}
-    CMotionDef*			motion_def		(u16 idx)					{	VERIFY(p_); return &p_->m_mdefs[idx];			}
-
-	const shared_str	&id				() const					{	VERIFY(p_); return p_->m_id;					}
+    // construction
+    shared_motions() { p_ = 0; }
+    shared_motions(shared_motions const& rhs) { p_ = 0; create(rhs); }
+    ~shared_motions() { destroy(); }
+
+    // assignment & accessors
+    shared_motions& operator= (shared_motions const& rhs) { create(rhs); return *this; }
+    bool operator== (shared_motions const& rhs) const { return (p_ == rhs.p_); }
+
+    // misc func
+    MotionVec* bone_motions(shared_str bone_name) { VERIFY(p_); return p_->bone_motions(bone_name); }
+    accel_map* motion_map() { VERIFY(p_); return &p_->m_motion_map; }
+    accel_map* cycle() { VERIFY(p_); return &p_->m_cycle; }
+    accel_map* fx() { VERIFY(p_); return &p_->m_fx; }
+    CPartition* partition() { VERIFY(p_); return &p_->m_partition; }
+    MotionDefVec* motion_defs() { VERIFY(p_); return &p_->m_mdefs; }
+    CMotionDef* motion_def(u16 idx) { VERIFY(p_); return &p_->m_mdefs[idx]; }
+
+    const shared_str& id() const { VERIFY(p_); return p_->m_id; }
 
 };
 //---------------------------------------------------------------------------
diff --git a/src/xrEngine/StatGraph.cpp b/src/xrEngine/StatGraph.cpp
index 168534d707d..b43497d9470 100644
--- a/src/xrEngine/StatGraph.cpp
+++ b/src/xrEngine/StatGraph.cpp
@@ -6,216 +6,216 @@
 
 CStatGraph::CStatGraph()
 {
-	Device.seqRender.Add		(this,REG_PRIORITY_LOW-1000);
-	OnDeviceCreate();
-	mn					= 0;
-	mx					= 1;
-	max_item_count		= 1;
-	lt.set				(0,0);
-	rb.set				(200,200);
-	grid.set			(1,1);
-	grid_color			= 0xFF000000;
-	rect_color			= 0xFF000000;
-	grid_step.set		(1, 1);
-
-	AppendSubGraph(stCurve);
+    Device.seqRender.Add(this, REG_PRIORITY_LOW - 1000);
+    OnDeviceCreate();
+    mn = 0;
+    mx = 1;
+    max_item_count = 1;
+    lt.set(0, 0);
+    rb.set(200, 200);
+    grid.set(1, 1);
+    grid_color = 0xFF000000;
+    rect_color = 0xFF000000;
+    grid_step.set(1, 1);
+
+    AppendSubGraph(stCurve);
 }
 
 CStatGraph::~CStatGraph()
 {
-	Device.seqRender.Remove		(this);
-	OnDeviceDestroy();
-	m_Markers.clear();
+    Device.seqRender.Remove(this);
+    OnDeviceDestroy();
+    m_Markers.clear();
 }
 
 void CStatGraph::OnDeviceCreate()
 {
-	m_pRender->OnDeviceCreate();
-//	hGeomLine.create			(FVF::F_TL0uv,RCache.Vertex.Buffer(),RCache.Index.Buffer());
-//	hGeomTri.create				(FVF::F_TL0uv,RCache.Vertex.Buffer(),RCache.QuadIB);
+    m_pRender->OnDeviceCreate();
+    // hGeomLine.create (FVF::F_TL0uv,RCache.Vertex.Buffer(),RCache.Index.Buffer());
+    // hGeomTri.create (FVF::F_TL0uv,RCache.Vertex.Buffer(),RCache.QuadIB);
 }
 
 void CStatGraph::OnDeviceDestroy()
 {
-	m_pRender->OnDeviceDestroy();
-//	hGeomLine.destroy				();
-//	hGeomTri.destroy				();
+    m_pRender->OnDeviceDestroy();
+    // hGeomLine.destroy ();
+    // hGeomTri.destroy ();
 }
 
 void CStatGraph::OnRender()
 {
-	m_pRender->OnRender(*this);
-	/*
-	RCache.OnFrameEnd();
-
-	RenderBack();
-
-	u32			TriElem = 0;
-	u32			LineElem = 0;
-	for (SubGraphVecIt it=subgraphs.begin(); it!=subgraphs.end(); it++)
-	{
-		switch (it->style)
-		{
-		case stBar: 
-			{
-				TriElem += it->elements.size()*4;
-			}break;
-		case stCurve: 
-			{
-				LineElem += it->elements.size()*2;
-			}break;
-		case stBarLine: 
-			{
-				LineElem += it->elements.size()*4;
-			}break;
-		case stPoint: 
-			{
-				//				TriElem += it->elements.size()*4;
-			}break;
-		};
-	};
-
-	u32			dwOffsetTri = 0, dwOffsetLine = 0,dwCount;
-	FVF::TL0uv* pv_Tri_start	= NULL;
-	FVF::TL0uv* pv_Tri;
-	FVF::TL0uv* pv_Line_start	= NULL;
-	FVF::TL0uv* pv_Line;
-
-	if (TriElem)
-	{
-		pv_Tri_start = (FVF::TL0uv*)RCache.Vertex.Lock(TriElem,hGeomTri->vb_stride,dwOffsetTri);
-		pv_Tri = pv_Tri_start;
-
-		pv_Tri = pv_Tri_start;
-		for (SubGraphVecIt it=subgraphs.begin(); it!=subgraphs.end(); it++)
-		{
-			switch(it->style)
-			{
-			case stBar:		RenderBars		(&pv_Tri, &(it->elements));		break;
-			};
-		};
-		dwCount 				= u32(pv_Tri-pv_Tri_start);
-		RCache.Vertex.Unlock	(dwCount,hGeomTri->vb_stride);
-		RCache.set_Geometry		(hGeomTri);
-		RCache.Render	   		(D3DPT_TRIANGLELIST,dwOffsetTri,0, dwCount, 0, dwCount/2);
-	};
-
-	if (LineElem)
-	{
-		pv_Line_start = (FVF::TL0uv*)RCache.Vertex.Lock(LineElem,hGeomLine->vb_stride,dwOffsetLine);
-		pv_Line = pv_Line_start;
-
-		for (SubGraphVecIt it=subgraphs.begin(); it!=subgraphs.end(); it++)
-		{
-			switch(it->style)
-			{
-			case stCurve:	RenderLines		(&pv_Line, &(it->elements));	break;
-			case stBarLine:	RenderBarLines	(&pv_Line, &(it->elements));	break;
-			};
-		};
-
-		dwCount 				= u32(pv_Line-pv_Line_start);
-		RCache.Vertex.Unlock	(dwCount,hGeomLine->vb_stride);
-		RCache.set_Geometry		(hGeomLine);
-		RCache.Render	   		(D3DPT_LINELIST,dwOffsetLine,dwCount/2);
-	};
-
-	if (!m_Markers.empty())
-	{
-		dwOffsetLine = 0;
-		LineElem = m_Markers.size()*2;
-
-		pv_Line_start = (FVF::TL0uv*)RCache.Vertex.Lock(LineElem,hGeomLine->vb_stride,dwOffsetLine);
-		pv_Line = pv_Line_start;
-
-		RenderMarkers		(&pv_Line, &(m_Markers));
-
-		dwCount 				= u32(pv_Line-pv_Line_start);
-		RCache.Vertex.Unlock	(dwCount,hGeomLine->vb_stride);
-		RCache.set_Geometry		(hGeomLine);
-		RCache.Render	   		(D3DPT_LINELIST,dwOffsetLine,dwCount/2);
-	}
-	*/
+    m_pRender->OnRender(*this);
+    /*
+    RCache.OnFrameEnd();
+
+    RenderBack();
+
+    u32 TriElem = 0;
+    u32 LineElem = 0;
+    for (SubGraphVecIt it=subgraphs.begin(); it!=subgraphs.end(); it++)
+    {
+    switch (it->style)
+    {
+    case stBar:
+    {
+    TriElem += it->elements.size()*4;
+    }break;
+    case stCurve:
+    {
+    LineElem += it->elements.size()*2;
+    }break;
+    case stBarLine:
+    {
+    LineElem += it->elements.size()*4;
+    }break;
+    case stPoint:
+    {
+    // TriElem += it->elements.size()*4;
+    }break;
+    };
+    };
+
+    u32 dwOffsetTri = 0, dwOffsetLine = 0,dwCount;
+    FVF::TL0uv* pv_Tri_start = NULL;
+    FVF::TL0uv* pv_Tri;
+    FVF::TL0uv* pv_Line_start = NULL;
+    FVF::TL0uv* pv_Line;
+
+    if (TriElem)
+    {
+    pv_Tri_start = (FVF::TL0uv*)RCache.Vertex.Lock(TriElem,hGeomTri->vb_stride,dwOffsetTri);
+    pv_Tri = pv_Tri_start;
+
+    pv_Tri = pv_Tri_start;
+    for (SubGraphVecIt it=subgraphs.begin(); it!=subgraphs.end(); it++)
+    {
+    switch(it->style)
+    {
+    case stBar: RenderBars (&pv_Tri, &(it->elements)); break;
+    };
+    };
+    dwCount = u32(pv_Tri-pv_Tri_start);
+    RCache.Vertex.Unlock (dwCount,hGeomTri->vb_stride);
+    RCache.set_Geometry (hGeomTri);
+    RCache.Render (D3DPT_TRIANGLELIST,dwOffsetTri,0, dwCount, 0, dwCount/2);
+    };
+
+    if (LineElem)
+    {
+    pv_Line_start = (FVF::TL0uv*)RCache.Vertex.Lock(LineElem,hGeomLine->vb_stride,dwOffsetLine);
+    pv_Line = pv_Line_start;
+
+    for (SubGraphVecIt it=subgraphs.begin(); it!=subgraphs.end(); it++)
+    {
+    switch(it->style)
+    {
+    case stCurve: RenderLines (&pv_Line, &(it->elements)); break;
+    case stBarLine: RenderBarLines (&pv_Line, &(it->elements)); break;
+    };
+    };
+
+    dwCount = u32(pv_Line-pv_Line_start);
+    RCache.Vertex.Unlock (dwCount,hGeomLine->vb_stride);
+    RCache.set_Geometry (hGeomLine);
+    RCache.Render (D3DPT_LINELIST,dwOffsetLine,dwCount/2);
+    };
+
+    if (!m_Markers.empty())
+    {
+    dwOffsetLine = 0;
+    LineElem = m_Markers.size()*2;
+
+    pv_Line_start = (FVF::TL0uv*)RCache.Vertex.Lock(LineElem,hGeomLine->vb_stride,dwOffsetLine);
+    pv_Line = pv_Line_start;
+
+    RenderMarkers (&pv_Line, &(m_Markers));
+
+    dwCount = u32(pv_Line-pv_Line_start);
+    RCache.Vertex.Unlock (dwCount,hGeomLine->vb_stride);
+    RCache.set_Geometry (hGeomLine);
+    RCache.Render (D3DPT_LINELIST,dwOffsetLine,dwCount/2);
+    }
+    */
 };
 
 /*
-void CStatGraph::RenderBack	()
+void CStatGraph::RenderBack ()
 {
-	// draw back
-	u32			dwOffset,dwCount;
-	FVF::TL0uv* pv_start				= (FVF::TL0uv*)RCache.Vertex.Lock(4,hGeomTri->vb_stride,dwOffset);
-	FVF::TL0uv* pv						= pv_start;
-	// base rect
-	pv->set					(lt.x,rb.y,back_color); pv++;	// 0
-	pv->set					(lt.x,lt.y,back_color); pv++; 	// 1
-	pv->set					(rb.x,rb.y,back_color); pv++;	// 2
-	pv->set					(rb.x,lt.y,back_color); pv++;	// 3
-	// render	
-	dwCount 				= u32(pv-pv_start);
-	RCache.Vertex.Unlock	(dwCount,hGeomTri->vb_stride);
-	RCache.set_Geometry		(hGeomTri);
-	RCache.Render	   		(D3DPT_TRIANGLELIST,dwOffset,0, dwCount, 0, dwCount/2);	
-
-	//draw rect
-	pv_start				= (FVF::TL0uv*)RCache.Vertex.Lock(5,hGeomLine->vb_stride,dwOffset);
-	pv						= pv_start;
-	// base rect
-	pv->set					(lt.x,lt.y,rect_color); pv++;	// 0
-	pv->set					(rb.x-1,lt.y,rect_color); pv++; 	// 1
-	pv->set					(rb.x-1,rb.y,rect_color); pv++;	// 2
-	pv->set					(lt.x,rb.y,rect_color); pv++;	// 3
-	pv->set					(lt.x,lt.y,rect_color); pv++;	// 0
-	// render	
-	dwCount 				= u32(pv-pv_start);
-    RCache.Vertex.Unlock	(dwCount,hGeomLine->vb_stride);
-    RCache.set_Geometry		(hGeomLine);
-    RCache.Render	   		(D3DPT_LINESTRIP,dwOffset,4);
-
-	// draw grid
-	float elem_factor	= float(rb.y-lt.y)/float(mx-mn);
-	float base_y		= float(rb.y)+(mn*elem_factor);
-
-	int PNum_H_LinesUp	= int((base_y - float(lt.y)) / (grid_step.y*elem_factor));
-	int PNum_H_LinesDwn = u32((float(rb.y) - base_y) / (grid_step.y*elem_factor));
-	int Num_H_LinesUp = (grid.y < PNum_H_LinesUp) ? grid.y : PNum_H_LinesUp;
-	int Num_H_LinesDwn = (grid.y < PNum_H_LinesUp) ? grid.y : PNum_H_LinesDwn;
-
-	pv_start	= (FVF::TL0uv*)RCache.Vertex.Lock(	2 + 2*grid.x + Num_H_LinesUp*2 + Num_H_LinesDwn*2,
-													hGeomLine->vb_stride,dwOffset);
-    pv			= pv_start;
-    // base Coordinate Line
-	pv->set					(lt.x, int(base_y), base_color); pv++; // 0
-	pv->set					(rb.x, int(base_y), base_color); pv++;	// 0    
-    // grid
-//    float grid_offs_x		= float(rb.x-lt.x)/float(grid.x+1);
-//    float grid_offs_y		= float(rb.y-lt.y)/float(grid.y+1);
-    for (int g_x=1; g_x<=grid.x; g_x++)
-	{
-	    pv->set				(int(lt.x + g_x*grid_step.x*elem_factor),lt.y,grid_color); pv++; 	
-	    pv->set				(int(lt.x + g_x*grid_step.x*elem_factor),rb.y,grid_color); pv++; 	
-	}
-	for (int g_y=1; g_y<=Num_H_LinesDwn; g_y++)
-	{
-		pv->set				(lt.x,int(base_y+g_y*grid_step.y*elem_factor),grid_color); pv++;
-		pv->set				(rb.x,int(base_y+g_y*grid_step.y*elem_factor),grid_color); pv++;
-	};
-
-	for (g_y=1; g_y<=Num_H_LinesUp; g_y++)
-	{									
-		pv->set				(lt.x,int(base_y-g_y*grid_step.y*elem_factor),grid_color); pv++; 	
-		pv->set				(rb.x,int(base_y-g_y*grid_step.y*elem_factor),grid_color); pv++; 	
-	}    	
-
-	
-//    for (int g_y=1; g_y<=grid.y; g_y++){
-//	    pv->set				(lt.x,iFloor(g_y*grid_offs_y+lt.y),grid_color); pv++; 	
-//	    pv->set				(rb.x,iFloor(g_y*grid_offs_y+lt.y),grid_color); pv++; 	
-//	}
-
-	dwCount 				= u32(pv-pv_start);
-    RCache.Vertex.Unlock	(dwCount,hGeomLine->vb_stride);
-    RCache.set_Geometry		(hGeomLine);
-    RCache.Render	   		(D3DPT_LINELIST,dwOffset,dwCount/2);
+// draw back
+u32 dwOffset,dwCount;
+FVF::TL0uv* pv_start = (FVF::TL0uv*)RCache.Vertex.Lock(4,hGeomTri->vb_stride,dwOffset);
+FVF::TL0uv* pv = pv_start;
+// base rect
+pv->set (lt.x,rb.y,back_color); pv++; // 0
+pv->set (lt.x,lt.y,back_color); pv++; // 1
+pv->set (rb.x,rb.y,back_color); pv++; // 2
+pv->set (rb.x,lt.y,back_color); pv++; // 3
+// render
+dwCount = u32(pv-pv_start);
+RCache.Vertex.Unlock (dwCount,hGeomTri->vb_stride);
+RCache.set_Geometry (hGeomTri);
+RCache.Render (D3DPT_TRIANGLELIST,dwOffset,0, dwCount, 0, dwCount/2);
+
+//draw rect
+pv_start = (FVF::TL0uv*)RCache.Vertex.Lock(5,hGeomLine->vb_stride,dwOffset);
+pv = pv_start;
+// base rect
+pv->set (lt.x,lt.y,rect_color); pv++; // 0
+pv->set (rb.x-1,lt.y,rect_color); pv++; // 1
+pv->set (rb.x-1,rb.y,rect_color); pv++; // 2
+pv->set (lt.x,rb.y,rect_color); pv++; // 3
+pv->set (lt.x,lt.y,rect_color); pv++; // 0
+// render
+dwCount = u32(pv-pv_start);
+RCache.Vertex.Unlock (dwCount,hGeomLine->vb_stride);
+RCache.set_Geometry (hGeomLine);
+RCache.Render (D3DPT_LINESTRIP,dwOffset,4);
+
+// draw grid
+float elem_factor = float(rb.y-lt.y)/float(mx-mn);
+float base_y = float(rb.y)+(mn*elem_factor);
+
+int PNum_H_LinesUp = int((base_y - float(lt.y)) / (grid_step.y*elem_factor));
+int PNum_H_LinesDwn = u32((float(rb.y) - base_y) / (grid_step.y*elem_factor));
+int Num_H_LinesUp = (grid.y < PNum_H_LinesUp) ? grid.y : PNum_H_LinesUp;
+int Num_H_LinesDwn = (grid.y < PNum_H_LinesUp) ? grid.y : PNum_H_LinesDwn;
+
+pv_start = (FVF::TL0uv*)RCache.Vertex.Lock( 2 + 2*grid.x + Num_H_LinesUp*2 + Num_H_LinesDwn*2,
+hGeomLine->vb_stride,dwOffset);
+pv = pv_start;
+// base Coordinate Line
+pv->set (lt.x, int(base_y), base_color); pv++; // 0
+pv->set (rb.x, int(base_y), base_color); pv++; // 0
+// grid
+// float grid_offs_x = float(rb.x-lt.x)/float(grid.x+1);
+// float grid_offs_y = float(rb.y-lt.y)/float(grid.y+1);
+for (int g_x=1; g_x<=grid.x; g_x++)
+{
+pv->set (int(lt.x + g_x*grid_step.x*elem_factor),lt.y,grid_color); pv++;
+pv->set (int(lt.x + g_x*grid_step.x*elem_factor),rb.y,grid_color); pv++;
+}
+for (int g_y=1; g_y<=Num_H_LinesDwn; g_y++)
+{
+pv->set (lt.x,int(base_y+g_y*grid_step.y*elem_factor),grid_color); pv++;
+pv->set (rb.x,int(base_y+g_y*grid_step.y*elem_factor),grid_color); pv++;
+};
+
+for (g_y=1; g_y<=Num_H_LinesUp; g_y++)
+{
+pv->set (lt.x,int(base_y-g_y*grid_step.y*elem_factor),grid_color); pv++;
+pv->set (rb.x,int(base_y-g_y*grid_step.y*elem_factor),grid_color); pv++;
+}
+
+
+// for (int g_y=1; g_y<=grid.y; g_y++){
+// pv->set (lt.x,iFloor(g_y*grid_offs_y+lt.y),grid_color); pv++;
+// pv->set (rb.x,iFloor(g_y*grid_offs_y+lt.y),grid_color); pv++;
+// }
+
+dwCount = u32(pv-pv_start);
+RCache.Vertex.Unlock (dwCount,hGeomLine->vb_stride);
+RCache.set_Geometry (hGeomLine);
+RCache.Render (D3DPT_LINELIST,dwOffset,dwCount/2);
 
 
 };
@@ -223,125 +223,125 @@ void CStatGraph::RenderBack	()
 /*
 void CStatGraph::RenderBars(FVF::TL0uv** ppv, ElementsDeq* pelements)
 {
-	float elem_offs		= float(rb.x-lt.x)/max_item_count;
-	float elem_factor	= float(rb.y-lt.y)/float(mx-mn);
-	float base_y		= float(rb.y)+(mn*elem_factor);
-
-	float column_width = elem_offs;
-	if (column_width > 1) column_width--;
-	for (ElementsDeqIt it=pelements->begin(); it!=pelements->end(); it++)
-	{
-		float X		= float(it-pelements->begin())*elem_offs+lt.x;
-		float Y0	= base_y;
-		float Y1	= base_y - it->data*elem_factor;
-
-		if (Y1 > Y0)
-		{
-			(*ppv)->set		(X,Y1,it->color); (*ppv)++;
-			(*ppv)->set		(X,Y0,it->color); (*ppv)++;
-			(*ppv)->set		(X+column_width,Y1,it->color); (*ppv)++;
-			(*ppv)->set		(X+column_width,Y0,it->color); (*ppv)++;
-		}
-		else
-		{
-			(*ppv)->set		(X,Y0,it->color); (*ppv)++;
-			(*ppv)->set		(X,Y1,it->color); (*ppv)++;
-			(*ppv)->set		(X+column_width,Y0,it->color); (*ppv)++;
-			(*ppv)->set		(X+column_width,Y1,it->color); (*ppv)++;
-		};
-	};	
+float elem_offs = float(rb.x-lt.x)/max_item_count;
+float elem_factor = float(rb.y-lt.y)/float(mx-mn);
+float base_y = float(rb.y)+(mn*elem_factor);
+
+float column_width = elem_offs;
+if (column_width > 1) column_width--;
+for (ElementsDeqIt it=pelements->begin(); it!=pelements->end(); it++)
+{
+float X = float(it-pelements->begin())*elem_offs+lt.x;
+float Y0 = base_y;
+float Y1 = base_y - it->data*elem_factor;
+
+if (Y1 > Y0)
+{
+(*ppv)->set (X,Y1,it->color); (*ppv)++;
+(*ppv)->set (X,Y0,it->color); (*ppv)++;
+(*ppv)->set (X+column_width,Y1,it->color); (*ppv)++;
+(*ppv)->set (X+column_width,Y0,it->color); (*ppv)++;
+}
+else
+{
+(*ppv)->set (X,Y0,it->color); (*ppv)++;
+(*ppv)->set (X,Y1,it->color); (*ppv)++;
+(*ppv)->set (X+column_width,Y0,it->color); (*ppv)++;
+(*ppv)->set (X+column_width,Y1,it->color); (*ppv)++;
+};
+};
 };
 */
 /*
 void CStatGraph::RenderLines( FVF::TL0uv** ppv, ElementsDeq* pelements )
 {
-	float elem_offs		= float(rb.x-lt.x)/max_item_count;
-	float elem_factor	= float(rb.y-lt.y)/float(mx-mn);
-	float base_y		= float(rb.y)+(mn*elem_factor);
-
-	for (ElementsDeqIt it=pelements->begin()+1;  it!=pelements->end() && it!=pelements->end()+1; it++)
-	{
-		ElementsDeqIt it_prev = it-1;
-		float X0	= float(it_prev-pelements->begin())*elem_offs+lt.x;
-		float Y0	= base_y-it_prev->data*elem_factor;
-		(*ppv)->set		(X0,Y0,it->color); (*ppv)++;
-		float X1	= float(it-pelements->begin())*elem_offs+lt.x;
-		float Y1	= base_y-it->data*elem_factor;
-		(*ppv)->set		(X1,Y1,it->color); (*ppv)++;
-	}
+float elem_offs = float(rb.x-lt.x)/max_item_count;
+float elem_factor = float(rb.y-lt.y)/float(mx-mn);
+float base_y = float(rb.y)+(mn*elem_factor);
+
+for (ElementsDeqIt it=pelements->begin()+1; it!=pelements->end() && it!=pelements->end()+1; it++)
+{
+ElementsDeqIt it_prev = it-1;
+float X0 = float(it_prev-pelements->begin())*elem_offs+lt.x;
+float Y0 = base_y-it_prev->data*elem_factor;
+(*ppv)->set (X0,Y0,it->color); (*ppv)++;
+float X1 = float(it-pelements->begin())*elem_offs+lt.x;
+float Y1 = base_y-it->data*elem_factor;
+(*ppv)->set (X1,Y1,it->color); (*ppv)++;
+}
 };
 */
 
 /*
 void CStatGraph::RenderBarLines( FVF::TL0uv** ppv, ElementsDeq* pelements )
 {
-	float elem_offs		= float(rb.x-lt.x)/max_item_count;
-	float elem_factor	= float(rb.y-lt.y)/float(mx-mn);
-	float base_y		= float(rb.y)+(mn*elem_factor);
-
-	for (ElementsDeqIt it=pelements->begin()+1; it!=pelements->end() && it!=pelements->end()+1; it++)
-	{
-		ElementsDeqIt it_prev = it-1;
-		float X0	= float(it_prev-pelements->begin())*elem_offs+lt.x+elem_offs;
-		float Y0	= base_y-it_prev->data*elem_factor;
-		(*ppv)->set		(X0,Y0,it->color); (*ppv)++;
-		float X1	= float(it-pelements->begin())*elem_offs+lt.x;
-		float Y1	= base_y-it->data*elem_factor;
-		(*ppv)->set		(X1,Y1,it->color); (*ppv)++;
-		(*ppv)->set		(X1,Y1,it->color); (*ppv)++;
-		X1 += elem_offs;
-		(*ppv)->set		(X1,Y1,it->color); (*ppv)++;
-	}
+float elem_offs = float(rb.x-lt.x)/max_item_count;
+float elem_factor = float(rb.y-lt.y)/float(mx-mn);
+float base_y = float(rb.y)+(mn*elem_factor);
+
+for (ElementsDeqIt it=pelements->begin()+1; it!=pelements->end() && it!=pelements->end()+1; it++)
+{
+ElementsDeqIt it_prev = it-1;
+float X0 = float(it_prev-pelements->begin())*elem_offs+lt.x+elem_offs;
+float Y0 = base_y-it_prev->data*elem_factor;
+(*ppv)->set (X0,Y0,it->color); (*ppv)++;
+float X1 = float(it-pelements->begin())*elem_offs+lt.x;
+float Y1 = base_y-it->data*elem_factor;
+(*ppv)->set (X1,Y1,it->color); (*ppv)++;
+(*ppv)->set (X1,Y1,it->color); (*ppv)++;
+X1 += elem_offs;
+(*ppv)->set (X1,Y1,it->color); (*ppv)++;
+}
 };
 */
 
 /*
 void CStatGraph::RenderPoints( FVF::TL0uv** ppv, ElementsDeq* pelements )
 {
-	float elem_offs		= float(rb.x-lt.x)/max_item_count;
-	float elem_factor	= float(rb.y-lt.y)/float(mx-mn);
-	float base_y		= float(rb.y)+(mn*elem_factor);
-
-	for (ElementsDeqIt it=pelements->begin()+1; it!=pelements->end(); it++)
-	{
-		float X1	= float(it-pelements->begin())*elem_offs+lt.x;
-		float Y1	= base_y-it->data*elem_factor;
-		(*ppv)->set		(X1,Y1,it->color); (*ppv)++;
-	}
+float elem_offs = float(rb.x-lt.x)/max_item_count;
+float elem_factor = float(rb.y-lt.y)/float(mx-mn);
+float base_y = float(rb.y)+(mn*elem_factor);
+
+for (ElementsDeqIt it=pelements->begin()+1; it!=pelements->end(); it++)
+{
+float X1 = float(it-pelements->begin())*elem_offs+lt.x;
+float Y1 = base_y-it->data*elem_factor;
+(*ppv)->set (X1,Y1,it->color); (*ppv)++;
+}
 };
 */
 /*
-void	CStatGraph::RenderMarkers	( FVF::TL0uv** ppv, MarkersDeq* pmarkers )
+void CStatGraph::RenderMarkers ( FVF::TL0uv** ppv, MarkersDeq* pmarkers )
+{
+float elem_offs = float(rb.x-lt.x)/max_item_count;
+float elem_factor = float(rb.y-lt.y)/float(mx-mn);
+float base_y = float(rb.y)+(mn*elem_factor);
+
+for (MarkersDeqIt it=pmarkers->begin(); it!=pmarkers->end() && it!=pmarkers->end()+1; it++)
+{
+SMarker &CurMarker = *it;
+float X0 = 0, Y0 = 0, X1 = 0, Y1 = 0;
+switch (CurMarker.m_eStyle)
 {
-	float elem_offs		= float(rb.x-lt.x)/max_item_count;
-	float elem_factor	= float(rb.y-lt.y)/float(mx-mn);
-	float base_y		= float(rb.y)+(mn*elem_factor);
-
-	for (MarkersDeqIt it=pmarkers->begin();  it!=pmarkers->end() && it!=pmarkers->end()+1; it++)
-	{
-		SMarker &CurMarker = *it;
-		float X0 = 0, Y0 = 0, X1 = 0, Y1 = 0;
-		switch (CurMarker.m_eStyle)
-		{
-		case stVert:
-			{
-				X0 = CurMarker.m_fPos*elem_offs+lt.x;
-				clamp(X0, float(lt.x), float(rb.x));
-				X1 = X0;
-				Y0 = float(lt.y);
-				Y1 = float(rb.y);
-			}break;
-		case stHor:
-			{
-				X0 = float(lt.x);
-				X1 = float(rb.x);
-				Y0 = base_y - CurMarker.m_fPos*elem_factor;
-				clamp(Y0, float(lt.y), float(rb.y));
-				Y1 = Y0;
-			}break;
-		}
-		(*ppv)->set		(X0,Y0,CurMarker.m_dwColor); (*ppv)++;
-		(*ppv)->set		(X1,Y1,CurMarker.m_dwColor); (*ppv)++;
-	}
+case stVert:
+{
+X0 = CurMarker.m_fPos*elem_offs+lt.x;
+clamp(X0, float(lt.x), float(rb.x));
+X1 = X0;
+Y0 = float(lt.y);
+Y1 = float(rb.y);
+}break;
+case stHor:
+{
+X0 = float(lt.x);
+X1 = float(rb.x);
+Y0 = base_y - CurMarker.m_fPos*elem_factor;
+clamp(Y0, float(lt.y), float(rb.y));
+Y1 = Y0;
+}break;
+}
+(*ppv)->set (X0,Y0,CurMarker.m_dwColor); (*ppv)++;
+(*ppv)->set (X1,Y1,CurMarker.m_dwColor); (*ppv)++;
+}
 }
 */
\ No newline at end of file
diff --git a/src/xrEngine/StatGraph.h b/src/xrEngine/StatGraph.h
index 59b4bc6c55b..252565cf5e2 100644
--- a/src/xrEngine/StatGraph.h
+++ b/src/xrEngine/StatGraph.h
@@ -6,161 +6,164 @@
 #include "../Include/xrRender/StatGraphRender.h"
 
 //---------------------------------------------------------------------------
-class ENGINE_API CStatGraph	: public pureRender
+class ENGINE_API CStatGraph : public pureRender
 {
-	friend class dxStatGraphRender;
+    friend class dxStatGraphRender;
 public:
-	enum EStyle{
-    	stBar,
+    enum EStyle
+    {
+        stBar,
         stCurve,
-		stBarLine,
-		stPoint,
-		stVert,
-		stHor,
-   };
+        stBarLine,
+        stPoint,
+        stVert,
+        stHor,
+    };
 protected:
-	struct SElement{
-    	u32 		color;
-        float		data;
-			        SElement(float d, u32 clr)
+    struct SElement
+    {
+        u32 color;
+        float data;
+        SElement(float d, u32 clr)
         {
-        	color	= clr;
-            data	= d;
+            color = clr;
+            data = d;
         }
     };
-	DEFINE_DEQUE	(SElement,ElementsDeq,ElementsDeqIt);
-	struct SSubGraph
-	{
-		EStyle			style;
-		ElementsDeq		elements;
-					SSubGraph(EStyle s)
-		{
-			style = s;
-		};
-					void SetStyle (EStyle s)
-		{
-			style = s;
-		};
-	};
-	DEFINE_VECTOR	(SSubGraph,SubGraphVec,SubGraphVecIt);
-	SubGraphVec		subgraphs;
-	
-	float			mn, mx;
-	u32				max_item_count;
-	Ivector2 		lt,rb;
-	Ivector2 		grid;
-	Fvector2		grid_step;
-	u32				grid_color;
-	u32				base_color;
-	u32				rect_color;
-	u32				back_color;
-	FactoryPtr<IStatGraphRender>	m_pRender;
-	//ref_geom 		hGeomTri;
-	//ref_geom 		hGeomLine;
-
-	
-	struct SMarker {
-		EStyle			m_eStyle;
-		float			m_fPos;
-		u32				m_dwColor;
-	};
-
-	DEFINE_DEQUE	(SMarker,MarkersDeq,MarkersDeqIt);
-	MarkersDeq		m_Markers;
+    DEFINE_DEQUE(SElement, ElementsDeq, ElementsDeqIt);
+    struct SSubGraph
+    {
+        EStyle style;
+        ElementsDeq elements;
+        SSubGraph(EStyle s)
+        {
+            style = s;
+        };
+        void SetStyle(EStyle s)
+        {
+            style = s;
+        };
+    };
+    DEFINE_VECTOR(SSubGraph, SubGraphVec, SubGraphVecIt);
+    SubGraphVec subgraphs;
+
+    float mn, mx;
+    u32 max_item_count;
+    Ivector2 lt, rb;
+    Ivector2 grid;
+    Fvector2 grid_step;
+    u32 grid_color;
+    u32 base_color;
+    u32 rect_color;
+    u32 back_color;
+    FactoryPtr<IStatGraphRender> m_pRender;
+    //ref_geom hGeomTri;
+    //ref_geom hGeomLine;
+
+
+    struct SMarker
+    {
+        EStyle m_eStyle;
+        float m_fPos;
+        u32 m_dwColor;
+    };
+
+    DEFINE_DEQUE(SMarker, MarkersDeq, MarkersDeqIt);
+    MarkersDeq m_Markers;
 
 protected:
-//	virtual void	RenderBack		();
+    // virtual void RenderBack ();
 
-//	virtual void	RenderBars		( FVF::TL0uv** ppv, ElementsDeq* pelements );
-//	virtual void	RenderLines		( FVF::TL0uv** ppv, ElementsDeq* pelements );
-//	virtual void	RenderBarLines	( FVF::TL0uv** ppv, ElementsDeq* pelements );
-////	virtual void	RenderPoints	( FVF::TL0uv** ppv, ElementsDeq* pelements );
-//	virtual	void	RenderMarkers	( FVF::TL0uv** ppv, MarkersDeq* pmarkers );
+    // virtual void RenderBars ( FVF::TL0uv** ppv, ElementsDeq* pelements );
+    // virtual void RenderLines ( FVF::TL0uv** ppv, ElementsDeq* pelements );
+    // virtual void RenderBarLines ( FVF::TL0uv** ppv, ElementsDeq* pelements );
+    //// virtual void RenderPoints ( FVF::TL0uv** ppv, ElementsDeq* pelements );
+    // virtual void RenderMarkers ( FVF::TL0uv** ppv, MarkersDeq* pmarkers );
 public:
-  					CStatGraph	();
-					~CStatGraph	();
-    virtual void 	OnRender	();
-			void 	OnDeviceCreate	();
-			void 	OnDeviceDestroy	();	
+    CStatGraph();
+    ~CStatGraph();
+    virtual void OnRender();
+    void OnDeviceCreate();
+    void OnDeviceDestroy();
 
-    IC 	void		SetStyle	(EStyle s, u32 SubGraphID = 0)
+    IC void SetStyle(EStyle s, u32 SubGraphID = 0)
     {
-		if (SubGraphID >= subgraphs.size()) return;
-		SubGraphVecIt it = subgraphs.begin() + SubGraphID;
-		it->SetStyle(s);
+        if (SubGraphID >= subgraphs.size()) return;
+        SubGraphVecIt it = subgraphs.begin() + SubGraphID;
+        it->SetStyle(s);
     }
-	
-    IC	void		SetRect		(int l, int t, int w, int h, u32 rect_clr, u32 back_clr)
+
+    IC void SetRect(int l, int t, int w, int h, u32 rect_clr, u32 back_clr)
     {
-        lt.set		(l,t);
-        rb.set		(l+w,t+h);
-        rect_color	= rect_clr;
-		back_color	= back_clr;
+        lt.set(l, t);
+        rb.set(l + w, t + h);
+        rect_color = rect_clr;
+        back_color = back_clr;
     }
-    IC	void		SetGrid		(int w_div, float w_step, int h_div, float h_step, u32 grid_clr, u32 base_clr)
+    IC void SetGrid(int w_div, float w_step, int h_div, float h_step, u32 grid_clr, u32 base_clr)
     {
-        grid.set	(w_div,h_div);
-		grid_step.set (w_step, h_step);
-        grid_color 	= grid_clr;
-		base_color	= base_clr;
+        grid.set(w_div, h_div);
+        grid_step.set(w_step, h_step);
+        grid_color = grid_clr;
+        base_color = base_clr;
     }
-    IC	void		SetMinMax	(float _mn, float _mx, u32 item_count)
+    IC void SetMinMax(float _mn, float _mx, u32 item_count)
     {
-        mn			= _mn;
-        mx			= _mx;
+        mn = _mn;
+        mx = _mx;
         max_item_count = item_count;
-		for (SubGraphVecIt it=subgraphs.begin(); it!=subgraphs.end(); it++)
-		{
-			while(it->elements.size()>max_item_count) it->elements.pop_front();
-		};
+        for (SubGraphVecIt it = subgraphs.begin(); it != subgraphs.end(); it++)
+        {
+            while (it->elements.size() > max_item_count) it->elements.pop_front();
+        };
     }
-    IC	void		AppendItem	(float d, u32 clr, u32 SubGraphID = 0)
+    IC void AppendItem(float d, u32 clr, u32 SubGraphID = 0)
     {
-		if (SubGraphID>=subgraphs.size()) return;
+        if (SubGraphID >= subgraphs.size()) return;
 
-    	clamp		(d,mn,mx);
-		
-		SubGraphVecIt it = subgraphs.begin() + SubGraphID;
-        it->elements.push_back(SElement(d,clr));
-        while(it->elements.size()>max_item_count) it->elements.pop_front();
+        clamp(d, mn, mx);
+
+        SubGraphVecIt it = subgraphs.begin() + SubGraphID;
+        it->elements.push_back(SElement(d, clr));
+        while (it->elements.size() > max_item_count) it->elements.pop_front();
     };
-	IC	u32			AppendSubGraph	(EStyle S)
-	{
-		subgraphs.push_back(SSubGraph(S));
-		return subgraphs.size()-1;
-	};
-
-	IC	void		AddMarker (EStyle Style, float pos, u32 Color)
-	{
-		SMarker NewMarker;
-		NewMarker.m_dwColor = Color;
-		NewMarker.m_eStyle = Style;
-		NewMarker.m_fPos = pos;
-
-		m_Markers.push_back(NewMarker);
-	};
-	
-	IC  const SMarker& Marker(u32 ID)
-	{
-		VERIFY(ID<m_Markers.size());
-		return m_Markers[ID];
-	};
-
-	IC	void		UpdateMarkerPos	(u32 ID, float NewPos)
-	{
-		if (ID >= m_Markers.size()) return;
-		SMarker &pMarker = m_Markers[ID];
-		pMarker.m_fPos = NewPos;
-	};
-	IC	void		ClearMarkers()
-	{
-		m_Markers.clear();
-	}
-
-	IC	void		RemoveMarker(u32 ID)
-	{
-		if (ID >= m_Markers.size()) return;
-		m_Markers.erase(m_Markers.begin()+ID);
-	}
+    IC u32 AppendSubGraph(EStyle S)
+    {
+        subgraphs.push_back(SSubGraph(S));
+        return subgraphs.size() - 1;
+    };
+
+    IC void AddMarker(EStyle Style, float pos, u32 Color)
+    {
+        SMarker NewMarker;
+        NewMarker.m_dwColor = Color;
+        NewMarker.m_eStyle = Style;
+        NewMarker.m_fPos = pos;
+
+        m_Markers.push_back(NewMarker);
+    };
+
+    IC const SMarker& Marker(u32 ID)
+    {
+        VERIFY(ID < m_Markers.size());
+        return m_Markers[ID];
+    };
+
+    IC void UpdateMarkerPos(u32 ID, float NewPos)
+    {
+        if (ID >= m_Markers.size()) return;
+        SMarker& pMarker = m_Markers[ID];
+        pMarker.m_fPos = NewPos;
+    };
+    IC void ClearMarkers()
+    {
+        m_Markers.clear();
+    }
+
+    IC void RemoveMarker(u32 ID)
+    {
+        if (ID >= m_Markers.size()) return;
+        m_Markers.erase(m_Markers.begin() + ID);
+    }
 };
 #endif
diff --git a/src/xrEngine/Stats.cpp b/src/xrEngine/Stats.cpp
index 521cf3069b0..d1c77e28b54 100644
--- a/src/xrEngine/Stats.cpp
+++ b/src/xrEngine/Stats.cpp
@@ -9,512 +9,526 @@
 
 #include "../Include/xrRender/DrawUtils.h"
 
-int		g_ErrorLineCount	= 15;
-Flags32 g_stats_flags		= {0};
+int g_ErrorLineCount = 15;
+Flags32 g_stats_flags = {0};
 
 // stats
 DECLARE_RP(Stats);
 
-class	optimizer	{
-	float	average_	;
-	BOOL	enabled_	;
+class optimizer
+{
+    float average_;
+    BOOL enabled_;
 public:
-	optimizer	()		{
-		average_	= 30.f;
-//		enabled_	= TRUE;
-//		disable		();
-		// because Engine is not exist
-		enabled_	= FALSE;
-	}
-
-	BOOL	enabled	()	{ return enabled_;	}
-	void	enable	()	{ if (!enabled_)	{ Engine.External.tune_resume	();	enabled_=TRUE;	}}
-	void	disable	()	{ if (enabled_)		{ Engine.External.tune_pause	();	enabled_=FALSE; }}
-	void	update	(float value)	{
-		if (value < average_*0.7f)	{
-			// 25% deviation
-			enable	();
-		} else {
-			disable	();
-		};
-		average_	= 0.99f*average_ + 0.01f*value;
-	};
+    optimizer()
+    {
+        average_ = 30.f;
+        //  enabled_ = TRUE;
+        //  disable ();
+        // because Engine is not exist
+        enabled_ = FALSE;
+    }
+
+    BOOL enabled() { return enabled_; }
+    void enable() { if (!enabled_) { Engine.External.tune_resume(); enabled_ = TRUE; } }
+    void disable() { if (enabled_) { Engine.External.tune_pause(); enabled_ = FALSE; } }
+    void update(float value)
+    {
+        if (value < average_*0.7f)
+        {
+            // 25% deviation
+            enable();
+        }
+        else
+        {
+            disable();
+        };
+        average_ = 0.99f*average_ + 0.01f*value;
+    };
 };
-static	optimizer	vtune;
+static optimizer vtune;
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
-BOOL			g_bDisableRedText	= FALSE;
-CStats::CStats	()
+BOOL   g_bDisableRedText = FALSE;
+CStats::CStats()
 {
-	fFPS				= 30.f;
-	fRFPS				= 30.f;
-	fTPS				= 0;
-	pFont				= 0;
-	fMem_calls			= 0;
-	RenderDUMP_DT_Count = 0;
-	Device.seqRender.Add		(this,REG_PRIORITY_LOW-1000);
+    fFPS = 30.f;
+    fRFPS = 30.f;
+    fTPS = 0;
+    pFont = 0;
+    fMem_calls = 0;
+    RenderDUMP_DT_Count = 0;
+    Device.seqRender.Add(this, REG_PRIORITY_LOW - 1000);
 }
 
 CStats::~CStats()
 {
-	Device.seqRender.Remove		(this);
-	xr_delete		(pFont);
+    Device.seqRender.Remove(this);
+    xr_delete(pFont);
 }
 
 void _draw_cam_pos(CGameFont* pFont)
 {
-	float sz		= pFont->GetHeight();
-	pFont->SetHeightI(0.02f);
-	pFont->SetColor	(0xffffffff);
-	pFont->Out		(10, 600, "CAMERA POSITION:  [%3.2f,%3.2f,%3.2f]",VPUSH(Device.vCameraPosition));
-	pFont->SetHeight(sz);
-	pFont->OnRender	();
+    float sz = pFont->GetHeight();
+    pFont->SetHeightI(0.02f);
+    pFont->SetColor(0xffffffff);
+    pFont->Out(10, 600, "CAMERA POSITION:  [%3.2f,%3.2f,%3.2f]", VPUSH(Device.vCameraPosition));
+    pFont->SetHeight(sz);
+    pFont->OnRender();
 }
 
-void CStats::Show() 
+void CStats::Show()
 {
-	// Stop timers
-	{
-		EngineTOTAL.FrameEnd		();	
-		Sheduler.FrameEnd			();	
-		UpdateClient.FrameEnd		();	
-		Physics.FrameEnd			();	
-		ph_collision.FrameEnd		();
-		ph_core.FrameEnd			();
-		Animation.FrameEnd			();	
-		AI_Think.FrameEnd			();
-		AI_Range.FrameEnd			();
-		AI_Path.FrameEnd			();
-		AI_Node.FrameEnd			();
-		AI_Vis.FrameEnd				();
-		AI_Vis_Query.FrameEnd		();
-		AI_Vis_RayTests.FrameEnd	();
-		
-		RenderTOTAL.FrameEnd		();
-		RenderCALC.FrameEnd			();
-		RenderCALC_HOM.FrameEnd		();
-		RenderDUMP.FrameEnd			();	
-		RenderDUMP_RT.FrameEnd		();
-		RenderDUMP_SKIN.FrameEnd	();	
-		RenderDUMP_Wait.FrameEnd	();	
-		RenderDUMP_Wait_S.FrameEnd	();	
-		RenderDUMP_HUD.FrameEnd		();	
-		RenderDUMP_Glows.FrameEnd	();	
-		RenderDUMP_Lights.FrameEnd	();	
-		RenderDUMP_WM.FrameEnd		();	
-		RenderDUMP_DT_VIS.FrameEnd	();	
-		RenderDUMP_DT_Render.FrameEnd();	
-		RenderDUMP_DT_Cache.FrameEnd();
-		RenderDUMP_Pcalc.FrameEnd	();	
-		RenderDUMP_Scalc.FrameEnd	();	
-		RenderDUMP_Srender.FrameEnd	();	
-		
-		Sound.FrameEnd				();
-		Input.FrameEnd				();
-		clRAY.FrameEnd				();	
-		clBOX.FrameEnd				();
-		clFRUSTUM.FrameEnd			();
-		
-		netClient1.FrameEnd			();
-		netClient2.FrameEnd			();
-		netServer.FrameEnd			();
-
-		netClientCompressor.FrameEnd();
-		netServerCompressor.FrameEnd();
-		
-		TEST0.FrameEnd				();
-		TEST1.FrameEnd				();
-		TEST2.FrameEnd				();
-		TEST3.FrameEnd				();
-
-		g_SpatialSpace->stat_insert.FrameEnd		();
-		g_SpatialSpace->stat_remove.FrameEnd		();
-		g_SpatialSpacePhysic->stat_insert.FrameEnd	();
-		g_SpatialSpacePhysic->stat_remove.FrameEnd	();
-	}
-
-	// calc FPS & TPS
-	if (Device.fTimeDelta>EPS_S) {
-		float fps  = 1.f/Device.fTimeDelta;
-		//if (Engine.External.tune_enabled)	vtune.update	(fps);
-		float fOne = 0.3f;
-		float fInv = 1.f-fOne;
-		fFPS = fInv*fFPS + fOne*fps;
-
-		if (RenderTOTAL.result>EPS_S) {
-			u32	rendered_polies = Device.m_pRender->GetCacheStatPolys();
-			fTPS = fInv*fTPS + fOne*float(rendered_polies)/(RenderTOTAL.result*1000.f);
-			//fTPS = fInv*fTPS + fOne*float(RCache.stat.polys)/(RenderTOTAL.result*1000.f);
-			fRFPS= fInv*fRFPS+ fOne*1000.f/RenderTOTAL.result;
-		}
-	}
-	{
-		float mem_count		= float	(Memory.stat_calls);
-		if (mem_count>fMem_calls)	fMem_calls	=	mem_count;
-		else						fMem_calls	=	.9f*fMem_calls + .1f*mem_count;
-		Memory.stat_calls	= 0		;
-	}
-
-	////////////////////////////////////////////////
-	if (g_dedicated_server) return;
-	////////////////////////////////////////////////
-	int frm = 2000;
-	div_t ddd = div(Device.dwFrame,frm);
-	if( ddd.rem < frm/2.0f ){
-		pFont->SetColor	(0xFFFFFFFF	);
-		pFont->OutSet	(0,0);
-		pFont->OutNext	(*eval_line_1);
-		pFont->OutNext	(*eval_line_2);
-		pFont->OutNext	(*eval_line_3);
-		pFont->OnRender	();
-	}
-
-	CGameFont& F = *pFont;
-	float		f_base_size	= 0.01f;
-				F.SetHeightI	(f_base_size);
-
-	if (vtune.enabled())	{
-		float sz		= pFont->GetHeight();
-		pFont->SetHeightI(0.02f);
-		pFont->SetColor	(0xFFFF0000	);
-		pFont->OutSet	(Device.dwWidth/2.0f+(pFont->SizeOf_("--= tune =--")/2.0f),Device.dwHeight/2.0f);
-		pFont->OutNext	("--= tune =--");
-		pFont->OnRender	();
-		pFont->SetHeight(sz);
-	};
-
-	// Show them
-	if (psDeviceFlags.test(rsStatistic))
-	{
-		static float	r_ps		= 0;
-		static float	b_ps		= 0;
-		r_ps						= .99f*r_ps + .01f*(clRAY.count/clRAY.result);
-		b_ps						= .99f*b_ps + .01f*(clBOX.count/clBOX.result);
-
-		CSound_stats				snd_stat;
-		::Sound->statistic			(&snd_stat,0);
-		F.SetColor	(0xFFFFFFFF	);
-
-		F.OutSet	(0,0);
-		F.OutNext	("FPS/RFPS:    %3.1f/%3.1f",fFPS,fRFPS);
-		F.OutNext	("TPS:         %2.2f M",	fTPS);
-		m_pRender->OutData1(F);
-		//F.OutNext	("VERT:        %d/%d",		RCache.stat.verts,RCache.stat.calls?RCache.stat.verts/RCache.stat.calls:0);
-		//F.OutNext	("POLY:        %d/%d",		RCache.stat.polys,RCache.stat.calls?RCache.stat.polys/RCache.stat.calls:0);
-		//F.OutNext	("DIP/DP:      %d",			RCache.stat.calls);
+    // Stop timers
+    {
+        EngineTOTAL.FrameEnd();
+        Sheduler.FrameEnd();
+        UpdateClient.FrameEnd();
+        Physics.FrameEnd();
+        ph_collision.FrameEnd();
+        ph_core.FrameEnd();
+        Animation.FrameEnd();
+        AI_Think.FrameEnd();
+        AI_Range.FrameEnd();
+        AI_Path.FrameEnd();
+        AI_Node.FrameEnd();
+        AI_Vis.FrameEnd();
+        AI_Vis_Query.FrameEnd();
+        AI_Vis_RayTests.FrameEnd();
+
+        RenderTOTAL.FrameEnd();
+        RenderCALC.FrameEnd();
+        RenderCALC_HOM.FrameEnd();
+        RenderDUMP.FrameEnd();
+        RenderDUMP_RT.FrameEnd();
+        RenderDUMP_SKIN.FrameEnd();
+        RenderDUMP_Wait.FrameEnd();
+        RenderDUMP_Wait_S.FrameEnd();
+        RenderDUMP_HUD.FrameEnd();
+        RenderDUMP_Glows.FrameEnd();
+        RenderDUMP_Lights.FrameEnd();
+        RenderDUMP_WM.FrameEnd();
+        RenderDUMP_DT_VIS.FrameEnd();
+        RenderDUMP_DT_Render.FrameEnd();
+        RenderDUMP_DT_Cache.FrameEnd();
+        RenderDUMP_Pcalc.FrameEnd();
+        RenderDUMP_Scalc.FrameEnd();
+        RenderDUMP_Srender.FrameEnd();
+
+        Sound.FrameEnd();
+        Input.FrameEnd();
+        clRAY.FrameEnd();
+        clBOX.FrameEnd();
+        clFRUSTUM.FrameEnd();
+
+        netClient1.FrameEnd();
+        netClient2.FrameEnd();
+        netServer.FrameEnd();
+
+        netClientCompressor.FrameEnd();
+        netServerCompressor.FrameEnd();
+
+        TEST0.FrameEnd();
+        TEST1.FrameEnd();
+        TEST2.FrameEnd();
+        TEST3.FrameEnd();
+
+        g_SpatialSpace->stat_insert.FrameEnd();
+        g_SpatialSpace->stat_remove.FrameEnd();
+        g_SpatialSpacePhysic->stat_insert.FrameEnd();
+        g_SpatialSpacePhysic->stat_remove.FrameEnd();
+    }
+
+    // calc FPS & TPS
+    if (Device.fTimeDelta > EPS_S)
+    {
+        float fps = 1.f / Device.fTimeDelta;
+        //if (Engine.External.tune_enabled) vtune.update (fps);
+        float fOne = 0.3f;
+        float fInv = 1.f - fOne;
+        fFPS = fInv*fFPS + fOne*fps;
+
+        if (RenderTOTAL.result > EPS_S)
+        {
+            u32 rendered_polies = Device.m_pRender->GetCacheStatPolys();
+            fTPS = fInv*fTPS + fOne*float(rendered_polies) / (RenderTOTAL.result*1000.f);
+            //fTPS = fInv*fTPS + fOne*float(RCache.stat.polys)/(RenderTOTAL.result*1000.f);
+            fRFPS = fInv*fRFPS + fOne*1000.f / RenderTOTAL.result;
+        }
+    }
+    {
+        float mem_count = float(Memory.stat_calls);
+        if (mem_count > fMem_calls) fMem_calls = mem_count;
+        else fMem_calls = .9f*fMem_calls + .1f*mem_count;
+        Memory.stat_calls = 0;
+    }
+
+    ////////////////////////////////////////////////
+    if (g_dedicated_server) return;
+    ////////////////////////////////////////////////
+    int frm = 2000;
+    div_t ddd = div(Device.dwFrame, frm);
+    if (ddd.rem < frm / 2.0f)
+    {
+        pFont->SetColor(0xFFFFFFFF);
+        pFont->OutSet(0, 0);
+        pFont->OutNext(*eval_line_1);
+        pFont->OutNext(*eval_line_2);
+        pFont->OutNext(*eval_line_3);
+        pFont->OnRender();
+    }
+
+    CGameFont& F = *pFont;
+    float  f_base_size = 0.01f;
+    F.SetHeightI(f_base_size);
+
+    if (vtune.enabled())
+    {
+        float sz = pFont->GetHeight();
+        pFont->SetHeightI(0.02f);
+        pFont->SetColor(0xFFFF0000);
+        pFont->OutSet(Device.dwWidth / 2.0f + (pFont->SizeOf_("--= tune =--") / 2.0f), Device.dwHeight / 2.0f);
+        pFont->OutNext("--= tune =--");
+        pFont->OnRender();
+        pFont->SetHeight(sz);
+    };
+
+    // Show them
+    if (psDeviceFlags.test(rsStatistic))
+    {
+        static float r_ps = 0;
+        static float b_ps = 0;
+        r_ps = .99f*r_ps + .01f*(clRAY.count / clRAY.result);
+        b_ps = .99f*b_ps + .01f*(clBOX.count / clBOX.result);
+
+        CSound_stats snd_stat;
+        ::Sound->statistic(&snd_stat, 0);
+        F.SetColor(0xFFFFFFFF);
+
+        F.OutSet(0, 0);
+        F.OutNext("FPS/RFPS:    %3.1f/%3.1f", fFPS, fRFPS);
+        F.OutNext("TPS:         %2.2f M", fTPS);
+        m_pRender->OutData1(F);
+        //F.OutNext ("VERT:        %d/%d", RCache.stat.verts,RCache.stat.calls?RCache.stat.verts/RCache.stat.calls:0);
+        //F.OutNext ("POLY:        %d/%d", RCache.stat.polys,RCache.stat.calls?RCache.stat.polys/RCache.stat.calls:0);
+        //F.OutNext ("DIP/DP:      %d", RCache.stat.calls);
 #ifdef DEBUG
-		F.OutSkip	();
+        F.OutSkip();
 #ifdef FS_DEBUG
-		F.OutNext	("mapped:      %d",			g_file_mapped_memory);
-		F.OutSkip	();
+        F.OutNext("mapped:      %d", g_file_mapped_memory);
+        F.OutSkip();
 #endif
-		m_pRender->OutData2(F);
-		//F.OutNext	("SH/T/M/C:    %d/%d/%d/%d",RCache.stat.states,RCache.stat.textures,RCache.stat.matrices,RCache.stat.constants);
-		//F.OutNext	("RT/PS/VS:    %d/%d/%d",	RCache.stat.target_rt,RCache.stat.ps,RCache.stat.vs);
-		//F.OutNext	("DCL/VB/IB:   %d/%d/%d",   RCache.stat.decl,RCache.stat.vb,RCache.stat.ib);
+        m_pRender->OutData2(F);
+        //F.OutNext ("SH/T/M/C:    %d/%d/%d/%d",RCache.stat.states,RCache.stat.textures,RCache.stat.matrices,RCache.stat.constants);
+        //F.OutNext ("RT/PS/VS:    %d/%d/%d", RCache.stat.target_rt,RCache.stat.ps,RCache.stat.vs);
+        //F.OutNext ("DCL/VB/IB:   %d/%d/%d", RCache.stat.decl,RCache.stat.vb,RCache.stat.ib);
 #endif
-		m_pRender->OutData3(F);
-		//F.OutNext	("xforms:      %d",			RCache.stat.xforms);
-		F.OutSkip	();
+        m_pRender->OutData3(F);
+        //F.OutNext ("xforms:      %d", RCache.stat.xforms);
+        F.OutSkip();
 
 #define PPP(a) (100.f*float(a)/float(EngineTOTAL.result))
-		F.OutNext	("*** ENGINE:  %2.2fms",EngineTOTAL.result);	
-		F.OutNext	("Memory:      %2.2fa",fMem_calls);
-		F.OutNext	("uClients:    %2.2fms, %2.1f%%, crow(%d)/active(%d)/total(%d)",UpdateClient.result,PPP(UpdateClient.result),UpdateClient_crows,UpdateClient_active,UpdateClient_total);
-		F.OutNext	("uSheduler:   %2.2fms, %2.1f%%",Sheduler.result,		PPP(Sheduler.result));
-		F.OutNext	("uSheduler_L: %2.2fms",fShedulerLoad);
-		F.OutNext	("uParticles:  Qstart[%d] Qactive[%d] Qdestroy[%d]",	Particles_starting,Particles_active,Particles_destroy);
-		F.OutNext	("spInsert:    o[%.2fms, %2.1f%%], p[%.2fms, %2.1f%%]",	g_SpatialSpace->stat_insert.result, PPP(g_SpatialSpace->stat_insert.result),	g_SpatialSpacePhysic->stat_insert.result, PPP(g_SpatialSpacePhysic->stat_insert.result));
-		F.OutNext	("spRemove:    o[%.2fms, %2.1f%%], p[%.2fms, %2.1f%%]",	g_SpatialSpace->stat_remove.result, PPP(g_SpatialSpace->stat_remove.result),	g_SpatialSpacePhysic->stat_remove.result, PPP(g_SpatialSpacePhysic->stat_remove.result));
-		F.OutNext	("Physics:     %2.2fms, %2.1f%%",Physics.result,		PPP(Physics.result));	
-		F.OutNext	("  collider:  %2.2fms", ph_collision.result);	
-		F.OutNext	("  solver:    %2.2fms, %d",ph_core.result,ph_core.count);	
-		F.OutNext	("aiThink:     %2.2fms, %d",AI_Think.result,AI_Think.count);	
-		F.OutNext	("  aiRange:   %2.2fms, %d",AI_Range.result,AI_Range.count);
-		F.OutNext	("  aiPath:    %2.2fms, %d",AI_Path.result,AI_Path.count);
-		F.OutNext	("  aiNode:    %2.2fms, %d",AI_Node.result,AI_Node.count);
-		F.OutNext	("aiVision:    %2.2fms, %d",AI_Vis.result,AI_Vis.count);
-		F.OutNext	("  Query:     %2.2fms",	AI_Vis_Query.result);
-		F.OutNext	("  RayCast:   %2.2fms",	AI_Vis_RayTests.result);
-		F.OutSkip	();
-								   
+        F.OutNext("*** ENGINE:  %2.2fms", EngineTOTAL.result);
+        F.OutNext("Memory:      %2.2fa", fMem_calls);
+        F.OutNext("uClients:    %2.2fms, %2.1f%%, crow(%d)/active(%d)/total(%d)", UpdateClient.result, PPP(UpdateClient.result), UpdateClient_crows, UpdateClient_active, UpdateClient_total);
+        F.OutNext("uSheduler:   %2.2fms, %2.1f%%", Sheduler.result, PPP(Sheduler.result));
+        F.OutNext("uSheduler_L: %2.2fms", fShedulerLoad);
+        F.OutNext("uParticles:  Qstart[%d] Qactive[%d] Qdestroy[%d]", Particles_starting, Particles_active, Particles_destroy);
+        F.OutNext("spInsert:    o[%.2fms, %2.1f%%], p[%.2fms, %2.1f%%]", g_SpatialSpace->stat_insert.result, PPP(g_SpatialSpace->stat_insert.result), g_SpatialSpacePhysic->stat_insert.result, PPP(g_SpatialSpacePhysic->stat_insert.result));
+        F.OutNext("spRemove:    o[%.2fms, %2.1f%%], p[%.2fms, %2.1f%%]", g_SpatialSpace->stat_remove.result, PPP(g_SpatialSpace->stat_remove.result), g_SpatialSpacePhysic->stat_remove.result, PPP(g_SpatialSpacePhysic->stat_remove.result));
+        F.OutNext("Physics:     %2.2fms, %2.1f%%", Physics.result, PPP(Physics.result));
+        F.OutNext("  collider:  %2.2fms", ph_collision.result);
+        F.OutNext("  solver:    %2.2fms, %d", ph_core.result, ph_core.count);
+        F.OutNext("aiThink:     %2.2fms, %d", AI_Think.result, AI_Think.count);
+        F.OutNext("  aiRange:   %2.2fms, %d", AI_Range.result, AI_Range.count);
+        F.OutNext("  aiPath:    %2.2fms, %d", AI_Path.result, AI_Path.count);
+        F.OutNext("  aiNode:    %2.2fms, %d", AI_Node.result, AI_Node.count);
+        F.OutNext("aiVision:    %2.2fms, %d", AI_Vis.result, AI_Vis.count);
+        F.OutNext("  Query:     %2.2fms", AI_Vis_Query.result);
+        F.OutNext("  RayCast:   %2.2fms", AI_Vis_RayTests.result);
+        F.OutSkip();
+
 #undef  PPP
 #define PPP(a) (100.f*float(a)/float(RenderTOTAL.result))
-		F.OutNext	("*** RENDER:  %2.2fms",RenderTOTAL.result);
-		F.OutNext	("R_CALC:      %2.2fms, %2.1f%%",RenderCALC.result,	PPP(RenderCALC.result));	
-		F.OutNext	("  HOM:       %2.2fms, %d",RenderCALC_HOM.result,	RenderCALC_HOM.count);
-		F.OutNext	("  Skeletons: %2.2fms, %d",Animation.result,		Animation.count);
-		F.OutNext	("R_DUMP:      %2.2fms, %2.1f%%",RenderDUMP.result,	PPP(RenderDUMP.result));	
-		F.OutNext	("  Wait-L:    %2.2fms",RenderDUMP_Wait.result);	
-		F.OutNext	("  Wait-S:    %2.2fms",RenderDUMP_Wait_S.result);	
-		F.OutNext	("  Skinning:  %2.2fms",RenderDUMP_SKIN.result);	
-		F.OutNext	("  DT_Vis/Cnt:%2.2fms/%d",RenderDUMP_DT_VIS.result,RenderDUMP_DT_Count);	
-		F.OutNext	("  DT_Render: %2.2fms",RenderDUMP_DT_Render.result);	
-		F.OutNext	("  DT_Cache:  %2.2fms",RenderDUMP_DT_Cache.result);	
-		F.OutNext	("  Wallmarks: %2.2fms, %d/%d - %d",RenderDUMP_WM.result,RenderDUMP_WMS_Count,RenderDUMP_WMD_Count,RenderDUMP_WMT_Count);
-		F.OutNext	("  Glows:     %2.2fms",RenderDUMP_Glows.result);	
-		F.OutNext	("  Lights:    %2.2fms, %d",RenderDUMP_Lights.result,RenderDUMP_Lights.count);
-		F.OutNext	("  RT:        %2.2fms, %d",RenderDUMP_RT.result,RenderDUMP_RT.count);
-		F.OutNext	("  HUD:       %2.2fms",RenderDUMP_HUD.result);	
-		F.OutNext	("  P_calc:    %2.2fms",RenderDUMP_Pcalc.result);
-		F.OutNext	("  S_calc:    %2.2fms",RenderDUMP_Scalc.result);
-		F.OutNext	("  S_render:  %2.2fms, %d",RenderDUMP_Srender.result,RenderDUMP_Srender.count);
-		F.OutSkip	();
-		F.OutNext	("*** SOUND:   %2.2fms",Sound.result);
-		F.OutNext	("  TGT/SIM/E: %d/%d/%d",  snd_stat._rendered, snd_stat._simulated, snd_stat._events);
-		F.OutNext	("  HIT/MISS:  %d/%d",  snd_stat._cache_hits, snd_stat._cache_misses);
-		F.OutSkip	();
-		F.OutNext	("Input:       %2.2fms",Input.result);
-		F.OutNext	("clRAY:       %2.2fms, %d, %2.0fK",clRAY.result,		clRAY.count,r_ps);
-		F.OutNext	("clBOX:       %2.2fms, %d, %2.0fK",clBOX.result,		clBOX.count,b_ps);
-		F.OutNext	("clFRUSTUM:   %2.2fms, %d",		clFRUSTUM.result,	clFRUSTUM.count	);
-		F.OutSkip	();
-		F.OutNext	("netClientRecv:   %2.2fms, %d",	netClient1.result,netClient1.count);
-		F.OutNext	("netClientSend:   %2.2fms, %d",	netClient2.result,netClient2.count);
-		F.OutNext	("netServer:   %2.2fms, %d",		netServer.result,netServer.count);
-		F.OutNext	("netClientCompressor:   %2.2fms",	netClientCompressor.result);
-		F.OutNext	("netServerCompressor:   %2.2fms",	netServerCompressor.result);
-		
-		F.OutSkip	();
-
-		F.OutSkip	();
-		F.OutNext	("TEST 0:      %2.2fms, %d",TEST0.result,TEST0.count);
-		F.OutNext	("TEST 1:      %2.2fms, %d",TEST1.result,TEST1.count);
-		F.OutNext	("TEST 2:      %2.2fms, %d",TEST2.result,TEST2.count);
-		F.OutNext	("TEST 3:      %2.2fms, %d",TEST3.result,TEST3.count);
+        F.OutNext("*** RENDER:  %2.2fms", RenderTOTAL.result);
+        F.OutNext("R_CALC:      %2.2fms, %2.1f%%", RenderCALC.result, PPP(RenderCALC.result));
+        F.OutNext("  HOM:       %2.2fms, %d", RenderCALC_HOM.result, RenderCALC_HOM.count);
+        F.OutNext("  Skeletons: %2.2fms, %d", Animation.result, Animation.count);
+        F.OutNext("R_DUMP:      %2.2fms, %2.1f%%", RenderDUMP.result, PPP(RenderDUMP.result));
+        F.OutNext("  Wait-L:    %2.2fms", RenderDUMP_Wait.result);
+        F.OutNext("  Wait-S:    %2.2fms", RenderDUMP_Wait_S.result);
+        F.OutNext("  Skinning:  %2.2fms", RenderDUMP_SKIN.result);
+        F.OutNext("  DT_Vis/Cnt:%2.2fms/%d", RenderDUMP_DT_VIS.result, RenderDUMP_DT_Count);
+        F.OutNext("  DT_Render: %2.2fms", RenderDUMP_DT_Render.result);
+        F.OutNext("  DT_Cache:  %2.2fms", RenderDUMP_DT_Cache.result);
+        F.OutNext("  Wallmarks: %2.2fms, %d/%d - %d", RenderDUMP_WM.result, RenderDUMP_WMS_Count, RenderDUMP_WMD_Count, RenderDUMP_WMT_Count);
+        F.OutNext("  Glows:     %2.2fms", RenderDUMP_Glows.result);
+        F.OutNext("  Lights:    %2.2fms, %d", RenderDUMP_Lights.result, RenderDUMP_Lights.count);
+        F.OutNext("  RT:        %2.2fms, %d", RenderDUMP_RT.result, RenderDUMP_RT.count);
+        F.OutNext("  HUD:       %2.2fms", RenderDUMP_HUD.result);
+        F.OutNext("  P_calc:    %2.2fms", RenderDUMP_Pcalc.result);
+        F.OutNext("  S_calc:    %2.2fms", RenderDUMP_Scalc.result);
+        F.OutNext("  S_render:  %2.2fms, %d", RenderDUMP_Srender.result, RenderDUMP_Srender.count);
+        F.OutSkip();
+        F.OutNext("*** SOUND:   %2.2fms", Sound.result);
+        F.OutNext("  TGT/SIM/E: %d/%d/%d", snd_stat._rendered, snd_stat._simulated, snd_stat._events);
+        F.OutNext("  HIT/MISS:  %d/%d", snd_stat._cache_hits, snd_stat._cache_misses);
+        F.OutSkip();
+        F.OutNext("Input:       %2.2fms", Input.result);
+        F.OutNext("clRAY:       %2.2fms, %d, %2.0fK", clRAY.result, clRAY.count, r_ps);
+        F.OutNext("clBOX:       %2.2fms, %d, %2.0fK", clBOX.result, clBOX.count, b_ps);
+        F.OutNext("clFRUSTUM:   %2.2fms, %d", clFRUSTUM.result, clFRUSTUM.count);
+        F.OutSkip();
+        F.OutNext("netClientRecv:   %2.2fms, %d", netClient1.result, netClient1.count);
+        F.OutNext("netClientSend:   %2.2fms, %d", netClient2.result, netClient2.count);
+        F.OutNext("netServer:   %2.2fms, %d", netServer.result, netServer.count);
+        F.OutNext("netClientCompressor:   %2.2fms", netClientCompressor.result);
+        F.OutNext("netServerCompressor:   %2.2fms", netServerCompressor.result);
+
+        F.OutSkip();
+
+        F.OutSkip();
+        F.OutNext("TEST 0:      %2.2fms, %d", TEST0.result, TEST0.count);
+        F.OutNext("TEST 1:      %2.2fms, %d", TEST1.result, TEST1.count);
+        F.OutNext("TEST 2:      %2.2fms, %d", TEST2.result, TEST2.count);
+        F.OutNext("TEST 3:      %2.2fms, %d", TEST3.result, TEST3.count);
 #ifdef DEBUG_MEMORY_MANAGER
-		F.OutSkip	();
-		F.OutNext	("str: cmp[%3d], dock[%3d], qpc[%3d]",Memory.stat_strcmp,Memory.stat_strdock,CPU::qpc_counter);
-		Memory.stat_strcmp	=	0		;
-		Memory.stat_strdock	=	0		;
-		CPU::qpc_counter	=	0		;
+        F.OutSkip();
+        F.OutNext("str: cmp[%3d], dock[%3d], qpc[%3d]", Memory.stat_strcmp, Memory.stat_strdock, CPU::qpc_counter);
+        Memory.stat_strcmp = 0;
+        Memory.stat_strdock = 0;
+        CPU::qpc_counter = 0;
 #else // DEBUG_MEMORY_MANAGER
-		F.OutSkip	();
-		F.OutNext	("qpc[%3d]",CPU::qpc_counter);
-		CPU::qpc_counter	=	0		;
+        F.OutSkip();
+        F.OutNext("qpc[%3d]", CPU::qpc_counter);
+        CPU::qpc_counter = 0;
 #endif // DEBUG_MEMORY_MANAGER
-//		F.OutSet	(640,0);
-		F.OutSkip	();
-		m_pRender->OutData4(F);
-		/*
-		F.OutNext	("static:        %3.1f/%d",	RCache.stat.r.s_static.verts/1024.f,		RCache.stat.r.s_static.dips );
-		F.OutNext	("flora:         %3.1f/%d",	RCache.stat.r.s_flora.verts/1024.f,			RCache.stat.r.s_flora.dips );
-		F.OutNext	("  flora_lods:  %3.1f/%d",	RCache.stat.r.s_flora_lods.verts/1024.f,	RCache.stat.r.s_flora_lods.dips );
-		F.OutNext	("dynamic:       %3.1f/%d",	RCache.stat.r.s_dynamic.verts/1024.f,		RCache.stat.r.s_dynamic.dips );
-		F.OutNext	("  dynamic_sw:  %3.1f/%d",	RCache.stat.r.s_dynamic_sw.verts/1024.f,	RCache.stat.r.s_dynamic_sw.dips );
-		F.OutNext	("  dynamic_inst:%3.1f/%d",	RCache.stat.r.s_dynamic_inst.verts/1024.f,	RCache.stat.r.s_dynamic_inst.dips );
-		F.OutNext	("  dynamic_1B:  %3.1f/%d",	RCache.stat.r.s_dynamic_1B.verts/1024.f,	RCache.stat.r.s_dynamic_1B.dips );
-		F.OutNext	("  dynamic_2B:  %3.1f/%d",	RCache.stat.r.s_dynamic_2B.verts/1024.f,	RCache.stat.r.s_dynamic_2B.dips );
-		F.OutNext	("details:       %3.1f/%d",	RCache.stat.r.s_details.verts/1024.f,		RCache.stat.r.s_details.dips );
-*/
-		//////////////////////////////////////////////////////////////////////////
-		// Renderer specific
-		F.SetHeightI						(f_base_size);
-		F.OutSet						(200,0);
-		Render->Statistics				(&F);
-
-		//////////////////////////////////////////////////////////////////////////
-		// Game specific
-		F.SetHeightI						(f_base_size);
-		F.OutSet						(400,0);
-		g_pGamePersistent->Statistics	(&F);
-
-		//////////////////////////////////////////////////////////////////////////
-		// process PURE STATS
-		F.SetHeightI						(f_base_size);
-		seqStats.Process				(rp_Stats);
-		pFont->OnRender					();
-	};
-
-	if( /*psDeviceFlags.test(rsStatistic) ||*/ psDeviceFlags.test(rsCameraPos) ){
-		_draw_cam_pos					(pFont);
-		pFont->OnRender					();
-	};
+        //  F.OutSet (640,0);
+        F.OutSkip();
+        m_pRender->OutData4(F);
+        /*
+        F.OutNext ("static:        %3.1f/%d", RCache.stat.r.s_static.verts/1024.f, RCache.stat.r.s_static.dips );
+        F.OutNext ("flora:         %3.1f/%d", RCache.stat.r.s_flora.verts/1024.f, RCache.stat.r.s_flora.dips );
+        F.OutNext ("  flora_lods:  %3.1f/%d", RCache.stat.r.s_flora_lods.verts/1024.f, RCache.stat.r.s_flora_lods.dips );
+        F.OutNext ("dynamic:       %3.1f/%d", RCache.stat.r.s_dynamic.verts/1024.f, RCache.stat.r.s_dynamic.dips );
+        F.OutNext ("  dynamic_sw:  %3.1f/%d", RCache.stat.r.s_dynamic_sw.verts/1024.f, RCache.stat.r.s_dynamic_sw.dips );
+        F.OutNext ("  dynamic_inst:%3.1f/%d", RCache.stat.r.s_dynamic_inst.verts/1024.f, RCache.stat.r.s_dynamic_inst.dips );
+        F.OutNext ("  dynamic_1B:  %3.1f/%d", RCache.stat.r.s_dynamic_1B.verts/1024.f, RCache.stat.r.s_dynamic_1B.dips );
+        F.OutNext ("  dynamic_2B:  %3.1f/%d", RCache.stat.r.s_dynamic_2B.verts/1024.f, RCache.stat.r.s_dynamic_2B.dips );
+        F.OutNext ("details:       %3.1f/%d", RCache.stat.r.s_details.verts/1024.f, RCache.stat.r.s_details.dips );
+        */
+        //////////////////////////////////////////////////////////////////////////
+        // Renderer specific
+        F.SetHeightI(f_base_size);
+        F.OutSet(200, 0);
+        Render->Statistics(&F);
+
+        //////////////////////////////////////////////////////////////////////////
+        // Game specific
+        F.SetHeightI(f_base_size);
+        F.OutSet(400, 0);
+        g_pGamePersistent->Statistics(&F);
+
+        //////////////////////////////////////////////////////////////////////////
+        // process PURE STATS
+        F.SetHeightI(f_base_size);
+        seqStats.Process(rp_Stats);
+        pFont->OnRender();
+    };
+
+    if ( /*psDeviceFlags.test(rsStatistic) ||*/ psDeviceFlags.test(rsCameraPos))
+    {
+        _draw_cam_pos(pFont);
+        pFont->OnRender();
+    };
 #ifdef DEBUG
-	//////////////////////////////////////////////////////////////////////////
-	// PERF ALERT
-	if (!g_bDisableRedText)
-	{
-		CGameFont&	F = *((CGameFont*)pFont);
-		F.SetColor						(color_rgba(255,16,16,255));
-		F.OutSet						(300,300);
-		F.SetHeightI						(f_base_size*2);
-		if (fFPS<30)					F.OutNext	("FPS       < 30:   %3.1f",	fFPS);
-		//if (RCache.stat.verts>500000)	F.OutNext	("Verts     > 500k: %d",	RCache.stat.verts);
-		m_pRender->GuardVerts(F);
-		////if (RCache.stat.polys>500000)	F.OutNext	("Polys     > 500k: %d",	RCache.stat.polys);
-		if (psDeviceFlags.test(rsStatistic))
-		{
-			m_pRender->GuardDrawCalls(F);
-			//if (RCache.stat.calls>1000)		F.OutNext	("DIP/DP    > 1k:   %d",	RCache.stat.calls);
-			////if (RCache.stat.textures>1000)F.OutNext	("T_change  > 500:  %d",	RCache.stat.textures);
-			if (RenderDUMP_DT_Count>1000)	F.OutNext	("DT_count  > 1000: %u",	RenderDUMP_DT_Count);
-			F.OutSkip						();
-			//if (fMem_calls>1500)			F.OutNext	("MMGR calls > 1500:%3.1f",	fMem_calls);
-			if (Sheduler.result>3.f)		F.OutNext	("Update     > 3ms:	%3.1f",	Sheduler.result);
-			if (UpdateClient.result>3.f)	F.OutNext	("UpdateCL   > 3ms: %3.1f",	UpdateClient.result);
-			if (Physics.result>5.f)			F.OutNext	("Physics    > 5ms: %3.1f",	Physics.result);	
-		}
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// Show errors
-	if (!g_bDisableRedText && errors.size())
-	{
-		CGameFont&	F = *((CGameFont*)pFont);
-		F.SetColor	(color_rgba(255,16,16,191));
-		F.OutSet	(200,0);
-		F.SetHeightI	(f_base_size);
+    //////////////////////////////////////////////////////////////////////////
+    // PERF ALERT
+    if (!g_bDisableRedText)
+    {
+        CGameFont& F = *((CGameFont*)pFont);
+        F.SetColor(color_rgba(255, 16, 16, 255));
+        F.OutSet(300, 300);
+        F.SetHeightI(f_base_size * 2);
+        if (fFPS < 30)     F.OutNext("FPS       < 30:   %3.1f", fFPS);
+        //if (RCache.stat.verts>500000) F.OutNext ("Verts     > 500k: %d", RCache.stat.verts);
+        m_pRender->GuardVerts(F);
+        ////if (RCache.stat.polys>500000) F.OutNext ("Polys     > 500k: %d", RCache.stat.polys);
+        if (psDeviceFlags.test(rsStatistic))
+        {
+            m_pRender->GuardDrawCalls(F);
+            //if (RCache.stat.calls>1000)  F.OutNext ("DIP/DP    > 1k:   %d", RCache.stat.calls);
+            ////if (RCache.stat.textures>1000)F.OutNext ("T_change  > 500:  %d", RCache.stat.textures);
+            if (RenderDUMP_DT_Count > 1000) F.OutNext("DT_count  > 1000: %u", RenderDUMP_DT_Count);
+            F.OutSkip();
+            //if (fMem_calls>1500)   F.OutNext ("MMGR calls > 1500:%3.1f", fMem_calls);
+            if (Sheduler.result > 3.f)  F.OutNext("Update     > 3ms: %3.1f", Sheduler.result);
+            if (UpdateClient.result > 3.f) F.OutNext("UpdateCL   > 3ms: %3.1f", UpdateClient.result);
+            if (Physics.result > 5.f)   F.OutNext("Physics    > 5ms: %3.1f", Physics.result);
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+    // Show errors
+    if (!g_bDisableRedText && errors.size())
+    {
+        CGameFont& F = *((CGameFont*)pFont);
+        F.SetColor(color_rgba(255, 16, 16, 191));
+        F.OutSet(200, 0);
+        F.SetHeightI(f_base_size);
 #if 0
-		for (u32 it=0; it<errors.size(); it++)
-			F.OutNext("%s",errors[it].c_str());
+        for (u32 it = 0; it < errors.size(); it++)
+            F.OutNext("%s", errors[it].c_str());
 #else
-		for (u32 it=(u32)_max(int(0),(int)errors.size() - g_ErrorLineCount); it<errors.size(); it++)
-			F.OutNext("%s",errors[it].c_str());
+        for (u32 it = (u32)_max(int(0), (int)errors.size() - g_ErrorLineCount); it < errors.size(); it++)
+            F.OutNext("%s", errors[it].c_str());
 #endif
-		F.OnRender	();
-	}
+        F.OnRender();
+    }
 #endif
 
-	{
-		EngineTOTAL.FrameStart		();	
-		Sheduler.FrameStart			();	
-		UpdateClient.FrameStart		();	
-		Physics.FrameStart			();	
-		ph_collision.FrameStart		();
-		ph_core.FrameStart			();
-		Animation.FrameStart		();	
-		AI_Think.FrameStart			();
-		AI_Range.FrameStart			();
-		AI_Path.FrameStart			();
-		AI_Node.FrameStart			();
-		AI_Vis.FrameStart			();
-		AI_Vis_Query.FrameStart		();
-		AI_Vis_RayTests.FrameStart	();
-		
-		RenderTOTAL.FrameStart		();
-		RenderCALC.FrameStart		();
-		RenderCALC_HOM.FrameStart	();
-		RenderDUMP.FrameStart		();	
-		RenderDUMP_RT.FrameStart	();
-		RenderDUMP_SKIN.FrameStart	();	
-		RenderDUMP_Wait.FrameStart	();	
-		RenderDUMP_Wait_S.FrameStart();	
-		RenderDUMP_HUD.FrameStart	();	
-		RenderDUMP_Glows.FrameStart	();	
-		RenderDUMP_Lights.FrameStart();	
-		RenderDUMP_WM.FrameStart	();	
-		RenderDUMP_DT_VIS.FrameStart();	
-		RenderDUMP_DT_Render.FrameStart();	
-		RenderDUMP_DT_Cache.FrameStart();	
-		RenderDUMP_Pcalc.FrameStart	();	
-		RenderDUMP_Scalc.FrameStart	();	
-		RenderDUMP_Srender.FrameStart();	
-		
-		Sound.FrameStart			();
-		Input.FrameStart			();
-		clRAY.FrameStart			();	
-		clBOX.FrameStart			();
-		clFRUSTUM.FrameStart		();
-		
-		netClient1.FrameStart		();
-		netClient2.FrameStart		();
-		netServer.FrameStart		();
-		netClientCompressor.FrameStart();
-		netServerCompressor.FrameStart();
-
-		TEST0.FrameStart			();
-		TEST1.FrameStart			();
-		TEST2.FrameStart			();
-		TEST3.FrameStart			();
-
-		g_SpatialSpace->stat_insert.FrameStart		();
-		g_SpatialSpace->stat_remove.FrameStart		();
-
-		g_SpatialSpacePhysic->stat_insert.FrameStart();
-		g_SpatialSpacePhysic->stat_remove.FrameStart();
-	}
-	dwSND_Played = dwSND_Allocated = 0;
-	Particles_starting = Particles_active = Particles_destroy = 0;
+    {
+        EngineTOTAL.FrameStart();
+        Sheduler.FrameStart();
+        UpdateClient.FrameStart();
+        Physics.FrameStart();
+        ph_collision.FrameStart();
+        ph_core.FrameStart();
+        Animation.FrameStart();
+        AI_Think.FrameStart();
+        AI_Range.FrameStart();
+        AI_Path.FrameStart();
+        AI_Node.FrameStart();
+        AI_Vis.FrameStart();
+        AI_Vis_Query.FrameStart();
+        AI_Vis_RayTests.FrameStart();
+
+        RenderTOTAL.FrameStart();
+        RenderCALC.FrameStart();
+        RenderCALC_HOM.FrameStart();
+        RenderDUMP.FrameStart();
+        RenderDUMP_RT.FrameStart();
+        RenderDUMP_SKIN.FrameStart();
+        RenderDUMP_Wait.FrameStart();
+        RenderDUMP_Wait_S.FrameStart();
+        RenderDUMP_HUD.FrameStart();
+        RenderDUMP_Glows.FrameStart();
+        RenderDUMP_Lights.FrameStart();
+        RenderDUMP_WM.FrameStart();
+        RenderDUMP_DT_VIS.FrameStart();
+        RenderDUMP_DT_Render.FrameStart();
+        RenderDUMP_DT_Cache.FrameStart();
+        RenderDUMP_Pcalc.FrameStart();
+        RenderDUMP_Scalc.FrameStart();
+        RenderDUMP_Srender.FrameStart();
+
+        Sound.FrameStart();
+        Input.FrameStart();
+        clRAY.FrameStart();
+        clBOX.FrameStart();
+        clFRUSTUM.FrameStart();
+
+        netClient1.FrameStart();
+        netClient2.FrameStart();
+        netServer.FrameStart();
+        netClientCompressor.FrameStart();
+        netServerCompressor.FrameStart();
+
+        TEST0.FrameStart();
+        TEST1.FrameStart();
+        TEST2.FrameStart();
+        TEST3.FrameStart();
+
+        g_SpatialSpace->stat_insert.FrameStart();
+        g_SpatialSpace->stat_remove.FrameStart();
+
+        g_SpatialSpacePhysic->stat_insert.FrameStart();
+        g_SpatialSpacePhysic->stat_remove.FrameStart();
+    }
+    dwSND_Played = dwSND_Allocated = 0;
+    Particles_starting = Particles_active = Particles_destroy = 0;
 }
 
-void	_LogCallback				(LPCSTR string)
+void _LogCallback(LPCSTR string)
 {
-	if (string && '!'==string[0] && ' '==string[1])
-		Device.Statistic->errors.push_back	(shared_str(string));
+    if (string && '!' == string[0] && ' ' == string[1])
+        Device.Statistic->errors.push_back(shared_str(string));
 }
 
-void CStats::OnDeviceCreate			()
+void CStats::OnDeviceCreate()
 {
-	g_bDisableRedText				= strstr(Core.Params,"-xclsx")?TRUE:FALSE;
+    g_bDisableRedText = strstr(Core.Params, "-xclsx") ? TRUE : FALSE;
 
-//	if (!strstr(Core.Params, "-dedicated"))
+    // if (!strstr(Core.Params, "-dedicated"))
 #ifndef DEDICATED_SERVER
-	pFont	= xr_new<CGameFont>		("stat_font", CGameFont::fsDeviceIndependent);
+    pFont = xr_new<CGameFont>("stat_font", CGameFont::fsDeviceIndependent);
 #endif
-	
-	if(!pSettings->section_exist("evaluation")
-		||!pSettings->line_exist("evaluation","line1")
-		||!pSettings->line_exist("evaluation","line2")
-		||!pSettings->line_exist("evaluation","line3") )
-		FATAL	("");
-
-	eval_line_1 = pSettings->r_string_wb("evaluation","line1");
-	eval_line_2 = pSettings->r_string_wb("evaluation","line2");
-	eval_line_3 = pSettings->r_string_wb("evaluation","line3");
-
-	// 
+
+    if (!pSettings->section_exist("evaluation")
+            || !pSettings->line_exist("evaluation", "line1")
+            || !pSettings->line_exist("evaluation", "line2")
+            || !pSettings->line_exist("evaluation", "line3"))
+        FATAL("");
+
+    eval_line_1 = pSettings->r_string_wb("evaluation", "line1");
+    eval_line_2 = pSettings->r_string_wb("evaluation", "line2");
+    eval_line_3 = pSettings->r_string_wb("evaluation", "line3");
+
+    //
 #ifdef DEBUG
-	if (!g_bDisableRedText)			SetLogCB	(_LogCallback);
+    if (!g_bDisableRedText)   SetLogCB(_LogCallback);
 #endif
 }
 
-void CStats::OnDeviceDestroy		()
+void CStats::OnDeviceDestroy()
 {
-	SetLogCB(0);
-	xr_delete	(pFont);
+    SetLogCB(0);
+    xr_delete(pFont);
 }
 
-void CStats::OnRender				()
+void CStats::OnRender()
 {
 #ifdef DEBUG
-	if (g_stats_flags.is(st_sound)){
-		CSound_stats_ext				snd_stat_ext;
-		::Sound->statistic				(0,&snd_stat_ext);
-		CSound_stats_ext::item_vec_it	_I = snd_stat_ext.items.begin();
-		CSound_stats_ext::item_vec_it	_E = snd_stat_ext.items.end();
-		for (;_I!=_E;_I++){
-			const CSound_stats_ext::SItem& item = *_I;
-			if (item._3D)
-			{
-				m_pRender->SetDrawParams(&*Device.m_pRender);
-				//RCache.set_xform_world(Fidentity);
-				//RCache.set_Shader		(Device.m_SelectionShader);
-				//RCache.set_c			("tfactor",1,1,1,1);
-				DU->DrawCross			(item.params.position, 0.5f, 0xFF0000FF, true );
-				if (g_stats_flags.is(st_sound_min_dist))
-					DU->DrawSphere		(Fidentity, item.params.position, item.params.min_distance, 0x400000FF,	0xFF0000FF, true, true);
-				if (g_stats_flags.is(st_sound_max_dist))
-					DU->DrawSphere		(Fidentity, item.params.position, item.params.max_distance, 0x4000FF00,	0xFF008000, true, true);
-				
-				xr_string out_txt		= (out_txt.size() && g_stats_flags.is(st_sound_info_name)) ? item.name.c_str():"";
-
-				if (item.game_object)
-				{
-					if (g_stats_flags.is(st_sound_ai_dist))
-						DU->DrawSphere	(Fidentity, item.params.position, item.params.max_ai_distance, 0x80FF0000,0xFF800000,true,true);
-					if (g_stats_flags.is(st_sound_info_object)){
-						out_txt			+= "  (";
-						out_txt			+= item.game_object->cNameSect().c_str();
-						out_txt			+= ")";
-					}
-				}
-				if (g_stats_flags.is_any(st_sound_info_name|st_sound_info_object) && item.name.size())
-					DU->OutText			(item.params.position, out_txt.c_str(),0xFFFFFFFF,0xFF000000);
-			}
-		}
-	}
+    if (g_stats_flags.is(st_sound))
+    {
+        CSound_stats_ext    snd_stat_ext;
+        ::Sound->statistic(0, &snd_stat_ext);
+        CSound_stats_ext::item_vec_it _I = snd_stat_ext.items.begin();
+        CSound_stats_ext::item_vec_it _E = snd_stat_ext.items.end();
+        for (; _I != _E; _I++)
+        {
+            const CSound_stats_ext::SItem& item = *_I;
+            if (item._3D)
+            {
+                m_pRender->SetDrawParams(&*Device.m_pRender);
+                //RCache.set_xform_world(Fidentity);
+                //RCache.set_Shader (Device.m_SelectionShader);
+                //RCache.set_c ("tfactor",1,1,1,1);
+                DU->DrawCross(item.params.position, 0.5f, 0xFF0000FF, true);
+                if (g_stats_flags.is(st_sound_min_dist))
+                    DU->DrawSphere(Fidentity, item.params.position, item.params.min_distance, 0x400000FF, 0xFF0000FF, true, true);
+                if (g_stats_flags.is(st_sound_max_dist))
+                    DU->DrawSphere(Fidentity, item.params.position, item.params.max_distance, 0x4000FF00, 0xFF008000, true, true);
+
+                xr_string out_txt = (out_txt.size() && g_stats_flags.is(st_sound_info_name)) ? item.name.c_str() : "";
+
+                if (item.game_object)
+                {
+                    if (g_stats_flags.is(st_sound_ai_dist))
+                        DU->DrawSphere(Fidentity, item.params.position, item.params.max_ai_distance, 0x80FF0000, 0xFF800000, true, true);
+                    if (g_stats_flags.is(st_sound_info_object))
+                    {
+                        out_txt += " (";
+                        out_txt += item.game_object->cNameSect().c_str();
+                        out_txt += ")";
+                    }
+                }
+                if (g_stats_flags.is_any(st_sound_info_name | st_sound_info_object) && item.name.size())
+                    DU->OutText(item.params.position, out_txt.c_str(), 0xFFFFFFFF, 0xFF000000);
+            }
+        }
+    }
 #endif
 }
diff --git a/src/xrEngine/Stats.h b/src/xrEngine/Stats.h
index c1a18c2e413..4f7726f541a 100644
--- a/src/xrEngine/Stats.h
+++ b/src/xrEngine/Stats.h
@@ -16,117 +16,118 @@ DECLARE_MESSAGE(Stats);
 class ENGINE_API CStatsPhysics
 {
 public:
-	CStatTimer	ph_collision;		// collision
-	CStatTimer	ph_core;			// integrate
-	CStatTimer	Physics;			// movement+collision
+    CStatTimer ph_collision; // collision
+    CStatTimer ph_core; // integrate
+    CStatTimer Physics; // movement+collision
 };
 
-class ENGINE_API CStats: 
-	public pureRender,
-	public CStatsPhysics
+class ENGINE_API CStats :
+    public pureRender,
+    public CStatsPhysics
 {
 public:
-	CGameFont*	pFont;
-
-	float		fFPS,fRFPS,fTPS		;			// FPS, RenderFPS, TPS
-	float		fMem_calls			;
-	u32			dwMem_calls			;
-	u32			dwSND_Played,dwSND_Allocated;	// Play/Alloc
-	float		fShedulerLoad		;
-
-	CStatTimer	EngineTOTAL;			// 
-	CStatTimer	Sheduler;				// 
-	CStatTimer	UpdateClient;			// 
-	u32			UpdateClient_updated;	//
-	u32			UpdateClient_crows;		//
-	u32			UpdateClient_active;	//
-	u32			UpdateClient_total;		//
-	u32			Particles_starting;	// starting
-	u32			Particles_active;	// active
-	u32			Particles_destroy;	// destroying
-//	CStatTimer	Physics;			// movement+collision
-//	CStatTimer	ph_collision;		// collision
-//	CStatTimer	ph_core;			// collision
-	CStatTimer	AI_Think;			// thinking
-	CStatTimer	AI_Range;			// query: range
-	CStatTimer	AI_Path;			// query: path
-	CStatTimer	AI_Node;			// query: node
-	CStatTimer	AI_Vis;				// visibility detection - total
-	CStatTimer	AI_Vis_Query;		// visibility detection - portal traversal and frustum culling
-	CStatTimer	AI_Vis_RayTests;	// visibility detection - ray casting
-
-	CStatTimer	RenderTOTAL;		// 
-	CStatTimer	RenderTOTAL_Real;	
-	CStatTimer	RenderCALC;			// portal traversal, frustum culling, entities "renderable_Render"
-	CStatTimer	RenderCALC_HOM;		// HOM rendering
-	CStatTimer	Animation;			// skeleton calculation
-	CStatTimer	RenderDUMP;			// actual primitive rendering
-	CStatTimer	RenderDUMP_Wait;	// ...waiting something back (queries results, etc.)
-	CStatTimer	RenderDUMP_Wait_S;	// ...frame-limit sync
-	CStatTimer	RenderDUMP_RT;		// ...render-targets
-	CStatTimer	RenderDUMP_SKIN;	// ...skinning
-	CStatTimer	RenderDUMP_HUD;		// ...hud rendering
-	CStatTimer	RenderDUMP_Glows;	// ...glows vis-testing,sorting,render
-	CStatTimer	RenderDUMP_Lights;	// ...d-lights building/rendering
-	CStatTimer	RenderDUMP_WM;		// ...wallmark sorting, rendering
-	u32			RenderDUMP_WMS_Count;// ...number of static wallmark
-	u32			RenderDUMP_WMD_Count;// ...number of dynamic wallmark
-	u32			RenderDUMP_WMT_Count;// ...number of wallmark tri
-	CStatTimer	RenderDUMP_DT_VIS;	// ...details visibility detection
-	CStatTimer	RenderDUMP_DT_Render;// ...details rendering
-	CStatTimer	RenderDUMP_DT_Cache;// ...details slot cache access
-	u32			RenderDUMP_DT_Count;// ...number of DT-elements
-	CStatTimer	RenderDUMP_Pcalc;	// ...projectors	building
-	CStatTimer	RenderDUMP_Scalc;	// ...shadows		building
-	CStatTimer	RenderDUMP_Srender;	// ...shadows		render
-	
-	CStatTimer	Sound;				// total time taken by sound subsystem (accurate only in single-threaded mode)
-	CStatTimer	Input;				// total time taken by input subsystem (accurate only in single-threaded mode)
-	CStatTimer	clRAY;				// total: ray-testing
-	CStatTimer	clBOX;				// total: box query
-	CStatTimer	clFRUSTUM;			// total: frustum query
-	
-	CStatTimer	netClient1;
-	CStatTimer	netClient2;
-	CStatTimer	netServer;
-	CStatTimer	netClientCompressor;
-	CStatTimer	netServerCompressor;
-	
-
-	
-	CStatTimer	TEST0;				// debug counter
-	CStatTimer	TEST1;				// debug counter
-	CStatTimer	TEST2;				// debug counter
-	CStatTimer	TEST3;				// debug counter
-
-	shared_str	eval_line_1;
-	shared_str	eval_line_2;
-	shared_str	eval_line_3;
-
-	void			Show			(void);
-	virtual void 	OnRender		();
-	void			OnDeviceCreate	(void);
-	void			OnDeviceDestroy	(void);
+    CGameFont* pFont;
+
+    float fFPS, fRFPS, fTPS; // FPS, RenderFPS, TPS
+    float fMem_calls;
+    u32 dwMem_calls;
+    u32 dwSND_Played, dwSND_Allocated; // Play/Alloc
+    float fShedulerLoad;
+
+    CStatTimer EngineTOTAL; //
+    CStatTimer Sheduler; //
+    CStatTimer UpdateClient; //
+    u32 UpdateClient_updated; //
+    u32 UpdateClient_crows; //
+    u32 UpdateClient_active; //
+    u32 UpdateClient_total; //
+    u32 Particles_starting; // starting
+    u32 Particles_active; // active
+    u32 Particles_destroy; // destroying
+    // CStatTimer Physics; // movement+collision
+    // CStatTimer ph_collision; // collision
+    // CStatTimer ph_core; // collision
+    CStatTimer AI_Think; // thinking
+    CStatTimer AI_Range; // query: range
+    CStatTimer AI_Path; // query: path
+    CStatTimer AI_Node; // query: node
+    CStatTimer AI_Vis; // visibility detection - total
+    CStatTimer AI_Vis_Query; // visibility detection - portal traversal and frustum culling
+    CStatTimer AI_Vis_RayTests; // visibility detection - ray casting
+
+    CStatTimer RenderTOTAL; //
+    CStatTimer RenderTOTAL_Real;
+    CStatTimer RenderCALC; // portal traversal, frustum culling, entities "renderable_Render"
+    CStatTimer RenderCALC_HOM; // HOM rendering
+    CStatTimer Animation; // skeleton calculation
+    CStatTimer RenderDUMP; // actual primitive rendering
+    CStatTimer RenderDUMP_Wait; // ...waiting something back (queries results, etc.)
+    CStatTimer RenderDUMP_Wait_S; // ...frame-limit sync
+    CStatTimer RenderDUMP_RT; // ...render-targets
+    CStatTimer RenderDUMP_SKIN; // ...skinning
+    CStatTimer RenderDUMP_HUD; // ...hud rendering
+    CStatTimer RenderDUMP_Glows; // ...glows vis-testing,sorting,render
+    CStatTimer RenderDUMP_Lights; // ...d-lights building/rendering
+    CStatTimer RenderDUMP_WM; // ...wallmark sorting, rendering
+    u32 RenderDUMP_WMS_Count;// ...number of static wallmark
+    u32 RenderDUMP_WMD_Count;// ...number of dynamic wallmark
+    u32 RenderDUMP_WMT_Count;// ...number of wallmark tri
+    CStatTimer RenderDUMP_DT_VIS; // ...details visibility detection
+    CStatTimer RenderDUMP_DT_Render;// ...details rendering
+    CStatTimer RenderDUMP_DT_Cache;// ...details slot cache access
+    u32 RenderDUMP_DT_Count;// ...number of DT-elements
+    CStatTimer RenderDUMP_Pcalc; // ...projectors building
+    CStatTimer RenderDUMP_Scalc; // ...shadows building
+    CStatTimer RenderDUMP_Srender; // ...shadows render
+
+    CStatTimer Sound; // total time taken by sound subsystem (accurate only in single-threaded mode)
+    CStatTimer Input; // total time taken by input subsystem (accurate only in single-threaded mode)
+    CStatTimer clRAY; // total: ray-testing
+    CStatTimer clBOX; // total: box query
+    CStatTimer clFRUSTUM; // total: frustum query
+
+    CStatTimer netClient1;
+    CStatTimer netClient2;
+    CStatTimer netServer;
+    CStatTimer netClientCompressor;
+    CStatTimer netServerCompressor;
+
+
+
+    CStatTimer TEST0; // debug counter
+    CStatTimer TEST1; // debug counter
+    CStatTimer TEST2; // debug counter
+    CStatTimer TEST3; // debug counter
+
+    shared_str eval_line_1;
+    shared_str eval_line_2;
+    shared_str eval_line_3;
+
+    void Show(void);
+    virtual void OnRender();
+    void OnDeviceCreate(void);
+    void OnDeviceDestroy(void);
 public:
-	xr_vector		<shared_str>	errors;
-	CRegistrator	<pureStats>		seqStats;
+    xr_vector <shared_str> errors;
+    CRegistrator <pureStats> seqStats;
 public:
-					CStats			();
-					~CStats			();
+    CStats();
+    ~CStats();
 
-	IC CGameFont*	Font			(){return pFont;}
+    IC CGameFont* Font() { return pFont; }
 
 private:
-	FactoryPtr<IStatsRender>	m_pRender;
+    FactoryPtr<IStatsRender> m_pRender;
 };
 
-enum{
-	st_sound			= (1<<0),
-	st_sound_min_dist	= (1<<1),
-	st_sound_max_dist	= (1<<2),
-	st_sound_ai_dist	= (1<<3),
-	st_sound_info_name	= (1<<4),
-	st_sound_info_object= (1<<5),
+enum
+{
+    st_sound = (1 << 0),
+    st_sound_min_dist = (1 << 1),
+    st_sound_max_dist = (1 << 2),
+    st_sound_ai_dist = (1 << 3),
+    st_sound_info_name = (1 << 4),
+    st_sound_info_object = (1 << 5),
 };
 
 extern Flags32 g_stats_flags;
diff --git a/src/xrEngine/Text_Console.cpp b/src/xrEngine/Text_Console.cpp
index 83bc78e6dff..67ec630ea17 100644
--- a/src/xrEngine/Text_Console.cpp
+++ b/src/xrEngine/Text_Console.cpp
@@ -2,341 +2,343 @@
 #include "Text_Console.h"
 #include "line_editor.h"
 
-extern char const * const		ioc_prompt;
-extern char const * const		ch_cursor;
+extern char const* const ioc_prompt;
+extern char const* const ch_cursor;
 int g_svTextConsoleUpdateRate = 1;
 
 CTextConsole::CTextConsole()
 {
-	m_pMainWnd    = NULL;
-	m_hConsoleWnd = NULL;
-	m_hLogWnd     = NULL;
-	m_hLogWndFont = NULL;
+    m_pMainWnd = NULL;
+    m_hConsoleWnd = NULL;
+    m_hLogWnd = NULL;
+    m_hLogWndFont = NULL;
 
-	m_bScrollLog  = true;
-	m_dwStartLine = 0;
+    m_bScrollLog = true;
+    m_dwStartLine = 0;
 
-	m_bNeedUpdate      = false;
-	m_dwLastUpdateTime = Device.dwTimeGlobal;
-	m_last_time        = Device.dwTimeGlobal;
+    m_bNeedUpdate = false;
+    m_dwLastUpdateTime = Device.dwTimeGlobal;
+    m_last_time = Device.dwTimeGlobal;
 }
 
 CTextConsole::~CTextConsole()
 {
-	m_pMainWnd = NULL;
+    m_pMainWnd = NULL;
 }
 
 //-------------------------------------------------------------------------------------------
-LRESULT CALLBACK TextConsole_WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-void	CTextConsole::CreateConsoleWnd()
+LRESULT CALLBACK TextConsole_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+void CTextConsole::CreateConsoleWnd()
 {
-	HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(0);
-	//----------------------------------
-	RECT cRc;
-	GetClientRect(*m_pMainWnd, &cRc);
-	INT lX = cRc.left;
-	INT lY = cRc.top;
-	INT lWidth = cRc.right - cRc.left;
-	INT lHeight = cRc.bottom - cRc.top;
-	//----------------------------------
-	const char*	wndclass ="TEXT_CONSOLE";
-
-	// Register the windows class
-	WNDCLASS wndClass = { 0, TextConsole_WndProc, 0, 0, hInstance,
-		NULL,
-		LoadCursor( hInstance, IDC_ARROW ),
-		GetStockBrush(GRAY_BRUSH),
-		NULL, wndclass };
-	RegisterClass( &wndClass );
-
-	// Set the window's initial style
-	u32 dwWindowStyle = WS_OVERLAPPED | WS_CHILD | WS_VISIBLE;// | WS_CLIPSIBLINGS;// | WS_CLIPCHILDREN;
-
-	// Set the window's initial width
-	RECT rc;
-	SetRect			( &rc, lX, lY, lWidth, lHeight );
-//	AdjustWindowRect( &rc, dwWindowStyle, FALSE );
-
-	// Create the render window
-	m_hConsoleWnd = CreateWindow( wndclass, "XRAY Text Console", dwWindowStyle,
-		lX, lY,
-		lWidth, lHeight, *m_pMainWnd,
-		0, hInstance, 0L );
-	//---------------------------------------------------------------------------
-	R_ASSERT2(m_hConsoleWnd, "Unable to Create TextConsole Window!");
+    HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(0);
+    //----------------------------------
+    RECT cRc;
+    GetClientRect(*m_pMainWnd, &cRc);
+    INT lX = cRc.left;
+    INT lY = cRc.top;
+    INT lWidth = cRc.right - cRc.left;
+    INT lHeight = cRc.bottom - cRc.top;
+    //----------------------------------
+    const char* wndclass = "TEXT_CONSOLE";
+
+    // Register the windows class
+    WNDCLASS wndClass = {0, TextConsole_WndProc, 0, 0, hInstance,
+                         NULL,
+                         LoadCursor(hInstance, IDC_ARROW),
+                         GetStockBrush(GRAY_BRUSH),
+                         NULL, wndclass
+                        };
+    RegisterClass(&wndClass);
+
+    // Set the window's initial style
+    u32 dwWindowStyle = WS_OVERLAPPED | WS_CHILD | WS_VISIBLE;// | WS_CLIPSIBLINGS;// | WS_CLIPCHILDREN;
+
+    // Set the window's initial width
+    RECT rc;
+    SetRect(&rc, lX, lY, lWidth, lHeight);
+    // AdjustWindowRect( &rc, dwWindowStyle, FALSE );
+
+    // Create the render window
+    m_hConsoleWnd = CreateWindow(wndclass, "XRAY Text Console", dwWindowStyle,
+                                 lX, lY,
+                                 lWidth, lHeight, *m_pMainWnd,
+                                 0, hInstance, 0L);
+    //---------------------------------------------------------------------------
+    R_ASSERT2(m_hConsoleWnd, "Unable to Create TextConsole Window!");
 };
 //-------------------------------------------------------------------------------------------
-LRESULT CALLBACK TextConsole_LogWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-void	CTextConsole::CreateLogWnd()
+LRESULT CALLBACK TextConsole_LogWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+void CTextConsole::CreateLogWnd()
 {
-	HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(0);
-	//----------------------------------
-	RECT cRc;
-	GetClientRect(m_hConsoleWnd, &cRc);
-	INT lX = cRc.left;
-	INT lY = cRc.top;
-	INT lWidth = cRc.right - cRc.left;
-	INT lHeight = cRc.bottom - cRc.top;
-	//----------------------------------
-	const char*	wndclass ="TEXT_CONSOLE_LOG_WND";
-
-	// Register the windows class
-	WNDCLASS wndClass = { 0, TextConsole_LogWndProc, 0, 0, hInstance,
-		NULL,
-		LoadCursor( NULL, IDC_ARROW ),
-		GetStockBrush(BLACK_BRUSH),
-		NULL, wndclass };
-	RegisterClass( &wndClass );
-
-	// Set the window's initial style
-	u32 dwWindowStyle = WS_OVERLAPPED | WS_CHILD | WS_VISIBLE;// | WS_CLIPSIBLINGS;
-//	u32 dwWindowStyleEx = WS_EX_CLIENTEDGE;
-
-	// Set the window's initial width
-	RECT rc;
-	SetRect			( &rc, lX, lY, lWidth, lHeight );
-//	AdjustWindowRect( &rc, dwWindowStyle, FALSE );
-
-	// Create the render window
-	m_hLogWnd = CreateWindow(wndclass, "XRAY Text Console Log", dwWindowStyle,
-		lX, lY,
-		lWidth, lHeight, m_hConsoleWnd,
-		0, hInstance, 0L );
-	//---------------------------------------------------------------------------
-	R_ASSERT2(m_hLogWnd, "Unable to Create TextConsole Window!");
-	//---------------------------------------------------------------------------
-	ShowWindow(m_hLogWnd, SW_SHOW); 
-	UpdateWindow(m_hLogWnd);
-	//-----------------------------------------------
-	LOGFONT lf; 
-	lf.lfHeight = -12; 
-	lf.lfWidth = 0;
-	lf.lfEscapement = 0; 
-	lf.lfOrientation = 0; 
-	lf.lfWeight = FW_NORMAL;
-	lf.lfItalic = 0; 
-	lf.lfUnderline = 0; 
-	lf.lfStrikeOut = 0; 
-	lf.lfCharSet = DEFAULT_CHARSET;
-	lf.lfOutPrecision = OUT_STRING_PRECIS;
-	lf.lfClipPrecision = CLIP_STROKE_PRECIS;	
-	lf.lfQuality = DRAFT_QUALITY;
-	lf.lfPitchAndFamily = VARIABLE_PITCH | FF_SWISS;
-	xr_sprintf(lf.lfFaceName,sizeof(lf.lfFaceName),"");
-
-	m_hLogWndFont = CreateFontIndirect(&lf);
-	R_ASSERT2(m_hLogWndFont, "Unable to Create Font for Log Window");
-	//------------------------------------------------
-	m_hDC_LogWnd = GetDC(m_hLogWnd);
-	R_ASSERT2(m_hDC_LogWnd, "Unable to Get DC for Log Window!");
-	//------------------------------------------------
-	m_hDC_LogWnd_BackBuffer = CreateCompatibleDC(m_hDC_LogWnd);
-	R_ASSERT2(m_hDC_LogWnd_BackBuffer, "Unable to Create Compatible DC for Log Window!");
-	//------------------------------------------------
-	GetClientRect(m_hLogWnd, &cRc);
-	lWidth = cRc.right - cRc.left;
-	lHeight = cRc.bottom - cRc.top;
-	//----------------------------------
-	m_hBB_BM = CreateCompatibleBitmap(m_hDC_LogWnd, lWidth, lHeight);
-	R_ASSERT2(m_hBB_BM, "Unable to Create Compatible Bitmap for Log Window!");
-	//------------------------------------------------
-	m_hOld_BM = (HBITMAP)SelectObject(m_hDC_LogWnd_BackBuffer, m_hBB_BM);
-	//------------------------------------------------
-	m_hPrevFont = (HFONT)SelectObject(m_hDC_LogWnd_BackBuffer, m_hLogWndFont);
-	//------------------------------------------------
-	SetTextColor(m_hDC_LogWnd_BackBuffer, RGB(255, 255, 255));
-	SetBkColor(m_hDC_LogWnd_BackBuffer, RGB(1, 1, 1));
-	//------------------------------------------------
-	m_hBackGroundBrush = GetStockBrush(BLACK_BRUSH);
+    HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(0);
+    //----------------------------------
+    RECT cRc;
+    GetClientRect(m_hConsoleWnd, &cRc);
+    INT lX = cRc.left;
+    INT lY = cRc.top;
+    INT lWidth = cRc.right - cRc.left;
+    INT lHeight = cRc.bottom - cRc.top;
+    //----------------------------------
+    const char* wndclass = "TEXT_CONSOLE_LOG_WND";
+
+    // Register the windows class
+    WNDCLASS wndClass = {0, TextConsole_LogWndProc, 0, 0, hInstance,
+                         NULL,
+                         LoadCursor(NULL, IDC_ARROW),
+                         GetStockBrush(BLACK_BRUSH),
+                         NULL, wndclass
+                        };
+    RegisterClass(&wndClass);
+
+    // Set the window's initial style
+    u32 dwWindowStyle = WS_OVERLAPPED | WS_CHILD | WS_VISIBLE;// | WS_CLIPSIBLINGS;
+    // u32 dwWindowStyleEx = WS_EX_CLIENTEDGE;
+
+    // Set the window's initial width
+    RECT rc;
+    SetRect(&rc, lX, lY, lWidth, lHeight);
+    // AdjustWindowRect( &rc, dwWindowStyle, FALSE );
+
+    // Create the render window
+    m_hLogWnd = CreateWindow(wndclass, "XRAY Text Console Log", dwWindowStyle,
+                             lX, lY,
+                             lWidth, lHeight, m_hConsoleWnd,
+                             0, hInstance, 0L);
+    //---------------------------------------------------------------------------
+    R_ASSERT2(m_hLogWnd, "Unable to Create TextConsole Window!");
+    //---------------------------------------------------------------------------
+    ShowWindow(m_hLogWnd, SW_SHOW);
+    UpdateWindow(m_hLogWnd);
+    //-----------------------------------------------
+    LOGFONT lf;
+    lf.lfHeight = -12;
+    lf.lfWidth = 0;
+    lf.lfEscapement = 0;
+    lf.lfOrientation = 0;
+    lf.lfWeight = FW_NORMAL;
+    lf.lfItalic = 0;
+    lf.lfUnderline = 0;
+    lf.lfStrikeOut = 0;
+    lf.lfCharSet = DEFAULT_CHARSET;
+    lf.lfOutPrecision = OUT_STRING_PRECIS;
+    lf.lfClipPrecision = CLIP_STROKE_PRECIS;
+    lf.lfQuality = DRAFT_QUALITY;
+    lf.lfPitchAndFamily = VARIABLE_PITCH | FF_SWISS;
+    xr_sprintf(lf.lfFaceName, sizeof(lf.lfFaceName), "");
+
+    m_hLogWndFont = CreateFontIndirect(&lf);
+    R_ASSERT2(m_hLogWndFont, "Unable to Create Font for Log Window");
+    //------------------------------------------------
+    m_hDC_LogWnd = GetDC(m_hLogWnd);
+    R_ASSERT2(m_hDC_LogWnd, "Unable to Get DC for Log Window!");
+    //------------------------------------------------
+    m_hDC_LogWnd_BackBuffer = CreateCompatibleDC(m_hDC_LogWnd);
+    R_ASSERT2(m_hDC_LogWnd_BackBuffer, "Unable to Create Compatible DC for Log Window!");
+    //------------------------------------------------
+    GetClientRect(m_hLogWnd, &cRc);
+    lWidth = cRc.right - cRc.left;
+    lHeight = cRc.bottom - cRc.top;
+    //----------------------------------
+    m_hBB_BM = CreateCompatibleBitmap(m_hDC_LogWnd, lWidth, lHeight);
+    R_ASSERT2(m_hBB_BM, "Unable to Create Compatible Bitmap for Log Window!");
+    //------------------------------------------------
+    m_hOld_BM = (HBITMAP)SelectObject(m_hDC_LogWnd_BackBuffer, m_hBB_BM);
+    //------------------------------------------------
+    m_hPrevFont = (HFONT)SelectObject(m_hDC_LogWnd_BackBuffer, m_hLogWndFont);
+    //------------------------------------------------
+    SetTextColor(m_hDC_LogWnd_BackBuffer, RGB(255, 255, 255));
+    SetBkColor(m_hDC_LogWnd_BackBuffer, RGB(1, 1, 1));
+    //------------------------------------------------
+    m_hBackGroundBrush = GetStockBrush(BLACK_BRUSH);
 }
 
 void CTextConsole::Initialize()
 {
-	inherited::Initialize();
-	
-	m_pMainWnd         = &Device.m_hWnd;
-	m_dwLastUpdateTime = Device.dwTimeGlobal;
-	m_last_time        = Device.dwTimeGlobal;
+    inherited::Initialize();
 
-	CreateConsoleWnd();
-	CreateLogWnd();
+    m_pMainWnd = &Device.m_hWnd;
+    m_dwLastUpdateTime = Device.dwTimeGlobal;
+    m_last_time = Device.dwTimeGlobal;
 
-	ShowWindow( m_hConsoleWnd, SW_SHOW );
-	UpdateWindow( m_hConsoleWnd );	
+    CreateConsoleWnd();
+    CreateLogWnd();
 
-	m_server_info.ResetData();
+    ShowWindow(m_hConsoleWnd, SW_SHOW);
+    UpdateWindow(m_hConsoleWnd);
+
+    m_server_info.ResetData();
 }
 
 void CTextConsole::Destroy()
 {
-	inherited::Destroy();	
+    inherited::Destroy();
 
-	SelectObject( m_hDC_LogWnd_BackBuffer, m_hPrevFont );
-	SelectObject( m_hDC_LogWnd_BackBuffer, m_hOld_BM );
+    SelectObject(m_hDC_LogWnd_BackBuffer, m_hPrevFont);
+    SelectObject(m_hDC_LogWnd_BackBuffer, m_hOld_BM);
 
-	if ( m_hBB_BM )           DeleteObject( m_hBB_BM );
-	if ( m_hOld_BM )          DeleteObject( m_hOld_BM );
-	if ( m_hLogWndFont )      DeleteObject( m_hLogWndFont );
-	if ( m_hPrevFont )        DeleteObject( m_hPrevFont );
-	if ( m_hBackGroundBrush ) DeleteObject( m_hBackGroundBrush );
+    if (m_hBB_BM) DeleteObject(m_hBB_BM);
+    if (m_hOld_BM) DeleteObject(m_hOld_BM);
+    if (m_hLogWndFont) DeleteObject(m_hLogWndFont);
+    if (m_hPrevFont) DeleteObject(m_hPrevFont);
+    if (m_hBackGroundBrush) DeleteObject(m_hBackGroundBrush);
 
-	ReleaseDC( m_hLogWnd, m_hDC_LogWnd_BackBuffer );
-	ReleaseDC( m_hLogWnd, m_hDC_LogWnd );
+    ReleaseDC(m_hLogWnd, m_hDC_LogWnd_BackBuffer);
+    ReleaseDC(m_hLogWnd, m_hDC_LogWnd);
 
-	DestroyWindow( m_hLogWnd );
-	DestroyWindow( m_hConsoleWnd );
+    DestroyWindow(m_hLogWnd);
+    DestroyWindow(m_hConsoleWnd);
 }
 
 void CTextConsole::OnRender() {} //disable ÑConsole::OnRender()
 
 void CTextConsole::OnPaint()
 {
-	RECT wRC;
-	PAINTSTRUCT ps;
-	BeginPaint( m_hLogWnd, &ps );
-
-	if ( /*m_bNeedUpdate*/ Device.dwFrame % 2 )
-	{
-//		m_dwLastUpdateTime = Device.dwTimeGlobal;
-//		m_bNeedUpdate = false;
-		
-		GetClientRect( m_hLogWnd, &wRC );
-		DrawLog( m_hDC_LogWnd_BackBuffer, &wRC );
-	}
-	else
-	{
-		wRC = ps.rcPaint;
-	}
-	
-	
-	BitBlt(	m_hDC_LogWnd,
-			wRC.left, wRC.top,
-			wRC.right - wRC.left, wRC.bottom - wRC.top,
-			m_hDC_LogWnd_BackBuffer,
-			wRC.left, wRC.top,
-			SRCCOPY); //(FullUpdate) ? SRCCOPY : NOTSRCCOPY);
-/*
-	Msg ("URect - %d:%d - %d:%d", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom);
-*/
-	EndPaint( m_hLogWnd, &ps );
+    RECT wRC;
+    PAINTSTRUCT ps;
+    BeginPaint(m_hLogWnd, &ps);
+
+    if ( /*m_bNeedUpdate*/ Device.dwFrame % 2)
+    {
+        // m_dwLastUpdateTime = Device.dwTimeGlobal;
+        // m_bNeedUpdate = false;
+
+        GetClientRect(m_hLogWnd, &wRC);
+        DrawLog(m_hDC_LogWnd_BackBuffer, &wRC);
+    }
+    else
+    {
+        wRC = ps.rcPaint;
+    }
+
+
+    BitBlt(m_hDC_LogWnd,
+           wRC.left, wRC.top,
+           wRC.right - wRC.left, wRC.bottom - wRC.top,
+           m_hDC_LogWnd_BackBuffer,
+           wRC.left, wRC.top,
+           SRCCOPY); //(FullUpdate) ? SRCCOPY : NOTSRCCOPY);
+    /*
+     Msg ("URect - %d:%d - %d:%d", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom);
+     */
+    EndPaint(m_hLogWnd, &ps);
 }
 
-void CTextConsole::DrawLog( HDC hDC, RECT* pRect )
+void CTextConsole::DrawLog(HDC hDC, RECT* pRect)
 {
-	TEXTMETRIC tm;
-	GetTextMetrics(hDC, &tm);
-
-	RECT wRC = *pRect;
-	GetClientRect(m_hLogWnd, &wRC);
-	FillRect(hDC, &wRC, m_hBackGroundBrush);
-
-	int Width = wRC.right - wRC.left;
-	int Height = wRC.bottom - wRC.top;
-	wRC = *pRect;
-	int y_top_max = (int)(0.32f * Height);
-
-	//---------------------------------------------------------------------------------
-	LPCSTR s_edt = ec().str_edit();
-	LPCSTR s_cur = ec().str_before_cursor();
-
-	u32 cur_len = xr_strlen( s_cur ) + xr_strlen( ch_cursor ) + 1;
-	PSTR buf = (PSTR)_alloca( cur_len * sizeof(char) );
-	xr_strcpy( buf, cur_len, s_cur );
-	xr_strcat( buf, cur_len, ch_cursor );
-	buf[cur_len-1] = 0;
-
-	u32 cur0_len = xr_strlen( s_cur );
-
-	int xb = 25;
-	
-	SetTextColor( hDC, RGB(255, 255, 255) );
-	TextOut( hDC, xb, Height-tm.tmHeight-1, buf, cur_len-1 );
-	buf[ cur0_len ] = 0;
-	
-	SetTextColor(hDC, RGB(0, 0, 0));
-	TextOut( hDC, xb, Height-tm.tmHeight-1, buf, cur0_len );
-
-
-	SetTextColor( hDC, RGB(255, 255, 255) );
-	TextOut( hDC, 0, Height-tm.tmHeight-3, ioc_prompt, xr_strlen(ioc_prompt) ); // ">>> "
-
-	SetTextColor( hDC, (COLORREF)bgr2rgb(get_mark_color( mark11 )) );
-	TextOut( hDC, xb, Height-tm.tmHeight-3, s_edt, xr_strlen(s_edt) );
-
-	SetTextColor( hDC, RGB(205, 205, 225) );
-	u32 log_line = LogFile->size()-1;
-	string16 q, q2;
-	itoa( log_line, q, 10 );
-	xr_strcpy( q2, sizeof(q2), "[" );
-	xr_strcat( q2, sizeof(q2), q );
-	xr_strcat( q2, sizeof(q2), "]" );
-	u32 qn = xr_strlen( q2 );
-
-	TextOut( hDC, Width - 8 * qn, Height-tm.tmHeight-tm.tmHeight, q2, qn );
-
-	int ypos = Height - tm.tmHeight - tm.tmHeight;
-	for( int i = LogFile->size()-1-scroll_delta; i >= 0; --i ) 
-	{
-		ypos -= tm.tmHeight;
-		if ( ypos < y_top_max )
-		{
-			break;
-		}
-		LPCSTR ls = ((*LogFile)[i]).c_str();
-
-		if ( !ls )
-		{
-			continue;
-		}
-		Console_mark cm = (Console_mark)ls[0];
-		COLORREF     c2 = (COLORREF)bgr2rgb( get_mark_color( cm ) );
-		SetTextColor( hDC, c2 );
-		u8 b = (is_mark( cm ))? 2 : 0;
-		LPCSTR pOut = ls + b;
-
-		BOOL res = TextOut( hDC, 10, ypos, pOut, xr_strlen(pOut) );
-		if ( !res )
-		{
-			R_ASSERT2( 0, "TextOut(..) return NULL" );
-		}
-	}
-
-	if ( g_pGameLevel && ( Device.dwTimeGlobal - m_last_time > 500 ) )
-	{
-		m_last_time = Device.dwTimeGlobal;
-
-		m_server_info.ResetData();
-		g_pGameLevel->GetLevelInfo( &m_server_info );
-	}
-
-	ypos = 5;
-	for ( u32 i = 0; i < m_server_info.Size(); ++i )
-	{
-		SetTextColor( hDC, m_server_info[i].color );
-		TextOut( hDC, 10, ypos, m_server_info[i].name, xr_strlen(m_server_info[i].name) );
-
-		ypos += tm.tmHeight;
-		if ( ypos > y_top_max )
-		{
-			break;
-		}
-	}
+    TEXTMETRIC tm;
+    GetTextMetrics(hDC, &tm);
+
+    RECT wRC = *pRect;
+    GetClientRect(m_hLogWnd, &wRC);
+    FillRect(hDC, &wRC, m_hBackGroundBrush);
+
+    int Width = wRC.right - wRC.left;
+    int Height = wRC.bottom - wRC.top;
+    wRC = *pRect;
+    int y_top_max = (int)(0.32f * Height);
+
+    //---------------------------------------------------------------------------------
+    LPCSTR s_edt = ec().str_edit();
+    LPCSTR s_cur = ec().str_before_cursor();
+
+    u32 cur_len = xr_strlen(s_cur) + xr_strlen(ch_cursor) + 1;
+    PSTR buf = (PSTR)_alloca(cur_len * sizeof(char));
+    xr_strcpy(buf, cur_len, s_cur);
+    xr_strcat(buf, cur_len, ch_cursor);
+    buf[cur_len - 1] = 0;
+
+    u32 cur0_len = xr_strlen(s_cur);
+
+    int xb = 25;
+
+    SetTextColor(hDC, RGB(255, 255, 255));
+    TextOut(hDC, xb, Height - tm.tmHeight - 1, buf, cur_len - 1);
+    buf[cur0_len] = 0;
+
+    SetTextColor(hDC, RGB(0, 0, 0));
+    TextOut(hDC, xb, Height - tm.tmHeight - 1, buf, cur0_len);
+
+
+    SetTextColor(hDC, RGB(255, 255, 255));
+    TextOut(hDC, 0, Height - tm.tmHeight - 3, ioc_prompt, xr_strlen(ioc_prompt)); // ">>> "
+
+    SetTextColor(hDC, (COLORREF)bgr2rgb(get_mark_color(mark11)));
+    TextOut(hDC, xb, Height - tm.tmHeight - 3, s_edt, xr_strlen(s_edt));
+
+    SetTextColor(hDC, RGB(205, 205, 225));
+    u32 log_line = LogFile->size() - 1;
+    string16 q, q2;
+    itoa(log_line, q, 10);
+    xr_strcpy(q2, sizeof(q2), "[");
+    xr_strcat(q2, sizeof(q2), q);
+    xr_strcat(q2, sizeof(q2), "]");
+    u32 qn = xr_strlen(q2);
+
+    TextOut(hDC, Width - 8 * qn, Height - tm.tmHeight - tm.tmHeight, q2, qn);
+
+    int ypos = Height - tm.tmHeight - tm.tmHeight;
+    for (int i = LogFile->size() - 1 - scroll_delta; i >= 0; --i)
+    {
+        ypos -= tm.tmHeight;
+        if (ypos < y_top_max)
+        {
+            break;
+        }
+        LPCSTR ls = ((*LogFile)[i]).c_str();
+
+        if (!ls)
+        {
+            continue;
+        }
+        Console_mark cm = (Console_mark)ls[0];
+        COLORREF c2 = (COLORREF)bgr2rgb(get_mark_color(cm));
+        SetTextColor(hDC, c2);
+        u8 b = (is_mark(cm)) ? 2 : 0;
+        LPCSTR pOut = ls + b;
+
+        BOOL res = TextOut(hDC, 10, ypos, pOut, xr_strlen(pOut));
+        if (!res)
+        {
+            R_ASSERT2(0, "TextOut(..) return NULL");
+        }
+    }
+
+    if (g_pGameLevel && (Device.dwTimeGlobal - m_last_time > 500))
+    {
+        m_last_time = Device.dwTimeGlobal;
+
+        m_server_info.ResetData();
+        g_pGameLevel->GetLevelInfo(&m_server_info);
+    }
+
+    ypos = 5;
+    for (u32 i = 0; i < m_server_info.Size(); ++i)
+    {
+        SetTextColor(hDC, m_server_info[i].color);
+        TextOut(hDC, 10, ypos, m_server_info[i].name, xr_strlen(m_server_info[i].name));
+
+        ypos += tm.tmHeight;
+        if (ypos > y_top_max)
+        {
+            break;
+        }
+    }
 }
 /*
 void CTextConsole::IR_OnKeyboardPress( int dik ) !!!!!!!!!!!!!!!!!!!!!
 {
-	m_bNeedUpdate = true;
-	inherited::IR_OnKeyboardPress( dik );
+m_bNeedUpdate = true;
+inherited::IR_OnKeyboardPress( dik );
 }
 */
 void CTextConsole::OnFrame()
 {
-	inherited::OnFrame();
-/*	if ( !m_bNeedUpdate && m_dwLastUpdateTime + 1000/g_svTextConsoleUpdateRate > Device.dwTimeGlobal )
-	{
-		return;
-	}
-*/	InvalidateRect( m_hConsoleWnd, NULL, FALSE );
-	SetCursor( LoadCursor( NULL, IDC_ARROW ) );	
-//	m_bNeedUpdate = true;
+    inherited::OnFrame();
+    /* if ( !m_bNeedUpdate && m_dwLastUpdateTime + 1000/g_svTextConsoleUpdateRate > Device.dwTimeGlobal )
+     {
+     return;
+     }
+     */ InvalidateRect(m_hConsoleWnd, NULL, FALSE);
+    SetCursor(LoadCursor(NULL, IDC_ARROW));
+    // m_bNeedUpdate = true;
 }
diff --git a/src/xrEngine/Text_Console.h b/src/xrEngine/Text_Console.h
index b9d77646550..bb2316c8a23 100644
--- a/src/xrEngine/Text_Console.h
+++ b/src/xrEngine/Text_Console.h
@@ -5,50 +5,50 @@
 class ENGINE_API CTextConsole : public CConsole
 {
 private:
-	typedef CConsole inherited;
+    typedef CConsole inherited;
 
 private:
-	HWND*	m_pMainWnd;
+    HWND* m_pMainWnd;
 
-	HWND	m_hConsoleWnd;
-	void	CreateConsoleWnd	();
-	
-	HWND	m_hLogWnd;	
-	void	CreateLogWnd		();
+    HWND m_hConsoleWnd;
+    void CreateConsoleWnd();
 
-	bool	m_bScrollLog;
-	u32		m_dwStartLine;
-	void	DrawLog(HDC hDC, RECT* pRect);
+    HWND m_hLogWnd;
+    void CreateLogWnd();
+
+    bool m_bScrollLog;
+    u32 m_dwStartLine;
+    void DrawLog(HDC hDC, RECT* pRect);
 
 private:
-	HFONT	m_hLogWndFont;
-	HFONT	m_hPrevFont;
-	HBRUSH	m_hBackGroundBrush;
+    HFONT m_hLogWndFont;
+    HFONT m_hPrevFont;
+    HBRUSH m_hBackGroundBrush;
 
-	HDC		m_hDC_LogWnd;
-	HDC		m_hDC_LogWnd_BackBuffer;
-	HBITMAP m_hBB_BM, m_hOld_BM;
+    HDC m_hDC_LogWnd;
+    HDC m_hDC_LogWnd_BackBuffer;
+    HBITMAP m_hBB_BM, m_hOld_BM;
 
-	bool	m_bNeedUpdate;
-	u32		m_dwLastUpdateTime;
+    bool m_bNeedUpdate;
+    u32 m_dwLastUpdateTime;
 
-	u32		m_last_time;
-	CServerInfo m_server_info;
+    u32 m_last_time;
+    CServerInfo m_server_info;
 
 public:
-					CTextConsole();
-	virtual			~CTextConsole();
+    CTextConsole();
+    virtual ~CTextConsole();
 
-	virtual	void	Initialize	();
-	virtual	void	Destroy		();
+    virtual void Initialize();
+    virtual void Destroy();
 
-	virtual void			OnRender	();
-	virtual void	_BCL	OnFrame		();
+    virtual void OnRender();
+    virtual void _BCL OnFrame();
 
-//	virtual void	IR_OnKeyboardPress		(int dik);
+    // virtual void IR_OnKeyboardPress (int dik);
 
-			void	AddString	(LPCSTR string);
-			void	OnPaint		();
+    void AddString(LPCSTR string);
+    void OnPaint();
 
 };// class TextConsole
 
diff --git a/src/xrEngine/Text_Console_WndProc.cpp b/src/xrEngine/Text_Console_WndProc.cpp
index 635e019ae20..423c1d209dd 100644
--- a/src/xrEngine/Text_Console_WndProc.cpp
+++ b/src/xrEngine/Text_Console_WndProc.cpp
@@ -1,51 +1,54 @@
 #include "stdafx.h"
 #include "Text_Console.h"
 
-LRESULT CALLBACK TextConsole_WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+LRESULT CALLBACK TextConsole_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	switch(uMsg)
-	{
-	case WM_PAINT:
-		{			
-//			return 0;
-		}break;
-	case  WM_ERASEBKGND:
-		{
-			int x=0;
-			x=x;
-//			CTextConsole* pTextConsole = (CTextConsole*)Console;
-//			pTextConsole->OnPaint();
-//			return 1;
-		}break;
-	case WM_NCPAINT :
-		{
-//			CTextConsole* pTextConsole = (CTextConsole*)Console;
-//			pTextConsole->OnPaint();
-			int x=0;
-			x=x;
-//			return 0;
-		}break;
-	default:
-		break;
-	}
-	return DefWindowProc(hWnd,uMsg,wParam,lParam);
+    switch (uMsg)
+    {
+    case WM_PAINT:
+    {
+        // return 0;
+    } break;
+    case WM_ERASEBKGND:
+    {
+        int x = 0;
+        x = x;
+        // CTextConsole* pTextConsole = (CTextConsole*)Console;
+        // pTextConsole->OnPaint();
+        // return 1;
+    }
+    break;
+    case WM_NCPAINT:
+    {
+        // CTextConsole* pTextConsole = (CTextConsole*)Console;
+        // pTextConsole->OnPaint();
+        int x = 0;
+        x = x;
+        // return 0;
+    }
+    break;
+    default:
+        break;
+    }
+    return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }
 
-LRESULT CALLBACK TextConsole_LogWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+LRESULT CALLBACK TextConsole_LogWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	switch(uMsg)
-	{
-	case WM_ERASEBKGND:
-		return (LRESULT)1; // Say we handled it.
+    switch (uMsg)
+    {
+    case WM_ERASEBKGND:
+        return (LRESULT)1; // Say we handled it.
 
-	case WM_PAINT:
-		{
-			CTextConsole* pTextConsole = (CTextConsole*)Console;
-			pTextConsole->OnPaint();
-			return (LRESULT)0; // Say we handled it.
-		}break;
-	default:
-		break;
-	}
-	return DefWindowProc(hWnd,uMsg,wParam,lParam);
+    case WM_PAINT:
+    {
+        CTextConsole* pTextConsole = (CTextConsole*)Console;
+        pTextConsole->OnPaint();
+        return (LRESULT)0; // Say we handled it.
+    }
+    break;
+    default:
+        break;
+    }
+    return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }
\ No newline at end of file
diff --git a/src/xrEngine/WaveForm.h b/src/xrEngine/WaveForm.h
index 1ec8e105ef8..a2a84a15bc4 100644
--- a/src/xrEngine/WaveForm.h
+++ b/src/xrEngine/WaveForm.h
@@ -5,59 +5,66 @@
 #pragma pack(push,4)
 struct WaveForm
 {
-	enum EFunction
-	{
-		fCONSTANT		= 0,
-		fSIN,
-		fTRIANGLE,
-		fSQUARE,
-		fSAWTOOTH,
-		fINVSAWTOOTH,
-		fFORCE32		= u32(-1)
-	};
-	IC float signf		(float t) { return t/_abs(t); }
-	IC float Func		(float t)
-	{
-		switch (F)
-		{
-			case fCONSTANT:		return 0;
-			case fSIN:			return _sin(t*PI_MUL_2);
-			case fTRIANGLE:		return asinf(_sin((t-0.25f)*PI_MUL_2))/PI_DIV_2;
-			case fSQUARE:		return signf(_cos(t*PI));
-			case fSAWTOOTH:		return atanf(tanf((t+0.5f)*PI))/PI_DIV_2;
-			case fINVSAWTOOTH:	return -(atanf(tanf((t+0.5f)*PI))/PI_DIV_2);
-		}
-		return 0.f;
-	}
+    enum EFunction
+    {
+        fCONSTANT = 0,
+        fSIN,
+        fTRIANGLE,
+        fSQUARE,
+        fSAWTOOTH,
+        fINVSAWTOOTH,
+        fFORCE32 = u32(-1)
+    };
+    IC float signf(float t) { return t / _abs(t); }
+    IC float Func(float t)
+    {
+        switch (F)
+        {
+        case fCONSTANT:
+            return 0;
+        case fSIN:
+            return _sin(t*PI_MUL_2);
+        case fTRIANGLE:
+            return asinf(_sin((t - 0.25f)*PI_MUL_2)) / PI_DIV_2;
+        case fSQUARE:
+            return signf(_cos(t*PI));
+        case fSAWTOOTH:
+            return atanf(tanf((t + 0.5f)*PI)) / PI_DIV_2;
+        case fINVSAWTOOTH:
+            return -(atanf(tanf((t + 0.5f)*PI)) / PI_DIV_2);
+        }
+        return 0.f;
+    }
 public:
-	EFunction	F;
-	float		arg[4];
+    EFunction F;
+    float arg[4];
 
-	IC float Calculate	(float t)
-	{
-		// y = arg0 + arg1*func( (time+arg2)*arg3 )
-		float x = (t+arg[2])*arg[3];
-		return arg[0] + arg[1]*Func(x-floorf(x));
-	}
+    IC float Calculate(float t)
+    {
+        // y = arg0 + arg1*func( (time+arg2)*arg3 )
+        float x = (t + arg[2])*arg[3];
+        return arg[0] + arg[1] * Func(x - floorf(x));
+    }
 
-	WaveForm()	{
-		F		= fCONSTANT;
-		arg[0]	= 0;
-		arg[1]	= 1;
-		arg[2]	= 0;
-		arg[3]	= 1;
-	}
+    WaveForm()
+    {
+        F = fCONSTANT;
+        arg[0] = 0;
+        arg[1] = 1;
+        arg[2] = 0;
+        arg[3] = 1;
+    }
 
-	IC	BOOL	Similar	(const WaveForm& W) const
-	{
-		if (!fsimilar(arg[0],W.arg[0],EPS_L))	return FALSE;
-		if (!fsimilar(arg[1],W.arg[1],EPS_L))	return FALSE;
-		if (fis_zero(arg[1],EPS_L))				return TRUE;
-		if (F	!=	W.F)						return FALSE;
-		if (!fsimilar(arg[2],W.arg[2],EPS_L))	return FALSE;
-		if (!fsimilar(arg[3],W.arg[3],EPS_L))	return FALSE;
-		return TRUE;
-	}
+    IC BOOL Similar(const WaveForm& W) const
+    {
+        if (!fsimilar(arg[0], W.arg[0], EPS_L)) return FALSE;
+        if (!fsimilar(arg[1], W.arg[1], EPS_L)) return FALSE;
+        if (fis_zero(arg[1], EPS_L)) return TRUE;
+        if (F != W.F) return FALSE;
+        if (!fsimilar(arg[2], W.arg[2], EPS_L)) return FALSE;
+        if (!fsimilar(arg[3], W.arg[3], EPS_L)) return FALSE;
+        return TRUE;
+    }
 };
 
 #pragma pack(pop)
diff --git a/src/xrEngine/XR_IOConsole.cpp b/src/xrEngine/XR_IOConsole.cpp
index 27e7abd9b58..1ec0389b64e 100644
--- a/src/xrEngine/XR_IOConsole.cpp
+++ b/src/xrEngine/XR_IOConsole.cpp
@@ -17,931 +17,978 @@
 
 #include "securom_api.h"
 
-static float const UI_BASE_WIDTH	= 1024.0f;
-static float const UI_BASE_HEIGHT	= 768.0f;
-static float const LDIST            = 0.05f;
-static u32   const cmd_history_max  = 64;
+static float const UI_BASE_WIDTH = 1024.0f;
+static float const UI_BASE_HEIGHT = 768.0f;
+static float const LDIST = 0.05f;
+static u32 const cmd_history_max = 64;
 
-static u32 const prompt_font_color  = color_rgba( 228, 228, 255, 255 );
-static u32 const tips_font_color    = color_rgba( 230, 250, 230, 255 );
-static u32 const cmd_font_color     = color_rgba( 138, 138, 245, 255 );
-static u32 const cursor_font_color  = color_rgba( 255, 255, 255, 255 );
-static u32 const total_font_color   = color_rgba( 250, 250,  15, 180 );
-static u32 const default_font_color = color_rgba( 250, 250, 250, 250 );
+static u32 const prompt_font_color = color_rgba(228, 228, 255, 255);
+static u32 const tips_font_color = color_rgba(230, 250, 230, 255);
+static u32 const cmd_font_color = color_rgba(138, 138, 245, 255);
+static u32 const cursor_font_color = color_rgba(255, 255, 255, 255);
+static u32 const total_font_color = color_rgba(250, 250, 15, 180);
+static u32 const default_font_color = color_rgba(250, 250, 250, 250);
 
-static u32 const back_color         = color_rgba(  20,  20,  20, 200 );
-static u32 const tips_back_color    = color_rgba(  20,  20,  20, 200 );
-static u32 const tips_select_color  = color_rgba(  90,  90, 140, 230 );
-static u32 const tips_word_color    = color_rgba(   5, 100,  56, 200 );
-static u32 const tips_scroll_back_color  = color_rgba( 15, 15, 15, 230 );
-static u32 const tips_scroll_pos_color   = color_rgba( 70, 70, 70, 240 );
+static u32 const back_color = color_rgba(20, 20, 20, 200);
+static u32 const tips_back_color = color_rgba(20, 20, 20, 200);
+static u32 const tips_select_color = color_rgba(90, 90, 140, 230);
+static u32 const tips_word_color = color_rgba(5, 100, 56, 200);
+static u32 const tips_scroll_back_color = color_rgba(15, 15, 15, 230);
+static u32 const tips_scroll_pos_color = color_rgba(70, 70, 70, 240);
 
 
-ENGINE_API CConsole*		Console		=	NULL;
+ENGINE_API CConsole* Console = NULL;
 
-extern char const * const	ioc_prompt;
-       char const * const	ioc_prompt	=	">>> ";
+extern char const* const ioc_prompt;
+char const* const ioc_prompt = ">>> ";
 
-extern char const * const	ch_cursor;
-       char const * const	ch_cursor	=	"_";
+extern char const* const ch_cursor;
+char const* const ch_cursor = "_";
 
 text_editor::line_edit_control& CConsole::ec()
 {
-	return m_editor->control();
+    return m_editor->control();
 }
 
-u32 CConsole::get_mark_color( Console_mark type )
+u32 CConsole::get_mark_color(Console_mark type)
 {
-	u32 color = default_font_color;
-	switch ( type )
-	{
-	case mark0:  color = color_rgba( 255, 255,   0, 255 ); break;
-	case mark1:  color = color_rgba( 255,   0,   0, 255 ); break;
-	case mark2:  color = color_rgba( 100, 100, 255, 255 ); break;
-	case mark3:  color = color_rgba(   0, 222, 205, 155 ); break;
-	case mark4:  color = color_rgba( 255,   0, 255, 255 ); break;
-	case mark5:  color = color_rgba( 155,  55, 170, 155 ); break;
-	case mark6:  color = color_rgba(  25, 200,  50, 255 ); break;
-	case mark7:  color = color_rgba( 255, 255,   0, 255 ); break;
-	case mark8:  color = color_rgba( 128, 128, 128, 255 ); break;
-	case mark9:  color = color_rgba(   0, 255,   0, 255 ); break;
-	case mark10: color = color_rgba(  55, 155, 140, 255 ); break;
-	case mark11: color = color_rgba( 205, 205, 105, 255 ); break;
-	case mark12: color = color_rgba( 128, 128, 250, 255 ); break;
-	case no_mark:
-	default: break;
-	}
-	return color;
+    u32 color = default_font_color;
+    switch (type)
+    {
+    case mark0:
+        color = color_rgba(255, 255, 0, 255);
+        break;
+    case mark1:
+        color = color_rgba(255, 0, 0, 255);
+        break;
+    case mark2:
+        color = color_rgba(100, 100, 255, 255);
+        break;
+    case mark3:
+        color = color_rgba(0, 222, 205, 155);
+        break;
+    case mark4:
+        color = color_rgba(255, 0, 255, 255);
+        break;
+    case mark5:
+        color = color_rgba(155, 55, 170, 155);
+        break;
+    case mark6:
+        color = color_rgba(25, 200, 50, 255);
+        break;
+    case mark7:
+        color = color_rgba(255, 255, 0, 255);
+        break;
+    case mark8:
+        color = color_rgba(128, 128, 128, 255);
+        break;
+    case mark9:
+        color = color_rgba(0, 255, 0, 255);
+        break;
+    case mark10:
+        color = color_rgba(55, 155, 140, 255);
+        break;
+    case mark11:
+        color = color_rgba(205, 205, 105, 255);
+        break;
+    case mark12:
+        color = color_rgba(128, 128, 250, 255);
+        break;
+    case no_mark:
+    default:
+        break;
+    }
+    return color;
 }
 
-bool CConsole::is_mark( Console_mark type )
+bool CConsole::is_mark(Console_mark type)
 {
-	switch ( type )
-	{
-	case mark0:  case mark1:  case mark2:  case mark3:
-	case mark4:  case mark5:  case mark6:  case mark7:
-	case mark8:  case mark9:  case mark10: case mark11:	case mark12:
-		return true;
-		break;
-	}
-	return false;
+    switch (type)
+    {
+    case mark0:
+    case mark1:
+    case mark2:
+    case mark3:
+    case mark4:
+    case mark5:
+    case mark6:
+    case mark7:
+    case mark8:
+    case mark9:
+    case mark10:
+    case mark11:
+    case mark12:
+        return true;
+        break;
+    }
+    return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 CConsole::CConsole()
-:m_hShader_back(NULL)
+    :m_hShader_back(NULL)
 {
-	m_editor          = xr_new<text_editor::line_editor>( (u32)CONSOLE_BUF_SIZE );
-	m_cmd_history_max = cmd_history_max;
-	m_disable_tips    = false;
-	Register_callbacks();
-	Device.seqResolutionChanged.Add(this);
+    m_editor = xr_new<text_editor::line_editor>((u32)CONSOLE_BUF_SIZE);
+    m_cmd_history_max = cmd_history_max;
+    m_disable_tips = false;
+    Register_callbacks();
+    Device.seqResolutionChanged.Add(this);
 }
 
 void CConsole::Initialize()
 {
-	scroll_delta	= 0;
-	bVisible		= false;
-	pFont			= NULL;
-	pFont2			= NULL;
-
-	m_mouse_pos.x	= 0;
-	m_mouse_pos.y	= 0;
-	m_last_cmd		= NULL;
-	
-	m_cmd_history.reserve( m_cmd_history_max + 2 );
-	m_cmd_history.clear_not_free();
-	reset_cmd_history_idx();
-
-	m_tips.reserve( MAX_TIPS_COUNT + 1 );
-	m_tips.clear_not_free();
-	m_temp_tips.reserve( MAX_TIPS_COUNT + 1 );
-	m_temp_tips.clear_not_free();
-
-	m_tips_mode		= 0;
-	m_prev_length_str = 0;
-	m_cur_cmd		= NULL;
-	reset_selected_tip();
-
-	// Commands
-	extern void CCC_Register();
-	CCC_Register();
+    scroll_delta = 0;
+    bVisible = false;
+    pFont = NULL;
+    pFont2 = NULL;
+
+    m_mouse_pos.x = 0;
+    m_mouse_pos.y = 0;
+    m_last_cmd = NULL;
+
+    m_cmd_history.reserve(m_cmd_history_max + 2);
+    m_cmd_history.clear_not_free();
+    reset_cmd_history_idx();
+
+    m_tips.reserve(MAX_TIPS_COUNT + 1);
+    m_tips.clear_not_free();
+    m_temp_tips.reserve(MAX_TIPS_COUNT + 1);
+    m_temp_tips.clear_not_free();
+
+    m_tips_mode = 0;
+    m_prev_length_str = 0;
+    m_cur_cmd = NULL;
+    reset_selected_tip();
+
+    // Commands
+    extern void CCC_Register();
+    CCC_Register();
 }
 
 CConsole::~CConsole()
 {
-	xr_delete( m_hShader_back );
-	xr_delete( m_editor );
-	Destroy();
-	Device.seqResolutionChanged.Remove(this);
+    xr_delete(m_hShader_back);
+    xr_delete(m_editor);
+    Destroy();
+    Device.seqResolutionChanged.Remove(this);
 }
 
 void CConsole::Destroy()
 {
-	xr_delete( pFont );
-	xr_delete( pFont2 );
-	Commands.clear();
+    xr_delete(pFont);
+    xr_delete(pFont2);
+    Commands.clear();
 }
 
-void CConsole::AddCommand( IConsole_Command* cc )
+void CConsole::AddCommand(IConsole_Command* cc)
 {
-	Commands[cc->Name()] = cc;
+    Commands[cc->Name()] = cc;
 }
 
-void CConsole::RemoveCommand( IConsole_Command* cc )
+void CConsole::RemoveCommand(IConsole_Command* cc)
 {
-	vecCMD_IT it = Commands.find( cc->Name() );
-	if ( Commands.end() != it )
-	{
-		Commands.erase(it);
-	}
+    vecCMD_IT it = Commands.find(cc->Name());
+    if (Commands.end() != it)
+    {
+        Commands.erase(it);
+    }
 }
 
 void CConsole::OnFrame()
 {
-	m_editor->on_frame();
-	
-	if ( Device.dwFrame % 10 == 0 )
-	{
-		update_tips();
-	}
+    m_editor->on_frame();
+
+    if (Device.dwFrame % 10 == 0)
+    {
+        update_tips();
+    }
 }
 
-void CConsole::OutFont( LPCSTR text, float& pos_y )
+void CConsole::OutFont(LPCSTR text, float& pos_y)
 {
-	float str_length = pFont->SizeOf_( text );
-	float scr_width  = 1.98f * Device.fWidth_2;
-	if( str_length > scr_width ) //1024.0f
-	{
-		float f	= 0.0f;
-		int sz	= 0;
-		int ln	= 0;
-		PSTR one_line = (PSTR)_alloca( (CONSOLE_BUF_SIZE + 1) * sizeof(char) );
-		
-		while( text[sz] && (ln + sz < CONSOLE_BUF_SIZE-5) )// ïåðåíîñ ñòðîê
-		{
-			one_line[ln+sz]   = text[sz];
-			one_line[ln+sz+1] = 0;
-			
-			float t	= pFont->SizeOf_( one_line + ln );
-			if ( t > scr_width )
-			{
-				OutFont		( text + sz + 1, pos_y );
-				pos_y		-= LDIST;
-				pFont->OutI	( -1.0f, pos_y, "%s", one_line + ln );
-				ln			= sz + 1;
-				f			= 0.0f;
-			}
-			else
-			{
-				f = t;
-			}
-
-			++sz;
-		}
-	}
-	else
-	{
-		pFont->OutI( -1.0f, pos_y, "%s", text );
-	}
+    float str_length = pFont->SizeOf_(text);
+    float scr_width = 1.98f * Device.fWidth_2;
+    if (str_length > scr_width) //1024.0f
+    {
+        float f = 0.0f;
+        int sz = 0;
+        int ln = 0;
+        PSTR one_line = (PSTR)_alloca((CONSOLE_BUF_SIZE + 1) * sizeof(char));
+
+        while (text[sz] && (ln + sz < CONSOLE_BUF_SIZE - 5))// ïåðåíîñ ñòðîê
+        {
+            one_line[ln + sz] = text[sz];
+            one_line[ln + sz + 1] = 0;
+
+            float t = pFont->SizeOf_(one_line + ln);
+            if (t > scr_width)
+            {
+                OutFont(text + sz + 1, pos_y);
+                pos_y -= LDIST;
+                pFont->OutI(-1.0f, pos_y, "%s", one_line + ln);
+                ln = sz + 1;
+                f = 0.0f;
+            }
+            else
+            {
+                f = t;
+            }
+
+            ++sz;
+        }
+    }
+    else
+    {
+        pFont->OutI(-1.0f, pos_y, "%s", text);
+    }
 }
 
 void CConsole::OnScreenResolutionChanged()
 {
-	xr_delete( pFont );
-	xr_delete( pFont2 );
+    xr_delete(pFont);
+    xr_delete(pFont2);
 }
 
 void CConsole::OnRender()
 {
-	if ( !bVisible )
-	{
-		return;
-	}
-
-	if ( !m_hShader_back )
-	{
-		m_hShader_back = xr_new< FactoryPtr<IUIShader> >();
-		(*m_hShader_back)->create( "hud\\default", "ui\\ui_console" ); // "ui\\ui_empty"
-	}
-	
-	if ( !pFont )
-	{
-		pFont = xr_new<CGameFont>( "hud_font_di", CGameFont::fsDeviceIndependent );
-		pFont->SetHeightI(  0.025f );
-	}
-	if( !pFont2 )
-	{
-		pFont2 = xr_new<CGameFont>( "hud_font_di2", CGameFont::fsDeviceIndependent );
-		pFont2->SetHeightI( 0.025f );
-	}
-
-	bool bGame = false;	
-	if ( ( g_pGameLevel && g_pGameLevel->bReady ) ||
-		 ( g_pGamePersistent && g_pGamePersistent->m_pMainMenu && g_pGamePersistent->m_pMainMenu->IsActive() ) )
-	{
-		 bGame = true;
-	}
-	if ( g_dedicated_server )
-	{
-		bGame = false;
-	}
-	
-	DrawBackgrounds( bGame );
-
-	float fMaxY;
-	float dwMaxY = (float)Device.dwHeight;
-	// float dwMaxX=float(Device.dwWidth/2);
-	if ( bGame )
-	{
-		fMaxY  = 0.0f;
-		dwMaxY /= 2;
-	}
-	else
-	{
-		fMaxY = 1.0f;
-	}
-
-	float ypos  = fMaxY - LDIST * 1.1f;
-	float scr_x = 1.0f / Device.fWidth_2;
-
-	//---------------------------------------------------------------------------------
-	float scr_width  = 1.9f * Device.fWidth_2;
-	float ioc_d      = pFont->SizeOf_(ioc_prompt);
-	float d1         = pFont->SizeOf_( "_" );
-
-	LPCSTR s_cursor = ec().str_before_cursor();
-	LPCSTR s_b_mark = ec().str_before_mark();
-	LPCSTR s_mark   = ec().str_mark();
-	LPCSTR s_mark_a = ec().str_after_mark();
-
-	//	strncpy_s( buf1, cur_pos, editor, MAX_LEN );
-	float str_length = ioc_d + pFont->SizeOf_( s_cursor );
-	float out_pos    = 0.0f;
-	if( str_length > scr_width )
-	{
-		out_pos -= (str_length - scr_width);
-		str_length = scr_width;
-	}
-
-	pFont->SetColor( prompt_font_color );
-	pFont->OutI( -1.0f + out_pos * scr_x, ypos, "%s", ioc_prompt );
-	out_pos += ioc_d;
-
-	if ( !m_disable_tips && m_tips.size() )
-	{
-		pFont->SetColor( tips_font_color );
-
-		float shift_x = 0.0f;
-		switch ( m_tips_mode )
-		{
-		case 0: shift_x = scr_x * 1.0f;			break;
-		case 1: shift_x = scr_x * out_pos;		break;
-		case 2: shift_x = scr_x * ( ioc_d + pFont->SizeOf_(m_cur_cmd.c_str()) + d1 );	break;
-		case 3: shift_x = scr_x * str_length;	break;
-		}
-
-		vecTipsEx::iterator itb = m_tips.begin() + m_start_tip;
-		vecTipsEx::iterator ite = m_tips.end();
-		for ( u32 i = 0; itb != ite ; ++itb, ++i ) // tips
-		{
-			pFont->OutI( -1.0f + shift_x, fMaxY + i*LDIST, "%s", (*itb).text.c_str() );
-			if ( i >= VIEW_TIPS_COUNT-1 )
-			{
-				break; //for
-			}
-		}	
-	}
-
-	// ===== ==============================================
-	pFont->SetColor ( cmd_font_color );
-	pFont2->SetColor( cmd_font_color );
-
-	pFont->OutI(  -1.0f + out_pos * scr_x, ypos, "%s", s_b_mark );		out_pos += pFont->SizeOf_(s_b_mark);
-	pFont2->OutI( -1.0f + out_pos * scr_x, ypos, "%s", s_mark );		out_pos += pFont2->SizeOf_(s_mark);
-	pFont->OutI(  -1.0f + out_pos * scr_x, ypos, "%s", s_mark_a );
-
-	//pFont2->OutI( -1.0f + ioc_d * scr_x, ypos, "%s", editor=all );
-	
-	if( ec().cursor_view() )
-	{
-		pFont->SetColor( cursor_font_color );
-		pFont->OutI( -1.0f + str_length * scr_x, ypos, "%s", ch_cursor );
-	}
-	
-	// ---------------------
-	u32 log_line = LogFile->size()-1;
-	ypos -= LDIST;
-	for( int i = log_line - scroll_delta; i >= 0; --i ) 
-	{
-		ypos -= LDIST;
-		if ( ypos < -1.0f )
-		{
-			break;
-		}
-		LPCSTR ls = ((*LogFile)[i]).c_str();
-		
-		if ( !ls )
-		{
-			continue;
-		}
-		Console_mark cm = (Console_mark)ls[0];
-		pFont->SetColor( get_mark_color( cm ) );
-		//u8 b = (is_mark( cm ))? 2 : 0;
-		//OutFont( ls + b, ypos );
-		OutFont( ls, ypos );
-	}
-	
-	string16 q;
-	itoa( log_line, q, 10 );
-	u32 qn = xr_strlen( q );
-	pFont->SetColor( total_font_color );
-	pFont->OutI( 0.95f - 0.03f * qn, fMaxY - 2.0f * LDIST, "[%d]", log_line );
-		
-	pFont->OnRender();
-	pFont2->OnRender();
+    if (!bVisible)
+    {
+        return;
+    }
+
+    if (!m_hShader_back)
+    {
+        m_hShader_back = xr_new< FactoryPtr<IUIShader> >();
+        (*m_hShader_back)->create("hud\\default", "ui\\ui_console"); // "ui\\ui_empty"
+    }
+
+    if (!pFont)
+    {
+        pFont = xr_new<CGameFont>("hud_font_di", CGameFont::fsDeviceIndependent);
+        pFont->SetHeightI(0.025f);
+    }
+    if (!pFont2)
+    {
+        pFont2 = xr_new<CGameFont>("hud_font_di2", CGameFont::fsDeviceIndependent);
+        pFont2->SetHeightI(0.025f);
+    }
+
+    bool bGame = false;
+    if ((g_pGameLevel && g_pGameLevel->bReady) ||
+            (g_pGamePersistent && g_pGamePersistent->m_pMainMenu && g_pGamePersistent->m_pMainMenu->IsActive()))
+    {
+        bGame = true;
+    }
+    if (g_dedicated_server)
+    {
+        bGame = false;
+    }
+
+    DrawBackgrounds(bGame);
+
+    float fMaxY;
+    float dwMaxY = (float)Device.dwHeight;
+    // float dwMaxX=float(Device.dwWidth/2);
+    if (bGame)
+    {
+        fMaxY = 0.0f;
+        dwMaxY /= 2;
+    }
+    else
+    {
+        fMaxY = 1.0f;
+    }
+
+    float ypos = fMaxY - LDIST * 1.1f;
+    float scr_x = 1.0f / Device.fWidth_2;
+
+    //---------------------------------------------------------------------------------
+    float scr_width = 1.9f * Device.fWidth_2;
+    float ioc_d = pFont->SizeOf_(ioc_prompt);
+    float d1 = pFont->SizeOf_("_");
+
+    LPCSTR s_cursor = ec().str_before_cursor();
+    LPCSTR s_b_mark = ec().str_before_mark();
+    LPCSTR s_mark = ec().str_mark();
+    LPCSTR s_mark_a = ec().str_after_mark();
+
+    // strncpy_s( buf1, cur_pos, editor, MAX_LEN );
+    float str_length = ioc_d + pFont->SizeOf_(s_cursor);
+    float out_pos = 0.0f;
+    if (str_length > scr_width)
+    {
+        out_pos -= (str_length - scr_width);
+        str_length = scr_width;
+    }
+
+    pFont->SetColor(prompt_font_color);
+    pFont->OutI(-1.0f + out_pos * scr_x, ypos, "%s", ioc_prompt);
+    out_pos += ioc_d;
+
+    if (!m_disable_tips && m_tips.size())
+    {
+        pFont->SetColor(tips_font_color);
+
+        float shift_x = 0.0f;
+        switch (m_tips_mode)
+        {
+        case 0:
+            shift_x = scr_x * 1.0f;
+            break;
+        case 1:
+            shift_x = scr_x * out_pos;
+            break;
+        case 2:
+            shift_x = scr_x * (ioc_d + pFont->SizeOf_(m_cur_cmd.c_str()) + d1);
+            break;
+        case 3:
+            shift_x = scr_x * str_length;
+            break;
+        }
+
+        vecTipsEx::iterator itb = m_tips.begin() + m_start_tip;
+        vecTipsEx::iterator ite = m_tips.end();
+        for (u32 i = 0; itb != ite; ++itb, ++i) // tips
+        {
+            pFont->OutI(-1.0f + shift_x, fMaxY + i*LDIST, "%s", (*itb).text.c_str());
+            if (i >= VIEW_TIPS_COUNT - 1)
+            {
+                break; //for
+            }
+        }
+    }
+
+    // ===== ==============================================
+    pFont->SetColor(cmd_font_color);
+    pFont2->SetColor(cmd_font_color);
+
+    pFont->OutI(-1.0f + out_pos * scr_x, ypos, "%s", s_b_mark);
+    out_pos += pFont->SizeOf_(s_b_mark);
+    pFont2->OutI(-1.0f + out_pos * scr_x, ypos, "%s", s_mark);
+    out_pos += pFont2->SizeOf_(s_mark);
+    pFont->OutI(-1.0f + out_pos * scr_x, ypos, "%s", s_mark_a);
+
+    //pFont2->OutI( -1.0f + ioc_d * scr_x, ypos, "%s", editor=all );
+
+    if (ec().cursor_view())
+    {
+        pFont->SetColor(cursor_font_color);
+        pFont->OutI(-1.0f + str_length * scr_x, ypos, "%s", ch_cursor);
+    }
+
+    // ---------------------
+    u32 log_line = LogFile->size() - 1;
+    ypos -= LDIST;
+    for (int i = log_line - scroll_delta; i >= 0; --i)
+    {
+        ypos -= LDIST;
+        if (ypos < -1.0f)
+        {
+            break;
+        }
+        LPCSTR ls = ((*LogFile)[i]).c_str();
+
+        if (!ls)
+        {
+            continue;
+        }
+        Console_mark cm = (Console_mark)ls[0];
+        pFont->SetColor(get_mark_color(cm));
+        //u8 b = (is_mark( cm ))? 2 : 0;
+        //OutFont( ls + b, ypos );
+        OutFont(ls, ypos);
+    }
+
+    string16 q;
+    itoa(log_line, q, 10);
+    u32 qn = xr_strlen(q);
+    pFont->SetColor(total_font_color);
+    pFont->OutI(0.95f - 0.03f * qn, fMaxY - 2.0f * LDIST, "[%d]", log_line);
+
+    pFont->OnRender();
+    pFont2->OnRender();
 }
 
-void CConsole::DrawBackgrounds( bool bGame )
+void CConsole::DrawBackgrounds(bool bGame)
 {
-	float ky = (bGame)? 0.5f : 1.0f;
-
-	Frect r;
-	r.set( 0.0f, 0.0f, float(Device.dwWidth), ky * float(Device.dwHeight) );
-
-	UIRender->SetShader( **m_hShader_back );
-	// 6 = back, 12 = tips, (VIEW_TIPS_COUNT+1)*6 = highlight_words, 12 = scroll
-	UIRender->StartPrimitive( 6 + 12 + (VIEW_TIPS_COUNT+1)*6 + 12, IUIRender::ptTriList, IUIRender::pttTL );
-
-	DrawRect( r, back_color );
-
-	if ( m_tips.size() == 0 || m_disable_tips )
-	{
-		UIRender->FlushPrimitive();
-		return;
-	}
-
-	LPCSTR max_str = "xxxxx";
-	vecTipsEx::iterator itb = m_tips.begin();
-	vecTipsEx::iterator ite = m_tips.end();
-	for ( ; itb != ite; ++itb )
-	{
-		if ( pFont->SizeOf_( (*itb).text.c_str() ) > pFont->SizeOf_( max_str ) )
-		{
-			max_str = (*itb).text.c_str();
-		}
-	}
-
-	float w1        = pFont->SizeOf_( "_" );
-	float ioc_w     = pFont->SizeOf_( ioc_prompt ) - w1;
-	float cur_cmd_w = pFont->SizeOf_( m_cur_cmd.c_str() );
-	cur_cmd_w		+= (cur_cmd_w > 0.01f) ? w1 : 0.0f;
-
-	float list_w    = pFont->SizeOf_( max_str ) + 2.0f * w1;
-
-	float font_h    = pFont->CurrentHeight_();
-	float tips_h    = _min( m_tips.size(), (u32)VIEW_TIPS_COUNT ) * font_h;
-	tips_h			+= ( m_tips.size() > 0 )? 5.0f : 0.0f;
-
-	Frect pr, sr;
-	pr.x1 = ioc_w + cur_cmd_w;
-	pr.x2 = pr.x1 + list_w;
-
-	pr.y1 = UI_BASE_HEIGHT * 0.5f;
-	pr.y1 *= float(Device.dwHeight)/UI_BASE_HEIGHT;
-
-	pr.y2 = pr.y1 + tips_h;
-
-	float select_y = 0.0f;
-	float select_h = 0.0f;
-	
-	if ( m_select_tip >= 0 && m_select_tip < (int)m_tips.size() )
-	{
-		int sel_pos = m_select_tip - m_start_tip;
-
-		select_y = sel_pos * font_h;
-		select_h = font_h; //1 string
-	}
-	
-	sr.x1 = pr.x1;
-	sr.y1 = pr.y1 + select_y;
-
-	sr.x2 = pr.x2;
-	sr.y2 = sr.y1 + select_h;
-
-	DrawRect( pr, tips_back_color );
-	DrawRect( sr, tips_select_color );
-
-	// --------------------------- highlight words --------------------
-
-	if ( m_select_tip < (int)m_tips.size() )
-	{
-		Frect r;
+    float ky = (bGame) ? 0.5f : 1.0f;
+
+    Frect r;
+    r.set(0.0f, 0.0f, float(Device.dwWidth), ky * float(Device.dwHeight));
+
+    UIRender->SetShader(**m_hShader_back);
+    // 6 = back, 12 = tips, (VIEW_TIPS_COUNT+1)*6 = highlight_words, 12 = scroll
+    UIRender->StartPrimitive(6 + 12 + (VIEW_TIPS_COUNT + 1) * 6 + 12, IUIRender::ptTriList, IUIRender::pttTL);
+
+    DrawRect(r, back_color);
+
+    if (m_tips.size() == 0 || m_disable_tips)
+    {
+        UIRender->FlushPrimitive();
+        return;
+    }
+
+    LPCSTR max_str = "xxxxx";
+    vecTipsEx::iterator itb = m_tips.begin();
+    vecTipsEx::iterator ite = m_tips.end();
+    for (; itb != ite; ++itb)
+    {
+        if (pFont->SizeOf_((*itb).text.c_str()) > pFont->SizeOf_(max_str))
+        {
+            max_str = (*itb).text.c_str();
+        }
+    }
+
+    float w1 = pFont->SizeOf_("_");
+    float ioc_w = pFont->SizeOf_(ioc_prompt) - w1;
+    float cur_cmd_w = pFont->SizeOf_(m_cur_cmd.c_str());
+    cur_cmd_w += (cur_cmd_w > 0.01f) ? w1 : 0.0f;
+
+    float list_w = pFont->SizeOf_(max_str) + 2.0f * w1;
+
+    float font_h = pFont->CurrentHeight_();
+    float tips_h = _min(m_tips.size(), (u32)VIEW_TIPS_COUNT) * font_h;
+    tips_h += (m_tips.size() > 0) ? 5.0f : 0.0f;
+
+    Frect pr, sr;
+    pr.x1 = ioc_w + cur_cmd_w;
+    pr.x2 = pr.x1 + list_w;
+
+    pr.y1 = UI_BASE_HEIGHT * 0.5f;
+    pr.y1 *= float(Device.dwHeight) / UI_BASE_HEIGHT;
+
+    pr.y2 = pr.y1 + tips_h;
+
+    float select_y = 0.0f;
+    float select_h = 0.0f;
+
+    if (m_select_tip >= 0 && m_select_tip < (int)m_tips.size())
+    {
+        int sel_pos = m_select_tip - m_start_tip;
+
+        select_y = sel_pos * font_h;
+        select_h = font_h; //1 string
+    }
+
+    sr.x1 = pr.x1;
+    sr.y1 = pr.y1 + select_y;
+
+    sr.x2 = pr.x2;
+    sr.y2 = sr.y1 + select_h;
+
+    DrawRect(pr, tips_back_color);
+    DrawRect(sr, tips_select_color);
+
+    // --------------------------- highlight words --------------------
+
+    if (m_select_tip < (int)m_tips.size())
+    {
+        Frect r;
         xr_string tmp;
-		vecTipsEx::iterator itb = m_tips.begin() + m_start_tip;
-		vecTipsEx::iterator ite = m_tips.end();
-		for ( u32 i = 0; itb != ite; ++itb, ++i ) // tips
-		{
-			TipString const& ts = (*itb);
-			if ( (ts.HL_start < 0) || (ts.HL_finish < 0) || (ts.HL_start > ts.HL_finish) )
-			{
-				continue;
-			}
-			int    str_size = (int)ts.text.size();
-			if ( (ts.HL_start >= str_size) || (ts.HL_finish > str_size) )
-			{
-				continue;
-			}
-
-			r.null();
+        vecTipsEx::iterator itb = m_tips.begin() + m_start_tip;
+        vecTipsEx::iterator ite = m_tips.end();
+        for (u32 i = 0; itb != ite; ++itb, ++i) // tips
+        {
+            TipString const& ts = (*itb);
+            if ((ts.HL_start < 0) || (ts.HL_finish < 0) || (ts.HL_start > ts.HL_finish))
+            {
+                continue;
+            }
+            int str_size = (int)ts.text.size();
+            if ((ts.HL_start >= str_size) || (ts.HL_finish > str_size))
+            {
+                continue;
+            }
+
+            r.null();
             tmp.assign(ts.text.c_str(), ts.HL_start);
-			r.x1 = pr.x1 + w1 + pFont->SizeOf_( tmp.c_str() );
-			r.y1 = pr.y1 + i * font_h;
-
-			tmp.assign(ts.text.c_str(), ts.HL_finish);
-			r.x2 = pr.x1 + w1 + pFont->SizeOf_( tmp.c_str() );
-			r.y2 = r.y1 + font_h;
-
-			DrawRect( r, tips_word_color );
-
-			if ( i >= VIEW_TIPS_COUNT-1 )
-			{
-				break; // for itb
-			}
-		}// for itb
-	} // if
-
-	// --------------------------- scroll bar --------------------
-
-	u32 tips_sz = m_tips.size();
-	if ( tips_sz > VIEW_TIPS_COUNT )
-	{
-		Frect rb, rs;
-		
-		rb.x1 = pr.x2;
-		rb.y1 = pr.y1;
-		rb.x2 = rb.x1 + 2 * w1;
-		rb.y2 = pr.y2;
-		DrawRect( rb, tips_scroll_back_color );
-
-		VERIFY( rb.y2 - rb.y1 >= 1.0f );
-		float back_height = rb.y2 - rb.y1;
-		float u_height = (back_height * VIEW_TIPS_COUNT)/ float(tips_sz);
-		if ( u_height < 0.5f * font_h )
-		{
-			u_height = 0.5f * font_h;
-		}
-
-		//float u_pos = (back_height - u_height) * float(m_start_tip) / float(tips_sz);
-		float u_pos = back_height * float(m_start_tip) / float(tips_sz);
-		
-		//clamp( u_pos, 0.0f, back_height - u_height );
-		
-		rs = rb;
-		rs.y1 = pr.y1 + u_pos;
-		rs.y2 = rs.y1 + u_height;
-		DrawRect( rs, tips_scroll_pos_color );
-	}
-
-	UIRender->FlushPrimitive();
+            r.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
+            r.y1 = pr.y1 + i * font_h;
+
+            tmp.assign(ts.text.c_str(), ts.HL_finish);
+            r.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
+            r.y2 = r.y1 + font_h;
+
+            DrawRect(r, tips_word_color);
+
+            if (i >= VIEW_TIPS_COUNT - 1)
+            {
+                break; // for itb
+            }
+        }// for itb
+    } // if
+
+    // --------------------------- scroll bar --------------------
+
+    u32 tips_sz = m_tips.size();
+    if (tips_sz > VIEW_TIPS_COUNT)
+    {
+        Frect rb, rs;
+
+        rb.x1 = pr.x2;
+        rb.y1 = pr.y1;
+        rb.x2 = rb.x1 + 2 * w1;
+        rb.y2 = pr.y2;
+        DrawRect(rb, tips_scroll_back_color);
+
+        VERIFY(rb.y2 - rb.y1 >= 1.0f);
+        float back_height = rb.y2 - rb.y1;
+        float u_height = (back_height * VIEW_TIPS_COUNT) / float(tips_sz);
+        if (u_height < 0.5f * font_h)
+        {
+            u_height = 0.5f * font_h;
+        }
+
+        //float u_pos = (back_height - u_height) * float(m_start_tip) / float(tips_sz);
+        float u_pos = back_height * float(m_start_tip) / float(tips_sz);
+
+        //clamp( u_pos, 0.0f, back_height - u_height );
+
+        rs = rb;
+        rs.y1 = pr.y1 + u_pos;
+        rs.y2 = rs.y1 + u_height;
+        DrawRect(rs, tips_scroll_pos_color);
+    }
+
+    UIRender->FlushPrimitive();
 }
 
-void CConsole::DrawRect( Frect const& r, u32 color )
+void CConsole::DrawRect(Frect const& r, u32 color)
 {
-	UIRender->PushPoint( r.x1, r.y1, 0.0f, color, 0.0f, 0.0f );
-	UIRender->PushPoint( r.x2, r.y1, 0.0f, color, 1.0f, 0.0f );
-	UIRender->PushPoint( r.x2, r.y2, 0.0f, color, 1.0f, 1.0f );
+    UIRender->PushPoint(r.x1, r.y1, 0.0f, color, 0.0f, 0.0f);
+    UIRender->PushPoint(r.x2, r.y1, 0.0f, color, 1.0f, 0.0f);
+    UIRender->PushPoint(r.x2, r.y2, 0.0f, color, 1.0f, 1.0f);
 
-	UIRender->PushPoint( r.x1, r.y1, 0.0f, color, 0.0f, 0.0f );
-	UIRender->PushPoint( r.x2, r.y2, 0.0f, color, 1.0f, 1.0f );
-	UIRender->PushPoint( r.x1, r.y2, 0.0f, color, 0.0f, 1.0f );
+    UIRender->PushPoint(r.x1, r.y1, 0.0f, color, 0.0f, 0.0f);
+    UIRender->PushPoint(r.x2, r.y2, 0.0f, color, 1.0f, 1.0f);
+    UIRender->PushPoint(r.x1, r.y2, 0.0f, color, 0.0f, 1.0f);
 }
 
-void CConsole::ExecuteCommand( LPCSTR cmd_str, bool record_cmd )
+void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd)
 {
-	u32  str_size = xr_strlen( cmd_str );
-	PSTR edt   = (PSTR)_alloca( (str_size + 1) * sizeof(char) );
-	PSTR first = (PSTR)_alloca( (str_size + 1) * sizeof(char) );
-	PSTR last  = (PSTR)_alloca( (str_size + 1) * sizeof(char) );
-	
-	xr_strcpy( edt, str_size+1, cmd_str );
-	edt[str_size] = 0;
-
-	scroll_delta	= 0;
-	reset_cmd_history_idx();
-	reset_selected_tip();
-
-	text_editor::remove_spaces( edt );
-	if ( edt[0] == 0 )
-	{
-		return;
-	}
-	if ( record_cmd )
-	{
-		char c[2];
-		c[0] = mark2;
-		c[1] = 0;
-
-		if ( m_last_cmd.c_str() == 0 || xr_strcmp( m_last_cmd, edt ) != 0 )
-		{
-			Log( c, edt );
-			add_cmd_history( edt );
-			m_last_cmd = edt;
-		}
-	}
-	text_editor::split_cmd( first, last, edt );
-
-	// search
-	vecCMD_IT it = Commands.find( first );
-	if ( it != Commands.end() )
-	{
-		IConsole_Command* cc = it->second;
-		if ( cc && cc->bEnabled )
-		{
-			if ( cc->bLowerCaseArgs )
-			{
-				strlwr( last );
-			}
-			if ( last[0] == 0 )
-			{
-				if ( cc->bEmptyArgsHandled )
-				{
-					cc->Execute( last );
-				}
-				else
-				{
-					IConsole_Command::TStatus stat;
-					cc->Status( stat );
-					Msg( "- %s %s", cc->Name(), stat );
-				}
-			}
-			else
-			{
-				cc->Execute( last );
-				if ( record_cmd )
-				{
-					cc->add_to_LRU( (LPCSTR)last );
-				}
-			}
-		}
-		else
-		{
-			Log("! Command disabled.");
-		}
-	}
-	else
-	{
-		Log( "! Unknown command: ", first );
-	}
-
-	if ( record_cmd )
-	{
-		ec().clear_states();
-	}
+    u32 str_size = xr_strlen(cmd_str);
+    PSTR edt = (PSTR)_alloca((str_size + 1) * sizeof(char));
+    PSTR first = (PSTR)_alloca((str_size + 1) * sizeof(char));
+    PSTR last = (PSTR)_alloca((str_size + 1) * sizeof(char));
+
+    xr_strcpy(edt, str_size + 1, cmd_str);
+    edt[str_size] = 0;
+
+    scroll_delta = 0;
+    reset_cmd_history_idx();
+    reset_selected_tip();
+
+    text_editor::remove_spaces(edt);
+    if (edt[0] == 0)
+    {
+        return;
+    }
+    if (record_cmd)
+    {
+        char c[2];
+        c[0] = mark2;
+        c[1] = 0;
+
+        if (m_last_cmd.c_str() == 0 || xr_strcmp(m_last_cmd, edt) != 0)
+        {
+            Log(c, edt);
+            add_cmd_history(edt);
+            m_last_cmd = edt;
+        }
+    }
+    text_editor::split_cmd(first, last, edt);
+
+    // search
+    vecCMD_IT it = Commands.find(first);
+    if (it != Commands.end())
+    {
+        IConsole_Command* cc = it->second;
+        if (cc && cc->bEnabled)
+        {
+            if (cc->bLowerCaseArgs)
+            {
+                strlwr(last);
+            }
+            if (last[0] == 0)
+            {
+                if (cc->bEmptyArgsHandled)
+                {
+                    cc->Execute(last);
+                }
+                else
+                {
+                    IConsole_Command::TStatus stat;
+                    cc->Status(stat);
+                    Msg("- %s %s", cc->Name(), stat);
+                }
+            }
+            else
+            {
+                cc->Execute(last);
+                if (record_cmd)
+                {
+                    cc->add_to_LRU((LPCSTR)last);
+                }
+            }
+        }
+        else
+        {
+            Log("! Command disabled.");
+        }
+    }
+    else
+    {
+        Log("! Unknown command: ", first);
+    }
+
+    if (record_cmd)
+    {
+        ec().clear_states();
+    }
 }
 
 void CConsole::Show()
 {
-	SECUROM_MARKER_HIGH_SECURITY_ON(11)
-
-	if ( bVisible )
-	{
-		return;
-	}
-	bVisible = true;
-	
-	GetCursorPos( &m_mouse_pos );
-
-	ec().clear_states();
-	scroll_delta	= 0;
-	reset_cmd_history_idx();
-	reset_selected_tip();
-	update_tips();
-
-	m_editor->IR_Capture();
-	Device.seqRender.Add( this, 1 );
-	Device.seqFrame.Add( this );
-
-	SECUROM_MARKER_HIGH_SECURITY_OFF(11)
+    SECUROM_MARKER_HIGH_SECURITY_ON(11)
+
+    if (bVisible)
+    {
+        return;
+    }
+    bVisible = true;
+
+    GetCursorPos(&m_mouse_pos);
+
+    ec().clear_states();
+    scroll_delta = 0;
+    reset_cmd_history_idx();
+    reset_selected_tip();
+    update_tips();
+
+    m_editor->IR_Capture();
+    Device.seqRender.Add(this, 1);
+    Device.seqFrame.Add(this);
+
+    SECUROM_MARKER_HIGH_SECURITY_OFF(11)
 }
 
 extern CInput* pInput;
 
 void CConsole::Hide()
 {
-	if ( !bVisible )
-	{
-		return;
-	}
-	if ( g_pGamePersistent && g_dedicated_server )
-	{
-		return;
-	}
-//	if  ( g_pGameLevel || 
-//		( g_pGamePersistent && g_pGamePersistent->m_pMainMenu && g_pGamePersistent->m_pMainMenu->IsActive() ))
-
-	if ( pInput->get_exclusive_mode() )
-	{
-		SetCursorPos( m_mouse_pos.x, m_mouse_pos.y );
-	}
-
-	bVisible = false;
-	reset_selected_tip();
-	update_tips();
-
-	Device.seqFrame.Remove( this );
-	Device.seqRender.Remove( this );
-	m_editor->IR_Release();
+    if (!bVisible)
+    {
+        return;
+    }
+    if (g_pGamePersistent && g_dedicated_server)
+    {
+        return;
+    }
+    // if ( g_pGameLevel ||
+    // ( g_pGamePersistent && g_pGamePersistent->m_pMainMenu && g_pGamePersistent->m_pMainMenu->IsActive() ))
+
+    if (pInput->get_exclusive_mode())
+    {
+        SetCursorPos(m_mouse_pos.x, m_mouse_pos.y);
+    }
+
+    bVisible = false;
+    reset_selected_tip();
+    update_tips();
+
+    Device.seqFrame.Remove(this);
+    Device.seqRender.Remove(this);
+    m_editor->IR_Release();
 }
 
 void CConsole::SelectCommand()
 {
-	if ( m_cmd_history.empty() )
-	{
-		return;
-	}
-	VERIFY( 0 <= m_cmd_history_idx && m_cmd_history_idx < (int)m_cmd_history.size() );
-		
-	vecHistory::reverse_iterator	it_rb = m_cmd_history.rbegin() + m_cmd_history_idx;
-	ec().set_edit( (*it_rb).c_str() );
-	reset_selected_tip();
+    if (m_cmd_history.empty())
+    {
+        return;
+    }
+    VERIFY(0 <= m_cmd_history_idx && m_cmd_history_idx < (int)m_cmd_history.size());
+
+    vecHistory::reverse_iterator it_rb = m_cmd_history.rbegin() + m_cmd_history_idx;
+    ec().set_edit((*it_rb).c_str());
+    reset_selected_tip();
 }
 
-void CConsole::Execute( LPCSTR cmd )
+void CConsole::Execute(LPCSTR cmd)
 {
-	ExecuteCommand( cmd, false );
+    ExecuteCommand(cmd, false);
 }
 
-void CConsole::ExecuteScript( LPCSTR str )
+void CConsole::ExecuteScript(LPCSTR str)
 {
-	u32  str_size = xr_strlen( str );
-	PSTR buf = (PSTR)_alloca( (str_size + 10) * sizeof(char) );
-	xr_strcpy( buf, str_size + 10, "cfg_load " );
-	xr_strcat( buf, str_size + 10, str );
-	Execute( buf );
+    u32 str_size = xr_strlen(str);
+    PSTR buf = (PSTR)_alloca((str_size + 10) * sizeof(char));
+    xr_strcpy(buf, str_size + 10, "cfg_load ");
+    xr_strcat(buf, str_size + 10, str);
+    Execute(buf);
 }
 
 // -------------------------------------------------------------------------------------------------
 
-IConsole_Command* CConsole::find_next_cmd( LPCSTR in_str, shared_str& out_str )
+IConsole_Command* CConsole::find_next_cmd(LPCSTR in_str, shared_str& out_str)
 {
-	LPCSTR radmin_cmd_name = "ra ";
-	bool b_ra  = (in_str == strstr( in_str, radmin_cmd_name ) );
-	u32 offset = (b_ra)? xr_strlen( radmin_cmd_name ) : 0;
-
-	LPSTR t2;
-	STRCONCAT( t2, in_str + offset, " " );
-
-	vecCMD_IT it = Commands.lower_bound( t2 );
-	if ( it != Commands.end() )
-	{
-		IConsole_Command* cc = it->second;
-		LPCSTR name_cmd      = cc->Name();
-		u32    name_cmd_size = xr_strlen( name_cmd );
-		PSTR   new_str       = (PSTR)_alloca( (offset + name_cmd_size + 2) * sizeof(char) );
-
-		xr_strcpy( new_str, offset + name_cmd_size + 2, (b_ra)? radmin_cmd_name : "" );
-		xr_strcat( new_str, offset + name_cmd_size + 2, name_cmd );
-
-		out_str._set( (LPCSTR)new_str );
-		return cc;
-	}
-	return NULL;
+    LPCSTR radmin_cmd_name = "ra ";
+    bool b_ra = (in_str == strstr(in_str, radmin_cmd_name));
+    u32 offset = (b_ra) ? xr_strlen(radmin_cmd_name) : 0;
+
+    LPSTR t2;
+    STRCONCAT(t2, in_str + offset, " ");
+
+    vecCMD_IT it = Commands.lower_bound(t2);
+    if (it != Commands.end())
+    {
+        IConsole_Command* cc = it->second;
+        LPCSTR name_cmd = cc->Name();
+        u32 name_cmd_size = xr_strlen(name_cmd);
+        PSTR new_str = (PSTR)_alloca((offset + name_cmd_size + 2) * sizeof(char));
+
+        xr_strcpy(new_str, offset + name_cmd_size + 2, (b_ra) ? radmin_cmd_name : "");
+        xr_strcat(new_str, offset + name_cmd_size + 2, name_cmd);
+
+        out_str._set((LPCSTR)new_str);
+        return cc;
+    }
+    return NULL;
 }
 
-bool CConsole::add_next_cmds( LPCSTR in_str, vecTipsEx& out_v )
+bool CConsole::add_next_cmds(LPCSTR in_str, vecTipsEx& out_v)
 {
-	u32 cur_count = out_v.size();
-	if ( cur_count >= MAX_TIPS_COUNT )
-	{
-		return false;
-	}
-
-	LPSTR t2;
-	STRCONCAT( t2, in_str, " " );
-
-	shared_str temp;
-	IConsole_Command* cc = find_next_cmd( t2, temp );
-	if ( !cc || temp.size() == 0 )
-	{
-		return false;
-	}
-
-	bool res = false;
-	for ( u32 i = cur_count; i < MAX_TIPS_COUNT*2; ++i ) //fake=protect
-	{
-		temp._set( cc->Name() );
-		bool dup = ( std::find( out_v.begin(), out_v.end(), temp ) != out_v.end() );
-		if ( !dup )
-		{
-			TipString ts( temp );
-			out_v.push_back( ts );
-			res = true;
-		}
-		if ( out_v.size() >= MAX_TIPS_COUNT )
-		{
-			break; // for
-		}
-		LPSTR t3;
-		STRCONCAT( t3, out_v.back().text.c_str(), " " );
-		cc = find_next_cmd( t3, temp );
-		if ( !cc )
-		{
-			break; // for
-		}
-	} // for
-	return res;
+    u32 cur_count = out_v.size();
+    if (cur_count >= MAX_TIPS_COUNT)
+    {
+        return false;
+    }
+
+    LPSTR t2;
+    STRCONCAT(t2, in_str, " ");
+
+    shared_str temp;
+    IConsole_Command* cc = find_next_cmd(t2, temp);
+    if (!cc || temp.size() == 0)
+    {
+        return false;
+    }
+
+    bool res = false;
+    for (u32 i = cur_count; i < MAX_TIPS_COUNT * 2; ++i) //fake=protect
+    {
+        temp._set(cc->Name());
+        bool dup = (std::find(out_v.begin(), out_v.end(), temp) != out_v.end());
+        if (!dup)
+        {
+            TipString ts(temp);
+            out_v.push_back(ts);
+            res = true;
+        }
+        if (out_v.size() >= MAX_TIPS_COUNT)
+        {
+            break; // for
+        }
+        LPSTR t3;
+        STRCONCAT(t3, out_v.back().text.c_str(), " ");
+        cc = find_next_cmd(t3, temp);
+        if (!cc)
+        {
+            break; // for
+        }
+    } // for
+    return res;
 }
 
-bool CConsole::add_internal_cmds( LPCSTR in_str, vecTipsEx& out_v )
+bool CConsole::add_internal_cmds(LPCSTR in_str, vecTipsEx& out_v)
 {
-	u32 cur_count = out_v.size();
-	if ( cur_count >= MAX_TIPS_COUNT )
-	{
-		return false;
-	}
-	u32   in_sz = xr_strlen(in_str);
-	
-	bool res = false;
-	// word in begin
+    u32 cur_count = out_v.size();
+    if (cur_count >= MAX_TIPS_COUNT)
+    {
+        return false;
+    }
+    u32 in_sz = xr_strlen(in_str);
+
+    bool res = false;
+    // word in begin
     xr_string name2;
-	vecCMD_IT itb = Commands.begin();
-	vecCMD_IT ite = Commands.end();
-	for ( ; itb != ite; ++itb )
-	{
-		LPCSTR name = itb->first;
-		u32 name_sz = xr_strlen(name);
-		if ( name_sz >= in_sz )
-		{
+    vecCMD_IT itb = Commands.begin();
+    vecCMD_IT ite = Commands.end();
+    for (; itb != ite; ++itb)
+    {
+        LPCSTR name = itb->first;
+        u32 name_sz = xr_strlen(name);
+        if (name_sz >= in_sz)
+        {
             name2.assign(name, in_sz);
-			if ( !stricmp( name2.c_str(), in_str ) )
-			{
-				shared_str temp;
-				temp._set( name );
-				bool dup = ( std::find( out_v.begin(), out_v.end(), temp ) != out_v.end() );
-				if ( !dup )
-				{
-					out_v.push_back( TipString( temp, 0, in_sz ) );
-					res = true;
-				}
-			}
-		}
-
-		if ( out_v.size() >= MAX_TIPS_COUNT )
-		{
-			return res;
-		}
-	} // for
-
-	// word in internal
-	itb = Commands.begin();
-	ite = Commands.end();
-	for ( ; itb != ite; ++itb )
-	{
-		LPCSTR name = itb->first;
-		LPCSTR fd_str = strstr( name, in_str );
-		if ( fd_str )
-		{
-			shared_str temp;
-			temp._set( name );
-			bool dup = ( std::find( out_v.begin(), out_v.end(), temp ) != out_v.end() );
-			if ( !dup )
-			{
-				u32 name_sz = xr_strlen( name );
-				int   fd_sz = name_sz - xr_strlen( fd_str );
-				out_v.push_back( TipString( temp, fd_sz, fd_sz + in_sz ) );
-				res = true;
-			}
-		}
-		if ( out_v.size() >= MAX_TIPS_COUNT )
-		{
-			return res;
-		}
-	} // for
-
-	return res;
+            if (!stricmp(name2.c_str(), in_str))
+            {
+                shared_str temp;
+                temp._set(name);
+                bool dup = (std::find(out_v.begin(), out_v.end(), temp) != out_v.end());
+                if (!dup)
+                {
+                    out_v.push_back(TipString(temp, 0, in_sz));
+                    res = true;
+                }
+            }
+        }
+
+        if (out_v.size() >= MAX_TIPS_COUNT)
+        {
+            return res;
+        }
+    } // for
+
+    // word in internal
+    itb = Commands.begin();
+    ite = Commands.end();
+    for (; itb != ite; ++itb)
+    {
+        LPCSTR name = itb->first;
+        LPCSTR fd_str = strstr(name, in_str);
+        if (fd_str)
+        {
+            shared_str temp;
+            temp._set(name);
+            bool dup = (std::find(out_v.begin(), out_v.end(), temp) != out_v.end());
+            if (!dup)
+            {
+                u32 name_sz = xr_strlen(name);
+                int fd_sz = name_sz - xr_strlen(fd_str);
+                out_v.push_back(TipString(temp, fd_sz, fd_sz + in_sz));
+                res = true;
+            }
+        }
+        if (out_v.size() >= MAX_TIPS_COUNT)
+        {
+            return res;
+        }
+    } // for
+
+    return res;
 }
 
 void CConsole::update_tips()
 {
-	m_temp_tips.clear_not_free();
-	m_tips.clear_not_free();
-
-	m_cur_cmd  = NULL;
-	if ( !bVisible )
-	{
-		return;
-	}
-
-	LPCSTR cur = ec().str_edit();
-	u32    cur_length = xr_strlen( cur );
-
-	if ( cur_length == 0 )
-	{
-		m_prev_length_str = 0;
-		return;
-	}
-	
-	if ( m_prev_length_str != cur_length )
-	{
-		reset_selected_tip();
-	}
-	m_prev_length_str = cur_length;
-
-	PSTR first = (PSTR)_alloca( (cur_length + 1) * sizeof(char) );
-	PSTR last  = (PSTR)_alloca( (cur_length + 1) * sizeof(char) );
-	text_editor::split_cmd( first, last, cur );
-	
-	u32 first_lenght = xr_strlen(first);
-	
-	if ( (first_lenght > 2) && (first_lenght + 1 <= cur_length) ) // param
-	{
-		if ( cur[first_lenght] == ' ' )
-		{
-			if ( m_tips_mode != 2 )
-			{
-				reset_selected_tip();
-			}
-
-			vecCMD_IT it = Commands.find( first );
-			if ( it != Commands.end() )
-			{
-				IConsole_Command* cc = it->second;
-				
-				u32 mode = 0;
-				if ( (first_lenght + 2 <= cur_length) && (cur[first_lenght] == ' ') && (cur[first_lenght+1] == ' ') )
-				{
-					mode = 1;
-					last += 1; // fake: next char
-				}
-
-				cc->fill_tips( m_temp_tips, mode );
-				m_tips_mode = 2;
-				m_cur_cmd._set( first );
-				select_for_filter( last, m_temp_tips, m_tips );
-
-				if ( m_tips.size() == 0 )
-				{
-					m_tips.push_back( TipString( "(empty)" ) );
-				}
-				if ( (int)m_tips.size() <= m_select_tip )
-				{
-					reset_selected_tip();
-				}
-				return;
-			}
-		}
-	}
-
-	// cmd name
-	{
-		add_internal_cmds( cur, m_tips );
-		//add_next_cmds( cur, m_tips );
-		m_tips_mode = 1;
-	}
-
-	if ( m_tips.size() == 0 )
-	{
-		m_tips_mode = 0;
-		reset_selected_tip();
-	}
-	if ( (int)m_tips.size() <= m_select_tip )
-	{
-		reset_selected_tip();
-	}
+    m_temp_tips.clear_not_free();
+    m_tips.clear_not_free();
+
+    m_cur_cmd = NULL;
+    if (!bVisible)
+    {
+        return;
+    }
+
+    LPCSTR cur = ec().str_edit();
+    u32 cur_length = xr_strlen(cur);
+
+    if (cur_length == 0)
+    {
+        m_prev_length_str = 0;
+        return;
+    }
+
+    if (m_prev_length_str != cur_length)
+    {
+        reset_selected_tip();
+    }
+    m_prev_length_str = cur_length;
+
+    PSTR first = (PSTR)_alloca((cur_length + 1) * sizeof(char));
+    PSTR last = (PSTR)_alloca((cur_length + 1) * sizeof(char));
+    text_editor::split_cmd(first, last, cur);
+
+    u32 first_lenght = xr_strlen(first);
+
+    if ((first_lenght > 2) && (first_lenght + 1 <= cur_length)) // param
+    {
+        if (cur[first_lenght] == ' ')
+        {
+            if (m_tips_mode != 2)
+            {
+                reset_selected_tip();
+            }
+
+            vecCMD_IT it = Commands.find(first);
+            if (it != Commands.end())
+            {
+                IConsole_Command* cc = it->second;
+
+                u32 mode = 0;
+                if ((first_lenght + 2 <= cur_length) && (cur[first_lenght] == ' ') && (cur[first_lenght + 1] == ' '))
+                {
+                    mode = 1;
+                    last += 1; // fake: next char
+                }
+
+                cc->fill_tips(m_temp_tips, mode);
+                m_tips_mode = 2;
+                m_cur_cmd._set(first);
+                select_for_filter(last, m_temp_tips, m_tips);
+
+                if (m_tips.size() == 0)
+                {
+                    m_tips.push_back(TipString("(empty)"));
+                }
+                if ((int)m_tips.size() <= m_select_tip)
+                {
+                    reset_selected_tip();
+                }
+                return;
+            }
+        }
+    }
+
+    // cmd name
+    {
+        add_internal_cmds(cur, m_tips);
+        //add_next_cmds( cur, m_tips );
+        m_tips_mode = 1;
+    }
+
+    if (m_tips.size() == 0)
+    {
+        m_tips_mode = 0;
+        reset_selected_tip();
+    }
+    if ((int)m_tips.size() <= m_select_tip)
+    {
+        reset_selected_tip();
+    }
 
 }
 
-void CConsole::select_for_filter( LPCSTR filter_str, vecTips& in_v, vecTipsEx& out_v )
+void CConsole::select_for_filter(LPCSTR filter_str, vecTips& in_v, vecTipsEx& out_v)
 {
-	out_v.clear_not_free();
-	u32 in_count = in_v.size();
-	if ( in_count == 0 || !filter_str )
-	{
-		return;
-	}
-
-	bool all = ( xr_strlen(filter_str) == 0 );
-
-	vecTips::iterator itb = in_v.begin();
-	vecTips::iterator ite = in_v.end();
-	for ( ; itb != ite ; ++itb )
-	{
-		shared_str const& str = (*itb);
-		if ( all )
-		{
-			out_v.push_back( TipString( str ) );
-		}
-		else
-		{
-			LPCSTR fd_str = strstr( str.c_str(), filter_str );
-			if ( fd_str )
-			{
-				int   fd_sz = str.size() - xr_strlen( fd_str );
-				TipString ts( str, fd_sz, fd_sz + xr_strlen(filter_str) );
-				out_v.push_back( ts );
-			}
-		}
-	}//for
+    out_v.clear_not_free();
+    u32 in_count = in_v.size();
+    if (in_count == 0 || !filter_str)
+    {
+        return;
+    }
+
+    bool all = (xr_strlen(filter_str) == 0);
+
+    vecTips::iterator itb = in_v.begin();
+    vecTips::iterator ite = in_v.end();
+    for (; itb != ite; ++itb)
+    {
+        shared_str const& str = (*itb);
+        if (all)
+        {
+            out_v.push_back(TipString(str));
+        }
+        else
+        {
+            LPCSTR fd_str = strstr(str.c_str(), filter_str);
+            if (fd_str)
+            {
+                int fd_sz = str.size() - xr_strlen(fd_str);
+                TipString ts(str, fd_sz, fd_sz + xr_strlen(filter_str));
+                out_v.push_back(ts);
+            }
+        }
+    }//for
 }
diff --git a/src/xrEngine/XR_IOConsole.h b/src/xrEngine/XR_IOConsole.h
index ddf42c4803b..81060239cec 100644
--- a/src/xrEngine/XR_IOConsole.h
+++ b/src/xrEngine/XR_IOConsole.h
@@ -19,198 +19,198 @@ class line_edit_control;
 
 struct TipString
 {
-	shared_str	text;
-	int			HL_start; // Highlight
-	int			HL_finish;
-	
-	TipString()
-	{
-		text._set( "" );
-		HL_start = 0;
-		HL_finish = 0;
-	}
-	TipString( shared_str const& tips_text, int start_pos, int finish_pos )
-	{
-		text._set( tips_text );
-		HL_start = start_pos;
-		HL_finish = finish_pos;
-	}
-	TipString( LPCSTR tips_text, int start_pos, int finish_pos )
-	{
-		text._set( tips_text );
-		HL_start = start_pos;
-		HL_finish = finish_pos;
-	}
-	TipString( shared_str const& tips_text )
-	{
-		text._set( tips_text );
-		HL_start = 0;
-		HL_finish = 0;
-	}
-	IC bool operator== ( shared_str const& tips_text )
-	{
-		return ( text == tips_text );
-	}
+    shared_str text;
+    int HL_start; // Highlight
+    int HL_finish;
+
+    TipString()
+    {
+        text._set("");
+        HL_start = 0;
+        HL_finish = 0;
+    }
+    TipString(shared_str const& tips_text, int start_pos, int finish_pos)
+    {
+        text._set(tips_text);
+        HL_start = start_pos;
+        HL_finish = finish_pos;
+    }
+    TipString(LPCSTR tips_text, int start_pos, int finish_pos)
+    {
+        text._set(tips_text);
+        HL_start = start_pos;
+        HL_finish = finish_pos;
+    }
+    TipString(shared_str const& tips_text)
+    {
+        text._set(tips_text);
+        HL_start = 0;
+        HL_finish = 0;
+    }
+    IC bool operator== (shared_str const& tips_text)
+    {
+        return (text == tips_text);
+    }
 };
 
 class ENGINE_API CConsole :
-	public pureRender,
-	public pureFrame,
-	public pureScreenResolutionChanged
+    public pureRender,
+    public pureFrame,
+    public pureScreenResolutionChanged
 {
 public:
-	struct str_pred : public std::binary_function<char*, char*, bool>
-	{	
-		IC bool operator()(const char* x, const char* y) const
-		{
-			return (xr_strcmp( x, y ) < 0);
-		}
-	};
-	typedef  xr_map<LPCSTR,IConsole_Command*,str_pred>	vecCMD;
-	typedef  vecCMD::iterator							vecCMD_IT;
-	typedef  vecCMD::const_iterator						vecCMD_CIT;
-	typedef  fastdelegate::FastDelegate0<void>			Callback;
-	typedef  xr_vector<shared_str>						vecHistory;
-	typedef  xr_vector<shared_str>						vecTips;
-	typedef  xr_vector<TipString>						vecTipsEx;
-
-	enum			{ CONSOLE_BUF_SIZE = 1024 };
-	enum			{ VIEW_TIPS_COUNT = 14, MAX_TIPS_COUNT = 220 };
+    struct str_pred : public std::binary_function < char*, char*, bool >
+    {
+        IC bool operator()(const char* x, const char* y) const
+        {
+            return (xr_strcmp(x, y) < 0);
+        }
+    };
+    typedef xr_map<LPCSTR, IConsole_Command*, str_pred> vecCMD;
+    typedef vecCMD::iterator vecCMD_IT;
+    typedef vecCMD::const_iterator vecCMD_CIT;
+    typedef fastdelegate::FastDelegate0<void> Callback;
+    typedef xr_vector<shared_str> vecHistory;
+    typedef xr_vector<shared_str> vecTips;
+    typedef xr_vector<TipString> vecTipsEx;
+
+    enum { CONSOLE_BUF_SIZE = 1024 };
+    enum { VIEW_TIPS_COUNT = 14, MAX_TIPS_COUNT = 220 };
 
 protected:
-	int				scroll_delta;
+    int scroll_delta;
 
-	CGameFont*		pFont;
-	CGameFont*		pFont2;
-	
-	FactoryPtr<IUIShader>*		m_hShader_back;
+    CGameFont* pFont;
+    CGameFont* pFont2;
 
-	POINT			m_mouse_pos;
-	bool			m_disable_tips;
+    FactoryPtr<IUIShader>* m_hShader_back;
+
+    POINT m_mouse_pos;
+    bool m_disable_tips;
 
 private:
-	vecHistory		m_cmd_history;
-	u32				m_cmd_history_max;
-	int				m_cmd_history_idx;
-	shared_str		m_last_cmd;
-	BENCH_SEC_SCRAMBLEMEMBER1
-
-	vecTips			m_temp_tips;
-	vecTipsEx		m_tips;
-	u32				m_tips_mode;
-	shared_str		m_cur_cmd;
-	int				m_select_tip;
-	int				m_start_tip;
-	u32				m_prev_length_str;
+    vecHistory m_cmd_history;
+    u32 m_cmd_history_max;
+    int m_cmd_history_idx;
+    shared_str m_last_cmd;
+    BENCH_SEC_SCRAMBLEMEMBER1
+
+    vecTips m_temp_tips;
+    vecTipsEx m_tips;
+    u32 m_tips_mode;
+    shared_str m_cur_cmd;
+    int m_select_tip;
+    int m_start_tip;
+    u32 m_prev_length_str;
 
 public:
-					CConsole			();
-	virtual			~CConsole			();
-	virtual	void	Initialize			();
-	virtual void	Destroy				();
-
-	virtual void		OnRender			();
-	virtual void _BCL	OnFrame				();
-	virtual void	OnScreenResolutionChanged();
-	string64		ConfigFile;
-	bool			bVisible;
-	vecCMD			Commands;
-
-	void			AddCommand			( IConsole_Command* cc );
-	void			RemoveCommand		( IConsole_Command* cc );
-
-	void			Show				();
-	void			Hide				();
-
-	void			Execute				( LPCSTR cmd );
-	void			ExecuteScript		( LPCSTR str );
-	void			ExecuteCommand		( LPCSTR cmd, bool record_cmd = true );
-	void			SelectCommand		();
-
-	bool			GetBool				( LPCSTR cmd ) const;
-	float			GetFloat			( LPCSTR cmd, float& min, float& max) const;
-	int				GetInteger			( LPCSTR cmd, int& min, int& max) const;
-	LPCSTR			GetString			( LPCSTR cmd ) const;
-	LPCSTR			GetToken			( LPCSTR cmd ) const;
-	xr_token*		GetXRToken			( LPCSTR cmd ) const;
-	Fvector			GetFVector			( LPCSTR cmd ) const;
-	Fvector*		GetFVectorPtr		( LPCSTR cmd ) const;
-	IConsole_Command* GetCommand		( LPCSTR cmd ) const;
+    CConsole();
+    virtual ~CConsole();
+    virtual void Initialize();
+    virtual void Destroy();
+
+    virtual void OnRender();
+    virtual void _BCL OnFrame();
+    virtual void OnScreenResolutionChanged();
+    string64 ConfigFile;
+    bool bVisible;
+    vecCMD Commands;
+
+    void AddCommand(IConsole_Command* cc);
+    void RemoveCommand(IConsole_Command* cc);
+
+    void Show();
+    void Hide();
+
+    void Execute(LPCSTR cmd);
+    void ExecuteScript(LPCSTR str);
+    void ExecuteCommand(LPCSTR cmd, bool record_cmd = true);
+    void SelectCommand();
+
+    bool GetBool(LPCSTR cmd) const;
+    float GetFloat(LPCSTR cmd, float& min, float& max) const;
+    int GetInteger(LPCSTR cmd, int& min, int& max) const;
+    LPCSTR GetString(LPCSTR cmd) const;
+    LPCSTR GetToken(LPCSTR cmd) const;
+    xr_token* GetXRToken(LPCSTR cmd) const;
+    Fvector GetFVector(LPCSTR cmd) const;
+    Fvector* GetFVectorPtr(LPCSTR cmd) const;
+    IConsole_Command* GetCommand(LPCSTR cmd) const;
 protected:
-	text_editor::line_editor*			m_editor;
-	text_editor::line_edit_control&		ec();
-
-	BENCH_SEC_SCRAMBLEMEMBER2
-
-	enum Console_mark // (int)=char
-	{
-		no_mark = ' ',
-		mark0  = '~',
-		mark1  = '!', // error
-		mark2  = '@', // console cmd
-		mark3  = '#',
-		mark4  = '$',
-		mark5  = '%',
-		mark6  = '^',
-		mark7  = '&',
-		mark8  = '*',
-		mark9  = '-', // green = ok
-		mark10 = '+',
-		mark11 = '=',
-		mark12 = '/'
-	};
-	
-	bool	is_mark				( Console_mark type );
-	u32		get_mark_color		( Console_mark type );
-
-	void	DrawBackgrounds		( bool bGame );
-	void	DrawRect			( Frect const& r, u32 color );
-	void	OutFont				( LPCSTR text, float& pos_y );
-	void	Register_callbacks	();
-	
+    text_editor::line_editor* m_editor;
+    text_editor::line_edit_control& ec();
+
+    BENCH_SEC_SCRAMBLEMEMBER2
+
+    enum Console_mark // (int)=char
+    {
+        no_mark = ' ',
+        mark0 = '~',
+        mark1 = '!', // error
+        mark2 = '@', // console cmd
+        mark3 = '#',
+        mark4 = '$',
+        mark5 = '%',
+        mark6 = '^',
+        mark7 = '&',
+        mark8 = '*',
+        mark9 = '-', // green = ok
+        mark10 = '+',
+        mark11 = '=',
+        mark12 = '/'
+    };
+
+    bool is_mark(Console_mark type);
+    u32 get_mark_color(Console_mark type);
+
+    void DrawBackgrounds(bool bGame);
+    void DrawRect(Frect const& r, u32 color);
+    void OutFont(LPCSTR text, float& pos_y);
+    void Register_callbacks();
+
 protected:
-	void xr_stdcall Prev_log	();
-	void xr_stdcall Next_log	();
-	void xr_stdcall Begin_log	();
-	void xr_stdcall End_log		();
-	
-	void xr_stdcall Find_cmd	();
-	void xr_stdcall Find_cmd_back();
-	void xr_stdcall Prev_cmd	();
-	void xr_stdcall Next_cmd	();
-	void xr_stdcall Prev_tip	();
-	void xr_stdcall Next_tip	();
-	
-	void xr_stdcall Begin_tips	();
-	void xr_stdcall End_tips	();
-	void xr_stdcall PageUp_tips	();
-	void xr_stdcall PageDown_tips();
-
-	void xr_stdcall Execute_cmd	();
-	void xr_stdcall Show_cmd	();
-	void xr_stdcall Hide_cmd	();
-	void xr_stdcall Hide_cmd_esc();
-
-	void xr_stdcall GamePause	();
+    void xr_stdcall Prev_log();
+    void xr_stdcall Next_log();
+    void xr_stdcall Begin_log();
+    void xr_stdcall End_log();
+
+    void xr_stdcall Find_cmd();
+    void xr_stdcall Find_cmd_back();
+    void xr_stdcall Prev_cmd();
+    void xr_stdcall Next_cmd();
+    void xr_stdcall Prev_tip();
+    void xr_stdcall Next_tip();
+
+    void xr_stdcall Begin_tips();
+    void xr_stdcall End_tips();
+    void xr_stdcall PageUp_tips();
+    void xr_stdcall PageDown_tips();
+
+    void xr_stdcall Execute_cmd();
+    void xr_stdcall Show_cmd();
+    void xr_stdcall Hide_cmd();
+    void xr_stdcall Hide_cmd_esc();
+
+    void xr_stdcall GamePause();
 
 protected:
-	void	add_cmd_history		( shared_str const& str );
-	void	next_cmd_history_idx();
-	void	prev_cmd_history_idx();
-	void	reset_cmd_history_idx();
-
-	void	next_selected_tip	();
-	void	check_next_selected_tip();
-	void	prev_selected_tip	();
-	void	check_prev_selected_tip();
-	void	reset_selected_tip	();
-
-	IConsole_Command* find_next_cmd( LPCSTR in_str, shared_str& out_str );
-	bool	add_next_cmds		( LPCSTR in_str, vecTipsEx& out_v );
-	bool	add_internal_cmds	( LPCSTR in_str, vecTipsEx& out_v );
-	
-	void	update_tips			();
-	void	select_for_filter	( LPCSTR filter_str, vecTips& in_v, vecTipsEx& out_v );
+    void add_cmd_history(shared_str const& str);
+    void next_cmd_history_idx();
+    void prev_cmd_history_idx();
+    void reset_cmd_history_idx();
+
+    void next_selected_tip();
+    void check_next_selected_tip();
+    void prev_selected_tip();
+    void check_prev_selected_tip();
+    void reset_selected_tip();
+
+    IConsole_Command* find_next_cmd(LPCSTR in_str, shared_str& out_str);
+    bool add_next_cmds(LPCSTR in_str, vecTipsEx& out_v);
+    bool add_internal_cmds(LPCSTR in_str, vecTipsEx& out_v);
+
+    void update_tips();
+    void select_for_filter(LPCSTR filter_str, vecTips& in_v, vecTipsEx& out_v);
 
 }; // class CConsole
 
diff --git a/src/xrEngine/XR_IOConsole_callback.cpp b/src/xrEngine/XR_IOConsole_callback.cpp
index 280bff13505..00ce4d687e0 100644
--- a/src/xrEngine/XR_IOConsole_callback.cpp
+++ b/src/xrEngine/XR_IOConsole_callback.cpp
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: XR_IOConsole_callback.cpp
-//	Created 	: 17.05.2008
-//	Author		: Evgeniy Sokolov
-//	Description : Console`s callback functions class implementation
+// Module : XR_IOConsole_callback.cpp
+// Created : 17.05.2008
+// Author : Evgeniy Sokolov
+// Description : Console`s callback functions class implementation
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -15,196 +15,196 @@
 
 void CConsole::Register_callbacks()
 {
-	ec().assign_callback( DIK_PRIOR, text_editor::ks_free,  Callback( this, &CConsole::Prev_log      ) );
-	ec().assign_callback( DIK_NEXT,  text_editor::ks_free,  Callback( this, &CConsole::Next_log      ) );
-	ec().assign_callback( DIK_PRIOR, text_editor::ks_Ctrl,  Callback( this, &CConsole::Begin_log     ) );
-	ec().assign_callback( DIK_NEXT,  text_editor::ks_Ctrl,  Callback( this, &CConsole::End_log       ) );
+    ec().assign_callback(DIK_PRIOR, text_editor::ks_free, Callback(this, &CConsole::Prev_log));
+    ec().assign_callback(DIK_NEXT, text_editor::ks_free, Callback(this, &CConsole::Next_log));
+    ec().assign_callback(DIK_PRIOR, text_editor::ks_Ctrl, Callback(this, &CConsole::Begin_log));
+    ec().assign_callback(DIK_NEXT, text_editor::ks_Ctrl, Callback(this, &CConsole::End_log));
 
-	ec().assign_callback( DIK_TAB,   text_editor::ks_free,  Callback( this, &CConsole::Find_cmd      ) );
-	ec().assign_callback( DIK_TAB,   text_editor::ks_Shift, Callback( this, &CConsole::Find_cmd_back ) );
-	ec().assign_callback( DIK_TAB,   text_editor::ks_Alt,   Callback( this, &CConsole::GamePause     ) );
+    ec().assign_callback(DIK_TAB, text_editor::ks_free, Callback(this, &CConsole::Find_cmd));
+    ec().assign_callback(DIK_TAB, text_editor::ks_Shift, Callback(this, &CConsole::Find_cmd_back));
+    ec().assign_callback(DIK_TAB, text_editor::ks_Alt, Callback(this, &CConsole::GamePause));
 
-	ec().assign_callback( DIK_UP,    text_editor::ks_free,  Callback( this, &CConsole::Prev_tip      ) );
-	ec().assign_callback( DIK_DOWN,  text_editor::ks_free,  Callback( this, &CConsole::Next_tip      ) );
-	ec().assign_callback( DIK_UP,    text_editor::ks_Ctrl,  Callback( this, &CConsole::Prev_cmd      ) );
-	ec().assign_callback( DIK_DOWN,  text_editor::ks_Ctrl,  Callback( this, &CConsole::Next_cmd      ) );
+    ec().assign_callback(DIK_UP, text_editor::ks_free, Callback(this, &CConsole::Prev_tip));
+    ec().assign_callback(DIK_DOWN, text_editor::ks_free, Callback(this, &CConsole::Next_tip));
+    ec().assign_callback(DIK_UP, text_editor::ks_Ctrl, Callback(this, &CConsole::Prev_cmd));
+    ec().assign_callback(DIK_DOWN, text_editor::ks_Ctrl, Callback(this, &CConsole::Next_cmd));
 
-	ec().assign_callback( DIK_HOME,  text_editor::ks_Alt,   Callback( this, &CConsole::Begin_tips    ) );
-	ec().assign_callback( DIK_END,   text_editor::ks_Alt,   Callback( this, &CConsole::End_tips      ) );
-	ec().assign_callback( DIK_PRIOR, text_editor::ks_Alt,   Callback( this, &CConsole::PageUp_tips   ) );
-	ec().assign_callback( DIK_NEXT,  text_editor::ks_Alt,   Callback( this, &CConsole::PageDown_tips ) );
-	
-	ec().assign_callback( DIK_RETURN,      text_editor::ks_free, Callback( this, &CConsole::Execute_cmd ) );
-	ec().assign_callback( DIK_NUMPADENTER, text_editor::ks_free, Callback( this, &CConsole::Execute_cmd ) );
-	
-	ec().assign_callback( DIK_ESCAPE, text_editor::ks_free, Callback( this, &CConsole::Hide_cmd_esc ) );
-	ec().assign_callback( DIK_GRAVE,  text_editor::ks_free, Callback( this, &CConsole::Hide_cmd     ) );
+    ec().assign_callback(DIK_HOME, text_editor::ks_Alt, Callback(this, &CConsole::Begin_tips));
+    ec().assign_callback(DIK_END, text_editor::ks_Alt, Callback(this, &CConsole::End_tips));
+    ec().assign_callback(DIK_PRIOR, text_editor::ks_Alt, Callback(this, &CConsole::PageUp_tips));
+    ec().assign_callback(DIK_NEXT, text_editor::ks_Alt, Callback(this, &CConsole::PageDown_tips));
+
+    ec().assign_callback(DIK_RETURN, text_editor::ks_free, Callback(this, &CConsole::Execute_cmd));
+    ec().assign_callback(DIK_NUMPADENTER, text_editor::ks_free, Callback(this, &CConsole::Execute_cmd));
+
+    ec().assign_callback(DIK_ESCAPE, text_editor::ks_free, Callback(this, &CConsole::Hide_cmd_esc));
+    ec().assign_callback(DIK_GRAVE, text_editor::ks_free, Callback(this, &CConsole::Hide_cmd));
 }
 
 void CConsole::Prev_log() // DIK_PRIOR=PAGE_UP
 {
-	scroll_delta++;
-	if ( scroll_delta > int(LogFile->size())-1 )
-	{
-		scroll_delta = LogFile->size()-1;
-	}
+    scroll_delta++;
+    if (scroll_delta > int(LogFile->size()) - 1)
+    {
+        scroll_delta = LogFile->size() - 1;
+    }
 }
 
 void CConsole::Next_log() // DIK_NEXT=PAGE_DOWN
 {
-	scroll_delta--;
-	if ( scroll_delta < 0 )
-	{
-		scroll_delta = 0;
-	}
+    scroll_delta--;
+    if (scroll_delta < 0)
+    {
+        scroll_delta = 0;
+    }
 }
 
 void CConsole::Begin_log() // PAGE_UP+Ctrl
 {
-	scroll_delta = LogFile->size()-1;
+    scroll_delta = LogFile->size() - 1;
 }
 
 void CConsole::End_log() // PAGE_DOWN+Ctrl
 {
-	scroll_delta = 0;
+    scroll_delta = 0;
 }
 
 void CConsole::Find_cmd() // DIK_TAB
 {
-	shared_str out_str;
-		
-	IConsole_Command* cc = find_next_cmd( ec().str_edit(), out_str );
-	if ( cc && out_str.size() )
-	{
-		ec().set_edit( out_str.c_str() );
-	}
+    shared_str out_str;
+
+    IConsole_Command* cc = find_next_cmd(ec().str_edit(), out_str);
+    if (cc && out_str.size())
+    {
+        ec().set_edit(out_str.c_str());
+    }
 }
 
 void CConsole::Find_cmd_back() // DIK_TAB+shift
 {
-	LPCSTR edt      = ec().str_edit();
-	LPCSTR radmin_cmd_name = "ra ";
-	bool b_ra  = (edt == strstr( edt, radmin_cmd_name ) );
-	u32 offset = (b_ra)? xr_strlen( radmin_cmd_name ) : 0;
+    LPCSTR edt = ec().str_edit();
+    LPCSTR radmin_cmd_name = "ra ";
+    bool b_ra = (edt == strstr(edt, radmin_cmd_name));
+    u32 offset = (b_ra) ? xr_strlen(radmin_cmd_name) : 0;
 
-	vecCMD_IT it = Commands.lower_bound( edt + offset );
-	if ( it != Commands.begin() )
-	{
-		--it;
-		IConsole_Command& cc = *(it->second);
-		LPCSTR name_cmd      = cc.Name();
-		u32    name_cmd_size = xr_strlen( name_cmd );
-		PSTR   new_str  = (PSTR)_alloca( (offset + name_cmd_size + 2) * sizeof(char) );
+    vecCMD_IT it = Commands.lower_bound(edt + offset);
+    if (it != Commands.begin())
+    {
+        --it;
+        IConsole_Command& cc = *(it->second);
+        LPCSTR name_cmd = cc.Name();
+        u32 name_cmd_size = xr_strlen(name_cmd);
+        PSTR new_str = (PSTR)_alloca((offset + name_cmd_size + 2) * sizeof(char));
 
-		xr_strcpy( new_str, offset + name_cmd_size + 2, (b_ra)? radmin_cmd_name : "" );
-		xr_strcat( new_str, offset + name_cmd_size + 2, name_cmd );
-		ec().set_edit( new_str );
-	}
+        xr_strcpy(new_str, offset + name_cmd_size + 2, (b_ra) ? radmin_cmd_name : "");
+        xr_strcat(new_str, offset + name_cmd_size + 2, name_cmd);
+        ec().set_edit(new_str);
+    }
 }
 
 void CConsole::Prev_cmd() // DIK_UP + Ctrl
 {
-	prev_cmd_history_idx();
-	SelectCommand();
+    prev_cmd_history_idx();
+    SelectCommand();
 }
 
 void CConsole::Next_cmd() // DIK_DOWN + Ctrl
 {
-	next_cmd_history_idx();
-	SelectCommand();
+    next_cmd_history_idx();
+    SelectCommand();
 }
 
 void CConsole::Prev_tip() // DIK_UP
 {
-	if ( xr_strlen( ec().str_edit() ) == 0 )
-	{
-		prev_cmd_history_idx();
-		SelectCommand();
-		return;
-	}
-	prev_selected_tip();
+    if (xr_strlen(ec().str_edit()) == 0)
+    {
+        prev_cmd_history_idx();
+        SelectCommand();
+        return;
+    }
+    prev_selected_tip();
 }
 
 void CConsole::Next_tip() // DIK_DOWN + Ctrl
 {
-	if ( xr_strlen( ec().str_edit() ) == 0 )
-	{
-		next_cmd_history_idx();
-		SelectCommand();
-		return;
-	}
-	next_selected_tip();
+    if (xr_strlen(ec().str_edit()) == 0)
+    {
+        next_cmd_history_idx();
+        SelectCommand();
+        return;
+    }
+    next_selected_tip();
 }
 
 void CConsole::Begin_tips()
 {
-	m_select_tip = 0;
-	m_start_tip = 0;
+    m_select_tip = 0;
+    m_start_tip = 0;
 }
 
 void CConsole::End_tips()
 {
-	m_select_tip = m_tips.size() - 1;
-	m_start_tip = m_select_tip - VIEW_TIPS_COUNT + 1;
-	check_next_selected_tip();
+    m_select_tip = m_tips.size() - 1;
+    m_start_tip = m_select_tip - VIEW_TIPS_COUNT + 1;
+    check_next_selected_tip();
 }
 
 void CConsole::PageUp_tips()
 {
-	m_select_tip -= VIEW_TIPS_COUNT;
-	check_prev_selected_tip();
+    m_select_tip -= VIEW_TIPS_COUNT;
+    check_prev_selected_tip();
 }
 
 void CConsole::PageDown_tips()
 {
-	m_select_tip += VIEW_TIPS_COUNT;
-	check_next_selected_tip();
+    m_select_tip += VIEW_TIPS_COUNT;
+    check_next_selected_tip();
 }
 
 void CConsole::Execute_cmd() // DIK_RETURN, DIK_NUMPADENTER
 {
-	if ( 0 <= m_select_tip && m_select_tip < (int)m_tips.size() )
-	{
-		shared_str const& str = m_tips[m_select_tip].text;
-		if ( m_tips_mode == 1 )
-		{
-			LPSTR buf;
-			STRCONCAT( buf, str.c_str(), " " );
-			ec().set_edit( buf );
-		}
-		else if ( m_tips_mode == 2 )
-		{
-			LPSTR buf;
-			STRCONCAT( buf, m_cur_cmd.c_str(), " ", str.c_str() );
-			ec().set_edit( buf );
-		}
-		reset_selected_tip();
-	}
-	else
-	{
-		ExecuteCommand( ec().str_edit() );
-	}
-	m_disable_tips = false;
+    if (0 <= m_select_tip && m_select_tip < (int)m_tips.size())
+    {
+        shared_str const& str = m_tips[m_select_tip].text;
+        if (m_tips_mode == 1)
+        {
+            LPSTR buf;
+            STRCONCAT(buf, str.c_str(), " ");
+            ec().set_edit(buf);
+        }
+        else if (m_tips_mode == 2)
+        {
+            LPSTR buf;
+            STRCONCAT(buf, m_cur_cmd.c_str(), " ", str.c_str());
+            ec().set_edit(buf);
+        }
+        reset_selected_tip();
+    }
+    else
+    {
+        ExecuteCommand(ec().str_edit());
+    }
+    m_disable_tips = false;
 }
 
 void CConsole::Show_cmd()
 {
-	Show();
+    Show();
 }
 
 void CConsole::Hide_cmd()
 {
-	Hide();
+    Hide();
 }
 
 void CConsole::Hide_cmd_esc()
 {
-	if ( 0 <= m_select_tip && m_select_tip < (int)m_tips.size() )
-	{
-		m_disable_tips = true;
-		return;
-	}
-	Hide();
+    if (0 <= m_select_tip && m_select_tip < (int)m_tips.size())
+    {
+        m_disable_tips = true;
+        return;
+    }
+    Hide();
 }
 
 void CConsole::GamePause()
diff --git a/src/xrEngine/XR_IOConsole_control.cpp b/src/xrEngine/XR_IOConsole_control.cpp
index 139aa0bfbbc..af03a347a39 100644
--- a/src/xrEngine/XR_IOConsole_control.cpp
+++ b/src/xrEngine/XR_IOConsole_control.cpp
@@ -1,97 +1,97 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: XR_IOConsole_control.cpp
-//	Created 	: 03.10.2008
-//	Author		: Evgeniy Sokolov
-//	Description : Console`s control-functions class implementation
+// Module : XR_IOConsole_control.cpp
+// Created : 03.10.2008
+// Author : Evgeniy Sokolov
+// Description : Console`s control-functions class implementation
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
 #include "XR_IOConsole.h"
 
 
-void CConsole::add_cmd_history( shared_str const& str )
+void CConsole::add_cmd_history(shared_str const& str)
 {
-	if ( str.size() == 0 )
-	{
-		return;
-	}
-	m_cmd_history.push_back( str );
-	if ( m_cmd_history.size() > m_cmd_history_max )
-	{
-		m_cmd_history.erase( m_cmd_history.begin() );
-	}
+    if (str.size() == 0)
+    {
+        return;
+    }
+    m_cmd_history.push_back(str);
+    if (m_cmd_history.size() > m_cmd_history_max)
+    {
+        m_cmd_history.erase(m_cmd_history.begin());
+    }
 }
 
 void CConsole::next_cmd_history_idx()
 {
-	--m_cmd_history_idx;
-	if ( m_cmd_history_idx < 0 )
-	{
-		m_cmd_history_idx = 0;
-	}
+    --m_cmd_history_idx;
+    if (m_cmd_history_idx < 0)
+    {
+        m_cmd_history_idx = 0;
+    }
 }
 
 void CConsole::prev_cmd_history_idx()
 {
-	++m_cmd_history_idx;
-	if ( m_cmd_history_idx >= (int)m_cmd_history.size() )
-	{
-		m_cmd_history_idx = m_cmd_history.size() - 1;
-	}
+    ++m_cmd_history_idx;
+    if (m_cmd_history_idx >= (int)m_cmd_history.size())
+    {
+        m_cmd_history_idx = m_cmd_history.size() - 1;
+    }
 }
 
 void CConsole::reset_cmd_history_idx()
 {
-	m_cmd_history_idx = -1;
+    m_cmd_history_idx = -1;
 }
 
 void CConsole::next_selected_tip()
 {
-	++m_select_tip;
-	check_next_selected_tip();
+    ++m_select_tip;
+    check_next_selected_tip();
 }
 
 void CConsole::check_next_selected_tip()
 {
-	if ( m_select_tip >= (int)m_tips.size() )
-	{
-		m_select_tip = m_tips.size() - 1;
-	}
+    if (m_select_tip >= (int)m_tips.size())
+    {
+        m_select_tip = m_tips.size() - 1;
+    }
 
-	int sel_dif = m_select_tip - VIEW_TIPS_COUNT + 1;
-	if ( sel_dif < 0 )
-	{
-		sel_dif = 0;
-	}
+    int sel_dif = m_select_tip - VIEW_TIPS_COUNT + 1;
+    if (sel_dif < 0)
+    {
+        sel_dif = 0;
+    }
 
-	if ( sel_dif > m_start_tip )
-	{
-		m_start_tip = sel_dif;
-	}
+    if (sel_dif > m_start_tip)
+    {
+        m_start_tip = sel_dif;
+    }
 }
 
 void CConsole::prev_selected_tip()
 {
-	--m_select_tip;
-	check_prev_selected_tip();
+    --m_select_tip;
+    check_prev_selected_tip();
 }
 
 void CConsole::check_prev_selected_tip()
 {
-	if ( m_select_tip < 0 )
-	{
-		m_select_tip = 0;
-	}
+    if (m_select_tip < 0)
+    {
+        m_select_tip = 0;
+    }
 
-	if ( m_start_tip > m_select_tip )
-	{
-		m_start_tip = m_select_tip;
-	}
+    if (m_start_tip > m_select_tip)
+    {
+        m_start_tip = m_select_tip;
+    }
 }
 
 void CConsole::reset_selected_tip()
 {
-	m_select_tip = -1;
-	m_start_tip = 0;
-	m_disable_tips = false;
+    m_select_tip = -1;
+    m_start_tip = 0;
+    m_disable_tips = false;
 }
diff --git a/src/xrEngine/XR_IOConsole_get.cpp b/src/xrEngine/XR_IOConsole_get.cpp
index 09f299b14bb..ba9ee78f050 100644
--- a/src/xrEngine/XR_IOConsole_get.cpp
+++ b/src/xrEngine/XR_IOConsole_get.cpp
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: XR_IOConsole_get.cpp
-//	Created 	: 17.05.2008
-//	Author		: Evgeniy Sokolov
-//	Description : Console`s get-functions class implementation
+// Module : XR_IOConsole_get.cpp
+// Created : 17.05.2008
+// Author : Evgeniy Sokolov
+// Description : Console`s get-functions class implementation
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -10,114 +10,114 @@
 #include "xr_ioc_cmd.h"
 
 
-bool CConsole::GetBool( LPCSTR cmd ) const
+bool CConsole::GetBool(LPCSTR cmd) const
 {
-	IConsole_Command* cc	= GetCommand(cmd);
-	CCC_Mask* cf			= dynamic_cast<CCC_Mask*>(cc);
-	if ( cf )
-	{
-		return ( cf->GetValue() != 0 );
-	}
-
-	CCC_Integer* ci			= dynamic_cast<CCC_Integer*>(cc);
-	if ( ci )
-	{
-		return ( ci->GetValue() != 0 );
-	}
-	return false;
+    IConsole_Command* cc = GetCommand(cmd);
+    CCC_Mask* cf = dynamic_cast<CCC_Mask*>(cc);
+    if (cf)
+    {
+        return (cf->GetValue() != 0);
+    }
+
+    CCC_Integer* ci = dynamic_cast<CCC_Integer*>(cc);
+    if (ci)
+    {
+        return (ci->GetValue() != 0);
+    }
+    return false;
 }
 
-float CConsole::GetFloat( LPCSTR cmd, float& min, float& max ) const
+float CConsole::GetFloat(LPCSTR cmd, float& min, float& max) const
 {
-	min						= 0.0f;
-	max						= 0.0f;
-	IConsole_Command* cc	= GetCommand(cmd);
-	CCC_Float* cf			= dynamic_cast<CCC_Float*>(cc);
-	if ( cf )
-	{
-		cf->GetBounds(min, max);
-		return cf->GetValue(); 
-	}
-	return 0.0f;
+    min = 0.0f;
+    max = 0.0f;
+    IConsole_Command* cc = GetCommand(cmd);
+    CCC_Float* cf = dynamic_cast<CCC_Float*>(cc);
+    if (cf)
+    {
+        cf->GetBounds(min, max);
+        return cf->GetValue();
+    }
+    return 0.0f;
 }
 
-IConsole_Command* CConsole::GetCommand( LPCSTR cmd ) const
+IConsole_Command* CConsole::GetCommand(LPCSTR cmd) const
 {
-	vecCMD_CIT it = Commands.find( cmd );
-	if ( it == Commands.end() )
-		return NULL;
-	else
-		return it->second;
+    vecCMD_CIT it = Commands.find(cmd);
+    if (it == Commands.end())
+        return NULL;
+    else
+        return it->second;
 }
 
 
-int CConsole::GetInteger( LPCSTR cmd, int& min, int& max ) const
+int CConsole::GetInteger(LPCSTR cmd, int& min, int& max) const
 {
-	min						= 0;
-	max						= 1;
-	IConsole_Command* cc	= GetCommand(cmd);
-
-	CCC_Integer* cf			= dynamic_cast<CCC_Integer*>(cc);
-	if ( cf )
-	{
-		cf->GetBounds(min, max);
-		return cf->GetValue();
-	}
-	CCC_Mask* cm = dynamic_cast<CCC_Mask*>(cc);
-	if ( cm )
-	{
-		min = 0;
-		max = 1;
-		return ( cm->GetValue() )? 1 : 0;
-	}
-	return 0;
+    min = 0;
+    max = 1;
+    IConsole_Command* cc = GetCommand(cmd);
+
+    CCC_Integer* cf = dynamic_cast<CCC_Integer*>(cc);
+    if (cf)
+    {
+        cf->GetBounds(min, max);
+        return cf->GetValue();
+    }
+    CCC_Mask* cm = dynamic_cast<CCC_Mask*>(cc);
+    if (cm)
+    {
+        min = 0;
+        max = 1;
+        return (cm->GetValue()) ? 1 : 0;
+    }
+    return 0;
 }
 
-LPCSTR CConsole::GetString( LPCSTR cmd ) const
+LPCSTR CConsole::GetString(LPCSTR cmd) const
 {
-	IConsole_Command* cc	= GetCommand(cmd);
-	if(!cc)
-		return				NULL;
+    IConsole_Command* cc = GetCommand(cmd);
+    if (!cc)
+        return NULL;
 
-	static IConsole_Command::TStatus stat;
-	cc->Status				( stat );
-	return					stat;
+    static IConsole_Command::TStatus stat;
+    cc->Status(stat);
+    return stat;
 }
 
-LPCSTR CConsole::GetToken( LPCSTR cmd ) const
+LPCSTR CConsole::GetToken(LPCSTR cmd) const
 {
-	return GetString( cmd );
+    return GetString(cmd);
 }
 
-xr_token* CConsole::GetXRToken( LPCSTR cmd ) const
+xr_token* CConsole::GetXRToken(LPCSTR cmd) const
 {
-	IConsole_Command* cc	= GetCommand(cmd);
-	
-	CCC_Token* cf			= dynamic_cast<CCC_Token*>(cc);
-	if ( cf )
-	{
-		return cf->GetToken();
-	}
-	return					NULL;
+    IConsole_Command* cc = GetCommand(cmd);
+
+    CCC_Token* cf = dynamic_cast<CCC_Token*>(cc);
+    if (cf)
+    {
+        return cf->GetToken();
+    }
+    return NULL;
 }
 
-Fvector* CConsole::GetFVectorPtr( LPCSTR cmd ) const
+Fvector* CConsole::GetFVectorPtr(LPCSTR cmd) const
 {
-	IConsole_Command* cc	= GetCommand(cmd);
-	CCC_Vector3* cf			= dynamic_cast<CCC_Vector3*>(cc);
-	if ( cf )
-	{
-		return cf->GetValuePtr();
-	}
-	return					NULL;
+    IConsole_Command* cc = GetCommand(cmd);
+    CCC_Vector3* cf = dynamic_cast<CCC_Vector3*>(cc);
+    if (cf)
+    {
+        return cf->GetValuePtr();
+    }
+    return NULL;
 }
 
-Fvector CConsole::GetFVector( LPCSTR cmd ) const
+Fvector CConsole::GetFVector(LPCSTR cmd) const
 {
-	Fvector* pV = GetFVectorPtr( cmd );
-	if ( pV )
-	{
-		return *pV;
-	}
-	return Fvector().set( 0.0f, 0.0f, 0.0f );
+    Fvector* pV = GetFVectorPtr(cmd);
+    if (pV)
+    {
+        return *pV;
+    }
+    return Fvector().set(0.0f, 0.0f, 0.0f);
 }
diff --git a/src/xrEngine/Xr_input.cpp b/src/xrEngine/Xr_input.cpp
index 6ec37f0f61e..6ae01e538fc 100644
--- a/src/xrEngine/Xr_input.cpp
+++ b/src/xrEngine/Xr_input.cpp
@@ -6,576 +6,646 @@
 #include "../include/editor/ide.hpp"
 
 #ifndef _EDITOR
-#	include "xr_input_xinput.h"
+# include "xr_input_xinput.h"
 #endif
-CInput *	pInput	= NULL;
-IInputReceiver		dummyController;
+CInput* pInput = NULL;
+IInputReceiver dummyController;
 
-ENGINE_API float	psMouseSens			= 1.f;
-ENGINE_API float	psMouseSensScale	= 1.f;
-ENGINE_API Flags32	psMouseInvert		= {FALSE};
+ENGINE_API float psMouseSens = 1.f;
+ENGINE_API float psMouseSensScale = 1.f;
+ENGINE_API Flags32 psMouseInvert = {FALSE};
 
-float stop_vibration_time				= flt_max;
+float stop_vibration_time = flt_max;
 
-#define MOUSEBUFFERSIZE			64
-#define KEYBOARDBUFFERSIZE		64
-#define _KEYDOWN(name,key)		( name[key] & 0x80 )
+#define MOUSEBUFFERSIZE 64
+#define KEYBOARDBUFFERSIZE 64
+#define _KEYDOWN(name,key) ( name[key] & 0x80 )
 
-static bool g_exclusive	= true;
-static void on_error_dialog			(bool before)
+static bool g_exclusive = true;
+static void on_error_dialog(bool before)
 {
 #ifdef INGAME_EDITOR
-	if (Device.editor())
-		return;
+    if (Device.editor())
+        return;
 #endif // #ifdef INGAME_EDITOR
-	if (!pInput || !g_exclusive)
-		return;
+    if (!pInput || !g_exclusive)
+        return;
 
-	if (before) {
-		pInput->unacquire	();
-		return;
-	}
+    if (before)
+    {
+        pInput->unacquire();
+        return;
+    }
 
-	pInput->acquire			(true);
+    pInput->acquire(true);
 }
 
-CInput::CInput						( BOOL bExclusive, int deviceForInit)
+CInput::CInput(BOOL bExclusive, int deviceForInit)
 {
-	g_exclusive							= !!bExclusive;
+    g_exclusive = !!bExclusive;
 
-	Log("Starting INPUT device...");
+    Log("Starting INPUT device...");
 
-	pDI 								=	NULL;
-	pMouse								=	NULL;
-	pKeyboard							=	NULL;
+    pDI = NULL;
+    pMouse = NULL;
+    pKeyboard = NULL;
 
-	//=====================Mouse
-	mouse_property.mouse_dt				=	25;
+    //=====================Mouse
+    mouse_property.mouse_dt = 25;
 
-	ZeroMemory							( mouseState,	sizeof(mouseState) );
-	ZeroMemory							( KBState,		sizeof(KBState) );
-	ZeroMemory							( timeStamp,	sizeof(timeStamp) );
-	ZeroMemory							( timeSave,		sizeof(timeStamp) );
-	ZeroMemory							( offs,			sizeof(offs) );
+    ZeroMemory(mouseState, sizeof(mouseState));
+    ZeroMemory(KBState, sizeof(KBState));
+    ZeroMemory(timeStamp, sizeof(timeStamp));
+    ZeroMemory(timeSave, sizeof(timeStamp));
+    ZeroMemory(offs, sizeof(offs));
 
-	//===================== Dummy pack
-	iCapture	(&dummyController);
+    //===================== Dummy pack
+    iCapture(&dummyController);
 
-	if (!pDI) CHK_DX(DirectInput8Create( GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&pDI, NULL ));
+    if (!pDI) CHK_DX(DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&pDI, NULL));
 
-//.	u32 kb_input_flags = ((bExclusive)?DISCL_EXCLUSIVE:DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND;
-	u32 kb_input_flags = ((bExclusive)?DISCL_EXCLUSIVE:DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND;
-	
-//.	u32 mouse_input_flags = ((bExclusive)?DISCL_EXCLUSIVE:DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND | DISCL_NOWINKEY,
-	u32 mouse_input_flags = ((bExclusive)?DISCL_EXCLUSIVE:DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND | DISCL_NOWINKEY;
+    //. u32 kb_input_flags = ((bExclusive)?DISCL_EXCLUSIVE:DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND;
+    u32 kb_input_flags = ((bExclusive) ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND;
 
-	// KEYBOARD
-	if (deviceForInit & keyboard_device_key)
-		CHK_DX(CreateInputDevice(
-		&pKeyboard, 	GUID_SysKeyboard, 	&c_dfDIKeyboard,
-		kb_input_flags,
-		KEYBOARDBUFFERSIZE ));
+    //. u32 mouse_input_flags = ((bExclusive)?DISCL_EXCLUSIVE:DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND | DISCL_NOWINKEY,
+    u32 mouse_input_flags = ((bExclusive) ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND | DISCL_NOWINKEY;
 
-	// MOUSE
-	if (deviceForInit & mouse_device_key)
-		CHK_DX(CreateInputDevice(
-		&pMouse,		GUID_SysMouse,		&c_dfDIMouse2,
-		mouse_input_flags,
-		MOUSEBUFFERSIZE ));
+    // KEYBOARD
+    if (deviceForInit & keyboard_device_key)
+        CHK_DX(CreateInputDevice(
+                   &pKeyboard, GUID_SysKeyboard, &c_dfDIKeyboard,
+                   kb_input_flags,
+                   KEYBOARDBUFFERSIZE));
 
-	Debug.set_on_dialog				(&on_error_dialog);
+    // MOUSE
+    if (deviceForInit & mouse_device_key)
+        CHK_DX(CreateInputDevice(
+                   &pMouse, GUID_SysMouse, &c_dfDIMouse2,
+                   mouse_input_flags,
+                   MOUSEBUFFERSIZE));
+
+    Debug.set_on_dialog(&on_error_dialog);
 
 #ifdef ENGINE_BUILD
-	Device.seqAppActivate.Add		(this);
-	Device.seqAppDeactivate.Add		(this, REG_PRIORITY_HIGH);
-	Device.seqFrame.Add				(this, REG_PRIORITY_HIGH);
+    Device.seqAppActivate.Add(this);
+    Device.seqAppDeactivate.Add(this, REG_PRIORITY_HIGH);
+    Device.seqFrame.Add(this, REG_PRIORITY_HIGH);
 #endif
 }
 
 CInput::~CInput(void)
 {
 #ifdef ENGINE_BUILD
-	Device.seqFrame.Remove			(this);
-	Device.seqAppDeactivate.Remove	(this);
-	Device.seqAppActivate.Remove	(this);
+    Device.seqFrame.Remove(this);
+    Device.seqAppDeactivate.Remove(this);
+    Device.seqAppActivate.Remove(this);
 #endif
-	//_______________________
-
-	// Unacquire and release the device's interfaces
-	if( pMouse ){
-		pMouse->Unacquire();
-		_RELEASE	(pMouse);
-	}
-
-	if( pKeyboard ){
-		pKeyboard->Unacquire();
-		_RELEASE	(pKeyboard);
-	}
-
-	_SHOW_REF	("Input: ",pDI);
-	_RELEASE	(pDI);
+    //_______________________
+
+    // Unacquire and release the device's interfaces
+    if (pMouse)
+    {
+        pMouse->Unacquire();
+        _RELEASE(pMouse);
+    }
+
+    if (pKeyboard)
+    {
+        pKeyboard->Unacquire();
+        _RELEASE(pKeyboard);
+    }
+
+    _SHOW_REF("Input: ", pDI);
+    _RELEASE(pDI);
 }
 
 //-----------------------------------------------------------------------------
 // Name: CreateInputDevice()
 // Desc: Create a DirectInput device.
 //-----------------------------------------------------------------------------
-HRESULT CInput::CreateInputDevice( LPDIRECTINPUTDEVICE8* device, GUID guidDevice, const DIDATAFORMAT* pdidDataFormat, u32 dwFlags, u32 buf_size )
+HRESULT CInput::CreateInputDevice(LPDIRECTINPUTDEVICE8* device, GUID guidDevice, const DIDATAFORMAT* pdidDataFormat, u32 dwFlags, u32 buf_size)
 {
-	// Obtain an interface to the input device
-//.	CHK_DX( pDI->CreateDeviceEx( guidDevice, IID_IDirectInputDevice8, (void**)device, NULL ) );
-	CHK_DX( pDI->CreateDevice( guidDevice, /*IID_IDirectInputDevice8,*/ device, NULL ) );
+    // Obtain an interface to the input device
+    //. CHK_DX( pDI->CreateDeviceEx( guidDevice, IID_IDirectInputDevice8, (void**)device, NULL ) );
+    CHK_DX(pDI->CreateDevice(guidDevice, /*IID_IDirectInputDevice8,*/ device, NULL));
 
-	// Set the device data format. Note: a data format specifies which
-	// controls on a device we are interested in, and how they should be
-	// reported.
-	CHK_DX((*device)->SetDataFormat( pdidDataFormat ) );
+    // Set the device data format. Note: a data format specifies which
+    // controls on a device we are interested in, and how they should be
+    // reported.
+    CHK_DX((*device)->SetDataFormat(pdidDataFormat));
 
-	// Set the cooperativity level to let DirectInput know how this device
-	// should interact with the system and with other DirectInput applications.
+    // Set the cooperativity level to let DirectInput know how this device
+    // should interact with the system and with other DirectInput applications.
 #ifdef INGAME_EDITOR
-	if (!Device.editor())
+    if (!Device.editor())
 #endif // #ifdef INGAME_EDITOR
-	{
-		HRESULT	_hr = (*device)->SetCooperativeLevel( RDEVICE.m_hWnd, dwFlags );
-		if (FAILED(_hr) && (_hr==E_NOTIMPL)) Msg("! INPUT: Can't set coop level. Emulation???");
-		else R_CHK(_hr);
-	}
-
-	// setup the buffer size for the keyboard data
-	DIPROPDWORD				dipdw;
-	dipdw.diph.dwSize		= sizeof(DIPROPDWORD);
-	dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-	dipdw.diph.dwObj		= 0;
-	dipdw.diph.dwHow		= DIPH_DEVICE;
-	dipdw.dwData			= buf_size;
-
-	CHK_DX( (*device)->SetProperty( DIPROP_BUFFERSIZE, &dipdw.diph ) );
-
-	return S_OK;
+    {
+        HRESULT _hr = (*device)->SetCooperativeLevel(RDEVICE.m_hWnd, dwFlags);
+        if (FAILED(_hr) && (_hr == E_NOTIMPL)) Msg("! INPUT: Can't set coop level. Emulation???");
+        else R_CHK(_hr);
+    }
+
+    // setup the buffer size for the keyboard data
+    DIPROPDWORD dipdw;
+    dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+    dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+    dipdw.diph.dwObj = 0;
+    dipdw.diph.dwHow = DIPH_DEVICE;
+    dipdw.dwData = buf_size;
+
+    CHK_DX((*device)->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph));
+
+    return S_OK;
 }
 
 //-----------------------------------------------------------------------
 
-void CInput::SetAllAcquire( BOOL bAcquire )
+void CInput::SetAllAcquire(BOOL bAcquire)
 {
-	if (pMouse)		bAcquire ? pMouse->Acquire() 	: pMouse->Unacquire();
-	if (pKeyboard)	bAcquire ? pKeyboard->Acquire()	: pKeyboard->Unacquire();
+    if (pMouse) bAcquire ? pMouse->Acquire() : pMouse->Unacquire();
+    if (pKeyboard) bAcquire ? pKeyboard->Acquire() : pKeyboard->Unacquire();
 }
 
-void CInput::SetMouseAcquire( BOOL bAcquire )
+void CInput::SetMouseAcquire(BOOL bAcquire)
 {
-	if (pMouse)		bAcquire ? pMouse->Acquire() : pMouse->Unacquire();
+    if (pMouse) bAcquire ? pMouse->Acquire() : pMouse->Unacquire();
 }
-void CInput::SetKBDAcquire( BOOL bAcquire )
+void CInput::SetKBDAcquire(BOOL bAcquire)
 {
-	if (pKeyboard)	bAcquire ? pKeyboard->Acquire()	: pKeyboard->Unacquire();
+    if (pKeyboard) bAcquire ? pKeyboard->Acquire() : pKeyboard->Unacquire();
 }
 //-----------------------------------------------------------------------
 BOOL b_altF4 = FALSE;
-void CInput::KeyUpdate	( )
+void CInput::KeyUpdate()
 {
-	if(b_altF4)					return;
-
-	HRESULT						hr;
-	DWORD dwElements			= KEYBOARDBUFFERSIZE;
-	DIDEVICEOBJECTDATA			od[KEYBOARDBUFFERSIZE];
-	DWORD key					= 0;
-
-	VERIFY(pKeyboard);
-
-	hr = pKeyboard->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0 );
-	if (( hr == DIERR_INPUTLOST )||( hr == DIERR_NOTACQUIRED ))
-	{
-		hr = pKeyboard->Acquire();
-		if ( hr != S_OK ) 
-			return;
-
-		hr = pKeyboard->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0 );
-		if ( hr != S_OK ) 
-			return;
-	}
-
-	bool b_dik_pause_was_pressed = false;
-	for (u32 idx = 0; idx < dwElements; idx++)
-	{
-		if(od[idx].dwOfs==DIK_PAUSE)
-		{
-			if( od[idx].dwData & 0x80 )
-				b_dik_pause_was_pressed = true;
-		
-			if(b_dik_pause_was_pressed && !(od[idx].dwData & 0x80) )
-			{
-				od[idx].uAppData = 666;
-				continue; //skip one-frame pause key on-off switch
-			}
-		}
-		KBState[od[idx].dwOfs]		= od[idx].dwData & 0x80;
-	}
+    if (b_altF4) return;
+
+    HRESULT hr;
+    DWORD dwElements = KEYBOARDBUFFERSIZE;
+    DIDEVICEOBJECTDATA od[KEYBOARDBUFFERSIZE];
+    DWORD key = 0;
+
+    VERIFY(pKeyboard);
+
+    hr = pKeyboard->GetDeviceData(sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0);
+    if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
+    {
+        hr = pKeyboard->Acquire();
+        if (hr != S_OK)
+            return;
+
+        hr = pKeyboard->GetDeviceData(sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0);
+        if (hr != S_OK)
+            return;
+    }
+
+    bool b_dik_pause_was_pressed = false;
+    for (u32 idx = 0; idx < dwElements; idx++)
+    {
+        if (od[idx].dwOfs == DIK_PAUSE)
+        {
+            if (od[idx].dwData & 0x80)
+                b_dik_pause_was_pressed = true;
+
+            if (b_dik_pause_was_pressed && !(od[idx].dwData & 0x80))
+            {
+                od[idx].uAppData = 666;
+                continue; //skip one-frame pause key on-off switch
+            }
+        }
+        KBState[od[idx].dwOfs] = od[idx].dwData & 0x80;
+    }
 
 #ifndef _EDITOR
-	bool b_alt_tab				= false;
+    bool b_alt_tab = false;
 
-	if(!b_altF4 && KBState[DIK_F4] && (KBState[DIK_RMENU] || KBState[DIK_LMENU]) )
-	{
-		b_altF4				= TRUE;
-		Engine.Event.Defer	("KERNEL:disconnect");
-		Engine.Event.Defer	("KERNEL:quit");
-	}
+    if (!b_altF4 && KBState[DIK_F4] && (KBState[DIK_RMENU] || KBState[DIK_LMENU]))
+    {
+        b_altF4 = TRUE;
+        Engine.Event.Defer("KERNEL:disconnect");
+        Engine.Event.Defer("KERNEL:quit");
+    }
 
 
 #endif
-	if(b_altF4)					return;
-
-	#ifndef _EDITOR
-   	if(Device.dwPrecacheFrame==0)
-	#endif
-	{
-
-		for (u32 i = 0; i < dwElements; i++)
-		{
-			if(od[i].uAppData == 666) //ignored action
-				continue;
-
-			key					= od[i].dwOfs;
-			if(od[i].dwData & 0x80)
-				cbStack.back()->IR_OnKeyboardPress	( key );
-			else
-			{
-				cbStack.back()->IR_OnKeyboardRelease	( key );
-	#ifndef _EDITOR
-				if(key==DIK_TAB  && (iGetAsyncKeyState(DIK_RMENU) || iGetAsyncKeyState(DIK_LMENU)) )
-					b_alt_tab = true;
-	#endif
-			}
-		}
-
-		for ( i = 0; i < COUNT_KB_BUTTONS; i++ )
-			if (KBState[i]) 
-				cbStack.back()->IR_OnKeyboardHold( i );
-	}
+    if (b_altF4) return;
 
 #ifndef _EDITOR
-	if(b_alt_tab)
-		SendMessage(Device.m_hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
+    if (Device.dwPrecacheFrame == 0)
 #endif
-/*
+    {
+
+        for (u32 i = 0; i < dwElements; i++)
+        {
+            if (od[i].uAppData == 666) //ignored action
+                continue;
+
+            key = od[i].dwOfs;
+            if (od[i].dwData & 0x80)
+                cbStack.back()->IR_OnKeyboardPress(key);
+            else
+            {
+                cbStack.back()->IR_OnKeyboardRelease(key);
 #ifndef _EDITOR
-//update xinput if exist
-    for( DWORD iUserIndex=0; iUserIndex<DXUT_MAX_CONTROLLERS; iUserIndex++ )
-	{
-        DXUTGetGamepadState( iUserIndex, &g_GamePads[iUserIndex], true, false );
-
-        if( !g_GamePads[iUserIndex].bConnected )
-            continue; // unplugged?
-
-		bool new_b, old_b;
-		new_b = !!(g_GamePads[iUserIndex].wPressedButtons & XINPUT_GAMEPAD_A);
-		old_b = !!(g_GamePads[iUserIndex].wLastButtons & XINPUT_GAMEPAD_A);
-
-		if(new_b != old_b)
-		{
-			if(old_b)
-				cbStack.back()->IR_OnMousePress(0);
-			else
-				cbStack.back()->IR_OnMouseRelease(0);
-		}
-		int dx,dy;
-		dx = iFloor(g_GamePads[iUserIndex].fThumbRX*6);
-		dy = iFloor(g_GamePads[iUserIndex].fThumbRY*6);
-		if(dx || dy)
-			cbStack.back()->IR_OnMouseMove	( dx, dy );
-	}
-
-	if(Device.fTimeGlobal > stop_vibration_time)
-	{
-		stop_vibration_time		= flt_max;
-		set_vibration			(0, 0);
-	}
-//xinput
+                if (key == DIK_TAB && (iGetAsyncKeyState(DIK_RMENU) || iGetAsyncKeyState(DIK_LMENU)))
+                    b_alt_tab = true;
+#endif
+            }
+        }
+
+        for (i = 0; i < COUNT_KB_BUTTONS; i++)
+            if (KBState[i])
+                cbStack.back()->IR_OnKeyboardHold(i);
+    }
+
+#ifndef _EDITOR
+    if (b_alt_tab)
+        SendMessage(Device.m_hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
 #endif
-*/
+    /*
+    #ifndef _EDITOR
+    //update xinput if exist
+    for( DWORD iUserIndex=0; iUserIndex<DXUT_MAX_CONTROLLERS; iUserIndex++ )
+    {
+    DXUTGetGamepadState( iUserIndex, &g_GamePads[iUserIndex], true, false );
+
+    if( !g_GamePads[iUserIndex].bConnected )
+    continue; // unplugged?
+
+    bool new_b, old_b;
+    new_b = !!(g_GamePads[iUserIndex].wPressedButtons & XINPUT_GAMEPAD_A);
+    old_b = !!(g_GamePads[iUserIndex].wLastButtons & XINPUT_GAMEPAD_A);
+
+    if(new_b != old_b)
+    {
+    if(old_b)
+    cbStack.back()->IR_OnMousePress(0);
+    else
+    cbStack.back()->IR_OnMouseRelease(0);
+    }
+    int dx,dy;
+    dx = iFloor(g_GamePads[iUserIndex].fThumbRX*6);
+    dy = iFloor(g_GamePads[iUserIndex].fThumbRY*6);
+    if(dx || dy)
+    cbStack.back()->IR_OnMouseMove ( dx, dy );
+    }
+
+    if(Device.fTimeGlobal > stop_vibration_time)
+    {
+    stop_vibration_time = flt_max;
+    set_vibration (0, 0);
+    }
+    //xinput
+    #endif
+    */
 }
 bool CInput::get_dik_name(int dik, LPSTR dest_str, int dest_sz)
 {
-	DIPROPSTRING keyname;
-	keyname.diph.dwSize			= sizeof(DIPROPSTRING);
-	keyname.diph.dwHeaderSize	= sizeof(DIPROPHEADER);
-	keyname.diph.dwObj			= static_cast<DWORD>(dik);
-	keyname.diph.dwHow			= DIPH_BYOFFSET;
-	HRESULT hr = pKeyboard->GetProperty(DIPROP_KEYNAME, &keyname.diph);
-	if(FAILED(hr))
-		return false;
-
-	const wchar_t* wct			= keyname.wsz;
-	if(0==wcslen(wct))
-		return					false;
-	
-	int cnt						= WideCharToMultiByte(CP_ACP,0,keyname.wsz,-1,dest_str,dest_sz,NULL,NULL);
-	if(cnt==-1)
-	{
-		Msg("! cant convert dik_name for dik[%d], prop=[%S]", dik, keyname.wsz);
-		return					false;
-	}
-	return						(cnt!=-1);
+    DIPROPSTRING keyname;
+    keyname.diph.dwSize = sizeof(DIPROPSTRING);
+    keyname.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+    keyname.diph.dwObj = static_cast<DWORD>(dik);
+    keyname.diph.dwHow = DIPH_BYOFFSET;
+    HRESULT hr = pKeyboard->GetProperty(DIPROP_KEYNAME, &keyname.diph);
+    if (FAILED(hr))
+        return false;
+
+    const wchar_t* wct = keyname.wsz;
+    if (0 == wcslen(wct))
+        return false;
+
+    int cnt = WideCharToMultiByte(CP_ACP, 0, keyname.wsz, -1, dest_str, dest_sz, NULL, NULL);
+    if (cnt == -1)
+    {
+        Msg("! cant convert dik_name for dik[%d], prop=[%S]", dik, keyname.wsz);
+        return false;
+    }
+    return (cnt != -1);
 }
 
-#define MOUSE_1		(0xED + 100)
-#define MOUSE_8		(0xED + 107)
+#define MOUSE_1 (0xED + 100)
+#define MOUSE_8 (0xED + 107)
 
-BOOL CInput::iGetAsyncKeyState( int dik )
+BOOL CInput::iGetAsyncKeyState(int dik)
 {
-	if(dik<COUNT_KB_BUTTONS)
-		return !!KBState[dik];
-	else
-	if(dik>=MOUSE_1 && dik<=MOUSE_8)
-	{
-		int mk = dik-MOUSE_1;
-		return iGetAsyncBtnState(mk);
-	}else
-		return FALSE; //unknown key ???
+    if (dik < COUNT_KB_BUTTONS)
+        return !!KBState[dik];
+    else if (dik >= MOUSE_1 && dik <= MOUSE_8)
+    {
+        int mk = dik - MOUSE_1;
+        return iGetAsyncBtnState(mk);
+    }
+    else
+        return FALSE; //unknown key ???
 }
 
-BOOL CInput::iGetAsyncBtnState( int btn )
+BOOL CInput::iGetAsyncBtnState(int btn)
 {
-	return !!mouseState[btn];
+    return !!mouseState[btn];
 }
 
-void CInput::MouseUpdate( )
+void CInput::MouseUpdate()
 {
-	HRESULT hr;
-	DWORD dwElements	= MOUSEBUFFERSIZE;
-	DIDEVICEOBJECTDATA	od[MOUSEBUFFERSIZE];
-
-	VERIFY(pMouse);
-
-	hr = pMouse->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0 );
-	if (( hr == DIERR_INPUTLOST )||( hr == DIERR_NOTACQUIRED )){
-		hr = pMouse->Acquire();
-		if ( hr != S_OK ) return;
-		hr = pMouse->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0 );
-		if ( hr != S_OK ) return;
-	};
-
-	#ifndef _EDITOR
-	if(Device.dwPrecacheFrame)
-		return;
-    #endif
-	BOOL				mouse_prev[COUNT_MOUSE_BUTTONS];
-
-	mouse_prev[0]		= mouseState[0];
-	mouse_prev[1]		= mouseState[1];
-	mouse_prev[2]		= mouseState[2];
-	mouse_prev[3]		= mouseState[3];
-	mouse_prev[4]		= mouseState[4];
-	mouse_prev[5]		= mouseState[5];
-	mouse_prev[6]		= mouseState[6];
-	mouse_prev[7]		= mouseState[7];
-
-	offs[0] = offs[1] = offs[2] = 0;
-	for (u32 i = 0; i < dwElements; i++){
-		switch (od[i].dwOfs){
-		case DIMOFS_X:	offs[0]	+= od[i].dwData; timeStamp[0] = od[i].dwTimeStamp;	break;
-		case DIMOFS_Y:	offs[1]	+= od[i].dwData; timeStamp[1] = od[i].dwTimeStamp;	break;
-		case DIMOFS_Z:	offs[2]	+= od[i].dwData; timeStamp[2] = od[i].dwTimeStamp;	break;
-		case DIMOFS_BUTTON0:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[0] = TRUE;				cbStack.back()->IR_OnMousePress(0);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[0] = FALSE;			cbStack.back()->IR_OnMouseRelease(0);	}
-			break;
-		case DIMOFS_BUTTON1:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[1] = TRUE;				cbStack.back()->IR_OnMousePress(1);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[1] = FALSE;			cbStack.back()->IR_OnMouseRelease(1);	}
-			break;
-		case DIMOFS_BUTTON2:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[2] = TRUE;				cbStack.back()->IR_OnMousePress(2);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[2] = FALSE;			cbStack.back()->IR_OnMouseRelease(2);	}
-			break;
-		case DIMOFS_BUTTON3:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[3] = TRUE;				cbStack.back()->IR_OnKeyboardPress(0xED + 103);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[3] = FALSE;			cbStack.back()->IR_OnKeyboardRelease(0xED + 103);	}
-			break;
-		case DIMOFS_BUTTON4:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[4] = TRUE;				cbStack.back()->IR_OnKeyboardPress(0xED + 104);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[4] = FALSE;			cbStack.back()->IR_OnKeyboardRelease(0xED + 104);	}
-			break;
-		case DIMOFS_BUTTON5:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[5] = TRUE;				cbStack.back()->IR_OnKeyboardPress(0xED + 105);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[5] = FALSE;			cbStack.back()->IR_OnKeyboardRelease(0xED + 105);	}
-			break;
-		case DIMOFS_BUTTON6:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[6] = TRUE;				cbStack.back()->IR_OnKeyboardPress(0xED + 106);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[6] = FALSE;			cbStack.back()->IR_OnKeyboardRelease(0xED + 106);	}
-			break;
-		case DIMOFS_BUTTON7:
-			if ( od[i].dwData & 0x80 )	
-			{ mouseState[7] = TRUE;				cbStack.back()->IR_OnKeyboardPress(0xED + 107);		}
-			if ( !(od[i].dwData & 0x80))
-			{ mouseState[7] = FALSE;			cbStack.back()->IR_OnKeyboardRelease(0xED + 107);	}
-			break;
-		}
-	}
-
-	if (mouseState[0] && mouse_prev[0])
-	{
-		cbStack.back()->IR_OnMouseHold(0);
-	}
-
-	if (mouseState[1] && mouse_prev[1])		
-	{
-		cbStack.back()->IR_OnMouseHold(1);
-	}
-
-	if (mouseState[2] && mouse_prev[2])		
-	{
-		cbStack.back()->IR_OnMouseHold(2);
-	}
-	if ( dwElements ){
-		if (offs[0] || offs[1]) cbStack.back()->IR_OnMouseMove	( offs[0], offs[1] );
-		if (offs[2])			cbStack.back()->IR_OnMouseWheel	( offs[2] );
-	} else {
-		if (timeStamp[1] && ((dwCurTime-timeStamp[1])>=mouse_property.mouse_dt))	cbStack.back()->IR_OnMouseStop(DIMOFS_Y, timeStamp[1] = 0);
-		if (timeStamp[0] && ((dwCurTime-timeStamp[0])>=mouse_property.mouse_dt))	cbStack.back()->IR_OnMouseStop(DIMOFS_X, timeStamp[0] = 0);
-	}
+    HRESULT hr;
+    DWORD dwElements = MOUSEBUFFERSIZE;
+    DIDEVICEOBJECTDATA od[MOUSEBUFFERSIZE];
+
+    VERIFY(pMouse);
+
+    hr = pMouse->GetDeviceData(sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0);
+    if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
+    {
+        hr = pMouse->Acquire();
+        if (hr != S_OK) return;
+        hr = pMouse->GetDeviceData(sizeof(DIDEVICEOBJECTDATA), &od[0], &dwElements, 0);
+        if (hr != S_OK) return;
+    };
+
+#ifndef _EDITOR
+    if (Device.dwPrecacheFrame)
+        return;
+#endif
+    BOOL mouse_prev[COUNT_MOUSE_BUTTONS];
+
+    mouse_prev[0] = mouseState[0];
+    mouse_prev[1] = mouseState[1];
+    mouse_prev[2] = mouseState[2];
+    mouse_prev[3] = mouseState[3];
+    mouse_prev[4] = mouseState[4];
+    mouse_prev[5] = mouseState[5];
+    mouse_prev[6] = mouseState[6];
+    mouse_prev[7] = mouseState[7];
+
+    offs[0] = offs[1] = offs[2] = 0;
+    for (u32 i = 0; i < dwElements; i++)
+    {
+        switch (od[i].dwOfs)
+        {
+        case DIMOFS_X:
+            offs[0] += od[i].dwData;
+            timeStamp[0] = od[i].dwTimeStamp;
+            break;
+        case DIMOFS_Y:
+            offs[1] += od[i].dwData;
+            timeStamp[1] = od[i].dwTimeStamp;
+            break;
+        case DIMOFS_Z:
+            offs[2] += od[i].dwData;
+            timeStamp[2] = od[i].dwTimeStamp;
+            break;
+        case DIMOFS_BUTTON0:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[0] = TRUE;
+                cbStack.back()->IR_OnMousePress(0);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[0] = FALSE;
+                cbStack.back()->IR_OnMouseRelease(0);
+            }
+            break;
+        case DIMOFS_BUTTON1:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[1] = TRUE;
+                cbStack.back()->IR_OnMousePress(1);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[1] = FALSE;
+                cbStack.back()->IR_OnMouseRelease(1);
+            }
+            break;
+        case DIMOFS_BUTTON2:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[2] = TRUE;
+                cbStack.back()->IR_OnMousePress(2);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[2] = FALSE;
+                cbStack.back()->IR_OnMouseRelease(2);
+            }
+            break;
+        case DIMOFS_BUTTON3:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[3] = TRUE;
+                cbStack.back()->IR_OnKeyboardPress(0xED + 103);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[3] = FALSE;
+                cbStack.back()->IR_OnKeyboardRelease(0xED + 103);
+            }
+            break;
+        case DIMOFS_BUTTON4:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[4] = TRUE;
+                cbStack.back()->IR_OnKeyboardPress(0xED + 104);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[4] = FALSE;
+                cbStack.back()->IR_OnKeyboardRelease(0xED + 104);
+            }
+            break;
+        case DIMOFS_BUTTON5:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[5] = TRUE;
+                cbStack.back()->IR_OnKeyboardPress(0xED + 105);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[5] = FALSE;
+                cbStack.back()->IR_OnKeyboardRelease(0xED + 105);
+            }
+            break;
+        case DIMOFS_BUTTON6:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[6] = TRUE;
+                cbStack.back()->IR_OnKeyboardPress(0xED + 106);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[6] = FALSE;
+                cbStack.back()->IR_OnKeyboardRelease(0xED + 106);
+            }
+            break;
+        case DIMOFS_BUTTON7:
+            if (od[i].dwData & 0x80)
+            {
+                mouseState[7] = TRUE;
+                cbStack.back()->IR_OnKeyboardPress(0xED + 107);
+            }
+            if (!(od[i].dwData & 0x80))
+            {
+                mouseState[7] = FALSE;
+                cbStack.back()->IR_OnKeyboardRelease(0xED + 107);
+            }
+            break;
+        }
+    }
+
+    if (mouseState[0] && mouse_prev[0])
+    {
+        cbStack.back()->IR_OnMouseHold(0);
+    }
+
+    if (mouseState[1] && mouse_prev[1])
+    {
+        cbStack.back()->IR_OnMouseHold(1);
+    }
+
+    if (mouseState[2] && mouse_prev[2])
+    {
+        cbStack.back()->IR_OnMouseHold(2);
+    }
+    if (dwElements)
+    {
+        if (offs[0] || offs[1]) cbStack.back()->IR_OnMouseMove(offs[0], offs[1]);
+        if (offs[2]) cbStack.back()->IR_OnMouseWheel(offs[2]);
+    }
+    else
+    {
+        if (timeStamp[1] && ((dwCurTime - timeStamp[1]) >= mouse_property.mouse_dt)) cbStack.back()->IR_OnMouseStop(DIMOFS_Y, timeStamp[1] = 0);
+        if (timeStamp[0] && ((dwCurTime - timeStamp[0]) >= mouse_property.mouse_dt)) cbStack.back()->IR_OnMouseStop(DIMOFS_X, timeStamp[0] = 0);
+    }
 }
 
 //-------------------------------------------------------
-void CInput::iCapture(IInputReceiver *p)
+void CInput::iCapture(IInputReceiver* p)
 {
-	VERIFY(p);
-	if (pMouse) 	MouseUpdate();
-    if (pKeyboard) 	KeyUpdate();
+    VERIFY(p);
+    if (pMouse) MouseUpdate();
+    if (pKeyboard) KeyUpdate();
 
     // change focus
-	if (!cbStack.empty())
-		cbStack.back()->IR_OnDeactivate();
-	cbStack.push_back(p);
-	cbStack.back()->IR_OnActivate();
-
-	// prepare for _new_ controller
-	ZeroMemory			( timeStamp,	sizeof(timeStamp) );
-	ZeroMemory			( timeSave,		sizeof(timeStamp) );
-	ZeroMemory			( offs,			sizeof(offs) );
+    if (!cbStack.empty())
+        cbStack.back()->IR_OnDeactivate();
+    cbStack.push_back(p);
+    cbStack.back()->IR_OnActivate();
+
+    // prepare for _new_ controller
+    ZeroMemory(timeStamp, sizeof(timeStamp));
+    ZeroMemory(timeSave, sizeof(timeStamp));
+    ZeroMemory(offs, sizeof(offs));
 }
 
-void CInput::iRelease(IInputReceiver *p)
+void CInput::iRelease(IInputReceiver* p)
 {
-	if (p == cbStack.back())
-	{
-		cbStack.back()->IR_OnDeactivate();
-		cbStack.pop_back();
-		IInputReceiver * ir = cbStack.back();
-		ir->IR_OnActivate();
-	}else{// we are not topmost receiver, so remove the nearest one
-		u32 cnt = cbStack.size();
-		for(;cnt>0;--cnt)
-			if( cbStack[cnt-1] == p ){
-				xr_vector<IInputReceiver*>::iterator it = cbStack.begin();
-				std::advance	(it,cnt-1);
-				cbStack.erase	(it);
-				break;
-			}
-	}
+    if (p == cbStack.back())
+    {
+        cbStack.back()->IR_OnDeactivate();
+        cbStack.pop_back();
+        IInputReceiver* ir = cbStack.back();
+        ir->IR_OnActivate();
+    }
+    else
+    {
+        // we are not topmost receiver, so remove the nearest one
+        u32 cnt = cbStack.size();
+        for (; cnt > 0; --cnt)
+            if (cbStack[cnt - 1] == p)
+            {
+                xr_vector<IInputReceiver*>::iterator it = cbStack.begin();
+                std::advance(it, cnt - 1);
+                cbStack.erase(it);
+                break;
+            }
+    }
 }
 
-void CInput::OnAppActivate		(void)
+void CInput::OnAppActivate(void)
 {
-	if (CurrentIR())
-		CurrentIR()->IR_OnActivate();
-
-	SetAllAcquire	( true );
-	ZeroMemory		( mouseState,	sizeof(mouseState) );
-	ZeroMemory		( KBState,		sizeof(KBState) );
-	ZeroMemory		( timeStamp,	sizeof(timeStamp) );
-	ZeroMemory		( timeSave,		sizeof(timeStamp) );
-	ZeroMemory		( offs,			sizeof(offs) );
+    if (CurrentIR())
+        CurrentIR()->IR_OnActivate();
+
+    SetAllAcquire(true);
+    ZeroMemory(mouseState, sizeof(mouseState));
+    ZeroMemory(KBState, sizeof(KBState));
+    ZeroMemory(timeStamp, sizeof(timeStamp));
+    ZeroMemory(timeSave, sizeof(timeStamp));
+    ZeroMemory(offs, sizeof(offs));
 }
 
-void CInput::OnAppDeactivate	(void)
+void CInput::OnAppDeactivate(void)
 {
-	if (CurrentIR())
-		CurrentIR()->IR_OnDeactivate();
-
-	SetAllAcquire	( false );
-	ZeroMemory		( mouseState,	sizeof(mouseState) );
-	ZeroMemory		( KBState,		sizeof(KBState) );
-	ZeroMemory		( timeStamp,	sizeof(timeStamp) );
-	ZeroMemory		( timeSave,		sizeof(timeStamp) );
-	ZeroMemory		( offs,			sizeof(offs) );
+    if (CurrentIR())
+        CurrentIR()->IR_OnDeactivate();
+
+    SetAllAcquire(false);
+    ZeroMemory(mouseState, sizeof(mouseState));
+    ZeroMemory(KBState, sizeof(KBState));
+    ZeroMemory(timeStamp, sizeof(timeStamp));
+    ZeroMemory(timeSave, sizeof(timeStamp));
+    ZeroMemory(offs, sizeof(offs));
 }
 
-void CInput::OnFrame			(void)
+void CInput::OnFrame(void)
 {
-	RDEVICE.Statistic->Input.Begin			();
-	dwCurTime		= RDEVICE.TimerAsync_MMT	();
-	if (pKeyboard)	KeyUpdate				();
-	if (pMouse)		MouseUpdate				();
-	RDEVICE.Statistic->Input.End			();
+    RDEVICE.Statistic->Input.Begin();
+    dwCurTime = RDEVICE.TimerAsync_MMT();
+    if (pKeyboard) KeyUpdate();
+    if (pMouse) MouseUpdate();
+    RDEVICE.Statistic->Input.End();
 }
 
-IInputReceiver*	 CInput::CurrentIR()
+IInputReceiver* CInput::CurrentIR()
 {
-	if(cbStack.size())
-		return cbStack.back();
-	else
-		return NULL;
+    if (cbStack.size())
+        return cbStack.back();
+    else
+        return NULL;
 }
 
-void CInput::unacquire				()
+void CInput::unacquire()
 {
-	pKeyboard->Unacquire			();
-	pMouse->Unacquire				();
+    pKeyboard->Unacquire();
+    pMouse->Unacquire();
 }
 
-void CInput::acquire				(const bool &exclusive)
+void CInput::acquire(const bool& exclusive)
 {
-	pKeyboard->SetCooperativeLevel	(
+    pKeyboard->SetCooperativeLevel(
 #ifdef INGAME_EDITOR
-		Device.editor() ? Device.editor()->main_handle() : 
+        Device.editor() ? Device.editor()->main_handle() :
 #endif // #ifdef INGAME_EDITOR
-		RDEVICE.m_hWnd,
-		(exclusive ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND
-	);
-	pKeyboard->Acquire				();
+        RDEVICE.m_hWnd,
+        (exclusive ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND
+    );
+    pKeyboard->Acquire();
 
-	pMouse->SetCooperativeLevel		(
+    pMouse->SetCooperativeLevel(
 #ifdef INGAME_EDITOR
-		Device.editor() ? Device.editor()->main_handle() :
+        Device.editor() ? Device.editor()->main_handle() :
 #endif // #ifdef INGAME_EDITOR
-		RDEVICE.m_hWnd,
-		(exclusive ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND | DISCL_NOWINKEY
-	);
-	pMouse->Acquire					();
+        RDEVICE.m_hWnd,
+        (exclusive ? DISCL_EXCLUSIVE : DISCL_NONEXCLUSIVE) | DISCL_FOREGROUND | DISCL_NOWINKEY
+    );
+    pMouse->Acquire();
 }
 
-void CInput::exclusive_mode			(const bool &exclusive)
+void CInput::exclusive_mode(const bool& exclusive)
 {
-	g_exclusive						= exclusive;
-	unacquire						();
-	acquire							(exclusive);
+    g_exclusive = exclusive;
+    unacquire();
+    acquire(exclusive);
 }
-bool CInput::get_exclusive_mode		()
+bool CInput::get_exclusive_mode()
 {
-	return g_exclusive;
+    return g_exclusive;
 }
 
-void  CInput::feedback(u16 s1, u16 s2, float time)
+void CInput::feedback(u16 s1, u16 s2, float time)
 {
-	stop_vibration_time = RDEVICE.fTimeGlobal + time;
+    stop_vibration_time = RDEVICE.fTimeGlobal + time;
 #ifndef _EDITOR
-//.	set_vibration (s1, s2);
+    //. set_vibration (s1, s2);
 #endif
 }
diff --git a/src/xrEngine/_d3d_extensions.h b/src/xrEngine/_d3d_extensions.h
index dc48487ffd8..284aa502be2 100644
--- a/src/xrEngine/_d3d_extensions.h
+++ b/src/xrEngine/_d3d_extensions.h
@@ -2,38 +2,39 @@
 #define _D3D_EXT_internal
 
 #ifndef NO_XR_LIGHT
-struct Flight 
+struct Flight
 {
 public:
-    u32           type;             /* Type of light source */
-    Fcolor          diffuse;          /* Diffuse color of light */
-    Fcolor          specular;         /* Specular color of light */
-    Fcolor          ambient;          /* Ambient color of light */
-    Fvector         position;         /* Position in world space */
-    Fvector         direction;        /* Direction in world space */
-    float		    range;            /* Cutoff range */
-    float	        falloff;          /* Falloff */
-    float	        attenuation0;     /* Constant attenuation */
-    float	        attenuation1;     /* Linear attenuation */
-    float	        attenuation2;     /* Quadratic attenuation */
-    float	        theta;            /* Inner angle of spotlight cone */
-    float	        phi;              /* Outer angle of spotlight cone */
+    u32 type; /* Type of light source */
+    Fcolor diffuse; /* Diffuse color of light */
+    Fcolor specular; /* Specular color of light */
+    Fcolor ambient; /* Ambient color of light */
+    Fvector position; /* Position in world space */
+    Fvector direction; /* Direction in world space */
+    float range; /* Cutoff range */
+    float falloff; /* Falloff */
+    float attenuation0; /* Constant attenuation */
+    float attenuation1; /* Linear attenuation */
+    float attenuation2; /* Quadratic attenuation */
+    float theta; /* Inner angle of spotlight cone */
+    float phi; /* Outer angle of spotlight cone */
 
-	IC	void		set	(u32 ltType, float x, float y, float z)
-	{
-		ZeroMemory( this, sizeof(Flight) );
-		type=ltType;
-		diffuse.set(1.0f, 1.0f, 1.0f, 1.0f);
-		specular.set(diffuse);
-		position.set(x,y,z);
-		direction.set(x,y,z);
-		direction.normalize_safe();
-		range= _sqrt(flt_max);
-	}
-    IC	void		mul		(float brightness){
-	    diffuse.mul_rgb		(brightness);
-    	ambient.mul_rgb		(brightness);
-	    specular.mul_rgb	(brightness);
+    IC void set(u32 ltType, float x, float y, float z)
+    {
+        ZeroMemory(this, sizeof(Flight));
+        type = ltType;
+        diffuse.set(1.0f, 1.0f, 1.0f, 1.0f);
+        specular.set(diffuse);
+        position.set(x, y, z);
+        direction.set(x, y, z);
+        direction.normalize_safe();
+        range = _sqrt(flt_max);
+    }
+    IC void mul(float brightness)
+    {
+        diffuse.mul_rgb(brightness);
+        ambient.mul_rgb(brightness);
+        specular.mul_rgb(brightness);
     }
 };
 
@@ -49,43 +50,43 @@ struct Flight
 struct Fmaterial
 {
 public:
-    Fcolor			diffuse;        /* Diffuse color RGBA */
-    Fcolor			ambient;        /* Ambient color RGB */
-    Fcolor		    specular;       /* Specular 'shininess' */
-    Fcolor			emissive;       /* Emissive color RGB */
-    float			power;          /* Sharpness if specular highlight */
+    Fcolor diffuse; /* Diffuse color RGBA */
+    Fcolor ambient; /* Ambient color RGB */
+    Fcolor specular; /* Specular 'shininess' */
+    Fcolor emissive; /* Emissive color RGB */
+    float power; /* Sharpness if specular highlight */
 
-	IC	void		set	(float r, float g, float b)
-	{
-		ZeroMemory	(this, sizeof(Fmaterial));
-		diffuse.r = ambient.r = r;
-		diffuse.g = ambient.g = g;
-		diffuse.b = ambient.b = b;
-		diffuse.a = ambient.a = 1.0f;
-		power	  = 0;
-	}
-	IC	void	set(float r, float g, float b, float a)
-	{
-		ZeroMemory	(this, sizeof(Fmaterial));
-		diffuse.r = ambient.r = r;
-		diffuse.g = ambient.g = g;
-		diffuse.b = ambient.b = b;
-		diffuse.a = ambient.a = a;
-		power	  = 0;
-	}
-	IC	void	set	(Fcolor &c)
-	{
-		ZeroMemory	( this, sizeof(Fmaterial) );
-		diffuse.r = ambient.r = c.r;
-		diffuse.g = ambient.g = c.g;
-		diffuse.b = ambient.b = c.b;
-		diffuse.a = ambient.a = c.a;
-		power	  = 0;
-	}
+    IC void set(float r, float g, float b)
+    {
+        ZeroMemory(this, sizeof(Fmaterial));
+        diffuse.r = ambient.r = r;
+        diffuse.g = ambient.g = g;
+        diffuse.b = ambient.b = b;
+        diffuse.a = ambient.a = 1.0f;
+        power = 0;
+    }
+    IC void set(float r, float g, float b, float a)
+    {
+        ZeroMemory(this, sizeof(Fmaterial));
+        diffuse.r = ambient.r = r;
+        diffuse.g = ambient.g = g;
+        diffuse.b = ambient.b = b;
+        diffuse.a = ambient.a = a;
+        power = 0;
+    }
+    IC void set(Fcolor& c)
+    {
+        ZeroMemory(this, sizeof(Fmaterial));
+        diffuse.r = ambient.r = c.r;
+        diffuse.g = ambient.g = c.g;
+        diffuse.b = ambient.b = c.b;
+        diffuse.a = ambient.a = c.a;
+        power = 0;
+    }
 };
 
 /*
-#if sizeof(Fmaterial)!=sizeof(D3DMATERIAL9) 
+#if sizeof(Fmaterial)!=sizeof(D3DMATERIAL9)
 #error Different structure size
 #endif
 */
@@ -93,28 +94,28 @@ struct Fmaterial
 #endif
 
 #ifndef NO_XR_VDECLARATOR
-struct	VDeclarator	: public svector<D3DVERTEXELEMENT9, MAXD3DDECLLENGTH+1>
+struct VDeclarator : public svector < D3DVERTEXELEMENT9, MAXD3DDECLLENGTH + 1 >
 {
-	void	set		(u32 FVF)
-	{
-		D3DXDeclaratorFromFVF	(FVF,begin());
-		resize					(D3DXGetDeclLength(begin())+1);
-	}
-	void	set		(D3DVERTEXELEMENT9* dcl)
-	{
-		resize					(D3DXGetDeclLength(dcl)+1);
-		CopyMemory				(begin(),dcl,size()*sizeof(D3DVERTEXELEMENT9));
-	}
-	void	set		(const VDeclarator& d)
-	{
-		*this		= d;
-	}
-	u32		vertex	()				{ return D3DXGetDeclVertexSize(begin(),0);	}
-	BOOL	equal	(VDeclarator& d)
-	{
-		if (size()!=d.size())	return false;
-		else					return 0==memcmp(begin(),d.begin(),size()*sizeof(D3DVERTEXELEMENT9));
-	}
+    void set(u32 FVF)
+    {
+        D3DXDeclaratorFromFVF(FVF, begin());
+        resize(D3DXGetDeclLength(begin()) + 1);
+    }
+    void set(D3DVERTEXELEMENT9* dcl)
+    {
+        resize(D3DXGetDeclLength(dcl) + 1);
+        CopyMemory(begin(), dcl, size()*sizeof(D3DVERTEXELEMENT9));
+    }
+    void set(const VDeclarator& d)
+    {
+        *this = d;
+    }
+    u32 vertex() { return D3DXGetDeclVertexSize(begin(), 0); }
+    BOOL equal(VDeclarator& d)
+    {
+        if (size() != d.size()) return false;
+        else return 0 == memcmp(begin(), d.begin(), size()*sizeof(D3DVERTEXELEMENT9));
+    }
 };
 #endif
 
diff --git a/src/xrEngine/_scripting.cpp b/src/xrEngine/_scripting.cpp
index a35a8e38cc3..c74db5fb72b 100644
--- a/src/xrEngine/_scripting.cpp
+++ b/src/xrEngine/_scripting.cpp
@@ -1,10 +1,11 @@
 #include "stdafx.h"
 
 // Dima needs this because we have to exclude option /EHsc (exception handling) from the project
-namespace boost {
-//	void  throw_exception(const std::exception &A)
-//	{
-//		Debug.fatal(DEBUG_INFO,"Boost exception raised");
-//	}
+namespace boost
+{
+// void throw_exception(const std::exception &A)
+// {
+// Debug.fatal(DEBUG_INFO,"Boost exception raised");
+// }
 };
 
diff --git a/src/xrEngine/ai_script_lua_debug.cpp b/src/xrEngine/ai_script_lua_debug.cpp
index bbe10beb067..7a4612c50aa 100644
--- a/src/xrEngine/ai_script_lua_debug.cpp
+++ b/src/xrEngine/ai_script_lua_debug.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: ai_script_lua_debug.cpp
-//	Created 	: 19.09.2003
-//  Modified 	: 19.09.2003
-//	Author		: Dmitriy Iassenev
-//	Description : XRay Script debugging system
+// Module : ai_script_lua_debug.cpp
+// Created : 19.09.2003
+// Modified : 19.09.2003
+// Author : Dmitriy Iassenev
+// Description : XRay Script debugging system
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -12,117 +12,139 @@
 
 using namespace Script;
 
-bool Script::bfPrintOutput(CLuaVirtualMachine *tpLuaVirtualMachine, LPCSTR caScriptFileName, int iErorCode)
+bool Script::bfPrintOutput(CLuaVirtualMachine* tpLuaVirtualMachine, LPCSTR caScriptFileName, int iErorCode)
 {
-	for (int i=-1; ; --i)
-		if (lua_isstring(tpLuaVirtualMachine,i)) {
-			LPCSTR	S = lua_tostring(tpLuaVirtualMachine,i);
-			if (!xr_strcmp(S,"cannot resume dead coroutine")) {
-				LuaOut	(Lua::eLuaMessageTypeInfo,"Script %s is finished",caScriptFileName);
-				return	(true);
-			}
-			else {
-				if (!i && !iErorCode)
-					LuaOut	(Lua::eLuaMessageTypeInfo,"Output from %s",caScriptFileName);
-				LuaOut	(iErorCode ? Lua::eLuaMessageTypeError : Lua::eLuaMessageTypeMessage,"%s",S);
-			}
-		}
-		else {
-			for ( i=0; ; ++i)
-				if (lua_isstring(tpLuaVirtualMachine,i)) {
-					LPCSTR	S = lua_tostring(tpLuaVirtualMachine,i);
-					if (!xr_strcmp(S,"cannot resume dead coroutine")) {
-						LuaOut	(Lua::eLuaMessageTypeInfo,"Script %s is finished",caScriptFileName);
-						return	(true);
-					}
-					else {
-						if (!i && !iErorCode)
-							LuaOut	(Lua::eLuaMessageTypeInfo,"Output from %s",caScriptFileName);
-						LuaOut	(iErorCode ? Lua::eLuaMessageTypeError : Lua::eLuaMessageTypeMessage,"%s",S);
-					}
-				}
-				else
-					return		(false);
-		}
+    for (int i = -1;; --i)
+        if (lua_isstring(tpLuaVirtualMachine, i))
+        {
+            LPCSTR S = lua_tostring(tpLuaVirtualMachine, i);
+            if (!xr_strcmp(S, "cannot resume dead coroutine"))
+            {
+                LuaOut(Lua::eLuaMessageTypeInfo, "Script %s is finished", caScriptFileName);
+                return (true);
+            }
+            else
+            {
+                if (!i && !iErorCode)
+                    LuaOut(Lua::eLuaMessageTypeInfo, "Output from %s", caScriptFileName);
+                LuaOut(iErorCode ? Lua::eLuaMessageTypeError : Lua::eLuaMessageTypeMessage, "%s", S);
+            }
+        }
+        else
+        {
+            for (i = 0;; ++i)
+                if (lua_isstring(tpLuaVirtualMachine, i))
+                {
+                    LPCSTR S = lua_tostring(tpLuaVirtualMachine, i);
+                    if (!xr_strcmp(S, "cannot resume dead coroutine"))
+                    {
+                        LuaOut(Lua::eLuaMessageTypeInfo, "Script %s is finished", caScriptFileName);
+                        return (true);
+                    }
+                    else
+                    {
+                        if (!i && !iErorCode)
+                            LuaOut(Lua::eLuaMessageTypeInfo, "Output from %s", caScriptFileName);
+                        LuaOut(iErorCode ? Lua::eLuaMessageTypeError : Lua::eLuaMessageTypeMessage, "%s", S);
+                    }
+                }
+                else
+                    return (false);
+        }
 }
 
-void Script::vfPrintError(CLuaVirtualMachine *tpLuaVirtualMachine, int iErrorCode)
+void Script::vfPrintError(CLuaVirtualMachine* tpLuaVirtualMachine, int iErrorCode)
 {
-	switch (iErrorCode) {
-		case LUA_ERRRUN : {
-			Msg ("! SCRIPT RUNTIME ERROR");
-			break;
-		}
-		case LUA_ERRMEM : {
-			Msg ("! SCRIPT ERROR (memory allocation)");
-			break;
-		}
-		case LUA_ERRERR : {
-			Msg ("! SCRIPT ERROR (while running the error handler function)");
-			break;
-		}
-		case LUA_ERRFILE : {
-			Msg ("! SCRIPT ERROR (while running file)");
-			break;
-		}
-		case LUA_ERRSYNTAX : {
-			Msg ("! SCRIPT SYNTAX ERROR");
-			break;
-		}
-		default : NODEFAULT;
-	}
-	
-	for (int i=0; ; ++i) {
-		Msg		("! Stack level %d",i);
-		if (!bfListLevelVars(tpLuaVirtualMachine,i))
-			return;
-	}
+    switch (iErrorCode)
+    {
+    case LUA_ERRRUN:
+    {
+        Msg("! SCRIPT RUNTIME ERROR");
+        break;
+    }
+    case LUA_ERRMEM:
+    {
+        Msg("! SCRIPT ERROR (memory allocation)");
+        break;
+    }
+    case LUA_ERRERR:
+    {
+        Msg("! SCRIPT ERROR (while running the error handler function)");
+        break;
+    }
+    case LUA_ERRFILE:
+    {
+        Msg("! SCRIPT ERROR (while running file)");
+        break;
+    }
+    case LUA_ERRSYNTAX:
+    {
+        Msg("! SCRIPT SYNTAX ERROR");
+        break;
+    }
+    default:
+        NODEFAULT;
+    }
+
+    for (int i = 0;; ++i)
+    {
+        Msg("! Stack level %d", i);
+        if (!bfListLevelVars(tpLuaVirtualMachine, i))
+            return;
+    }
 }
 
 LPCSTR Script::cafEventToString(int iEventCode)
 {
-	switch (iEventCode) {
-		case LUA_HOOKCALL		: return("hook call");
-		case LUA_HOOKRET		: return("hook return");
-		case LUA_HOOKLINE		: return("hook line");
-		case LUA_HOOKCOUNT		: return("hook count");
-		case LUA_HOOKTAILRET	: return("hook tail return");
-		default					: NODEFAULT;
-	}
+    switch (iEventCode)
+    {
+    case LUA_HOOKCALL:
+        return("hook call");
+    case LUA_HOOKRET:
+        return("hook return");
+    case LUA_HOOKLINE:
+        return("hook line");
+    case LUA_HOOKCOUNT:
+        return("hook count");
+    case LUA_HOOKTAILRET:
+        return("hook tail return");
+    default:
+        NODEFAULT;
+    }
 #ifdef DEBUG
-	return(0);
+    return(0);
 #endif
 }
 
-bool Script::bfListLevelVars(CLuaVirtualMachine *tpLuaVirtualMachine, int iStackLevel)
+bool Script::bfListLevelVars(CLuaVirtualMachine* tpLuaVirtualMachine, int iStackLevel)
 {
-//	lua_Debug	l_tDebugInfo;
-//	int			i;
-//	const char	*name;
-//
-//	if (lua_getstack(tpLuaVirtualMachine, iStackLevel, &l_tDebugInfo) == 0)
-//		return	(false);  /* failure: no such level in the stack */
-//	Msg			("  Event			: %d",cafEventToString(l_tDebugInfo.event));
-//	Msg			("  Name			: %s",l_tDebugInfo.name);
-//	Msg			("  Name what		: %s",l_tDebugInfo.namewhat);
-//	Msg			("  What			: %s",l_tDebugInfo.what);
-//	Msg			("  Source			: %s",l_tDebugInfo.source);
-//	Msg			("  Source (short)	: %s",l_tDebugInfo.short_src);
-//	Msg			("  Current line	: %d",l_tDebugInfo.currentline);
-//	Msg			("  Nups			: %d",l_tDebugInfo.nups);
-//	Msg			("  Line defined	: %d",l_tDebugInfo.linedefined);
-//	i			= 1;
-//	while (NULL != (name = lua_getlocal(tpLuaVirtualMachine, &l_tDebugInfo, i++))) {
-//		Msg		("    local   %d %s", i-1, name);
-//		lua_pop	(tpLuaVirtualMachine, 1);  /* remove variable value */
-//	}
-//
-//	lua_getinfo	(tpLuaVirtualMachine, "f", &l_tDebugInfo);  /* retrieves function */
-//	i = 1;
-//	while (NULL != (name = lua_getupvalue(tpLuaVirtualMachine, -1, i++))) {
-//		Msg		("    upvalue %d %s", i-1, name);
-//		lua_pop	(tpLuaVirtualMachine, 1);  /* remove upvalue value */
-//	}
-//	return		(true);
-	return		(false);
+    // lua_Debug l_tDebugInfo;
+    // int i;
+    // const char *name;
+    //
+    // if (lua_getstack(tpLuaVirtualMachine, iStackLevel, &l_tDebugInfo) == 0)
+    // return (false); /* failure: no such level in the stack */
+    // Msg (" Event : %d",cafEventToString(l_tDebugInfo.event));
+    // Msg (" Name : %s",l_tDebugInfo.name);
+    // Msg (" Name what : %s",l_tDebugInfo.namewhat);
+    // Msg (" What : %s",l_tDebugInfo.what);
+    // Msg (" Source : %s",l_tDebugInfo.source);
+    // Msg (" Source (short) : %s",l_tDebugInfo.short_src);
+    // Msg (" Current line : %d",l_tDebugInfo.currentline);
+    // Msg (" Nups : %d",l_tDebugInfo.nups);
+    // Msg (" Line defined : %d",l_tDebugInfo.linedefined);
+    // i = 1;
+    // while (NULL != (name = lua_getlocal(tpLuaVirtualMachine, &l_tDebugInfo, i++))) {
+    // Msg (" local %d %s", i-1, name);
+    // lua_pop (tpLuaVirtualMachine, 1); /* remove variable value */
+    // }
+    //
+    // lua_getinfo (tpLuaVirtualMachine, "f", &l_tDebugInfo); /* retrieves function */
+    // i = 1;
+    // while (NULL != (name = lua_getupvalue(tpLuaVirtualMachine, -1, i++))) {
+    // Msg (" upvalue %d %s", i-1, name);
+    // lua_pop (tpLuaVirtualMachine, 1); /* remove upvalue value */
+    // }
+    // return (true);
+    return (false);
 }
diff --git a/src/xrEngine/ai_script_lua_extension.cpp b/src/xrEngine/ai_script_lua_extension.cpp
index 8a3568182c7..33e68d01e6a 100644
--- a/src/xrEngine/ai_script_lua_extension.cpp
+++ b/src/xrEngine/ai_script_lua_extension.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: ai_script_lua_extension.cpp
-//	Created 	: 19.09.2003
-//  Modified 	: 19.09.2003
-//	Author		: Dmitriy Iassenev
-//	Description : XRay Script extensions
+// Module : ai_script_lua_extension.cpp
+// Created : 19.09.2003
+// Modified : 19.09.2003
+// Author : Dmitriy Iassenev
+// Description : XRay Script extensions
 ////////////////////////////////////////////////////////////////////////////
 
 #include <stdarg.h>
@@ -13,22 +13,22 @@
 
 #ifdef XRRENDER_R4_EXPORTS
 #define ENGINE_BUILD
-#endif	//	XRRENDER_R4_EXPORTS
+#endif // XRRENDER_R4_EXPORTS
 
 #ifdef XRRENDER_R3_EXPORTS
 #define ENGINE_BUILD
-#endif	//	XRRENDER_R3_EXPORTS
+#endif // XRRENDER_R3_EXPORTS
 
 #ifdef XRRENDER_R2_EXPORTS
 #define ENGINE_BUILD
-#endif	//	XRRENDER_R2_EXPORTS
+#endif // XRRENDER_R2_EXPORTS
 
 #ifdef XRRENDER_R1_EXPORTS
 #define ENGINE_BUILD
-#endif	//	XRRENDER_R1_EXPORTS
+#endif // XRRENDER_R1_EXPORTS
 
 #ifndef ENGINE_BUILD
-	#include "ai_space.h"
+#include "ai_space.h"
 #endif
 
 using namespace Script;
@@ -36,411 +36,442 @@ using namespace Script;
 int __cdecl Lua::LuaOut(Lua::ELuaMessageType tLuaMessageType, LPCSTR caFormat, ...)
 {
 #ifndef ENGINE_BUILD
-	if (!psAI_Flags.test(aiLua))
-		return(0);
+    if (!psAI_Flags.test(aiLua))
+        return(0);
 #endif
 
-	LPCSTR		S = "", SS = "";
-	LPSTR		S1;
-	string4096	S2;
-	switch (tLuaMessageType) {
-		case Lua::eLuaMessageTypeInfo : {
-			S	= "* [LUA] ";
-			SS	= "[INFO]        ";
-			break;
-		}
-		case Lua::eLuaMessageTypeError : {
-			S	= "! [LUA] ";
-			SS	= "[ERROR]       ";
-			break;
-		}
-		case Lua::eLuaMessageTypeMessage : {
-			S	= "[LUA] ";
-			SS	= "[MESSAGE]     ";
-			break;
-		}
-		case Lua::eLuaMessageTypeHookCall : {
-			S	= "[LUA][HOOK_CALL] ";
-			SS	= "[CALL]        ";
-			break;
-		}
-		case Lua::eLuaMessageTypeHookReturn : {
-			S	= "[LUA][HOOK_RETURN] ";
-			SS	= "[RETURN]      ";
-			break;
-		}
-		case Lua::eLuaMessageTypeHookLine : {
-			S	= "[LUA][HOOK_LINE] ";
-			SS	= "[LINE]        ";
-			break;
-		}
-		case Lua::eLuaMessageTypeHookCount : {
-			S	= "[LUA][HOOK_COUNT] ";
-			SS	= "[COUNT]       ";
-			break;
-		}
-		case Lua::eLuaMessageTypeHookTailReturn : {
-			S	= "[LUA][HOOK_TAIL_RETURN] ";
-			SS	= "[TAIL_RETURN] ";
-			break;
-		}
-		default : NODEFAULT;
-	}
-	
-	va_list	l_tMarker;
-	
-	va_start(l_tMarker,caFormat);
-
-	xr_strcpy	(S2,S);
-	S1		= S2 + xr_strlen(S);
-	int		l_iResult = vsprintf(S1,caFormat,l_tMarker);
-	Msg		("%s",S2);
-	
-	xr_strcpy	(S2,SS);
-	S1		= S2 + xr_strlen(SS);
-	vsprintf(S1,caFormat,l_tMarker);
+    LPCSTR S = "", SS = "";
+    LPSTR S1;
+    string4096 S2;
+    switch (tLuaMessageType)
+    {
+    case Lua::eLuaMessageTypeInfo:
+    {
+        S = "* [LUA] ";
+        SS = "[INFO] ";
+        break;
+    }
+    case Lua::eLuaMessageTypeError:
+    {
+        S = "! [LUA] ";
+        SS = "[ERROR] ";
+        break;
+    }
+    case Lua::eLuaMessageTypeMessage:
+    {
+        S = "[LUA] ";
+        SS = "[MESSAGE] ";
+        break;
+    }
+    case Lua::eLuaMessageTypeHookCall:
+    {
+        S = "[LUA][HOOK_CALL] ";
+        SS = "[CALL] ";
+        break;
+    }
+    case Lua::eLuaMessageTypeHookReturn:
+    {
+        S = "[LUA][HOOK_RETURN] ";
+        SS = "[RETURN] ";
+        break;
+    }
+    case Lua::eLuaMessageTypeHookLine:
+    {
+        S = "[LUA][HOOK_LINE] ";
+        SS = "[LINE] ";
+        break;
+    }
+    case Lua::eLuaMessageTypeHookCount:
+    {
+        S = "[LUA][HOOK_COUNT] ";
+        SS = "[COUNT] ";
+        break;
+    }
+    case Lua::eLuaMessageTypeHookTailReturn:
+    {
+        S = "[LUA][HOOK_TAIL_RETURN] ";
+        SS = "[TAIL_RETURN] ";
+        break;
+    }
+    default:
+        NODEFAULT;
+    }
+
+    va_list l_tMarker;
+
+    va_start(l_tMarker, caFormat);
+
+    xr_strcpy(S2, S);
+    S1 = S2 + xr_strlen(S);
+    int l_iResult = vsprintf(S1, caFormat, l_tMarker);
+    Msg("%s", S2);
+
+    xr_strcpy(S2, SS);
+    S1 = S2 + xr_strlen(SS);
+    vsprintf(S1, caFormat, l_tMarker);
 
 #ifdef ENGINE_BUILD
-	// Msg("[LUA Output] : %s",S2);
+    // Msg("[LUA Output] : %s",S2);
 #else
-	ai().lua_output().w_string(S2);
+    ai().lua_output().w_string(S2);
 #endif
 
-	va_end	(l_tMarker);
+    va_end(l_tMarker);
 
-	return	(l_iResult);
+    return (l_iResult);
 }
 
 #ifndef ENGINE_BUILD
-void Script::vfLoadStandardScripts(CLuaVirtualMachine *tpLuaVM)
+void Script::vfLoadStandardScripts(CLuaVirtualMachine* tpLuaVM)
 {
-	string256		S,S1;
-	FS.update_path	(S,"$game_data$","script.ltx");
-	CInifile		*l_tpIniFile = xr_new<CInifile>(S);
-	R_ASSERT		(l_tpIniFile);
-	LPCSTR			caScriptString = l_tpIniFile->r_string("common","script");
-
-	u32				caNamespaceName = _GetItemCount(caScriptString);
-	string256		I;
-	for (u32 i=0; i<caNamespaceName; ++i) {
-		FS.update_path(S,"$game_scripts$",strconcat(S1,_GetItem(caScriptString,i,I),".script"));
-		bfLoadFile	(tpLuaVM,S,true);
-		if (bfIsObjectPresent(tpLuaVM,"_G",xr_strcat(I,"_initialize"),LUA_TFUNCTION))
-			lua_dostring(tpLuaVM,xr_strcat(I,"()"));
-	}
-	xr_delete		(l_tpIniFile);
+    string256 S, S1;
+    FS.update_path(S, "$game_data$", "script.ltx");
+    CInifile* l_tpIniFile = xr_new<CInifile>(S);
+    R_ASSERT(l_tpIniFile);
+    LPCSTR caScriptString = l_tpIniFile->r_string("common", "script");
+
+    u32 caNamespaceName = _GetItemCount(caScriptString);
+    string256 I;
+    for (u32 i = 0; i < caNamespaceName; ++i)
+    {
+        FS.update_path(S, "$game_scripts$", strconcat(S1, _GetItem(caScriptString, i, I), ".script"));
+        bfLoadFile(tpLuaVM, S, true);
+        if (bfIsObjectPresent(tpLuaVM, "_G", xr_strcat(I, "_initialize"), LUA_TFUNCTION))
+            lua_dostring(tpLuaVM, xr_strcat(I, "()"));
+    }
+    xr_delete(l_tpIniFile);
 }
 
 void LuaError(lua_State* L)
 {
-	Debug.fatal(DEBUG_INFO,"LUA error: %s",lua_tostring(L,-1));
+    Debug.fatal(DEBUG_INFO, "LUA error: %s", lua_tostring(L, -1));
 }
 
-void Script::vfExportToLua(CLuaVirtualMachine *tpLuaVM)
+void Script::vfExportToLua(CLuaVirtualMachine* tpLuaVM)
 {
-	luabind::open					(tpLuaVM);
-	luabind::set_error_callback		(LuaError);
-
-	lua_atpanic		(tpLuaVM,Script::LuaPanic);
-
-	vfExportGlobals				(tpLuaVM);
-	vfExportFvector				(tpLuaVM);
-	vfExportFmatrix				(tpLuaVM);
-	vfExportGame				(tpLuaVM);
-	vfExportLevel				(tpLuaVM);
-	vfExportDevice				(tpLuaVM);
-	vfExportParticles			(tpLuaVM);
-	vfExportSound				(tpLuaVM);
-	vfExportHit					(tpLuaVM);
-	vfExportActions				(tpLuaVM);
-	vfExportObject				(tpLuaVM);
-	vfExportEffector			(tpLuaVM);
-	vfExportArtifactMerger		(tpLuaVM);
-	vfExportMemoryObjects		(tpLuaVM);
-	vfExportActionManagement	(tpLuaVM);
-	vfExportMotivationManagement(tpLuaVM);
+    luabind::open(tpLuaVM);
+    luabind::set_error_callback(LuaError);
+
+    lua_atpanic(tpLuaVM, Script::LuaPanic);
+
+    vfExportGlobals(tpLuaVM);
+    vfExportFvector(tpLuaVM);
+    vfExportFmatrix(tpLuaVM);
+    vfExportGame(tpLuaVM);
+    vfExportLevel(tpLuaVM);
+    vfExportDevice(tpLuaVM);
+    vfExportParticles(tpLuaVM);
+    vfExportSound(tpLuaVM);
+    vfExportHit(tpLuaVM);
+    vfExportActions(tpLuaVM);
+    vfExportObject(tpLuaVM);
+    vfExportEffector(tpLuaVM);
+    vfExportArtifactMerger(tpLuaVM);
+    vfExportMemoryObjects(tpLuaVM);
+    vfExportActionManagement(tpLuaVM);
+    vfExportMotivationManagement(tpLuaVM);
 
 #ifdef DEBUG
-	lua_sethook					(tpLuaVM, LuaHookCall,	LUA_HOOKCALL | LUA_HOOKRET | LUA_HOOKLINE | LUA_HOOKTAILRET,	0);
+    lua_sethook(tpLuaVM, LuaHookCall, LUA_HOOKCALL | LUA_HOOKRET | LUA_HOOKLINE | LUA_HOOKTAILRET, 0);
 #endif
 
-	vfLoadStandardScripts		(tpLuaVM);
+    vfLoadStandardScripts(tpLuaVM);
 }
 
-bool Script::bfLoadFile(CLuaVirtualMachine *tpLuaVM, LPCSTR caScriptName, bool bCall)
+bool Script::bfLoadFile(CLuaVirtualMachine* tpLuaVM, LPCSTR caScriptName, bool bCall)
 {
-	string256		l_caNamespaceName;
-	_splitpath		(caScriptName,0,0,l_caNamespaceName,0);
-	if (!xr_strlen(l_caNamespaceName))
-		return		(bfLoadFileIntoNamespace(tpLuaVM,caScriptName,"_G",bCall));
-	else
-		return		(bfLoadFileIntoNamespace(tpLuaVM,caScriptName,l_caNamespaceName,bCall));
+    string256 l_caNamespaceName;
+    _splitpath(caScriptName, 0, 0, l_caNamespaceName, 0);
+    if (!xr_strlen(l_caNamespaceName))
+        return (bfLoadFileIntoNamespace(tpLuaVM, caScriptName, "_G", bCall));
+    else
+        return (bfLoadFileIntoNamespace(tpLuaVM, caScriptName, l_caNamespaceName, bCall));
 }
 #endif
 
-bool bfCreateNamespaceTable(CLuaVirtualMachine *tpLuaVM, LPCSTR caNamespaceName)
+bool bfCreateNamespaceTable(CLuaVirtualMachine* tpLuaVM, LPCSTR caNamespaceName)
 {
-	lua_pushstring	(tpLuaVM,"_G");
-	lua_gettable	(tpLuaVM,LUA_GLOBALSINDEX);
-	LPSTR			S2	= xr_strdup(caNamespaceName);
-	LPSTR			S	= S2;
-	for (;;) {
-		if (!xr_strlen(S)) {
-			lua_pop		(tpLuaVM,1);
-			LuaOut		(Lua::eLuaMessageTypeError,"the namespace name %s is incorrect!",caNamespaceName);
-			xr_free		(S2);
-			return		(false);
-		}
-		LPSTR			S1 = strchr(S,'.');
-		if (S1)
-			*S1				= 0;
-		lua_pushstring	(tpLuaVM,S);
-		lua_gettable	(tpLuaVM,-2);
-		if (lua_isnil(tpLuaVM,-1)) {
-			lua_pop			(tpLuaVM,1);
-			lua_newtable	(tpLuaVM);
-			lua_pushstring	(tpLuaVM,S);
-			lua_pushvalue	(tpLuaVM,-2);
-			lua_settable	(tpLuaVM,-4);
-		}
-		else
-			if (!lua_istable(tpLuaVM,-1)) {
-				xr_free			(S2);
-				lua_pop			(tpLuaVM,2);
-				LuaOut			(Lua::eLuaMessageTypeError,"the namespace name %s is already being used by the non-table object!",caNamespaceName);
-				return			(false);
-			}
-			lua_remove		(tpLuaVM,-2);
-			if (S1)
-				S			= ++S1;
-			else
-				break;
-	}
-	xr_free			(S2);
-	return			(true);
+    lua_pushstring(tpLuaVM, "_G");
+    lua_gettable(tpLuaVM, LUA_GLOBALSINDEX);
+    LPSTR S2 = xr_strdup(caNamespaceName);
+    LPSTR S = S2;
+    for (;;)
+    {
+        if (!xr_strlen(S))
+        {
+            lua_pop(tpLuaVM, 1);
+            LuaOut(Lua::eLuaMessageTypeError, "the namespace name %s is incorrect!", caNamespaceName);
+            xr_free(S2);
+            return (false);
+        }
+        LPSTR S1 = strchr(S, '.');
+        if (S1)
+            *S1 = 0;
+        lua_pushstring(tpLuaVM, S);
+        lua_gettable(tpLuaVM, -2);
+        if (lua_isnil(tpLuaVM, -1))
+        {
+            lua_pop(tpLuaVM, 1);
+            lua_newtable(tpLuaVM);
+            lua_pushstring(tpLuaVM, S);
+            lua_pushvalue(tpLuaVM, -2);
+            lua_settable(tpLuaVM, -4);
+        }
+        else if (!lua_istable(tpLuaVM, -1))
+        {
+            xr_free(S2);
+            lua_pop(tpLuaVM, 2);
+            LuaOut(Lua::eLuaMessageTypeError, "the namespace name %s is already being used by the non-table object!", caNamespaceName);
+            return (false);
+        }
+        lua_remove(tpLuaVM, -2);
+        if (S1)
+            S = ++S1;
+        else
+            break;
+    }
+    xr_free(S2);
+    return (true);
 }
 
-void vfCopyGlobals(CLuaVirtualMachine *tpLuaVM)
+void vfCopyGlobals(CLuaVirtualMachine* tpLuaVM)
 {
-	lua_newtable	(tpLuaVM);
-	lua_pushstring	(tpLuaVM,"_G");
-	lua_gettable	(tpLuaVM,LUA_GLOBALSINDEX);
-	lua_pushnil		(tpLuaVM);
-	while (lua_next(tpLuaVM, -2)) {
-		lua_pushvalue	(tpLuaVM,-2);
-		lua_pushvalue	(tpLuaVM,-2);
-		lua_settable	(tpLuaVM,-6);
-		lua_pop			(tpLuaVM, 1);
-	}
+    lua_newtable(tpLuaVM);
+    lua_pushstring(tpLuaVM, "_G");
+    lua_gettable(tpLuaVM, LUA_GLOBALSINDEX);
+    lua_pushnil(tpLuaVM);
+    while (lua_next(tpLuaVM, -2))
+    {
+        lua_pushvalue(tpLuaVM, -2);
+        lua_pushvalue(tpLuaVM, -2);
+        lua_settable(tpLuaVM, -6);
+        lua_pop(tpLuaVM, 1);
+    }
 }
 
-bool Script::bfLoadBuffer(CLuaVirtualMachine *tpLuaVM, LPCSTR caBuffer, size_t tSize, LPCSTR caScriptName, LPCSTR caNameSpaceName)
+bool Script::bfLoadBuffer(CLuaVirtualMachine* tpLuaVM, LPCSTR caBuffer, size_t tSize, LPCSTR caScriptName, LPCSTR caNameSpaceName)
 {
-	int				l_iErrorCode;
-	if (caNameSpaceName) {
-		string256		insert;
-		xr_sprintf		(insert,sizeof(insert),"local this = %s\n",caNameSpaceName);
-		size_t			str_len = xr_strlen(insert);
-		LPSTR			script = xr_alloc<char>(u32(str_len + tSize));
-		xr_strcpy		(script, str_len+tSize, insert);
-		CopyMemory		(script+str_len, caBuffer, u32(tSize));
-		l_iErrorCode	= luaL_loadbuffer(tpLuaVM,script,tSize + str_len,caScriptName);
-		xr_free			(script);
-	}
-	else
-		l_iErrorCode	= luaL_loadbuffer(tpLuaVM,caBuffer,tSize,caScriptName);
-
-	if (l_iErrorCode) {
+    int l_iErrorCode;
+    if (caNameSpaceName)
+    {
+        string256 insert;
+        xr_sprintf(insert, sizeof(insert), "local this = %s\n", caNameSpaceName);
+        size_t str_len = xr_strlen(insert);
+        LPSTR script = xr_alloc<char>(u32(str_len + tSize));
+        xr_strcpy(script, str_len + tSize, insert);
+        CopyMemory(script + str_len, caBuffer, u32(tSize));
+        l_iErrorCode = luaL_loadbuffer(tpLuaVM, script, tSize + str_len, caScriptName);
+        xr_free(script);
+    }
+    else
+        l_iErrorCode = luaL_loadbuffer(tpLuaVM, caBuffer, tSize, caScriptName);
+
+    if (l_iErrorCode)
+    {
 #ifdef DEBUG
-		if (!bfPrintOutput	(tpLuaVM,caScriptName,l_iErrorCode))
-			vfPrintError(tpLuaVM,l_iErrorCode);
+        if (!bfPrintOutput(tpLuaVM, caScriptName, l_iErrorCode))
+            vfPrintError(tpLuaVM, l_iErrorCode);
 #endif
-		return			(false);
-	}
-	return			(true);
+        return (false);
+    }
+    return (true);
 }
 
-bool bfDoFile(CLuaVirtualMachine *tpLuaVM, LPCSTR caScriptName, LPCSTR caNameSpaceName, bool bCall)
+bool bfDoFile(CLuaVirtualMachine* tpLuaVM, LPCSTR caScriptName, LPCSTR caNameSpaceName, bool bCall)
 {
-	string_path		l_caLuaFileName;
-	IReader			*l_tpFileReader = FS.r_open(caScriptName);
-	R_ASSERT		(l_tpFileReader);
-	strconcat		(sizeof(l_caLuaFileName),l_caLuaFileName,"@",caScriptName);
-	
-	if (!bfLoadBuffer(tpLuaVM,static_cast<LPCSTR>(l_tpFileReader->pointer()),(size_t)l_tpFileReader->length(),l_caLuaFileName,caNameSpaceName)) {
-		lua_pop			(tpLuaVM,4);
-		FS.r_close		(l_tpFileReader);
-		return		(false);
-	}
-	FS.r_close		(l_tpFileReader);
-
-	if (bCall) {
-		lua_call	(tpLuaVM,0,0);
-//		int			l_iErrorCode = lua_pcall(tpLuaVM,0,0,0);
-//		if (l_iErrorCode) {
-//#ifdef DEBUG
-//			bfPrintOutput	(tpLuaVM,caScriptName,l_iErrorCode);
-//			vfPrintError	(tpLuaVM,l_iErrorCode);
-//#endif
-//			return	(false);
-//		}
-	}
-	else
-		lua_insert		(tpLuaVM,-4);
-
-	return			(true);
+    string_path l_caLuaFileName;
+    IReader* l_tpFileReader = FS.r_open(caScriptName);
+    R_ASSERT(l_tpFileReader);
+    strconcat(sizeof(l_caLuaFileName), l_caLuaFileName, "@", caScriptName);
+
+    if (!bfLoadBuffer(tpLuaVM, static_cast<LPCSTR>(l_tpFileReader->pointer()), (size_t)l_tpFileReader->length(), l_caLuaFileName, caNameSpaceName))
+    {
+        lua_pop(tpLuaVM, 4);
+        FS.r_close(l_tpFileReader);
+        return (false);
+    }
+    FS.r_close(l_tpFileReader);
+
+    if (bCall)
+    {
+        lua_call(tpLuaVM, 0, 0);
+        // int l_iErrorCode = lua_pcall(tpLuaVM,0,0,0);
+        // if (l_iErrorCode) {
+        //#ifdef DEBUG
+        // bfPrintOutput (tpLuaVM,caScriptName,l_iErrorCode);
+        // vfPrintError (tpLuaVM,l_iErrorCode);
+        //#endif
+        // return (false);
+        // }
+    }
+    else
+        lua_insert(tpLuaVM, -4);
+
+    return (true);
 }
 
-void vfSetNamespace(CLuaVirtualMachine *tpLuaVM)
+void vfSetNamespace(CLuaVirtualMachine* tpLuaVM)
 {
-	lua_pushnil		(tpLuaVM);
-	while (lua_next(tpLuaVM, -2)) {
-		lua_pushvalue	(tpLuaVM,-2);
-		lua_gettable	(tpLuaVM,-5);
-		if (lua_isnil(tpLuaVM,-1)) {
-			lua_pop			(tpLuaVM,1);
-			lua_pushvalue	(tpLuaVM,-2);
-			lua_pushvalue	(tpLuaVM,-2);
-			lua_pushvalue	(tpLuaVM,-2);
-			lua_pushnil		(tpLuaVM);
-			lua_settable	(tpLuaVM,-7);
-			lua_settable	(tpLuaVM,-7);
-		}
-		else {
-			lua_pop			(tpLuaVM,1);
-			lua_pushvalue	(tpLuaVM,-2);
-			lua_gettable	(tpLuaVM,-4);
-			if (!lua_equal(tpLuaVM,-1,-2)) {
-				lua_pushvalue	(tpLuaVM,-3);
-				lua_pushvalue	(tpLuaVM,-2);
-				lua_pushvalue	(tpLuaVM,-2);
-				lua_pushvalue	(tpLuaVM,-5);
-				lua_settable	(tpLuaVM,-8);
-				lua_settable	(tpLuaVM,-8);
-			}
-			lua_pop			(tpLuaVM,1);
-		}
-		lua_pushvalue	(tpLuaVM,-2);
-		lua_pushnil		(tpLuaVM);
-		lua_settable	(tpLuaVM,-6);
-		lua_pop			(tpLuaVM, 1);
-	}
-	lua_pop			(tpLuaVM,3);
+    lua_pushnil(tpLuaVM);
+    while (lua_next(tpLuaVM, -2))
+    {
+        lua_pushvalue(tpLuaVM, -2);
+        lua_gettable(tpLuaVM, -5);
+        if (lua_isnil(tpLuaVM, -1))
+        {
+            lua_pop(tpLuaVM, 1);
+            lua_pushvalue(tpLuaVM, -2);
+            lua_pushvalue(tpLuaVM, -2);
+            lua_pushvalue(tpLuaVM, -2);
+            lua_pushnil(tpLuaVM);
+            lua_settable(tpLuaVM, -7);
+            lua_settable(tpLuaVM, -7);
+        }
+        else
+        {
+            lua_pop(tpLuaVM, 1);
+            lua_pushvalue(tpLuaVM, -2);
+            lua_gettable(tpLuaVM, -4);
+            if (!lua_equal(tpLuaVM, -1, -2))
+            {
+                lua_pushvalue(tpLuaVM, -3);
+                lua_pushvalue(tpLuaVM, -2);
+                lua_pushvalue(tpLuaVM, -2);
+                lua_pushvalue(tpLuaVM, -5);
+                lua_settable(tpLuaVM, -8);
+                lua_settable(tpLuaVM, -8);
+            }
+            lua_pop(tpLuaVM, 1);
+        }
+        lua_pushvalue(tpLuaVM, -2);
+        lua_pushnil(tpLuaVM);
+        lua_settable(tpLuaVM, -6);
+        lua_pop(tpLuaVM, 1);
+    }
+    lua_pop(tpLuaVM, 3);
 }
 
-bool Script::bfLoadFileIntoNamespace(CLuaVirtualMachine *tpLuaVM, LPCSTR caScriptName, LPCSTR caNamespaceName, bool bCall)
+bool Script::bfLoadFileIntoNamespace(CLuaVirtualMachine* tpLuaVM, LPCSTR caScriptName, LPCSTR caNamespaceName, bool bCall)
 {
-	if (!bfCreateNamespaceTable(tpLuaVM,caNamespaceName))
-		return		(false);
-	vfCopyGlobals	(tpLuaVM);
-	if (!bfDoFile(tpLuaVM,caScriptName,caNamespaceName,bCall))
-		return		(false);
-	vfSetNamespace	(tpLuaVM);
-	return			(true);
+    if (!bfCreateNamespaceTable(tpLuaVM, caNamespaceName))
+        return (false);
+    vfCopyGlobals(tpLuaVM);
+    if (!bfDoFile(tpLuaVM, caScriptName, caNamespaceName, bCall))
+        return (false);
+    vfSetNamespace(tpLuaVM);
+    return (true);
 }
 
-bool Script::bfGetNamespaceTable(CLuaVirtualMachine *tpLuaVM, LPCSTR N)
+bool Script::bfGetNamespaceTable(CLuaVirtualMachine* tpLuaVM, LPCSTR N)
 {
-	lua_pushstring 		(tpLuaVM,"_G"); 
-	lua_gettable 		(tpLuaVM,LUA_GLOBALSINDEX); 
-	string256			S2;	xr_strcpy	(S2,N);
-	LPSTR				S	= S2;
-	for (;;) { 
-		if (!xr_strlen(S)) return	(false); 
-		LPSTR S1 		= strchr(S,'.'); 
-		if (S1) 	*S1 = 0; 
-		lua_pushstring 	(tpLuaVM,S); 
-		lua_gettable 	(tpLuaVM,-2); 
-		if (lua_isnil(tpLuaVM,-1)) { 
-			lua_pop		(tpLuaVM,2); 
-			return		(false);	//	there is no namespace!
-		}
-		else 
-			if (!lua_istable(tpLuaVM,-1)) { 
-				lua_pop		(tpLuaVM,2); 
-				FATAL		(" Error : the namespace name is already being used by the non-table object!\n");
-				return		(false); 
-			} 
-			lua_remove	(tpLuaVM,-2); 
-			if (S1)		S = ++S1; 
-			else 		break; 
-	} 
-	return	(true); 
+    lua_pushstring(tpLuaVM, "_G");
+    lua_gettable(tpLuaVM, LUA_GLOBALSINDEX);
+    string256 S2;
+    xr_strcpy(S2, N);
+    LPSTR S = S2;
+    for (;;)
+    {
+        if (!xr_strlen(S)) return (false);
+        LPSTR S1 = strchr(S, '.');
+        if (S1) *S1 = 0;
+        lua_pushstring(tpLuaVM, S);
+        lua_gettable(tpLuaVM, -2);
+        if (lua_isnil(tpLuaVM, -1))
+        {
+            lua_pop(tpLuaVM, 2);
+            return (false); // there is no namespace!
+        }
+        else if (!lua_istable(tpLuaVM, -1))
+        {
+            lua_pop(tpLuaVM, 2);
+            FATAL(" Error : the namespace name is already being used by the non-table object!\n");
+            return (false);
+        }
+        lua_remove(tpLuaVM, -2);
+        if (S1) S = ++S1;
+        else break;
+    }
+    return (true);
 }
 
-CLuaVirtualMachine *Script::get_namespace_table(CLuaVirtualMachine *tpLuaVM, LPCSTR N)
+CLuaVirtualMachine* Script::get_namespace_table(CLuaVirtualMachine* tpLuaVM, LPCSTR N)
 {
-	if (!xr_strlen(N))
-		return				(tpLuaVM);
-	lua_pushstring 			(tpLuaVM,"_G"); 
-	lua_gettable 			(tpLuaVM,LUA_GLOBALSINDEX); 
-	string256				S2;
-	xr_strcpy					(S2,N);
-	LPSTR					S	= S2;
-	for (;;) { 
-		if (!xr_strlen(S))
-			return			(0); 
-		LPSTR				S1 = strchr(S,'.'); 
-		if (S1)
-			*S1				= 0; 
-		lua_pushstring 		(tpLuaVM,S); 
-		lua_gettable 		(tpLuaVM,-2); 
-		if (lua_isnil(tpLuaVM,-1)) { 
-			lua_pop			(tpLuaVM,2); 
-			return			(0);	//	there is no namespace!
-		}
-		else 
-			if (!lua_istable(tpLuaVM,-1)) { 
-				lua_pop		(tpLuaVM,2); 
-				FATAL		(" Error : the namespace name is already being used by the non-table object!\n");
-				return		(0); 
-			} 
-
-			lua_remove		(tpLuaVM,-2);
-
-			if (S1)
-				S			= ++S1; 
-			else
-				break; 
-	} 
-	return					(tpLuaVM); 
+    if (!xr_strlen(N))
+        return (tpLuaVM);
+    lua_pushstring(tpLuaVM, "_G");
+    lua_gettable(tpLuaVM, LUA_GLOBALSINDEX);
+    string256 S2;
+    xr_strcpy(S2, N);
+    LPSTR S = S2;
+    for (;;)
+    {
+        if (!xr_strlen(S))
+            return (0);
+        LPSTR S1 = strchr(S, '.');
+        if (S1)
+            *S1 = 0;
+        lua_pushstring(tpLuaVM, S);
+        lua_gettable(tpLuaVM, -2);
+        if (lua_isnil(tpLuaVM, -1))
+        {
+            lua_pop(tpLuaVM, 2);
+            return (0); // there is no namespace!
+        }
+        else if (!lua_istable(tpLuaVM, -1))
+        {
+            lua_pop(tpLuaVM, 2);
+            FATAL(" Error : the namespace name is already being used by the non-table object!\n");
+            return (0);
+        }
+
+        lua_remove(tpLuaVM, -2);
+
+        if (S1)
+            S = ++S1;
+        else
+            break;
+    }
+    return (tpLuaVM);
 }
 
-bool	Script::bfIsObjectPresent	(CLuaVirtualMachine *tpLuaVM, LPCSTR identifier, int type)
+bool Script::bfIsObjectPresent(CLuaVirtualMachine* tpLuaVM, LPCSTR identifier, int type)
 {
-	lua_pushnil (tpLuaVM); 
-	while (lua_next(tpLuaVM, -2)) { 
-		if ((lua_type(tpLuaVM, -1) == type) && !xr_strcmp(identifier,lua_tostring(tpLuaVM, -2))) { 
-			lua_pop (tpLuaVM, 3); 
-			return	(true); 
-		} 
-		lua_pop (tpLuaVM, 1); 
-	} 
-	lua_pop (tpLuaVM, 1); 
-	return	(false); 
+    lua_pushnil(tpLuaVM);
+    while (lua_next(tpLuaVM, -2))
+    {
+        if ((lua_type(tpLuaVM, -1) == type) && !xr_strcmp(identifier, lua_tostring(tpLuaVM, -2)))
+        {
+            lua_pop(tpLuaVM, 3);
+            return (true);
+        }
+        lua_pop(tpLuaVM, 1);
+    }
+    lua_pop(tpLuaVM, 1);
+    return (false);
 }
 
-bool	Script::bfIsObjectPresent	(CLuaVirtualMachine *tpLuaVM, LPCSTR namespace_name, LPCSTR identifier, int type)
+bool Script::bfIsObjectPresent(CLuaVirtualMachine* tpLuaVM, LPCSTR namespace_name, LPCSTR identifier, int type)
 {
-	if (xr_strlen(namespace_name) && !bfGetNamespaceTable(tpLuaVM,namespace_name))
-		return				(false); 
-	return					(bfIsObjectPresent(tpLuaVM,identifier,type)); 
+    if (xr_strlen(namespace_name) && !bfGetNamespaceTable(tpLuaVM, namespace_name))
+        return (false);
+    return (bfIsObjectPresent(tpLuaVM, identifier, type));
 }
 
-luabind::object Script::lua_namespace_table(CLuaVirtualMachine *tpLuaVM, LPCSTR namespace_name)
+luabind::object Script::lua_namespace_table(CLuaVirtualMachine* tpLuaVM, LPCSTR namespace_name)
 {
-	string256			S1;
-	xr_strcpy				(S1,namespace_name);
-	LPSTR				S = S1;
-	luabind::object		lua_namespace = luabind::get_globals(tpLuaVM);
-	for (;;) {
-		if (!xr_strlen(S))
-			return		(lua_namespace);
-		LPSTR			I = strchr(S,'.');
-		if (!I)
-			return		(lua_namespace[S]);
-		*I				= 0;
-		lua_namespace	= lua_namespace[S];
-		S				= I + 1;
-	}
+    string256 S1;
+    xr_strcpy(S1, namespace_name);
+    LPSTR S = S1;
+    luabind::object lua_namespace = luabind::get_globals(tpLuaVM);
+    for (;;)
+    {
+        if (!xr_strlen(S))
+            return (lua_namespace);
+        LPSTR I = strchr(S, '.');
+        if (!I)
+            return (lua_namespace[S]);
+        *I = 0;
+        lua_namespace = lua_namespace[S];
+        S = I + 1;
+    }
 }
\ No newline at end of file
diff --git a/src/xrEngine/ai_script_lua_extension.h b/src/xrEngine/ai_script_lua_extension.h
index af522b75b7e..4038fb059d9 100644
--- a/src/xrEngine/ai_script_lua_extension.h
+++ b/src/xrEngine/ai_script_lua_extension.h
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: ai_script_lua_extension.h
-//	Created 	: 19.09.2003
-//  Modified 	: 22.09.2003
-//	Author		: Dmitriy Iassenev
-//	Description : XRay Script extensions
+// Module : ai_script_lua_extension.h
+// Created : 19.09.2003
+// Modified : 22.09.2003
+// Author : Dmitriy Iassenev
+// Description : XRay Script extensions
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -11,39 +11,40 @@
 #include "ai_script_space.h"
 //struct CLuaVirtualMachine;
 
-namespace Script {
+namespace Script
+{
 #ifndef ENGINE_BUILD
-	void				vfExportGlobals				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportFvector				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportFmatrix				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportGame				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportLevel				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportDevice				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportParticles			(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportSound				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportHit					(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportActions				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportObject				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportEffector			(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportArtifactMerger		(CLuaVirtualMachine *tpLuaVM);
-	void				vfLoadStandardScripts		(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportMemoryObjects		(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportToLua				(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportActionManagement	(CLuaVirtualMachine *tpLuaVM);
-	void				vfExportMotivationManagement(CLuaVirtualMachine *tpLuaVM);
-	bool				bfLoadFile					(CLuaVirtualMachine *tpLuaVM, LPCSTR	caScriptName,	bool	bCall = true);
-	void				LuaHookCall					(CLuaVirtualMachine *tpLuaVM, lua_Debug *tpLuaDebug);
-	int					LuaPanic					(CLuaVirtualMachine *tpLuaVM);
+void vfExportGlobals(CLuaVirtualMachine* tpLuaVM);
+void vfExportFvector(CLuaVirtualMachine* tpLuaVM);
+void vfExportFmatrix(CLuaVirtualMachine* tpLuaVM);
+void vfExportGame(CLuaVirtualMachine* tpLuaVM);
+void vfExportLevel(CLuaVirtualMachine* tpLuaVM);
+void vfExportDevice(CLuaVirtualMachine* tpLuaVM);
+void vfExportParticles(CLuaVirtualMachine* tpLuaVM);
+void vfExportSound(CLuaVirtualMachine* tpLuaVM);
+void vfExportHit(CLuaVirtualMachine* tpLuaVM);
+void vfExportActions(CLuaVirtualMachine* tpLuaVM);
+void vfExportObject(CLuaVirtualMachine* tpLuaVM);
+void vfExportEffector(CLuaVirtualMachine* tpLuaVM);
+void vfExportArtifactMerger(CLuaVirtualMachine* tpLuaVM);
+void vfLoadStandardScripts(CLuaVirtualMachine* tpLuaVM);
+void vfExportMemoryObjects(CLuaVirtualMachine* tpLuaVM);
+void vfExportToLua(CLuaVirtualMachine* tpLuaVM);
+void vfExportActionManagement(CLuaVirtualMachine* tpLuaVM);
+void vfExportMotivationManagement(CLuaVirtualMachine* tpLuaVM);
+bool bfLoadFile(CLuaVirtualMachine* tpLuaVM, LPCSTR caScriptName, bool bCall = true);
+void LuaHookCall(CLuaVirtualMachine* tpLuaVM, lua_Debug* tpLuaDebug);
+int LuaPanic(CLuaVirtualMachine* tpLuaVM);
 #endif
-	bool				bfPrintOutput				(CLuaVirtualMachine *tpLuaVM, LPCSTR	caScriptName, int iErorCode = 0);
-	LPCSTR				cafEventToString			(int				iEventCode);
-	void				vfPrintError				(CLuaVirtualMachine *tpLuaVM, int		iErrorCode);
-	bool				bfListLevelVars				(CLuaVirtualMachine *tpLuaVM, int		iStackLevel);
-	bool				bfLoadBuffer				(CLuaVirtualMachine *tpLuaVM, LPCSTR	caBuffer,		size_t	tSize,				LPCSTR	caScriptName, LPCSTR caNameSpaceName = 0);
-	bool				bfLoadFileIntoNamespace		(CLuaVirtualMachine *tpLuaVM, LPCSTR	caScriptName,	LPCSTR	caNamespaceName,	bool	bCall);
-	bool				bfGetNamespaceTable			(CLuaVirtualMachine *tpLuaVM, LPCSTR	caName);
-	CLuaVirtualMachine	*get_namespace_table		(CLuaVirtualMachine *tpLuaVM, LPCSTR	caName);
-	bool				bfIsObjectPresent			(CLuaVirtualMachine *tpLuaVM, LPCSTR	caIdentifier,	int type);
-	bool				bfIsObjectPresent			(CLuaVirtualMachine *tpLuaVM, LPCSTR	caNamespaceName, LPCSTR	caIdentifier, int type);
-	luabind::object		lua_namespace_table			(CLuaVirtualMachine *tpLuaVM, LPCSTR namespace_name);
+bool bfPrintOutput(CLuaVirtualMachine* tpLuaVM, LPCSTR caScriptName, int iErorCode = 0);
+LPCSTR cafEventToString(int iEventCode);
+void vfPrintError(CLuaVirtualMachine* tpLuaVM, int iErrorCode);
+bool bfListLevelVars(CLuaVirtualMachine* tpLuaVM, int iStackLevel);
+bool bfLoadBuffer(CLuaVirtualMachine* tpLuaVM, LPCSTR caBuffer, size_t tSize, LPCSTR caScriptName, LPCSTR caNameSpaceName = 0);
+bool bfLoadFileIntoNamespace(CLuaVirtualMachine* tpLuaVM, LPCSTR caScriptName, LPCSTR caNamespaceName, bool bCall);
+bool bfGetNamespaceTable(CLuaVirtualMachine* tpLuaVM, LPCSTR caName);
+CLuaVirtualMachine* get_namespace_table(CLuaVirtualMachine* tpLuaVM, LPCSTR caName);
+bool bfIsObjectPresent(CLuaVirtualMachine* tpLuaVM, LPCSTR caIdentifier, int type);
+bool bfIsObjectPresent(CLuaVirtualMachine* tpLuaVM, LPCSTR caNamespaceName, LPCSTR caIdentifier, int type);
+luabind::object lua_namespace_table(CLuaVirtualMachine* tpLuaVM, LPCSTR namespace_name);
 };
diff --git a/src/xrEngine/ai_script_lua_space.h b/src/xrEngine/ai_script_lua_space.h
index b5df3a252ca..34371e71484 100644
--- a/src/xrEngine/ai_script_lua_space.h
+++ b/src/xrEngine/ai_script_lua_space.h
@@ -1,17 +1,19 @@
 #pragma once
 
-namespace Lua {
-	enum ELuaMessageType {
-		eLuaMessageTypeInfo = u32(0),
-		eLuaMessageTypeError,
-		eLuaMessageTypeMessage,
-		eLuaMessageTypeHookCall,
-		eLuaMessageTypeHookReturn,
-		eLuaMessageTypeHookLine,
-		eLuaMessageTypeHookCount,
-		eLuaMessageTypeHookTailReturn = u32(-1),
-	};
+namespace Lua
+{
+enum ELuaMessageType
+{
+    eLuaMessageTypeInfo = u32(0),
+    eLuaMessageTypeError,
+    eLuaMessageTypeMessage,
+    eLuaMessageTypeHookCall,
+    eLuaMessageTypeHookReturn,
+    eLuaMessageTypeHookLine,
+    eLuaMessageTypeHookCount,
+    eLuaMessageTypeHookTailReturn = u32(-1),
+};
 
-	int __cdecl LuaOut(ELuaMessageType tLuaMessageType, LPCSTR caFormat, ...);
+int __cdecl LuaOut(ELuaMessageType tLuaMessageType, LPCSTR caFormat, ...);
 }
 
diff --git a/src/xrEngine/ai_script_space.h b/src/xrEngine/ai_script_space.h
index 99579527929..a0c67e587b3 100644
--- a/src/xrEngine/ai_script_space.h
+++ b/src/xrEngine/ai_script_space.h
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: ai_script_space.h
-//	Created 	: 22.09.2003
-//  Modified 	: 22.09.2003
-//	Author		: Dmitriy Iassenev
-//	Description : XRay Script space
+// Module : ai_script_space.h
+// Created : 22.09.2003
+// Modified : 22.09.2003
+// Author : Dmitriy Iassenev
+// Description : XRay Script space
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -17,12 +17,12 @@
 //#define LUABIND_NO_EXCEPTIONS
 
 extern "C" {
-	//#define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+    //#define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
-	#include <lua/lua.h>
-	#include <lua/lualib.h>
-	#include <lua/lauxlib.h>
-//	#include <lua/luajit.h>
+#include <lua/lua.h>
+#include <lua/lualib.h>
+#include <lua/lauxlib.h>
+    // #include <lua/luajit.h>
 }
 
 // Lua-bind
@@ -35,10 +35,11 @@ extern "C" {
 
 typedef lua_State CLuaVirtualMachine;
 
-struct SMemberCallback {
-	luabind::functor<void>	*m_lua_function;
-	luabind::object			*m_lua_object;
-	shared_str				m_method_name;
+struct SMemberCallback
+{
+    luabind::functor<void>* m_lua_function;
+    luabind::object* m_lua_object;
+    shared_str m_method_name;
 };
 
 #include "ai_script_lua_space.h"
diff --git a/src/xrEngine/bone.cpp b/src/xrEngine/bone.cpp
index 9ffd7ed4665..c57136360a6 100644
--- a/src/xrEngine/bone.cpp
+++ b/src/xrEngine/bone.cpp
@@ -5,52 +5,52 @@
 #include "gamemtllib.h"
 
 
-u16	CBone::get_game_mtl_idx	( )			const	
+u16 CBone::get_game_mtl_idx() const
 {
-	return GMLib.GetMaterialIdx(game_mtl.c_str());
+    return GMLib.GetMaterialIdx(game_mtl.c_str());
 }
 
-static const Fobb	dummy = Fobb().identity();
-const	Fobb&		CBone::	get_obb				( )			const
+static const Fobb dummy = Fobb().identity();
+const Fobb& CBone::get_obb() const
 {
-	return dummy;
+    return dummy;
 }
 //////////////////////////////////////////////////////////////////////////
 // BoneInstance methods
 
 
 
-void	ENGINE_API	CBoneInstance::set_param	(u32 idx, float data)
+void ENGINE_API CBoneInstance::set_param(u32 idx, float data)
 {
-	VERIFY		(idx<MAX_BONE_PARAMS);
-	param[idx]	= data;
+    VERIFY(idx < MAX_BONE_PARAMS);
+    param[idx] = data;
 }
-float	ENGINE_API	CBoneInstance::get_param	(u32 idx)
+float ENGINE_API CBoneInstance::get_param(u32 idx)
 {
-	VERIFY		(idx<MAX_BONE_PARAMS);
-	return		param[idx];
+    VERIFY(idx < MAX_BONE_PARAMS);
+    return param[idx];
 }
 
-#ifdef	DEBUG
-void ENGINE_API	CBoneData::DebugQuery		(BoneDebug& L)
+#ifdef DEBUG
+void ENGINE_API CBoneData::DebugQuery(BoneDebug& L)
 {
-	for (u32 i=0; i<children.size(); i++)
-	{
-		L.push_back(SelfID);
-		L.push_back(children[i]->SelfID);
-		children[i]->DebugQuery(L);
-	}
+    for (u32 i = 0; i < children.size(); i++)
+    {
+        L.push_back(SelfID);
+        L.push_back(children[i]->SelfID);
+        children[i]->DebugQuery(L);
+    }
 }
 #endif
 
-void ENGINE_API	CBoneData::CalculateM2B(const Fmatrix& parent)
+void ENGINE_API CBoneData::CalculateM2B(const Fmatrix& parent)
 {
-	// Build matrix
-	m2b_transform.mul_43	(parent,bind_transform);
+    // Build matrix
+    m2b_transform.mul_43(parent, bind_transform);
 
-	// Calculate children
-	for (xr_vector<CBoneData*>::iterator C=children.begin(); C!=children.end(); C++)
-		(*C)->CalculateM2B	(m2b_transform);
+    // Calculate children
+    for (xr_vector<CBoneData*>::iterator C = children.begin(); C != children.end(); C++)
+        (*C)->CalculateM2B(m2b_transform);
 
-	m2b_transform.invert	();            
+    m2b_transform.invert();
 }
diff --git a/src/xrEngine/bone.h b/src/xrEngine/bone.h
index bcb9855b39f..3794cc47e45 100644
--- a/src/xrEngine/bone.h
+++ b/src/xrEngine/bone.h
@@ -9,126 +9,126 @@
 // refs
 class CBone;
 
-#define	BI_NONE				(u16(-1))
+#define BI_NONE (u16(-1))
 
-#define OGF_IKDATA_VERSION	0x0001
+#define OGF_IKDATA_VERSION 0x0001
 
-#define	MAX_BONE_PARAMS		4
+#define MAX_BONE_PARAMS 4
 
 class ENGINE_API CBoneInstance;
 // callback
-typedef void  _BCL BoneCallbackFunction	(CBoneInstance* P);
-typedef		BoneCallbackFunction*		BoneCallback;
-//typedef void  (* BoneCallback)		(CBoneInstance* P);
+typedef void _BCL BoneCallbackFunction(CBoneInstance* P);
+typedef BoneCallbackFunction* BoneCallback;
+//typedef void (* BoneCallback) (CBoneInstance* P);
 
 //*** Bone Instance *******************************************************************************
 #pragma pack(push,8)
-class ENGINE_API		CBoneInstance
+class ENGINE_API CBoneInstance
 {
 public:
-	// data
-	Fmatrix				mTransform;							// final x-form matrix (local to model)
-	Fmatrix				mRenderTransform;					// final x-form matrix (model_base -> bone -> model)
+    // data
+    Fmatrix mTransform; // final x-form matrix (local to model)
+    Fmatrix mRenderTransform; // final x-form matrix (model_base -> bone -> model)
 private:
-	BoneCallback		Callback;
-	void*				Callback_Param;
-	BOOL				Callback_overwrite;					// performance hint - don't calc anims
-	u32					Callback_type;	
+    BoneCallback Callback;
+    void* Callback_Param;
+    BOOL Callback_overwrite; // performance hint - don't calc anims
+    u32 Callback_type;
 public:
-	float				param			[MAX_BONE_PARAMS];	// 
-	//
-	// methods
+    float param[MAX_BONE_PARAMS]; //
+    //
+    // methods
 public:
-	IC	BoneCallback	_BCL	callback()					{ return  Callback; }
-	IC	void*			_BCL	callback_param()			{ return Callback_Param;	}
-	IC	BOOL			_BCL	callback_overwrite()		{ return Callback_overwrite; }					// performance hint - don't calc anims
-	IC	u32				_BCL	callback_type()				{ return Callback_type; }	
+    IC BoneCallback _BCL callback() { return Callback; }
+    IC void* _BCL callback_param() { return Callback_Param; }
+    IC BOOL _BCL callback_overwrite() { return Callback_overwrite; } // performance hint - don't calc anims
+    IC u32 _BCL callback_type() { return Callback_type; }
 public:
-	IC void				_BCL	construct();
-
-	void	_BCL set_callback	(u32 Type, BoneCallback C, void* Param,  BOOL overwrite=FALSE)
-	{	
-		Callback			= C; 
-		Callback_Param		= Param; 
-		Callback_overwrite	= overwrite;
-		Callback_type		= Type;
-	}
-
-	void	_BCL reset_callback()
-	{
-		Callback			= 0; 
-		Callback_Param		= 0; 
-		Callback_overwrite	= FALSE;
-		Callback_type		= 0;
-	}
-	void		_BCL		set_callback_overwrite(BOOL v){ Callback_overwrite = v; }
-
-	void				set_param		(u32 idx, float data);
-	float				get_param		(u32 idx);
-
-	u32					mem_usage		(){return sizeof(*this);}
+    IC void _BCL construct();
+
+    void _BCL set_callback(u32 Type, BoneCallback C, void* Param, BOOL overwrite = FALSE)
+    {
+        Callback = C;
+        Callback_Param = Param;
+        Callback_overwrite = overwrite;
+        Callback_type = Type;
+    }
+
+    void _BCL reset_callback()
+    {
+        Callback = 0;
+        Callback_Param = 0;
+        Callback_overwrite = FALSE;
+        Callback_type = 0;
+    }
+    void _BCL set_callback_overwrite(BOOL v) { Callback_overwrite = v; }
+
+    void set_param(u32 idx, float data);
+    float get_param(u32 idx);
+
+    u32 mem_usage() { return sizeof(*this); }
 };
 #pragma pack(pop)
 
 #pragma pack( push,2 )
-struct ENGINE_API vertBoned1W			// (3+3+3+3+2+1)*4 = 15*4 = 60 bytes
+struct ENGINE_API vertBoned1W // (3+3+3+3+2+1)*4 = 15*4 = 60 bytes
 {
-	Fvector	P;
-	Fvector	N;
-	Fvector	T;
-	Fvector	B;
-	float	u,v;
-	u32		matrix;
-	void	get_pos( Fvector& p ) const { p.set(P); }
-#ifdef	DEBUG	
-	static const u8 bones_count = 1;
-	u16		get_bone_id(u8 bone)const{ VERIFY(bone<bones_count); return u16(matrix); }
+    Fvector P;
+    Fvector N;
+    Fvector T;
+    Fvector B;
+    float u, v;
+    u32 matrix;
+    void get_pos(Fvector& p) const { p.set(P); }
+#ifdef DEBUG
+    static const u8 bones_count = 1;
+    u16 get_bone_id(u8 bone)const { VERIFY(bone < bones_count); return u16(matrix); }
 #endif
 };
-struct ENGINE_API vertBoned2W			// (1+3+3 + 1+3+3 + 2)*4 = 16*4 = 64 bytes
+struct ENGINE_API vertBoned2W // (1+3+3 + 1+3+3 + 2)*4 = 16*4 = 64 bytes
 {
-	u16		matrix0;
-	u16		matrix1;
-	Fvector	P;
-	Fvector	N;
-	Fvector	T;
-	Fvector	B;
-	float	w;
-	float	u,v;
-	void	get_pos( Fvector& p ) { p.set(P); }
-#ifdef	DEBUG
-	static const u8 bones_count = 2;
-	u16		get_bone_id(u8 bone)const{ VERIFY(bone<bones_count); return bone==0 ? matrix0 : matrix1; }
+    u16 matrix0;
+    u16 matrix1;
+    Fvector P;
+    Fvector N;
+    Fvector T;
+    Fvector B;
+    float w;
+    float u, v;
+    void get_pos(Fvector& p) { p.set(P); }
+#ifdef DEBUG
+    static const u8 bones_count = 2;
+    u16 get_bone_id(u8 bone)const { VERIFY(bone < bones_count); return bone == 0 ? matrix0 : matrix1; }
 #endif
 };
-struct ENGINE_API vertBoned3W          // 70 bytes
+struct ENGINE_API vertBoned3W // 70 bytes
 {
-	u16		m		[3];
-	Fvector	P;
-	Fvector	N;
-	Fvector	T;
-	Fvector	B;
-	float	w		[2];
-	float	u,v;
-	void	get_pos( Fvector& p ) { p.set(P); }
-#ifdef	DEBUG
-	static const u8 bones_count = 3;
-	u16		get_bone_id(u8 bone)const{ VERIFY(bone<bones_count); return m[bone]; }
+    u16 m[3];
+    Fvector P;
+    Fvector N;
+    Fvector T;
+    Fvector B;
+    float w[2];
+    float u, v;
+    void get_pos(Fvector& p) { p.set(P); }
+#ifdef DEBUG
+    static const u8 bones_count = 3;
+    u16 get_bone_id(u8 bone)const { VERIFY(bone < bones_count); return m[bone]; }
 #endif
 };
-struct ENGINE_API vertBoned4W       //76 bytes
+struct ENGINE_API vertBoned4W //76 bytes
 {
-	u16		m		[4];
-	Fvector	P;
-	Fvector	N;
-	Fvector	T;
-	Fvector	B;
-	float	w		[3];
-	float	u,v;
-	void	get_pos( Fvector& p ) { p.set(P); }
-#ifdef	DEBUG
-	static const u8 bones_count = 4;
-	u16		get_bone_id(u8 bone)const{ VERIFY(bone<bones_count); return m[bone]; }
+    u16 m[4];
+    Fvector P;
+    Fvector N;
+    Fvector T;
+    Fvector B;
+    float w[3];
+    float u, v;
+    void get_pos(Fvector& p) { p.set(P); }
+#ifdef DEBUG
+    static const u8 bones_count = 4;
+    u16 get_bone_id(u8 bone)const { VERIFY(bone < bones_count); return m[bone]; }
 #endif
 };
 #pragma pack(pop)
@@ -137,8 +137,8 @@ struct ENGINE_API vertBoned4W       //76 bytes
 enum EJointType
 {
     jtRigid,
-	jtCloth,
-	jtJoint,
+    jtCloth,
+    jtJoint,
     jtWheel,
     jtNone,
     jtSlider,
@@ -147,55 +147,62 @@ enum EJointType
 
 struct ECORE_API SJointLimit
 {
-	Fvector2		limit;
-    float 			spring_factor;
-    float 			damping_factor;
-    SJointLimit		(){Reset();}
-    void 			Reset()
+    Fvector2 limit;
+    float spring_factor;
+    float damping_factor;
+    SJointLimit() { Reset(); }
+    void Reset()
     {
-    	limit.set		(0.f,0.f);
-        spring_factor 	= 1.f;
-        damping_factor  = 1.f;
+        limit.set(0.f, 0.f);
+        spring_factor = 1.f;
+        damping_factor = 1.f;
     }
 };
 
 struct ECORE_API SBoneShape
 {
     enum EShapeType
-	{
-    	stNone,
+    {
+        stNone,
         stBox,
         stSphere,
         stCylinder,
         stForceU32 = u16(-1)
     };
 
-	enum EShapeFlags{
-		sfNoPickable		= (1<<0), 	// use only in RayPick
-        sfRemoveAfterBreak  = (1<<1),	
-		sfNoPhysics			= (1<<2),
-        sfNoFogCollider		= (1<<3),	
-	};
-
-	u16				type;		// 2
-	Flags16			flags;		// 2
-  	Fobb			box;      	// 15*4
-    Fsphere			sphere;		// 4*4
-    Fcylinder		cylinder;	// 8*4
-    SBoneShape		(){Reset();}
-    void			Reset()
+    enum EShapeFlags
+    {
+        sfNoPickable = (1 << 0), // use only in RayPick
+        sfRemoveAfterBreak = (1 << 1),
+        sfNoPhysics = (1 << 2),
+        sfNoFogCollider = (1 << 3),
+    };
+
+    u16 type; // 2
+    Flags16 flags; // 2
+    Fobb box; // 15*4
+    Fsphere sphere; // 4*4
+    Fcylinder cylinder; // 8*4
+    SBoneShape() { Reset(); }
+    void Reset()
     {
-		flags.zero	();
-    	type		= stNone;
+        flags.zero();
+        type = stNone;
         box.invalidate();
-        sphere.P.set(0.f,0.f,0.f); sphere.R = 0.f;
+        sphere.P.set(0.f, 0.f, 0.f);
+        sphere.R = 0.f;
         cylinder.invalidate();
     }
-    bool			Valid(){  
-    	switch (type){
-        case stBox: 	return !fis_zero(box.m_halfsize.x)&&!fis_zero(box.m_halfsize.y)&&!fis_zero(box.m_halfsize.z);
-        case stSphere: 	return !fis_zero(sphere.R);
-        case stCylinder:return !fis_zero(cylinder.m_height)&&!fis_zero(cylinder.m_radius)&&!fis_zero(cylinder.m_direction.square_magnitude());
+    bool Valid()
+    {
+        switch (type)
+        {
+        case stBox:
+            return !fis_zero(box.m_halfsize.x) && !fis_zero(box.m_halfsize.y) && !fis_zero(box.m_halfsize.z);
+        case stSphere:
+            return !fis_zero(sphere.R);
+        case stCylinder:
+            return !fis_zero(cylinder.m_height) && !fis_zero(cylinder.m_radius) && !fis_zero(cylinder.m_direction.square_magnitude());
         };
         return true;
     }
@@ -204,73 +211,76 @@ struct ECORE_API SBoneShape
 struct ECORE_API SJointIKData
 {
     // IK
-    EJointType		type;
-    SJointLimit		limits	[3];// by [axis XYZ on joint] and[Z-wheel,X-steer on wheel]
-    float			spring_factor;
-    float			damping_factor;
-    enum{
-    	flBreakable	= (1<<0),
+    EJointType type;
+    SJointLimit limits[3];// by [axis XYZ on joint] and[Z-wheel,X-steer on wheel]
+    float spring_factor;
+    float damping_factor;
+    enum
+    {
+        flBreakable = (1 << 0),
     };
-    Flags32			ik_flags;
-    float			break_force;	// [0..+INF]
-    float			break_torque;	// [0..+INF]
-
-    float			friction;
-    			
-    SJointIKData	(){ Reset();}
-    void			Reset	()
+    Flags32 ik_flags;
+    float break_force; // [0..+INF]
+    float break_torque; // [0..+INF]
+
+    float friction;
+
+    SJointIKData() { Reset(); }
+    void Reset()
     {
-    	limits[0].Reset	();
-    	limits[1].Reset	();
-    	limits[2].Reset	();
-        type			= jtRigid;
-        spring_factor	= 1.f;
-        damping_factor	= 1.f;
-        ik_flags.zero	();
-    	break_force		= 0.f;
-    	break_torque	= 0.f;
+        limits[0].Reset();
+        limits[1].Reset();
+        limits[2].Reset();
+        type = jtRigid;
+        spring_factor = 1.f;
+        damping_factor = 1.f;
+        ik_flags.zero();
+        break_force = 0.f;
+        break_torque = 0.f;
     }
-    void				clamp_by_limits(Fvector& dest_xyz);
-    void				Export(IWriter& F)
+    void clamp_by_limits(Fvector& dest_xyz);
+    void Export(IWriter& F)
     {
-        F.w_u32			(type);
-        for (int k=0; k<3; k++){
-        	// Kostya Slipchenko say:
-            // íàïðàâëåíèå âðàùåíèÿ â ÎÄÅ îòëè÷àåòñÿ îò íàïðàâëåíèÿ âðàùåíèå â X-Ray 
+        F.w_u32(type);
+        for (int k = 0; k < 3; k++)
+        {
+            // Kostya Slipchenko say:
+            // íàïðàâëåíèå âðàùåíèÿ â ÎÄÅ îòëè÷àåòñÿ îò íàïðàâëåíèÿ âðàùåíèå â X-Ray
             // ïîýòîìó ìåíÿåì çíàê ó ëèìèòîâ
-            //F.w_float	(_min(-limits[k].limit.x,-limits[k].limit.y)); // min (swap special for ODE) 
-            //F.w_float	(_max(-limits[k].limit.x,-limits[k].limit.y)); // max (swap special for ODE)
+            //F.w_float (_min(-limits[k].limit.x,-limits[k].limit.y)); // min (swap special for ODE)
+            //F.w_float (_max(-limits[k].limit.x,-limits[k].limit.y)); // max (swap special for ODE)
+
+            VERIFY(_min(-limits[k].limit.x, -limits[k].limit.y) == -limits[k].limit.y);
+            VERIFY(_max(-limits[k].limit.x, -limits[k].limit.y) == -limits[k].limit.x);
 
-			VERIFY(_min(-limits[k].limit.x,-limits[k].limit.y) == -limits[k].limit.y );
-			VERIFY(_max(-limits[k].limit.x,-limits[k].limit.y) == -limits[k].limit.x );
-			
-			F.w_float	(-limits[k].limit.y); // min (swap special for ODE) 
-            F.w_float	(-limits[k].limit.x); // max (swap special for ODE)
+            F.w_float(-limits[k].limit.y); // min (swap special for ODE)
+            F.w_float(-limits[k].limit.x); // max (swap special for ODE)
 
 
-            F.w_float	(limits[k].spring_factor);
-            F.w_float	(limits[k].damping_factor);
+            F.w_float(limits[k].spring_factor);
+            F.w_float(limits[k].damping_factor);
         }
-        F.w_float		(spring_factor);
-        F.w_float		(damping_factor);
+        F.w_float(spring_factor);
+        F.w_float(damping_factor);
 
-        F.w_u32			(ik_flags.get());
-        F.w_float		(break_force);
-        F.w_float		(break_torque);
+        F.w_u32(ik_flags.get());
+        F.w_float(break_force);
+        F.w_float(break_torque);
 
-        F.w_float		(friction);
+        F.w_float(friction);
     }
-    bool				Import(IReader& F, u16 vers)
+    bool Import(IReader& F, u16 vers)
     {
-        type			= (EJointType)F.r_u32();
-        F.r				(limits,sizeof(SJointLimit)*3);
-        spring_factor	= F.r_float();
-        damping_factor	= F.r_float();
-        ik_flags.flags	= F.r_u32();
-        break_force		= F.r_float();
-        break_torque	= F.r_float();
-        if (vers>0){
-	        friction	= F.r_float();
+        type = (EJointType)F.r_u32();
+        F.r(limits, sizeof(SJointLimit) * 3);
+        spring_factor = F.r_float();
+        damping_factor = F.r_float();
+        ik_flags.flags = F.r_u32();
+        break_force = F.r_float();
+        break_torque = F.r_float();
+        if (vers > 0)
+        {
+            friction = F.r_float();
         }
         return true;
     }
@@ -279,264 +289,266 @@ struct ECORE_API SJointIKData
 
 
 
-class 	IBoneData
+class IBoneData
 {
-	public:
-
-	virtual			IBoneData&	_BCL	GetChild		( u16 id )			= 0;
-	virtual const	IBoneData&	_BCL	GetChild		( u16 id )	const	= 0;
-	virtual			u16			_BCL	GetSelfID		( )			const	= 0;
-	virtual			u16			_BCL	GetNumChildren	( )			const	= 0;
-
-	virtual const SJointIKData& _BCL	get_IK_data			( )const	= 0;
-	virtual const	Fmatrix&	_BCL	get_bind_transform	( )const	= 0;
-	virtual const	SBoneShape&	_BCL	get_shape			( )const	= 0;
-	virtual const	Fobb&		_BCL	get_obb				( )const	= 0;
-	virtual const	Fvector&	_BCL	get_center_of_mass	( )const	= 0;
-	virtual			float		_BCL	get_mass			( )const	= 0;
-	virtual			u16			_BCL	get_game_mtl_idx	( )const	= 0;
-	virtual			u16			_BCL	GetParentID			( ) const	= 0;
-	virtual			float		_BCL	lo_limit			( u8 k )	const	= 0;
-	virtual			float		_BCL	hi_limit			( u8 k )	const	= 0;
-	
+public:
+
+    virtual IBoneData& _BCL GetChild(u16 id) = 0;
+    virtual const IBoneData& _BCL GetChild(u16 id) const = 0;
+    virtual u16 _BCL GetSelfID() const = 0;
+    virtual u16 _BCL GetNumChildren() const = 0;
+
+    virtual const SJointIKData& _BCL get_IK_data()const = 0;
+    virtual const Fmatrix& _BCL get_bind_transform()const = 0;
+    virtual const SBoneShape& _BCL get_shape()const = 0;
+    virtual const Fobb& _BCL get_obb()const = 0;
+    virtual const Fvector& _BCL get_center_of_mass()const = 0;
+    virtual float _BCL get_mass()const = 0;
+    virtual u16 _BCL get_game_mtl_idx()const = 0;
+    virtual u16 _BCL GetParentID() const = 0;
+    virtual float _BCL lo_limit(u8 k) const = 0;
+    virtual float _BCL hi_limit(u8 k) const = 0;
+
 };
 
-//static const Fobb	dummy ;//= Fobb().identity();
+//static const Fobb dummy ;//= Fobb().identity();
 // refs
 class CBone;
-DEFINE_VECTOR		    (CBone*,BoneVec,BoneIt);
+DEFINE_VECTOR(CBone*, BoneVec, BoneIt);
 
-class ECORE_API CBone:
-	public CBoneInstance,
-	public IBoneData
+class ECORE_API CBone :
+    public CBoneInstance,
+    public IBoneData
 {
-	shared_str			name;
-	shared_str			parent_name;
-	shared_str			wmap;
-	Fvector			    rest_offset;
-	Fvector			    rest_rotate;    // XYZ format (Game format)
-	float			    rest_length;
+    shared_str name;
+    shared_str parent_name;
+    shared_str wmap;
+    Fvector rest_offset;
+    Fvector rest_rotate; // XYZ format (Game format)
+    float rest_length;
 
-	Fvector			    mot_offset;
-	Fvector			    mot_rotate;		// XYZ format (Game format)
-	float			    mot_length;
+    Fvector mot_offset;
+    Fvector mot_rotate; // XYZ format (Game format)
+    float mot_length;
 
-    Fmatrix			    mot_transform;
+    Fmatrix mot_transform;
 
-	Fmatrix				local_rest_transform;
-    Fmatrix			    rest_transform;
-    Fmatrix			    rest_i_transform;
+    Fmatrix local_rest_transform;
+    Fmatrix rest_transform;
+    Fmatrix rest_i_transform;
 
-    //Fmatrix			    last_transform;
+    //Fmatrix last_transform;
 
-    //Fmatrix				render_transform;
+    //Fmatrix render_transform;
 public:
-	int				    SelfID;
-    CBone*			    parent;
-    BoneVec				children;
+    int SelfID;
+    CBone* parent;
+    BoneVec children;
 public:
     // editor part
-    Flags8			    flags;    
-	enum{
-    	flSelected	    = (1<<0),
+    Flags8 flags;
+    enum
+    {
+        flSelected = (1 << 0),
     };
-    SJointIKData	    IK_data;
-    shared_str			game_mtl;
-    SBoneShape		    shape;
+    SJointIKData IK_data;
+    shared_str game_mtl;
+    SBoneShape shape;
 
-    float			    mass;
-    Fvector			    center_of_mass;
+    float mass;
+    Fvector center_of_mass;
 public:
-					    CBone			();
-	virtual			    ~CBone			();
+    CBone();
+    virtual ~CBone();
 
-	void			    SetName			(const char* p){name		= p; xr_strlwr(name);		}
-	void			    SetParentName	(const char* p){parent_name	= p; xr_strlwr(parent_name);}
-	void			    SetWMap			(const char* p){wmap		= p;}
-	void			    SetRestParams	(float length, const Fvector& offset, const Fvector& rotate){rest_offset.set(offset);rest_rotate.set(rotate);rest_length=length;};
+    void SetName(const char* p) { name = p; xr_strlwr(name); }
+    void SetParentName(const char* p) { parent_name = p; xr_strlwr(parent_name); }
+    void SetWMap(const char* p) { wmap = p; }
+    void SetRestParams(float length, const Fvector& offset, const Fvector& rotate) { rest_offset.set(offset); rest_rotate.set(rotate); rest_length = length; };
 
-	shared_str		    Name			(){return name;}
-	shared_str		    ParentName		(){return parent_name;}
-	shared_str		    WMap			(){return wmap;}
-	IC CBone*		    Parent			(){return parent;}
-    IC BOOL			    IsRoot			(){return (parent==0);}
-	shared_str&		    NameRef			(){return name;}
+    shared_str Name() { return name; }
+    shared_str ParentName() { return parent_name; }
+    shared_str WMap() { return wmap; }
+    IC CBone* Parent() { return parent; }
+    IC BOOL IsRoot() { return (parent == 0); }
+    shared_str& NameRef() { return name; }
 
     // transformation
-    const Fvector&      _Offset			(){return mot_offset;}
-    const Fvector&      _Rotate			(){return mot_rotate;}
-    float			    _Length			(){return mot_length;}
-    IC Fmatrix&		    _RTransform		(){return rest_transform;}
-    IC Fmatrix&		    _RITransform	(){return rest_i_transform;}
-    IC Fmatrix&		    _LRTransform	(){return local_rest_transform;}
-    IC Fmatrix&		    _MTransform		(){return mot_transform;}
-    
-	IC Fmatrix&		    _LTransform		(){return mTransform;}//{return last_transform;}
-    IC const Fmatrix&	_LTransform		() const {return mTransform;}
-    
-    IC Fmatrix&		    _RenderTransform(){return mRenderTransform;}//{return render_transform;}
-	IC Fvector&			_RestOffset		(){return rest_offset;}
-	IC Fvector&		    _RestRotate		(){return rest_rotate;}
-    
-	void			    _Update			(const Fvector& T, const Fvector& R){mot_offset.set(T); mot_rotate.set(R); mot_length=rest_length;}
-    void			    Reset			(){mot_offset.set(rest_offset); mot_rotate.set(rest_rotate); mot_length=rest_length;}
+    const Fvector& _Offset() { return mot_offset; }
+    const Fvector& _Rotate() { return mot_rotate; }
+    float _Length() { return mot_length; }
+    IC Fmatrix& _RTransform() { return rest_transform; }
+    IC Fmatrix& _RITransform() { return rest_i_transform; }
+    IC Fmatrix& _LRTransform() { return local_rest_transform; }
+    IC Fmatrix& _MTransform() { return mot_transform; }
+
+    IC Fmatrix& _LTransform() { return mTransform; } //{return last_transform;}
+    IC const Fmatrix& _LTransform() const { return mTransform; }
+
+    IC Fmatrix& _RenderTransform() { return mRenderTransform; } //{return render_transform;}
+    IC Fvector& _RestOffset() { return rest_offset; }
+    IC Fvector& _RestRotate() { return rest_rotate; }
+
+    void _Update(const Fvector& T, const Fvector& R) { mot_offset.set(T); mot_rotate.set(R); mot_length = rest_length; }
+    void Reset() { mot_offset.set(rest_offset); mot_rotate.set(rest_rotate); mot_length = rest_length; }
 
     // IO
-	void			    Save			(IWriter& F);
-	void			    Load_0			(IReader& F);
-	void			    Load_1			(IReader& F);
+    void Save(IWriter& F);
+    void Load_0(IReader& F);
+    void Load_1(IReader& F);
 #ifdef _LW_EXPORT
-    void			    ParseBone(LWItemID bone);
+    void ParseBone(LWItemID bone);
 #endif
-IC	float	_BCL		engine_lo_limit ( u8 k ) const	{ return -IK_data.limits[k].limit.y; }
-IC	float	_BCL		engine_hi_limit ( u8 k ) const	{ return -IK_data.limits[k].limit.x; }
+    IC float _BCL engine_lo_limit(u8 k) const { return -IK_data.limits[k].limit.y; }
+    IC float _BCL engine_hi_limit(u8 k) const { return -IK_data.limits[k].limit.x; }
+
+    IC float _BCL editor_lo_limit(u8 k) const { return IK_data.limits[k].limit.x; }
+    IC float _BCL editor_hi_limit(u8 k) const { return IK_data.limits[k].limit.y; }
 
-IC	float	_BCL		editor_lo_limit ( u8 k ) const	{ return IK_data.limits[k].limit.x; }
-IC	float	_BCL		editor_hi_limit ( u8 k ) const	{ return IK_data.limits[k].limit.y; }
 
 
 
+    void SaveData(IWriter& F);
+    void LoadData(IReader& F);
+    void ResetData();
+    void CopyData(CBone* bone);
 
-	void			    SaveData		(IWriter& F);
-	void			    LoadData		(IReader& F);
-    void			    ResetData		();
-    void			    CopyData		(CBone* bone);
-    
 #if defined _EDITOR || defined _MAYA_EXPORT
-	void			    ShapeScale		(const Fvector& amount);
-	void			    ShapeRotate		(const Fvector& amount);
-	void			    ShapeMove		(const Fvector& amount);
-	void			    BindRotate		(const Fvector& amount);
-	void			    BindMove		(const Fvector& amount);
-	void			    BoneMove		(const Fvector& amount);
-	void			    BoneRotate		(const Fvector& axis, float angle);
+    void ShapeScale(const Fvector& amount);
+    void ShapeRotate(const Fvector& amount);
+    void ShapeMove(const Fvector& amount);
+    void BindRotate(const Fvector& amount);
+    void BindMove(const Fvector& amount);
+    void BoneMove(const Fvector& amount);
+    void BoneRotate(const Fvector& axis, float angle);
 
-	bool 			    Pick			(float& dist, const Fvector& S, const Fvector& D, const Fmatrix& parent);
+    bool Pick(float& dist, const Fvector& S, const Fvector& D, const Fmatrix& parent);
 
-    void			    Select			(BOOL flag)	{ flags.set(flSelected,flag); }
-    bool			    Selected		(){return !!flags.is(flSelected);}
+    void Select(BOOL flag) { flags.set(flSelected, flag); }
+    bool Selected() { return !!flags.is(flSelected); }
 
-    void			    ClampByLimits	();
+    void ClampByLimits();
 
-    bool 			    ExportOGF		(IWriter& F);
+    bool ExportOGF(IWriter& F);
 #endif
 private:
-				IBoneData&		_BCL	GetChild			( u16 id )			{return *children[id];}
-		const	IBoneData&		_BCL	GetChild			( u16 id )	const	{return *children[id];}
-        		u16				_BCL	GetSelfID			( )			const	{return (u16)SelfID;}
-				u16				_BCL	GetNumChildren		( )			const	{return u16( children.size() );}
-		const	SJointIKData&	_BCL	get_IK_data			( )			const	{return	IK_data;}
-		const	Fmatrix&		_BCL	get_bind_transform	( )			const	
-		{
-			
-				return	local_rest_transform;
-
-		}
-		const	SBoneShape&		_BCL	get_shape			( )			const	{return shape;}
-
-		const	Fobb&			_BCL	get_obb				( )			const	;
-		const	Fvector&		_BCL	get_center_of_mass	( )			const	{return center_of_mass;}
-				float			_BCL	get_mass			( )			const	{return mass;}
-				u16				_BCL	get_game_mtl_idx	( )			const	;
-				u16				_BCL	GetParentID			( )			const	{if(parent) return u16(parent->SelfID); else return u16(-1);};
-				float			_BCL	lo_limit			( u8 k )	const	{ return engine_lo_limit(k); }
-				float			_BCL	hi_limit			( u8 k )	const	{ return engine_hi_limit(k); }
+    IBoneData& _BCL GetChild(u16 id) { return *children[id]; }
+    const IBoneData& _BCL GetChild(u16 id) const { return *children[id]; }
+    u16 _BCL GetSelfID() const { return (u16)SelfID; }
+    u16 _BCL GetNumChildren() const { return u16(children.size()); }
+    const SJointIKData& _BCL get_IK_data() const { return IK_data; }
+    const Fmatrix& _BCL get_bind_transform() const
+    {
+
+        return local_rest_transform;
+
+    }
+    const SBoneShape& _BCL get_shape() const { return shape; }
+
+    const Fobb& _BCL get_obb() const;
+    const Fvector& _BCL get_center_of_mass() const { return center_of_mass; }
+    float _BCL get_mass() const { return mass; }
+    u16 _BCL get_game_mtl_idx() const;
+    u16 _BCL GetParentID() const { if (parent) return u16(parent->SelfID); else return u16(-1); };
+    float _BCL lo_limit(u8 k) const { return engine_lo_limit(k); }
+    float _BCL hi_limit(u8 k) const { return engine_hi_limit(k); }
 };
 
 //*** Shared Bone Data ****************************************************************************
 class CBoneData;
 // t-defs
-typedef xr_vector<CBoneData*>		vecBones;
-typedef vecBones::iterator			vecBonesIt;
+typedef xr_vector<CBoneData*> vecBones;
+typedef vecBones::iterator vecBonesIt;
 
 
-class 	ENGINE_API	CBoneData:
-	public IBoneData
+class ENGINE_API CBoneData :
+    public IBoneData
 {
 protected:
-	u16					SelfID;
-	u16					ParentID;
+    u16 SelfID;
+    u16 ParentID;
 public:
-	shared_str			name;
+    shared_str name;
 
 
-	Fobb				obb;			
+    Fobb obb;
 
-	Fmatrix				bind_transform;
-	Fmatrix				m2b_transform;	// model to bone conversion transform
-	SBoneShape			shape;
-	shared_str			game_mtl_name;
-	u16					game_mtl_idx;
-	SJointIKData		IK_data;
-	float				mass;
-	Fvector				center_of_mass;
+    Fmatrix bind_transform;
+    Fmatrix m2b_transform; // model to bone conversion transform
+    SBoneShape shape;
+    shared_str game_mtl_name;
+    u16 game_mtl_idx;
+    SJointIKData IK_data;
+    float mass;
+    Fvector center_of_mass;
 
 
-	vecBones			children;		// bones which are slaves to this
+    vecBones children; // bones which are slaves to this
 
-	DEFINE_VECTOR		(u16,FacesVec,FacesVecIt);
-	DEFINE_VECTOR		(FacesVec,ChildFacesVec,ChildFacesVecIt);
-	ChildFacesVec		child_faces;	// shared
-public:    
-	CBoneData		(u16 ID):SelfID(ID)	{VERIFY(SelfID!=BI_NONE);}
-	virtual				~CBoneData		()					{}
+    DEFINE_VECTOR(u16, FacesVec, FacesVecIt);
+    DEFINE_VECTOR(FacesVec, ChildFacesVec, ChildFacesVecIt);
+    ChildFacesVec child_faces; // shared
+public:
+    CBoneData(u16 ID) :SelfID(ID) { VERIFY(SelfID != BI_NONE); }
+    virtual ~CBoneData() {}
 #ifdef DEBUG
-	typedef svector<int,128>	BoneDebug;
-	void						DebugQuery		(BoneDebug& L);
+    typedef svector<int, 128> BoneDebug;
+    void DebugQuery(BoneDebug& L);
 #endif
-	IC void				SetParentID		(u16 id){ParentID=id;}
-
-	IC u16		_BCL	GetSelfID		() const {return SelfID;}
-	IC u16		_BCL	GetParentID		() const {return ParentID;}
-
-	// assign face
-	void				AppendFace		(u16 child_idx, u16 idx)
-	{
-		child_faces[child_idx].push_back(idx);
-	}
-	// Calculation
-	void				CalculateM2B	(const Fmatrix& Parent);
+    IC void SetParentID(u16 id) { ParentID = id; }
+
+    IC u16 _BCL GetSelfID() const { return SelfID; }
+    IC u16 _BCL GetParentID() const { return ParentID; }
+
+    // assign face
+    void AppendFace(u16 child_idx, u16 idx)
+    {
+        child_faces[child_idx].push_back(idx);
+    }
+    // Calculation
+    void CalculateM2B(const Fmatrix& Parent);
 private:
-				IBoneData&		_BCL	GetChild			( u16 id ) { return *children[id]; }
-		const	IBoneData&		_BCL	GetChild			( u16 id )	const { return *children[id]; }
-				u16				_BCL	GetNumChildren		( )			const { return (u16)children.size(); }
-		const	SJointIKData&	_BCL	get_IK_data			( )			const	{return	IK_data;}
-		const	Fmatrix&		_BCL	get_bind_transform	( )			const	{return	bind_transform;}
-		const	SBoneShape&		_BCL	get_shape			( )			const	{return shape;}
-		const	Fobb&			_BCL	get_obb				( )			const	{return obb;}
-		const	Fvector&		_BCL	get_center_of_mass	( )			const	{return center_of_mass;}
-				float			_BCL	get_mass			( )			const	{return mass;}
-				u16				_BCL	get_game_mtl_idx	( )			const	{return game_mtl_idx;}
-				float			_BCL	lo_limit			( u8 k )	const	{return IK_data.limits[k].limit.x;}
-				float			_BCL	hi_limit			( u8 k )	const	{return IK_data.limits[k].limit.y;}
+    IBoneData& _BCL GetChild(u16 id) { return *children[id]; }
+    const IBoneData& _BCL GetChild(u16 id) const { return *children[id]; }
+    u16 _BCL GetNumChildren() const { return (u16)children.size(); }
+    const SJointIKData& _BCL get_IK_data() const { return IK_data; }
+    const Fmatrix& _BCL get_bind_transform() const { return bind_transform; }
+    const SBoneShape& _BCL get_shape() const { return shape; }
+    const Fobb& _BCL get_obb() const { return obb; }
+    const Fvector& _BCL get_center_of_mass() const { return center_of_mass; }
+    float _BCL get_mass() const { return mass; }
+    u16 _BCL get_game_mtl_idx() const { return game_mtl_idx; }
+    float _BCL lo_limit(u8 k) const { return IK_data.limits[k].limit.x; }
+    float _BCL hi_limit(u8 k) const { return IK_data.limits[k].limit.y; }
 public:
-	virtual u32			mem_usage		()
-	{
-		u32 sz			= sizeof(*this)+sizeof(vecBones::value_type)*children.size();
-		for (ChildFacesVecIt c_it=child_faces.begin(); c_it!=child_faces.end(); c_it++)
-			sz			+= c_it->size()*sizeof(FacesVec::value_type)+sizeof(*c_it);
-		return			sz;
-	}
+    virtual u32 mem_usage()
+    {
+        u32 sz = sizeof(*this) + sizeof(vecBones::value_type)*children.size();
+        for (ChildFacesVecIt c_it = child_faces.begin(); c_it != child_faces.end(); c_it++)
+            sz += c_it->size()*sizeof(FacesVec::value_type) + sizeof(*c_it);
+        return sz;
+    }
 };
 
 
 
 
-enum EBoneCallbackType{
-	bctDummy			= u32(0),	// 0 - required!!!
-	bctPhysics,
-	bctCustom,
-	bctForceU32			= u32(-1),
+enum EBoneCallbackType
+{
+    bctDummy = u32(0), // 0 - required!!!
+    bctPhysics,
+    bctCustom,
+    bctForceU32 = u32(-1),
 };
 
 
-IC void		CBoneInstance::construct	()
+IC void CBoneInstance::construct()
 {
-	ZeroMemory					(this,sizeof(*this));
-	mTransform.identity			();
+    ZeroMemory(this, sizeof(*this));
+    mTransform.identity();
 
-	mRenderTransform.identity	();
-	Callback_overwrite			= FALSE;
+    mRenderTransform.identity();
+    Callback_overwrite = FALSE;
 }
 
 
diff --git a/src/xrEngine/cf_dynamic_mesh.cpp b/src/xrEngine/cf_dynamic_mesh.cpp
index b84779cd000..228aaf596db 100644
--- a/src/xrEngine/cf_dynamic_mesh.cpp
+++ b/src/xrEngine/cf_dynamic_mesh.cpp
@@ -1,70 +1,70 @@
-#include	"stdafx.h"
+#include "stdafx.h"
 
-#include	"cf_dynamic_mesh.h"
+#include "cf_dynamic_mesh.h"
 
-#include	"xr_object.h"
+#include "xr_object.h"
 
 #include "../Include/xrRender/RenderVisual.h"
 #include "../Include/xrRender/Kinematics.h"
 
 #ifdef DEBUG
-#include	"iphdebug.h"
+#include "iphdebug.h"
 #endif
 
-BOOL	CCF_DynamicMesh::_RayQuery( const collide::ray_defs& Q, collide::rq_results& R)
+BOOL CCF_DynamicMesh::_RayQuery(const collide::ray_defs& Q, collide::rq_results& R)
 {
-	int s_count = R.r_count();
-	BOOL res = inherited::_RayQuery( Q, R );
-	if( !res )
-		return FALSE;
+    int s_count = R.r_count();
+    BOOL res = inherited::_RayQuery(Q, R);
+    if (!res)
+        return FALSE;
 
-	VERIFY( owner );
-	VERIFY( owner->Visual() );
-	IKinematics *K = owner->Visual()->dcast_PKinematics();
-	
-	struct spick
-	{
-		 const collide::ray_defs& Q;
-		 const  CObject			& obj;
-		 IKinematics			& K;
-		 
-		 spick(  const collide::ray_defs& Q_, const CObject &obj_, IKinematics &K_ ): Q( Q_ ), obj( obj_ ), K( K_ )
-		 {
+    VERIFY(owner);
+    VERIFY(owner->Visual());
+    IKinematics* K = owner->Visual()->dcast_PKinematics();
 
-		 }
-		 
-		 bool operator() ( collide::rq_result &r )
-		{
-			IKinematics::pick_result br;
-			VERIFY( r.O == &obj );
-			bool  res = K.PickBone( obj.XFORM(), br, Q.range, Q.start, Q.dir, (u16) r.element ) ;
-			if(res)
-			{
-				r.range = br.dist;
-			}
-#if	0
-			if(res)
-			{
-				ph_debug_render->open_cashed_draw();
-				ph_debug_render->draw_tri(  br.tri[0], br.tri[1], br.tri[2], D3DCOLOR_ARGB(50, 255,0,0), 0 );
-				ph_debug_render->close_cashed_draw(50000);
-			}
+    struct spick
+    {
+        const collide::ray_defs& Q;
+        const CObject& obj;
+        IKinematics& K;
+
+        spick(const collide::ray_defs& Q_, const CObject& obj_, IKinematics& K_) : Q(Q_), obj(obj_), K(K_)
+        {
+
+        }
+
+        bool operator() (collide::rq_result& r)
+        {
+            IKinematics::pick_result br;
+            VERIFY(r.O == &obj);
+            bool res = K.PickBone(obj.XFORM(), br, Q.range, Q.start, Q.dir, (u16)r.element);
+            if (res)
+            {
+                r.range = br.dist;
+            }
+#if 0
+            if (res)
+            {
+                ph_debug_render->open_cashed_draw();
+                ph_debug_render->draw_tri(br.tri[0], br.tri[1], br.tri[2], D3DCOLOR_ARGB(50, 255, 0, 0), 0);
+                ph_debug_render->close_cashed_draw(50000);
+            }
 #endif
-			return !res;
-		}
-		private:
-			spick& operator = (spick& ){ NODEFAULT;  return *this; }
-	} pick( (collide::ray_defs&) (Q), (const CObject &)(*owner),(IKinematics&) (*K) );
-	
-	R.r_results().erase( std::remove_if( R.r_results().begin() + s_count, R.r_results().end() , pick), R.r_results().end() );
-	/*
-	for( collide::rq_result* i = R.r_begin() + s_count; i < R.r_end(); ++i )
-	{
-		IKinematics::pick_result r;
-		if( K->PickBone( owner->XFORM(), r, Q.range, Q.start, Q.dir, (u16) i->element ) )
-			return TRUE;
-	}
-	*/
-	VERIFY( R.r_count() >= s_count );
-	return R.r_count() > s_count;
+            return !res;
+        }
+    private:
+        spick& operator = (spick&) { NODEFAULT; return *this; }
+    } pick((collide::ray_defs&) (Q), (const CObject&)(*owner), (IKinematics&)(*K));
+
+    R.r_results().erase(std::remove_if(R.r_results().begin() + s_count, R.r_results().end(), pick), R.r_results().end());
+    /*
+    for( collide::rq_result* i = R.r_begin() + s_count; i < R.r_end(); ++i )
+    {
+    IKinematics::pick_result r;
+    if( K->PickBone( owner->XFORM(), r, Q.range, Q.start, Q.dir, (u16) i->element ) )
+    return TRUE;
+    }
+    */
+    VERIFY(R.r_count() >= s_count);
+    return R.r_count() > s_count;
 }
\ No newline at end of file
diff --git a/src/xrEngine/cf_dynamic_mesh.h b/src/xrEngine/cf_dynamic_mesh.h
index 2f0395d47ea..683f250cba7 100644
--- a/src/xrEngine/cf_dynamic_mesh.h
+++ b/src/xrEngine/cf_dynamic_mesh.h
@@ -3,12 +3,12 @@
 #include "xr_collide_form.h"
 
 
-class ENGINE_API	CCF_DynamicMesh:
-public CCF_Skeleton
+class ENGINE_API CCF_DynamicMesh :
+    public CCF_Skeleton
 {
-	typedef	 CCF_Skeleton inherited;
+    typedef CCF_Skeleton inherited;
 public:
-						CCF_DynamicMesh	( CObject* _owner ) :CCF_Skeleton(_owner){};
+    CCF_DynamicMesh(CObject* _owner) :CCF_Skeleton(_owner) {};
 
-	virtual BOOL		_RayQuery		( const collide::ray_defs& Q, collide::rq_results& R);
+    virtual BOOL _RayQuery(const collide::ray_defs& Q, collide::rq_results& R);
 };
\ No newline at end of file
diff --git a/src/xrEngine/cl_intersect.h b/src/xrEngine/cl_intersect.h
index 35a48410ae3..638612f92bb 100644
--- a/src/xrEngine/cl_intersect.h
+++ b/src/xrEngine/cl_intersect.h
@@ -4,742 +4,849 @@
 
 namespace CDB
 {
-	//----------------------------------------------------------------------
-	// Name  : intersectRaySphere()
-	// Input : rO - origin of ray in world space
-	//         rV - _vector_ describing direction of ray in world space
-	//         sO - Origin of sphere
-	//         sR - radius of sphere
-	// Notes : Normalized directional vectors expected
-	// -----------------------------------------------------------------------
-	IC bool IntersectRaySphere(const Fvector& rO, const Fvector& rV, const Fvector& sO, float sR)
-	{
-		Fvector Q;
-		Q.sub(sO,rO);
-
-		float c = Q.magnitude();
-		float v = Q.dotproduct(rV);
-		float d = sR*sR - (c*c - v*v);
-
-		// If there was no intersection, return -1
-		return (d > 0.0);
-	}
-
-	//-- Ray-Triangle : 2nd level of indirection --------------------------------
-	IC bool TestRayTri(const Fvector& C, const Fvector& D, Fvector** p, float& u, float& v, float& range, bool bCull)
-	{
-		Fvector edge1, edge2, tvec, pvec, qvec;
-		float det,inv_det;
-		// find vectors for two edges sharing vert0
-		edge1.sub(*p[1], *p[0]);
-		edge2.sub(*p[2], *p[0]);
-		// begin calculating determinant - also used to calculate U parameter
-		pvec.crossproduct(D, edge2);
-		// if determinant is near zero, ray lies in plane of triangle
-		det = edge1.dotproduct(pvec);
-		if (bCull){						// define TEST_CULL if culling is desired
-			if (det < EPS)  return false;
-			tvec.sub(C, *p[0]);							// calculate distance from vert0 to ray origin
-			u = tvec.dotproduct(pvec);			// calculate U parameter and test bounds
-			if (u < 0.0 || u > det) return false;
-			qvec.crossproduct(tvec, edge1);				// prepare to test V parameter
-			v = D.dotproduct(qvec);			// calculate V parameter and test bounds
-			if (v < 0.0 || u + v > det) return false;
-			range = edge2.dotproduct(qvec);		// calculate t, scale parameters, ray intersects triangle
-			inv_det = 1.0f / det;
-			range *= inv_det;
-			u *= inv_det;
-			v *= inv_det;
-		}else{											// the non-culling branch
-			if (det > -EPS && det < EPS) return false;
-			inv_det = 1.0f / det;
-			tvec.sub(C, *p[0]);							// calculate distance from vert0 to ray origin
-			u = tvec.dotproduct(pvec)*inv_det;	// calculate U parameter and test bounds
-			if (u < 0.0f || u > 1.0f)    return false;
-			qvec.crossproduct(tvec, edge1);				// prepare to test V parameter
-			v = D.dotproduct(qvec)*inv_det;	// calculate V parameter and test bounds
-			if (v < 0.0f || u + v > 1.0f) return false;
-			range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects triangle
-		}
-		return true;
-	}
-	//-- Ray-Triangle : 1st level of indirection --------------------------------
-	IC bool TestRayTri(const Fvector& C, const Fvector& D, Fvector* p, float& u, float& v, float& range, bool bCull)
-	{
-		Fvector edge1, edge2, tvec, pvec, qvec;
-		float det,inv_det;
-		// find vectors for two edges sharing vert0
-		edge1.sub(p[1], p[0]);
-		edge2.sub(p[2], p[0]);
-		// begin calculating determinant - also used to calculate U parameter
-		pvec.crossproduct(D, edge2);
-		// if determinant is near zero, ray lies in plane of triangle
-		det = edge1.dotproduct(pvec);
-		if (bCull){						// define TEST_CULL if culling is desired
-			if (det < EPS)  return false;
-			tvec.sub(C, p[0]);							// calculate distance from vert0 to ray origin
-			u = tvec.dotproduct(pvec);			// calculate U parameter and test bounds
-			if (u < 0.0f || u > det) return false;
-			qvec.crossproduct(tvec, edge1);				// prepare to test V parameter
-			v = D.dotproduct(qvec);			// calculate V parameter and test bounds
-			if (v < 0.0f || u + v > det) return false;
-			range = edge2.dotproduct(qvec);		// calculate t, scale parameters, ray intersects triangle
-			inv_det = 1.0f / det;
-			range *= inv_det;
-			u *= inv_det;
-			v *= inv_det;
-		}else{											// the non-culling branch
-			if (det > -EPS && det < EPS) return false;
-			inv_det = 1.0f / det;
-			tvec.sub(C, p[0]);							// calculate distance from vert0 to ray origin
-			u = tvec.dotproduct(pvec)*inv_det;	// calculate U parameter and test bounds
-			if (u < 0.0f || u > 1.0f)    return false;
-			qvec.crossproduct(tvec, edge1);				// prepare to test V parameter
-			v = D.dotproduct(qvec)*inv_det;	// calculate V parameter and test bounds
-			if (v < 0.0f || u + v > 1.0f) return false;
-			range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects triangle
-		}
-		return true;
-	}
-
-	//-- Ray-Triangle(always return range) : 1st level of indirection --------------------------------
-	IC bool TestRayTri2(const Fvector& C, const Fvector& D, Fvector* p, float& range)
-	{
-		Fvector edge1, edge2, tvec, pvec, qvec;
-		float det,inv_det,u,v;
-
-		// find vectors for two edges sharing vert0
-		edge1.sub(p[1], p[0]);
-		edge2.sub(p[2], p[0]);
-		// begin calculating determinant - also used to calculate U parameter
-		pvec.crossproduct(D, edge2);
-		// if determinant is near zero, ray lies in plane of triangle
-		det = edge1.dotproduct(pvec);
-
-		if (_abs(det) < EPS_S)		{ range=-1; return false; }
-		inv_det = 1.0f / det;
-		tvec.sub(C, p[0]);					// calculate distance from vert0 to ray origin
-		u = tvec.dotproduct(pvec)*inv_det;	// calculate U parameter and test bounds
-		qvec.crossproduct(tvec, edge1);		// prepare to test V parameter
-		range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects plane
-		if (u < 0.0f || u > 1.0f)		return false;
-		v = D.dotproduct(qvec)*inv_det;		// calculate V parameter and test bounds
-		if (v < 0.0f || u + v > 1.0f) return false;
-		return true;
-	}
-	IC bool TestRayTri2(const Fvector& C, const Fvector& D, Fvector** p, float& range)
-	{
-		Fvector edge1, edge2, tvec, pvec, qvec;
-		float det,inv_det,u,v;
-
-		// find vectors for two edges sharing vert0
-		edge1.sub(*p[1], *p[0]);
-		edge2.sub(*p[2], *p[0]);
-		// begin calculating determinant - also used to calculate U parameter
-		pvec.crossproduct(D, edge2);
-		// if determinant is near zero, ray lies in plane of triangle
-		det = edge1.dotproduct(pvec);
-
-		if (_abs(det) < EPS_S)		{ range=-1; return false; }
-		inv_det = 1.0f / det;
-		tvec.sub(C, *p[0]);					// calculate distance from vert0 to ray origin
-		u = tvec.dotproduct(pvec)*inv_det;	// calculate U parameter and test bounds
-		qvec.crossproduct(tvec, edge1);		// prepare to test V parameter
-		range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects plane
-		if (u < 0.0f || u > 1.0f)		return false;
-		v = D.dotproduct(qvec)*inv_det;		// calculate V parameter and test bounds
-		if (v < 0.0f || u + v > 1.0f) return false;
-		return true;
-	}
-	//---------------------------------------------------------------------------
-	// macros for fast arithmetic
-	//---------------------------------------------------------------------------
-	//---------------------------------------------------------------------------
-	// compare [-r,r] to [NdD+dt*NdW]
+//----------------------------------------------------------------------
+// Name : intersectRaySphere()
+// Input : rO - origin of ray in world space
+// rV - _vector_ describing direction of ray in world space
+// sO - Origin of sphere
+// sR - radius of sphere
+// Notes : Normalized directional vectors expected
+// -----------------------------------------------------------------------
+IC bool IntersectRaySphere(const Fvector& rO, const Fvector& rV, const Fvector& sO, float sR)
+{
+    Fvector Q;
+    Q.sub(sO, rO);
+
+    float c = Q.magnitude();
+    float v = Q.dotproduct(rV);
+    float d = sR*sR - (c*c - v*v);
+
+    // If there was no intersection, return -1
+    return (d > 0.0);
+}
+
+//-- Ray-Triangle : 2nd level of indirection --------------------------------
+IC bool TestRayTri(const Fvector& C, const Fvector& D, Fvector** p, float& u, float& v, float& range, bool bCull)
+{
+    Fvector edge1, edge2, tvec, pvec, qvec;
+    float det, inv_det;
+    // find vectors for two edges sharing vert0
+    edge1.sub(*p[1], *p[0]);
+    edge2.sub(*p[2], *p[0]);
+    // begin calculating determinant - also used to calculate U parameter
+    pvec.crossproduct(D, edge2);
+    // if determinant is near zero, ray lies in plane of triangle
+    det = edge1.dotproduct(pvec);
+    if (bCull)
+    {
+        // define TEST_CULL if culling is desired
+        if (det < EPS) return false;
+        tvec.sub(C, *p[0]); // calculate distance from vert0 to ray origin
+        u = tvec.dotproduct(pvec); // calculate U parameter and test bounds
+        if (u < 0.0 || u > det) return false;
+        qvec.crossproduct(tvec, edge1); // prepare to test V parameter
+        v = D.dotproduct(qvec); // calculate V parameter and test bounds
+        if (v < 0.0 || u + v > det) return false;
+        range = edge2.dotproduct(qvec); // calculate t, scale parameters, ray intersects triangle
+        inv_det = 1.0f / det;
+        range *= inv_det;
+        u *= inv_det;
+        v *= inv_det;
+    }
+    else
+    {
+        // the non-culling branch
+        if (det > -EPS && det < EPS) return false;
+        inv_det = 1.0f / det;
+        tvec.sub(C, *p[0]); // calculate distance from vert0 to ray origin
+        u = tvec.dotproduct(pvec)*inv_det; // calculate U parameter and test bounds
+        if (u < 0.0f || u > 1.0f) return false;
+        qvec.crossproduct(tvec, edge1); // prepare to test V parameter
+        v = D.dotproduct(qvec)*inv_det; // calculate V parameter and test bounds
+        if (v < 0.0f || u + v > 1.0f) return false;
+        range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects triangle
+    }
+    return true;
+}
+//-- Ray-Triangle : 1st level of indirection --------------------------------
+IC bool TestRayTri(const Fvector& C, const Fvector& D, Fvector* p, float& u, float& v, float& range, bool bCull)
+{
+    Fvector edge1, edge2, tvec, pvec, qvec;
+    float det, inv_det;
+    // find vectors for two edges sharing vert0
+    edge1.sub(p[1], p[0]);
+    edge2.sub(p[2], p[0]);
+    // begin calculating determinant - also used to calculate U parameter
+    pvec.crossproduct(D, edge2);
+    // if determinant is near zero, ray lies in plane of triangle
+    det = edge1.dotproduct(pvec);
+    if (bCull)
+    {
+        // define TEST_CULL if culling is desired
+        if (det < EPS) return false;
+        tvec.sub(C, p[0]); // calculate distance from vert0 to ray origin
+        u = tvec.dotproduct(pvec); // calculate U parameter and test bounds
+        if (u < 0.0f || u > det) return false;
+        qvec.crossproduct(tvec, edge1); // prepare to test V parameter
+        v = D.dotproduct(qvec); // calculate V parameter and test bounds
+        if (v < 0.0f || u + v > det) return false;
+        range = edge2.dotproduct(qvec); // calculate t, scale parameters, ray intersects triangle
+        inv_det = 1.0f / det;
+        range *= inv_det;
+        u *= inv_det;
+        v *= inv_det;
+    }
+    else
+    {
+        // the non-culling branch
+        if (det > -EPS && det < EPS) return false;
+        inv_det = 1.0f / det;
+        tvec.sub(C, p[0]); // calculate distance from vert0 to ray origin
+        u = tvec.dotproduct(pvec)*inv_det; // calculate U parameter and test bounds
+        if (u < 0.0f || u > 1.0f) return false;
+        qvec.crossproduct(tvec, edge1); // prepare to test V parameter
+        v = D.dotproduct(qvec)*inv_det; // calculate V parameter and test bounds
+        if (v < 0.0f || u + v > 1.0f) return false;
+        range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects triangle
+    }
+    return true;
+}
+
+//-- Ray-Triangle(always return range) : 1st level of indirection --------------------------------
+IC bool TestRayTri2(const Fvector& C, const Fvector& D, Fvector* p, float& range)
+{
+    Fvector edge1, edge2, tvec, pvec, qvec;
+    float det, inv_det, u, v;
+
+    // find vectors for two edges sharing vert0
+    edge1.sub(p[1], p[0]);
+    edge2.sub(p[2], p[0]);
+    // begin calculating determinant - also used to calculate U parameter
+    pvec.crossproduct(D, edge2);
+    // if determinant is near zero, ray lies in plane of triangle
+    det = edge1.dotproduct(pvec);
+
+    if (_abs(det) < EPS_S) { range = -1; return false; }
+    inv_det = 1.0f / det;
+    tvec.sub(C, p[0]); // calculate distance from vert0 to ray origin
+    u = tvec.dotproduct(pvec)*inv_det; // calculate U parameter and test bounds
+    qvec.crossproduct(tvec, edge1); // prepare to test V parameter
+    range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects plane
+    if (u < 0.0f || u > 1.0f) return false;
+    v = D.dotproduct(qvec)*inv_det; // calculate V parameter and test bounds
+    if (v < 0.0f || u + v > 1.0f) return false;
+    return true;
+}
+IC bool TestRayTri2(const Fvector& C, const Fvector& D, Fvector** p, float& range)
+{
+    Fvector edge1, edge2, tvec, pvec, qvec;
+    float det, inv_det, u, v;
+
+    // find vectors for two edges sharing vert0
+    edge1.sub(*p[1], *p[0]);
+    edge2.sub(*p[2], *p[0]);
+    // begin calculating determinant - also used to calculate U parameter
+    pvec.crossproduct(D, edge2);
+    // if determinant is near zero, ray lies in plane of triangle
+    det = edge1.dotproduct(pvec);
+
+    if (_abs(det) < EPS_S) { range = -1; return false; }
+    inv_det = 1.0f / det;
+    tvec.sub(C, *p[0]); // calculate distance from vert0 to ray origin
+    u = tvec.dotproduct(pvec)*inv_det; // calculate U parameter and test bounds
+    qvec.crossproduct(tvec, edge1); // prepare to test V parameter
+    range = edge2.dotproduct(qvec)*inv_det;// calculate t, ray intersects plane
+    if (u < 0.0f || u > 1.0f) return false;
+    v = D.dotproduct(qvec)*inv_det; // calculate V parameter and test bounds
+    if (v < 0.0f || u + v > 1.0f) return false;
+    return true;
+}
+//---------------------------------------------------------------------------
+// macros for fast arithmetic
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// compare [-r,r] to [NdD+dt*NdW]
 #define TESTV0(NdD, R) \
-    if		(NdD> R) return false;\
-    else if	(NdD<-R) return false;
-	//---------------------------------------------------------------------------
-	// compare [-r,r] to [min{p,p+d0,p+d1},max{p,p+d0,p+d1}]
+ if (NdD> R) return false;\
+  else if (NdD<-R) return false;
+//---------------------------------------------------------------------------
+// compare [-r,r] to [min{p,p+d0,p+d1},max{p,p+d0,p+d1}]
 #define TESTV1(p,d0,d1,r){ \
-    if ( (p) > (r) ){ \
-	if ( (d0) >= 0.0f ){ \
-	if ( (d1) >= 0.0f ){ \
-				return false; \
-	}else{ \
-	if ( (p)+(d1) > (r) ) \
-	return false; \
-	} \
-	}else if ( (d1) <= (d0) ){ \
-	if ( (p)+(d1) > (r) ) \
-	return false; \
-	}else{ \
-	if ( (p)+(d0) > (r) ) \
-	return false; \
-	} \
-    }else if ( (p) < -(r) ){ \
-	if ( (d0) <= 0.0f ){ \
-	if ( (d1) <= 0.0f ){ \
-				return false; \
-	}else{ \
-	if ( (p)+(d1) < -(r) ) \
-	return false; \
-	} \
-	}else if ( (d1) >= (d0) ){ \
-	if ( (p)+(d1) < -(r) ) \
-	return false; \
-	}else{ \
-	if ( (p)+(d0) < -(r) ) \
-	return false; \
-	} \
-    } \
-	}
-	//---------------------------------------------------------------------------
-	// compare [-r,r] to [min{p,p+d},max{p,p+d}]
+ if ( (p) > (r) ){ \
+ if ( (d0) >= 0.0f ){ \
+ if ( (d1) >= 0.0f ){ \
+ return false; \
+  }else{ \
+ if ( (p)+(d1) > (r) ) \
+ return false; \
+  } \
+  }else if ( (d1) <= (d0) ){ \
+ if ( (p)+(d1) > (r) ) \
+ return false; \
+  }else{ \
+ if ( (p)+(d0) > (r) ) \
+ return false; \
+ } \
+  }else if ( (p) < -(r) ){ \
+ if ( (d0) <= 0.0f ){ \
+ if ( (d1) <= 0.0f ){ \
+ return false; \
+  }else{ \
+ if ( (p)+(d1) < -(r) ) \
+ return false; \
+  } \
+  }else if ( (d1) >= (d0) ){ \
+ if ( (p)+(d1) < -(r) ) \
+ return false; \
+  }else{ \
+ if ( (p)+(d0) < -(r) ) \
+ return false; \
+ } \
+  } \
+ }
+//---------------------------------------------------------------------------
+// compare [-r,r] to [min{p,p+d},max{p,p+d}]
 #define TESTV2(p,d,r){ \
-    if ( (p) > (r) ){ \
-	if ( (d) >= 0.0f ){ return false; \
-	}else{ if ( (p)+(d) > (r) ) return false; } \
-    }else if ( (p) < -(r) ){ \
-	if ( (d) <= 0.0f ){ return false; \
-	}else{ if ( (p)+(d) < -(r) ) return false; } \
-    } \
-	}
-	//---------------------------------------------------------------------------
-
-	IC bool TestBBoxTri(const Fmatrix33& A, const Fvector& T, const Fvector& extA, Fvector** p, BOOL bCulling){
-		// construct triangle normal, difference of center and vertex (18 ops)
-		Fvector D, E[2], N;
-		E[0].sub(*p[1],*p[0]);
-		E[1].sub(*p[2],*p[0]);
-		N.crossproduct(E[0],E[1]);
-
-		if (bCulling&&(A.k.dotproduct(N)>=0)) return false;
-
-		D.sub(*p[0],T);
-
-		// axis C+t*N
-		float A0dN = A.i.dotproduct(N);
-		float A1dN = A.j.dotproduct(N);
-		float A2dN = A.k.dotproduct(N);
-		float R = _abs(extA.x*A0dN)+_abs(extA.y*A1dN)+_abs(extA.z*A2dN);
-		float NdD = N.dotproduct(D);
-		TESTV0(NdD,R); //AXIS_N
-
-		// axis C+t*A0
-		float A0dD = A.i.dotproduct(D);
-		float A0dE0 = A.i.dotproduct(E[0]);
-		float A0dE1 = A.i.dotproduct(E[1]);
-		TESTV1(A0dD,A0dE0,A0dE1,extA.x); //AXIS_A0
-
-		// axis C+t*A1
-		float A1dD	= A.j.dotproduct(D);
-		float A1dE0 = A.j.dotproduct(E[0]);
-		float A1dE1 = A.j.dotproduct(E[1]);
-		TESTV1(A1dD,A1dE0,A1dE1,extA.y); //AXIS_A1
-
-		// axis C+t*A2
-		float A2dD	= A.k.dotproduct(D);
-		float A2dE0 = A.k.dotproduct(E[0]);
-		float A2dE1 = A.k.dotproduct(E[1]);
-		TESTV1(A2dD,A2dE0,A2dE1,extA.z); //AXIS_A2
-
-		// axis C+t*A0xE0
-		Fvector A0xE0;
-		A0xE0.crossproduct(A.i,E[0]);
-		float A0xE0dD = A0xE0.dotproduct(D);
-		R = _abs(extA.y*A2dE0)+_abs(extA.z*A1dE0);
-		TESTV2(A0xE0dD,A0dN,R); //AXIS_A0xE0
-
-		// axis C+t*A0xE1
-		Fvector A0xE1;
-		A0xE1.crossproduct(A.i,E[1]);
-		float A0xE1dD = A0xE1.dotproduct(D);
-		R = _abs(extA.y*A2dE1)+_abs(extA.z*A1dE1);
-		TESTV2(A0xE1dD,-A0dN,R); //AXIS_A0xE1
-
-		// axis C+t*A0xE2
-		float A1dE2 = A1dE1-A1dE0;
-		float A2dE2 = A2dE1-A2dE0;
-		float A0xE2dD = A0xE1dD-A0xE0dD;
-		R = _abs(extA.y*A2dE2)+_abs(extA.z*A1dE2);
-		TESTV2(A0xE2dD,-A0dN,R); //AXIS_A0xE2
-
-		// axis C+t*A1xE0
-		Fvector A1xE0;
-		A1xE0.crossproduct(A.j,E[0]);
-		float A1xE0dD = A1xE0.dotproduct(D);
-		R = _abs(extA.x*A2dE0)+_abs(extA.z*A0dE0);
-		TESTV2(A1xE0dD,A1dN,R); //AXIS_A1xE0
-
-		// axis C+t*A1xE1
-		Fvector A1xE1;
-		A1xE1.crossproduct(A.j,E[1]);
-		float A1xE1dD = A1xE1.dotproduct(D);
-		R = _abs(extA.x*A2dE1)+_abs(extA.z*A0dE1);
-		TESTV2(A1xE1dD,-A1dN,R); //AXIS_A1xE1
-
-		// axis C+t*A1xE2
-		float A0dE2 = A0dE1-A0dE0;
-		float A1xE2dD = A1xE1dD-A1xE0dD;
-		R = _abs(extA.x*A2dE2)+_abs(extA.z*A0dE2);
-		TESTV2(A1xE2dD,-A1dN,R); //AXIS_A1xE2
-
-		// axis C+t*A2xE0
-		Fvector A2xE0;
-		A2xE0.crossproduct(A.k,E[0]);
-		float A2xE0dD = A2xE0.dotproduct(D);
-		R = _abs(extA.x*A1dE0)+_abs(extA.y*A0dE0);
-		TESTV2(A2xE0dD,A2dN,R); //AXIS_A2xE0
-
-		// axis C+t*A2xE1
-		Fvector A2xE1;
-		A2xE1.crossproduct(A.k,E[1]);
-		float A2xE1dD = A2xE1.dotproduct(D);
-		R = _abs(extA.x*A1dE1)+_abs(extA.y*A0dE1);
-		TESTV2(A2xE1dD,-A2dN,R); //AXIS_A2xE1
-
-		// axis C+t*A2xE2
-		float A2xE2dD = A2xE1dD-A2xE0dD;
-		R = _abs(extA.x*A1dE2)+_abs(extA.y*A0dE2);
-		TESTV2(A2xE2dD,-A2dN,R); //AXIS_A2xE2
-
-		// intersection occurs
-		return true;
-	}
-	IC bool TestBBoxTri(const Fmatrix33& A, const Fvector& T, const Fvector& extA, Fvector* p, BOOL bCulling){
-		// construct triangle normal, difference of center and vertex (18 ops)
-		Fvector D, E[2], N;
-		E[0].sub(p[1],p[0]);
-		E[1].sub(p[2],p[0]);
-		N.crossproduct(E[0],E[1]);
-
-		if (bCulling&&(A.k.dotproduct(N)>=0)) return false;
-
-		D.sub(p[0],T);
-
-		// axis C+t*N
-		float A0dN = A.i.dotproduct(N);
-		float A1dN = A.j.dotproduct(N);
-		float A2dN = A.k.dotproduct(N);
-		float R = _abs(extA.x*A0dN)+_abs(extA.y*A1dN)+_abs(extA.z*A2dN);
-		float NdD = N.dotproduct(D);
-		TESTV0(NdD,R); //AXIS_N
-
-		// axis C+t*A0
-		float A0dD = A.i.dotproduct(D);
-		float A0dE0 = A.i.dotproduct(E[0]);
-		float A0dE1 = A.i.dotproduct(E[1]);
-		TESTV1(A0dD,A0dE0,A0dE1,extA.x); //AXIS_A0
-
-		// axis C+t*A1
-		float A1dD	= A.j.dotproduct(D);
-		float A1dE0 = A.j.dotproduct(E[0]);
-		float A1dE1 = A.j.dotproduct(E[1]);
-		TESTV1(A1dD,A1dE0,A1dE1,extA.y); //AXIS_A1
-
-		// axis C+t*A2
-		float A2dD	= A.k.dotproduct(D);
-		float A2dE0 = A.k.dotproduct(E[0]);
-		float A2dE1 = A.k.dotproduct(E[1]);
-		TESTV1(A2dD,A2dE0,A2dE1,extA.z); //AXIS_A2
-
-		// axis C+t*A0xE0
-		Fvector A0xE0;
-		A0xE0.crossproduct(A.i,E[0]);
-		float A0xE0dD = A0xE0.dotproduct(D);
-		R = _abs(extA.y*A2dE0)+_abs(extA.z*A1dE0);
-		TESTV2(A0xE0dD,A0dN,R); //AXIS_A0xE0
-
-		// axis C+t*A0xE1
-		Fvector A0xE1;
-		A0xE1.crossproduct(A.i,E[1]);
-		float A0xE1dD = A0xE1.dotproduct(D);
-		R = _abs(extA.y*A2dE1)+_abs(extA.z*A1dE1);
-		TESTV2(A0xE1dD,-A0dN,R); //AXIS_A0xE1
-
-		// axis C+t*A0xE2
-		float A1dE2 = A1dE1-A1dE0;
-		float A2dE2 = A2dE1-A2dE0;
-		float A0xE2dD = A0xE1dD-A0xE0dD;
-		R = _abs(extA.y*A2dE2)+_abs(extA.z*A1dE2);
-		TESTV2(A0xE2dD,-A0dN,R); //AXIS_A0xE2
-
-		// axis C+t*A1xE0
-		Fvector A1xE0;
-		A1xE0.crossproduct(A.j,E[0]);
-		float A1xE0dD = A1xE0.dotproduct(D);
-		R = _abs(extA.x*A2dE0)+_abs(extA.z*A0dE0);
-		TESTV2(A1xE0dD,A1dN,R); //AXIS_A1xE0
-
-		// axis C+t*A1xE1
-		Fvector A1xE1;
-		A1xE1.crossproduct(A.j,E[1]);
-		float A1xE1dD = A1xE1.dotproduct(D);
-		R = _abs(extA.x*A2dE1)+_abs(extA.z*A0dE1);
-		TESTV2(A1xE1dD,-A1dN,R); //AXIS_A1xE1
-
-		// axis C+t*A1xE2
-		float A0dE2 = A0dE1-A0dE0;
-		float A1xE2dD = A1xE1dD-A1xE0dD;
-		R = _abs(extA.x*A2dE2)+_abs(extA.z*A0dE2);
-		TESTV2(A1xE2dD,-A1dN,R); //AXIS_A1xE2
-
-		// axis C+t*A2xE0
-		Fvector A2xE0;
-		A2xE0.crossproduct(A.k,E[0]);
-		float A2xE0dD = A2xE0.dotproduct(D);
-		R = _abs(extA.x*A1dE0)+_abs(extA.y*A0dE0);
-		TESTV2(A2xE0dD,A2dN,R); //AXIS_A2xE0
-
-		// axis C+t*A2xE1
-		Fvector A2xE1;
-		A2xE1.crossproduct(A.k,E[1]);
-		float A2xE1dD = A2xE1.dotproduct(D);
-		R = _abs(extA.x*A1dE1)+_abs(extA.y*A0dE1);
-		TESTV2(A2xE1dD,-A2dN,R); //AXIS_A2xE1
-
-		// axis C+t*A2xE2
-		float A2xE2dD = A2xE1dD-A2xE0dD;
-		R = _abs(extA.x*A1dE2)+_abs(extA.y*A0dE2);
-		TESTV2(A2xE2dD,-A2dN,R); //AXIS_A2xE2
-
-		// intersection occurs
-		return true;
-	}
-	//---------------------------------------------------------------------------}
-
-	//----------------------------------------------------------------------------
-	IC float MgcSqrDistance (const Fvector& rkPoint, const Fvector& orig, const Fvector& e0,const Fvector& e1){
-
-		Fvector kDiff;
-		kDiff.sub(orig,rkPoint);
-
-		float fA00 = e0.square_magnitude();
-		float fA01 = e0.dotproduct(e1);
-		float fA11 = e1.square_magnitude();
-		float fB0 = kDiff.dotproduct(e0);
-		float fB1 = kDiff.dotproduct(e1);
-		float fC = kDiff.square_magnitude();
-		float fDet = _abs(fA00*fA11-fA01*fA01);
-		float fS = fA01*fB1-fA11*fB0;
-		float fT = fA01*fB0-fA00*fB1;
-		float fSqrDist;
-
-		if ( fS + fT <= fDet ){
-			if ( fS < 0.0f ){
-				if ( fT < 0.0f ){  // region 4
-					if ( fB0 < 0.0f ){
-						fT = 0.0f;
-						if ( -fB0 >= fA00 ){
-							fS = 1.0f;
-							fSqrDist = fA00+2.0f*fB0+fC;
-						}else{
-							fS = -fB0/fA00;
-							fSqrDist = fB0*fS+fC;
-						}
-					}else{
-						fS = 0.0f;
-						if ( fB1 >= 0.0f ){
-							fT = 0.0f;
-							fSqrDist = fC;
-						}else if ( -fB1 >= fA11 ){
-							fT = 1.0f;
-							fSqrDist = fA11+2.0f*fB1+fC;
-						}else{
-							fT = -fB1/fA11;
-							fSqrDist = fB1*fT+fC;
-						}
-					}
-				}else{  // region 3
-					fS = 0.0f;
-					if ( fB1 >= 0.0f ){
-						fT = 0.0f;
-						fSqrDist = fC;
-					}else if ( -fB1 >= fA11 ){
-						fT = 1;
-						fSqrDist = fA11+2.0f*fB1+fC;
-					}else{
-						fT = -fB1/fA11;
-						fSqrDist = fB1*fT+fC;
-					}
-				}
-			}else if ( fT < 0.0f ){  // region 5
-				fT = 0.0f;
-				if ( fB0 >= 0.0f ){
-					fS = 0.0f;
-					fSqrDist = fC;
-				}else if ( -fB0 >= fA00 ){
-					fS = 1.0;
-					fSqrDist = fA00+2.0f*fB0+fC;
-				}else{
-					fS = -fB0/fA00;
-					fSqrDist = fB0*fS+fC;
-				}
-			}else{  // region 0
-				// minimum at interior point
-				float fInvDet = 1.0f/fDet;
-				fS *= fInvDet;
-				fT *= fInvDet;
-				fSqrDist = fS*(fA00*fS+fA01*fT+2.0f*fB0) +
-					fT*(fA01*fS+fA11*fT+2.0f*fB1)+fC;
-			}
-		}else{
-			float fTmp0, fTmp1, fNumer, fDenom;
-
-			if ( fS < 0.0f ){  // region 2
-				fTmp0 = fA01 + fB0;
-				fTmp1 = fA11 + fB1;
-				if ( fTmp1 > fTmp0 ){
-					fNumer = fTmp1 - fTmp0;
-					fDenom = fA00-2.0f*fA01+fA11;
-					if ( fNumer >= fDenom ){
-						fS = 1.0f;
-						fT = 0.0f;
-						fSqrDist = fA00+2.0f*fB0+fC;
-					}else{
-						fS = fNumer/fDenom;
-						fT = 1.0f - fS;
-						fSqrDist = fS*(fA00*fS+fA01*fT+2.0f*fB0) +
-							fT*(fA01*fS+fA11*fT+2.0f*fB1)+fC;
-					}
-				}else{
-					fS = 0.0f;
-					if ( fTmp1 <= 0.0f ){
-						fT = 1.0f;
-						fSqrDist = fA11+2.0f*fB1+fC;
-					}else if ( fB1 >= 0.0f ){
-						fT = 0.0f;
-						fSqrDist = fC;
-					}else{
-						fT = -fB1/fA11;
-						fSqrDist = fB1*fT+fC;
-					}
-				}
-			}else if ( fT < 0.0 ){  // region 6
-				fTmp0 = fA01 + fB1;
-				fTmp1 = fA00 + fB0;
-				if ( fTmp1 > fTmp0 ){
-					fNumer = fTmp1 - fTmp0;
-					fDenom = fA00-2.0f*fA01+fA11;
-					if ( fNumer >= fDenom ){
-						fT = 1.0f;
-						fS = 0.0f;
-						fSqrDist = fA11+2.0f*fB1+fC;
-					}else{
-						fT = fNumer/fDenom;
-						fS = 1.0f - fT;
-						fSqrDist = fS*(fA00*fS+fA01*fT+2.0f*fB0) +
-							fT*(fA01*fS+fA11*fT+2.0f*fB1)+fC;
-					}
-				}else{
-					fT = 0.0f;
-					if ( fTmp1 <= 0.0f ){
-						fS = 1.0f;
-						fSqrDist = fA00+2.0f*fB0+fC;
-					}else if ( fB0 >= 0.0f ){
-						fS = 0.0f;
-						fSqrDist = fC;
-					}else{
-						fS = -fB0/fA00;
-						fSqrDist = fB0*fS+fC;
-					}
-				}
-			}else{  // region 1
-				fNumer = fA11 + fB1 - fA01 - fB0;
-				if ( fNumer <= 0.0f ){
-					fS = 0.0f;
-					fT = 1.0f;
-					fSqrDist = fA11+2.0f*fB1+fC;
-				}else{
-					fDenom = fA00-2.0f*fA01+fA11;
-					if ( fNumer >= fDenom ){
-						fS = 1.0f;
-						fT = 0.0f;
-						fSqrDist = fA00+2.0f*fB0+fC;
-					}else{
-						fS = fNumer/fDenom;
-						fT = 1.0f - fS;
-						fSqrDist = fS*(fA00*fS+fA01*fT+2.0f*fB0) +
-							fT*(fA01*fS+fA11*fT+2.0f*fB1)+fC;
-					}
-				}
-			}
-		}
-
-		return _abs(fSqrDist);
-	}
-
-	enum EST_Result{
-		stNone		= 0,
-		stIntersect	= 1,
-		stInside	= 2,
-	};
-
-	IC EST_Result TestSphereTri(const Fvector& sphereOrigin, float sphereRadius,
-						const Fvector& orig, const Fvector& e0,const Fvector& e1)
-	{
-
-		float fRSqr = sphereRadius*sphereRadius;
-		Fvector kV0mC;
-		kV0mC.sub(orig, sphereOrigin);
-
-		// count the number of triangle vertices inside the sphere
-		int iInside = 0;
-
-		// test if v0 is inside the sphere
-		if ( kV0mC.square_magnitude() <= fRSqr )
-			iInside++;
-
-		// test if v1 is inside the sphere
-		Fvector kDiff;
-		kDiff.add(kV0mC, e0);
-		if ( kDiff.square_magnitude() <= fRSqr )
-			iInside++;
-
-		// test if v2 is inside the sphere
-		kDiff.add(kV0mC, e1);
-		if ( kDiff.square_magnitude() <= fRSqr )
-			iInside++;
-
-		// triangle does not traversely intersect sphere
-		if ( iInside == 3 ) return stInside;
-
-		// triangle transversely intersects sphere
-		if ( iInside > 0 ) return stIntersect;
-
-		// All vertices are outside the sphere, but the triangle might still
-		// intersect the sphere.  This is the case when the distance from the
-		// sphere center to the triangle is smaller than the radius.
-		float fSqrDist = MgcSqrDistance(sphereOrigin,orig,e0,e1);
-		return (fSqrDist < fRSqr)?stIntersect:stNone;
-	}
-	//---------------------------------------------------------------------------
-	IC EST_Result TestSphereTri(const Fvector& sphereOrigin, float sphereRadius, Fvector* p)
-	{
-		Fvector e0, e1;
-		// find vectors for two edges sharing vert0
-		e0.sub(p[1], p[0]);
-		e1.sub(p[2], p[0]);
-		return TestSphereTri(sphereOrigin,sphereRadius,p[0],e0,e1);
-	}
-	IC EST_Result TestSphereTri(const Fvector& sphereOrigin, float sphereRadius, Fvector** p)
-	{
-		Fvector e0, e1;
-		// find vectors for two edges sharing vert0
-		e0.sub(*p[1], *p[0]);
-		e1.sub(*p[2], *p[0]);
-		return TestSphereTri(sphereOrigin,sphereRadius,*p[0],e0,e1);
-	}
-	IC bool TestSphereOBB(const Fsphere& rkSphere, const Fobb& rkBox)
-	{
-		// Test for intersection in the coordinate system of the box by
-		// transforming the sphere into that coordinate system.
-		Fvector3 kCDiff;
-		kCDiff.sub(rkSphere.P,rkBox.m_translate);
-
-		float fAx = _abs(kCDiff.dotproduct(rkBox.m_rotate.i));
-		float fAy = _abs(kCDiff.dotproduct(rkBox.m_rotate.j));
-		float fAz = _abs(kCDiff.dotproduct(rkBox.m_rotate.k));
-		float fDx = fAx - rkBox.m_halfsize[0];
-		float fDy = fAy - rkBox.m_halfsize[1];
-		float fDz = fAz - rkBox.m_halfsize[2];
-
-		if ( fAx <= rkBox.m_halfsize[0] ){
-			if ( fAy <= rkBox.m_halfsize[1] ){
-				if ( fAz <= rkBox.m_halfsize[2] ){
-					// sphere center inside box
-					return true;
-				}else{
-					// potential sphere-face intersection with face z
-					return fDz <= rkSphere.R;
-				}
-			}else{
-				if ( fAz <= rkBox.m_halfsize[2] ){
-					// potential sphere-face intersection with face y
-					return fDy <= rkSphere.R;
-				}else{
-					// potential sphere-edge intersection with edge formed
-					// by faces y and z
-					float fRSqr = rkSphere.R*rkSphere.R;
-					return fDy*fDy + fDz*fDz <= fRSqr;
-				}
-			}
-		}else{
-			if ( fAy <= rkBox.m_halfsize[1] ){
-				if ( fAz <= rkBox.m_halfsize[2] ){
-					// potential sphere-face intersection with face x
-					return fDx <= rkSphere.R;
-				}else{
-					// potential sphere-edge intersection with edge formed
-					// by faces x and z
-					float fRSqr = rkSphere.R*rkSphere.R;
-					return fDx*fDx + fDz*fDz <= fRSqr;
-				}
-			}else{
-				if ( fAz <= rkBox.m_halfsize[2] ){
-					// potential sphere-edge intersection with edge formed
-					// by faces x and y
-					float fRSqr = rkSphere.R*rkSphere.R;
-					return fDx*fDx + fDy*fDy <= fRSqr;
-				}else{
-					// potential sphere-vertex intersection at corner formed
-					// by faces x,y,z
-					float fRSqr = rkSphere.R*rkSphere.R;
-					return fDx*fDx + fDy*fDy + fDz*fDz <= fRSqr;
-				}
-			}
-		}
-	}
-	//----------------------------------------------------------------------------
-	IC bool TestRayOBB (const Fvector3& origin, const Fvector3& direction, const Fobb& rkBox)
-	{
-		float			fWdU[3], fAWdU[3], fDdU[3], fADdU[3], fAWxDdU[3], fRhs;
-
-		Fvector3		kDiff;
-		kDiff.sub		(origin,rkBox.m_translate);
-
-		fWdU[0]			= direction.dotproduct(rkBox.m_rotate.i);
-		fAWdU[0]		= _abs(fWdU[0]);
-		fDdU[0]			= kDiff.dotproduct(rkBox.m_rotate.i);
-		fADdU[0]		= _abs(fDdU[0]);
-		if ( fADdU[0] > rkBox.m_halfsize[0] && fDdU[0]*fWdU[0] >= (float)0.0 )
-			return false;
-
-		fWdU[1]			= direction.dotproduct(rkBox.m_rotate.j);
-		fAWdU[1]		= _abs(fWdU[1]);
-		fDdU[1]			= kDiff.dotproduct(rkBox.m_rotate.j);
-		fADdU[1]		= _abs(fDdU[1]);
-		if ( fADdU[1] > rkBox.m_halfsize[1] && fDdU[1]*fWdU[1] >= (float)0.0 )
-			return false;
-
-		fWdU[2]			= direction.dotproduct(rkBox.m_rotate.k);
-		fAWdU[2]		= _abs(fWdU[2]);
-		fDdU[2]			= kDiff.dotproduct(rkBox.m_rotate.k);
-		fADdU[2]		= _abs(fDdU[2]);
-		if ( fADdU[2] > rkBox.m_halfsize[2] && fDdU[2]*fWdU[2] >= (float)0.0 )
-			return false;
-
-		Fvector3		kWxD;
-		kWxD.crossproduct(direction,kDiff);
-
-		fAWxDdU[0]		= _abs(kWxD.dotproduct(rkBox.m_rotate.i));
-		fRhs = rkBox.m_halfsize[1]*fAWdU[2] + rkBox.m_halfsize[2]*fAWdU[1];
-		if ( fAWxDdU[0] > fRhs )
-			return false;
-
-		fAWxDdU[1]		= _abs(kWxD.dotproduct(rkBox.m_rotate.j));
-		fRhs = rkBox.m_halfsize[0]*fAWdU[2] + rkBox.m_halfsize[2]*fAWdU[0];
-		if ( fAWxDdU[1] > fRhs )
-			return false;
-
-		fAWxDdU[2]		= _abs(kWxD.dotproduct(rkBox.m_rotate.k));
-		fRhs = rkBox.m_halfsize[0]*fAWdU[1] + rkBox.m_halfsize[1]*fAWdU[0];
-		if ( fAWxDdU[2] > fRhs )
-			return false;
-
-		return true;
-	}
+ if ( (p) > (r) ){ \
+ if ( (d) >= 0.0f ){ return false; \
+  }else{ if ( (p)+(d) > (r) ) return false; } \
+  }else if ( (p) < -(r) ){ \
+ if ( (d) <= 0.0f ){ return false; \
+  }else{ if ( (p)+(d) < -(r) ) return false; } \
+  } \
+ }
+//---------------------------------------------------------------------------
+
+IC bool TestBBoxTri(const Fmatrix33& A, const Fvector& T, const Fvector& extA, Fvector** p, BOOL bCulling)
+{
+    // construct triangle normal, difference of center and vertex (18 ops)
+    Fvector D, E[2], N;
+    E[0].sub(*p[1], *p[0]);
+    E[1].sub(*p[2], *p[0]);
+    N.crossproduct(E[0], E[1]);
+
+    if (bCulling && (A.k.dotproduct(N) >= 0)) return false;
+
+    D.sub(*p[0], T);
+
+    // axis C+t*N
+    float A0dN = A.i.dotproduct(N);
+    float A1dN = A.j.dotproduct(N);
+    float A2dN = A.k.dotproduct(N);
+    float R = _abs(extA.x*A0dN) + _abs(extA.y*A1dN) + _abs(extA.z*A2dN);
+    float NdD = N.dotproduct(D);
+    TESTV0(NdD, R); //AXIS_N
+
+    // axis C+t*A0
+    float A0dD = A.i.dotproduct(D);
+    float A0dE0 = A.i.dotproduct(E[0]);
+    float A0dE1 = A.i.dotproduct(E[1]);
+    TESTV1(A0dD, A0dE0, A0dE1, extA.x); //AXIS_A0
+
+    // axis C+t*A1
+    float A1dD = A.j.dotproduct(D);
+    float A1dE0 = A.j.dotproduct(E[0]);
+    float A1dE1 = A.j.dotproduct(E[1]);
+    TESTV1(A1dD, A1dE0, A1dE1, extA.y); //AXIS_A1
+
+    // axis C+t*A2
+    float A2dD = A.k.dotproduct(D);
+    float A2dE0 = A.k.dotproduct(E[0]);
+    float A2dE1 = A.k.dotproduct(E[1]);
+    TESTV1(A2dD, A2dE0, A2dE1, extA.z); //AXIS_A2
+
+    // axis C+t*A0xE0
+    Fvector A0xE0;
+    A0xE0.crossproduct(A.i, E[0]);
+    float A0xE0dD = A0xE0.dotproduct(D);
+    R = _abs(extA.y*A2dE0) + _abs(extA.z*A1dE0);
+    TESTV2(A0xE0dD, A0dN, R); //AXIS_A0xE0
+
+    // axis C+t*A0xE1
+    Fvector A0xE1;
+    A0xE1.crossproduct(A.i, E[1]);
+    float A0xE1dD = A0xE1.dotproduct(D);
+    R = _abs(extA.y*A2dE1) + _abs(extA.z*A1dE1);
+    TESTV2(A0xE1dD, -A0dN, R); //AXIS_A0xE1
+
+    // axis C+t*A0xE2
+    float A1dE2 = A1dE1 - A1dE0;
+    float A2dE2 = A2dE1 - A2dE0;
+    float A0xE2dD = A0xE1dD - A0xE0dD;
+    R = _abs(extA.y*A2dE2) + _abs(extA.z*A1dE2);
+    TESTV2(A0xE2dD, -A0dN, R); //AXIS_A0xE2
+
+    // axis C+t*A1xE0
+    Fvector A1xE0;
+    A1xE0.crossproduct(A.j, E[0]);
+    float A1xE0dD = A1xE0.dotproduct(D);
+    R = _abs(extA.x*A2dE0) + _abs(extA.z*A0dE0);
+    TESTV2(A1xE0dD, A1dN, R); //AXIS_A1xE0
+
+    // axis C+t*A1xE1
+    Fvector A1xE1;
+    A1xE1.crossproduct(A.j, E[1]);
+    float A1xE1dD = A1xE1.dotproduct(D);
+    R = _abs(extA.x*A2dE1) + _abs(extA.z*A0dE1);
+    TESTV2(A1xE1dD, -A1dN, R); //AXIS_A1xE1
+
+    // axis C+t*A1xE2
+    float A0dE2 = A0dE1 - A0dE0;
+    float A1xE2dD = A1xE1dD - A1xE0dD;
+    R = _abs(extA.x*A2dE2) + _abs(extA.z*A0dE2);
+    TESTV2(A1xE2dD, -A1dN, R); //AXIS_A1xE2
+
+    // axis C+t*A2xE0
+    Fvector A2xE0;
+    A2xE0.crossproduct(A.k, E[0]);
+    float A2xE0dD = A2xE0.dotproduct(D);
+    R = _abs(extA.x*A1dE0) + _abs(extA.y*A0dE0);
+    TESTV2(A2xE0dD, A2dN, R); //AXIS_A2xE0
+
+    // axis C+t*A2xE1
+    Fvector A2xE1;
+    A2xE1.crossproduct(A.k, E[1]);
+    float A2xE1dD = A2xE1.dotproduct(D);
+    R = _abs(extA.x*A1dE1) + _abs(extA.y*A0dE1);
+    TESTV2(A2xE1dD, -A2dN, R); //AXIS_A2xE1
+
+    // axis C+t*A2xE2
+    float A2xE2dD = A2xE1dD - A2xE0dD;
+    R = _abs(extA.x*A1dE2) + _abs(extA.y*A0dE2);
+    TESTV2(A2xE2dD, -A2dN, R); //AXIS_A2xE2
+
+    // intersection occurs
+    return true;
+}
+IC bool TestBBoxTri(const Fmatrix33& A, const Fvector& T, const Fvector& extA, Fvector* p, BOOL bCulling)
+{
+    // construct triangle normal, difference of center and vertex (18 ops)
+    Fvector D, E[2], N;
+    E[0].sub(p[1], p[0]);
+    E[1].sub(p[2], p[0]);
+    N.crossproduct(E[0], E[1]);
+
+    if (bCulling && (A.k.dotproduct(N) >= 0)) return false;
+
+    D.sub(p[0], T);
+
+    // axis C+t*N
+    float A0dN = A.i.dotproduct(N);
+    float A1dN = A.j.dotproduct(N);
+    float A2dN = A.k.dotproduct(N);
+    float R = _abs(extA.x*A0dN) + _abs(extA.y*A1dN) + _abs(extA.z*A2dN);
+    float NdD = N.dotproduct(D);
+    TESTV0(NdD, R); //AXIS_N
+
+    // axis C+t*A0
+    float A0dD = A.i.dotproduct(D);
+    float A0dE0 = A.i.dotproduct(E[0]);
+    float A0dE1 = A.i.dotproduct(E[1]);
+    TESTV1(A0dD, A0dE0, A0dE1, extA.x); //AXIS_A0
+
+    // axis C+t*A1
+    float A1dD = A.j.dotproduct(D);
+    float A1dE0 = A.j.dotproduct(E[0]);
+    float A1dE1 = A.j.dotproduct(E[1]);
+    TESTV1(A1dD, A1dE0, A1dE1, extA.y); //AXIS_A1
+
+    // axis C+t*A2
+    float A2dD = A.k.dotproduct(D);
+    float A2dE0 = A.k.dotproduct(E[0]);
+    float A2dE1 = A.k.dotproduct(E[1]);
+    TESTV1(A2dD, A2dE0, A2dE1, extA.z); //AXIS_A2
+
+    // axis C+t*A0xE0
+    Fvector A0xE0;
+    A0xE0.crossproduct(A.i, E[0]);
+    float A0xE0dD = A0xE0.dotproduct(D);
+    R = _abs(extA.y*A2dE0) + _abs(extA.z*A1dE0);
+    TESTV2(A0xE0dD, A0dN, R); //AXIS_A0xE0
+
+    // axis C+t*A0xE1
+    Fvector A0xE1;
+    A0xE1.crossproduct(A.i, E[1]);
+    float A0xE1dD = A0xE1.dotproduct(D);
+    R = _abs(extA.y*A2dE1) + _abs(extA.z*A1dE1);
+    TESTV2(A0xE1dD, -A0dN, R); //AXIS_A0xE1
+
+    // axis C+t*A0xE2
+    float A1dE2 = A1dE1 - A1dE0;
+    float A2dE2 = A2dE1 - A2dE0;
+    float A0xE2dD = A0xE1dD - A0xE0dD;
+    R = _abs(extA.y*A2dE2) + _abs(extA.z*A1dE2);
+    TESTV2(A0xE2dD, -A0dN, R); //AXIS_A0xE2
+
+    // axis C+t*A1xE0
+    Fvector A1xE0;
+    A1xE0.crossproduct(A.j, E[0]);
+    float A1xE0dD = A1xE0.dotproduct(D);
+    R = _abs(extA.x*A2dE0) + _abs(extA.z*A0dE0);
+    TESTV2(A1xE0dD, A1dN, R); //AXIS_A1xE0
+
+    // axis C+t*A1xE1
+    Fvector A1xE1;
+    A1xE1.crossproduct(A.j, E[1]);
+    float A1xE1dD = A1xE1.dotproduct(D);
+    R = _abs(extA.x*A2dE1) + _abs(extA.z*A0dE1);
+    TESTV2(A1xE1dD, -A1dN, R); //AXIS_A1xE1
+
+    // axis C+t*A1xE2
+    float A0dE2 = A0dE1 - A0dE0;
+    float A1xE2dD = A1xE1dD - A1xE0dD;
+    R = _abs(extA.x*A2dE2) + _abs(extA.z*A0dE2);
+    TESTV2(A1xE2dD, -A1dN, R); //AXIS_A1xE2
+
+    // axis C+t*A2xE0
+    Fvector A2xE0;
+    A2xE0.crossproduct(A.k, E[0]);
+    float A2xE0dD = A2xE0.dotproduct(D);
+    R = _abs(extA.x*A1dE0) + _abs(extA.y*A0dE0);
+    TESTV2(A2xE0dD, A2dN, R); //AXIS_A2xE0
+
+    // axis C+t*A2xE1
+    Fvector A2xE1;
+    A2xE1.crossproduct(A.k, E[1]);
+    float A2xE1dD = A2xE1.dotproduct(D);
+    R = _abs(extA.x*A1dE1) + _abs(extA.y*A0dE1);
+    TESTV2(A2xE1dD, -A2dN, R); //AXIS_A2xE1
+
+    // axis C+t*A2xE2
+    float A2xE2dD = A2xE1dD - A2xE0dD;
+    R = _abs(extA.x*A1dE2) + _abs(extA.y*A0dE2);
+    TESTV2(A2xE2dD, -A2dN, R); //AXIS_A2xE2
+
+    // intersection occurs
+    return true;
+}
+//---------------------------------------------------------------------------}
+
+//----------------------------------------------------------------------------
+IC float MgcSqrDistance(const Fvector& rkPoint, const Fvector& orig, const Fvector& e0, const Fvector& e1)
+{
+
+    Fvector kDiff;
+    kDiff.sub(orig, rkPoint);
+
+    float fA00 = e0.square_magnitude();
+    float fA01 = e0.dotproduct(e1);
+    float fA11 = e1.square_magnitude();
+    float fB0 = kDiff.dotproduct(e0);
+    float fB1 = kDiff.dotproduct(e1);
+    float fC = kDiff.square_magnitude();
+    float fDet = _abs(fA00*fA11 - fA01*fA01);
+    float fS = fA01*fB1 - fA11*fB0;
+    float fT = fA01*fB0 - fA00*fB1;
+    float fSqrDist;
+
+    if (fS + fT <= fDet)
+    {
+        if (fS < 0.0f)
+        {
+            if (fT < 0.0f)
+            {
+                // region 4
+                if (fB0 < 0.0f)
+                {
+                    fT = 0.0f;
+                    if (-fB0 >= fA00)
+                    {
+                        fS = 1.0f;
+                        fSqrDist = fA00 + 2.0f*fB0 + fC;
+                    }
+                    else
+                    {
+                        fS = -fB0 / fA00;
+                        fSqrDist = fB0*fS + fC;
+                    }
+                }
+                else
+                {
+                    fS = 0.0f;
+                    if (fB1 >= 0.0f)
+                    {
+                        fT = 0.0f;
+                        fSqrDist = fC;
+                    }
+                    else if (-fB1 >= fA11)
+                    {
+                        fT = 1.0f;
+                        fSqrDist = fA11 + 2.0f*fB1 + fC;
+                    }
+                    else
+                    {
+                        fT = -fB1 / fA11;
+                        fSqrDist = fB1*fT + fC;
+                    }
+                }
+            }
+            else
+            {
+                // region 3
+                fS = 0.0f;
+                if (fB1 >= 0.0f)
+                {
+                    fT = 0.0f;
+                    fSqrDist = fC;
+                }
+                else if (-fB1 >= fA11)
+                {
+                    fT = 1;
+                    fSqrDist = fA11 + 2.0f*fB1 + fC;
+                }
+                else
+                {
+                    fT = -fB1 / fA11;
+                    fSqrDist = fB1*fT + fC;
+                }
+            }
+        }
+        else if (fT < 0.0f)
+        {
+            // region 5
+            fT = 0.0f;
+            if (fB0 >= 0.0f)
+            {
+                fS = 0.0f;
+                fSqrDist = fC;
+            }
+            else if (-fB0 >= fA00)
+            {
+                fS = 1.0;
+                fSqrDist = fA00 + 2.0f*fB0 + fC;
+            }
+            else
+            {
+                fS = -fB0 / fA00;
+                fSqrDist = fB0*fS + fC;
+            }
+        }
+        else
+        {
+            // region 0
+            // minimum at interior point
+            float fInvDet = 1.0f / fDet;
+            fS *= fInvDet;
+            fT *= fInvDet;
+            fSqrDist = fS*(fA00*fS + fA01*fT + 2.0f*fB0) +
+                       fT*(fA01*fS + fA11*fT + 2.0f*fB1) + fC;
+        }
+    }
+    else
+    {
+        float fTmp0, fTmp1, fNumer, fDenom;
+
+        if (fS < 0.0f)
+        {
+            // region 2
+            fTmp0 = fA01 + fB0;
+            fTmp1 = fA11 + fB1;
+            if (fTmp1 > fTmp0)
+            {
+                fNumer = fTmp1 - fTmp0;
+                fDenom = fA00 - 2.0f*fA01 + fA11;
+                if (fNumer >= fDenom)
+                {
+                    fS = 1.0f;
+                    fT = 0.0f;
+                    fSqrDist = fA00 + 2.0f*fB0 + fC;
+                }
+                else
+                {
+                    fS = fNumer / fDenom;
+                    fT = 1.0f - fS;
+                    fSqrDist = fS*(fA00*fS + fA01*fT + 2.0f*fB0) +
+                               fT*(fA01*fS + fA11*fT + 2.0f*fB1) + fC;
+                }
+            }
+            else
+            {
+                fS = 0.0f;
+                if (fTmp1 <= 0.0f)
+                {
+                    fT = 1.0f;
+                    fSqrDist = fA11 + 2.0f*fB1 + fC;
+                }
+                else if (fB1 >= 0.0f)
+                {
+                    fT = 0.0f;
+                    fSqrDist = fC;
+                }
+                else
+                {
+                    fT = -fB1 / fA11;
+                    fSqrDist = fB1*fT + fC;
+                }
+            }
+        }
+        else if (fT < 0.0)
+        {
+            // region 6
+            fTmp0 = fA01 + fB1;
+            fTmp1 = fA00 + fB0;
+            if (fTmp1 > fTmp0)
+            {
+                fNumer = fTmp1 - fTmp0;
+                fDenom = fA00 - 2.0f*fA01 + fA11;
+                if (fNumer >= fDenom)
+                {
+                    fT = 1.0f;
+                    fS = 0.0f;
+                    fSqrDist = fA11 + 2.0f*fB1 + fC;
+                }
+                else
+                {
+                    fT = fNumer / fDenom;
+                    fS = 1.0f - fT;
+                    fSqrDist = fS*(fA00*fS + fA01*fT + 2.0f*fB0) +
+                               fT*(fA01*fS + fA11*fT + 2.0f*fB1) + fC;
+                }
+            }
+            else
+            {
+                fT = 0.0f;
+                if (fTmp1 <= 0.0f)
+                {
+                    fS = 1.0f;
+                    fSqrDist = fA00 + 2.0f*fB0 + fC;
+                }
+                else if (fB0 >= 0.0f)
+                {
+                    fS = 0.0f;
+                    fSqrDist = fC;
+                }
+                else
+                {
+                    fS = -fB0 / fA00;
+                    fSqrDist = fB0*fS + fC;
+                }
+            }
+        }
+        else
+        {
+            // region 1
+            fNumer = fA11 + fB1 - fA01 - fB0;
+            if (fNumer <= 0.0f)
+            {
+                fS = 0.0f;
+                fT = 1.0f;
+                fSqrDist = fA11 + 2.0f*fB1 + fC;
+            }
+            else
+            {
+                fDenom = fA00 - 2.0f*fA01 + fA11;
+                if (fNumer >= fDenom)
+                {
+                    fS = 1.0f;
+                    fT = 0.0f;
+                    fSqrDist = fA00 + 2.0f*fB0 + fC;
+                }
+                else
+                {
+                    fS = fNumer / fDenom;
+                    fT = 1.0f - fS;
+                    fSqrDist = fS*(fA00*fS + fA01*fT + 2.0f*fB0) +
+                               fT*(fA01*fS + fA11*fT + 2.0f*fB1) + fC;
+                }
+            }
+        }
+    }
+
+    return _abs(fSqrDist);
+}
+
+enum EST_Result
+{
+    stNone = 0,
+    stIntersect = 1,
+    stInside = 2,
+};
+
+IC EST_Result TestSphereTri(const Fvector& sphereOrigin, float sphereRadius,
+                            const Fvector& orig, const Fvector& e0, const Fvector& e1)
+{
+
+    float fRSqr = sphereRadius*sphereRadius;
+    Fvector kV0mC;
+    kV0mC.sub(orig, sphereOrigin);
+
+    // count the number of triangle vertices inside the sphere
+    int iInside = 0;
+
+    // test if v0 is inside the sphere
+    if (kV0mC.square_magnitude() <= fRSqr)
+        iInside++;
+
+    // test if v1 is inside the sphere
+    Fvector kDiff;
+    kDiff.add(kV0mC, e0);
+    if (kDiff.square_magnitude() <= fRSqr)
+        iInside++;
+
+    // test if v2 is inside the sphere
+    kDiff.add(kV0mC, e1);
+    if (kDiff.square_magnitude() <= fRSqr)
+        iInside++;
+
+    // triangle does not traversely intersect sphere
+    if (iInside == 3) return stInside;
+
+    // triangle transversely intersects sphere
+    if (iInside > 0) return stIntersect;
+
+    // All vertices are outside the sphere, but the triangle might still
+    // intersect the sphere. This is the case when the distance from the
+    // sphere center to the triangle is smaller than the radius.
+    float fSqrDist = MgcSqrDistance(sphereOrigin, orig, e0, e1);
+    return (fSqrDist < fRSqr) ? stIntersect : stNone;
+}
+//---------------------------------------------------------------------------
+IC EST_Result TestSphereTri(const Fvector& sphereOrigin, float sphereRadius, Fvector* p)
+{
+    Fvector e0, e1;
+    // find vectors for two edges sharing vert0
+    e0.sub(p[1], p[0]);
+    e1.sub(p[2], p[0]);
+    return TestSphereTri(sphereOrigin, sphereRadius, p[0], e0, e1);
+}
+IC EST_Result TestSphereTri(const Fvector& sphereOrigin, float sphereRadius, Fvector** p)
+{
+    Fvector e0, e1;
+    // find vectors for two edges sharing vert0
+    e0.sub(*p[1], *p[0]);
+    e1.sub(*p[2], *p[0]);
+    return TestSphereTri(sphereOrigin, sphereRadius, *p[0], e0, e1);
+}
+IC bool TestSphereOBB(const Fsphere& rkSphere, const Fobb& rkBox)
+{
+    // Test for intersection in the coordinate system of the box by
+    // transforming the sphere into that coordinate system.
+    Fvector3 kCDiff;
+    kCDiff.sub(rkSphere.P, rkBox.m_translate);
+
+    float fAx = _abs(kCDiff.dotproduct(rkBox.m_rotate.i));
+    float fAy = _abs(kCDiff.dotproduct(rkBox.m_rotate.j));
+    float fAz = _abs(kCDiff.dotproduct(rkBox.m_rotate.k));
+    float fDx = fAx - rkBox.m_halfsize[0];
+    float fDy = fAy - rkBox.m_halfsize[1];
+    float fDz = fAz - rkBox.m_halfsize[2];
+
+    if (fAx <= rkBox.m_halfsize[0])
+    {
+        if (fAy <= rkBox.m_halfsize[1])
+        {
+            if (fAz <= rkBox.m_halfsize[2])
+            {
+                // sphere center inside box
+                return true;
+            }
+            else
+            {
+                // potential sphere-face intersection with face z
+                return fDz <= rkSphere.R;
+            }
+        }
+        else
+        {
+            if (fAz <= rkBox.m_halfsize[2])
+            {
+                // potential sphere-face intersection with face y
+                return fDy <= rkSphere.R;
+            }
+            else
+            {
+                // potential sphere-edge intersection with edge formed
+                // by faces y and z
+                float fRSqr = rkSphere.R*rkSphere.R;
+                return fDy*fDy + fDz*fDz <= fRSqr;
+            }
+        }
+    }
+    else
+    {
+        if (fAy <= rkBox.m_halfsize[1])
+        {
+            if (fAz <= rkBox.m_halfsize[2])
+            {
+                // potential sphere-face intersection with face x
+                return fDx <= rkSphere.R;
+            }
+            else
+            {
+                // potential sphere-edge intersection with edge formed
+                // by faces x and z
+                float fRSqr = rkSphere.R*rkSphere.R;
+                return fDx*fDx + fDz*fDz <= fRSqr;
+            }
+        }
+        else
+        {
+            if (fAz <= rkBox.m_halfsize[2])
+            {
+                // potential sphere-edge intersection with edge formed
+                // by faces x and y
+                float fRSqr = rkSphere.R*rkSphere.R;
+                return fDx*fDx + fDy*fDy <= fRSqr;
+            }
+            else
+            {
+                // potential sphere-vertex intersection at corner formed
+                // by faces x,y,z
+                float fRSqr = rkSphere.R*rkSphere.R;
+                return fDx*fDx + fDy*fDy + fDz*fDz <= fRSqr;
+            }
+        }
+    }
+}
+//----------------------------------------------------------------------------
+IC bool TestRayOBB(const Fvector3& origin, const Fvector3& direction, const Fobb& rkBox)
+{
+    float fWdU[3], fAWdU[3], fDdU[3], fADdU[3], fAWxDdU[3], fRhs;
+
+    Fvector3 kDiff;
+    kDiff.sub(origin, rkBox.m_translate);
+
+    fWdU[0] = direction.dotproduct(rkBox.m_rotate.i);
+    fAWdU[0] = _abs(fWdU[0]);
+    fDdU[0] = kDiff.dotproduct(rkBox.m_rotate.i);
+    fADdU[0] = _abs(fDdU[0]);
+    if (fADdU[0] > rkBox.m_halfsize[0] && fDdU[0] * fWdU[0] >= (float)0.0)
+        return false;
+
+    fWdU[1] = direction.dotproduct(rkBox.m_rotate.j);
+    fAWdU[1] = _abs(fWdU[1]);
+    fDdU[1] = kDiff.dotproduct(rkBox.m_rotate.j);
+    fADdU[1] = _abs(fDdU[1]);
+    if (fADdU[1] > rkBox.m_halfsize[1] && fDdU[1] * fWdU[1] >= (float)0.0)
+        return false;
+
+    fWdU[2] = direction.dotproduct(rkBox.m_rotate.k);
+    fAWdU[2] = _abs(fWdU[2]);
+    fDdU[2] = kDiff.dotproduct(rkBox.m_rotate.k);
+    fADdU[2] = _abs(fDdU[2]);
+    if (fADdU[2] > rkBox.m_halfsize[2] && fDdU[2] * fWdU[2] >= (float)0.0)
+        return false;
+
+    Fvector3 kWxD;
+    kWxD.crossproduct(direction, kDiff);
+
+    fAWxDdU[0] = _abs(kWxD.dotproduct(rkBox.m_rotate.i));
+    fRhs = rkBox.m_halfsize[1] * fAWdU[2] + rkBox.m_halfsize[2] * fAWdU[1];
+    if (fAWxDdU[0] > fRhs)
+        return false;
+
+    fAWxDdU[1] = _abs(kWxD.dotproduct(rkBox.m_rotate.j));
+    fRhs = rkBox.m_halfsize[0] * fAWdU[2] + rkBox.m_halfsize[2] * fAWdU[0];
+    if (fAWxDdU[1] > fRhs)
+        return false;
+
+    fAWxDdU[2] = _abs(kWxD.dotproduct(rkBox.m_rotate.k));
+    fRhs = rkBox.m_halfsize[0] * fAWdU[1] + rkBox.m_halfsize[1] * fAWdU[0];
+    if (fAWxDdU[2] > fRhs)
+        return false;
+
+    return true;
+}
 //----------------------------------------------------------------------------
 };
 
diff --git a/src/xrEngine/dedicated_server_only.h b/src/xrEngine/dedicated_server_only.h
index 2178d72d93c..d642ad7feaa 100644
--- a/src/xrEngine/dedicated_server_only.h
+++ b/src/xrEngine/dedicated_server_only.h
@@ -4,14 +4,14 @@
 //#define DEDICATED_SERVER_ONLY
 
 #ifdef DEDICATED_SERVER_ONLY
-#	define PROTECT_API
+# define PROTECT_API
 #else// #ifdef DEDICATED_SERVER_ONLY
-#	define PROTECT_API	__declspec(dllexport)
+# define PROTECT_API __declspec(dllexport)
 #endif // #ifdef DEDICATED_SERVER_ONLY
 
-#ifdef	BENCHMARK_BUILD
-#	undef PROTECT_API
-#	define PROTECT_API
-#endif	//	#ifdef	BENCHMARK_BUILD
+#ifdef BENCHMARK_BUILD
+# undef PROTECT_API
+# define PROTECT_API
+#endif // #ifdef BENCHMARK_BUILD
 
 #endif // #ifndef DEDICATED_SERVER_ONLY_H_INCLUDED
\ No newline at end of file
diff --git a/src/xrEngine/defines.cpp b/src/xrEngine/defines.cpp
index 7e48c575de8..343e057e85e 100644
--- a/src/xrEngine/defines.cpp
+++ b/src/xrEngine/defines.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 
 #ifdef DEBUG
-	ECORE_API BOOL bDebug	= FALSE;
-	
+ECORE_API BOOL bDebug = FALSE;
+
 #endif
 
 // Video
-//. u32			psCurrentMode		= 1024;
-u32			psCurrentVidMode[2] = {1024,768};
-u32			psCurrentBPP		= 32;
+//. u32 psCurrentMode = 1024;
+u32 psCurrentVidMode[2] = {1024, 768};
+u32 psCurrentBPP = 32;
 // release version always has "mt_*" enabled
-Flags32		psDeviceFlags		= {rsFullscreen|rsDetails|mtPhysics|mtSound|mtNetwork|rsDrawStatic|rsDrawDynamic|rsRefresh60hz};
+Flags32 psDeviceFlags = {rsFullscreen | rsDetails | mtPhysics | mtSound | mtNetwork | rsDrawStatic | rsDrawDynamic | rsRefresh60hz};
 
-// textures 
-int			psTextureLOD		= 1;
+// textures
+int psTextureLOD = 1;
diff --git a/src/xrEngine/defines.h b/src/xrEngine/defines.h
index 9840b209ac5..640524b1ed9 100644
--- a/src/xrEngine/defines.h
+++ b/src/xrEngine/defines.h
@@ -1,76 +1,77 @@
 #ifndef DefinesH
 #define DefinesH
 
-#ifdef	DEBUG
-	ENGINE_API	extern BOOL			bDebug;
+#ifdef DEBUG
+ENGINE_API extern BOOL bDebug;
 #else
-	#define bDebug 0
+#define bDebug 0
 #endif
 
-#define _RELEASE(x)			{ if(x) { (x)->Release();       (x)=NULL; } }
-#define _SHOW_REF(msg, x)   { if(x) { x->AddRef(); Log(msg,u32(x->Release()));}}
+#define _RELEASE(x) { if(x) { (x)->Release(); (x)=NULL; } }
+#define _SHOW_REF(msg, x) { if(x) { x->AddRef(); Log(msg,u32(x->Release()));}}
 
 // textures
-ENGINE_API extern	int		psTextureLOD		;
+ENGINE_API extern int psTextureLOD;
 
 // psDeviceFlags
-enum {
-	rsFullscreen					= (1ul<<0ul),
-	rsClearBB						= (1ul<<1ul),
-	rsVSync							= (1ul<<2ul),
-	rsWireframe						= (1ul<<3ul),
-	rsOcclusion						= (1ul<<4ul),
-	rsStatistic						= (1ul<<5ul),
-	rsDetails						= (1ul<<6ul),
-	rsRefresh60hz					= (1ul<<7ul),
-	rsConstantFPS					= (1ul<<8ul),
-	rsDrawStatic					= (1ul<<9ul),
-	rsDrawDynamic					= (1ul<<10ul),
-	rsDisableObjectsAsCrows			= (1ul<<11ul),
+enum
+{
+    rsFullscreen = (1ul << 0ul),
+    rsClearBB = (1ul << 1ul),
+    rsVSync = (1ul << 2ul),
+    rsWireframe = (1ul << 3ul),
+    rsOcclusion = (1ul << 4ul),
+    rsStatistic = (1ul << 5ul),
+    rsDetails = (1ul << 6ul),
+    rsRefresh60hz = (1ul << 7ul),
+    rsConstantFPS = (1ul << 8ul),
+    rsDrawStatic = (1ul << 9ul),
+    rsDrawDynamic = (1ul << 10ul),
+    rsDisableObjectsAsCrows = (1ul << 11ul),
 
-	rsOcclusionDraw					= (1ul<<12ul),
-	rsOcclusionStats				= (1ul<<13ul),
+    rsOcclusionDraw = (1ul << 12ul),
+    rsOcclusionStats = (1ul << 13ul),
 
-	mtSound							= (1ul<<14ul),
-	mtPhysics						= (1ul<<15ul),
-	mtNetwork						= (1ul<<16ul),
-	mtParticles						= (1ul<<17ul),
+    mtSound = (1ul << 14ul),
+    mtPhysics = (1ul << 15ul),
+    mtNetwork = (1ul << 16ul),
+    mtParticles = (1ul << 17ul),
 
-	rsCameraPos						= (1ul<<18ul),
-	rsR2							= (1ul<<19ul),
-	rsR3							= (1ul<<20ul),
-	rsR4							= (1ul<<21ul),
-	// 22-32 bit - reserved to Editor
+    rsCameraPos = (1ul << 18ul),
+    rsR2 = (1ul << 19ul),
+    rsR3 = (1ul << 20ul),
+    rsR4 = (1ul << 21ul),
+    // 22-32 bit - reserved to Editor
 };
 
 
-//. ENGINE_API extern	u32			psCurrentMode		;
-ENGINE_API extern	u32			psCurrentVidMode[];
-ENGINE_API extern	u32			psCurrentBPP		;
-ENGINE_API extern	Flags32		psDeviceFlags		;
+//. ENGINE_API extern u32 psCurrentMode ;
+ENGINE_API extern u32 psCurrentVidMode[];
+ENGINE_API extern u32 psCurrentBPP;
+ENGINE_API extern Flags32 psDeviceFlags;
 
 // game path definition
-#define _game_data_				"$game_data$"
-#define _game_textures_			"$game_textures$"
-#define _game_levels_			"$game_levels$"
-#define _game_sounds_			"$game_sounds$"
-#define _game_meshes_			"$game_meshes$"
-#define _game_shaders_			"$game_shaders$"
-#define _game_config_			"$game_congif$"
+#define _game_data_ "$game_data$"
+#define _game_textures_ "$game_textures$"
+#define _game_levels_ "$game_levels$"
+#define _game_sounds_ "$game_sounds$"
+#define _game_meshes_ "$game_meshes$"
+#define _game_shaders_ "$game_shaders$"
+#define _game_config_ "$game_congif$"
 
 // editor path definition
-#define _server_root_		    "$server_root$"
-#define _server_data_root_	    "$server_data_root$"
-#define _local_root_		    "$local_root$"
-#define _import_			    "$import$"
-#define _sounds_			    "$sounds$"
-#define _textures_			    "$textures$"
-#define _objects_			    "$objects$"
-#define _maps_				    "$maps$"
-#define _temp_				    "$temp$"
-#define _omotion_			    "$omotion$"
-#define _omotions_			    "$omotions$"
-#define _smotion_			    "$smotion$"
-#define _detail_objects_	    "$detail_objects$"
+#define _server_root_ "$server_root$"
+#define _server_data_root_ "$server_data_root$"
+#define _local_root_ "$local_root$"
+#define _import_ "$import$"
+#define _sounds_ "$sounds$"
+#define _textures_ "$textures$"
+#define _objects_ "$objects$"
+#define _maps_ "$maps$"
+#define _temp_ "$temp$"
+#define _omotion_ "$omotion$"
+#define _omotions_ "$omotions$"
+#define _smotion_ "$smotion$"
+#define _detail_objects_ "$detail_objects$"
 
 #endif
diff --git a/src/xrEngine/device.cpp b/src/xrEngine/device.cpp
index d8931fc166b..1b42b678a03 100644
--- a/src/xrEngine/device.cpp
+++ b/src/xrEngine/device.cpp
@@ -21,475 +21,492 @@
 #include "../xrCore/FS_impl.h"
 
 #ifdef INGAME_EDITOR
-#	include "../include/editor/ide.hpp"
-#	include "engine_impl.hpp"
+# include "../include/editor/ide.hpp"
+# include "engine_impl.hpp"
 #endif // #ifdef INGAME_EDITOR
 
 #include "xrSash.h"
 #include "igame_persistent.h"
 
-#pragma comment( lib, "d3dx9.lib"		)
+#pragma comment( lib, "d3dx9.lib" )
 
 ENGINE_API CRenderDevice Device;
 ENGINE_API CLoadScreenRenderer load_screen_renderer;
 
 
-ENGINE_API BOOL g_bRendering = FALSE; 
+ENGINE_API BOOL g_bRendering = FALSE;
 
-BOOL		g_bLoaded = FALSE;
-ref_light	precache_light = 0;
+BOOL g_bLoaded = FALSE;
+ref_light precache_light = 0;
 
-BOOL CRenderDevice::Begin	()
+BOOL CRenderDevice::Begin()
 {
 #ifndef DEDICATED_SERVER
 
-	/*
-	HW.Validate		();
-	HRESULT	_hr		= HW.pDevice->TestCooperativeLevel();
+    /*
+    HW.Validate ();
+    HRESULT _hr = HW.pDevice->TestCooperativeLevel();
     if (FAILED(_hr))
-	{
-		// If the device was lost, do not render until we get it back
-		if		(D3DERR_DEVICELOST==_hr)		{
-			Sleep	(33);
-			return	FALSE;
-		}
-
-		// Check if the device is ready to be reset
-		if		(D3DERR_DEVICENOTRESET==_hr)
-		{
-			Reset	();
-		}
-	}
-	*/
-
-	switch (m_pRender->GetDeviceState())
-	{
-	case IRenderDeviceRender::dsOK:
-		break;
-
-	case IRenderDeviceRender::dsLost:
-		// If the device was lost, do not render until we get it back
-		Sleep(33);
-		return FALSE;
-		break;
-
-	case IRenderDeviceRender::dsNeedReset:
-		// Check if the device is ready to be reset
-		Reset();
-		break;
-
-	default:
-		R_ASSERT(0);
-	}
-
-	m_pRender->Begin();
-
-	/*
-	CHK_DX					(HW.pDevice->BeginScene());
-	RCache.OnFrameBegin		();
-	RCache.set_CullMode		(CULL_CW);
-	RCache.set_CullMode		(CULL_CCW);
-	if (HW.Caps.SceneMode)	overdrawBegin	();
-	*/
-
-	FPU::m24r	();
-	g_bRendering = 	TRUE;
+    {
+    // If the device was lost, do not render until we get it back
+    if (D3DERR_DEVICELOST==_hr) {
+    Sleep (33);
+    return FALSE;
+    }
+
+    // Check if the device is ready to be reset
+    if (D3DERR_DEVICENOTRESET==_hr)
+    {
+    Reset ();
+    }
+    }
+    */
+
+    switch (m_pRender->GetDeviceState())
+    {
+    case IRenderDeviceRender::dsOK:
+        break;
+
+    case IRenderDeviceRender::dsLost:
+        // If the device was lost, do not render until we get it back
+        Sleep(33);
+        return FALSE;
+        break;
+
+    case IRenderDeviceRender::dsNeedReset:
+        // Check if the device is ready to be reset
+        Reset();
+        break;
+
+    default:
+        R_ASSERT(0);
+    }
+
+    m_pRender->Begin();
+
+    /*
+    CHK_DX (HW.pDevice->BeginScene());
+    RCache.OnFrameBegin ();
+    RCache.set_CullMode (CULL_CW);
+    RCache.set_CullMode (CULL_CCW);
+    if (HW.Caps.SceneMode) overdrawBegin ();
+    */
+
+    FPU::m24r();
+    g_bRendering = TRUE;
 #endif
-	return		TRUE;
+    return TRUE;
 }
 
-void CRenderDevice::Clear	()
+void CRenderDevice::Clear()
 {
-	m_pRender->Clear();
+    m_pRender->Clear();
 }
 
 extern void CheckPrivilegySlowdown();
 
 
-void CRenderDevice::End		(void)
+void CRenderDevice::End(void)
 {
 #ifndef DEDICATED_SERVER
 
 
 #ifdef INGAME_EDITOR
-	bool							load_finished = false;
+    bool load_finished = false;
 #endif // #ifdef INGAME_EDITOR
-	if (dwPrecacheFrame)
-	{
-		::Sound->set_master_volume	(0.f);
-		dwPrecacheFrame	--;
-//.		pApp->load_draw_internal	();
-		if (0==dwPrecacheFrame)
-		{
+    if (dwPrecacheFrame)
+    {
+        ::Sound->set_master_volume(0.f);
+        dwPrecacheFrame--;
+        //. pApp->load_draw_internal ();
+        if (0 == dwPrecacheFrame)
+        {
 
 #ifdef INGAME_EDITOR
-			load_finished			= true;
+            load_finished = true;
 #endif // #ifdef INGAME_EDITOR
-			//Gamma.Update		();
-			m_pRender->updateGamma();
+            //Gamma.Update ();
+            m_pRender->updateGamma();
 
-			if(precache_light) precache_light->set_active	(false);
-			if(precache_light) precache_light.destroy		();
-			::Sound->set_master_volume						(1.f);
-//			pApp->destroy_loading_shaders					();
+            if (precache_light) precache_light->set_active(false);
+            if (precache_light) precache_light.destroy();
+            ::Sound->set_master_volume(1.f);
+            // pApp->destroy_loading_shaders ();
 
-			m_pRender->ResourcesDestroyNecessaryTextures	();
-			Memory.mem_compact								();
-			Msg												("* MEMORY USAGE: %d K",Memory.mem_usage()/1024);
-			Msg												("* End of synchronization A[%d] R[%d]",b_is_Active, b_is_Ready);
+            m_pRender->ResourcesDestroyNecessaryTextures();
+            Memory.mem_compact();
+            Msg("* MEMORY USAGE: %d K", Memory.mem_usage() / 1024);
+            Msg("* End of synchronization A[%d] R[%d]", b_is_Active, b_is_Ready);
 
 #ifdef FIND_CHUNK_BENCHMARK_ENABLE
-			g_find_chunk_counter.flush();
+            g_find_chunk_counter.flush();
 #endif // FIND_CHUNK_BENCHMARK_ENABLE
 
-			CheckPrivilegySlowdown							();
-			
-			if(g_pGamePersistent->GameType()==1)//haCk
-			{
-				WINDOWINFO	wi;
-				GetWindowInfo(m_hWnd,&wi);
-				if(wi.dwWindowStatus!=WS_ACTIVECAPTION)
-					Pause(TRUE,TRUE,TRUE,"application start");
-			}
-		}
-	}
-
-	g_bRendering		= FALSE;
-	// end scene
-	//	Present goes here, so call OA Frame end.
-	if (g_SASH.IsBenchmarkRunning())
-		g_SASH.DisplayFrame(Device.fTimeGlobal);
-	m_pRender->End();
-	//RCache.OnFrameEnd	();
-	//Memory.dbg_check		();
-    //CHK_DX				(HW.pDevice->EndScene());
-
-	//HRESULT _hr		= HW.pDevice->Present( NULL, NULL, NULL, NULL );
-	//if				(D3DERR_DEVICELOST==_hr)	return;			// we will handle this later
-	//R_ASSERT2		(SUCCEEDED(_hr),	"Presentation failed. Driver upgrade needed?");
-#	ifdef INGAME_EDITOR
-		if (load_finished && m_editor)
-			m_editor->on_load_finished	();
-#	endif // #ifdef INGAME_EDITOR
+            CheckPrivilegySlowdown();
+
+            if (g_pGamePersistent->GameType() == 1)//haCk
+            {
+                WINDOWINFO wi;
+                GetWindowInfo(m_hWnd, &wi);
+                if (wi.dwWindowStatus != WS_ACTIVECAPTION)
+                    Pause(TRUE, TRUE, TRUE, "application start");
+            }
+        }
+    }
+
+    g_bRendering = FALSE;
+    // end scene
+    // Present goes here, so call OA Frame end.
+    if (g_SASH.IsBenchmarkRunning())
+        g_SASH.DisplayFrame(Device.fTimeGlobal);
+    m_pRender->End();
+    //RCache.OnFrameEnd ();
+    //Memory.dbg_check ();
+    //CHK_DX (HW.pDevice->EndScene());
+
+    //HRESULT _hr = HW.pDevice->Present( NULL, NULL, NULL, NULL );
+    //if (D3DERR_DEVICELOST==_hr) return; // we will handle this later
+    //R_ASSERT2 (SUCCEEDED(_hr), "Presentation failed. Driver upgrade needed?");
+# ifdef INGAME_EDITOR
+    if (load_finished && m_editor)
+        m_editor->on_load_finished();
+# endif // #ifdef INGAME_EDITOR
 #endif
 }
 
 
-volatile u32	mt_Thread_marker		= 0x12345678;
-void 			mt_Thread	(void *ptr)	{
-	while (true) {
-		// waiting for Device permission to execute
-		Device.mt_csEnter.Enter	();
-
-		if (Device.mt_bMustExit) {
-			Device.mt_bMustExit = FALSE;				// Important!!!
-			Device.mt_csEnter.Leave();					// Important!!!
-			return;
-		}
-		// we has granted permission to execute
-		mt_Thread_marker			= Device.dwFrame;
- 
-		for (u32 pit=0; pit<Device.seqParallel.size(); pit++)
-			Device.seqParallel[pit]	();
-		Device.seqParallel.clear_not_free	();
-		Device.seqFrameMT.Process	(rp_Frame);
-
-		// now we give control to device - signals that we are ended our work
-		Device.mt_csEnter.Leave	();
-		// waits for device signal to continue - to start again
-		Device.mt_csLeave.Enter	();
-		// returns sync signal to device
-		Device.mt_csLeave.Leave	();
-	}
+volatile u32 mt_Thread_marker = 0x12345678;
+void mt_Thread(void* ptr)
+{
+    while (true)
+    {
+        // waiting for Device permission to execute
+        Device.mt_csEnter.Enter();
+
+        if (Device.mt_bMustExit)
+        {
+            Device.mt_bMustExit = FALSE; // Important!!!
+            Device.mt_csEnter.Leave(); // Important!!!
+            return;
+        }
+        // we has granted permission to execute
+        mt_Thread_marker = Device.dwFrame;
+
+        for (u32 pit = 0; pit < Device.seqParallel.size(); pit++)
+            Device.seqParallel[pit]();
+        Device.seqParallel.clear_not_free();
+        Device.seqFrameMT.Process(rp_Frame);
+
+        // now we give control to device - signals that we are ended our work
+        Device.mt_csEnter.Leave();
+        // waits for device signal to continue - to start again
+        Device.mt_csLeave.Enter();
+        // returns sync signal to device
+        Device.mt_csLeave.Leave();
+    }
 }
 
 #include "igame_level.h"
-void CRenderDevice::PreCache	(u32 amount, bool b_draw_loadscreen, bool b_wait_user_input)
+void CRenderDevice::PreCache(u32 amount, bool b_draw_loadscreen, bool b_wait_user_input)
 {
-	if (m_pRender->GetForceGPU_REF()) amount=0;
+    if (m_pRender->GetForceGPU_REF()) amount = 0;
 #ifdef DEDICATED_SERVER
-	amount = 0;
+    amount = 0;
 #endif
-	// Msg			("* PCACHE: start for %d...",amount);
-	dwPrecacheFrame	= dwPrecacheTotal = amount;
-	if (amount && !precache_light && g_pGameLevel && g_loading_events.empty()) {
-		precache_light					= ::Render->light_create();
-		precache_light->set_shadow		(false);
-		precache_light->set_position	(vCameraPosition);
-		precache_light->set_color		(255,255,255);
-		precache_light->set_range		(5.0f);
-		precache_light->set_active		(true);
-	}
-
-	if(amount && b_draw_loadscreen && load_screen_renderer.b_registered==false)
-	{
-		load_screen_renderer.start	(b_wait_user_input);
-	}
+    // Msg ("* PCACHE: start for %d...",amount);
+    dwPrecacheFrame = dwPrecacheTotal = amount;
+    if (amount && !precache_light && g_pGameLevel && g_loading_events.empty())
+    {
+        precache_light = ::Render->light_create();
+        precache_light->set_shadow(false);
+        precache_light->set_position(vCameraPosition);
+        precache_light->set_color(255, 255, 255);
+        precache_light->set_range(5.0f);
+        precache_light->set_active(true);
+    }
+
+    if (amount && b_draw_loadscreen && load_screen_renderer.b_registered == false)
+    {
+        load_screen_renderer.start(b_wait_user_input);
+    }
 }
 
 
 int g_svDedicateServerUpdateReate = 100;
 
-ENGINE_API xr_list<LOADING_EVENT>			g_loading_events;
+ENGINE_API xr_list<LOADING_EVENT> g_loading_events;
 
-void CRenderDevice::on_idle		()
+void CRenderDevice::on_idle()
 {
-	if (!b_is_Ready) {
-		Sleep	(100);
-		return;
-	}
+    if (!b_is_Ready)
+    {
+        Sleep(100);
+        return;
+    }
 
 #ifdef DEDICATED_SERVER
-	u32 FrameStartTime = TimerGlobal.GetElapsed_ms();
+    u32 FrameStartTime = TimerGlobal.GetElapsed_ms();
 #endif
-	if (psDeviceFlags.test(rsStatistic))	g_bEnableStatGather	= TRUE;
-	else									g_bEnableStatGather	= FALSE;
-	if(g_loading_events.size())
-	{
-		if( g_loading_events.front()() )
-			g_loading_events.pop_front();
-		pApp->LoadDraw				();
-		return;
-	}else 
-	{
-		if ( (!Device.dwPrecacheFrame) && (!g_SASH.IsBenchmarkRunning())
-			&& g_bLoaded)
-			g_SASH.StartBenchmark();
-
-		FrameMove						( );
-	}
-
-	// Precache
-	if (dwPrecacheFrame)
-	{
-		float factor					= float(dwPrecacheFrame)/float(dwPrecacheTotal);
-		float angle						= PI_MUL_2 * factor;
-		vCameraDirection.set			(_sin(angle),0,_cos(angle));	vCameraDirection.normalize	();
-		vCameraTop.set					(0,1,0);
-		vCameraRight.crossproduct		(vCameraTop,vCameraDirection);
-
-		mView.build_camera_dir			(vCameraPosition,vCameraDirection,vCameraTop);
-	}
-
-	// Matrices
-	mFullTransform.mul			( mProject,mView	);
-	m_pRender->SetCacheXform(mView, mProject);
-	//RCache.set_xform_view		( mView				);
-	//RCache.set_xform_project	( mProject			);
-	D3DXMatrixInverse			( (D3DXMATRIX*)&mInvFullTransform, 0, (D3DXMATRIX*)&mFullTransform);
-
-	vCameraPosition_saved	= vCameraPosition;
-	mFullTransform_saved	= mFullTransform;
-	mView_saved				= mView;
-	mProject_saved			= mProject;
-
-	// *** Resume threads
-	// Capture end point - thread must run only ONE cycle
-	// Release start point - allow thread to run
-	mt_csLeave.Enter			();
-	mt_csEnter.Leave			();
-	Sleep						(0);
+    if (psDeviceFlags.test(rsStatistic)) g_bEnableStatGather = TRUE;
+    else g_bEnableStatGather = FALSE;
+    if (g_loading_events.size())
+    {
+        if (g_loading_events.front()())
+            g_loading_events.pop_front();
+        pApp->LoadDraw();
+        return;
+    }
+    else
+    {
+        if ((!Device.dwPrecacheFrame) && (!g_SASH.IsBenchmarkRunning())
+            && g_bLoaded)
+            g_SASH.StartBenchmark();
+
+        FrameMove();
+    }
+
+    // Precache
+    if (dwPrecacheFrame)
+    {
+        float factor = float(dwPrecacheFrame) / float(dwPrecacheTotal);
+        float angle = PI_MUL_2 * factor;
+        vCameraDirection.set(_sin(angle), 0, _cos(angle));
+        vCameraDirection.normalize();
+        vCameraTop.set(0, 1, 0);
+        vCameraRight.crossproduct(vCameraTop, vCameraDirection);
+
+        mView.build_camera_dir(vCameraPosition, vCameraDirection, vCameraTop);
+    }
+
+    // Matrices
+    mFullTransform.mul(mProject, mView);
+    m_pRender->SetCacheXform(mView, mProject);
+    //RCache.set_xform_view ( mView );
+    //RCache.set_xform_project ( mProject );
+    D3DXMatrixInverse((D3DXMATRIX*)&mInvFullTransform, 0, (D3DXMATRIX*)&mFullTransform);
+
+    vCameraPosition_saved = vCameraPosition;
+    mFullTransform_saved = mFullTransform;
+    mView_saved = mView;
+    mProject_saved = mProject;
+
+    // *** Resume threads
+    // Capture end point - thread must run only ONE cycle
+    // Release start point - allow thread to run
+    mt_csLeave.Enter();
+    mt_csEnter.Leave();
+    Sleep(0);
 
 #ifndef DEDICATED_SERVER
-	Statistic->RenderTOTAL_Real.FrameStart	();
-	Statistic->RenderTOTAL_Real.Begin		();
-	if (b_is_Active)							{
-		if (Begin())				{
-
-			seqRender.Process						(rp_Render);
-			if (psDeviceFlags.test(rsCameraPos) || psDeviceFlags.test(rsStatistic) || Statistic->errors.size())	
-				Statistic->Show						();
-			//	TEST!!!
-			//Statistic->RenderTOTAL_Real.End			();
-			//	Present goes here
-			End										();
-		}
-	}
-	Statistic->RenderTOTAL_Real.End			();
-	Statistic->RenderTOTAL_Real.FrameEnd	();
-	Statistic->RenderTOTAL.accum	= Statistic->RenderTOTAL_Real.accum;
+    Statistic->RenderTOTAL_Real.FrameStart();
+    Statistic->RenderTOTAL_Real.Begin();
+    if (b_is_Active)
+    {
+        if (Begin())
+        {
+
+            seqRender.Process(rp_Render);
+            if (psDeviceFlags.test(rsCameraPos) || psDeviceFlags.test(rsStatistic) || Statistic->errors.size())
+                Statistic->Show();
+            // TEST!!!
+            //Statistic->RenderTOTAL_Real.End ();
+            // Present goes here
+            End();
+        }
+    }
+    Statistic->RenderTOTAL_Real.End();
+    Statistic->RenderTOTAL_Real.FrameEnd();
+    Statistic->RenderTOTAL.accum = Statistic->RenderTOTAL_Real.accum;
 #endif // #ifndef DEDICATED_SERVER
-	// *** Suspend threads
-	// Capture startup point
-	// Release end point - allow thread to wait for startup point
-	mt_csEnter.Enter						();
-	mt_csLeave.Leave						();
-
-	// Ensure, that second thread gets chance to execute anyway
-	if (dwFrame!=mt_Thread_marker)			{
-		for (u32 pit=0; pit<Device.seqParallel.size(); pit++)
-			Device.seqParallel[pit]			();
-		Device.seqParallel.clear_not_free	();
-		seqFrameMT.Process					(rp_Frame);
-	}
+    // *** Suspend threads
+    // Capture startup point
+    // Release end point - allow thread to wait for startup point
+    mt_csEnter.Enter();
+    mt_csLeave.Leave();
+
+    // Ensure, that second thread gets chance to execute anyway
+    if (dwFrame != mt_Thread_marker)
+    {
+        for (u32 pit = 0; pit < Device.seqParallel.size(); pit++)
+            Device.seqParallel[pit]();
+        Device.seqParallel.clear_not_free();
+        seqFrameMT.Process(rp_Frame);
+    }
 
 #ifdef DEDICATED_SERVER
-	u32 FrameEndTime = TimerGlobal.GetElapsed_ms();
-	u32 FrameTime = (FrameEndTime - FrameStartTime);
-	/*
-	string1024 FPS_str = "";
-	string64 tmp;
-	xr_strcat(FPS_str, "FPS Real - ");
-	if (dwTimeDelta != 0)
-		xr_strcat(FPS_str, ltoa(1000/dwTimeDelta, tmp, 10));
-	else
-		xr_strcat(FPS_str, "~~~");
-
-	xr_strcat(FPS_str, ", FPS Proj - ");
-	if (FrameTime != 0)
-		xr_strcat(FPS_str, ltoa(1000/FrameTime, tmp, 10));
-	else
-		xr_strcat(FPS_str, "~~~");
-	
-*/
-	u32 DSUpdateDelta = 1000/g_svDedicateServerUpdateReate;
-	if (FrameTime < DSUpdateDelta)
-	{
-		Sleep(DSUpdateDelta - FrameTime);
-//		Msg("sleep for %d", DSUpdateDelta - FrameTime);
-//		xr_strcat(FPS_str, ", sleeped for ");
-//		xr_strcat(FPS_str, ltoa(DSUpdateDelta - FrameTime, tmp, 10));
-	}
-//	Msg(FPS_str);
+    u32 FrameEndTime = TimerGlobal.GetElapsed_ms();
+    u32 FrameTime = (FrameEndTime - FrameStartTime);
+    /*
+    string1024 FPS_str = "";
+    string64 tmp;
+    xr_strcat(FPS_str, "FPS Real - ");
+    if (dwTimeDelta != 0)
+    xr_strcat(FPS_str, ltoa(1000/dwTimeDelta, tmp, 10));
+    else
+    xr_strcat(FPS_str, "~~~");
+
+    xr_strcat(FPS_str, ", FPS Proj - ");
+    if (FrameTime != 0)
+    xr_strcat(FPS_str, ltoa(1000/FrameTime, tmp, 10));
+    else
+    xr_strcat(FPS_str, "~~~");
+
+    */
+    u32 DSUpdateDelta = 1000 / g_svDedicateServerUpdateReate;
+    if (FrameTime < DSUpdateDelta)
+    {
+        Sleep(DSUpdateDelta - FrameTime);
+        // Msg("sleep for %d", DSUpdateDelta - FrameTime);
+        // xr_strcat(FPS_str, ", sleeped for ");
+        // xr_strcat(FPS_str, ltoa(DSUpdateDelta - FrameTime, tmp, 10));
+    }
+    // Msg(FPS_str);
 #endif // #ifdef DEDICATED_SERVER
 
-	if (!b_is_Active)
-		Sleep		(1);
+    if (!b_is_Active)
+        Sleep(1);
 }
 
 #ifdef INGAME_EDITOR
-void CRenderDevice::message_loop_editor	()
+void CRenderDevice::message_loop_editor()
 {
-	m_editor->run			();
-	m_editor_finalize		(m_editor);
-	xr_delete				(m_engine);
+    m_editor->run();
+    m_editor_finalize(m_editor);
+    xr_delete(m_engine);
 }
 #endif // #ifdef INGAME_EDITOR
 
 void CRenderDevice::message_loop()
 {
 #ifdef INGAME_EDITOR
-	if (editor()) {
-		message_loop_editor	();
-		return;
-	}
+    if (editor())
+    {
+        message_loop_editor();
+        return;
+    }
 #endif // #ifdef INGAME_EDITOR
 
-	MSG						msg;
-    PeekMessage				(&msg, NULL, 0U, 0U, PM_NOREMOVE );
-	while (msg.message != WM_QUIT) {
-		if (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) {
-			TranslateMessage(&msg);
-			DispatchMessage	(&msg);
-			continue;
-		}
-
-		on_idle				();
+    MSG msg;
+    PeekMessage(&msg, NULL, 0U, 0U, PM_NOREMOVE);
+    while (msg.message != WM_QUIT)
+    {
+        if (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE))
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+            continue;
+        }
+
+        on_idle();
     }
 }
 
-void CRenderDevice::Run			()
+void CRenderDevice::Run()
 {
-//	DUMP_PHASE;
-	g_bLoaded		= FALSE;
-	Log				("Starting engine...");
-	thread_name		("X-RAY Primary thread");
-
-	// Startup timers and calculate timer delta
-	dwTimeGlobal				= 0;
-	Timer_MM_Delta				= 0;
-	{
-		u32 time_mm			= timeGetTime	();
-		while (timeGetTime()==time_mm);			// wait for next tick
-		u32 time_system		= timeGetTime	();
-		u32 time_local		= TimerAsync	();
-		Timer_MM_Delta		= time_system-time_local;
-	}
-
-	// Start all threads
-//	InitializeCriticalSection	(&mt_csEnter);
-//	InitializeCriticalSection	(&mt_csLeave);
-	mt_csEnter.Enter			();
-	mt_bMustExit				= FALSE;
-	thread_spawn				(mt_Thread,"X-RAY Secondary thread",0,0);
-
-	// Message cycle
-	seqAppStart.Process			(rp_AppStart);
-
-	//CHK_DX(HW.pDevice->Clear(0,0,D3DCLEAR_TARGET,D3DCOLOR_XRGB(0,0,0),1,0));
-	m_pRender->ClearTarget		();
-
-	message_loop				();
-
-	seqAppEnd.Process		(rp_AppEnd);
-
-	// Stop Balance-Thread
-	mt_bMustExit			= TRUE;
-	mt_csEnter.Leave		();
-	while (mt_bMustExit)	Sleep(0);
-//	DeleteCriticalSection	(&mt_csEnter);
-//	DeleteCriticalSection	(&mt_csLeave);
+    // DUMP_PHASE;
+    g_bLoaded = FALSE;
+    Log("Starting engine...");
+    thread_name("X-RAY Primary thread");
+
+    // Startup timers and calculate timer delta
+    dwTimeGlobal = 0;
+    Timer_MM_Delta = 0;
+    {
+        u32 time_mm = timeGetTime();
+        while (timeGetTime() == time_mm); // wait for next tick
+        u32 time_system = timeGetTime();
+        u32 time_local = TimerAsync();
+        Timer_MM_Delta = time_system - time_local;
+    }
+
+    // Start all threads
+    // InitializeCriticalSection (&mt_csEnter);
+    // InitializeCriticalSection (&mt_csLeave);
+    mt_csEnter.Enter();
+    mt_bMustExit = FALSE;
+    thread_spawn(mt_Thread, "X-RAY Secondary thread", 0, 0);
+
+    // Message cycle
+    seqAppStart.Process(rp_AppStart);
+
+    //CHK_DX(HW.pDevice->Clear(0,0,D3DCLEAR_TARGET,D3DCOLOR_XRGB(0,0,0),1,0));
+    m_pRender->ClearTarget();
+
+    message_loop();
+
+    seqAppEnd.Process(rp_AppEnd);
+
+    // Stop Balance-Thread
+    mt_bMustExit = TRUE;
+    mt_csEnter.Leave();
+    while (mt_bMustExit) Sleep(0);
+    // DeleteCriticalSection (&mt_csEnter);
+    // DeleteCriticalSection (&mt_csLeave);
 }
 
-u32 app_inactive_time		= 0;
+u32 app_inactive_time = 0;
 u32 app_inactive_time_start = 0;
 
-void ProcessLoading(RP_FUNC *f);
+void ProcessLoading(RP_FUNC* f);
 void CRenderDevice::FrameMove()
 {
-	dwFrame			++;
-
-	Core.dwFrame = dwFrame;
-
-	dwTimeContinual	= TimerMM.GetElapsed_ms() - app_inactive_time;
-
-	if (psDeviceFlags.test(rsConstantFPS))	{
-		// 20ms = 50fps
-		//fTimeDelta		=	0.020f;			
-		//fTimeGlobal		+=	0.020f;
-		//dwTimeDelta		=	20;
-		//dwTimeGlobal	+=	20;
-		// 33ms = 30fps
-		fTimeDelta		=	0.033f;			
-		fTimeGlobal		+=	0.033f;
-		dwTimeDelta		=	33;
-		dwTimeGlobal	+=	33;
-	} else {
-		// Timer
-		float fPreviousFrameTime = Timer.GetElapsed_sec(); Timer.Start();	// previous frame
-		fTimeDelta = 0.1f * fTimeDelta + 0.9f*fPreviousFrameTime;			// smooth random system activity - worst case ~7% error
-		//fTimeDelta = 0.7f * fTimeDelta + 0.3f*fPreviousFrameTime;			// smooth random system activity
-		if (fTimeDelta>.1f)    
-			fTimeDelta = .1f;							// limit to 15fps minimum
-
-		if (fTimeDelta <= 0.f) 
-			fTimeDelta = EPS_S + EPS_S;					// limit to 15fps minimum
-
-		if(Paused())	
-			fTimeDelta = 0.0f;
-
-//		u64	qTime		= TimerGlobal.GetElapsed_clk();
-		fTimeGlobal		= TimerGlobal.GetElapsed_sec(); //float(qTime)*CPU::cycles2seconds;
-		u32	_old_global	= dwTimeGlobal;
-		dwTimeGlobal = TimerGlobal.GetElapsed_ms();
-		dwTimeDelta		= dwTimeGlobal-_old_global;
-	}
-
-	// Frame move
-	Statistic->EngineTOTAL.Begin	();
-
-	//	TODO: HACK to test loading screen.
-	//if(!g_bLoaded) 
-		ProcessLoading				(rp_Frame);
-	//else
-	//	seqFrame.Process			(rp_Frame);
-	Statistic->EngineTOTAL.End	();
+    dwFrame++;
+
+    Core.dwFrame = dwFrame;
+
+    dwTimeContinual = TimerMM.GetElapsed_ms() - app_inactive_time;
+
+    if (psDeviceFlags.test(rsConstantFPS))
+    {
+        // 20ms = 50fps
+        //fTimeDelta = 0.020f;
+        //fTimeGlobal += 0.020f;
+        //dwTimeDelta = 20;
+        //dwTimeGlobal += 20;
+        // 33ms = 30fps
+        fTimeDelta = 0.033f;
+        fTimeGlobal += 0.033f;
+        dwTimeDelta = 33;
+        dwTimeGlobal += 33;
+    }
+    else
+    {
+        // Timer
+        float fPreviousFrameTime = Timer.GetElapsed_sec();
+        Timer.Start(); // previous frame
+        fTimeDelta = 0.1f * fTimeDelta + 0.9f*fPreviousFrameTime; // smooth random system activity - worst case ~7% error
+        //fTimeDelta = 0.7f * fTimeDelta + 0.3f*fPreviousFrameTime; // smooth random system activity
+        if (fTimeDelta > .1f)
+            fTimeDelta = .1f; // limit to 15fps minimum
+
+        if (fTimeDelta <= 0.f)
+            fTimeDelta = EPS_S + EPS_S; // limit to 15fps minimum
+
+        if (Paused())
+            fTimeDelta = 0.0f;
+
+        // u64 qTime = TimerGlobal.GetElapsed_clk();
+        fTimeGlobal = TimerGlobal.GetElapsed_sec(); //float(qTime)*CPU::cycles2seconds;
+        u32 _old_global = dwTimeGlobal;
+        dwTimeGlobal = TimerGlobal.GetElapsed_ms();
+        dwTimeDelta = dwTimeGlobal - _old_global;
+    }
+
+    // Frame move
+    Statistic->EngineTOTAL.Begin();
+
+    // TODO: HACK to test loading screen.
+    //if(!g_bLoaded)
+    ProcessLoading(rp_Frame);
+    //else
+    // seqFrame.Process (rp_Frame);
+    Statistic->EngineTOTAL.End();
 }
 
-void ProcessLoading				(RP_FUNC *f)
+void ProcessLoading(RP_FUNC* f)
 {
-	Device.seqFrame.Process				(rp_Frame);
-	g_bLoaded							= TRUE;
+    Device.seqFrame.Process(rp_Frame);
+    g_bLoaded = TRUE;
 }
 
 ENGINE_API BOOL bShowPauseString = TRUE;
@@ -497,67 +514,71 @@ ENGINE_API BOOL bShowPauseString = TRUE;
 
 void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason)
 {
-	static int snd_emitters_ = -1;
+    static int snd_emitters_ = -1;
 
-	if (g_bBenchmark)	return;
+    if (g_bBenchmark) return;
 
 
 #ifdef DEBUG
-//	Msg("pause [%s] timer=[%s] sound=[%s] reason=%s",bOn?"ON":"OFF", bTimer?"ON":"OFF", bSound?"ON":"OFF", reason);
+    // Msg("pause [%s] timer=[%s] sound=[%s] reason=%s",bOn?"ON":"OFF", bTimer?"ON":"OFF", bSound?"ON":"OFF", reason);
 #endif // DEBUG
 
-#ifndef DEDICATED_SERVER	
+#ifndef DEDICATED_SERVER
 
-	if(bOn)
-	{
-		if(!Paused())						
-			bShowPauseString				= 
+    if (bOn)
+    {
+        if (!Paused())
+            bShowPauseString =
 #ifdef INGAME_EDITOR
-				editor() ? FALSE : 
+                editor() ? FALSE :
 #endif // #ifdef INGAME_EDITOR
 #ifdef DEBUG
-				!xr_strcmp(reason, "li_pause_key_no_clip")?	FALSE:
+                !xr_strcmp(reason, "li_pause_key_no_clip") ? FALSE :
 #endif // DEBUG
-				TRUE;
+                TRUE;
 
-		if( bTimer && (!g_pGamePersistent || g_pGamePersistent->CanBePaused()) )
-		{
-			g_pauseMngr.Pause				(TRUE);
+        if (bTimer && (!g_pGamePersistent || g_pGamePersistent->CanBePaused()))
+        {
+            g_pauseMngr.Pause(TRUE);
 #ifdef DEBUG
-			if(!xr_strcmp(reason, "li_pause_key_no_clip"))
-				TimerGlobal.Pause				(FALSE);
+            if (!xr_strcmp(reason, "li_pause_key_no_clip"))
+                TimerGlobal.Pause(FALSE);
 #endif // DEBUG
-		}
-	
-		if (bSound && ::Sound) {
-			snd_emitters_ =					::Sound->pause_emitters(true);
+        }
+
+        if (bSound && ::Sound)
+        {
+            snd_emitters_ = ::Sound->pause_emitters(true);
 #ifdef DEBUG
-//			Log("snd_emitters_[true]",snd_emitters_);
+            // Log("snd_emitters_[true]",snd_emitters_);
 #endif // DEBUG
-		}
-	}else
-	{
-		if( bTimer && /*g_pGamePersistent->CanBePaused() &&*/ g_pauseMngr.Paused() )
-		{
-			fTimeDelta						= EPS_S + EPS_S;
-			g_pauseMngr.Pause				(FALSE);
-		}
-		
-		if(bSound)
-		{
-			if(snd_emitters_>0) //avoid crash
-			{
-				snd_emitters_ =				::Sound->pause_emitters(false);
+        }
+    }
+    else
+    {
+        if (bTimer && /*g_pGamePersistent->CanBePaused() &&*/ g_pauseMngr.Paused())
+        {
+            fTimeDelta = EPS_S + EPS_S;
+            g_pauseMngr.Pause(FALSE);
+        }
+
+        if (bSound)
+        {
+            if (snd_emitters_ > 0) //avoid crash
+            {
+                snd_emitters_ = ::Sound->pause_emitters(false);
 #ifdef DEBUG
-//				Log("snd_emitters_[false]",snd_emitters_);
+                // Log("snd_emitters_[false]",snd_emitters_);
 #endif // DEBUG
-			}else {
+            }
+            else
+            {
 #ifdef DEBUG
-				Log("Sound->pause_emitters underflow");
+                Log("Sound->pause_emitters underflow");
 #endif // DEBUG
-			}
-		}
-	}
+            }
+        }
+    }
 
 #endif
 
@@ -565,75 +586,76 @@ void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason)
 
 BOOL CRenderDevice::Paused()
 {
-	return g_pauseMngr.Paused();
+    return g_pauseMngr.Paused();
 };
 
 void CRenderDevice::OnWM_Activate(WPARAM wParam, LPARAM lParam)
 {
-	u16 fActive						= LOWORD(wParam);
-	BOOL fMinimized					= (BOOL) HIWORD(wParam);
-	BOOL bActive					= ((fActive!=WA_INACTIVE) && (!fMinimized))?TRUE:FALSE;
-	
-	if (bActive!=Device.b_is_Active)
-	{
-		Device.b_is_Active			= bActive;
-
-		if (Device.b_is_Active)	
-		{
-			Device.seqAppActivate.Process(rp_AppActivate);
-			app_inactive_time		+= TimerMM.GetElapsed_ms() - app_inactive_time_start;
+    u16 fActive = LOWORD(wParam);
+    BOOL fMinimized = (BOOL)HIWORD(wParam);
+    BOOL bActive = ((fActive != WA_INACTIVE) && (!fMinimized)) ? TRUE : FALSE;
+
+    if (bActive != Device.b_is_Active)
+    {
+        Device.b_is_Active = bActive;
+
+        if (Device.b_is_Active)
+        {
+            Device.seqAppActivate.Process(rp_AppActivate);
+            app_inactive_time += TimerMM.GetElapsed_ms() - app_inactive_time_start;
 
 #ifndef DEDICATED_SERVER
-#	ifdef INGAME_EDITOR
-			if (!editor())
-#	endif // #ifdef INGAME_EDITOR
-				ShowCursor			(FALSE);
+# ifdef INGAME_EDITOR
+            if (!editor())
+# endif // #ifdef INGAME_EDITOR
+                ShowCursor(FALSE);
 #endif // #ifndef DEDICATED_SERVER
-		}else	
-		{
-			app_inactive_time_start	= TimerMM.GetElapsed_ms();
-			Device.seqAppDeactivate.Process(rp_AppDeactivate);
-			ShowCursor				(TRUE);
-		}
-	}
+        }
+        else
+        {
+            app_inactive_time_start = TimerMM.GetElapsed_ms();
+            Device.seqAppDeactivate.Process(rp_AppDeactivate);
+            ShowCursor(TRUE);
+        }
+    }
 }
 
-void	CRenderDevice::AddSeqFrame			( pureFrame* f, bool mt )
+void CRenderDevice::AddSeqFrame(pureFrame* f, bool mt)
 {
-		if ( mt )	
-		seqFrameMT.Add	(f,REG_PRIORITY_HIGH);
-	else								
-		seqFrame.Add		(f,REG_PRIORITY_LOW);
+    if (mt)
+        seqFrameMT.Add(f, REG_PRIORITY_HIGH);
+    else
+        seqFrame.Add(f, REG_PRIORITY_LOW);
 
 }
 
-void	CRenderDevice::RemoveSeqFrame	( pureFrame* f )
+void CRenderDevice::RemoveSeqFrame(pureFrame* f)
 {
-	seqFrameMT.Remove	( f );
-	seqFrame.Remove		( f );
+    seqFrameMT.Remove(f);
+    seqFrame.Remove(f);
 }
 
 CLoadScreenRenderer::CLoadScreenRenderer()
-:b_registered(false)
+    :b_registered(false)
 {}
 
-void CLoadScreenRenderer::start(bool b_user_input) 
+void CLoadScreenRenderer::start(bool b_user_input)
 {
-	Device.seqRender.Add			(this, 0);
-	b_registered					= true;
-	b_need_user_input				= b_user_input;
+    Device.seqRender.Add(this, 0);
+    b_registered = true;
+    b_need_user_input = b_user_input;
 }
 
 void CLoadScreenRenderer::stop()
 {
-	if(!b_registered)				return;
-	Device.seqRender.Remove			(this);
-	pApp->destroy_loading_shaders	();
-	b_registered					= false;
-	b_need_user_input				= false;
+    if (!b_registered) return;
+    Device.seqRender.Remove(this);
+    pApp->destroy_loading_shaders();
+    b_registered = false;
+    b_need_user_input = false;
 }
 
-void CLoadScreenRenderer::OnRender() 
+void CLoadScreenRenderer::OnRender()
 {
-	pApp->load_draw_internal();
+    pApp->load_draw_internal();
 }
\ No newline at end of file
diff --git a/src/xrEngine/device.h b/src/xrEngine/device.h
index 450e29f9acc..1baf9741a6a 100644
--- a/src/xrEngine/device.h
+++ b/src/xrEngine/device.h
@@ -4,10 +4,10 @@
 
 // Note:
 // ZNear - always 0.0f
-// ZFar  - always 1.0f
+// ZFar - always 1.0f
 
-//class	ENGINE_API	CResourceManager;
-//class	ENGINE_API	CGammaControl;
+//class ENGINE_API CResourceManager;
+//class ENGINE_API CGammaControl;
 
 #include "pure.h"
 //#include "hw.h"
@@ -16,7 +16,7 @@
 //#include "shader.h"
 //#include "R_Backend.h"
 
-#define VIEWPORT_NEAR  0.2f
+#define VIEWPORT_NEAR 0.2f
 
 #define DEVICE_RESET_PRECACHE_FRAME_COUNT 10
 
@@ -24,7 +24,7 @@
 #include "../Include/xrRender/RenderDeviceRender.h"
 
 #ifdef INGAME_EDITOR
-#	include "../Include/editor/interfaces.hpp"
+# include "../Include/editor/interfaces.hpp"
 #endif // #ifdef INGAME_EDITOR
 
 class engine_impl;
@@ -34,305 +34,308 @@ class engine_impl;
 class IRenderDevice
 {
 public:
-	virtual		CStatsPhysics*	_BCL		StatPhysics		()							= 0;								
-	virtual				void	_BCL		AddSeqFrame		( pureFrame* f, bool mt )	= 0;
-	virtual				void	_BCL		RemoveSeqFrame	( pureFrame* f )			= 0;
+    virtual CStatsPhysics* _BCL StatPhysics() = 0;
+    virtual void _BCL AddSeqFrame(pureFrame* f, bool mt) = 0;
+    virtual void _BCL RemoveSeqFrame(pureFrame* f) = 0;
 };
 
 class ENGINE_API CRenderDeviceData
 {
 
 public:
-	u32										dwWidth;
-	u32										dwHeight;
-	
-	u32										dwPrecacheFrame;
-	BOOL									b_is_Ready;
-	BOOL									b_is_Active;
+    u32 dwWidth;
+    u32 dwHeight;
+
+    u32 dwPrecacheFrame;
+    BOOL b_is_Ready;
+    BOOL b_is_Active;
 public:
 
-		// Engine flow-control
-	u32										dwFrame;
+    // Engine flow-control
+    u32 dwFrame;
 
-	float									fTimeDelta;
-	float									fTimeGlobal;
-	u32										dwTimeDelta;
-	u32										dwTimeGlobal;
-	u32										dwTimeContinual;
+    float fTimeDelta;
+    float fTimeGlobal;
+    u32 dwTimeDelta;
+    u32 dwTimeGlobal;
+    u32 dwTimeContinual;
 
-	Fvector									vCameraPosition;
-	Fvector									vCameraDirection;
-	Fvector									vCameraTop;
-	Fvector									vCameraRight;
+    Fvector vCameraPosition;
+    Fvector vCameraDirection;
+    Fvector vCameraTop;
+    Fvector vCameraRight;
 
-	Fmatrix									mView;
-	Fmatrix									mProject;
-	Fmatrix									mFullTransform;
+    Fmatrix mView;
+    Fmatrix mProject;
+    Fmatrix mFullTransform;
 
-	// Copies of corresponding members. Used for synchronization.
-	Fvector									vCameraPosition_saved;
+    // Copies of corresponding members. Used for synchronization.
+    Fvector vCameraPosition_saved;
 
-	Fmatrix									mView_saved;
-	Fmatrix									mProject_saved;
-	Fmatrix									mFullTransform_saved;
+    Fmatrix mView_saved;
+    Fmatrix mProject_saved;
+    Fmatrix mFullTransform_saved;
 
-	float									fFOV;
-	float									fASPECT;
+    float fFOV;
+    float fASPECT;
 protected:
 
-	u32										Timer_MM_Delta;
-	CTimer_paused							Timer;
-	CTimer_paused							TimerGlobal;
+    u32 Timer_MM_Delta;
+    CTimer_paused Timer;
+    CTimer_paused TimerGlobal;
 public:
 
-// Registrators
-	CRegistrator	<pureRender			>			seqRender;
-	CRegistrator	<pureAppActivate	>			seqAppActivate;
-	CRegistrator	<pureAppDeactivate	>			seqAppDeactivate;
-	CRegistrator	<pureAppStart		>			seqAppStart;
-	CRegistrator	<pureAppEnd			>			seqAppEnd;
-	CRegistrator	<pureFrame			>			seqFrame;
-	CRegistrator	<pureScreenResolutionChanged>	seqResolutionChanged;
+    // Registrators
+    CRegistrator <pureRender > seqRender;
+    CRegistrator <pureAppActivate > seqAppActivate;
+    CRegistrator <pureAppDeactivate > seqAppDeactivate;
+    CRegistrator <pureAppStart > seqAppStart;
+    CRegistrator <pureAppEnd > seqAppEnd;
+    CRegistrator <pureFrame > seqFrame;
+    CRegistrator <pureScreenResolutionChanged> seqResolutionChanged;
 
-	HWND									m_hWnd;
-//	CStats*									Statistic;
+    HWND m_hWnd;
+    // CStats* Statistic;
 
 };
 
-class	ENGINE_API CRenderDeviceBase :
-	public IRenderDevice,
-	public CRenderDeviceData
+class ENGINE_API CRenderDeviceBase :
+    public IRenderDevice,
+    public CRenderDeviceData
 {
 public:
 };
 
 #pragma pack(pop)
 // refs
-class ENGINE_API CRenderDevice: public CRenderDeviceBase
+class ENGINE_API CRenderDevice : public CRenderDeviceBase
 {
 private:
     // Main objects used for creating and rendering the 3D scene
-    u32										m_dwWindowStyle;
-    RECT									m_rcWindowBounds;
-    RECT									m_rcWindowClient;
-
-	//u32										Timer_MM_Delta;
-	//CTimer_paused							Timer;
-	//CTimer_paused							TimerGlobal;
-	CTimer									TimerMM;
-
-	void									_Create		(LPCSTR shName);
-	void									_Destroy	(BOOL	bKeepTextures);
-	void									_SetupStates();
+    u32 m_dwWindowStyle;
+    RECT m_rcWindowBounds;
+    RECT m_rcWindowClient;
+
+    //u32 Timer_MM_Delta;
+    //CTimer_paused Timer;
+    //CTimer_paused TimerGlobal;
+    CTimer TimerMM;
+
+    void _Create(LPCSTR shName);
+    void _Destroy(BOOL bKeepTextures);
+    void _SetupStates();
 public:
- //   HWND									m_hWnd;
-	LRESULT									MsgProc		(HWND,UINT,WPARAM,LPARAM);
-
-//	u32										dwFrame;
-//	u32										dwPrecacheFrame;
-	u32										dwPrecacheTotal;
-
-//	u32										dwWidth, dwHeight;
-	float									fWidth_2, fHeight_2;
-//	BOOL									b_is_Ready;
-//	BOOL									b_is_Active;
-	void									OnWM_Activate(WPARAM wParam, LPARAM lParam);
+    // HWND m_hWnd;
+    LRESULT MsgProc(HWND, UINT, WPARAM, LPARAM);
+
+    // u32 dwFrame;
+    // u32 dwPrecacheFrame;
+    u32 dwPrecacheTotal;
+
+    // u32 dwWidth, dwHeight;
+    float fWidth_2, fHeight_2;
+    // BOOL b_is_Ready;
+    // BOOL b_is_Active;
+    void OnWM_Activate(WPARAM wParam, LPARAM lParam);
 public:
-	//ref_shader								m_WireShader;
-	//ref_shader								m_SelectionShader;
-
-	IRenderDeviceRender						*m_pRender;
-
-	BOOL									m_bNearer;
-	void									SetNearer	(BOOL enabled)
-	{
-		if (enabled&&!m_bNearer){
-			m_bNearer						= TRUE;
-			mProject._43					-= EPS_L;
-		}else if (!enabled&&m_bNearer){
-			m_bNearer						= FALSE;
-			mProject._43					+= EPS_L;
-		}
-		m_pRender->SetCacheXform(mView, mProject);
-		//R_ASSERT(0);
-		//	TODO: re-implement set projection
-		//RCache.set_xform_project			(mProject);
-	}
-
-	void									DumpResourcesMemoryUsage() { m_pRender->ResourcesDumpMemoryUsage();}
+    //ref_shader m_WireShader;
+    //ref_shader m_SelectionShader;
+
+    IRenderDeviceRender* m_pRender;
+
+    BOOL m_bNearer;
+    void SetNearer(BOOL enabled)
+    {
+        if (enabled&&!m_bNearer)
+        {
+            m_bNearer = TRUE;
+            mProject._43 -= EPS_L;
+        }
+        else if (!enabled&&m_bNearer)
+        {
+            m_bNearer = FALSE;
+            mProject._43 += EPS_L;
+        }
+        m_pRender->SetCacheXform(mView, mProject);
+        //R_ASSERT(0);
+        // TODO: re-implement set projection
+        //RCache.set_xform_project (mProject);
+    }
+
+    void DumpResourcesMemoryUsage() { m_pRender->ResourcesDumpMemoryUsage(); }
 public:
-	// Registrators
-	//CRegistrator	<pureRender			>			seqRender;
-//	CRegistrator	<pureAppActivate	>			seqAppActivate;
-//	CRegistrator	<pureAppDeactivate	>			seqAppDeactivate;
-//	CRegistrator	<pureAppStart		>			seqAppStart;
-//	CRegistrator	<pureAppEnd			>			seqAppEnd;
-	//CRegistrator	<pureFrame			>			seqFrame;
-	CRegistrator	<pureFrame			>			seqFrameMT;
-	CRegistrator	<pureDeviceReset	>			seqDeviceReset;
-	xr_vector		<fastdelegate::FastDelegate0<> >	seqParallel;
-
-	// Dependent classes
-	//CResourceManager*						Resources;
-
-	CStats*									Statistic;
-
-	// Engine flow-control
-	//float									fTimeDelta;
-	//float									fTimeGlobal;
-	//u32										dwTimeDelta;
-	//u32										dwTimeGlobal;
-	//u32										dwTimeContinual;
-
-	// Cameras & projection
-	//Fvector									vCameraPosition;
-	//Fvector									vCameraDirection;
-	//Fvector									vCameraTop;
-	//Fvector									vCameraRight;
-
-	//Fmatrix									mView;
-	//Fmatrix									mProject;
-	//Fmatrix									mFullTransform;
-
-	Fmatrix									mInvFullTransform;
-
-	//float									fFOV;
-	//float									fASPECT;
-	
-	CRenderDevice			()
-		:
-		m_pRender(0)
+    // Registrators
+    //CRegistrator <pureRender > seqRender;
+    // CRegistrator <pureAppActivate > seqAppActivate;
+    // CRegistrator <pureAppDeactivate > seqAppDeactivate;
+    // CRegistrator <pureAppStart > seqAppStart;
+    // CRegistrator <pureAppEnd > seqAppEnd;
+    //CRegistrator <pureFrame > seqFrame;
+    CRegistrator <pureFrame > seqFrameMT;
+    CRegistrator <pureDeviceReset > seqDeviceReset;
+    xr_vector <fastdelegate::FastDelegate0<> > seqParallel;
+
+    // Dependent classes
+    //CResourceManager* Resources;
+
+    CStats* Statistic;
+
+    // Engine flow-control
+    //float fTimeDelta;
+    //float fTimeGlobal;
+    //u32 dwTimeDelta;
+    //u32 dwTimeGlobal;
+    //u32 dwTimeContinual;
+
+    // Cameras & projection
+    //Fvector vCameraPosition;
+    //Fvector vCameraDirection;
+    //Fvector vCameraTop;
+    //Fvector vCameraRight;
+
+    //Fmatrix mView;
+    //Fmatrix mProject;
+    //Fmatrix mFullTransform;
+
+    Fmatrix mInvFullTransform;
+
+    //float fFOV;
+    //float fASPECT;
+
+    CRenderDevice()
+        :
+        m_pRender(0)
 #ifdef INGAME_EDITOR
-		,m_editor_module(0),
-		m_editor_initialize(0),
-		m_editor_finalize(0),
-		m_editor(0),
-		m_engine(0)
+        , m_editor_module(0),
+        m_editor_initialize(0),
+        m_editor_finalize(0),
+        m_editor(0),
+        m_engine(0)
 #endif // #ifdef INGAME_EDITOR
 #ifdef PROFILE_CRITICAL_SECTIONS
-		,mt_csEnter(MUTEX_PROFILE_ID(CRenderDevice::mt_csEnter))
-		,mt_csLeave(MUTEX_PROFILE_ID(CRenderDevice::mt_csLeave))
+        ,mt_csEnter(MUTEX_PROFILE_ID(CRenderDevice::mt_csEnter))
+        ,mt_csLeave(MUTEX_PROFILE_ID(CRenderDevice::mt_csLeave))
 #endif // #ifdef PROFILE_CRITICAL_SECTIONS
-	{
-	    m_hWnd              = NULL;
-		b_is_Active			= FALSE;
-		b_is_Ready			= FALSE;
-		Timer.Start			();
-		m_bNearer			= FALSE;
-	};
-
-	void	Pause							(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason);
-	BOOL	Paused							();
-
-	// Scene control
-	void PreCache							(u32 amount, bool b_draw_loadscreen, bool b_wait_user_input);
-	BOOL Begin								();
-	void Clear								();
-	void End								();
-	void FrameMove							();
-	
-	void overdrawBegin						();
-	void overdrawEnd						();
-
-	// Mode control
-	void DumpFlags							();
-	IC	 CTimer_paused* GetTimerGlobal		()	{ return &TimerGlobal;								}
-	u32	 TimerAsync							()	{ return TimerGlobal.GetElapsed_ms();				}
-	u32	 TimerAsync_MMT						()	{ return TimerMM.GetElapsed_ms() +	Timer_MM_Delta; }
-
-	// Creation & Destroying
-	void ConnectToRender();
-	void Create								(void);
-	void Run								(void);
-	void Destroy							(void);
-	void Reset								(bool precache = true);
-
-	void Initialize							(void);
-	void ShutDown							(void);
+    {
+        m_hWnd = NULL;
+        b_is_Active = FALSE;
+        b_is_Ready = FALSE;
+        Timer.Start();
+        m_bNearer = FALSE;
+    };
+
+    void Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason);
+    BOOL Paused();
+
+    // Scene control
+    void PreCache(u32 amount, bool b_draw_loadscreen, bool b_wait_user_input);
+    BOOL Begin();
+    void Clear();
+    void End();
+    void FrameMove();
+
+    void overdrawBegin();
+    void overdrawEnd();
+
+    // Mode control
+    void DumpFlags();
+    IC CTimer_paused* GetTimerGlobal() { return &TimerGlobal; }
+    u32 TimerAsync() { return TimerGlobal.GetElapsed_ms(); }
+    u32 TimerAsync_MMT() { return TimerMM.GetElapsed_ms() + Timer_MM_Delta; }
+
+    // Creation & Destroying
+    void ConnectToRender();
+    void Create(void);
+    void Run(void);
+    void Destroy(void);
+    void Reset(bool precache = true);
+
+    void Initialize(void);
+    void ShutDown(void);
 
 public:
-	void time_factor						(const float &time_factor)
-	{
-		Timer.time_factor		(time_factor);
-		TimerGlobal.time_factor	(time_factor);
-	}
-	
-	IC	const float &time_factor			() const
-	{
-		VERIFY					(Timer.time_factor() == TimerGlobal.time_factor());
-		return					(Timer.time_factor());
-	}
-
-	// Multi-threading
-	xrCriticalSection	mt_csEnter;
-	xrCriticalSection	mt_csLeave;
-	volatile BOOL		mt_bMustExit;
-
-	ICF		void			remove_from_seq_parallel	(const fastdelegate::FastDelegate0<> &delegate)
-	{
-		xr_vector<fastdelegate::FastDelegate0<> >::iterator I = std::find(
-			seqParallel.begin(),
-			seqParallel.end(),
-			delegate
-		);
-		if (I != seqParallel.end())
-			seqParallel.erase	(I);
-	}
+    void time_factor(const float& time_factor)
+    {
+        Timer.time_factor(time_factor);
+        TimerGlobal.time_factor(time_factor);
+    }
+
+    IC const float& time_factor() const
+    {
+        VERIFY(Timer.time_factor() == TimerGlobal.time_factor());
+        return (Timer.time_factor());
+    }
+
+    // Multi-threading
+    xrCriticalSection mt_csEnter;
+    xrCriticalSection mt_csLeave;
+    volatile BOOL mt_bMustExit;
+
+    ICF void remove_from_seq_parallel(const fastdelegate::FastDelegate0<>& delegate)
+    {
+        xr_vector<fastdelegate::FastDelegate0<> >::iterator I = std::find(
+                    seqParallel.begin(),
+                    seqParallel.end(),
+                    delegate
+                );
+        if (I != seqParallel.end())
+            seqParallel.erase(I);
+    }
 
 public:
-			void xr_stdcall		on_idle				();
-			bool xr_stdcall		on_message			(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &result);
+    void xr_stdcall on_idle();
+    bool xr_stdcall on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result);
 
 private:
-			void					message_loop		();
-virtual		void			_BCL	AddSeqFrame			( pureFrame* f, bool mt );
-virtual		void			_BCL	RemoveSeqFrame		( pureFrame* f );
-virtual		CStatsPhysics*	_BCL	StatPhysics			()	{ return  Statistic ;}
+    void message_loop();
+    virtual void _BCL AddSeqFrame(pureFrame* f, bool mt);
+    virtual void _BCL RemoveSeqFrame(pureFrame* f);
+    virtual CStatsPhysics* _BCL StatPhysics() { return Statistic; }
 #ifdef INGAME_EDITOR
 public:
-	IC		editor::ide			*editor				() const { return m_editor; }
+    IC editor::ide* editor() const { return m_editor; }
 
 private:
-			void				initialize_editor	();
-			void				message_loop_editor	();
+    void initialize_editor();
+    void message_loop_editor();
 
 private:
-	typedef editor::initialize_function_ptr			initialize_function_ptr;
-	typedef editor::finalize_function_ptr			finalize_function_ptr;
+    typedef editor::initialize_function_ptr initialize_function_ptr;
+    typedef editor::finalize_function_ptr finalize_function_ptr;
 
 private:
-	HMODULE						m_editor_module;
-	initialize_function_ptr		m_editor_initialize;
-	finalize_function_ptr		m_editor_finalize;
-	editor::ide					*m_editor;
-	engine_impl					*m_engine;
+    HMODULE m_editor_module;
+    initialize_function_ptr m_editor_initialize;
+    finalize_function_ptr m_editor_finalize;
+    editor::ide* m_editor;
+    engine_impl* m_engine;
 #endif // #ifdef INGAME_EDITOR
 };
 
-extern		ENGINE_API		CRenderDevice		Device;
+extern ENGINE_API CRenderDevice Device;
 
-#ifndef	_EDITOR
-#define	RDEVICE	Device
+#ifndef _EDITOR
+#define RDEVICE Device
 #else
-#define RDEVICE	EDevice
+#define RDEVICE EDevice
 #endif
 
 
-extern		ENGINE_API		bool				g_bBenchmark;
+extern ENGINE_API bool g_bBenchmark;
 
-typedef fastdelegate::FastDelegate0<bool>		LOADING_EVENT;
-extern	ENGINE_API xr_list<LOADING_EVENT>		g_loading_events;
+typedef fastdelegate::FastDelegate0<bool> LOADING_EVENT;
+extern ENGINE_API xr_list<LOADING_EVENT> g_loading_events;
 
 class ENGINE_API CLoadScreenRenderer :public pureRender
 {
 public:
-					CLoadScreenRenderer	();
-	void			start				(bool b_user_input);
-	void			stop				();
-	virtual void	OnRender			();
+    CLoadScreenRenderer();
+    void start(bool b_user_input);
+    void stop();
+    virtual void OnRender();
 
-	bool			b_registered;
-	bool			b_need_user_input;
+    bool b_registered;
+    bool b_need_user_input;
 };
 extern ENGINE_API CLoadScreenRenderer load_screen_renderer;
 
diff --git a/src/xrEngine/edit_actions.cpp b/src/xrEngine/edit_actions.cpp
index 4d4fe60a4b3..a48ec3f5fde 100644
--- a/src/xrEngine/edit_actions.cpp
+++ b/src/xrEngine/edit_actions.cpp
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: edit_actions.cpp
-//	Created 	: 04.03.2008
-//	Author		: Evgeniy Sokolov
-//	Description : edit actions chars class implementation
+// Module : edit_actions.cpp
+// Created : 04.03.2008
+// Author : Evgeniy Sokolov
+// Description : edit actions chars class implementation
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -14,137 +14,137 @@
 namespace text_editor
 {
 
-base::base():	m_previous_action( NULL )
+base::base() : m_previous_action(NULL)
 {
 }
 
 base::~base()
 {
-	xr_delete( m_previous_action );
+    xr_delete(m_previous_action);
 }
 
-void base::on_assign( base* const prev_action )
+void base::on_assign(base* const prev_action)
 {
-	m_previous_action = prev_action;
+    m_previous_action = prev_action;
 }
 
-void base::on_key_press( line_edit_control* const control )
+void base::on_key_press(line_edit_control* const control)
 {
-	if ( m_previous_action )
-	{
-		m_previous_action->on_key_press( control );
-	}
+    if (m_previous_action)
+    {
+        m_previous_action->on_key_press(control);
+    }
 }
 
 // -------------------------------------------------------------------------------------------------
 
-callback_base::callback_base( Callback const& callback, key_state state )
+callback_base::callback_base(Callback const& callback, key_state state)
 {
-	m_callback  = callback;
-	m_run_state = state;
+    m_callback = callback;
+    m_run_state = state;
 }
 
 callback_base::~callback_base()
 {
 }
 
-void callback_base::on_key_press( line_edit_control* const control )
+void callback_base::on_key_press(line_edit_control* const control)
 {
-	if ( control->get_key_state( m_run_state ) )
-	{
-		m_callback();
-		return;
-	}
-	base::on_key_press( control );
+    if (control->get_key_state(m_run_state))
+    {
+        m_callback();
+        return;
+    }
+    base::on_key_press(control);
 }
 
 // -------------------------------------------------------------------------------------------------
 
-type_pair::type_pair( u32 dik, char c, char c_shift, bool b_translate )
+type_pair::type_pair(u32 dik, char c, char c_shift, bool b_translate)
 {
-	init( dik, c, c_shift, b_translate );
+    init(dik, c, c_shift, b_translate);
 }
 
 type_pair::~type_pair()
 {
 }
 
-void type_pair::init( u32 dik, char c, char c_shift, bool b_translate )
+void type_pair::init(u32 dik, char c, char c_shift, bool b_translate)
 {
-	m_translate	= b_translate;
-	m_dik = dik;
-	m_char = c;
-	m_char_shift = c_shift;
+    m_translate = b_translate;
+    m_dik = dik;
+    m_char = c;
+    m_char_shift = c_shift;
 }
 
 
-void type_pair::on_key_press( line_edit_control* const control )
+void type_pair::on_key_press(line_edit_control* const control)
 {
-	char c = 0;
-	if( m_translate )
-	{
-		c				= m_char;
-		char c_shift	= m_char_shift;
-		string128		buff;
-		buff[0]			= 0;
-		
-		/*
-		//setlocale( LC_ALL, "" ); // User-default
-
-		// The following 3 lines looks useless
-
-		LPSTR			loc;
-		STRCONCAT		( loc, ".", itoa( GetACP(), code_page, 10 ) );
-		setlocale		( LC_ALL, loc );*/
-
-		static _locale_t current_locale = _create_locale(LC_ALL, "");
-		
-		if ( pInput->get_dik_name( m_dik, buff, sizeof(buff) ) )
-		{
-			if ( _isalpha_l(buff[0], current_locale) || buff[0] == char(-1) ) // "ÿ" = -1
-			{
-				_strlwr_l	(buff, current_locale);
-				c			= buff[0];
-				_strupr_l	(buff, current_locale);
-				c_shift	= buff[0];
-			}
-		}
-
-		//setlocale( LC_ALL, "C" );	// restore to ANSI
-
-		if ( control->get_key_state( ks_Shift ) != control->get_key_state( ks_CapsLock ) )
-		{
-			c = c_shift;
-		}
-	}
-	else
-	{
-		c = m_char;
-		if ( control->get_key_state( ks_Shift ) != control->get_key_state( ks_CapsLock ) )
-		{
-			c = m_char_shift;
-		}
-	}
-	control->insert_character( c );
+    char c = 0;
+    if (m_translate)
+    {
+        c = m_char;
+        char c_shift = m_char_shift;
+        string128 buff;
+        buff[0] = 0;
+
+        /*
+        //setlocale( LC_ALL, "" ); // User-default
+
+        // The following 3 lines looks useless
+
+        LPSTR loc;
+        STRCONCAT ( loc, ".", itoa( GetACP(), code_page, 10 ) );
+        setlocale ( LC_ALL, loc );*/
+
+        static _locale_t current_locale = _create_locale(LC_ALL, "");
+
+        if (pInput->get_dik_name(m_dik, buff, sizeof(buff)))
+        {
+            if (_isalpha_l(buff[0], current_locale) || buff[0] == char(-1)) // "ÿ" = -1
+            {
+                _strlwr_l(buff, current_locale);
+                c = buff[0];
+                _strupr_l(buff, current_locale);
+                c_shift = buff[0];
+            }
+        }
+
+        //setlocale( LC_ALL, "C" ); // restore to ANSI
+
+        if (control->get_key_state(ks_Shift) != control->get_key_state(ks_CapsLock))
+        {
+            c = c_shift;
+        }
+    }
+    else
+    {
+        c = m_char;
+        if (control->get_key_state(ks_Shift) != control->get_key_state(ks_CapsLock))
+        {
+            c = m_char_shift;
+        }
+    }
+    control->insert_character(c);
 }
 
 // -------------------------------------------------------------------------------------------------
 
-key_state_base::key_state_base( key_state state, base* type_pair )
-:m_type_pair(type_pair),m_state(state)
+key_state_base::key_state_base(key_state state, base* type_pair)
+    :m_type_pair(type_pair), m_state(state)
 {
 }
 
 key_state_base::~key_state_base()
 {
-	xr_delete(m_type_pair);
+    xr_delete(m_type_pair);
 }
 
-void key_state_base::on_key_press( line_edit_control* const control )
+void key_state_base::on_key_press(line_edit_control* const control)
 {
-	control->set_key_state( m_state, true );
-	if(m_type_pair)
-		m_type_pair->on_key_press(control);
+    control->set_key_state(m_state, true);
+    if (m_type_pair)
+        m_type_pair->on_key_press(control);
 }
 
 } // namespace text_editor
diff --git a/src/xrEngine/edit_actions.h b/src/xrEngine/edit_actions.h
index c4228a5d6bf..0c4faacd001 100644
--- a/src/xrEngine/edit_actions.h
+++ b/src/xrEngine/edit_actions.h
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: edit_actions.h
-//	Created 	: 04.03.2008
-//	Author		: Evgeniy Sokolov
-//	Description : edit actions class
+// Module : edit_actions.h
+// Created : 04.03.2008
+// Author : Evgeniy Sokolov
+// Description : edit actions class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDIT_ACTIONS_H_INCLUDED
@@ -13,19 +13,19 @@
 namespace text_editor
 {
 
-enum	key_state;
-class	line_edit_control;
+enum key_state;
+class line_edit_control;
 
 class base : private boost::noncopyable
 {
 public:
-					base			();
-	virtual			~base			();
-			void	on_assign 		( base* const prev_action );
-	virtual	void	on_key_press	( line_edit_control* const control );
+    base();
+    virtual ~base();
+    void on_assign(base* const prev_action);
+    virtual void on_key_press(line_edit_control* const control);
 
 protected:
-	base*			m_previous_action;
+    base* m_previous_action;
 
 }; // class base
 
@@ -34,16 +34,16 @@ class base : private boost::noncopyable
 class callback_base : public base
 {
 private:
-	typedef		fastdelegate::FastDelegate0<void>		Callback;
+    typedef fastdelegate::FastDelegate0<void> Callback;
 
 public:
-					callback_base	( Callback const& callback, key_state state );
-	virtual			~callback_base	();
-	virtual	void	on_key_press	( line_edit_control* const control );
+    callback_base(Callback const& callback, key_state state);
+    virtual ~callback_base();
+    virtual void on_key_press(line_edit_control* const control);
 
 protected:
-	key_state	m_run_state;
-	Callback	m_callback;
+    key_state m_run_state;
+    Callback m_callback;
 
 }; // class callback_base
 
@@ -52,16 +52,16 @@ class callback_base : public base
 class type_pair : public base
 {
 public:
-					type_pair		( u32 dik, char c, char c_shift, bool b_translate );
-	virtual			~type_pair		();
-			void	init			( u32 dik, char c, char c_shift, bool b_translate );
-	virtual	void	on_key_press	( line_edit_control* const control );
+    type_pair(u32 dik, char c, char c_shift, bool b_translate);
+    virtual ~type_pair();
+    void init(u32 dik, char c, char c_shift, bool b_translate);
+    virtual void on_key_press(line_edit_control* const control);
 
 private:
-	u32		m_dik;
-	bool	m_translate;
-	char	m_char;
-	char	m_char_shift;
+    u32 m_dik;
+    bool m_translate;
+    char m_char;
+    char m_char_shift;
 
 }; // class type_pair
 
@@ -70,13 +70,13 @@ class type_pair : public base
 class key_state_base : public base
 {
 public:
-					key_state_base	( key_state state, base* type_pair );
-	virtual			~key_state_base	();
-	virtual	void	on_key_press	( line_edit_control* const control );
+    key_state_base(key_state state, base* type_pair);
+    virtual ~key_state_base();
+    virtual void on_key_press(line_edit_control* const control);
 
 private:
-	key_state		m_state;
-	base*			m_type_pair;
+    key_state m_state;
+    base* m_type_pair;
 }; // class key_state_base
 
 } // namespace text_editor
diff --git a/src/xrEngine/editor_environment_ambients_ambient.cpp b/src/xrEngine/editor_environment_ambients_ambient.cpp
index 768531acf88..7a14d5470f3 100644
--- a/src/xrEngine/editor_environment_ambients_ambient.cpp
+++ b/src/xrEngine/editor_environment_ambients_ambient.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_ambient.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients ambient class
+// Module : editor_environment_ambients_ambient.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients ambient class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -26,247 +26,253 @@ using editor::environment::sound_channels::channel;
 using editor::environment::effects::effect;
 
 template <>
-void property_collection<ambient::effect_container_type, ambient>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<ambient::effect_container_type, ambient>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy				(buffer, buffer_size, m_container[item_index]->id().c_str());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
 
 template <>
-editor::property_holder* property_collection<ambient::effect_container_type, ambient>::create	()
+editor::property_holder* property_collection<ambient::effect_container_type, ambient>::create()
 {
-	effect_id*				object = xr_new<effect_id>(m_holder.effects_manager(), "");
-	object->fill			(this);
-	return					(object->object());
+    effect_id* object = xr_new<effect_id>(m_holder.effects_manager(), "");
+    object->fill(this);
+    return (object->object());
 }
 
 template <>
-void property_collection<ambient::sound_container_type, ambient>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<ambient::sound_container_type, ambient>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy				(buffer, buffer_size, m_container[item_index]->id().c_str());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
 
 template <>
-editor::property_holder* property_collection<ambient::sound_container_type, ambient>::create	()
+editor::property_holder* property_collection<ambient::sound_container_type, ambient>::create()
 {
-	sound_id*				object = xr_new<sound_id>(m_holder.sounds_manager(), "");
-	object->fill			(this);
-	return					(object->object());
+    sound_id* object = xr_new<sound_id>(m_holder.sounds_manager(), "");
+    object->fill(this);
+    return (object->object());
 }
 
-ambient::ambient			(manager const& manager, shared_str const& id) :
-	m_manager				(manager),
-	m_property_holder		(0),
-	m_effects_collection	(0),
-	m_sounds_collection		(0)
+ambient::ambient(manager const& manager, shared_str const& id) :
+    m_manager(manager),
+    m_property_holder(0),
+    m_effects_collection(0),
+    m_sounds_collection(0)
 {
-	m_load_section			= id;
-	m_effects_collection	= xr_new<effect_collection_type>(&m_effects_ids, this);
-	m_sounds_collection		= xr_new<sound_collection_type>(&m_sound_channels_ids, this);
+    m_load_section = id;
+    m_effects_collection = xr_new<effect_collection_type>(&m_effects_ids, this);
+    m_sounds_collection = xr_new<sound_collection_type>(&m_sound_channels_ids, this);
 }
 
-ambient::~ambient			()
+ambient::~ambient()
 {
-	delete_data				(m_effects_ids);
-	xr_delete				(m_effects_collection);
+    delete_data(m_effects_ids);
+    xr_delete(m_effects_collection);
 
-	delete_data				(m_sound_channels_ids);
-	xr_delete				(m_sounds_collection);
+    delete_data(m_sound_channels_ids);
+    xr_delete(m_sounds_collection);
 
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy			(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void ambient::load			(
-		CInifile& ambients_config,
-		CInifile& sound_channels_config,
-		CInifile& effects_config,
-		const shared_str& section
-	)
+void ambient::load(
+    CInifile& ambients_config,
+    CInifile& sound_channels_config,
+    CInifile& effects_config,
+    const shared_str& section
+)
 {
-	VERIFY					(m_load_section == section);
-	inherited::load			(
-		ambients_config,
-		sound_channels_config,
-		effects_config,
-		m_load_section
-	);
-
-	{
-		VERIFY				(m_effects_ids.empty());
-		LPCSTR				effects_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section,	"effects", "");
-		for (u32 i=0, n=_GetItemCount(effects_string); i<n; ++i) {
-			string_path		temp;
-			effect_id*		object = xr_new<effect_id>( m_manager.effects_manager(), _GetItem( effects_string, i, temp ) );
-			object->fill	(m_effects_collection);
-			m_effects_ids.push_back	(object);
-		}
-	}
-
-	{
-		VERIFY				(m_sound_channels_ids.empty());
-		LPCSTR				sounds_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section,	"sound_channels", "");
-		for (u32 i=0, n=_GetItemCount(sounds_string); i<n; ++i) {
-			string_path		temp;
-			sound_id*		object = xr_new<sound_id>( m_manager.sounds_manager(), _GetItem( sounds_string, i, temp ) );
-			object->fill	(m_sounds_collection);
-			m_sound_channels_ids.push_back	(object);
-		}
-	}
+    VERIFY(m_load_section == section);
+    inherited::load(
+        ambients_config,
+        sound_channels_config,
+        effects_config,
+        m_load_section
+    );
+
+    {
+        VERIFY(m_effects_ids.empty());
+        LPCSTR effects_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section, "effects", "");
+        for (u32 i = 0, n = _GetItemCount(effects_string); i < n; ++i)
+        {
+            string_path temp;
+            effect_id* object = xr_new<effect_id>(m_manager.effects_manager(), _GetItem(effects_string, i, temp));
+            object->fill(m_effects_collection);
+            m_effects_ids.push_back(object);
+        }
+    }
+
+    {
+        VERIFY(m_sound_channels_ids.empty());
+        LPCSTR sounds_string = READ_IF_EXISTS(&ambients_config, r_string, m_load_section, "sound_channels", "");
+        for (u32 i = 0, n = _GetItemCount(sounds_string); i < n; ++i)
+        {
+            string_path temp;
+            sound_id* object = xr_new<sound_id>(m_manager.sounds_manager(), _GetItem(sounds_string, i, temp));
+            object->fill(m_sounds_collection);
+            m_sound_channels_ids.push_back(object);
+        }
+    }
 }
 
-void ambient::save			(CInifile& config)
+void ambient::save(CInifile& config)
 {
-	u32						count = 1;
-	LPSTR					temp = 0;
-	{
-		sound_container_type::const_iterator	b = m_sound_channels_ids.begin(), i = b;
-		sound_container_type::const_iterator	e = m_sound_channels_ids.end();
-		for ( ; i != e; ++i)
-			count			+= (*i)->id().size() + 2;
-
-		temp				= (LPSTR)_alloca(count*sizeof(char));
-		*temp				= 0;
-		for (i = b; i != e; ++i) {
-			if (i == b) {
-				xr_strcpy	(temp, count, (*i)->id().c_str());
-				continue;
-			}
-
-			xr_strcat		(temp, count, ", ");
-			xr_strcat		(temp, count, (*i)->id().c_str());
-		}
-	}
-
-	config.w_string			(m_load_section.c_str(), "sound_channels",	  temp);
-	config.w_float			(m_load_section.c_str(), "min_effect_period", float(m_effect_period.x)/1000.f);
-	config.w_float			(m_load_section.c_str(), "max_effect_period", float(m_effect_period.y)/1000.f);
-
-	{
-		count				= 1;
-		effect_container_type::const_iterator	b = m_effects_ids.begin(), i = b;
-		effect_container_type::const_iterator	e = m_effects_ids.end();
-		for ( ; i != e; ++i)
-			count			+= (*i)->id().size() + 2;
-
-		temp				= (LPSTR)_alloca(count*sizeof(char));
-		*temp				= 0;
-		for (i = b; i != e; ++i) {
-			if (i == b) {
-				xr_strcpy	(temp, count, (*i)->id().c_str());
-				continue;
-			}
-
-			xr_strcat		(temp, count, ", ");
-			xr_strcat		(temp, count, (*i)->id().c_str());
-		}
-	}
-	config.w_string			(m_load_section.c_str(), "effects", temp);
+    u32 count = 1;
+    LPSTR temp = 0;
+    {
+        sound_container_type::const_iterator b = m_sound_channels_ids.begin(), i = b;
+        sound_container_type::const_iterator e = m_sound_channels_ids.end();
+        for (; i != e; ++i)
+            count += (*i)->id().size() + 2;
+
+        temp = (LPSTR)_alloca(count*sizeof(char));
+        *temp = 0;
+        for (i = b; i != e; ++i)
+        {
+            if (i == b)
+            {
+                xr_strcpy(temp, count, (*i)->id().c_str());
+                continue;
+            }
+
+            xr_strcat(temp, count, ", ");
+            xr_strcat(temp, count, (*i)->id().c_str());
+        }
+    }
+
+    config.w_string(m_load_section.c_str(), "sound_channels", temp);
+    config.w_float(m_load_section.c_str(), "min_effect_period", float(m_effect_period.x) / 1000.f);
+    config.w_float(m_load_section.c_str(), "max_effect_period", float(m_effect_period.y) / 1000.f);
+
+    {
+        count = 1;
+        effect_container_type::const_iterator b = m_effects_ids.begin(), i = b;
+        effect_container_type::const_iterator e = m_effects_ids.end();
+        for (; i != e; ++i)
+            count += (*i)->id().size() + 2;
+
+        temp = (LPSTR)_alloca(count*sizeof(char));
+        *temp = 0;
+        for (i = b; i != e; ++i)
+        {
+            if (i == b)
+            {
+                xr_strcpy(temp, count, (*i)->id().c_str());
+                continue;
+            }
+
+            xr_strcat(temp, count, ", ");
+            xr_strcat(temp, count, (*i)->id().c_str());
+        }
+    }
+    config.w_string(m_load_section.c_str(), "effects", temp);
 }
 
-LPCSTR ambient::id_getter						() const
+LPCSTR ambient::id_getter() const
 {
-	return					(m_load_section.c_str());
+    return (m_load_section.c_str());
 }
 
-void ambient::id_setter							(LPCSTR value_)
+void ambient::id_setter(LPCSTR value_)
 {
-	shared_str				value = value_;
-	if (m_load_section._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (m_load_section._get() == value._get())
+        return;
 
-	m_load_section			= m_manager.unique_id(value);
+    m_load_section = m_manager.unique_id(value);
 }
 
-void ambient::fill			(editor::property_holder_collection* collection)
+void ambient::fill(editor::property_holder_collection* collection)
 {
-	VERIFY					(!m_property_holder);
-	m_property_holder		= ::ide().create_property_holder(m_load_section.c_str(), collection, this);
-
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type				string_getter;
-	string_getter.bind				(this, &ambient::id_getter);
-
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type				string_setter;
-	string_setter.bind				(this, &ambient::id_setter);
-
-	m_property_holder->add_property	(
-		"id",
-		"properties",
-		"this option is resposible for ambient identifier",
-		m_load_section.c_str(),
-		string_getter,
-		string_setter
-	);
-	m_property_holder->add_property	(
-		"minimum period",
-		"effects",
-		"this option is resposible for minimum effect period (in seconds)",
-		m_effect_period.x,
-		m_effect_period.x
-	);
-	m_property_holder->add_property	(
-		"maximum period",
-		"effects",
-		"this option is resposible for maximum effect period (in seconds)",
-		m_effect_period.y,
-		m_effect_period.y
-	);
-	m_property_holder->add_property	(
-		"effects",
-		"effects",
-		"this option is resposible for maximum effects",
-		m_effects_collection
-	);
-	m_property_holder->add_property	(
-		"sound channels",
-		"sounds",
-		"this option is resposible for sound channels",
-		m_sounds_collection
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_load_section.c_str(), collection, this);
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &ambient::id_getter);
+
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &ambient::id_setter);
+
+    m_property_holder->add_property(
+        "id",
+        "properties",
+        "this option is resposible for ambient identifier",
+        m_load_section.c_str(),
+        string_getter,
+        string_setter
+    );
+    m_property_holder->add_property(
+        "minimum period",
+        "effects",
+        "this option is resposible for minimum effect period (in seconds)",
+        m_effect_period.x,
+        m_effect_period.x
+    );
+    m_property_holder->add_property(
+        "maximum period",
+        "effects",
+        "this option is resposible for maximum effect period (in seconds)",
+        m_effect_period.y,
+        m_effect_period.y
+    );
+    m_property_holder->add_property(
+        "effects",
+        "effects",
+        "this option is resposible for maximum effects",
+        m_effects_collection
+    );
+    m_property_holder->add_property(
+        "sound channels",
+        "sounds",
+        "this option is resposible for sound channels",
+        m_sounds_collection
+    );
 }
 
-ambient::property_holder_type* ambient::object	()
+ambient::property_holder_type* ambient::object()
 {
-	return					(m_property_holder);
+    return (m_property_holder);
 }
 
-::editor::environment::effects::manager const& ambient::effects_manager		() const
+::editor::environment::effects::manager const& ambient::effects_manager() const
 {
-	return					(m_manager.effects_manager());
+    return (m_manager.effects_manager());
 }
 
-::editor::environment::sound_channels::manager const& ambient::sounds_manager	() const
+::editor::environment::sound_channels::manager const& ambient::sounds_manager() const
 {
-	return					(m_manager.sounds_manager());
+    return (m_manager.sounds_manager());
 }
 
-ambient::SEffect* ambient::create_effect			(CInifile& config, LPCSTR id)
+ambient::SEffect* ambient::create_effect(CInifile& config, LPCSTR id)
 {
-	effect*					result = xr_new<effect>(m_manager.effects_manager(), id);
-	result->load			(config);
-	result->fill			(m_effects_collection);
-	return					(result);
+    effect* result = xr_new<effect>(m_manager.effects_manager(), id);
+    result->load(config);
+    result->fill(m_effects_collection);
+    return (result);
 }
 
-ambient::SSndChannel* ambient::create_sound_channel	(CInifile& config, LPCSTR id)
+ambient::SSndChannel* ambient::create_sound_channel(CInifile& config, LPCSTR id)
 {
-	channel*				result = xr_new<channel>(m_manager.sounds_manager(), id);
-	result->load			(config);
-	result->fill			(m_sounds_collection);
-	return					(result);
+    channel* result = xr_new<channel>(m_manager.sounds_manager(), id);
+    result->load(config);
+    result->fill(m_sounds_collection);
+    return (result);
 }
 
-CEnvAmbient::EffectVec& ambient::effects							()
+CEnvAmbient::EffectVec& ambient::effects()
 {
-	return					(inherited::effects());
+    return (inherited::effects());
 }
 
-CEnvAmbient::SSndChannelVec& ambient::get_snd_channels			()
+CEnvAmbient::SSndChannelVec& ambient::get_snd_channels()
 {
-	return					(inherited::get_snd_channels());
+    return (inherited::get_snd_channels());
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_ambients_ambient.hpp b/src/xrEngine/editor_environment_ambients_ambient.hpp
index 8c34d518141..b606f3b02fe 100644
--- a/src/xrEngine/editor_environment_ambients_ambient.hpp
+++ b/src/xrEngine/editor_environment_ambients_ambient.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_ambient.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients ambient class
+// Module : editor_environment_ambients_ambient.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients ambient class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_AMBIENTS_AMBIENT_HPP_INCLUDED
@@ -16,86 +16,91 @@
 #include "property_collection_forward.hpp"
 #include "environment.h"
 
-namespace editor {
-namespace environment {
+namespace editor
+{
+namespace environment
+{
 
-	namespace effects {
-		class manager;
-	} // namespace effects
+namespace effects
+{
+class manager;
+} // namespace effects
 
-	namespace sound_channels {
-		class manager;
-	} // namespace sound_channels
+namespace sound_channels
+{
+class manager;
+} // namespace sound_channels
 
-namespace ambients {
+namespace ambients
+{
 
 class manager;
 class effect_id;
 class sound_id;
 
 class ambient :
-	public CEnvAmbient,
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public CEnvAmbient,
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 private:
-	typedef CEnvAmbient		inherited;
+    typedef CEnvAmbient inherited;
 
 public:
-							ambient				(manager const& manager, shared_str const& id);
-	virtual					~ambient			();
-	virtual	void			load				(
-								CInifile& ambients_config,
-								CInifile& sound_channels_config,
-								CInifile& effects_config,
-								const shared_str& section
-							);
-			void			save				(CInifile& config);
-			void			fill				(editor::property_holder_collection* collection);
-	inline	shared_str const& id				() const { return m_load_section; }
-	virtual	SEffect*		create_effect		(CInifile& config, LPCSTR id);
-	virtual	SSndChannel*	create_sound_channel(CInifile& config, LPCSTR id);
-	virtual	EffectVec&		effects				();
-	virtual	SSndChannelVec&	get_snd_channels	();
+    ambient(manager const& manager, shared_str const& id);
+    virtual ~ambient();
+    virtual void load(
+        CInifile& ambients_config,
+        CInifile& sound_channels_config,
+        CInifile& effects_config,
+        const shared_str& section
+    );
+    void save(CInifile& config);
+    void fill(editor::property_holder_collection* collection);
+    inline shared_str const& id() const { return m_load_section; }
+    virtual SEffect* create_effect(CInifile& config, LPCSTR id);
+    virtual SSndChannel* create_sound_channel(CInifile& config, LPCSTR id);
+    virtual EffectVec& effects();
+    virtual SSndChannelVec& get_snd_channels();
 
 private:
-			LPCSTR xr_stdcall id_getter	() const;
-			void xr_stdcall id_setter	(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
 
 public:
-	effects::manager const&			effects_manager	() const;
-	sound_channels::manager const&	sounds_manager	() const;
+    effects::manager const& effects_manager() const;
+    sound_channels::manager const& sounds_manager() const;
 
 public:
-	typedef xr_vector<effect_id*>		effect_container_type;
-	typedef property_collection<
-				effect_container_type,
-				ambient
-			>							effect_collection_type;
+    typedef xr_vector<effect_id*> effect_container_type;
+    typedef property_collection <
+    effect_container_type,
+    ambient
+    > effect_collection_type;
 
 public:
-	typedef xr_vector<sound_id*>		sound_container_type;
-	typedef property_collection<
-				sound_container_type,
-				ambient
-			>							sound_collection_type;
+    typedef xr_vector<sound_id*> sound_container_type;
+    typedef property_collection <
+    sound_container_type,
+    ambient
+    > sound_collection_type;
 
 private:
-	typedef editor::property_holder		property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type* object();
+    virtual property_holder_type* object();
 
 private:
-	CInifile*							m_config;
-	property_holder_type*				m_property_holder;
-	manager const&						m_manager;
+    CInifile* m_config;
+    property_holder_type* m_property_holder;
+    manager const& m_manager;
 
-	effect_collection_type*				m_effects_collection;
-	effect_container_type				m_effects_ids;
+    effect_collection_type* m_effects_collection;
+    effect_container_type m_effects_ids;
 
-	sound_collection_type*				m_sounds_collection;
-	sound_container_type				m_sound_channels_ids;
+    sound_collection_type* m_sounds_collection;
+    sound_container_type m_sound_channels_ids;
 }; // class ambient
 } // namespace ambients
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_ambients_effect_id.cpp b/src/xrEngine/editor_environment_ambients_effect_id.cpp
index b53390fe301..7da0a653990 100644
--- a/src/xrEngine/editor_environment_ambients_effect_id.cpp
+++ b/src/xrEngine/editor_environment_ambients_effect_id.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_effect_id.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients effect identifier class
+// Module : editor_environment_ambients_effect_id.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients effect identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -16,63 +16,63 @@
 using editor::environment::ambients::effect_id;
 using editor::environment::effects::manager;
 
-effect_id::effect_id								(
-		manager const& manager,
-		shared_str const& id
-	) :
-	m_manager						(manager),
-	m_id							(id),
-	m_property_holder				(0)
+effect_id::effect_id(
+    manager const& manager,
+    shared_str const& id
+) :
+    m_manager(manager),
+    m_id(id),
+    m_property_holder(0)
 {
 }
 
-effect_id::~effect_id								()
+effect_id::~effect_id()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy					(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-LPCSTR const* effect_id::collection					()
+LPCSTR const* effect_id::collection()
 {
-	return							(&*m_manager.effects_ids().begin());
+    return (&*m_manager.effects_ids().begin());
 }
 
-u32 effect_id::collection_size						()
+u32 effect_id::collection_size()
 {
-	return							(m_manager.effects_ids().size());
+    return (m_manager.effects_ids().size());
 }
 
-void effect_id::fill								(editor::property_holder_collection* collection)
+void effect_id::fill(editor::property_holder_collection* collection)
 {
-	VERIFY							(!m_property_holder);
-	m_property_holder				= ::ide().create_property_holder(m_id.c_str(), collection, this);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this);
 
-	typedef editor::property_holder::string_collection_getter_type	collection_getter_type;
-	collection_getter_type			collection_getter;
-	collection_getter.bind			(this, &effect_id::collection);
+    typedef editor::property_holder::string_collection_getter_type collection_getter_type;
+    collection_getter_type collection_getter;
+    collection_getter.bind(this, &effect_id::collection);
 
-	typedef editor::property_holder::string_collection_size_getter_type	collection_size_getter_type;
-	collection_size_getter_type		collection_size_getter;
-	collection_size_getter.bind		(this, &effect_id::collection_size);
+    typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type;
+    collection_size_getter_type collection_size_getter;
+    collection_size_getter.bind(this, &effect_id::collection_size);
 
-	m_property_holder->add_property	(
-		"effect",
-		"properties",
-		"this option is resposible for effect",
-		m_id.c_str(),
-		m_id,
-		collection_getter,
-		collection_size_getter,
-		editor::property_holder::value_editor_combo_box,
-		editor::property_holder::cannot_enter_text
-	);
+    m_property_holder->add_property(
+        "effect",
+        "properties",
+        "this option is resposible for effect",
+        m_id.c_str(),
+        m_id,
+        collection_getter,
+        collection_size_getter,
+        editor::property_holder::value_editor_combo_box,
+        editor::property_holder::cannot_enter_text
+    );
 }
 
-effect_id::property_holder_type* effect_id::object	()
+effect_id::property_holder_type* effect_id::object()
 {
-	return							(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_ambients_effect_id.hpp b/src/xrEngine/editor_environment_ambients_effect_id.hpp
index 1e94551df82..575196d7b42 100644
--- a/src/xrEngine/editor_environment_ambients_effect_id.hpp
+++ b/src/xrEngine/editor_environment_ambients_effect_id.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_effect_id.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients effect identifier class
+// Module : editor_environment_ambients_effect_id.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients effect identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_AMBIENTS_EFFECT_ID_HPP_INCLUDED
@@ -14,40 +14,45 @@
 #include <boost/noncopyable.hpp>
 #include "../include/editor/property_holder.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder_collection;
 
-namespace environment {
-	namespace effects {
-		class manager;
-	} // namespace effects
+namespace environment
+{
+namespace effects
+{
+class manager;
+} // namespace effects
 
-namespace ambients {
+namespace ambients
+{
 
 class effect_id :
-	public editor::property_holder_holder,
-	private boost::noncopyable {
+    public editor::property_holder_holder,
+    private boost::noncopyable
+{
 public:
-							effect_id		(effects::manager const& manager, shared_str const& id);
-	virtual					~effect_id		();
-			void			fill			(editor::property_holder_collection* collection);
-	inline	shared_str const& id			() const { return m_id; }
+    effect_id(effects::manager const& manager, shared_str const& id);
+    virtual ~effect_id();
+    void fill(editor::property_holder_collection* collection);
+    inline shared_str const& id() const { return m_id; }
 
 private:
-	typedef editor::property_holder			property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type* object	();
+    virtual property_holder_type* object();
 
 private:
-	LPCSTR const* xr_stdcall collection		();
-	u32  xr_stdcall			collection_size	();
+    LPCSTR const* xr_stdcall collection();
+    u32 xr_stdcall collection_size();
 
 private:
-	property_holder_type*	m_property_holder;
-	effects::manager const&	m_manager;
-	shared_str				m_id;
+    property_holder_type* m_property_holder;
+    effects::manager const& m_manager;
+    shared_str m_id;
 }; // class effect_id
 } // namespace ambients
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_ambients_manager.cpp b/src/xrEngine/editor_environment_ambients_manager.cpp
index 50b5b4c3604..0f2fd8a4529 100644
--- a/src/xrEngine/editor_environment_ambients_manager.cpp
+++ b/src/xrEngine/editor_environment_ambients_manager.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_manager.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients manager class
+// Module : editor_environment_ambients_manager.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -21,147 +21,148 @@ using editor::environment::ambients::ambient;
 using editor::environment::detail::logical_string_predicate;
 
 template <>
-void property_collection<manager::ambient_container_type, manager>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<manager::ambient_container_type, manager>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy				(buffer, buffer_size, m_container[item_index]->id().c_str());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
 
 template <>
-editor::property_holder* property_collection<manager::ambient_container_type, manager>::create	()
+editor::property_holder* property_collection<manager::ambient_container_type, manager>::create()
 {
-	ambient*				object = xr_new<ambient>(m_holder, generate_unique_id("ambient_unique_id_").c_str());
-	object->fill			(this);
-	return					(object->object());
+    ambient* object = xr_new<ambient>(m_holder, generate_unique_id("ambient_unique_id_").c_str());
+    object->fill(this);
+    return (object->object());
 }
 
-manager::manager			(::editor::environment::manager const& manager) :
-	m_manager				(manager),
-	m_property_holder		(0),
-	m_collection			(0),
-	m_changed				(true)
+manager::manager(::editor::environment::manager const& manager) :
+    m_manager(manager),
+    m_property_holder(0),
+    m_collection(0),
+    m_changed(true)
 {
-	m_collection			= xr_new<collection_type>(&m_ambients, this, &m_changed);
+    m_collection = xr_new<collection_type>(&m_ambients, this, &m_changed);
 }
 
-manager::~manager			()
+manager::~manager()
 {
-	xr_delete				(m_collection);
-	delete_data				(m_ambients);
-	delete_data				(m_ambients_ids);
+    xr_delete(m_collection);
+    delete_data(m_ambients);
+    delete_data(m_ambients_ids);
 
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy			(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void manager::load			()
+void manager::load()
 {
-	VERIFY					(m_ambients.empty());
-
-	typedef CInifile::Root	sections_type;
-	sections_type&			sections = m_manager.m_ambients_config->sections();
-	m_ambients.reserve		(sections.size());
-	sections_type::const_iterator	i = sections.begin();
-	sections_type::const_iterator	e = sections.end();
-	for ( ; i != e; ++i) {
-		ambient*			object = xr_new<ambient>(*this, (*i)->Name);
-		object->load		(
-			*m_manager.m_ambients_config,
-			*m_manager.m_sound_channels_config,
-			*m_manager.m_effects_config,
-			(*i)->Name
-		);
-		object->fill		(m_collection);
-		m_ambients.push_back(object);
-	}
+    VERIFY(m_ambients.empty());
+
+    typedef CInifile::Root sections_type;
+    sections_type& sections = m_manager.m_ambients_config->sections();
+    m_ambients.reserve(sections.size());
+    sections_type::const_iterator i = sections.begin();
+    sections_type::const_iterator e = sections.end();
+    for (; i != e; ++i)
+    {
+        ambient* object = xr_new<ambient>(*this, (*i)->Name);
+        object->load(
+            *m_manager.m_ambients_config,
+            *m_manager.m_sound_channels_config,
+            *m_manager.m_effects_config,
+            (*i)->Name
+        );
+        object->fill(m_collection);
+        m_ambients.push_back(object);
+    }
 }
 
-void manager::save			()
+void manager::save()
 {
-	string_path				file_name;
-	CInifile*				config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\ambients.ltx"
-			),
-			FALSE,
-			FALSE,
-			TRUE
-		);
-
-	ambient_container_type::iterator	i = m_ambients.begin();
-	ambient_container_type::iterator	e = m_ambients.end();
-	for ( ; i != e; ++i)
-		(*i)->save			(*config);
-
-	xr_delete				(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\ambients.ltx"
+            ),
+            FALSE,
+            FALSE,
+            TRUE
+        );
+
+    ambient_container_type::iterator i = m_ambients.begin();
+    ambient_container_type::iterator e = m_ambients.end();
+    for (; i != e; ++i)
+        (*i)->save(*config);
+
+    xr_delete(config);
 }
 
-void manager::fill			(editor::property_holder* holder)
+void manager::fill(editor::property_holder* holder)
 {
-	VERIFY					(holder);
-	holder->add_property	(
-		"ambients",
-		"ambients",
-		"this option is resposible for ambients",
-		m_collection
-	);
+    VERIFY(holder);
+    holder->add_property(
+        "ambients",
+        "ambients",
+        "this option is resposible for ambients",
+        m_collection
+    );
 }
 
-::editor::environment::effects::manager const& manager::effects_manager		() const
+::editor::environment::effects::manager const& manager::effects_manager() const
 {
-	return					(m_manager.effects());
+    return (m_manager.effects());
 }
 
-::editor::environment::sound_channels::manager const& manager::sounds_manager	() const
+::editor::environment::sound_channels::manager const& manager::sounds_manager() const
 {
-	return					(m_manager.sound_channels());
+    return (m_manager.sound_channels());
 }
 
-shared_str manager::unique_id	(shared_str const& id) const
+shared_str manager::unique_id(shared_str const& id) const
 {
-	if (m_collection->unique_id(id.c_str()))
-		return				(id);
+    if (m_collection->unique_id(id.c_str()))
+        return (id);
 
-	return					(m_collection->generate_unique_id(id.c_str()));
+    return (m_collection->generate_unique_id(id.c_str()));
 }
 
-manager::ambients_ids_type const& manager::ambients_ids	() const
+manager::ambients_ids_type const& manager::ambients_ids() const
 {
-	if (!m_changed)
-		return				(m_ambients_ids);
+    if (!m_changed)
+        return (m_ambients_ids);
 
-	m_changed				= false;
+    m_changed = false;
 
-	delete_data				(m_ambients_ids);
+    delete_data(m_ambients_ids);
 
-	m_ambients_ids.resize	(m_ambients.size());
+    m_ambients_ids.resize(m_ambients.size());
 
-	ambient_container_type::const_iterator	i = m_ambients.begin();
-	ambient_container_type::const_iterator	e = m_ambients.end();
-	ambients_ids_type::iterator				j = m_ambients_ids.begin();
-	for ( ; i != e; ++i, ++j)
-		*j					= xr_strdup((*i)->id().c_str());
+    ambient_container_type::const_iterator i = m_ambients.begin();
+    ambient_container_type::const_iterator e = m_ambients.end();
+    ambients_ids_type::iterator j = m_ambients_ids.begin();
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id().c_str());
 
-	std::sort				(m_ambients_ids.begin(), m_ambients_ids.end(), logical_string_predicate());
+    std::sort(m_ambients_ids.begin(), m_ambients_ids.end(), logical_string_predicate());
 
-	return					(m_ambients_ids);
+    return (m_ambients_ids);
 }
 
-ambient* manager::get_ambient							(shared_str const& id) const
+ambient* manager::get_ambient(shared_str const& id) const
 {
-	ambient_container_type::const_iterator	i = m_ambients.begin();
-	ambient_container_type::const_iterator	e = m_ambients.end();
-	for ( ; i != e; ++i)
-		if ((*i)->id() == id)
-			return			(*i);
+    ambient_container_type::const_iterator i = m_ambients.begin();
+    ambient_container_type::const_iterator e = m_ambients.end();
+    for (; i != e; ++i)
+        if ((*i)->id() == id)
+            return (*i);
 
-	NODEFAULT;
+    NODEFAULT;
 #ifdef DEBUG
-	return					(0);
+    return (0);
 #endif // #ifdef DEBUG
 }
 
diff --git a/src/xrEngine/editor_environment_ambients_manager.hpp b/src/xrEngine/editor_environment_ambients_manager.hpp
index b4c53548d4e..f2c354f70e2 100644
--- a/src/xrEngine/editor_environment_ambients_manager.hpp
+++ b/src/xrEngine/editor_environment_ambients_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_manager.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients manager class
+// Module : editor_environment_ambients_manager.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_AMBIENTS_MANAGER_HPP_INCLUDED
@@ -14,61 +14,67 @@
 #include <boost/noncopyable.hpp>
 #include "property_collection_forward.hpp"
 
-namespace editor {
+namespace editor
+{
 
-	class property_holder;
+class property_holder;
 
-namespace environment {
+namespace environment
+{
 
-	class manager;
+class manager;
 
-	namespace effects {
-		class manager;
-	} // namespace effects
-	
-	namespace sound_channels {
-		class manager;
-	} // namespace sound_channels
+namespace effects
+{
+class manager;
+} // namespace effects
 
-namespace ambients {
+namespace sound_channels
+{
+class manager;
+} // namespace sound_channels
+
+namespace ambients
+{
 
 class ambient;
 
-class manager : private boost::noncopyable {
+class manager : private boost::noncopyable
+{
 public:
-							manager			(::editor::environment::manager const& manager);
-							~manager		();
-			void			load			();
-			void			save			();
-			void			fill			(editor::property_holder* holder);
-			shared_str		unique_id		(shared_str const& id) const;
-			ambient*		get_ambient		(shared_str const& id) const;
+    manager(::editor::environment::manager const& manager);
+    ~manager();
+    void load();
+    void save();
+    void fill(editor::property_holder* holder);
+    shared_str unique_id(shared_str const& id) const;
+    ambient* get_ambient(shared_str const& id) const;
 
 public:
-	effects::manager const&			effects_manager	() const;
-	sound_channels::manager const&	sounds_manager	() const;
+    effects::manager const& effects_manager() const;
+    sound_channels::manager const& sounds_manager() const;
 
 public:
-	typedef xr_vector<ambient*>				ambient_container_type;
-	typedef xr_vector<LPSTR>				ambients_ids_type;
+    typedef xr_vector<ambient*> ambient_container_type;
+    typedef xr_vector<LPSTR> ambients_ids_type;
 
 public:
-	ambients_ids_type const& ambients_ids	() const;
+    ambients_ids_type const& ambients_ids() const;
 
 private:
-	typedef editor::property_holder			property_holder_type;
-	typedef property_collection<
-				ambient_container_type,
-				manager
-			>								collection_type;
+    typedef editor::property_holder property_holder_type;
+    typedef property_collection <
+    ambient_container_type,
+    manager
+    > collection_type;
 
 private:
-	ambient_container_type					m_ambients;
-	mutable ambients_ids_type				m_ambients_ids;
-	::editor::environment::manager const&	m_manager;
-	property_holder_type*					m_property_holder;
-	collection_type*						m_collection;
-	mutable bool							m_changed;
+    ambient_container_type m_ambients;
+    mutable ambients_ids_type m_ambients_ids;
+    ::editor::environment::manager const& m_manager;
+    property_holder_type* m_property_holder;
+    collection_type* m_collection;
+    mutable bool m_changed;
 }; // class manager
 } // namespace ambients
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_ambients_sound_id.cpp b/src/xrEngine/editor_environment_ambients_sound_id.cpp
index 4e7cb13e204..8e4b2ee4e6a 100644
--- a/src/xrEngine/editor_environment_ambients_sound_id.cpp
+++ b/src/xrEngine/editor_environment_ambients_sound_id.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_sound_id.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients sound identifier class
+// Module : editor_environment_ambients_sound_id.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients sound identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -16,60 +16,60 @@
 using editor::environment::ambients::sound_id;
 using editor::environment::sound_channels::manager;
 
-sound_id::sound_id			(manager const& manager, shared_str const& id) :
-	m_manager						(manager),
-	m_id							(id),
-	m_property_holder				(0)
+sound_id::sound_id(manager const& manager, shared_str const& id) :
+    m_manager(manager),
+    m_id(id),
+    m_property_holder(0)
 {
 }
 
-sound_id::~sound_id			()
+sound_id::~sound_id()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy					(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-LPCSTR const* sound_id::collection					()
+LPCSTR const* sound_id::collection()
 {
-	return							(&*m_manager.channels_ids().begin());
+    return (&*m_manager.channels_ids().begin());
 }
 
-u32 sound_id::collection_size						()
+u32 sound_id::collection_size()
 {
-	return							(m_manager.channels_ids().size());
+    return (m_manager.channels_ids().size());
 }
 
-void sound_id::fill			(editor::property_holder_collection* collection)
+void sound_id::fill(editor::property_holder_collection* collection)
 {
-	VERIFY							(!m_property_holder);
-	m_property_holder				= ::ide().create_property_holder(m_id.c_str(), collection, this);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this);
 
-	typedef editor::property_holder::string_collection_getter_type	collection_getter_type;
-	collection_getter_type			collection_getter;
-	collection_getter.bind			(this, &sound_id::collection);
+    typedef editor::property_holder::string_collection_getter_type collection_getter_type;
+    collection_getter_type collection_getter;
+    collection_getter.bind(this, &sound_id::collection);
 
-	typedef editor::property_holder::string_collection_size_getter_type	collection_size_getter_type;
-	collection_size_getter_type		collection_size_getter;
-	collection_size_getter.bind		(this, &sound_id::collection_size);
+    typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type;
+    collection_size_getter_type collection_size_getter;
+    collection_size_getter.bind(this, &sound_id::collection_size);
 
-	m_property_holder->add_property	(
-		"sound channel",
-		"properties",
-		"this option is resposible for sound",
-		m_id.c_str(),
-		m_id,
-		collection_getter,
-		collection_size_getter,
-		editor::property_holder::value_editor_combo_box,
-		editor::property_holder::cannot_enter_text
-	);
+    m_property_holder->add_property(
+        "sound channel",
+        "properties",
+        "this option is resposible for sound",
+        m_id.c_str(),
+        m_id,
+        collection_getter,
+        collection_size_getter,
+        editor::property_holder::value_editor_combo_box,
+        editor::property_holder::cannot_enter_text
+    );
 }
 
-sound_id::property_holder_type* sound_id::object	()
+sound_id::property_holder_type* sound_id::object()
 {
-	return							(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_ambients_sound_id.hpp b/src/xrEngine/editor_environment_ambients_sound_id.hpp
index e704a111878..18baf85b42c 100644
--- a/src/xrEngine/editor_environment_ambients_sound_id.hpp
+++ b/src/xrEngine/editor_environment_ambients_sound_id.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_ambients_sound_id.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment ambients sound identifier class
+// Module : editor_environment_ambients_sound_id.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment ambients sound identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_AMBIENTS_SOUND_HPP_INCLUDED
@@ -14,40 +14,45 @@
 #include <boost/noncopyable.hpp>
 #include "../include/editor/property_holder.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder_collection;
 
-namespace environment {
-	namespace sound_channels {
-		class manager;
-	} // namespace sound_channels
+namespace environment
+{
+namespace sound_channels
+{
+class manager;
+} // namespace sound_channels
 
-namespace ambients {
+namespace ambients
+{
 
 class sound_id :
-	public editor::property_holder_holder,
-	private boost::noncopyable {
+    public editor::property_holder_holder,
+    private boost::noncopyable
+{
 public:
-							sound_id		(sound_channels::manager const& manager, shared_str const& sound);
-	virtual					~sound_id		();
-			void			fill			(editor::property_holder_collection* collection);
-	inline	shared_str const& id			() const { return m_id; }
+    sound_id(sound_channels::manager const& manager, shared_str const& sound);
+    virtual ~sound_id();
+    void fill(editor::property_holder_collection* collection);
+    inline shared_str const& id() const { return m_id; }
 
 private:
-	typedef editor::property_holder			property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type* object	();
+    virtual property_holder_type* object();
 
 private:
-	LPCSTR const* xr_stdcall collection		();
-	u32  xr_stdcall			collection_size	();
+    LPCSTR const* xr_stdcall collection();
+    u32 xr_stdcall collection_size();
 
 private:
-	property_holder_type*					m_property_holder;
-	sound_channels::manager const&			m_manager;
-	shared_str								m_id;
+    property_holder_type* m_property_holder;
+    sound_channels::manager const& m_manager;
+    shared_str m_id;
 }; // class sound_id
 } // namespace ambients
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_detail.cpp b/src/xrEngine/editor_environment_detail.cpp
index 13e4d0f3826..44e58f89132 100644
--- a/src/xrEngine/editor_environment_detail.cpp
+++ b/src/xrEngine/editor_environment_detail.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_detail.cpp
-//	Created 	: 11.01.2008
-//  Modified 	: 11.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment detail namespace
+// Module : editor_environment_detail.cpp
+// Created : 11.01.2008
+// Modified : 11.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment detail namespace
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -16,52 +16,52 @@
 
 using editor::environment::detail::logical_string_predicate;
 
-static HRESULT AnsiToUnicode						(LPCSTR pszA, LPVOID buffer, u32 const& buffer_size)
+static HRESULT AnsiToUnicode(LPCSTR pszA, LPVOID buffer, u32 const& buffer_size)
 {
-	VERIFY			(pszA);
-	VERIFY			(buffer);
-	VERIFY			(buffer_size);
+    VERIFY(pszA);
+    VERIFY(buffer);
+    VERIFY(buffer_size);
 
-	u32				cCharacters =  xr_strlen(pszA)+1;
-	VERIFY			(cCharacters*2 <= buffer_size);
+    u32 cCharacters = xr_strlen(pszA) + 1;
+    VERIFY(cCharacters * 2 <= buffer_size);
 
-	if (MultiByteToWideChar(CP_ACP, 0, pszA, cCharacters, (LPOLESTR)buffer, cCharacters))
-		return		(NOERROR);
+    if (MultiByteToWideChar(CP_ACP, 0, pszA, cCharacters, (LPOLESTR)buffer, cCharacters))
+        return (NOERROR);
 
-	return			(HRESULT_FROM_WIN32(GetLastError()));
+    return (HRESULT_FROM_WIN32(GetLastError()));
 }
 
-bool logical_string_predicate::operator()			(LPCSTR const& first, LPCSTR const& second) const
+bool logical_string_predicate::operator() (LPCSTR const& first, LPCSTR const& second) const
 {
-	u32				buffer_size0 = (xr_strlen(first) + 1)*2;
-	LPCWSTR			buffer0 = (LPCWSTR)_alloca(buffer_size0);
-	AnsiToUnicode	(first, (LPVOID)buffer0, buffer_size0);
+    u32 buffer_size0 = (xr_strlen(first) + 1) * 2;
+    LPCWSTR buffer0 = (LPCWSTR)_alloca(buffer_size0);
+    AnsiToUnicode(first, (LPVOID)buffer0, buffer_size0);
 
-	u32				buffer_size1 = (xr_strlen(second) + 1)*2;
-	LPCWSTR			buffer1 = (LPCWSTR)_alloca(buffer_size1);
-	AnsiToUnicode	(second, (LPVOID)buffer1, buffer_size1);
+    u32 buffer_size1 = (xr_strlen(second) + 1) * 2;
+    LPCWSTR buffer1 = (LPCWSTR)_alloca(buffer_size1);
+    AnsiToUnicode(second, (LPVOID)buffer1, buffer_size1);
 
-	return			(StrCmpLogicalW(buffer0, buffer1) < 0);
+    return (StrCmpLogicalW(buffer0, buffer1) < 0);
 }
 
-bool logical_string_predicate::operator()			(shared_str const& first, shared_str const& second) const
+bool logical_string_predicate::operator() (shared_str const& first, shared_str const& second) const
 {
-	u32				buffer_size0 = (first.size() + 1)*2;
-	LPCWSTR			buffer0 = (LPCWSTR)_alloca(buffer_size0);
-	AnsiToUnicode	(first.c_str(), (LPVOID)buffer0, buffer_size0);
+    u32 buffer_size0 = (first.size() + 1) * 2;
+    LPCWSTR buffer0 = (LPCWSTR)_alloca(buffer_size0);
+    AnsiToUnicode(first.c_str(), (LPVOID)buffer0, buffer_size0);
 
-	u32				buffer_size1 = (second.size() + 1)*2;
-	LPCWSTR			buffer1 = (LPCWSTR)_alloca(buffer_size1);
-	AnsiToUnicode	(second.c_str(), (LPVOID)buffer1, buffer_size1);
+    u32 buffer_size1 = (second.size() + 1) * 2;
+    LPCWSTR buffer1 = (LPCWSTR)_alloca(buffer_size1);
+    AnsiToUnicode(second.c_str(), (LPVOID)buffer1, buffer_size1);
 
-	return			(StrCmpLogicalW(buffer0, buffer1) < 0);
+    return (StrCmpLogicalW(buffer0, buffer1) < 0);
 }
 
-shared_str editor::environment::detail::real_path	(LPCSTR folder, LPCSTR path)
+shared_str editor::environment::detail::real_path(LPCSTR folder, LPCSTR path)
 {
-	string_path		result;
-	FS.update_path	(result, folder, path);
-	return			(result);
+    string_path result;
+    FS.update_path(result, folder, path);
+    return (result);
 }
 
 #endif // #ifdef INGAME_EDITOR
diff --git a/src/xrEngine/editor_environment_detail.hpp b/src/xrEngine/editor_environment_detail.hpp
index 0afbb91824a..b610e8bd1fe 100644
--- a/src/xrEngine/editor_environment_detail.hpp
+++ b/src/xrEngine/editor_environment_detail.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_detail.hpp
-//	Created 	: 11.01.2008
-//  Modified 	: 11.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment detail namespace
+// Module : editor_environment_detail.hpp
+// Created : 11.01.2008
+// Modified : 11.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment detail namespace
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_ENVIRONMENT_DETAIL_HPP_INCLUDED
@@ -11,16 +11,20 @@
 
 #ifdef INGAME_EDITOR
 
-namespace editor {
-namespace environment {
-namespace detail {
-
-struct logical_string_predicate {
-	bool		operator()	(LPCSTR const& first, LPCSTR const& second) const;
-	bool		operator()	(shared_str const& first, shared_str const& second) const;
+namespace editor
+{
+namespace environment
+{
+namespace detail
+{
+
+struct logical_string_predicate
+{
+    bool operator() (LPCSTR const& first, LPCSTR const& second) const;
+    bool operator() (shared_str const& first, shared_str const& second) const;
 }; // struct logical_string_predicate
 
-	shared_str	real_path	(LPCSTR folder, LPCSTR path);
+shared_str real_path(LPCSTR folder, LPCSTR path);
 
 } // namespace detail
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_effects_effect.cpp b/src/xrEngine/editor_environment_effects_effect.cpp
index 8e58289c657..89b48911864 100644
--- a/src/xrEngine/editor_environment_effects_effect.cpp
+++ b/src/xrEngine/editor_environment_effects_effect.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_effects_effect.cpp
-//	Created 	: 28.12.2007
-//  Modified 	: 28.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment effects effect class
+// Module : editor_environment_effects_effect.cpp
+// Created : 28.12.2007
+// Modified : 28.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor environment effects effect class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -20,202 +20,202 @@
 using editor::environment::effects::effect;
 using editor::environment::effects::manager;
 
-effect::effect			(manager const& manager, shared_str const& id) :
-	m_manager			(manager),
-	m_property_holder	(0),
-	m_id				(id),
-	m_sound				("")
+effect::effect(manager const& manager, shared_str const& id) :
+    m_manager(manager),
+    m_property_holder(0),
+    m_id(id),
+    m_sound("")
 {
-	particles			= "";
+    particles = "";
 }
 
-effect::~effect			()
+effect::~effect()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void effect::load		(CInifile& config)
+void effect::load(CInifile& config)
 {
-	life_time			= config.r_u32			(m_id, "life_time");
-	offset				= config.r_fvector3		(m_id, "offset");
-	particles			= config.r_string		(m_id, "particles");
-	m_sound				= config.r_string		(m_id, "sound");
-	wind_gust_factor	= config.r_float		(m_id, "wind_gust_factor");
+    life_time = config.r_u32(m_id, "life_time");
+    offset = config.r_fvector3(m_id, "offset");
+    particles = config.r_string(m_id, "particles");
+    m_sound = config.r_string(m_id, "sound");
+    wind_gust_factor = config.r_float(m_id, "wind_gust_factor");
 }
 
-void effect::save		(CInifile& config)
+void effect::save(CInifile& config)
 {
-	config.w_u32		(m_id.c_str(), "life_time",				life_time			);
-	config.w_fvector3	(m_id.c_str(), "offset",				offset				);
-	config.w_string		(m_id.c_str(), "particles",				particles.c_str()	);
-	config.w_string		(m_id.c_str(), "sound",					m_sound.c_str()		);
-	config.w_float		(m_id.c_str(), "wind_gust_factor",		wind_gust_factor	);
-	config.w_float		(m_id.c_str(), "wind_blast_in_time",	wind_blast_in_time	);
-	config.w_float		(m_id.c_str(), "wind_blast_out_time",	wind_blast_out_time	);
-	config.w_float		(m_id.c_str(), "wind_blast_strength",	wind_blast_strength	);
-	config.w_float		(m_id.c_str(), "wind_blast_longitude",	rad2deg(wind_blast_direction.getH()));
+    config.w_u32(m_id.c_str(), "life_time", life_time);
+    config.w_fvector3(m_id.c_str(), "offset", offset);
+    config.w_string(m_id.c_str(), "particles", particles.c_str());
+    config.w_string(m_id.c_str(), "sound", m_sound.c_str());
+    config.w_float(m_id.c_str(), "wind_gust_factor", wind_gust_factor);
+    config.w_float(m_id.c_str(), "wind_blast_in_time", wind_blast_in_time);
+    config.w_float(m_id.c_str(), "wind_blast_out_time", wind_blast_out_time);
+    config.w_float(m_id.c_str(), "wind_blast_strength", wind_blast_strength);
+    config.w_float(m_id.c_str(), "wind_blast_longitude", rad2deg(wind_blast_direction.getH()));
 }
 
 LPCSTR effect::id_getter() const
 {
-	return				(m_id.c_str());
+    return (m_id.c_str());
 }
 
-void effect::id_setter	(LPCSTR value_)
+void effect::id_setter(LPCSTR value_)
 {
-	shared_str			value = value_;
-	if (m_id._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (m_id._get() == value._get())
+        return;
 
-	m_id				= m_manager.unique_id(value);
+    m_id = m_manager.unique_id(value);
 }
 
-LPCSTR effect::sound_getter		()
+LPCSTR effect::sound_getter()
 {
-	return				(m_sound.c_str());
+    return (m_sound.c_str());
 }
 
-void effect::sound_setter		(LPCSTR value)
+void effect::sound_setter(LPCSTR value)
 {
-	m_sound				= value;
-	sound.destroy		();
-	sound.create		(value, st_Effect, sg_SourceType);
+    m_sound = value;
+    sound.destroy();
+    sound.create(value, st_Effect, sg_SourceType);
 }
 
-float effect::wind_blast_longitude_getter	() const
+float effect::wind_blast_longitude_getter() const
 {
-	float						h, p;
-	wind_blast_direction.getHP	(h, p);
-	return						(rad2deg(h));
+    float h, p;
+    wind_blast_direction.getHP(h, p);
+    return (rad2deg(h));
 }
 
-void effect::wind_blast_longitude_setter	(float value)
+void effect::wind_blast_longitude_setter(float value)
 {
-	wind_blast_direction.setHP	(deg2rad(value), 0.f);
+    wind_blast_direction.setHP(deg2rad(value), 0.f);
 }
 
-void effect::fill		(editor::property_holder_collection* collection)
+void effect::fill(editor::property_holder_collection* collection)
 {
-	VERIFY				(!m_property_holder);
-	m_property_holder	= ::ide().create_property_holder(m_id.c_str(), collection, this);
-
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type	string_getter;
-	string_getter.bind	(this, &effect::id_getter);
-
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type	string_setter;
-	string_setter.bind	(this, &effect::id_setter);
-
-	m_property_holder->add_property	(
-		"id",
-		"properties",
-		"this option is resposible for effect identifier",
-		m_id.c_str(),
-		string_getter,
-		string_setter
-	);
-	m_property_holder->add_property	(
-		"life time",
-		"properties",
-		"this option is resposible for effect life time (in milliseconds)",
-		(int const&)life_time,
-		(int&)life_time
-	);
-	m_property_holder->add_property	(
-		"offset",
-		"properties",
-		"this option is resposible for effect offset (3D vector)",
-		(vec3f const&)offset,
-		(vec3f&)offset
-	);
-	m_property_holder->add_property(
-		"particles",
-		"properties",
-		"this option is resposible for effect particles",
-		particles.c_str(),
-		particles,
-		&*m_manager.environment().particle_ids().begin(),
-		m_manager.environment().particle_ids().size(),
-		editor::property_holder::value_editor_tree_view,
-		editor::property_holder::cannot_enter_text
-	);
-
-	string_getter.bind	(this, &effect::sound_getter);
-	string_setter.bind	(this, &effect::sound_setter);
-	m_property_holder->add_property(
-		"sound",
-		"properties",
-		"this option is resposible for effect sound",
-		m_sound.c_str(),
-		string_getter,
-		string_setter,
-		".ogg",
-		"Sound files (*.ogg)|*.ogg",
-		detail::real_path("$game_sounds$", "").c_str(),
-		"Select sound...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
-	m_property_holder->add_property	(
-		"wind gust factor",
-		"properties",
-		"this option is resposible for effect wind gust factor",
-		wind_gust_factor,
-		wind_gust_factor
-	);
-	m_property_holder->add_property	(
-		"wind blast strength",
-		"properties",
-		"this option is resposible for effect wind blast strength",
-		wind_blast_strength,
-		wind_blast_strength
-	);
-	m_property_holder->add_property	(
-		"wind blast start time",
-		"properties",
-		"this option is resposible for effect wind blast start time",
-		wind_blast_in_time,
-		wind_blast_in_time,
-		0.f,
-		1000.f
-	);
-	m_property_holder->add_property	(
-		"wind blast stop time",
-		"properties",
-		"this option is resposible for effect wind blast stop time",
-		wind_blast_out_time,
-		wind_blast_out_time,
-		0.f,
-		1000.f
-	);
-
-	typedef ::editor::property_holder::float_getter_type	float_getter_type;
-	float_getter_type	float_getter;
-
-	typedef ::editor::property_holder::float_setter_type	float_setter_type;
-	float_setter_type	float_setter;
-
-	float_getter.bind	(this, &effect::wind_blast_longitude_getter);
-	float_setter.bind	(this, &effect::wind_blast_longitude_setter);
-	m_property_holder->add_property	(
-		"wind blast longitude",
-		"properties",
-		"this option is resposible for effect wind blast longitude",
-		float_getter(),
-		float_getter,
-		float_setter,
-		-360.f,
-		 360.f
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this);
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &effect::id_getter);
+
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &effect::id_setter);
+
+    m_property_holder->add_property(
+        "id",
+        "properties",
+        "this option is resposible for effect identifier",
+        m_id.c_str(),
+        string_getter,
+        string_setter
+    );
+    m_property_holder->add_property(
+        "life time",
+        "properties",
+        "this option is resposible for effect life time (in milliseconds)",
+        (int const&)life_time,
+        (int&)life_time
+    );
+    m_property_holder->add_property(
+        "offset",
+        "properties",
+        "this option is resposible for effect offset (3D vector)",
+        (vec3f const&)offset,
+        (vec3f&)offset
+    );
+    m_property_holder->add_property(
+        "particles",
+        "properties",
+        "this option is resposible for effect particles",
+        particles.c_str(),
+        particles,
+        &*m_manager.environment().particle_ids().begin(),
+        m_manager.environment().particle_ids().size(),
+        editor::property_holder::value_editor_tree_view,
+        editor::property_holder::cannot_enter_text
+    );
+
+    string_getter.bind(this, &effect::sound_getter);
+    string_setter.bind(this, &effect::sound_setter);
+    m_property_holder->add_property(
+        "sound",
+        "properties",
+        "this option is resposible for effect sound",
+        m_sound.c_str(),
+        string_getter,
+        string_setter,
+        ".ogg",
+        "Sound files (*.ogg)|*.ogg",
+        detail::real_path("$game_sounds$", "").c_str(),
+        "Select sound...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
+    m_property_holder->add_property(
+        "wind gust factor",
+        "properties",
+        "this option is resposible for effect wind gust factor",
+        wind_gust_factor,
+        wind_gust_factor
+    );
+    m_property_holder->add_property(
+        "wind blast strength",
+        "properties",
+        "this option is resposible for effect wind blast strength",
+        wind_blast_strength,
+        wind_blast_strength
+    );
+    m_property_holder->add_property(
+        "wind blast start time",
+        "properties",
+        "this option is resposible for effect wind blast start time",
+        wind_blast_in_time,
+        wind_blast_in_time,
+        0.f,
+        1000.f
+    );
+    m_property_holder->add_property(
+        "wind blast stop time",
+        "properties",
+        "this option is resposible for effect wind blast stop time",
+        wind_blast_out_time,
+        wind_blast_out_time,
+        0.f,
+        1000.f
+    );
+
+    typedef ::editor::property_holder::float_getter_type float_getter_type;
+    float_getter_type float_getter;
+
+    typedef ::editor::property_holder::float_setter_type float_setter_type;
+    float_setter_type float_setter;
+
+    float_getter.bind(this, &effect::wind_blast_longitude_getter);
+    float_setter.bind(this, &effect::wind_blast_longitude_setter);
+    m_property_holder->add_property(
+        "wind blast longitude",
+        "properties",
+        "this option is resposible for effect wind blast longitude",
+        float_getter(),
+        float_getter,
+        float_setter,
+        -360.f,
+        360.f
+    );
 }
 
-editor::property_holder* effect::object	()
+editor::property_holder* effect::object()
 {
-	return				(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_effects_effect.hpp b/src/xrEngine/editor_environment_effects_effect.hpp
index 98cb29e2f58..30e3255cd0a 100644
--- a/src/xrEngine/editor_environment_effects_effect.hpp
+++ b/src/xrEngine/editor_environment_effects_effect.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_effects_effect.hpp
-//	Created 	: 28.12.2007
-//  Modified 	: 28.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment effects effect class
+// Module : editor_environment_effects_effect.hpp
+// Created : 28.12.2007
+// Modified : 28.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor environment effects effect class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_EFFECTS_EFFECT_HPP_INCLUDED
@@ -15,53 +15,56 @@
 #include "../include/editor/property_holder.hpp"
 #include "environment.h"
 
-namespace editor {
-namespace environment {
+namespace editor
+{
+namespace environment
+{
 
 class manager;
 
-namespace effects {
+namespace effects
+{
 
 class manager;
 
 class effect :
-	public CEnvAmbient::SEffect,
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public CEnvAmbient::SEffect,
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 public:
-							effect		(manager const& manager, shared_str const& id);
-	virtual					~effect		();
-			void			load		(CInifile& config);
-			void			save		(CInifile& config);
-			void			fill		(editor::property_holder_collection* collection);
-	inline	LPCSTR			id			() const { return m_id.c_str(); }
+    effect(manager const& manager, shared_str const& id);
+    virtual ~effect();
+    void load(CInifile& config);
+    void save(CInifile& config);
+    void fill(editor::property_holder_collection* collection);
+    inline LPCSTR id() const { return m_id.c_str(); }
 
 
 private:
-	LPCSTR xr_stdcall		id_getter	() const;
-	void   xr_stdcall		id_setter	(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
 
-	float xr_stdcall		wind_blast_longitude_getter	() const;
-	void  xr_stdcall		wind_blast_longitude_setter	(float value);
+    float xr_stdcall wind_blast_longitude_getter() const;
+    void xr_stdcall wind_blast_longitude_setter(float value);
 
 
-	LPCSTR xr_stdcall sound_getter		();
-	void xr_stdcall	  sound_setter		(LPCSTR value);
+    LPCSTR xr_stdcall sound_getter();
+    void xr_stdcall sound_setter(LPCSTR value);
 
 private:
-	typedef editor::property_holder	property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type*object	();
+    virtual property_holder_type* object();
 
 private:
-	shared_str				m_id;
-	property_holder_type*	m_property_holder;
-	shared_str				m_sound;
+    shared_str m_id;
+    property_holder_type* m_property_holder;
+    shared_str m_sound;
 
 public:
-	manager const&			m_manager;
+    manager const& m_manager;
 }; // class effect
 
 } // namespace effects
diff --git a/src/xrEngine/editor_environment_effects_manager.cpp b/src/xrEngine/editor_environment_effects_manager.cpp
index 12ec7ac405b..bfd04ae408d 100644
--- a/src/xrEngine/editor_environment_effects_manager.cpp
+++ b/src/xrEngine/editor_environment_effects_manager.cpp
@@ -12,127 +12,128 @@ using editor::environment::effects::effect;
 using editor::environment::detail::logical_string_predicate;
 
 template <>
-void property_collection<manager::effect_container_type, manager>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<manager::effect_container_type, manager>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy				(buffer, buffer_size, m_container[item_index]->id());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id());
 }
 
 template <>
-editor::property_holder* property_collection<manager::effect_container_type, manager>::create	()
+editor::property_holder* property_collection<manager::effect_container_type, manager>::create()
 {
-	effect*					object = xr_new<effect>(m_holder, generate_unique_id("effect_unique_id_").c_str());
-	object->fill			(this);
-	return					(object->object());
+    effect* object = xr_new<effect>(m_holder, generate_unique_id("effect_unique_id_").c_str());
+    object->fill(this);
+    return (object->object());
 }
 
-manager::manager			(::editor::environment::manager* environment) :
-	m_environment			(*environment),
-	m_collection			(0),
-	m_changed				(true)
+manager::manager(::editor::environment::manager* environment) :
+    m_environment(*environment),
+    m_collection(0),
+    m_changed(true)
 {
-	m_collection			= xr_new<collection_type>(&m_effects, this, &m_changed);
+    m_collection = xr_new<collection_type>(&m_effects, this, &m_changed);
 }
 
-manager::~manager			()
+manager::~manager()
 {
-	xr_delete				(m_collection);
-	delete_data				(m_effects_ids);
+    xr_delete(m_collection);
+    delete_data(m_effects_ids);
 }
 
-void manager::load			()
+void manager::load()
 {
-	string_path				file_name;
-	CInifile*				config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\effects.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-
-	VERIFY					(m_effects.empty());
-
-	typedef CInifile::Root	sections_type;
-	sections_type&			sections = config->sections();
-	m_effects.reserve		(sections.size());
-	sections_type::const_iterator	i = sections.begin();
-	sections_type::const_iterator	e = sections.end();
-	for ( ; i != e; ++i) {
-		effect*				object = xr_new<effect>(*this, (*i)->Name);
-		object->load		(*config);
-		object->fill		(m_collection);
-		m_effects.push_back	(object);
-	}
-
-	xr_delete				(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\effects.ltx"
+            ),
+            TRUE,
+            TRUE,
+            FALSE
+        );
+
+    VERIFY(m_effects.empty());
+
+    typedef CInifile::Root sections_type;
+    sections_type& sections = config->sections();
+    m_effects.reserve(sections.size());
+    sections_type::const_iterator i = sections.begin();
+    sections_type::const_iterator e = sections.end();
+    for (; i != e; ++i)
+    {
+        effect* object = xr_new<effect>(*this, (*i)->Name);
+        object->load(*config);
+        object->fill(m_collection);
+        m_effects.push_back(object);
+    }
+
+    xr_delete(config);
 }
 
-void manager::save			()
+void manager::save()
 {
-	string_path				file_name;
-	CInifile*				config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\effects.ltx"
-			),
-			FALSE,
-			FALSE,
-			TRUE
-		);
-
-	effect_container_type::iterator	i = m_effects.begin();
-	effect_container_type::iterator	e = m_effects.end();
-	for ( ; i != e; ++i)
-		(*i)->save			(*config);
-
-	xr_delete				(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\effects.ltx"
+            ),
+            FALSE,
+            FALSE,
+            TRUE
+        );
+
+    effect_container_type::iterator i = m_effects.begin();
+    effect_container_type::iterator e = m_effects.end();
+    for (; i != e; ++i)
+        (*i)->save(*config);
+
+    xr_delete(config);
 }
 
-void manager::fill			(editor::property_holder* holder)
+void manager::fill(editor::property_holder* holder)
 {
-	VERIFY					(holder);
-	holder->add_property	(
-		"effects",
-		"ambients",
-		"this option is resposible for effects",
-		m_collection
-	);
+    VERIFY(holder);
+    holder->add_property(
+        "effects",
+        "ambients",
+        "this option is resposible for effects",
+        m_collection
+    );
 }
 
-manager::effects_ids_type const& manager::effects_ids	() const
+manager::effects_ids_type const& manager::effects_ids() const
 {
-	if (!m_changed)
-		return				(m_effects_ids);
+    if (!m_changed)
+        return (m_effects_ids);
 
-	m_changed				= false;
+    m_changed = false;
 
-	delete_data				(m_effects_ids);
+    delete_data(m_effects_ids);
 
-	m_effects_ids.resize	(m_effects.size());
+    m_effects_ids.resize(m_effects.size());
 
-	effect_container_type::const_iterator	i = m_effects.begin();
-	effect_container_type::const_iterator	e = m_effects.end();
-	effects_ids_type::iterator				j = m_effects_ids.begin();
-	for ( ; i != e; ++i, ++j)
-		*j					= xr_strdup((*i)->id());
+    effect_container_type::const_iterator i = m_effects.begin();
+    effect_container_type::const_iterator e = m_effects.end();
+    effects_ids_type::iterator j = m_effects_ids.begin();
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id());
 
-	std::sort				(m_effects_ids.begin(), m_effects_ids.end(), logical_string_predicate());
+    std::sort(m_effects_ids.begin(), m_effects_ids.end(), logical_string_predicate());
 
-	return					(m_effects_ids);
+    return (m_effects_ids);
 }
 
-shared_str manager::unique_id	(shared_str const& id) const
+shared_str manager::unique_id(shared_str const& id) const
 {
-	if (m_collection->unique_id(id.c_str()))
-		return				(id);
+    if (m_collection->unique_id(id.c_str()))
+        return (id);
 
-	return					(m_collection->generate_unique_id(id.c_str()));
+    return (m_collection->generate_unique_id(id.c_str()));
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_effects_manager.hpp b/src/xrEngine/editor_environment_effects_manager.hpp
index 4e30bae19bd..1b0f50b4ddb 100644
--- a/src/xrEngine/editor_environment_effects_manager.hpp
+++ b/src/xrEngine/editor_environment_effects_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_effects_manager.hpp
-//	Created 	: 28.12.2007
-//  Modified 	: 28.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment effects manager class
+// Module : editor_environment_effects_manager.hpp
+// Created : 28.12.2007
+// Modified : 28.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor environment effects manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_EFFECTS_MANAGER_HPP_INCLUDED
@@ -14,51 +14,55 @@
 #include <boost/noncopyable.hpp>
 #include "property_collection_forward.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 
-namespace environment {
+namespace environment
+{
 
 class manager;
 
-namespace effects {
+namespace effects
+{
 
 class effect;
 
-class manager : private boost::noncopyable {
+class manager : private boost::noncopyable
+{
 public:
-							manager			(::editor::environment::manager* environment);
-							~manager		();
-			void			load			();
-			void			save			();
-			void			fill			(editor::property_holder* holder);
-			shared_str		unique_id		(shared_str const& id) const;
+    manager(::editor::environment::manager* environment);
+    ~manager();
+    void load();
+    void save();
+    void fill(editor::property_holder* holder);
+    shared_str unique_id(shared_str const& id) const;
 
 public:
-	inline	::editor::environment::manager&	environment	() const {return m_environment;}
+    inline ::editor::environment::manager& environment() const { return m_environment; }
 
 public:
-	typedef xr_vector<effect*>				effect_container_type;
-	typedef xr_vector<LPSTR>				effects_ids_type;
+    typedef xr_vector<effect*> effect_container_type;
+    typedef xr_vector<LPSTR> effects_ids_type;
 
 public:
-	effects_ids_type const&	effects_ids		() const;
+    effects_ids_type const& effects_ids() const;
 
 private:
-	typedef editor::property_holder			property_holder_type;
-	typedef property_collection<
-				effect_container_type,
-				manager
-			>								collection_type;
+    typedef editor::property_holder property_holder_type;
+    typedef property_collection <
+    effect_container_type,
+    manager
+    > collection_type;
 
 private:
-	effect_container_type					m_effects;
-	mutable effects_ids_type				m_effects_ids;
-	::editor::environment::manager&			m_environment;
-	property_holder_type*					m_property_holder;
-	collection_type*						m_collection;
-	mutable bool							m_changed;
+    effect_container_type m_effects;
+    mutable effects_ids_type m_effects_ids;
+    ::editor::environment::manager& m_environment;
+    property_holder_type* m_property_holder;
+    collection_type* m_collection;
+    mutable bool m_changed;
 }; // class effects_manager
 
 } // namespace effects
diff --git a/src/xrEngine/editor_environment_levels_manager.cpp b/src/xrEngine/editor_environment_levels_manager.cpp
index 074745844b0..da64a66ffdd 100644
--- a/src/xrEngine/editor_environment_levels_manager.cpp
+++ b/src/xrEngine/editor_environment_levels_manager.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_levels_manager.cpp
-//	Created 	: 28.12.2007
-//  Modified 	: 28.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment levels manager class
+// Module : editor_environment_levels_manager.cpp
+// Created : 28.12.2007
+// Modified : 28.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor environment levels manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -18,143 +18,146 @@
 
 using editor::environment::levels::manager;
 
-static LPCSTR s_default_weather_id	= "[default]";
-static LPCSTR s_level_section_id	= "levels";
+static LPCSTR s_default_weather_id = "[default]";
+static LPCSTR s_level_section_id = "levels";
 
-manager::manager					(::editor::environment::weathers::manager* weathers) :
-	m_weathers						(*weathers),
-	m_property_holder				(0)
+manager::manager(::editor::environment::weathers::manager* weathers) :
+    m_weathers(*weathers),
+    m_property_holder(0)
 {
 }
 
-manager::~manager					()
+manager::~manager()
 {
-	VERIFY							(m_config_single);
-	CInifile::Destroy				(m_config_single);
-	m_config_single					= 0;
+    VERIFY(m_config_single);
+    CInifile::Destroy(m_config_single);
+    m_config_single = 0;
 
-	VERIFY							(m_config_mp);
-	CInifile::Destroy				(m_config_mp);
-	m_config_mp						= 0;
+    VERIFY(m_config_mp);
+    CInifile::Destroy(m_config_mp);
+    m_config_mp = 0;
 
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy					(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void manager::fill_levels			(CInifile& config, LPCSTR prefix, LPCSTR category)
+void manager::fill_levels(CInifile& config, LPCSTR prefix, LPCSTR category)
 {
-	string_path						section_id;
-	xr_strcpy						(section_id, "level_maps_");
-	xr_strcat						(section_id, prefix);
-	CInifile::Items const&			section = config.r_section(section_id).Data;
-
-	CInifile::Items::const_iterator	i = section.begin();
-	CInifile::Items::const_iterator	e = section.end();
-	for ( ; i != e; ++i) {
-		if (!(*i).first.size())
-			continue;
-
-		VERIFY						(config.section_exist((*i).first));
-		if (!config.line_exist((*i).first, "weathers")) {
-			m_levels.insert			(
-				std::make_pair(
-					(*i).first.c_str(),
-					std::make_pair(
-						category,
-						s_default_weather_id
-					)
-				)
-			);
-			continue;
-		}
-
-		LPCSTR						weather_id = config.r_string((*i).first, "weathers");
-		m_levels.insert				(
-			std::make_pair(
-				(*i).first.c_str(),
-				std::make_pair(
-					category,
-					weather_id
-				)
-			)
-		);
-	}
+    string_path section_id;
+    xr_strcpy(section_id, "level_maps_");
+    xr_strcat(section_id, prefix);
+    CInifile::Items const& section = config.r_section(section_id).Data;
+
+    CInifile::Items::const_iterator i = section.begin();
+    CInifile::Items::const_iterator e = section.end();
+    for (; i != e; ++i)
+    {
+        if (!(*i).first.size())
+            continue;
+
+        VERIFY(config.section_exist((*i).first));
+        if (!config.line_exist((*i).first, "weathers"))
+        {
+            m_levels.insert(
+                std::make_pair(
+                    (*i).first.c_str(),
+                    std::make_pair(
+                        category,
+                        s_default_weather_id
+                    )
+                )
+            );
+            continue;
+        }
+
+        LPCSTR weather_id = config.r_string((*i).first, "weathers");
+        m_levels.insert(
+            std::make_pair(
+                (*i).first.c_str(),
+                std::make_pair(
+                    category,
+                    weather_id
+                )
+            )
+        );
+    }
 }
 
-void manager::load					()
+void manager::load()
 {
-	string_path						file_name;
-
-	m_config_single					=
-		CInifile::Create(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"game_maps_single.ltx"
-			),
-			false
-		);
-
-	m_config_mp						=
-		CInifile::Create(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"game_maps_mp.ltx"
-			),
-			false
-		);
-
-	VERIFY							(m_levels.empty());
-	fill_levels						(*m_config_single,	"single",	"single");
-	fill_levels						(*m_config_mp,		"mp",		"multiplayer");
+    string_path file_name;
+
+    m_config_single =
+        CInifile::Create(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "game_maps_single.ltx"
+            ),
+            false
+        );
+
+    m_config_mp =
+        CInifile::Create(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "game_maps_mp.ltx"
+            ),
+            false
+        );
+
+    VERIFY(m_levels.empty());
+    fill_levels(*m_config_single, "single", "single");
+    fill_levels(*m_config_mp, "mp", "multiplayer");
 }
 
-LPCSTR const* manager::collection	()
+LPCSTR const* manager::collection()
 {
-	return							(&*m_weathers.weather_ids().begin());
+    return (&*m_weathers.weather_ids().begin());
 }
 
-u32 manager::collection_size		()
+u32 manager::collection_size()
 {
-	return							(m_weathers.weather_ids().size());
+    return (m_weathers.weather_ids().size());
 }
 
-void manager::fill					()
+void manager::fill()
 {
-	VERIFY							(!m_property_holder);
-	m_property_holder				= ::ide().create_property_holder("levels");
-
-	typedef editor::property_holder::string_collection_getter_type	collection_getter_type;
-	collection_getter_type			collection_getter;
-	collection_getter.bind			(this, &manager::collection);
-
-	typedef editor::property_holder::string_collection_size_getter_type	collection_size_getter_type;
-	collection_size_getter_type		collection_size_getter;
-	collection_size_getter.bind		(this, &manager::collection_size);
-
-	levels_container_type::iterator	i = m_levels.begin();
-	levels_container_type::iterator	e = m_levels.end();
-	for ( ; i != e; ++i) {
-		string_path					description;
-		xr_strcpy					(description, "weather for level ");
-		xr_strcat					(description, (*i).first.c_str());
-		m_property_holder->add_property	(
-			(*i).first.c_str(),
-			(*i).second.first,
-			description,
-			(*i).second.second.c_str(),
-			(*i).second.second,
-			collection_getter,
-			collection_size_getter,
-			editor::property_holder::value_editor_combo_box,
-			editor::property_holder::cannot_enter_text
-		);
-	}
-
-	::ide().environment_levels		(m_property_holder);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder("levels");
+
+    typedef editor::property_holder::string_collection_getter_type collection_getter_type;
+    collection_getter_type collection_getter;
+    collection_getter.bind(this, &manager::collection);
+
+    typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type;
+    collection_size_getter_type collection_size_getter;
+    collection_size_getter.bind(this, &manager::collection_size);
+
+    levels_container_type::iterator i = m_levels.begin();
+    levels_container_type::iterator e = m_levels.end();
+    for (; i != e; ++i)
+    {
+        string_path description;
+        xr_strcpy(description, "weather for level ");
+        xr_strcat(description, (*i).first.c_str());
+        m_property_holder->add_property(
+            (*i).first.c_str(),
+            (*i).second.first,
+            description,
+            (*i).second.second.c_str(),
+            (*i).second.second,
+            collection_getter,
+            collection_size_getter,
+            editor::property_holder::value_editor_combo_box,
+            editor::property_holder::cannot_enter_text
+        );
+    }
+
+    ::ide().environment_levels(m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_levels_manager.hpp b/src/xrEngine/editor_environment_levels_manager.hpp
index ef3ae6b521b..20b56f0af30 100644
--- a/src/xrEngine/editor_environment_levels_manager.hpp
+++ b/src/xrEngine/editor_environment_levels_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_levels_manager.hpp
-//	Created 	: 28.12.2007
-//  Modified 	: 28.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment levels manager class
+// Module : editor_environment_levels_manager.hpp
+// Created : 28.12.2007
+// Modified : 28.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor environment levels manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_LEVELS_MANAGER_HPP_INCLUDED
@@ -14,49 +14,55 @@
 #include <boost/noncopyable.hpp>
 #include "../xrserverentities/associative_vector.h"
 
-namespace editor {
+namespace editor
+{
 
-	class property_holder;
+class property_holder;
 
-namespace environment {
+namespace environment
+{
 
-	namespace weathers {
-		class manager;
-	} // namespace weathers
+namespace weathers
+{
+class manager;
+} // namespace weathers
 
-namespace levels {
+namespace levels
+{
 
-class manager : private boost::noncopyable {
+class manager : private boost::noncopyable
+{
 public:
-							manager			(::editor::environment::weathers::manager* environment);
-							~manager		();
-			void			load			();
-			void			save			();
-			void			fill			();
+    manager(::editor::environment::weathers::manager* environment);
+    ~manager();
+    void load();
+    void save();
+    void fill();
 
 private:
-			void			fill_levels		(CInifile& config, LPCSTR prefix, LPCSTR category);
+    void fill_levels(CInifile& config, LPCSTR prefix, LPCSTR category);
 
 private:
-	LPCSTR const* xr_stdcall collection		();
-	u32  xr_stdcall			collection_size	();
+    LPCSTR const* xr_stdcall collection();
+    u32 xr_stdcall collection_size();
 
 private:
-	struct predicate {
-		inline	bool	operator()			(shared_str const& left, shared_str const& right) const
-		{
-			return			(xr_strcmp(left.c_str(), right.c_str()) < 0);
-		}
-	}; // struct predicate
+    struct predicate
+    {
+        inline bool operator() (shared_str const& left, shared_str const& right) const
+        {
+            return (xr_strcmp(left.c_str(), right.c_str()) < 0);
+        }
+    }; // struct predicate
 
-	typedef associative_vector<shared_str, std::pair<LPCSTR, shared_str>, predicate>	levels_container_type;
+    typedef associative_vector<shared_str, std::pair<LPCSTR, shared_str>, predicate> levels_container_type;
 
 private:
-	levels_container_type						m_levels;
-	::editor::environment::weathers::manager&	m_weathers;
-	CInifile*									m_config_single;
-	CInifile*									m_config_mp;
-	editor::property_holder*					m_property_holder;
+    levels_container_type m_levels;
+    ::editor::environment::weathers::manager& m_weathers;
+    CInifile* m_config_single;
+    CInifile* m_config_mp;
+    editor::property_holder* m_property_holder;
 }; // class levels_manager
 
 } // namespace levels
diff --git a/src/xrEngine/editor_environment_manager.cpp b/src/xrEngine/editor_environment_manager.cpp
index 86c9add7979..1174d1d1bfc 100644
--- a/src/xrEngine/editor_environment_manager.cpp
+++ b/src/xrEngine/editor_environment_manager.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_manager.cpp
-//	Created 	: 12.12.2007
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment manager class
+// Module : editor_environment_manager.cpp
+// Created : 12.12.2007
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -31,222 +31,224 @@ using editor::environment::manager;
 using editor::environment::detail::logical_string_predicate;
 using particles_systems::library_interface;
 
-manager::manager												() :
-	m_suns						(0),
-	m_levels					(0),
-	m_effects					(0),
-	m_sound_channels			(0),
-	m_ambients					(0),
-	m_thunderbolts				(0),
-	m_weathers					(0)
+manager::manager() :
+    m_suns(0),
+    m_levels(0),
+    m_effects(0),
+    m_sound_channels(0),
+    m_ambients(0),
+    m_thunderbolts(0),
+    m_weathers(0)
 {
-	m_effects					= xr_new<editor::environment::effects::manager>(this);
-	m_sound_channels			= xr_new<editor::environment::sound_channels::manager>();
-	m_ambients					= xr_new<editor::environment::ambients::manager>(*this);
-	m_weathers					= xr_new<editor::environment::weathers::manager>(this);
-	m_suns						= xr_new<editor::environment::suns::manager>(this);
-	m_levels					= xr_new<editor::environment::levels::manager>(m_weathers);
-	m_thunderbolts				= xr_new<editor::environment::thunderbolts::manager>(this);
+    m_effects = xr_new<editor::environment::effects::manager>(this);
+    m_sound_channels = xr_new<editor::environment::sound_channels::manager>();
+    m_ambients = xr_new<editor::environment::ambients::manager>(*this);
+    m_weathers = xr_new<editor::environment::weathers::manager>(this);
+    m_suns = xr_new<editor::environment::suns::manager>(this);
+    m_levels = xr_new<editor::environment::levels::manager>(m_weathers);
+    m_thunderbolts = xr_new<editor::environment::thunderbolts::manager>(this);
 
-	load_internal				();
-	fill						();
+    load_internal();
+    fill();
 }
 
-manager::~manager												()
+manager::~manager()
 {
-	xr_delete					(m_thunderbolts);
-	xr_delete					(m_ambients);
-	xr_delete					(m_sound_channels);
-	xr_delete					(m_effects);
-	xr_delete					(m_levels);
-	xr_delete					(m_weathers);
-	xr_delete					(m_suns);
+    xr_delete(m_thunderbolts);
+    xr_delete(m_ambients);
+    xr_delete(m_sound_channels);
+    xr_delete(m_effects);
+    xr_delete(m_levels);
+    xr_delete(m_weathers);
+    xr_delete(m_suns);
 
-	delete_data					(m_shader_ids);
-	delete_data					(m_light_animator_ids);
+    delete_data(m_shader_ids);
+    delete_data(m_light_animator_ids);
 
-	WeatherCycles.clear			();
-	WeatherFXs.clear			();
+    WeatherCycles.clear();
+    WeatherFXs.clear();
 
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy				(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void manager::load												()
+void manager::load()
 {
 }
 
-void manager::load_internal										()
+void manager::load_internal()
 {
-	m_thunderbolts->load		();
-	m_suns->load				();
-	m_levels->load				();
-	m_effects->load				();
-	m_sound_channels->load		();
-	m_ambients->load			();
+    m_thunderbolts->load();
+    m_suns->load();
+    m_levels->load();
+    m_effects->load();
+    m_sound_channels->load();
+    m_ambients->load();
 
-	inherited::load				();
+    inherited::load();
 }
 
-void manager::save			()
+void manager::save()
 {
-	m_weathers->save			();
-//	m_suns->save				();
-	m_ambients->save			();
-	m_effects->save				();
-	m_sound_channels->save		();
-	m_thunderbolts->save		();
-//	m_levels->save				();
+    m_weathers->save();
+    // m_suns->save ();
+    m_ambients->save();
+    m_effects->save();
+    m_sound_channels->save();
+    m_thunderbolts->save();
+    // m_levels->save ();
 }
 
-void manager::fill												()
+void manager::fill()
 {
-	m_property_holder			= ::ide().create_property_holder("environment");
+    m_property_holder = ::ide().create_property_holder("environment");
 
-	m_weathers->fill			(m_property_holder);
-	m_suns->fill				(m_property_holder);
-	m_ambients->fill			(m_property_holder);
-	m_effects->fill				(m_property_holder);
-	m_sound_channels->fill		(m_property_holder);
-	m_thunderbolts->fill		(m_property_holder);
-	m_levels->fill				();
+    m_weathers->fill(m_property_holder);
+    m_suns->fill(m_property_holder);
+    m_ambients->fill(m_property_holder);
+    m_effects->fill(m_property_holder);
+    m_sound_channels->fill(m_property_holder);
+    m_thunderbolts->fill(m_property_holder);
+    m_levels->fill();
 
-	::ide().environment_weathers(m_property_holder);
+    ::ide().environment_weathers(m_property_holder);
 }
 
-void manager::load_weathers										()
+void manager::load_weathers()
 {
-	m_weathers->load			();
+    m_weathers->load();
 
-	// sorting weather envs
-	EnvsMapIt _I=WeatherCycles.begin();
-	EnvsMapIt _E=WeatherCycles.end();
-	for (; _I!=_E; _I++){
-		R_ASSERT3	(_I->second.size()>1,"Environment in weather must >=2",*_I->first);
-		std::sort(_I->second.begin(),_I->second.end(),sort_env_etl_pred);
-	}
-	R_ASSERT2	(!WeatherCycles.empty(),"Empty weathers.");
-	SetWeather	((*WeatherCycles.begin()).first.c_str());
+    // sorting weather envs
+    EnvsMapIt _I = WeatherCycles.begin();
+    EnvsMapIt _E = WeatherCycles.end();
+    for (; _I != _E; _I++)
+    {
+        R_ASSERT3(_I->second.size() > 1, "Environment in weather must >=2", *_I->first);
+        std::sort(_I->second.begin(), _I->second.end(), sort_env_etl_pred);
+    }
+    R_ASSERT2(!WeatherCycles.empty(), "Empty weathers.");
+    SetWeather((*WeatherCycles.begin()).first.c_str());
 }
 
-manager::shader_ids_type const& manager::shader_ids				() const
+manager::shader_ids_type const& manager::shader_ids() const
 {
-	if (!m_shader_ids.empty())
-		return					(m_shader_ids);
+    if (!m_shader_ids.empty())
+        return (m_shader_ids);
 
-	string_path					path;
-	FS.update_path				(path, "$game_data$", "shaders.xr");
-	IReader*					reader = FS.r_open(path); 
-	IReader*					stream = reader->open_chunk(3);
-	R_ASSERT					(stream);
+    string_path path;
+    FS.update_path(path, "$game_data$", "shaders.xr");
+    IReader* reader = FS.r_open(path);
+    IReader* stream = reader->open_chunk(3);
+    R_ASSERT(stream);
 
-	u32							count = stream->r_u32();
-	m_shader_ids.resize			(count);
-	shader_ids_type::iterator	i = m_shader_ids.begin();
-	shader_ids_type::iterator	e = m_shader_ids.end();
-	for ( ; i != e; ++i) {
-		string_path				buffer;
-		stream->r_stringZ		(buffer, sizeof(buffer)); 
-		*i						= xr_strdup(buffer);
-	}
-	
-	stream->close				();
-	FS.r_close					(reader);
+    u32 count = stream->r_u32();
+    m_shader_ids.resize(count);
+    shader_ids_type::iterator i = m_shader_ids.begin();
+    shader_ids_type::iterator e = m_shader_ids.end();
+    for (; i != e; ++i)
+    {
+        string_path buffer;
+        stream->r_stringZ(buffer, sizeof(buffer));
+        *i = xr_strdup(buffer);
+    }
 
-	std::sort					(m_shader_ids.begin(), m_shader_ids.end(), logical_string_predicate());
+    stream->close();
+    FS.r_close(reader);
 
-	return						(m_shader_ids);
+    std::sort(m_shader_ids.begin(), m_shader_ids.end(), logical_string_predicate());
+
+    return (m_shader_ids);
 }
 
-manager::particle_ids_type const& manager::particle_ids			() const
+manager::particle_ids_type const& manager::particle_ids() const
 {
-	if (!m_particle_ids.empty())
-		return					(m_particle_ids);
+    if (!m_particle_ids.empty())
+        return (m_particle_ids);
 
-	library_interface const&	library = m_pRender->particles_systems_library();
-	PS::CPGDef const* const*	i = library.particles_group_begin();
-	PS::CPGDef const* const*	e = library.particles_group_end();
-	for ( ; i != e; library.particles_group_next(i))
-		m_particle_ids.push_back(library.particles_group_id(**i).c_str());
+    library_interface const& library = m_pRender->particles_systems_library();
+    PS::CPGDef const* const* i = library.particles_group_begin();
+    PS::CPGDef const* const* e = library.particles_group_end();
+    for (; i != e; library.particles_group_next(i))
+        m_particle_ids.push_back(library.particles_group_id(**i).c_str());
 
-	std::sort					(m_particle_ids.begin(), m_particle_ids.end(), logical_string_predicate());
-	return						(m_particle_ids);
+    std::sort(m_particle_ids.begin(), m_particle_ids.end(), logical_string_predicate());
+    return (m_particle_ids);
 }
 
-manager::light_animator_ids_type const& manager::light_animator_ids	() const
+manager::light_animator_ids_type const& manager::light_animator_ids() const
 {
-	if (!m_light_animator_ids.empty())
-		return								(m_light_animator_ids);
+    if (!m_light_animator_ids.empty())
+        return (m_light_animator_ids);
 
-	typedef LAItemVec						container_type;
-	container_type const&					light_animators = LALib.Objects();
-	m_light_animator_ids.resize				(light_animators.size());
-	container_type::const_iterator			i = light_animators.begin();
-	container_type::const_iterator			e = light_animators.end();
-	light_animator_ids_type::iterator		j = m_light_animator_ids.begin();
-	for ( ; i != e; ++i, ++j)
-		*j									= xr_strdup((*i)->cName.c_str());
+    typedef LAItemVec container_type;
+    container_type const& light_animators = LALib.Objects();
+    m_light_animator_ids.resize(light_animators.size());
+    container_type::const_iterator i = light_animators.begin();
+    container_type::const_iterator e = light_animators.end();
+    light_animator_ids_type::iterator j = m_light_animator_ids.begin();
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->cName.c_str());
 
-	std::sort								(m_light_animator_ids.begin(), m_light_animator_ids.end(), logical_string_predicate());
+    std::sort(m_light_animator_ids.begin(), m_light_animator_ids.end(), logical_string_predicate());
 
-	return									(m_light_animator_ids);
+    return (m_light_animator_ids);
 }
 
-void manager::create_mixer	()
+void manager::create_mixer()
 {
-	VERIFY								(!CurrentEnv);
-	editor::environment::weathers::time	*object = xr_new<editor::environment::weathers::time>(this, (editor::environment::weathers::weather const*)0, "");
-	CurrentEnv							= object;
-	object->fill						(0);
+    VERIFY(!CurrentEnv);
+    editor::environment::weathers::time* object = xr_new<editor::environment::weathers::time>(this, (editor::environment::weathers::weather const*)0, "");
+    CurrentEnv = object;
+    object->fill(0);
 }
 
-void manager::unload		()
+void manager::unload()
 {
-	WeatherCycles.clear			();
-	WeatherFXs.clear			();
-	Modifiers.clear				();
-	Ambients.clear				();
+    WeatherCycles.clear();
+    WeatherFXs.clear();
+    Modifiers.clear();
+    Ambients.clear();
 }
 
-CEnvAmbient* manager::AppendEnvAmb		(const shared_str& sect)
+CEnvAmbient* manager::AppendEnvAmb(const shared_str& sect)
 {
-	return						(m_ambients->get_ambient(sect));
+    return (m_ambients->get_ambient(sect));
 }
 
-SThunderboltDesc* manager::thunderbolt_description		(CInifile& config, shared_str const& section)
+SThunderboltDesc* manager::thunderbolt_description(CInifile& config, shared_str const& section)
 {
-	return						(m_thunderbolts->description(config, section));
+    return (m_thunderbolts->description(config, section));
 }
 
-SThunderboltCollection* manager::thunderbolt_collection	(CInifile* pIni, CInifile* thunderbolts, LPCSTR section)
+SThunderboltCollection* manager::thunderbolt_collection(CInifile* pIni, CInifile* thunderbolts, LPCSTR section)
 {
-	return						(m_thunderbolts->get_collection(section));
+    return (m_thunderbolts->get_collection(section));
 }
 
-SThunderboltCollection* manager::thunderbolt_collection	(xr_vector<SThunderboltCollection*>& collection,  shared_str const& id)
+SThunderboltCollection* manager::thunderbolt_collection(xr_vector<SThunderboltCollection*>& collection, shared_str const& id)
 {
-	return						(m_thunderbolts->get_collection(id));
+    return (m_thunderbolts->get_collection(id));
 }
 
-CLensFlareDescriptor*   manager::add_flare				(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id)
+CLensFlareDescriptor* manager::add_flare(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id)
 {
 #if 0
-//	return						(m_suns->get_flare(id));
-	typedef xr_vector<CLensFlareDescriptor*>	container_type;
-	container_type::iterator	i = collection.begin();
-	container_type::iterator	e = collection.end();
-	for ( ; i != e; ++i)
-		if ((*i)->section == id)
-			return				(*i);
-
-	NODEFAULT;
+    // return (m_suns->get_flare(id));
+    typedef xr_vector<CLensFlareDescriptor*> container_type;
+    container_type::iterator i = collection.begin();
+    container_type::iterator e = collection.end();
+    for (; i != e; ++i)
+        if ((*i)->section == id)
+            return (*i);
+
+    NODEFAULT;
 #ifdef DEBUG
-	return						(0);
+    return (0);
 #endif // #ifdef DEBUG
 #endif // #if 0
-	return						(inherited::add_flare(collection, id));
+    return (inherited::add_flare(collection, id));
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_manager.hpp b/src/xrEngine/editor_environment_manager.hpp
index f97f7b2f352..d29e9785c2e 100644
--- a/src/xrEngine/editor_environment_manager.hpp
+++ b/src/xrEngine/editor_environment_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_manager.hpp
-//	Created 	: 12.12.2007
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment manager class
+// Module : editor_environment_manager.hpp
+// Created : 12.12.2007
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_ENVIRONMENT_MANAGER_HPP_INCLUDED
@@ -13,104 +13,115 @@
 
 #include "environment.h"
 
-namespace editor {
-	class property_holder;
-
-namespace environment {
-	namespace detail {
-	} // namespace detail
-
-	namespace suns {
-		class manager;
-	} // namespace suns
-
-	namespace effects {
-		class manager;
-	} // namespace effects
-
-	namespace levels {
-		class manager;
-	} // namespace levels
-
-	namespace sound_channels {
-		class manager;
-	} // namespace sound_channels
-
-	namespace ambients {
-		class manager;
-	} // namespace ambients
-
-	namespace thunderbolts {
-		class manager;
-	} // namespace thunderbolts
-
-	namespace weathers {
-		class manager;
-	} // namespace weathers
-
-class manager : public ::CEnvironment {
+namespace editor
+{
+class property_holder;
+
+namespace environment
+{
+namespace detail
+{
+} // namespace detail
+
+namespace suns
+{
+class manager;
+} // namespace suns
+
+namespace effects
+{
+class manager;
+} // namespace effects
+
+namespace levels
+{
+class manager;
+} // namespace levels
+
+namespace sound_channels
+{
+class manager;
+} // namespace sound_channels
+
+namespace ambients
+{
+class manager;
+} // namespace ambients
+
+namespace thunderbolts
+{
+class manager;
+} // namespace thunderbolts
+
+namespace weathers
+{
+class manager;
+} // namespace weathers
+
+class manager : public ::CEnvironment
+{
 public:
-	typedef xr_vector<LPCSTR>					shader_ids_type;
-	typedef xr_vector<LPCSTR>					particle_ids_type;
-	typedef xr_vector<LPCSTR>					light_animator_ids_type;
+    typedef xr_vector<LPCSTR> shader_ids_type;
+    typedef xr_vector<LPCSTR> particle_ids_type;
+    typedef xr_vector<LPCSTR> light_animator_ids_type;
 
 public:
-												manager					();
-	virtual										~manager				();
-	virtual	void								load_weathers			();
-	virtual	void								load					();
-	virtual	void								unload					();
-	virtual	void								create_mixer			();
-	virtual	CEnvAmbient*						AppendEnvAmb			(const shared_str& sect);
-	virtual	SThunderboltDesc*					thunderbolt_description	(CInifile& config, shared_str const& section);
-	virtual	SThunderboltCollection*				thunderbolt_collection	(CInifile* pIni, CInifile* thunderbolts, LPCSTR section);
-	virtual	SThunderboltCollection*				thunderbolt_collection	(xr_vector<SThunderboltCollection*>& collection,  shared_str const& id);
-	virtual	CLensFlareDescriptor*				add_flare				(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id);
-			void								save					();
-			shader_ids_type const&				shader_ids				() const;
-			particle_ids_type const&			particle_ids			() const;
-			light_animator_ids_type const&		light_animator_ids		() const;
+    manager();
+    virtual ~manager();
+    virtual void load_weathers();
+    virtual void load();
+    virtual void unload();
+    virtual void create_mixer();
+    virtual CEnvAmbient* AppendEnvAmb(const shared_str& sect);
+    virtual SThunderboltDesc* thunderbolt_description(CInifile& config, shared_str const& section);
+    virtual SThunderboltCollection* thunderbolt_collection(CInifile* pIni, CInifile* thunderbolts, LPCSTR section);
+    virtual SThunderboltCollection* thunderbolt_collection(xr_vector<SThunderboltCollection*>& collection, shared_str const& id);
+    virtual CLensFlareDescriptor* add_flare(xr_vector<CLensFlareDescriptor*>& collection, shared_str const& id);
+    void save();
+    shader_ids_type const& shader_ids() const;
+    particle_ids_type const& particle_ids() const;
+    light_animator_ids_type const& light_animator_ids() const;
 
 public:
-	typedef editor::property_holder										property_holder_type;
-	typedef editor::environment::suns::manager							suns_manager_type;
-	typedef editor::environment::levels::manager						levels_manager_type;
-	typedef editor::environment::effects::manager						effects_manager_type;
-	typedef editor::environment::sound_channels::manager				sound_channels_manager_type;
-	typedef editor::environment::ambients::manager						ambients_manager_type;
-	typedef editor::environment::thunderbolts::manager					thunderbolts_manager_type;
-	typedef editor::environment::weathers::manager						weathers_manager_type;
+    typedef editor::property_holder property_holder_type;
+    typedef editor::environment::suns::manager suns_manager_type;
+    typedef editor::environment::levels::manager levels_manager_type;
+    typedef editor::environment::effects::manager effects_manager_type;
+    typedef editor::environment::sound_channels::manager sound_channels_manager_type;
+    typedef editor::environment::ambients::manager ambients_manager_type;
+    typedef editor::environment::thunderbolts::manager thunderbolts_manager_type;
+    typedef editor::environment::weathers::manager weathers_manager_type;
 
 public:
-	inline	suns_manager_type const&			suns					() const { VERIFY(m_suns); 			return (*m_suns);			}
-	inline	levels_manager_type const&			levels					() const { VERIFY(m_levels); 		return (*m_levels);			}
-	inline	effects_manager_type const&			effects					() const { VERIFY(m_effects); 		return (*m_effects); 		}
-	inline	sound_channels_manager_type const&	sound_channels			() const { VERIFY(m_sound_channels);return (*m_sound_channels);	}
-	inline	ambients_manager_type const&		ambients				() const { VERIFY(m_ambients); 		return (*m_ambients);		}
-	inline	thunderbolts_manager_type const&	thunderbolts			() const { VERIFY(m_thunderbolts); 	return (*m_thunderbolts);	}
-	inline	weathers_manager_type&				weathers				() const { VERIFY(m_weathers); 		return (*m_weathers);		}
+    inline suns_manager_type const& suns() const { VERIFY(m_suns); return (*m_suns); }
+    inline levels_manager_type const& levels() const { VERIFY(m_levels); return (*m_levels); }
+    inline effects_manager_type const& effects() const { VERIFY(m_effects); return (*m_effects); }
+    inline sound_channels_manager_type const& sound_channels() const { VERIFY(m_sound_channels); return (*m_sound_channels); }
+    inline ambients_manager_type const& ambients() const { VERIFY(m_ambients); return (*m_ambients); }
+    inline thunderbolts_manager_type const& thunderbolts() const { VERIFY(m_thunderbolts); return (*m_thunderbolts); }
+    inline weathers_manager_type& weathers() const { VERIFY(m_weathers); return (*m_weathers); }
 
 private:
-	typedef CEnvironment						inherited;
+    typedef CEnvironment inherited;
 
 private:
-	virtual	void								load_internal			();
-			void								fill					();
+    virtual void load_internal();
+    void fill();
 
 private:
-	mutable shader_ids_type						m_shader_ids;
-	mutable particle_ids_type					m_particle_ids;
-	mutable light_animator_ids_type				m_light_animator_ids;
+    mutable shader_ids_type m_shader_ids;
+    mutable particle_ids_type m_particle_ids;
+    mutable light_animator_ids_type m_light_animator_ids;
 
 private:
-	property_holder_type*						m_property_holder;
-	suns_manager_type*							m_suns;
-	levels_manager_type*						m_levels;
-	effects_manager_type*						m_effects;
-	sound_channels_manager_type*				m_sound_channels;
-	ambients_manager_type*						m_ambients;
-	thunderbolts_manager_type*					m_thunderbolts;
-	weathers_manager_type*						m_weathers;
+    property_holder_type* m_property_holder;
+    suns_manager_type* m_suns;
+    levels_manager_type* m_levels;
+    effects_manager_type* m_effects;
+    sound_channels_manager_type* m_sound_channels;
+    ambients_manager_type* m_ambients;
+    thunderbolts_manager_type* m_thunderbolts;
+    weathers_manager_type* m_weathers;
 }; // class manager
 } // namespace environment
 } // namespace editor
diff --git a/src/xrEngine/editor_environment_manager_properties.cpp b/src/xrEngine/editor_environment_manager_properties.cpp
index d5bb00fe7bb..a1663361bcb 100644
--- a/src/xrEngine/editor_environment_manager_properties.cpp
+++ b/src/xrEngine/editor_environment_manager_properties.cpp
@@ -1,10 +1,11 @@
 
-struct test_property {
-	int	m_property;
+struct test_property
+{
+    int m_property;
 
-	test_property() : m_property(20) {}
-	int	 xr_stdcall getter () { return m_property; }
-	void xr_stdcall setter (int value) { m_property = value; }
+    test_property() : m_property(20) {}
+    int xr_stdcall getter() { return m_property; }
+    void xr_stdcall setter(int value) { m_property = value; }
 };
 
 static test_property s_test_property;
@@ -12,21 +13,23 @@ static test_property s_test_property_limited;
 
 LPCSTR s_properties[] = {"integer_property_0", "integer_property_1", "integer_property_2"};
 
-std::pair<int, LPCSTR> s_properties_enum[] = {
-	std::make_pair(10,"integer_property_0"),
-	std::make_pair(20,"integer_property_1"),
-	std::make_pair(30,"integer_property_2")
+std::pair<int, LPCSTR> s_properties_enum[] =
+{
+    std::make_pair(10, "integer_property_0"),
+    std::make_pair(20, "integer_property_1"),
+    std::make_pair(30, "integer_property_2")
 };
 
 static test_property s_test_property_values;
 static test_property s_test_property_enum;
 
-struct test_property2 {
-	LPSTR m_property;
+struct test_property2
+{
+    LPSTR m_property;
 
-	test_property2() : m_property(xr_strdup("")) {}
-	LPCSTR xr_stdcall getter () { return m_property; }
-	void xr_stdcall setter (LPCSTR value) { xr_free(m_property); m_property = xr_strdup(value); }
+    test_property2() : m_property(xr_strdup("")) {}
+    LPCSTR xr_stdcall getter() { return m_property; }
+    void xr_stdcall setter(LPCSTR value) { xr_free(m_property); m_property = xr_strdup(value); }
 };
 
 static test_property2 s_test_property2;
@@ -35,12 +38,13 @@ LPCSTR s_properties3[] = {"one", "two", "three"};
 
 static test_property2 s_test_property3;
 
-struct test_property4 {
-	bool	m_property;
+struct test_property4
+{
+    bool m_property;
 
-	test_property4() : m_property(false) {}
-	bool xr_stdcall getter () { return m_property; }
-	void xr_stdcall setter (bool value) { m_property = value; }
+    test_property4() : m_property(false) {}
+    bool xr_stdcall getter() { return m_property; }
+    void xr_stdcall setter(bool value) { m_property = value; }
 };
 
 static test_property4 s_test_property4;
@@ -49,22 +53,24 @@ LPCSTR s_properties5[] = {"bad", "good"};
 
 static test_property4 s_test_property5;
 
-struct test_property6 {
-	editor::color 	m_property;
+struct test_property6
+{
+    editor::color m_property;
 
-	test_property6() {m_property.r = 0.f; m_property.g = 0.f; m_property.b = 1.f; }
-	editor::color xr_stdcall getter () { return m_property; }
-	void xr_stdcall setter (editor::color value) { m_property = value; }
+    test_property6() { m_property.r = 0.f; m_property.g = 0.f; m_property.b = 1.f; }
+    editor::color xr_stdcall getter() { return m_property; }
+    void xr_stdcall setter(editor::color value) { m_property = value; }
 };
 
 static test_property6 s_test_property6;
 
-struct test_property7 {
-	float	m_property;
+struct test_property7
+{
+    float m_property;
 
-	test_property7() : m_property(6.f) {}
-	float xr_stdcall getter () { return m_property; }
-	void xr_stdcall setter (float value) { m_property = value; }
+    test_property7() : m_property(6.f) {}
+    float xr_stdcall getter() { return m_property; }
+    void xr_stdcall setter(float value) { m_property = value; }
 };
 
 static test_property7 s_test_property7;
@@ -73,240 +79,241 @@ static test_property7 s_test_property7_limited;
 
 static test_property7 s_test_property7_values_enum;
 
-std::pair<float, LPCSTR> s_properties7_enum[] = {
-	std::make_pair(10.1f,"float_property_0"),
-	std::make_pair(20.1f,"float_property_1"),
-	std::make_pair(30.1f,"float_property_2")
+std::pair<float, LPCSTR> s_properties7_enum[] =
+{
+    std::make_pair(10.1f, "float_property_0"),
+    std::make_pair(20.1f, "float_property_1"),
+    std::make_pair(30.1f, "float_property_2")
 };
 
 using editor::environment::manager;
 
-manager::manager	()
+manager::manager()
 {
-	// testing properties
-	if (!Device.editor())
-		return;
-
-	editor::ide&			ide = *Device.editor();
-	editor::property_holder*holder = ide.create_property_holder();
-	ide.active				(holder);
-
-	{
-		holder->add_property(
-			"holder",
-			"category",
-			"description",
-			holder
-		);
-	}
-
-	{
-		editor::property_holder::integer_getter_type	getter;
-		editor::property_holder::integer_setter_type	setter;
-
-		getter.bind			(&s_test_property, &test_property::getter);
-		setter.bind			(&s_test_property, &test_property::setter);
-		holder->add_property(
-			"integer",
-			"category",
-			"description",
-			s_test_property.m_property,
-			getter,
-			setter
-		);
-	}
-
-	{
-		editor::property_holder::integer_getter_type	getter;
-		editor::property_holder::integer_setter_type	setter;
-
-		getter.bind			(&s_test_property_limited, &test_property::getter);
-		setter.bind			(&s_test_property_limited, &test_property::setter);
-		holder->add_property(
-			"integer_limited",
-			"category",
-			"description",
-			s_test_property_limited.m_property,
-			getter,
-			setter,
-			0,
-			10
-		);
-	}
-
-	{
-		editor::property_holder::integer_getter_type	getter;
-		editor::property_holder::integer_setter_type	setter;
-
-		getter.bind			(&s_test_property_values, &test_property::getter);
-		setter.bind			(&s_test_property_values, &test_property::setter);
-		holder->add_property(
-			"integer_values",
-			"category",
-			"description",
-			s_test_property_limited.m_property,
-			getter,
-			setter,
-			s_properties,
-			3
-		);
-	}
-
-	{
-		editor::property_holder::integer_getter_type	getter;
-		editor::property_holder::integer_setter_type	setter;
-
-		getter.bind			(&s_test_property_enum, &test_property::getter);
-		setter.bind			(&s_test_property_enum, &test_property::setter);
-		holder->add_property(
-			"integer_enum",
-			"category",
-			"description",
-			s_test_property_enum.m_property,
-			getter,
-			setter,
-			s_properties_enum,
-			3
-		);
-	}
-
-	{
-		editor::property_holder::string_getter_type	getter;
-		editor::property_holder::string_setter_type	setter;
-
-		getter.bind			(&s_test_property2, &test_property2::getter);
-		setter.bind			(&s_test_property2, &test_property2::setter);
-		holder->add_property(
-			"string",
-			"category",
-			"description",
-			s_test_property2.m_property,
-			getter,
-			setter,
-			".dds",
-			"Texture files (*.dds)|*.dds",
-			"R:\\development\\priquel\\resources\\gamedata\\textures\\sky",
-			"Select texture..."
-		);
-	}
-
-	{
-		editor::property_holder::string_getter_type	getter;
-		editor::property_holder::string_setter_type	setter;
-
-		getter.bind			(&s_test_property3, &test_property2::getter);
-		setter.bind			(&s_test_property3, &test_property2::setter);
-		holder->add_property(
-			"string_values",
-			"category",
-			"description",
-			s_test_property3.m_property,
-			getter,
-			setter,
-			s_properties3,
-			3
-		);
-	}
-
-	{
-		editor::property_holder::boolean_getter_type	getter;
-		editor::property_holder::boolean_setter_type	setter;
-
-		getter.bind			(&s_test_property4, &test_property4::getter);
-		setter.bind			(&s_test_property4, &test_property4::setter);
-		holder->add_property(
-			"boolean",
-			"category",
-			"description",
-			s_test_property4.m_property,
-			getter,
-			setter
-		);
-	}
-
-	{
-		editor::property_holder::boolean_getter_type	getter;
-		editor::property_holder::boolean_setter_type	setter;
-
-		getter.bind			(&s_test_property5, &test_property4::getter);
-		setter.bind			(&s_test_property5, &test_property4::setter);
-		holder->add_property(
-			"boolean_values",
-			"category",
-			"description",
-			s_test_property5.m_property,
-			getter,
-			setter,
-			s_properties5
-		);
-	}
-
-	{
-		editor::property_holder::color_getter_type	getter;
-		editor::property_holder::color_setter_type	setter;
-
-		getter.bind			(&s_test_property6, &test_property6::getter);
-		setter.bind			(&s_test_property6, &test_property6::setter);
-		holder->add_property(
-			"color",
-			"category",
-			"description",
-			s_test_property6.m_property,
-			getter,
-			setter
-		);
-	}
-
-	{
-		editor::property_holder::float_getter_type	getter;
-		editor::property_holder::float_setter_type	setter;
-
-		getter.bind			(&s_test_property7_limited, &test_property7::getter);
-		setter.bind			(&s_test_property7_limited, &test_property7::setter);
-		holder->add_property(
-			"float",
-			"category",
-			"description",
-			s_test_property7.m_property,
-			getter,
-			setter
-		);
-	}
-
-	{
-		editor::property_holder::float_getter_type	getter;
-		editor::property_holder::float_setter_type	setter;
-
-		getter.bind			(&s_test_property7, &test_property7::getter);
-		setter.bind			(&s_test_property7, &test_property7::setter);
-		holder->add_property(
-			"float_limited",
-			"category",
-			"description",
-			s_test_property7.m_property,
-			getter,
-			setter,
-			0.f,
-			1.f
-		);
-	}
-
-	{
-		editor::property_holder::float_getter_type	getter;
-		editor::property_holder::float_setter_type	setter;
-
-		getter.bind			(&s_test_property7_values_enum, &test_property7::getter);
-		setter.bind			(&s_test_property7_values_enum, &test_property7::setter);
-		holder->add_property(
-			"float_enum",
-			"category",
-			"description",
-			s_test_property7_values_enum.m_property,
-			getter,
-			setter,
-			s_properties7_enum,
-			3
-		);
-	}
+    // testing properties
+    if (!Device.editor())
+        return;
+
+    editor::ide& ide = *Device.editor();
+    editor::property_holder* holder = ide.create_property_holder();
+    ide.active(holder);
+
+    {
+        holder->add_property(
+            "holder",
+            "category",
+            "description",
+            holder
+        );
+    }
+
+    {
+        editor::property_holder::integer_getter_type getter;
+        editor::property_holder::integer_setter_type setter;
+
+        getter.bind(&s_test_property, &test_property::getter);
+        setter.bind(&s_test_property, &test_property::setter);
+        holder->add_property(
+            "integer",
+            "category",
+            "description",
+            s_test_property.m_property,
+            getter,
+            setter
+        );
+    }
+
+    {
+        editor::property_holder::integer_getter_type getter;
+        editor::property_holder::integer_setter_type setter;
+
+        getter.bind(&s_test_property_limited, &test_property::getter);
+        setter.bind(&s_test_property_limited, &test_property::setter);
+        holder->add_property(
+            "integer_limited",
+            "category",
+            "description",
+            s_test_property_limited.m_property,
+            getter,
+            setter,
+            0,
+            10
+        );
+    }
+
+    {
+        editor::property_holder::integer_getter_type getter;
+        editor::property_holder::integer_setter_type setter;
+
+        getter.bind(&s_test_property_values, &test_property::getter);
+        setter.bind(&s_test_property_values, &test_property::setter);
+        holder->add_property(
+            "integer_values",
+            "category",
+            "description",
+            s_test_property_limited.m_property,
+            getter,
+            setter,
+            s_properties,
+            3
+        );
+    }
+
+    {
+        editor::property_holder::integer_getter_type getter;
+        editor::property_holder::integer_setter_type setter;
+
+        getter.bind(&s_test_property_enum, &test_property::getter);
+        setter.bind(&s_test_property_enum, &test_property::setter);
+        holder->add_property(
+            "integer_enum",
+            "category",
+            "description",
+            s_test_property_enum.m_property,
+            getter,
+            setter,
+            s_properties_enum,
+            3
+        );
+    }
+
+    {
+        editor::property_holder::string_getter_type getter;
+        editor::property_holder::string_setter_type setter;
+
+        getter.bind(&s_test_property2, &test_property2::getter);
+        setter.bind(&s_test_property2, &test_property2::setter);
+        holder->add_property(
+            "string",
+            "category",
+            "description",
+            s_test_property2.m_property,
+            getter,
+            setter,
+            ".dds",
+            "Texture files (*.dds)|*.dds",
+            "R:\\development\\priquel\\resources\\gamedata\\textures\\sky",
+            "Select texture..."
+        );
+    }
+
+    {
+        editor::property_holder::string_getter_type getter;
+        editor::property_holder::string_setter_type setter;
+
+        getter.bind(&s_test_property3, &test_property2::getter);
+        setter.bind(&s_test_property3, &test_property2::setter);
+        holder->add_property(
+            "string_values",
+            "category",
+            "description",
+            s_test_property3.m_property,
+            getter,
+            setter,
+            s_properties3,
+            3
+        );
+    }
+
+    {
+        editor::property_holder::boolean_getter_type getter;
+        editor::property_holder::boolean_setter_type setter;
+
+        getter.bind(&s_test_property4, &test_property4::getter);
+        setter.bind(&s_test_property4, &test_property4::setter);
+        holder->add_property(
+            "boolean",
+            "category",
+            "description",
+            s_test_property4.m_property,
+            getter,
+            setter
+        );
+    }
+
+    {
+        editor::property_holder::boolean_getter_type getter;
+        editor::property_holder::boolean_setter_type setter;
+
+        getter.bind(&s_test_property5, &test_property4::getter);
+        setter.bind(&s_test_property5, &test_property4::setter);
+        holder->add_property(
+            "boolean_values",
+            "category",
+            "description",
+            s_test_property5.m_property,
+            getter,
+            setter,
+            s_properties5
+        );
+    }
+
+    {
+        editor::property_holder::color_getter_type getter;
+        editor::property_holder::color_setter_type setter;
+
+        getter.bind(&s_test_property6, &test_property6::getter);
+        setter.bind(&s_test_property6, &test_property6::setter);
+        holder->add_property(
+            "color",
+            "category",
+            "description",
+            s_test_property6.m_property,
+            getter,
+            setter
+        );
+    }
+
+    {
+        editor::property_holder::float_getter_type getter;
+        editor::property_holder::float_setter_type setter;
+
+        getter.bind(&s_test_property7_limited, &test_property7::getter);
+        setter.bind(&s_test_property7_limited, &test_property7::setter);
+        holder->add_property(
+            "float",
+            "category",
+            "description",
+            s_test_property7.m_property,
+            getter,
+            setter
+        );
+    }
+
+    {
+        editor::property_holder::float_getter_type getter;
+        editor::property_holder::float_setter_type setter;
+
+        getter.bind(&s_test_property7, &test_property7::getter);
+        setter.bind(&s_test_property7, &test_property7::setter);
+        holder->add_property(
+            "float_limited",
+            "category",
+            "description",
+            s_test_property7.m_property,
+            getter,
+            setter,
+            0.f,
+            1.f
+        );
+    }
+
+    {
+        editor::property_holder::float_getter_type getter;
+        editor::property_holder::float_setter_type setter;
+
+        getter.bind(&s_test_property7_values_enum, &test_property7::getter);
+        setter.bind(&s_test_property7_values_enum, &test_property7::setter);
+        holder->add_property(
+            "float_enum",
+            "category",
+            "description",
+            s_test_property7_values_enum.m_property,
+            getter,
+            setter,
+            s_properties7_enum,
+            3
+        );
+    }
 }
 #endif
diff --git a/src/xrEngine/editor_environment_sound_channels_channel.cpp b/src/xrEngine/editor_environment_sound_channels_channel.cpp
index edeaffd8db6..fef9d70e1af 100644
--- a/src/xrEngine/editor_environment_sound_channels_channel.cpp
+++ b/src/xrEngine/editor_environment_sound_channels_channel.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_sound_channels_channel.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment sound channels channel class
+// Module : editor_environment_sound_channels_channel.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment sound channels channel class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -20,178 +20,181 @@ using editor::environment::sound_channels::source;
 using editor::environment::sound_channels::manager;
 
 template <>
-void property_collection<channel::sound_container_type, channel>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<channel::sound_container_type, channel>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy				(buffer, buffer_size, m_container[item_index]->id());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id());
 }
 
 template <>
-editor::property_holder* property_collection<channel::sound_container_type, channel>::create	()
+editor::property_holder* property_collection<channel::sound_container_type, channel>::create()
 {
-	source*					object = xr_new<source>("");
-	object->fill			(this);
-	return					(object->object());
+    source* object = xr_new<source>("");
+    object->fill(this);
+    return (object->object());
 }
 
-channel::channel			(manager const& manager, shared_str const& id) :
-	m_manager			(manager),
-	m_property_holder	(0),
-	m_collection		(0)
+channel::channel(manager const& manager, shared_str const& id) :
+    m_manager(manager),
+    m_property_holder(0),
+    m_collection(0)
 {
-	m_load_section		= id;
-	m_sound_dist		= Fvector2().set(0.f,0.f);
-	m_sound_period		= Ivector4().set(0,0,0,0);
-	m_collection		= xr_new<collection_type>(&m_sounds, this);
+    m_load_section = id;
+    m_sound_dist = Fvector2().set(0.f, 0.f);
+    m_sound_period = Ivector4().set(0, 0, 0, 0);
+    m_collection = xr_new<collection_type>(&m_sounds, this);
 }
 
-channel::~channel			()
+channel::~channel()
 {
-	xr_delete			(m_collection);
-	delete_data			(m_sounds);
+    xr_delete(m_collection);
+    delete_data(m_sounds);
 
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void channel::load			(CInifile& config)
+void channel::load(CInifile& config)
 {
-	inherited::load		(config, m_load_section.c_str());
-
-	VERIFY				(m_sounds.empty());
-	LPCSTR sounds		= config.r_string		(m_load_section,	"sounds");
-	string_path			sound;
-	for (u32 i=0, n=_GetItemCount(sounds); i<n; ++i) {
-		source*				object = xr_new<source>( _GetItem( sounds, i, sound ) );
-		object->fill		(m_collection);
-		m_sounds.push_back	(object);
-	}
+    inherited::load(config, m_load_section.c_str());
+
+    VERIFY(m_sounds.empty());
+    LPCSTR sounds = config.r_string(m_load_section, "sounds");
+    string_path sound;
+    for (u32 i = 0, n = _GetItemCount(sounds); i < n; ++i)
+    {
+        source* object = xr_new<source>(_GetItem(sounds, i, sound));
+        object->fill(m_collection);
+        m_sounds.push_back(object);
+    }
 }
 
-void channel::save			(CInifile& config)
+void channel::save(CInifile& config)
 {
-	config.w_float		(m_load_section.c_str(), "min_distance",	m_sound_dist.x	);
-	config.w_float		(m_load_section.c_str(), "max_distance",	m_sound_dist.y	);
-	config.w_s32		(m_load_section.c_str(), "period0",			m_sound_period.x);
-	config.w_s32		(m_load_section.c_str(), "period1",			m_sound_period.y);
-	config.w_s32		(m_load_section.c_str(), "period2",			m_sound_period.z);
-	config.w_s32		(m_load_section.c_str(), "period3",			m_sound_period.w);
-
-	u32					count = 1;
-	sound_container_type::const_iterator	b = m_sounds.begin(), i = b;
-	sound_container_type::const_iterator	e = m_sounds.end();
-	for ( ; i != e; ++i)
-		count			+= xr_strlen((*i)->id()) + 2;
-
-	LPSTR				temp = (LPSTR)_alloca(count*sizeof(char));
-	*temp				= 0;
-	for (i = b; i != e; ++i) {
-		if (i == b) {
-			xr_strcpy	(temp, count, (*i)->id());
-			continue;
-		}
-
-		xr_strcat		(temp, count, ", ");
-		xr_strcat		(temp, count, (*i)->id());
-	}
-
-	config.w_string		(m_load_section.c_str(),	"sounds", temp);
+    config.w_float(m_load_section.c_str(), "min_distance", m_sound_dist.x);
+    config.w_float(m_load_section.c_str(), "max_distance", m_sound_dist.y);
+    config.w_s32(m_load_section.c_str(), "period0", m_sound_period.x);
+    config.w_s32(m_load_section.c_str(), "period1", m_sound_period.y);
+    config.w_s32(m_load_section.c_str(), "period2", m_sound_period.z);
+    config.w_s32(m_load_section.c_str(), "period3", m_sound_period.w);
+
+    u32 count = 1;
+    sound_container_type::const_iterator b = m_sounds.begin(), i = b;
+    sound_container_type::const_iterator e = m_sounds.end();
+    for (; i != e; ++i)
+        count += xr_strlen((*i)->id()) + 2;
+
+    LPSTR temp = (LPSTR)_alloca(count*sizeof(char));
+    *temp = 0;
+    for (i = b; i != e; ++i)
+    {
+        if (i == b)
+        {
+            xr_strcpy(temp, count, (*i)->id());
+            continue;
+        }
+
+        xr_strcat(temp, count, ", ");
+        xr_strcat(temp, count, (*i)->id());
+    }
+
+    config.w_string(m_load_section.c_str(), "sounds", temp);
 }
 
-LPCSTR channel::id_getter	() const
+LPCSTR channel::id_getter() const
 {
-	return				(m_load_section.c_str());
+    return (m_load_section.c_str());
 }
 
-void channel::id_setter		(LPCSTR value_)
+void channel::id_setter(LPCSTR value_)
 {
-	shared_str			value = value_;
-	if (m_load_section._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (m_load_section._get() == value._get())
+        return;
 
-	m_load_section		= m_manager.unique_id(value);
+    m_load_section = m_manager.unique_id(value);
 }
 
-void channel::fill			(editor::property_holder_collection* collection)
+void channel::fill(editor::property_holder_collection* collection)
 {
-	VERIFY				(!m_property_holder);
-	m_property_holder	= ::ide().create_property_holder(m_load_section.c_str(), collection, this);
-
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type	string_getter;
-	string_getter.bind	(this, &channel::id_getter);
-
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type	string_setter;
-	string_setter.bind	(this, &channel::id_setter);
-
-	m_property_holder->add_property	(
-		"id",
-		"properties",
-		"this option is resposible for sound channel id",
-		m_load_section.c_str(),
-		string_getter,
-		string_setter
-	);
-	m_property_holder->add_property	(
-		"minimum distance",
-		"properties",
-		"this option is resposible for minimum distance (in meters)",
-		m_sound_dist.x,
-		m_sound_dist.x
-	);
-	m_property_holder->add_property	(
-		"maximum distance",
-		"properties",
-		"this option is resposible for maximum distance (in meters)",
-		m_sound_dist.y,
-		m_sound_dist.y
-	);
-	m_property_holder->add_property	(
-		"period 0",
-		"properties",
-		"this option is resposible for minimum start time interval (in seconds)",
-		m_sound_period.x,
-		m_sound_period.x
-	);
-	m_property_holder->add_property	(
-		"period 1",
-		"properties",
-		"this option is resposible for maximum start time interval (in seconds)",
-		m_sound_period.y,
-		m_sound_period.y
-	);
-	m_property_holder->add_property	(
-		"period 2",
-		"properties",
-		"this option is resposible for minimum pause interval (in seconds)",
-		m_sound_period.z,
-		m_sound_period.z
-	);
-	m_property_holder->add_property	(
-		"period 3",
-		"properties",
-		"this option is resposible for maximum pause interval (in seconds)",
-		m_sound_period.w,
-		m_sound_period.w
-	);
-	m_property_holder->add_property	(
-		"sounds",
-		"properties",
-		"this option is resposible for sound sources",
-		m_collection
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_load_section.c_str(), collection, this);
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &channel::id_getter);
+
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &channel::id_setter);
+
+    m_property_holder->add_property(
+        "id",
+        "properties",
+        "this option is resposible for sound channel id",
+        m_load_section.c_str(),
+        string_getter,
+        string_setter
+    );
+    m_property_holder->add_property(
+        "minimum distance",
+        "properties",
+        "this option is resposible for minimum distance (in meters)",
+        m_sound_dist.x,
+        m_sound_dist.x
+    );
+    m_property_holder->add_property(
+        "maximum distance",
+        "properties",
+        "this option is resposible for maximum distance (in meters)",
+        m_sound_dist.y,
+        m_sound_dist.y
+    );
+    m_property_holder->add_property(
+        "period 0",
+        "properties",
+        "this option is resposible for minimum start time interval (in seconds)",
+        m_sound_period.x,
+        m_sound_period.x
+    );
+    m_property_holder->add_property(
+        "period 1",
+        "properties",
+        "this option is resposible for maximum start time interval (in seconds)",
+        m_sound_period.y,
+        m_sound_period.y
+    );
+    m_property_holder->add_property(
+        "period 2",
+        "properties",
+        "this option is resposible for minimum pause interval (in seconds)",
+        m_sound_period.z,
+        m_sound_period.z
+    );
+    m_property_holder->add_property(
+        "period 3",
+        "properties",
+        "this option is resposible for maximum pause interval (in seconds)",
+        m_sound_period.w,
+        m_sound_period.w
+    );
+    m_property_holder->add_property(
+        "sounds",
+        "properties",
+        "this option is resposible for sound sources",
+        m_collection
+    );
 }
 
-channel::property_holder_type* channel::object	()
+channel::property_holder_type* channel::object()
 {
-	return				(m_property_holder);
+    return (m_property_holder);
 }
 
-CEnvAmbient::SSndChannel::sounds_type& channel::sounds	()
+CEnvAmbient::SSndChannel::sounds_type& channel::sounds()
 {
-	return				(inherited::sounds());
+    return (inherited::sounds());
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_sound_channels_channel.hpp b/src/xrEngine/editor_environment_sound_channels_channel.hpp
index 77037238ac4..3d90d6777cc 100644
--- a/src/xrEngine/editor_environment_sound_channels_channel.hpp
+++ b/src/xrEngine/editor_environment_sound_channels_channel.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_sound_channels_channel.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment sound channels channel class
+// Module : editor_environment_sound_channels_channel.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment sound channels channel class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SOUND_CHANNELS_CHANNEL_HPP_INCLUDED
@@ -16,54 +16,57 @@
 #include "property_collection_forward.hpp"
 #include "environment.h"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder_collection;
 
-namespace environment {
-namespace sound_channels {
+namespace environment
+{
+namespace sound_channels
+{
 
 class source;
 class manager;
 
 class channel :
-	public CEnvAmbient::SSndChannel,
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public CEnvAmbient::SSndChannel,
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 private:
-	typedef CEnvAmbient::SSndChannel	inherited;
+    typedef CEnvAmbient::SSndChannel inherited;
 
 public:
-							channel		(manager const& manager, shared_str const& id);
-	virtual					~channel	();
-			void			load		(CInifile& config);
-			void			save		(CInifile& config);
-			void			fill		(editor::property_holder_collection* collection);
-	inline	LPCSTR			id			() const { return m_load_section.c_str(); }
-	virtual	sounds_type&	sounds		();
+    channel(manager const& manager, shared_str const& id);
+    virtual ~channel();
+    void load(CInifile& config);
+    void save(CInifile& config);
+    void fill(editor::property_holder_collection* collection);
+    inline LPCSTR id() const { return m_load_section.c_str(); }
+    virtual sounds_type& sounds();
 
 private:
-			LPCSTR xr_stdcall id_getter	() const;
-			void   xr_stdcall id_setter	(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
 public:
-	typedef xr_vector<source*>			sound_container_type;
+    typedef xr_vector<source*> sound_container_type;
 
 private:
-	typedef editor::property_holder		property_holder_type;
-	typedef property_collection<
-				sound_container_type,
-				channel
-			>							collection_type;
+    typedef editor::property_holder property_holder_type;
+    typedef property_collection <
+    sound_container_type,
+    channel
+    > collection_type;
 
 public:
-	virtual	property_holder_type*	object	();
+    virtual property_holder_type* object();
 
 private:
-	manager const&			m_manager;
-	property_holder_type*	m_property_holder;
-	collection_type*		m_collection;
-	sound_container_type	m_sounds;
+    manager const& m_manager;
+    property_holder_type* m_property_holder;
+    collection_type* m_collection;
+    sound_container_type m_sounds;
 }; // class channel
 } // namespace sound_channels
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_sound_channels_manager.cpp b/src/xrEngine/editor_environment_sound_channels_manager.cpp
index a1aeba23ea2..683a7ab5d1f 100644
--- a/src/xrEngine/editor_environment_sound_channels_manager.cpp
+++ b/src/xrEngine/editor_environment_sound_channels_manager.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_sound_channels_manager.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment sound channels manager class
+// Module : editor_environment_sound_channels_manager.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment sound channels manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -19,127 +19,128 @@ using editor::environment::sound_channels::channel;
 using editor::environment::detail::logical_string_predicate;
 
 template <>
-void property_collection<manager::channel_container_type, manager>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<manager::channel_container_type, manager>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy				(buffer, buffer_size, m_container[item_index]->id());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id());
 }
 
 template <>
-editor::property_holder* property_collection<manager::channel_container_type, manager>::create	()
+editor::property_holder* property_collection<manager::channel_container_type, manager>::create()
 {
-	channel*				object = xr_new<channel>(m_holder, generate_unique_id("sound_channel_unique_id_").c_str());
-	object->fill			(this);
-	return					(object->object());
+    channel* object = xr_new<channel>(m_holder, generate_unique_id("sound_channel_unique_id_").c_str());
+    object->fill(this);
+    return (object->object());
 }
 
-manager::manager			() :
-	m_collection			(0),
-	m_changed				(true)
+manager::manager() :
+    m_collection(0),
+    m_changed(true)
 {
-	m_collection			= xr_new<collection_type>(&m_channels, this, &m_changed);
+    m_collection = xr_new<collection_type>(&m_channels, this, &m_changed);
 }
 
-manager::~manager			()
+manager::~manager()
 {
-	xr_delete				(m_collection);
-	delete_data				(m_channels);
-	delete_data				(m_channels_ids);
+    xr_delete(m_collection);
+    delete_data(m_channels);
+    delete_data(m_channels_ids);
 }
 
-void manager::load			()
+void manager::load()
 {
-	string_path				file_name;
-	CInifile*				config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\sound_channels.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-
-	VERIFY					(m_channels.empty());
-
-	typedef CInifile::Root	sections_type;
-	sections_type&			sections = config->sections();
-	m_channels.reserve		(sections.size());
-	sections_type::const_iterator	i = sections.begin();
-	sections_type::const_iterator	e = sections.end();
-	for ( ; i != e; ++i) {
-		channel*			object = xr_new<channel>(*this, (*i)->Name);
-		object->load		(*config);
-		object->fill		(m_collection);
-		m_channels.push_back(object);
-	}
-
-	xr_delete				(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\sound_channels.ltx"
+            ),
+            TRUE,
+            TRUE,
+            FALSE
+        );
+
+    VERIFY(m_channels.empty());
+
+    typedef CInifile::Root sections_type;
+    sections_type& sections = config->sections();
+    m_channels.reserve(sections.size());
+    sections_type::const_iterator i = sections.begin();
+    sections_type::const_iterator e = sections.end();
+    for (; i != e; ++i)
+    {
+        channel* object = xr_new<channel>(*this, (*i)->Name);
+        object->load(*config);
+        object->fill(m_collection);
+        m_channels.push_back(object);
+    }
+
+    xr_delete(config);
 }
 
-void manager::save			()
+void manager::save()
 {
-	string_path				file_name;
-	CInifile*				config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\sound_channels.ltx"
-			),
-			FALSE,
-			FALSE,
-			TRUE
-		);
-
-	channel_container_type::iterator	i = m_channels.begin();
-	channel_container_type::iterator	e = m_channels.end();
-	for ( ; i != e; ++i)
-		(*i)->save			(*config);
-
-	xr_delete				(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\sound_channels.ltx"
+            ),
+            FALSE,
+            FALSE,
+            TRUE
+        );
+
+    channel_container_type::iterator i = m_channels.begin();
+    channel_container_type::iterator e = m_channels.end();
+    for (; i != e; ++i)
+        (*i)->save(*config);
+
+    xr_delete(config);
 }
 
-void manager::fill			(editor::property_holder* holder)
+void manager::fill(editor::property_holder* holder)
 {
-	VERIFY					(holder);
-	holder->add_property	(
-		"sound channels",
-		"ambients",
-		"this option is resposible for sound channels",
-		m_collection
-	);
+    VERIFY(holder);
+    holder->add_property(
+        "sound channels",
+        "ambients",
+        "this option is resposible for sound channels",
+        m_collection
+    );
 }
 
-manager::channels_ids_type const& manager::channels_ids	() const
+manager::channels_ids_type const& manager::channels_ids() const
 {
-	if (!m_changed)
-		return				(m_channels_ids);
+    if (!m_changed)
+        return (m_channels_ids);
 
-	m_changed				= false;
+    m_changed = false;
 
-	delete_data				(m_channels_ids);
+    delete_data(m_channels_ids);
 
-	m_channels_ids.resize	(m_channels.size());
+    m_channels_ids.resize(m_channels.size());
 
-	channel_container_type::const_iterator	i = m_channels.begin();
-	channel_container_type::const_iterator	e = m_channels.end();
-	channels_ids_type::iterator				j = m_channels_ids.begin();
-	for ( ; i != e; ++i, ++j)
-		*j					= xr_strdup((*i)->id());
+    channel_container_type::const_iterator i = m_channels.begin();
+    channel_container_type::const_iterator e = m_channels.end();
+    channels_ids_type::iterator j = m_channels_ids.begin();
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id());
 
-	std::sort				(m_channels_ids.begin(), m_channels_ids.end(), logical_string_predicate());
+    std::sort(m_channels_ids.begin(), m_channels_ids.end(), logical_string_predicate());
 
-	return					(m_channels_ids);
+    return (m_channels_ids);
 }
 
-shared_str manager::unique_id	(shared_str const& id) const
+shared_str manager::unique_id(shared_str const& id) const
 {
-	if (m_collection->unique_id(id.c_str()))
-		return				(id);
+    if (m_collection->unique_id(id.c_str()))
+        return (id);
 
-	return					(m_collection->generate_unique_id(id.c_str()));
+    return (m_collection->generate_unique_id(id.c_str()));
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_sound_channels_manager.hpp b/src/xrEngine/editor_environment_sound_channels_manager.hpp
index 01d2263fcb5..a92a0cdb2ce 100644
--- a/src/xrEngine/editor_environment_sound_channels_manager.hpp
+++ b/src/xrEngine/editor_environment_sound_channels_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_sound_channels_manager.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment sound channels manager class
+// Module : editor_environment_sound_channels_manager.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment sound channels manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SOUND_CHANNELS_MANAGER_HPP_INCLUDED
@@ -14,44 +14,48 @@
 #include <boost/noncopyable.hpp>
 #include "property_collection_forward.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 
-namespace environment {
-namespace sound_channels {
+namespace environment
+{
+namespace sound_channels
+{
 
 class channel;
 
-class manager : private boost::noncopyable {
+class manager : private boost::noncopyable
+{
 public:
-							manager		();
-							~manager	();
-			void			load		();
-			void			save		();
-			void			fill		(editor::property_holder* holder);
-			shared_str		unique_id	(shared_str const& id) const;
+    manager();
+    ~manager();
+    void load();
+    void save();
+    void fill(editor::property_holder* holder);
+    shared_str unique_id(shared_str const& id) const;
 
 public:
-	typedef xr_vector<channel*>			channel_container_type;
-	typedef xr_vector<LPSTR>			channels_ids_type;
+    typedef xr_vector<channel*> channel_container_type;
+    typedef xr_vector<LPSTR> channels_ids_type;
 
 public:
-	channels_ids_type const&channels_ids() const;
+    channels_ids_type const& channels_ids() const;
 
 private:
-	typedef editor::property_holder		property_holder_type;
-	typedef property_collection<
-				channel_container_type,
-				manager
-			>							collection_type;
+    typedef editor::property_holder property_holder_type;
+    typedef property_collection <
+    channel_container_type,
+    manager
+    > collection_type;
 
 private:
-	channel_container_type				m_channels;
-	mutable channels_ids_type			m_channels_ids;
-	property_holder_type*				m_property_holder;
-	collection_type*					m_collection;
-	mutable bool						m_changed;
+    channel_container_type m_channels;
+    mutable channels_ids_type m_channels_ids;
+    property_holder_type* m_property_holder;
+    collection_type* m_collection;
+    mutable bool m_changed;
 }; // class manager
 } // namespace sound_channels
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_sound_channels_source.cpp b/src/xrEngine/editor_environment_sound_channels_source.cpp
index ae7212b6b94..6e709ab3279 100644
--- a/src/xrEngine/editor_environment_sound_channels_source.cpp
+++ b/src/xrEngine/editor_environment_sound_channels_source.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_sound_channels_source.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment sound channels source class
+// Module : editor_environment_sound_channels_source.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment sound channels source class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -15,43 +15,43 @@
 
 using editor::environment::sound_channels::source;
 
-source::source				(shared_str const& source) :
-	m_source			(source),
-	m_property_holder	(0)
+source::source(shared_str const& source) :
+    m_source(source),
+    m_property_holder(0)
 {
 }
 
-source::~source				()
+source::~source()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void source::fill			(editor::property_holder_collection* collection)
+void source::fill(editor::property_holder_collection* collection)
 {
-	VERIFY				(!m_property_holder);
-	m_property_holder	= ::ide().create_property_holder(m_source.c_str(), collection, this);
-
-	m_property_holder->add_property(
-		"sound",
-		"properties",
-		"this option is resposible for sound",
-		m_source.c_str(),
-		m_source,
-		".ogg",
-		"Sound files (*.ogg)|*.ogg",
-		detail::real_path("$game_sounds$", "").c_str(),
-		"Select sound...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_source.c_str(), collection, this);
+
+    m_property_holder->add_property(
+        "sound",
+        "properties",
+        "this option is resposible for sound",
+        m_source.c_str(),
+        m_source,
+        ".ogg",
+        "Sound files (*.ogg)|*.ogg",
+        detail::real_path("$game_sounds$", "").c_str(),
+        "Select sound...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
 }
 
 source::property_holder_type* source::object()
 {
-	return				(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_sound_channels_source.hpp b/src/xrEngine/editor_environment_sound_channels_source.hpp
index ecdcaa99696..7f9c5da4738 100644
--- a/src/xrEngine/editor_environment_sound_channels_source.hpp
+++ b/src/xrEngine/editor_environment_sound_channels_source.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_sound_channels_source.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment sound channels source class
+// Module : editor_environment_sound_channels_source.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment sound channels source class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SOUND_CHANNELS_SOURCE_HPP_INCLUDED
@@ -14,31 +14,35 @@
 #include <boost/noncopyable.hpp>
 #include "../include/editor/property_holder.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder_collection;
 
-namespace environment {
-namespace sound_channels {
+namespace environment
+{
+namespace sound_channels
+{
 
 class source :
-	public editor::property_holder_holder,
-	private boost::noncopyable {
+    public editor::property_holder_holder,
+    private boost::noncopyable
+{
 public:
-							source		(shared_str const& source);
-							~source		();
-			void			fill		(editor::property_holder_collection* collection);
-	inline	LPCSTR			id			() const { return m_source.c_str(); }
+    source(shared_str const& source);
+    ~source();
+    void fill(editor::property_holder_collection* collection);
+    inline LPCSTR id() const { return m_source.c_str(); }
 
 private:
-	typedef editor::property_holder		property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type* object();
+    virtual property_holder_type* object();
 
 private:
-	property_holder_type*	m_property_holder;
-	shared_str				m_source;
+    property_holder_type* m_property_holder;
+    shared_str m_source;
 }; // class source
 } // namespace sound_channels
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_suns_blend.cpp b/src/xrEngine/editor_environment_suns_blend.cpp
index f6e33e4e8f4..e250cf7ab11 100644
--- a/src/xrEngine/editor_environment_suns_blend.cpp
+++ b/src/xrEngine/editor_environment_suns_blend.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_blend.cpp
-//	Created 	: 26.01.2008
-//  Modified 	: 26.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns blend class
+// Module : editor_environment_suns_blend.cpp
+// Created : 26.01.2008
+// Modified : 26.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns blend class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -15,46 +15,46 @@
 using editor::environment::suns::blend;
 using editor::environment::suns::manager;
 
-blend::blend		() :
-    m_down_time	(0.f),
-    m_rise_time	(0.f),
-    m_time		(0.f)
+blend::blend() :
+    m_down_time(0.f),
+    m_rise_time(0.f),
+    m_time(0.f)
 {
 }
 
-void blend::load	(CInifile& config, shared_str const& section)
+void blend::load(CInifile& config, shared_str const& section)
 {
-    m_down_time	=   READ_IF_EXISTS(&config, r_float,	section, "blend_down_time",	60.f);
-    m_rise_time	=   READ_IF_EXISTS(&config, r_float,	section, "blend_rise_time",	60.f);
-    m_time		=   READ_IF_EXISTS(&config, r_float,	section, "blend_time",		.1f);
+    m_down_time = READ_IF_EXISTS(&config, r_float, section, "blend_down_time", 60.f);
+    m_rise_time = READ_IF_EXISTS(&config, r_float, section, "blend_rise_time", 60.f);
+    m_time = READ_IF_EXISTS(&config, r_float, section, "blend_time", .1f);
 }
 
-void blend::fill	(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection)
+void blend::fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection)
 {
-	editor::property_holder*	properties = holder;
-	VERIFY						(properties);
-
-	properties->add_property	(
-		"down time",
-		"blend",
-		"this option is resposible for the blend down time",
-		m_down_time,
-		m_down_time
-	);
-	properties->add_property	(
-		"rise time",
-		"blend",
-		"this option is resposible for the blend rise time",
-		m_rise_time,
-		m_rise_time
-	);
-	properties->add_property	(
-		"time",
-		"blend",
-		"this option is resposible for the blend time",
-		m_time,
-		m_time
-	);
+    editor::property_holder* properties = holder;
+    VERIFY(properties);
+
+    properties->add_property(
+        "down time",
+        "blend",
+        "this option is resposible for the blend down time",
+        m_down_time,
+        m_down_time
+    );
+    properties->add_property(
+        "rise time",
+        "blend",
+        "this option is resposible for the blend rise time",
+        m_rise_time,
+        m_rise_time
+    );
+    properties->add_property(
+        "time",
+        "blend",
+        "this option is resposible for the blend time",
+        m_time,
+        m_time
+    );
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_suns_blend.hpp b/src/xrEngine/editor_environment_suns_blend.hpp
index a6745e9aca6..3b18ecb6429 100644
--- a/src/xrEngine/editor_environment_suns_blend.hpp
+++ b/src/xrEngine/editor_environment_suns_blend.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_blend.hpp
-//	Created 	: 26.01.2008
-//  Modified 	: 26.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns blend class
+// Module : editor_environment_suns_blend.hpp
+// Created : 26.01.2008
+// Modified : 26.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns blend class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SUNS_BLEND_HPP_INCLUDED
@@ -13,27 +13,31 @@
 
 #include <boost/noncopyable.hpp>
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 class property_holder_collection;
 
-namespace environment {
-namespace suns {
+namespace environment
+{
+namespace suns
+{
 
 class manager;
 
-class blend : private boost::noncopyable {
+class blend : private boost::noncopyable
+{
 public:
-					blend		();
-			void	load		(CInifile& config, shared_str const& section);
-			void	save		(CInifile& config, shared_str const& section);
-			void	fill		(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection);
+    blend();
+    void load(CInifile& config, shared_str const& section);
+    void save(CInifile& config, shared_str const& section);
+    void fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection);
 
 private:
-    float			m_down_time;
-    float			m_rise_time;
-    float			m_time;
+    float m_down_time;
+    float m_rise_time;
+    float m_time;
 }; // class blend
 
 } // namespace suns
diff --git a/src/xrEngine/editor_environment_suns_flare.cpp b/src/xrEngine/editor_environment_suns_flare.cpp
index c380c44f9a7..e632f57f9af 100644
--- a/src/xrEngine/editor_environment_suns_flare.cpp
+++ b/src/xrEngine/editor_environment_suns_flare.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_flare.cpp
-//	Created 	: 13.12.2007
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns flare class
+// Module : editor_environment_suns_flare.cpp
+// Created : 13.12.2007
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns flare class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -17,68 +17,68 @@
 using editor::environment::suns::flare;
 using editor::property_holder;
 
-flare::flare			() :
-	m_property_holder	(0),
-	m_opacity			(0.f),
-	m_position			(0.f),
-	m_radius			(0.f),
-	m_texture			("")
+flare::flare() :
+    m_property_holder(0),
+    m_opacity(0.f),
+    m_position(0.f),
+    m_radius(0.f),
+    m_texture("")
 {
 }
 
-flare::~flare			()
+flare::~flare()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-editor::property_holder*	flare::object	()
+editor::property_holder* flare::object()
 {
-	return				(m_property_holder);
+    return (m_property_holder);
 }
 
-void flare::fill		(editor::property_holder_collection* collection)
+void flare::fill(editor::property_holder_collection* collection)
 {
-	VERIFY				(!m_property_holder);
-	m_property_holder	= ::ide().create_property_holder("flare", collection, this);
-	property_holder*	properties = m_property_holder;
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder("flare", collection, this);
+    property_holder* properties = m_property_holder;
 
-	properties->add_property(
-		"texture",
-		"flare",
-		"this option is resposible for gradient texture",
-		m_texture.c_str(),
-		m_texture,
-		".dds",
-		"Texture files (*.dds)|*.dds",
-		detail::real_path("$game_textures$", "").c_str(),
-		"Select texture...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
-	properties->add_property(
-		"opacity",
-		"flare",
-		"this option is resposible for gradient opacity",
-		m_opacity,
-		m_opacity
-	);
-	properties->add_property(
-		"position",
-		"flare",
-		"this option is resposible for gradient position",
-		m_position,
-		m_position
-	);
-	properties->add_property(
-		"radius",
-		"flare",
-		"this option is resposible for gradient radius",
-		m_radius,
-		m_radius
-	);
+    properties->add_property(
+        "texture",
+        "flare",
+        "this option is resposible for gradient texture",
+        m_texture.c_str(),
+        m_texture,
+        ".dds",
+        "Texture files (*.dds)|*.dds",
+        detail::real_path("$game_textures$", "").c_str(),
+        "Select texture...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
+    properties->add_property(
+        "opacity",
+        "flare",
+        "this option is resposible for gradient opacity",
+        m_opacity,
+        m_opacity
+    );
+    properties->add_property(
+        "position",
+        "flare",
+        "this option is resposible for gradient position",
+        m_position,
+        m_position
+    );
+    properties->add_property(
+        "radius",
+        "flare",
+        "this option is resposible for gradient radius",
+        m_radius,
+        m_radius
+    );
 }
-	
+
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_suns_flare.hpp b/src/xrEngine/editor_environment_suns_flare.hpp
index 80abdb37c10..2ac60ea5fd5 100644
--- a/src/xrEngine/editor_environment_suns_flare.hpp
+++ b/src/xrEngine/editor_environment_suns_flare.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_flare.hpp
-//	Created 	: 13.12.2007
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns flare class
+// Module : editor_environment_suns_flare.hpp
+// Created : 13.12.2007
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns flare class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_FLARE_HPP_INCLUDED
@@ -14,33 +14,36 @@
 #include <boost/noncopyable.hpp>
 #include "../include/editor/property_holder.hpp"
 
-namespace editor {
-namespace environment {
-namespace suns {
+namespace editor
+{
+namespace environment
+{
+namespace suns
+{
 
 class flare :
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 public:
-						flare		();
-	virtual				~flare		();
-			void		fill		(editor::property_holder_collection* collection);
+    flare();
+    virtual ~flare();
+    void fill(editor::property_holder_collection* collection);
 
 public:
-	typedef editor::property_holder	property_holder;
+    typedef editor::property_holder property_holder;
 
 public:
-	virtual	property_holder*object	();
+    virtual property_holder* object();
 
 private:
-	property_holder*	m_property_holder;
+    property_holder* m_property_holder;
 
 public:
-	shared_str			m_texture;
-    float				m_opacity;
-    float				m_position;
-    float				m_radius;
+    shared_str m_texture;
+    float m_opacity;
+    float m_position;
+    float m_radius;
 }; // class flare
 
 } // namespace suns
diff --git a/src/xrEngine/editor_environment_suns_flares.cpp b/src/xrEngine/editor_environment_suns_flares.cpp
index 3fcb5286bbb..396fd1913e8 100644
--- a/src/xrEngine/editor_environment_suns_flares.cpp
+++ b/src/xrEngine/editor_environment_suns_flares.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_flares.cpp
-//	Created 	: 26.01.2008
-//  Modified 	: 26.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns flares class
+// Module : editor_environment_suns_flares.cpp
+// Created : 26.01.2008
+// Modified : 26.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns flares class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -21,106 +21,107 @@ using editor::environment::suns::manager;
 using editor::environment::suns::flare;
 
 template <>
-void property_collection<flares::flares_type, flares>::display_name	(
-		u32 const& item_index,
-		LPSTR const& buffer,
-		u32 const& buffer_size
-	)
+void property_collection<flares::flares_type, flares>::display_name(
+    u32 const& item_index,
+    LPSTR const& buffer,
+    u32 const& buffer_size
+)
 {
-	float					position = m_container[item_index]->m_position;
-	xr_sprintf				(buffer, buffer_size, "flare [%f]", position);
+    float position = m_container[item_index]->m_position;
+    xr_sprintf(buffer, buffer_size, "flare [%f]", position);
 }
 
 template <>
-editor::property_holder* property_collection<flares::flares_type, flares>::create	()
+editor::property_holder* property_collection<flares::flares_type, flares>::create()
 {
-	flare*					object = xr_new<flare>();
-	object->fill			(this);
-	return					(object->object());
+    flare* object = xr_new<flare>();
+    object->fill(this);
+    return (object->object());
 }
 
-flares::flares		() :
-    m_use					(false),
-    m_shader				(""),
-	m_collection			(0)
+flares::flares() :
+    m_use(false),
+    m_shader(""),
+    m_collection(0)
 {
-	m_collection			= xr_new<collection_type>(&m_flares, this);
+    m_collection = xr_new<collection_type>(&m_flares, this);
 }
 
-flares::~flares		()
+flares::~flares()
 {
-	xr_delete				(m_collection);
-	delete_data				(m_flares);
+    xr_delete(m_collection);
+    delete_data(m_flares);
 }
 
-void flares::load	(CInifile& config, shared_str const& section)
+void flares::load(CInifile& config, shared_str const& section)
 {
-    m_use					= !!READ_IF_EXISTS(&config, r_bool,	  section, "flares",		true);
-    m_shader				=   READ_IF_EXISTS(&config, r_string, section, "flare_shader",	"effects\\flare");
-
-	if (!m_use)
-		return;
-
-	shared_str				flare_opacity  = READ_IF_EXISTS(&config, r_string, section, "flare_opacity",	"0.340, 0.260, 0.500, 0.420, 0.260, 0.260");
-	shared_str				flare_position = READ_IF_EXISTS(&config, r_string, section, "flare_position",	"1.300, 1.000, 0.500, -0.300, -0.600, -1.000");
-	shared_str				flare_radius   = READ_IF_EXISTS(&config, r_string, section, "flare_radius",		"0.080, 0.120, 0.040, 0.080, 0.120, 0.300");
-	shared_str				flare_textures = READ_IF_EXISTS(&config, r_string, section, "flare_textures",	"fx\\fx_flare1.tga, fx\\fx_flare2.tga, fx\\fx_flare2.tga, fx\\fx_flare2.tga, fx\\fx_flare3.tga, fx\\fx_flare1.tga");
-
-	u32						opacity_count  = _GetItemCount(flare_opacity  .c_str());
-	u32						position_count = _GetItemCount(flare_position .c_str());
-	u32						radius_count   = _GetItemCount(flare_radius   .c_str());
-	u32						texture_count  = _GetItemCount(flare_textures .c_str());
-
-	u32						min_flare_count = _min(_min(_min(opacity_count, position_count), radius_count), texture_count);
-	u32						max_flare_count = _max(_max(_max(opacity_count, position_count), radius_count), texture_count);
-
-	u32						max_string_count= _max(_max(_max(flare_opacity.size(), flare_position.size()), flare_radius.size()), flare_textures.size()) + 1;
-
-	if (min_flare_count != max_flare_count)
-		Msg					("! flare count for sun [%s] is setup incorrectly. only %d flares are correct", section.c_str(), min_flare_count);
-
-	u32 const buffer_size	= max_string_count*sizeof(char);
-	LPSTR					result = (LPSTR)_alloca(buffer_size);
-	for (u32 i=0; i<min_flare_count; ++i) {
-		flare*				object = xr_new<flare>();
-		object->m_opacity	= (float)atof(_GetItem(flare_opacity  .c_str(), i, result, buffer_size));
-		object->m_position	= (float)atof(_GetItem(flare_position .c_str(), i, result, buffer_size));
-		object->m_radius	= (float)atof(_GetItem(flare_radius   .c_str(), i, result, buffer_size));
-		object->m_texture	=			  _GetItem(flare_textures .c_str(), i, result, buffer_size);
-		object->fill		(m_collection);
-		m_flares.push_back	(object);
-	}
+    m_use = !!READ_IF_EXISTS(&config, r_bool, section, "flares", true);
+    m_shader = READ_IF_EXISTS(&config, r_string, section, "flare_shader", "effects\\flare");
+
+    if (!m_use)
+        return;
+
+    shared_str flare_opacity = READ_IF_EXISTS(&config, r_string, section, "flare_opacity", "0.340, 0.260, 0.500, 0.420, 0.260, 0.260");
+    shared_str flare_position = READ_IF_EXISTS(&config, r_string, section, "flare_position", "1.300, 1.000, 0.500, -0.300, -0.600, -1.000");
+    shared_str flare_radius = READ_IF_EXISTS(&config, r_string, section, "flare_radius", "0.080, 0.120, 0.040, 0.080, 0.120, 0.300");
+    shared_str flare_textures = READ_IF_EXISTS(&config, r_string, section, "flare_textures", "fx\\fx_flare1.tga, fx\\fx_flare2.tga, fx\\fx_flare2.tga, fx\\fx_flare2.tga, fx\\fx_flare3.tga, fx\\fx_flare1.tga");
+
+    u32 opacity_count = _GetItemCount(flare_opacity.c_str());
+    u32 position_count = _GetItemCount(flare_position.c_str());
+    u32 radius_count = _GetItemCount(flare_radius.c_str());
+    u32 texture_count = _GetItemCount(flare_textures.c_str());
+
+    u32 min_flare_count = _min(_min(_min(opacity_count, position_count), radius_count), texture_count);
+    u32 max_flare_count = _max(_max(_max(opacity_count, position_count), radius_count), texture_count);
+
+    u32 max_string_count = _max(_max(_max(flare_opacity.size(), flare_position.size()), flare_radius.size()), flare_textures.size()) + 1;
+
+    if (min_flare_count != max_flare_count)
+        Msg("! flare count for sun [%s] is setup incorrectly. only %d flares are correct", section.c_str(), min_flare_count);
+
+    u32 const buffer_size = max_string_count*sizeof(char);
+    LPSTR result = (LPSTR)_alloca(buffer_size);
+    for (u32 i = 0; i < min_flare_count; ++i)
+    {
+        flare* object = xr_new<flare>();
+        object->m_opacity = (float)atof(_GetItem(flare_opacity.c_str(), i, result, buffer_size));
+        object->m_position = (float)atof(_GetItem(flare_position.c_str(), i, result, buffer_size));
+        object->m_radius = (float)atof(_GetItem(flare_radius.c_str(), i, result, buffer_size));
+        object->m_texture = _GetItem(flare_textures.c_str(), i, result, buffer_size);
+        object->fill(m_collection);
+        m_flares.push_back(object);
+    }
 }
 
-void flares::fill	(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection)
+void flares::fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection)
 {
-	editor::property_holder*properties = holder;
-	VERIFY					(properties);
-
-	properties->add_property(
-		"use",
-		"flares",
-		"this option is resposible for the flares usage",
-		m_use,
-		m_use
-	);
-	properties->add_property(
-		"shader",
-		"flares",
-		"this option is resposible for flares shader",
-		m_shader.c_str(),
-		m_shader,
-		&*manager.m_environment.shader_ids().begin(),
-		manager.m_environment.shader_ids().size(),
-		editor::property_holder::value_editor_tree_view,
-		editor::property_holder::cannot_enter_text
-	);
-	properties->add_property(
-		"flares",
-		"flares",
-		"this option is resposible for flares",
-		m_collection
-	);
+    editor::property_holder* properties = holder;
+    VERIFY(properties);
+
+    properties->add_property(
+        "use",
+        "flares",
+        "this option is resposible for the flares usage",
+        m_use,
+        m_use
+    );
+    properties->add_property(
+        "shader",
+        "flares",
+        "this option is resposible for flares shader",
+        m_shader.c_str(),
+        m_shader,
+        &*manager.m_environment.shader_ids().begin(),
+        manager.m_environment.shader_ids().size(),
+        editor::property_holder::value_editor_tree_view,
+        editor::property_holder::cannot_enter_text
+    );
+    properties->add_property(
+        "flares",
+        "flares",
+        "this option is resposible for flares",
+        m_collection
+    );
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_suns_flares.hpp b/src/xrEngine/editor_environment_suns_flares.hpp
index 55bc1627afd..254a40407d9 100644
--- a/src/xrEngine/editor_environment_suns_flares.hpp
+++ b/src/xrEngine/editor_environment_suns_flares.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_flares.hpp
-//	Created 	: 26.01.2008
-//  Modified 	: 26.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns flares class
+// Module : editor_environment_suns_flares.hpp
+// Created : 26.01.2008
+// Modified : 26.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns flares class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SUNS_FLARES_HPP_INCLUDED
@@ -14,36 +14,40 @@
 #include <boost/noncopyable.hpp>
 #include "property_collection_forward.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 class property_holder_collection;
 
-namespace environment {
-namespace suns {
+namespace environment
+{
+namespace suns
+{
 
 class manager;
 class flare;
 
-class flares : private boost::noncopyable {
+class flares : private boost::noncopyable
+{
 public:
-					flares	();
-	virtual			~flares	();
-			void	load	(CInifile& config, shared_str const& section);
-			void	save	(CInifile& config, shared_str const& section);
-			void	fill	(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection);
+    flares();
+    virtual ~flares();
+    void load(CInifile& config, shared_str const& section);
+    void save(CInifile& config, shared_str const& section);
+    void fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection);
 private:
-	typedef xr_vector<flare*>							flares_type;
-	typedef editor::property_holder_collection			property_holder_collection;
+    typedef xr_vector<flare*> flares_type;
+    typedef editor::property_holder_collection property_holder_collection;
 
 public:
-	typedef property_collection<flares_type, flares>	collection_type;
+    typedef property_collection<flares_type, flares> collection_type;
 
 private:
-	flares_type				m_flares;
-    shared_str				m_shader;
-	collection_type*		m_collection;
-    bool					m_use;
+    flares_type m_flares;
+    shared_str m_shader;
+    collection_type* m_collection;
+    bool m_use;
 }; // class flares
 
 } // namespace suns
diff --git a/src/xrEngine/editor_environment_suns_gradient.cpp b/src/xrEngine/editor_environment_suns_gradient.cpp
index 11eef3382b4..98edac68d49 100644
--- a/src/xrEngine/editor_environment_suns_gradient.cpp
+++ b/src/xrEngine/editor_environment_suns_gradient.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_gradient.cpp
-//	Created 	: 26.01.2008
-//  Modified 	: 26.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns gradient class
+// Module : editor_environment_suns_gradient.cpp
+// Created : 26.01.2008
+// Modified : 26.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns gradient class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -20,107 +20,107 @@ using editor::property_holder;
 using editor::property_holder_collection;
 using editor::environment::suns::manager;
 
-gradient::gradient			() :
-	m_use					(false),
-    m_opacity				(.0f),
-    m_radius				(.0f),
-    m_shader				(""),
-    m_texture				("")
+gradient::gradient() :
+    m_use(false),
+    m_opacity(.0f),
+    m_radius(.0f),
+    m_shader(""),
+    m_texture("")
 {
 }
 
-void gradient::load			(CInifile& config, shared_str const& section)
+void gradient::load(CInifile& config, shared_str const& section)
 {
-	m_use					= !!READ_IF_EXISTS(&config, r_bool,		section, "gradient",				true);
-    m_opacity				=   READ_IF_EXISTS(&config, r_float,	section, "gradient_opacity",		.7f);
-    m_radius				=   READ_IF_EXISTS(&config, r_float,	section, "gradient_radius",		.9f);
-    m_shader				=   READ_IF_EXISTS(&config, r_string,	section, "gradient_shader",		"effects\\flare");
-    m_texture				=   READ_IF_EXISTS(&config, r_string,	section, "gradient_texture",		"fx\\fx_gradient.tga");
+    m_use = !!READ_IF_EXISTS(&config, r_bool, section, "gradient", true);
+    m_opacity = READ_IF_EXISTS(&config, r_float, section, "gradient_opacity", .7f);
+    m_radius = READ_IF_EXISTS(&config, r_float, section, "gradient_radius", .9f);
+    m_shader = READ_IF_EXISTS(&config, r_string, section, "gradient_shader", "effects\\flare");
+    m_texture = READ_IF_EXISTS(&config, r_string, section, "gradient_texture", "fx\\fx_gradient.tga");
 }
 
-bool gradient::use_getter	()
+bool gradient::use_getter()
 {
-	return					(m_use);
+    return (m_use);
 }
 
-void gradient::use_setter	(bool value)
+void gradient::use_setter(bool value)
 {
-	if (m_use == value)
-		return;
+    if (m_use == value)
+        return;
 
-	m_use					= value;
-//	m_property_holder->clear();
-//	fill_internal			();
+    m_use = value;
+    // m_property_holder->clear();
+    // fill_internal ();
 }
 
-void gradient::fill			(
-		manager const& manager,
-		property_holder* holder,
-		property_holder_collection* collection
-	)
+void gradient::fill(
+    manager const& manager,
+    property_holder* holder,
+    property_holder_collection* collection
+)
 {
-	editor::property_holder*	properties = holder;
-	VERIFY						(properties);
+    editor::property_holder* properties = holder;
+    VERIFY(properties);
 
-	typedef editor::property_holder::boolean_getter_type	boolean_getter_type;
-	boolean_getter_type			boolean_getter;
+    typedef editor::property_holder::boolean_getter_type boolean_getter_type;
+    boolean_getter_type boolean_getter;
 
-	typedef editor::property_holder::boolean_setter_type	boolean_setter_type;
-	boolean_setter_type			boolean_setter;
+    typedef editor::property_holder::boolean_setter_type boolean_setter_type;
+    boolean_setter_type boolean_setter;
 
-	boolean_getter.bind			(this, &gradient::use_getter);
-	boolean_setter.bind			(this, &gradient::use_setter);
+    boolean_getter.bind(this, &gradient::use_getter);
+    boolean_setter.bind(this, &gradient::use_setter);
 
-	properties->add_property(
-		"use",
-		"gradient",
-		"this option is resposible for gradient usage",
-		m_use,
-		boolean_getter,
-		boolean_setter,
-		property_holder::property_read_write,
-		property_holder::notify_parent_on_change,
-		property_holder::no_password_char,
-		property_holder::do_not_refresh_grid_on_change
-	);
-	properties->add_property(
-		"opacity",
-		"gradient",
-		"this option is resposible for gradient opacity",
-		m_opacity,
-		m_opacity
-	);
-	properties->add_property(
-		"radius",
-		"gradient",
-		"this option is resposible for gradient radius",
-		m_radius,
-		m_radius
-	);
-	properties->add_property(
-		"shader",
-		"gradient",
-		"this option is resposible for gradient shader",
-		m_shader.c_str(),
-		m_shader,
-		&*manager.m_environment.shader_ids().begin(),
-		manager.m_environment.shader_ids().size(),
-		editor::property_holder::value_editor_tree_view,
-		editor::property_holder::cannot_enter_text
-	);
-	properties->add_property(
-		"texture",
-		"gradient",
-		"this option is resposible for gradient texture",
-		m_texture.c_str(),
-		m_texture,
-		".dds",
-		"Texture files (*.dds)|*.dds",
-		detail::real_path("$game_textures$", "").c_str(),
-		"Select texture...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
+    properties->add_property(
+        "use",
+        "gradient",
+        "this option is resposible for gradient usage",
+        m_use,
+        boolean_getter,
+        boolean_setter,
+        property_holder::property_read_write,
+        property_holder::notify_parent_on_change,
+        property_holder::no_password_char,
+        property_holder::do_not_refresh_grid_on_change
+    );
+    properties->add_property(
+        "opacity",
+        "gradient",
+        "this option is resposible for gradient opacity",
+        m_opacity,
+        m_opacity
+    );
+    properties->add_property(
+        "radius",
+        "gradient",
+        "this option is resposible for gradient radius",
+        m_radius,
+        m_radius
+    );
+    properties->add_property(
+        "shader",
+        "gradient",
+        "this option is resposible for gradient shader",
+        m_shader.c_str(),
+        m_shader,
+        &*manager.m_environment.shader_ids().begin(),
+        manager.m_environment.shader_ids().size(),
+        editor::property_holder::value_editor_tree_view,
+        editor::property_holder::cannot_enter_text
+    );
+    properties->add_property(
+        "texture",
+        "gradient",
+        "this option is resposible for gradient texture",
+        m_texture.c_str(),
+        m_texture,
+        ".dds",
+        "Texture files (*.dds)|*.dds",
+        detail::real_path("$game_textures$", "").c_str(),
+        "Select texture...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_suns_gradient.hpp b/src/xrEngine/editor_environment_suns_gradient.hpp
index 1683c22ba87..43a13f094a0 100644
--- a/src/xrEngine/editor_environment_suns_gradient.hpp
+++ b/src/xrEngine/editor_environment_suns_gradient.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_gradient.hpp
-//	Created 	: 26.01.2008
-//  Modified 	: 26.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns gradient class
+// Module : editor_environment_suns_gradient.hpp
+// Created : 26.01.2008
+// Modified : 26.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns gradient class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SUNS_GRADIENT_HPP_INCLUDED
@@ -13,33 +13,37 @@
 
 #include <boost/noncopyable.hpp>
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 class property_holder_collection;
 
-namespace environment {
-namespace suns {
+namespace environment
+{
+namespace suns
+{
 
 class manager;
 
-class gradient : private boost::noncopyable {
+class gradient : private boost::noncopyable
+{
 public:
-					gradient	();
-			void	load		(CInifile& config, shared_str const& section);
-			void	save		(CInifile& config, shared_str const& section);
-			void	fill		(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection);
+    gradient();
+    void load(CInifile& config, shared_str const& section);
+    void save(CInifile& config, shared_str const& section);
+    void fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection);
 
 private:
-	bool xr_stdcall	use_getter	();
-	void xr_stdcall use_setter	(bool value);
+    bool xr_stdcall use_getter();
+    void xr_stdcall use_setter(bool value);
 
 private:
-	bool			m_use;
-    float			m_opacity;
-    float			m_radius;
-    shared_str		m_shader;
-    shared_str		m_texture;
+    bool m_use;
+    float m_opacity;
+    float m_radius;
+    shared_str m_shader;
+    shared_str m_texture;
 }; // class gradient
 
 } // namespace suns
diff --git a/src/xrEngine/editor_environment_suns_manager.cpp b/src/xrEngine/editor_environment_suns_manager.cpp
index 9c7bde11689..39425a6e057 100644
--- a/src/xrEngine/editor_environment_suns_manager.cpp
+++ b/src/xrEngine/editor_environment_suns_manager.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_manager.cpp
-//	Created 	: 13.12.2007
-//  Modified 	: 13.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns manager class
+// Module : editor_environment_suns_manager.cpp
+// Created : 13.12.2007
+// Modified : 13.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor environment suns manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -23,177 +23,179 @@ using editor::environment::suns::sun;
 using editor::environment::detail::logical_string_predicate;
 
 template <>
-void property_collection<manager::container_type, manager>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<manager::container_type, manager>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy				(buffer, buffer_size, m_container[item_index]->id().c_str());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
 
 template <>
-editor::property_holder* property_collection<manager::container_type, manager>::create	()
+editor::property_holder* property_collection<manager::container_type, manager>::create()
 {
-	sun*					object = xr_new<sun>(m_holder, generate_unique_id("sun_unique_id_").c_str());
-	object->fill			(this);
-	return					(object->object());
+    sun* object = xr_new<sun>(m_holder, generate_unique_id("sun_unique_id_").c_str());
+    object->fill(this);
+    return (object->object());
 }
 
-manager::manager			(::editor::environment::manager* environment) :
-	m_environment			(*environment),
-	m_collection			(0),
-	m_changed				(true)
+manager::manager(::editor::environment::manager* environment) :
+    m_environment(*environment),
+    m_collection(0),
+    m_changed(true)
 {
-	m_collection			= xr_new<collection_type>(&m_suns, this, &m_changed);
+    m_collection = xr_new<collection_type>(&m_suns, this, &m_changed);
 }
 
-manager::~manager			()
+manager::~manager()
 {
-	xr_delete				(m_collection);
+    xr_delete(m_collection);
 
-	delete_data				(m_suns);
-	delete_data				(m_suns_ids);
+    delete_data(m_suns);
+    delete_data(m_suns_ids);
 }
 
-void manager::load			()
+void manager::load()
 {
-	string_path				file_name;
-	CInifile*				config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\suns.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-
-	typedef CInifile::Root	sections_type;
-	sections_type&			sections = config->sections();
-	m_suns.reserve			(sections.size());
-	sections_type::const_iterator	i = sections.begin();
-	sections_type::const_iterator	e = sections.end();
-	for ( ; i != e; ++i)
-		add					(*config, (*i)->Name);
-
-	xr_delete				(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\suns.ltx"
+            ),
+            TRUE,
+            TRUE,
+            FALSE
+        );
+
+    typedef CInifile::Root sections_type;
+    sections_type& sections = config->sections();
+    m_suns.reserve(sections.size());
+    sections_type::const_iterator i = sections.begin();
+    sections_type::const_iterator e = sections.end();
+    for (; i != e; ++i)
+        add(*config, (*i)->Name);
+
+    xr_delete(config);
 }
 
-void manager::save			()
+void manager::save()
 {
-	string_path				file_name;
-	CInifile*				config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\suns.ltx"
-			),
-			FALSE,
-			FALSE,
-			TRUE
-		);
-
-	container_type::const_iterator	i = m_suns.begin();
-	container_type::const_iterator	e = m_suns.end();
-	for ( ; i != e; ++i)
-		(*i)->save			(*config);
-
-	xr_delete				(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\suns.ltx"
+            ),
+            FALSE,
+            FALSE,
+            TRUE
+        );
+
+    container_type::const_iterator i = m_suns.begin();
+    container_type::const_iterator e = m_suns.end();
+    for (; i != e; ++i)
+        (*i)->save(*config);
+
+    xr_delete(config);
 }
 
-void manager::add			(CInifile& config, shared_str const& section)
+void manager::add(CInifile& config, shared_str const& section)
 {
-	struct predicate {
-		shared_str			m_id;
-
-		inline		predicate	(shared_str const& id) :
-			m_id			(id)
-		{
-		}
-		
-		inline bool	operator()	(sun const* const& object) const
-		{
-			return			(object->id()._get() == m_id._get());
-		}
-	};
-
-	VERIFY					(
-		std::find_if(
-			m_suns.begin(),
-			m_suns.end(),
-			predicate(section)
-		) == 
-		m_suns.end()
-	);
-	
-	sun*					object = xr_new<sun>(*this, section);
-	object->load			(config);
-	object->fill			(m_collection);
-	m_suns.push_back		(object);
+    struct predicate
+    {
+        shared_str m_id;
+
+        inline predicate(shared_str const& id) :
+            m_id(id)
+        {
+        }
+
+        inline bool operator() (sun const* const& object) const
+        {
+            return (object->id()._get() == m_id._get());
+        }
+    };
+
+    VERIFY(
+        std::find_if(
+            m_suns.begin(),
+            m_suns.end(),
+            predicate(section)
+        ) ==
+        m_suns.end()
+    );
+
+    sun* object = xr_new<sun>(*this, section);
+    object->load(config);
+    object->fill(m_collection);
+    m_suns.push_back(object);
 }
 
-void manager::fill			(editor::property_holder* holder)
+void manager::fill(editor::property_holder* holder)
 {
-	VERIFY					(holder);
-	holder->add_property	(
-		"suns",
-		"suns",
-		"this option is resposible for sound channels",
-		m_collection
-	);
+    VERIFY(holder);
+    holder->add_property(
+        "suns",
+        "suns",
+        "this option is resposible for sound channels",
+        m_collection
+    );
 }
 
-shared_str manager::unique_id	(shared_str const& id) const
+shared_str manager::unique_id(shared_str const& id) const
 {
-	if (m_collection->unique_id(id.c_str()))
-		return				(id);
+    if (m_collection->unique_id(id.c_str()))
+        return (id);
 
-	return					(m_collection->generate_unique_id(id.c_str()));
+    return (m_collection->generate_unique_id(id.c_str()));
 }
 
-manager::suns_ids_type const& manager::suns_ids	() const
+manager::suns_ids_type const& manager::suns_ids() const
 {
-	if (!m_changed)
-		return				(m_suns_ids);
+    if (!m_changed)
+        return (m_suns_ids);
 
-	m_changed				= false;
+    m_changed = false;
 
-	delete_data				(m_suns_ids);
+    delete_data(m_suns_ids);
 
-	m_suns_ids.resize		(m_suns.size() + 1);
-	m_suns_ids[0]			= xr_strdup("");
+    m_suns_ids.resize(m_suns.size() + 1);
+    m_suns_ids[0] = xr_strdup("");
 
-	container_type::const_iterator	i = m_suns.begin();
-	container_type::const_iterator	e = m_suns.end();
-	suns_ids_type::iterator			j = m_suns_ids.begin() + 1;
-	for ( ; i != e; ++i, ++j)
-		*j					= xr_strdup((*i)->id().c_str());
+    container_type::const_iterator i = m_suns.begin();
+    container_type::const_iterator e = m_suns.end();
+    suns_ids_type::iterator j = m_suns_ids.begin() + 1;
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id().c_str());
 
-	std::sort				(m_suns_ids.begin(), m_suns_ids.end(), logical_string_predicate());
+    std::sort(m_suns_ids.begin(), m_suns_ids.end(), logical_string_predicate());
 
-	return					(m_suns_ids);
+    return (m_suns_ids);
 }
 
-struct predicate {
-	shared_str	m_id;
+struct predicate
+{
+    shared_str m_id;
 
-	IC			predicate	(shared_str const& id) :
-		m_id	(id)
-	{
-	}
+    IC predicate(shared_str const& id) :
+        m_id(id)
+    {
+    }
 
-	IC	bool	operator()	(sun* const& sun) const
-	{
-		return	(sun->id()._get() == m_id._get());
-	}
+    IC bool operator() (sun* const& sun) const
+    {
+        return (sun->id()._get() == m_id._get());
+    }
 }; // struct predicate
 
-CLensFlareDescriptor* manager::get_flare	(shared_str const& id) const
+CLensFlareDescriptor* manager::get_flare(shared_str const& id) const
 {
-//	container_type::const_iterator	found = std::find_if(m_suns.begin(), m_suns.end(), predicate(id));
-//	VERIFY							(found != m_suns.end());
-//	return							((*found)->);
-	return							(0);
+    // container_type::const_iterator found = std::find_if(m_suns.begin(), m_suns.end(), predicate(id));
+    // VERIFY (found != m_suns.end());
+    // return ((*found)->);
+    return (0);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_suns_manager.hpp b/src/xrEngine/editor_environment_suns_manager.hpp
index f2b0f39fe4c..2a69af6d857 100644
--- a/src/xrEngine/editor_environment_suns_manager.hpp
+++ b/src/xrEngine/editor_environment_suns_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_manager.hpp
-//	Created 	: 13.12.2007
-//  Modified 	: 13.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns manager class
+// Module : editor_environment_suns_manager.hpp
+// Created : 13.12.2007
+// Modified : 13.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor environment suns manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SUNS_MANAGER_HPP_INCLUDED
@@ -16,53 +16,57 @@
 
 class CLensFlareDescriptor;
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 
-namespace environment {
+namespace environment
+{
 
 class manager;
 
-namespace suns {
+namespace suns
+{
 
 class sun;
 
-class manager : private boost::noncopyable {
+class manager : private boost::noncopyable
+{
 public:
-					manager			(environment::manager* environment);
-					~manager		();
-			void	load			();
-			void	save			();
-			void	fill			(editor::property_holder* holder);
-			shared_str	unique_id	(shared_str const& id) const;
-	CLensFlareDescriptor* get_flare	(shared_str const& id) const;
+    manager(environment::manager* environment);
+    ~manager();
+    void load();
+    void save();
+    void fill(editor::property_holder* holder);
+    shared_str unique_id(shared_str const& id) const;
+    CLensFlareDescriptor* get_flare(shared_str const& id) const;
 
 private:
-			void	add				(CInifile& config, shared_str const& sun);
+    void add(CInifile& config, shared_str const& sun);
 
 public:
-	typedef	xr_vector<sun*>			container_type;
-	typedef xr_vector<LPSTR>		suns_ids_type;
+    typedef xr_vector<sun*> container_type;
+    typedef xr_vector<LPSTR> suns_ids_type;
 
 public:
-	suns_ids_type const&	suns_ids() const;
+    suns_ids_type const& suns_ids() const;
 
 private:
-	typedef property_collection<
-				container_type,
-				manager
-			>						collection_type;
+    typedef property_collection <
+    container_type,
+    manager
+    > collection_type;
 
 
 private:
-	container_type					m_suns;
-	mutable suns_ids_type			m_suns_ids;
-	collection_type*				m_collection;
-	mutable bool					m_changed;
+    container_type m_suns;
+    mutable suns_ids_type m_suns_ids;
+    collection_type* m_collection;
+    mutable bool m_changed;
 
 public:
-	environment::manager const&		m_environment;
+    environment::manager const& m_environment;
 }; // class suns_manager
 
 } // namespace suns
diff --git a/src/xrEngine/editor_environment_suns_sun.cpp b/src/xrEngine/editor_environment_suns_sun.cpp
index d87d5d61124..0f9907deb78 100644
--- a/src/xrEngine/editor_environment_suns_sun.cpp
+++ b/src/xrEngine/editor_environment_suns_sun.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_sun.cpp
-//	Created 	: 13.12.2007
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns sun class
+// Module : editor_environment_suns_sun.cpp
+// Created : 13.12.2007
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns sun class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -21,131 +21,131 @@ using editor::environment::suns::flare;
 using editor::environment::suns::manager;
 using editor::property_holder;
 
-sun::sun					(manager const& manager, shared_str const &id) :
-	m_manager				(manager),
-	m_id					(id),
-    m_use					(false),
-    m_ignore_color			(false),
-    m_radius				(0.f),
-    m_shader				(""),
-    m_texture				(""),
-	m_property_holder		(0)
+sun::sun(manager const& manager, shared_str const& id) :
+    m_manager(manager),
+    m_id(id),
+    m_use(false),
+    m_ignore_color(false),
+    m_radius(0.f),
+    m_shader(""),
+    m_texture(""),
+    m_property_holder(0)
 {
 }
 
-sun::~sun					()
+sun::~sun()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy			(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void sun::load				(CInifile& config)
+void sun::load(CInifile& config)
 {
-    m_use					= !!READ_IF_EXISTS(&config, r_bool,		m_id, "sun",				true);
-    m_ignore_color			= !!READ_IF_EXISTS(&config, r_bool,		m_id, "sun_ignore_color",	false);
-    m_radius				=   READ_IF_EXISTS(&config, r_float,	m_id, "sun_radius",			.15f);
-    m_shader				=   READ_IF_EXISTS(&config, r_string,	m_id, "sun_shader",			"effects\\sun");
-    m_texture				=   READ_IF_EXISTS(&config, r_string,	m_id, "sun_texture",		"fx\\fx_sun.tga");
+    m_use = !!READ_IF_EXISTS(&config, r_bool, m_id, "sun", true);
+    m_ignore_color = !!READ_IF_EXISTS(&config, r_bool, m_id, "sun_ignore_color", false);
+    m_radius = READ_IF_EXISTS(&config, r_float, m_id, "sun_radius", .15f);
+    m_shader = READ_IF_EXISTS(&config, r_string, m_id, "sun_shader", "effects\\sun");
+    m_texture = READ_IF_EXISTS(&config, r_string, m_id, "sun_texture", "fx\\fx_sun.tga");
 }
 
-void sun::save				(CInifile& config)
+void sun::save(CInifile& config)
 {
-   config.w_bool			(m_id.c_str(), "sun",				m_use				);
-   config.w_bool			(m_id.c_str(), "sun_ignore_color",	m_ignore_color		);
-   config.w_float			(m_id.c_str(), "sun_radius",		m_radius			);
-   config.w_string			(m_id.c_str(), "sun_shader",		m_shader.c_str()	);
-   config.w_string			(m_id.c_str(), "sun_texture",		m_texture.c_str()	);
+    config.w_bool(m_id.c_str(), "sun", m_use);
+    config.w_bool(m_id.c_str(), "sun_ignore_color", m_ignore_color);
+    config.w_float(m_id.c_str(), "sun_radius", m_radius);
+    config.w_string(m_id.c_str(), "sun_shader", m_shader.c_str());
+    config.w_string(m_id.c_str(), "sun_texture", m_texture.c_str());
 }
 
-LPCSTR sun::id_getter		() const
+LPCSTR sun::id_getter() const
 {
-	return					(m_id.c_str());
+    return (m_id.c_str());
 }
 
-void sun::id_setter			(LPCSTR value_)
+void sun::id_setter(LPCSTR value_)
 {
-	shared_str				value = value_;
-	if (m_id._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (m_id._get() == value._get())
+        return;
 
-	m_id					= m_manager.unique_id(value);
+    m_id = m_manager.unique_id(value);
 }
 
-void sun::fill				(editor::property_holder_collection* collection)
+void sun::fill(editor::property_holder_collection* collection)
 {
-	VERIFY					(!m_property_holder);
-	m_property_holder		= ::ide().create_property_holder(m_id.c_str(), collection, this);
-	editor::property_holder*properties = m_property_holder;
-	VERIFY					(properties);
-
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type		string_getter;
-	string_getter.bind		(this, &sun::id_getter);
-
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type		string_setter;
-	string_setter.bind		(this, &sun::id_setter);
-
-	properties->add_property(
-		"id",
-		"common",
-		"this option is resposible for sun identifier",
-		m_id.c_str(),
-		string_getter,
-		string_setter
-	);
-	properties->add_property(
-		"use",
-		"sun",
-		"this option is resposible for sun usage",
-		m_use,
-		m_use
-	);
-	properties->add_property(
-		"ignore color",
-		"sun",
-		"this option is resposible for sun ignore color",
-		m_ignore_color,
-		m_ignore_color
-	);
-	properties->add_property(
-		"radius",
-		"sun",
-		"this option is resposible for sun radius",
-		m_radius,
-		m_radius
-	);
-	properties->add_property(
-		"shader",
-		"sun",
-		"this option is resposible for sun shader",
-		m_shader.c_str(),
-		m_shader,
-		&*m_manager.m_environment.shader_ids().begin(),
-		m_manager.m_environment.shader_ids().size(),
-		editor::property_holder::value_editor_tree_view,
-		editor::property_holder::cannot_enter_text
-	);
-	properties->add_property(
-		"texture",
-		"sun",
-		"this option is resposible for sun texture",
-		m_texture.c_str(),
-		m_texture,
-		".dds",
-		"Texture files (*.dds)|*.dds",
-		detail::real_path("$game_textures$", "").c_str(),
-		"Select texture...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this);
+    editor::property_holder* properties = m_property_holder;
+    VERIFY(properties);
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &sun::id_getter);
+
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &sun::id_setter);
+
+    properties->add_property(
+        "id",
+        "common",
+        "this option is resposible for sun identifier",
+        m_id.c_str(),
+        string_getter,
+        string_setter
+    );
+    properties->add_property(
+        "use",
+        "sun",
+        "this option is resposible for sun usage",
+        m_use,
+        m_use
+    );
+    properties->add_property(
+        "ignore color",
+        "sun",
+        "this option is resposible for sun ignore color",
+        m_ignore_color,
+        m_ignore_color
+    );
+    properties->add_property(
+        "radius",
+        "sun",
+        "this option is resposible for sun radius",
+        m_radius,
+        m_radius
+    );
+    properties->add_property(
+        "shader",
+        "sun",
+        "this option is resposible for sun shader",
+        m_shader.c_str(),
+        m_shader,
+        &*m_manager.m_environment.shader_ids().begin(),
+        m_manager.m_environment.shader_ids().size(),
+        editor::property_holder::value_editor_tree_view,
+        editor::property_holder::cannot_enter_text
+    );
+    properties->add_property(
+        "texture",
+        "sun",
+        "this option is resposible for sun texture",
+        m_texture.c_str(),
+        m_texture,
+        ".dds",
+        "Texture files (*.dds)|*.dds",
+        detail::real_path("$game_textures$", "").c_str(),
+        "Select texture...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
 }
 
 property_holder* sun::object()
 {
-	return					(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_suns_sun.hpp b/src/xrEngine/editor_environment_suns_sun.hpp
index 8763a1de8e6..14d4f42d507 100644
--- a/src/xrEngine/editor_environment_suns_sun.hpp
+++ b/src/xrEngine/editor_environment_suns_sun.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_suns_sun.hpp
-//	Created 	: 13.12.2007
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment suns sun class
+// Module : editor_environment_suns_sun.hpp
+// Created : 13.12.2007
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment suns sun class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_SUNS_SUN_HPP_INCLUDED
@@ -15,46 +15,49 @@
 #include "../include/editor/property_holder.hpp"
 #include "xr_efflensflare.h"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 class property_holder_collection;
 
-namespace environment {
-namespace suns {
+namespace environment
+{
+namespace suns
+{
 
 class flare;
 class manager;
 
 class sun :
-	public CLensFlare,
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public CLensFlare,
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 public:
-								sun			(manager const& manager, shared_str const &section);
-								~sun		();
-			void				load		(CInifile& config);
-			void				save		(CInifile& config);
-			void				fill		(editor::property_holder_collection* collection);
+    sun(manager const& manager, shared_str const& section);
+    ~sun();
+    void load(CInifile& config);
+    void save(CInifile& config);
+    void fill(editor::property_holder_collection* collection);
 
 private:
-			LPCSTR xr_stdcall	id_getter	() const;
-			void   xr_stdcall	id_setter	(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
 public:
-	inline	shared_str const&	id			() const { return m_id; }
-	virtual	property_holder*	object		();
+    inline shared_str const& id() const { return m_id; }
+    virtual property_holder* object();
 
 private:
 
-	shared_str					m_id;
-    shared_str					m_shader;
-    shared_str					m_texture;
-	manager const&				m_manager;
-	editor::property_holder*	m_property_holder;
-    float						m_radius;
-    bool						m_use;
-    bool						m_ignore_color;
+    shared_str m_id;
+    shared_str m_shader;
+    shared_str m_texture;
+    manager const& m_manager;
+    editor::property_holder* m_property_holder;
+    float m_radius;
+    bool m_use;
+    bool m_ignore_color;
 }; // class sun
 
 } // namespace suns
diff --git a/src/xrEngine/editor_environment_thunderbolts_collection.cpp b/src/xrEngine/editor_environment_thunderbolts_collection.cpp
index a2ed4151916..fc7064539f8 100644
--- a/src/xrEngine/editor_environment_thunderbolts_collection.cpp
+++ b/src/xrEngine/editor_environment_thunderbolts_collection.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_collection.cpp
-//	Created 	: 10.01.2008
-//  Modified 	: 10.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts collection identifier class
+// Module : editor_environment_thunderbolts_collection.cpp
+// Created : 10.01.2008
+// Modified : 10.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts collection identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -21,111 +21,112 @@ using editor::environment::thunderbolts::manager;
 using editor::property_holder;
 
 template <>
-void property_collection<collection::container_type, collection>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<collection::container_type, collection>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy			(buffer, buffer_size, m_container[item_index]->id());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id());
 }
 
 template <>
-editor::property_holder* property_collection<collection::container_type, collection>::create	()
+editor::property_holder* property_collection<collection::container_type, collection>::create()
 {
-	thunderbolt_id*		object = xr_new<thunderbolt_id>(m_holder.m_manager, "");
-	object->fill		(this);
-	return				(object->object());
+    thunderbolt_id* object = xr_new<thunderbolt_id>(m_holder.m_manager, "");
+    object->fill(this);
+    return (object->object());
 }
 
-collection::collection					(manager const& manager, shared_str const& id) :
-	m_manager			(manager),
-	m_collection		(0),
-	m_property_holder	(0)
+collection::collection(manager const& manager, shared_str const& id) :
+    m_manager(manager),
+    m_collection(0),
+    m_property_holder(0)
 {
-	section				= id;
-	m_collection		= xr_new<collection_type>(&m_ids, this);
+    section = id;
+    m_collection = xr_new<collection_type>(&m_ids, this);
 }
 
-collection::~collection					()
+collection::~collection()
 {
-	xr_delete			(m_collection);
-	delete_data			(m_ids);
+    xr_delete(m_collection);
+    delete_data(m_ids);
 
-	palette.clear		();
+    palette.clear();
 
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void collection::load					(CInifile& config)
+void collection::load(CInifile& config)
 {
-	CInifile::Sect&				items = config.r_section(section);
-	m_ids.reserve				(items.Data.size());
-	typedef CInifile::Items		items_type;
-	items_type::const_iterator	i = items.Data.begin();
-	items_type::const_iterator	e = items.Data.end();
-	for ( ; i != e; ++i) {
-		thunderbolt_id*			object = xr_new<thunderbolt_id>(m_manager, (*i).first);
-		object->fill			(m_collection);
-		m_ids.push_back			(object);
-
-		palette.push_back		(m_manager.description(config, (*i).first));
-	}
+    CInifile::Sect& items = config.r_section(section);
+    m_ids.reserve(items.Data.size());
+    typedef CInifile::Items items_type;
+    items_type::const_iterator i = items.Data.begin();
+    items_type::const_iterator e = items.Data.end();
+    for (; i != e; ++i)
+    {
+        thunderbolt_id* object = xr_new<thunderbolt_id>(m_manager, (*i).first);
+        object->fill(m_collection);
+        m_ids.push_back(object);
+
+        palette.push_back(m_manager.description(config, (*i).first));
+    }
 }
 
-void collection::save					(CInifile& config)
+void collection::save(CInifile& config)
 {
-	container_type::const_iterator	i = m_ids.begin();
-	container_type::const_iterator	e = m_ids.end();
-	for ( ; i != e; ++i)
-		config.w_string	(section.c_str(), (*i)->id(), "");
+    container_type::const_iterator i = m_ids.begin();
+    container_type::const_iterator e = m_ids.end();
+    for (; i != e; ++i)
+        config.w_string(section.c_str(), (*i)->id(), "");
 }
 
-LPCSTR collection::id_getter			() const
+LPCSTR collection::id_getter() const
 {
-	return				(section.c_str());
+    return (section.c_str());
 }
 
-void collection::id_setter				(LPCSTR value_)
+void collection::id_setter(LPCSTR value_)
 {
-	shared_str			value = value_;
-	if (section._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (section._get() == value._get())
+        return;
 
-	section				= m_manager.unique_collection_id(value);
+    section = m_manager.unique_collection_id(value);
 }
 
-void collection::fill					(editor::property_holder_collection* collection)
+void collection::fill(editor::property_holder_collection* collection)
 {
-	VERIFY				(!m_property_holder);
-	m_property_holder	= ::ide().create_property_holder(section.c_str());
-
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type	string_getter;
-	string_getter.bind	(this, &collection::id_getter);
-
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type	string_setter;
-	string_setter.bind	(this, &collection::id_setter);
-
-	m_property_holder->add_property(
-		"id",
-		"properties",
-		"this option is resposible for collection id",
-		section.c_str(),
-		string_getter,
-		string_setter
-	);
-	m_property_holder->add_property	(
-		"thunderbolts",
-		"properties",
-		"this option is resposible for thunderbolts",
-		m_collection
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(section.c_str());
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &collection::id_getter);
+
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &collection::id_setter);
+
+    m_property_holder->add_property(
+        "id",
+        "properties",
+        "this option is resposible for collection id",
+        section.c_str(),
+        string_getter,
+        string_setter
+    );
+    m_property_holder->add_property(
+        "thunderbolts",
+        "properties",
+        "this option is resposible for thunderbolts",
+        m_collection
+    );
 }
 
-property_holder* collection::object		()
+property_holder* collection::object()
 {
-	return				(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_thunderbolts_collection.hpp b/src/xrEngine/editor_environment_thunderbolts_collection.hpp
index 918afc2e56c..4773aaa3775 100644
--- a/src/xrEngine/editor_environment_thunderbolts_collection.hpp
+++ b/src/xrEngine/editor_environment_thunderbolts_collection.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_collection.hpp
-//	Created 	: 10.01.2008
-//  Modified 	: 10.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts collection identifier class
+// Module : editor_environment_thunderbolts_collection.hpp
+// Created : 10.01.2008
+// Modified : 10.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts collection identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_THUNDERBOLTS_COLLECTION_ID_HPP_INCLUDED
@@ -16,49 +16,53 @@
 #include "property_collection_forward.hpp"
 #include "thunderbolt.h"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder_collection;
 
-namespace environment {
-namespace thunderbolts {
+namespace environment
+{
+namespace thunderbolts
+{
 
 class manager;
 class thunderbolt_id;
 
 class collection :
-	public SThunderboltCollection,
-	public editor::property_holder_holder,
-	private boost::noncopyable {
+    public SThunderboltCollection,
+    public editor::property_holder_holder,
+    private boost::noncopyable
+{
 public:
-							collection		(manager const& manager, shared_str const& id);
-	virtual					~collection		();
-			void			load			(CInifile& config);
-			void			save			(CInifile& config);
-			void			fill			(editor::property_holder_collection* collection);
-	inline	LPCSTR			id				() const { return section.c_str(); }
+    collection(manager const& manager, shared_str const& id);
+    virtual ~collection();
+    void load(CInifile& config);
+    void save(CInifile& config);
+    void fill(editor::property_holder_collection* collection);
+    inline LPCSTR id() const { return section.c_str(); }
 
 
 private:
-			LPCSTR	xr_stdcall	id_getter	() const;
-			void	xr_stdcall	id_setter	(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
 private:
-	typedef editor::property_holder			property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type* object	();
+    virtual property_holder_type* object();
 
 private:
-	typedef xr_vector<thunderbolt_id*>						container_type;
-	typedef property_collection<container_type, collection>	collection_type;
+    typedef xr_vector<thunderbolt_id*> container_type;
+    typedef property_collection<container_type, collection> collection_type;
 
 private:
-	container_type			m_ids;
-	collection_type*		m_collection;
-	property_holder_type*	m_property_holder;
+    container_type m_ids;
+    collection_type* m_collection;
+    property_holder_type* m_property_holder;
 
 public:
-	manager const&			m_manager;
+    manager const& m_manager;
 }; // class collection
 } // namespace thunderbolts
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_thunderbolts_gradient.cpp b/src/xrEngine/editor_environment_thunderbolts_gradient.cpp
index d29215dc498..42542810f45 100644
--- a/src/xrEngine/editor_environment_thunderbolts_gradient.cpp
+++ b/src/xrEngine/editor_environment_thunderbolts_gradient.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_gradient.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 10.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts gradient class
+// Module : editor_environment_thunderbolts_gradient.cpp
+// Created : 04.01.2008
+// Modified : 10.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts gradient class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -16,134 +16,134 @@
 
 using editor::environment::thunderbolts::gradient;
 
-gradient::gradient	() :
-	m_property_holder	(0)
+gradient::gradient() :
+    m_property_holder(0)
 {
 }
 
-gradient::~gradient	()
+gradient::~gradient()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void gradient::load	(CInifile& config, shared_str const& section_id, LPCSTR prefix)
+void gradient::load(CInifile& config, shared_str const& section_id, LPCSTR prefix)
 {
-	string_path			temp;
-	shader				= config.r_string	(section_id, strconcat(sizeof(temp), temp, prefix, "_shader"));
-	texture				= config.r_string	(section_id, strconcat(sizeof(temp), temp, prefix, "_texture"));
-	fOpacity			= config.r_float	(section_id, strconcat(sizeof(temp), temp, prefix, "_opacity"));
-	fRadius				= config.r_fvector2	(section_id, strconcat(sizeof(temp), temp, prefix, "_radius"));
-	m_pFlare->CreateShader	(*shader,*texture);
+    string_path temp;
+    shader = config.r_string(section_id, strconcat(sizeof(temp), temp, prefix, "_shader"));
+    texture = config.r_string(section_id, strconcat(sizeof(temp), temp, prefix, "_texture"));
+    fOpacity = config.r_float(section_id, strconcat(sizeof(temp), temp, prefix, "_opacity"));
+    fRadius = config.r_fvector2(section_id, strconcat(sizeof(temp), temp, prefix, "_radius"));
+    m_pFlare->CreateShader(*shader, *texture);
 }
 
-void gradient::save	(CInifile& config, shared_str const& section_id, LPCSTR prefix)
+void gradient::save(CInifile& config, shared_str const& section_id, LPCSTR prefix)
 {
-	string_path			temp;
-	config.w_string		(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_shader" ),	shader.c_str()	);
-	config.w_string		(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_texture"),	texture.c_str()	);
-	config.w_float		(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_opacity"),	fOpacity		);
-	config.w_fvector2	(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_radius" ),	fRadius			);
+    string_path temp;
+    config.w_string(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_shader"), shader.c_str());
+    config.w_string(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_texture"), texture.c_str());
+    config.w_float(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_opacity"), fOpacity);
+    config.w_fvector2(section_id.c_str(), strconcat(sizeof(temp), temp, prefix, "_radius"), fRadius);
 }
 
-LPCSTR gradient::shader_getter	() const
+LPCSTR gradient::shader_getter() const
 {
-	return				(shader.c_str());
+    return (shader.c_str());
 }
 
-void gradient::shader_setter	(LPCSTR	value)
+void gradient::shader_setter(LPCSTR value)
 {
-	shader					= value;
-	m_pFlare->CreateShader	(*shader,*texture);
+    shader = value;
+    m_pFlare->CreateShader(*shader, *texture);
 }
 
-LPCSTR gradient::texture_getter	() const
+LPCSTR gradient::texture_getter() const
 {
-	return				(texture.c_str());
+    return (texture.c_str());
 }
 
-void gradient::texture_setter	(LPCSTR	value)
+void gradient::texture_setter(LPCSTR value)
 {
-	texture				= value;
-	m_pFlare->CreateShader	(*shader,*texture);
+    texture = value;
+    m_pFlare->CreateShader(*shader, *texture);
 }
 
-void gradient::fill	(
-		::editor::environment::manager& environment,
-		LPCSTR name,
-		LPCSTR description,
-		::editor::property_holder& holder
-	)
+void gradient::fill(
+    ::editor::environment::manager& environment,
+    LPCSTR name,
+    LPCSTR description,
+    ::editor::property_holder& holder
+)
 {
-	VERIFY							(!m_property_holder);
-	m_property_holder				= ::ide().create_property_holder(name);
-
-	holder.add_property				(
-		name,
-		"gradient",
-		description,
-		m_property_holder
-	);
-
-	m_property_holder->add_property	(
-		"opacity",
-		"properties",
-		"this option is resposible for thunderbolt gradient opacity",
-		fOpacity,
-		fOpacity
-	);
-	m_property_holder->add_property	(
-		"minimum radius",
-		"properties",
-		"this option is resposible for thunderbolt gradient minimum radius",
-		fRadius.x,
-		fRadius.x
-	);
-	m_property_holder->add_property	(
-		"maximum _radius",
-		"properties",
-		"this option is resposible for thunderbolt gradient maximum radius",
-		fRadius.y,
-		fRadius.y
-	);
-
-	typedef ::editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type	string_getter;
-	string_getter.bind	(this, &gradient::shader_getter);
-
-	typedef ::editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type	string_setter;
-	string_setter.bind	(this, &gradient::shader_setter);
-
-	m_property_holder->add_property	(
-		"shader",
-		"properties",
-		"this option is resposible for thunderbolt gradient shader",
-		shader.c_str(),
-		string_getter,
-		string_setter,
-		&*environment.shader_ids().begin(),
-		environment.shader_ids().size(),
-		editor::property_holder::value_editor_tree_view,
-		editor::property_holder::cannot_enter_text
-	);
-
-	string_getter.bind	(this, &gradient::texture_getter);
-	string_setter.bind	(this, &gradient::texture_setter);
-	m_property_holder->add_property	(
-		"texture",
-		"",
-		"this option is resposible for thunderbolt gradient texture",
-		texture.c_str(),
-		texture,
-		".dds",
-		"Texture files (*.dds)|*.dds",
-		detail::real_path("$game_textures$", "").c_str(),
-		"Select texture...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(name);
+
+    holder.add_property(
+        name,
+        "gradient",
+        description,
+        m_property_holder
+    );
+
+    m_property_holder->add_property(
+        "opacity",
+        "properties",
+        "this option is resposible for thunderbolt gradient opacity",
+        fOpacity,
+        fOpacity
+    );
+    m_property_holder->add_property(
+        "minimum radius",
+        "properties",
+        "this option is resposible for thunderbolt gradient minimum radius",
+        fRadius.x,
+        fRadius.x
+    );
+    m_property_holder->add_property(
+        "maximum _radius",
+        "properties",
+        "this option is resposible for thunderbolt gradient maximum radius",
+        fRadius.y,
+        fRadius.y
+    );
+
+    typedef ::editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &gradient::shader_getter);
+
+    typedef ::editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &gradient::shader_setter);
+
+    m_property_holder->add_property(
+        "shader",
+        "properties",
+        "this option is resposible for thunderbolt gradient shader",
+        shader.c_str(),
+        string_getter,
+        string_setter,
+        &*environment.shader_ids().begin(),
+        environment.shader_ids().size(),
+        editor::property_holder::value_editor_tree_view,
+        editor::property_holder::cannot_enter_text
+    );
+
+    string_getter.bind(this, &gradient::texture_getter);
+    string_setter.bind(this, &gradient::texture_setter);
+    m_property_holder->add_property(
+        "texture",
+        "",
+        "this option is resposible for thunderbolt gradient texture",
+        texture.c_str(),
+        texture,
+        ".dds",
+        "Texture files (*.dds)|*.dds",
+        detail::real_path("$game_textures$", "").c_str(),
+        "Select texture...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
 }
 #endif // #ifdef INGAME_EDITOR
diff --git a/src/xrEngine/editor_environment_thunderbolts_gradient.hpp b/src/xrEngine/editor_environment_thunderbolts_gradient.hpp
index 1b69660a415..076c65b724c 100644
--- a/src/xrEngine/editor_environment_thunderbolts_gradient.hpp
+++ b/src/xrEngine/editor_environment_thunderbolts_gradient.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_gradient.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 10.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts gradient class
+// Module : editor_environment_thunderbolts_gradient.hpp
+// Created : 04.01.2008
+// Modified : 10.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts gradient class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_THUNDERBOLTS_GRADIENT_HPP_INCLUDED
@@ -15,41 +15,44 @@
 #include "../include/editor/property_holder.hpp"
 #include "thunderbolt.h"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 
-namespace environment {
+namespace environment
+{
 
 class manager;
 
-namespace thunderbolts {
+namespace thunderbolts
+{
 
 class gradient :
-	public SThunderboltDesc::SFlare,
-	private boost::noncopyable
+    public SThunderboltDesc::SFlare,
+    private boost::noncopyable
 {
 public:
-						gradient		();
-						~gradient		();
-			void		load			(CInifile& config, shared_str const& section_id, LPCSTR prefix);
-			void		save			(CInifile& config, shared_str const& section_id, LPCSTR prefix);
-			void		fill			(
-							::editor::environment::manager& environment,
-							LPCSTR name,
-							LPCSTR description,
-							editor::property_holder& holder
-						);
+    gradient();
+    ~gradient();
+    void load(CInifile& config, shared_str const& section_id, LPCSTR prefix);
+    void save(CInifile& config, shared_str const& section_id, LPCSTR prefix);
+    void fill(
+        ::editor::environment::manager& environment,
+        LPCSTR name,
+        LPCSTR description,
+        editor::property_holder& holder
+    );
 
 private:
-	LPCSTR	xr_stdcall	shader_getter	() const;
-	void	xr_stdcall	shader_setter	(LPCSTR	value);
+    LPCSTR xr_stdcall shader_getter() const;
+    void xr_stdcall shader_setter(LPCSTR value);
 
-	LPCSTR	xr_stdcall	texture_getter	() const;
-	void	xr_stdcall	texture_setter	(LPCSTR	value);
+    LPCSTR xr_stdcall texture_getter() const;
+    void xr_stdcall texture_setter(LPCSTR value);
 
 private:
-	property_holder*	m_property_holder;
+    property_holder* m_property_holder;
 }; // class gradient
 
 
diff --git a/src/xrEngine/editor_environment_thunderbolts_manager.cpp b/src/xrEngine/editor_environment_thunderbolts_manager.cpp
index a8405f9a3d8..bd5b70254c3 100644
--- a/src/xrEngine/editor_environment_thunderbolts_manager.cpp
+++ b/src/xrEngine/editor_environment_thunderbolts_manager.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_manager.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts manager class
+// Module : editor_environment_thunderbolts_manager.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -26,434 +26,436 @@ using editor::environment::thunderbolts::collection;
 using editor::environment::detail::logical_string_predicate;
 
 template <>
-void property_collection<manager::thunderbolt_container_type, manager>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<manager::thunderbolt_container_type, manager>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy						(buffer, buffer_size, m_container[item_index]->id());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id());
 }
 
 template <>
-editor::property_holder* property_collection<manager::thunderbolt_container_type, manager>::create	()
+editor::property_holder* property_collection<manager::thunderbolt_container_type, manager>::create()
 {
-	thunderbolt*					object = xr_new<thunderbolt>(&m_holder, generate_unique_id("thunderbolt_unique_id_").c_str());
-	object->fill					(m_holder.environment(), this);
-	return							(object->object());
+    thunderbolt* object = xr_new<thunderbolt>(&m_holder, generate_unique_id("thunderbolt_unique_id_").c_str());
+    object->fill(m_holder.environment(), this);
+    return (object->object());
 }
 
 template <>
-void property_collection<manager::collection_container_type, manager>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<manager::collection_container_type, manager>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy						(buffer, buffer_size, m_container[item_index]->id());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id());
 }
 
 template <>
-editor::property_holder* property_collection<manager::collection_container_type, manager>::create	()
+editor::property_holder* property_collection<manager::collection_container_type, manager>::create()
 {
-	collection*						object = xr_new<collection>(m_holder, generate_unique_id("thunderbolt_collection_unique_id_").c_str());
-	object->fill					(this);
-	return							(object->object());
+    collection* object = xr_new<collection>(m_holder, generate_unique_id("thunderbolt_collection_unique_id_").c_str());
+    object->fill(this);
+    return (object->object());
 }
 
-manager::manager					(::editor::environment::manager* environment) :
-	m_thunderbolt_collection		(0),
-	m_thunderbolts_changed			(true),
-	m_collections_collection		(0),
-	m_collections_changed			(true),
-	m_property_holder				(0),
-	m_environment					(*environment)
+manager::manager(::editor::environment::manager* environment) :
+    m_thunderbolt_collection(0),
+    m_thunderbolts_changed(true),
+    m_collections_collection(0),
+    m_collections_changed(true),
+    m_property_holder(0),
+    m_environment(*environment)
 {
-	m_thunderbolt_collection		= xr_new<thunderbolt_collection_type>(&m_thunderbolts, this, &m_thunderbolts_changed);
-	m_collections_collection		= xr_new<collection_collection_type>(&m_collections, this, &m_collections_changed);
+    m_thunderbolt_collection = xr_new<thunderbolt_collection_type>(&m_thunderbolts, this, &m_thunderbolts_changed);
+    m_collections_collection = xr_new<collection_collection_type>(&m_collections, this, &m_collections_changed);
 }
 
-manager::~manager					()
+manager::~manager()
 {
-	xr_delete						(m_thunderbolt_collection);
-	delete_data						(m_thunderbolts);
+    xr_delete(m_thunderbolt_collection);
+    delete_data(m_thunderbolts);
 
-	xr_delete						(m_collections_collection);
-	delete_data						(m_collections);
+    xr_delete(m_collections_collection);
+    delete_data(m_collections);
 
-	delete_data						(m_thunderbolts_ids);
-	delete_data						(m_collections_ids);
+    delete_data(m_thunderbolts_ids);
+    delete_data(m_collections_ids);
 
-	if (!Device.editor() || !m_property_holder)
-		return;
+    if (!Device.editor() || !m_property_holder)
+        return;
 
-	::ide().destroy					(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void manager::load_thunderbolts		()
+void manager::load_thunderbolts()
 {
-	VERIFY							(m_thunderbolts.empty());
-
-	string_path						file_name;
-	CInifile*						config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\thunderbolts.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-
-	typedef CInifile::Root			sections_type;
-	sections_type&					sections = config->sections();
-	m_thunderbolts.reserve			(sections.size());
-	sections_type::const_iterator	i = sections.begin();
-	sections_type::const_iterator	e = sections.end();
-	for ( ; i != e; ++i) {
-		thunderbolt*				object = xr_new<thunderbolt>(this, (*i)->Name);
-		object->load				(*config);
-		object->fill				(m_environment, m_thunderbolt_collection);
-		m_thunderbolts.push_back	(object);
-	}
-
-	xr_delete						(config);
+    VERIFY(m_thunderbolts.empty());
+
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\thunderbolts.ltx"
+            ),
+            TRUE,
+            TRUE,
+            FALSE
+        );
+
+    typedef CInifile::Root sections_type;
+    sections_type& sections = config->sections();
+    m_thunderbolts.reserve(sections.size());
+    sections_type::const_iterator i = sections.begin();
+    sections_type::const_iterator e = sections.end();
+    for (; i != e; ++i)
+    {
+        thunderbolt* object = xr_new<thunderbolt>(this, (*i)->Name);
+        object->load(*config);
+        object->fill(m_environment, m_thunderbolt_collection);
+        m_thunderbolts.push_back(object);
+    }
+
+    xr_delete(config);
 }
 
-void manager::save_thunderbolts		()
+void manager::save_thunderbolts()
 {
-	string_path						file_name;
-	CInifile*						config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\thunderbolts.ltx"
-			),
-			FALSE,
-			FALSE,
-			TRUE
-		);
-
-	thunderbolt_container_type::const_iterator	i = m_thunderbolts.begin();
-	thunderbolt_container_type::const_iterator	e = m_thunderbolts.end();
-	for ( ; i != e; ++i)
-		(*i)->save					(*config);
-
-	xr_delete						(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\thunderbolts.ltx"
+            ),
+            FALSE,
+            FALSE,
+            TRUE
+        );
+
+    thunderbolt_container_type::const_iterator i = m_thunderbolts.begin();
+    thunderbolt_container_type::const_iterator e = m_thunderbolts.end();
+    for (; i != e; ++i)
+        (*i)->save(*config);
+
+    xr_delete(config);
 }
 
-void manager::load_collections		()
+void manager::load_collections()
 {
-	VERIFY							(m_collections.empty());
-
-	string_path						file_name;
-	CInifile*						config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\thunderbolt_collections.ltx"
-			),
-			TRUE,
-			TRUE,
-			FALSE
-		);
-
-	typedef CInifile::Root			sections_type;
-	sections_type&					sections = config->sections();
-	m_collections.reserve			(sections.size());
-	sections_type::const_iterator	i = sections.begin();
-	sections_type::const_iterator	e = sections.end();
-	for ( ; i != e; ++i) {
-		collection*					object = xr_new<collection>(*this, (*i)->Name);
-		object->load				(*config);
-		object->fill				(m_thunderbolt_collection);
-		m_collections.push_back		(object);
-	}
-
-	xr_delete						(config);
+    VERIFY(m_collections.empty());
+
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\thunderbolt_collections.ltx"
+            ),
+            TRUE,
+            TRUE,
+            FALSE
+        );
+
+    typedef CInifile::Root sections_type;
+    sections_type& sections = config->sections();
+    m_collections.reserve(sections.size());
+    sections_type::const_iterator i = sections.begin();
+    sections_type::const_iterator e = sections.end();
+    for (; i != e; ++i)
+    {
+        collection* object = xr_new<collection>(*this, (*i)->Name);
+        object->load(*config);
+        object->fill(m_thunderbolt_collection);
+        m_collections.push_back(object);
+    }
+
+    xr_delete(config);
 }
 
-void manager::save_collections		()
+void manager::save_collections()
 {
-	string_path						file_name;
-	CInifile*						config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\thunderbolt_collections.ltx"
-			),
-			FALSE,
-			FALSE,
-			TRUE
-		);
-
-	collection_container_type::const_iterator	i = m_collections.begin();
-	collection_container_type::const_iterator	e = m_collections.end();
-	for ( ; i != e; ++i)
-		(*i)->save					(*config);
-
-	xr_delete						(config);
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\thunderbolt_collections.ltx"
+            ),
+            FALSE,
+            FALSE,
+            TRUE
+        );
+
+    collection_container_type::const_iterator i = m_collections.begin();
+    collection_container_type::const_iterator e = m_collections.end();
+    for (; i != e; ++i)
+        (*i)->save(*config);
+
+    xr_delete(config);
 }
 
-void manager::load					()
+void manager::load()
 {
-	load_thunderbolts				();
-	load_collections				();
+    load_thunderbolts();
+    load_collections();
 }
 
-void manager::save					()
+void manager::save()
 {
-	save_thunderbolts				();
-	save_collections				();
-
-	string_path						file_name;
-	CInifile*						config =
-		xr_new<CInifile>(
-			FS.update_path(
-				file_name,
-				"$game_config$",
-				"environment\\environment.ltx"
-			),
-			FALSE,
-			FALSE,
-			TRUE
-		);
-
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	
-	config->w_float					("environment","altitude",			rad2deg(environment.p_var_alt)	);
-	config->w_float					("environment","delta_longitude",	rad2deg(environment.p_var_long)	);
-	config->w_float					("environment","min_dist_factor",	environment.p_min_dist			);
-	config->w_float					("environment","tilt",				rad2deg(environment.p_tilt)		);
-	config->w_float					("environment","second_propability",environment.p_second_prop		);
-	config->w_float					("environment","sky_color",			environment.p_sky_color			);
-	config->w_float					("environment","sun_color",			environment.p_sun_color			);
-	config->w_float					("environment","fog_color",			environment.p_fog_color			);
-
-	xr_delete						(config);
+    save_thunderbolts();
+    save_collections();
+
+    string_path file_name;
+    CInifile* config =
+        xr_new<CInifile>(
+            FS.update_path(
+                file_name,
+                "$game_config$",
+                "environment\\environment.ltx"
+            ),
+            FALSE,
+            FALSE,
+            TRUE
+        );
+
+    CEnvironment& environment = g_pGamePersistent->Environment();
+
+    config->w_float("environment", "altitude", rad2deg(environment.p_var_alt));
+    config->w_float("environment", "delta_longitude", rad2deg(environment.p_var_long));
+    config->w_float("environment", "min_dist_factor", environment.p_min_dist);
+    config->w_float("environment", "tilt", rad2deg(environment.p_tilt));
+    config->w_float("environment", "second_propability", environment.p_second_prop);
+    config->w_float("environment", "sky_color", environment.p_sky_color);
+    config->w_float("environment", "sun_color", environment.p_sun_color);
+    config->w_float("environment", "fog_color", environment.p_fog_color);
+
+    xr_delete(config);
 }
 
-float manager::altitude_getter		() const
+float manager::altitude_getter() const
 {
-	return							(rad2deg(m_environment.p_var_alt));
+    return (rad2deg(m_environment.p_var_alt));
 }
 
-void manager::altitude_setter		(float value)
+void manager::altitude_setter(float value)
 {
-	m_environment.p_var_alt			= deg2rad(value);
+    m_environment.p_var_alt = deg2rad(value);
 }
 
-float manager::longitude_getter		() const
+float manager::longitude_getter() const
 {
-	return							(rad2deg(m_environment.p_var_long));
+    return (rad2deg(m_environment.p_var_long));
 }
 
-void manager::longitude_setter		(float value)
+void manager::longitude_setter(float value)
 {
-	m_environment.p_var_long		= deg2rad(value);
+    m_environment.p_var_long = deg2rad(value);
 }
 
-float manager::tilt_getter			() const
+float manager::tilt_getter() const
 {
-	return							(rad2deg(m_environment.p_tilt));
+    return (rad2deg(m_environment.p_tilt));
 }
 
-void manager::tilt_setter			(float value)
+void manager::tilt_setter(float value)
 {
-	m_environment.p_tilt			= deg2rad(value);
+    m_environment.p_tilt = deg2rad(value);
 }
 
-void manager::fill					(editor::property_holder* holder)
+void manager::fill(editor::property_holder* holder)
 {
-	VERIFY							(holder);
-
-	typedef ::editor::property_holder::float_getter_type	float_getter_type;
-	float_getter_type				float_getter;
-
-	typedef ::editor::property_holder::float_setter_type	float_setter_type;
-	float_setter_type				float_setter;
-
-	float_getter.bind				(this, &manager::altitude_getter);
-	float_setter.bind				(this, &manager::altitude_setter);
-	holder->add_property	(
-		"altitude",
-		"thunderbolts",
-		"this option is resposible for thunderbolts altitude (in degrees)",
-		rad2deg(m_environment.p_var_alt),
-		float_getter,
-		float_setter,
-		-360.0f,
-		 360.f
-	);
-
-	float_getter.bind				(this, &manager::longitude_getter);
-	float_setter.bind				(this, &manager::longitude_setter);
-	holder->add_property	(
-		"delta longitude",
-		"thunderbolts",
-		"this option is resposible for thunderbolts delta longitude (in degrees)",
-		m_environment.p_var_long,
-		float_getter,
-		float_setter,
-		-360.0f,
-		 360.f
-	);
-	holder->add_property	(
-		"minimum distance factor",
-		"thunderbolts",
-		"this option is resposible for thunderbolts minimum distance factor (distance from far plane)",
-		m_environment.p_min_dist,
-		m_environment.p_min_dist,
-		.0f,
-		.95f
-	);
-
-	float_getter.bind				(this, &manager::tilt_getter);
-	float_setter.bind				(this, &manager::tilt_setter);
-	holder->add_property	(
-		"tilt",
-		"thunderbolts",
-		"this option is resposible for thunderbolts tilt (in degrees)",
-		m_environment.p_tilt,
-		float_getter,
-		float_setter,
-		15.f,
-		30.f
-	);
-	holder->add_property	(
-		"second probability",
-		"thunderbolts",
-		"this option is resposible for thunderbolts second probability (0..1)",
-		m_environment.p_second_prop,
-		m_environment.p_second_prop,
-		0.f,
-		1.f
-	);
-	holder->add_property	(
-		"sky color",
-		"thunderbolts",
-		"this option is resposible for thunderbolts sky color (factor)",
-		m_environment.p_sky_color,
-		m_environment.p_sky_color,
-		0.f,
-		1.f
-	);
-	holder->add_property	(
-		"sun color",
-		"thunderbolts",
-		"this option is resposible for thunderbolts sun color (factor)",
-		m_environment.p_sun_color,
-		m_environment.p_sun_color,
-		0.f,
-		1.f
-	);
-	holder->add_property	(
-		"fog color",
-		"thunderbolts",
-		"this option is resposible for thunderbolts fog color (factor)",
-		m_environment.p_fog_color,
-		m_environment.p_fog_color,
-		0.f,
-		1.f
-	);
-	holder->add_property	(
-		"thunderbolt collections",
-		"thunderbolts",
-		"this option is resposible for thunderbolt collections",
-		m_collections_collection
-	);
-	holder->add_property	(
-		"thunderbolts",
-		"thunderbolts",
-		"this option is resposible for thunderbolts",
-		m_thunderbolt_collection
-	);
+    VERIFY(holder);
+
+    typedef ::editor::property_holder::float_getter_type float_getter_type;
+    float_getter_type float_getter;
+
+    typedef ::editor::property_holder::float_setter_type float_setter_type;
+    float_setter_type float_setter;
+
+    float_getter.bind(this, &manager::altitude_getter);
+    float_setter.bind(this, &manager::altitude_setter);
+    holder->add_property(
+        "altitude",
+        "thunderbolts",
+        "this option is resposible for thunderbolts altitude (in degrees)",
+        rad2deg(m_environment.p_var_alt),
+        float_getter,
+        float_setter,
+        -360.0f,
+        360.f
+    );
+
+    float_getter.bind(this, &manager::longitude_getter);
+    float_setter.bind(this, &manager::longitude_setter);
+    holder->add_property(
+        "delta longitude",
+        "thunderbolts",
+        "this option is resposible for thunderbolts delta longitude (in degrees)",
+        m_environment.p_var_long,
+        float_getter,
+        float_setter,
+        -360.0f,
+        360.f
+    );
+    holder->add_property(
+        "minimum distance factor",
+        "thunderbolts",
+        "this option is resposible for thunderbolts minimum distance factor (distance from far plane)",
+        m_environment.p_min_dist,
+        m_environment.p_min_dist,
+        .0f,
+        .95f
+    );
+
+    float_getter.bind(this, &manager::tilt_getter);
+    float_setter.bind(this, &manager::tilt_setter);
+    holder->add_property(
+        "tilt",
+        "thunderbolts",
+        "this option is resposible for thunderbolts tilt (in degrees)",
+        m_environment.p_tilt,
+        float_getter,
+        float_setter,
+        15.f,
+        30.f
+    );
+    holder->add_property(
+        "second probability",
+        "thunderbolts",
+        "this option is resposible for thunderbolts second probability (0..1)",
+        m_environment.p_second_prop,
+        m_environment.p_second_prop,
+        0.f,
+        1.f
+    );
+    holder->add_property(
+        "sky color",
+        "thunderbolts",
+        "this option is resposible for thunderbolts sky color (factor)",
+        m_environment.p_sky_color,
+        m_environment.p_sky_color,
+        0.f,
+        1.f
+    );
+    holder->add_property(
+        "sun color",
+        "thunderbolts",
+        "this option is resposible for thunderbolts sun color (factor)",
+        m_environment.p_sun_color,
+        m_environment.p_sun_color,
+        0.f,
+        1.f
+    );
+    holder->add_property(
+        "fog color",
+        "thunderbolts",
+        "this option is resposible for thunderbolts fog color (factor)",
+        m_environment.p_fog_color,
+        m_environment.p_fog_color,
+        0.f,
+        1.f
+    );
+    holder->add_property(
+        "thunderbolt collections",
+        "thunderbolts",
+        "this option is resposible for thunderbolt collections",
+        m_collections_collection
+    );
+    holder->add_property(
+        "thunderbolts",
+        "thunderbolts",
+        "this option is resposible for thunderbolts",
+        m_thunderbolt_collection
+    );
 }
 
-manager::thunderbolts_ids_type const& manager::thunderbolts_ids	() const
+manager::thunderbolts_ids_type const& manager::thunderbolts_ids() const
 {
-	if (!m_thunderbolts_changed)
-		return						(m_thunderbolts_ids);
+    if (!m_thunderbolts_changed)
+        return (m_thunderbolts_ids);
 
-	delete_data						(m_thunderbolts_ids);
+    delete_data(m_thunderbolts_ids);
 
-	m_thunderbolts_ids.resize		(m_thunderbolts.size());
+    m_thunderbolts_ids.resize(m_thunderbolts.size());
 
-	thunderbolt_container_type::const_iterator	i = m_thunderbolts.begin();
-	thunderbolt_container_type::const_iterator	e = m_thunderbolts.end();
-	thunderbolts_ids_type::iterator				j = m_thunderbolts_ids.begin();
-	for ( ; i != e; ++i, ++j)
-		*j							= xr_strdup((*i)->id());
+    thunderbolt_container_type::const_iterator i = m_thunderbolts.begin();
+    thunderbolt_container_type::const_iterator e = m_thunderbolts.end();
+    thunderbolts_ids_type::iterator j = m_thunderbolts_ids.begin();
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id());
 
-	std::sort						(m_thunderbolts_ids.begin(), m_thunderbolts_ids.end(), logical_string_predicate());
+    std::sort(m_thunderbolts_ids.begin(), m_thunderbolts_ids.end(), logical_string_predicate());
 
-	return							(m_thunderbolts_ids);
+    return (m_thunderbolts_ids);
 }
 
-manager::thunderbolts_ids_type const& manager::collections_ids	() const
+manager::thunderbolts_ids_type const& manager::collections_ids() const
 {
-	if (!m_collections_changed)
-		return						(m_collections_ids);
+    if (!m_collections_changed)
+        return (m_collections_ids);
 
-	delete_data						(m_collections_ids);
+    delete_data(m_collections_ids);
 
-	m_collections_ids.resize		(m_collections.size() + 1);
-	m_collections_ids[0]			= xr_strdup("");
+    m_collections_ids.resize(m_collections.size() + 1);
+    m_collections_ids[0] = xr_strdup("");
 
-	collection_container_type::const_iterator	i = m_collections.begin();
-	collection_container_type::const_iterator	e = m_collections.end();
-	collections_ids_type::iterator				j = m_collections_ids.begin() + 1;
-	for ( ; i != e; ++i, ++j)
-		*j							= xr_strdup((*i)->id());
+    collection_container_type::const_iterator i = m_collections.begin();
+    collection_container_type::const_iterator e = m_collections.end();
+    collections_ids_type::iterator j = m_collections_ids.begin() + 1;
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id());
 
-	std::sort						(m_collections_ids.begin(), m_collections_ids.end(), logical_string_predicate());
+    std::sort(m_collections_ids.begin(), m_collections_ids.end(), logical_string_predicate());
 
-	return							(m_collections_ids);
+    return (m_collections_ids);
 }
 
 ::editor::environment::manager& manager::environment() const
 {
-	return							(m_environment);
+    return (m_environment);
 }
 
-shared_str manager::unique_thunderbolt_id	(shared_str const& id) const
+shared_str manager::unique_thunderbolt_id(shared_str const& id) const
 {
-	if (m_thunderbolt_collection->unique_id(id.c_str()))
-		return				(id);
+    if (m_thunderbolt_collection->unique_id(id.c_str()))
+        return (id);
 
-	return					(m_thunderbolt_collection->generate_unique_id(id.c_str()));
+    return (m_thunderbolt_collection->generate_unique_id(id.c_str()));
 }
 
-shared_str manager::unique_collection_id	(shared_str const& id) const
+shared_str manager::unique_collection_id(shared_str const& id) const
 {
-	if (m_collections_collection->unique_id(id.c_str()))
-		return				(id);
+    if (m_collections_collection->unique_id(id.c_str()))
+        return (id);
 
-	return					(m_collections_collection->generate_unique_id(id.c_str()));
+    return (m_collections_collection->generate_unique_id(id.c_str()));
 }
 
-SThunderboltDesc* manager::description		(CInifile& config, shared_str const& section) const
+SThunderboltDesc* manager::description(CInifile& config, shared_str const& section) const
 {
-	thunderbolt_container_type::const_iterator	i = m_thunderbolts.begin();
-	thunderbolt_container_type::const_iterator	e = m_thunderbolts.end();
-	for ( ; i != e; ++i)
-		if ((*i)->id() == section)
-			return			(*i);
+    thunderbolt_container_type::const_iterator i = m_thunderbolts.begin();
+    thunderbolt_container_type::const_iterator e = m_thunderbolts.end();
+    for (; i != e; ++i)
+        if ((*i)->id() == section)
+            return (*i);
 
-	NODEFAULT;
+    NODEFAULT;
 #ifdef DEBUG
-	return					(0);
+    return (0);
 #endif // #ifdef DEBUG
 }
 
-SThunderboltCollection* manager::get_collection	(shared_str const& section)
+SThunderboltCollection* manager::get_collection(shared_str const& section)
 {
-	collection_container_type::iterator	i = m_collections.begin();
-	collection_container_type::iterator	e = m_collections.end();
-	for ( ; i != e; ++i)
-		if ((*i)->id() == section)
-			return			(*i);
+    collection_container_type::iterator i = m_collections.begin();
+    collection_container_type::iterator e = m_collections.end();
+    for (; i != e; ++i)
+        if ((*i)->id() == section)
+            return (*i);
 
-	NODEFAULT;
+    NODEFAULT;
 #ifdef DEBUG
-	return					(0);
+    return (0);
 #endif // #ifdef DEBUG
 }
 
diff --git a/src/xrEngine/editor_environment_thunderbolts_manager.hpp b/src/xrEngine/editor_environment_thunderbolts_manager.hpp
index e7ebc18bd47..a762efef2a5 100644
--- a/src/xrEngine/editor_environment_thunderbolts_manager.hpp
+++ b/src/xrEngine/editor_environment_thunderbolts_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_manager.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts manager class
+// Module : editor_environment_thunderbolts_manager.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_THUNDERBOLTS_MANAGER_HPP_INCLUDED
@@ -17,83 +17,87 @@
 struct SThunderboltDesc;
 struct SThunderboltCollection;
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 
-namespace environment {
+namespace environment
+{
 
 class manager;
 
-namespace thunderbolts {
+namespace thunderbolts
+{
 
 class thunderbolt;
 class thunderbolt_id;
 class collection;
 
-class manager : private boost::noncopyable {
+class manager : private boost::noncopyable
+{
 public:
-							manager		(::editor::environment::manager* environment);
-							~manager	();
-			void			load		();
-			void			save		();
-			void			fill		(editor::property_holder* holder);
-			SThunderboltDesc*		description		(CInifile& config, shared_str const& section) const;
-			SThunderboltCollection*	get_collection	(shared_str const& section);
+    manager(::editor::environment::manager* environment);
+    ~manager();
+    void load();
+    void save();
+    void fill(editor::property_holder* holder);
+    SThunderboltDesc* description(CInifile& config, shared_str const& section) const;
+    SThunderboltCollection* get_collection(shared_str const& section);
 
 public:
-			shared_str		unique_thunderbolt_id	(shared_str const& id) const;
-			shared_str		unique_collection_id	(shared_str const& id) const;
+    shared_str unique_thunderbolt_id(shared_str const& id) const;
+    shared_str unique_collection_id(shared_str const& id) const;
 
 public:
-	typedef xr_vector<thunderbolt*>		thunderbolt_container_type;
-	typedef xr_vector<collection*>		collection_container_type;
-	typedef xr_vector<LPSTR>			thunderbolts_ids_type;
-	typedef xr_vector<LPSTR>			collections_ids_type;
+    typedef xr_vector<thunderbolt*> thunderbolt_container_type;
+    typedef xr_vector<collection*> collection_container_type;
+    typedef xr_vector<LPSTR> thunderbolts_ids_type;
+    typedef xr_vector<LPSTR> collections_ids_type;
 
 public:
-	thunderbolts_ids_type const& thunderbolts_ids	() const;
-	collections_ids_type const& collections_ids		() const;
-	::editor::environment::manager&	environment		() const;
+    thunderbolts_ids_type const& thunderbolts_ids() const;
+    collections_ids_type const& collections_ids() const;
+    ::editor::environment::manager& environment() const;
 
 private:
-			void			load_thunderbolts		();
-			void			load_collections		();
-			void			save_thunderbolts		();
-			void			save_collections		();
+    void load_thunderbolts();
+    void load_collections();
+    void save_thunderbolts();
+    void save_collections();
 
 private:
-	typedef editor::property_holder		property_holder_type;
-	typedef property_collection<
-				thunderbolt_container_type,
-				manager
-			>							thunderbolt_collection_type;
-	typedef property_collection<
-				collection_container_type,
-				manager
-			>							collection_collection_type;
+    typedef editor::property_holder property_holder_type;
+    typedef property_collection <
+    thunderbolt_container_type,
+    manager
+    > thunderbolt_collection_type;
+    typedef property_collection <
+    collection_container_type,
+    manager
+    > collection_collection_type;
 
 private:
-			float xr_stdcall altitude_getter		() const;
-			void xr_stdcall  altitude_setter		(float value);
-			float xr_stdcall longitude_getter		() const;
-			void xr_stdcall  longitude_setter		(float value);
-			float xr_stdcall tilt_getter			() const;
-			void xr_stdcall	 tilt_setter			(float value);
+    float xr_stdcall altitude_getter() const;
+    void xr_stdcall altitude_setter(float value);
+    float xr_stdcall longitude_getter() const;
+    void xr_stdcall longitude_setter(float value);
+    float xr_stdcall tilt_getter() const;
+    void xr_stdcall tilt_setter(float value);
 
 private:
-	thunderbolt_container_type			m_thunderbolts;
-	thunderbolt_collection_type*		m_thunderbolt_collection;
-	bool								m_thunderbolts_changed;
-
-	collection_container_type			m_collections;
-	collection_collection_type*			m_collections_collection;
-	bool								m_collections_changed;
-
-	mutable thunderbolts_ids_type		m_thunderbolts_ids;
-	mutable collections_ids_type		m_collections_ids;
-	property_holder_type*				m_property_holder;
-	::editor::environment::manager&		m_environment;
+    thunderbolt_container_type m_thunderbolts;
+    thunderbolt_collection_type* m_thunderbolt_collection;
+    bool m_thunderbolts_changed;
+
+    collection_container_type m_collections;
+    collection_collection_type* m_collections_collection;
+    bool m_collections_changed;
+
+    mutable thunderbolts_ids_type m_thunderbolts_ids;
+    mutable collections_ids_type m_collections_ids;
+    property_holder_type* m_property_holder;
+    ::editor::environment::manager& m_environment;
 }; // class manager
 } // namespace thunderbolts
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp
index 97232ea55cd..2dbae5c3c1c 100644
--- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp
+++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_thunderbolt.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts thunderbolt class
+// Module : editor_environment_thunderbolts_thunderbolt.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts thunderbolt class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -19,147 +19,147 @@
 using editor::environment::thunderbolts::thunderbolt;
 using editor::environment::thunderbolts::manager;
 
-thunderbolt::thunderbolt		(manager* manager, shared_str const& id) :
-	m_manager			(*manager),
-	m_id				(id),
-	m_property_holder	(0)
+thunderbolt::thunderbolt(manager* manager, shared_str const& id) :
+    m_manager(*manager),
+    m_id(id),
+    m_property_holder(0)
 {
 }
 
-thunderbolt::~thunderbolt		()
+thunderbolt::~thunderbolt()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void thunderbolt::create_top_gradient	(CInifile& config, shared_str const& section)
+void thunderbolt::create_top_gradient(CInifile& config, shared_str const& section)
 {
-	VERIFY				(section == m_id);
-	m_top				= xr_new<gradient>();
-	m_top->load			(config, section, "gradient_top");
-	m_GradientTop		= m_top;
+    VERIFY(section == m_id);
+    m_top = xr_new<gradient>();
+    m_top->load(config, section, "gradient_top");
+    m_GradientTop = m_top;
 }
 
 void thunderbolt::create_center_gradient(CInifile& config, shared_str const& section)
 {
-	VERIFY				(section == m_id);
-	m_center			= xr_new<gradient>();
-	m_center->load		(config, section, "gradient_center");
-	m_GradientCenter	= m_center;
+    VERIFY(section == m_id);
+    m_center = xr_new<gradient>();
+    m_center->load(config, section, "gradient_center");
+    m_GradientCenter = m_center;
 }
 
-void thunderbolt::load			(CInifile& config)
+void thunderbolt::load(CInifile& config)
 {
-	inherited::load		(config, m_id);
-	m_color_animator	= config.r_string	(m_id, "color_anim");
-	m_lighting_model	= config.r_string	(m_id, "lightning_model");
-	m_sound				= config.r_string	(m_id, "sound");
+    inherited::load(config, m_id);
+    m_color_animator = config.r_string(m_id, "color_anim");
+    m_lighting_model = config.r_string(m_id, "lightning_model");
+    m_sound = config.r_string(m_id, "sound");
 }
 
-void thunderbolt::save			(CInifile& config)
+void thunderbolt::save(CInifile& config)
 {
-	m_top->save			(config, m_id, "gradient_top");
-	m_center->save		(config, m_id, "gradient_center");
-	config.w_string		(m_id.c_str(), "color_anim",		m_color_animator.c_str());
-	config.w_string		(m_id.c_str(), "lightning_model",	m_lighting_model.c_str());
-	config.w_string		(m_id.c_str(), "sound",				m_sound.c_str()			);
+    m_top->save(config, m_id, "gradient_top");
+    m_center->save(config, m_id, "gradient_center");
+    config.w_string(m_id.c_str(), "color_anim", m_color_animator.c_str());
+    config.w_string(m_id.c_str(), "lightning_model", m_lighting_model.c_str());
+    config.w_string(m_id.c_str(), "sound", m_sound.c_str());
 }
 
-LPCSTR thunderbolt::id_getter	() const
+LPCSTR thunderbolt::id_getter() const
 {
-	return				(m_id.c_str());
+    return (m_id.c_str());
 }
 
-void thunderbolt::id_setter		(LPCSTR value_)
+void thunderbolt::id_setter(LPCSTR value_)
 {
-	shared_str			value = value_;
-	if (m_id._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (m_id._get() == value._get())
+        return;
 
-	m_id				= m_manager.unique_thunderbolt_id(value);
+    m_id = m_manager.unique_thunderbolt_id(value);
 }
 
-void thunderbolt::fill			(
-		::editor::environment::manager& environment,
-		::editor::property_holder_collection* collection
-	)
+void thunderbolt::fill(
+    ::editor::environment::manager& environment,
+    ::editor::property_holder_collection* collection
+)
 {
-	VERIFY				(!m_property_holder);
-	m_property_holder	= ::ide().create_property_holder(m_id.c_str(), collection, this);
-
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type	string_getter;
-	string_getter.bind	(this, &thunderbolt::id_getter);
-
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type	string_setter;
-	string_setter.bind	(this, &thunderbolt::id_setter);
-
-	m_property_holder->add_property(
-		"id",
-		"properties",
-		"this option is resposible for thunderbolt id",
-		m_id.c_str(),
-		string_getter,
-		string_setter
-	);
-	m_property_holder->add_property(
-		"color animator",
-		"properties",
-		"this option is resposible for thunderbolt color animator",
-		m_color_animator.c_str(),
-		m_color_animator,
-		&*environment.light_animator_ids().begin(),
-		environment.light_animator_ids().size(),
-		editor::property_holder::value_editor_tree_view,
-		editor::property_holder::cannot_enter_text
-	);
-	m_property_holder->add_property(
-		"lighting model",
-		"properties",
-		"this option is resposible for thunderbolt lighting model",
-		m_lighting_model.c_str(),
-		m_lighting_model,
-		".dm",
-		"Lighting model files (*.dm)|*.dm",
-		detail::real_path("$game_meshes$", "").c_str(),
-		"Select lighting model...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::keep_extension
-	);
-	m_property_holder->add_property(
-		"sound",
-		"properties",
-		"this option is resposible for thunderbolt sound",
-		m_sound.c_str(),
-		m_sound,
-		".ogg",
-		"Sound files (*.ogg)|*.ogg",
-		detail::real_path("$game_sounds$", "").c_str(),
-		"Select sound...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
-
-	m_center->fill		(
-		environment,
-		"center",
-		"this option is resposible for thunderbolt gradient center",
-		*m_property_holder
-	);
-	m_top->fill			(
-		environment,
-		"top",
-		"this option is resposible for thunderbolt gradient top",
-		*m_property_holder
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this);
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &thunderbolt::id_getter);
+
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &thunderbolt::id_setter);
+
+    m_property_holder->add_property(
+        "id",
+        "properties",
+        "this option is resposible for thunderbolt id",
+        m_id.c_str(),
+        string_getter,
+        string_setter
+    );
+    m_property_holder->add_property(
+        "color animator",
+        "properties",
+        "this option is resposible for thunderbolt color animator",
+        m_color_animator.c_str(),
+        m_color_animator,
+        &*environment.light_animator_ids().begin(),
+        environment.light_animator_ids().size(),
+        editor::property_holder::value_editor_tree_view,
+        editor::property_holder::cannot_enter_text
+    );
+    m_property_holder->add_property(
+        "lighting model",
+        "properties",
+        "this option is resposible for thunderbolt lighting model",
+        m_lighting_model.c_str(),
+        m_lighting_model,
+        ".dm",
+        "Lighting model files (*.dm)|*.dm",
+        detail::real_path("$game_meshes$", "").c_str(),
+        "Select lighting model...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::keep_extension
+    );
+    m_property_holder->add_property(
+        "sound",
+        "properties",
+        "this option is resposible for thunderbolt sound",
+        m_sound.c_str(),
+        m_sound,
+        ".ogg",
+        "Sound files (*.ogg)|*.ogg",
+        detail::real_path("$game_sounds$", "").c_str(),
+        "Select sound...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
+
+    m_center->fill(
+        environment,
+        "center",
+        "this option is resposible for thunderbolt gradient center",
+        *m_property_holder
+    );
+    m_top->fill(
+        environment,
+        "top",
+        "this option is resposible for thunderbolt gradient top",
+        *m_property_holder
+    );
 }
 
-thunderbolt::property_holder_type* thunderbolt::object	()
+thunderbolt::property_holder_type* thunderbolt::object()
 {
-	return				(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp
index 31a459a167b..6e8413ec5c8 100644
--- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp
+++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_thunderbolt.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts thunderbolt class
+// Module : editor_environment_thunderbolts_thunderbolt.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts thunderbolt class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_THUNDERBOLTS_THUNDERBOLT_HPP_INCLUDED
@@ -16,53 +16,56 @@
 #include "editor_environment_thunderbolts_gradient.hpp"
 #include "thunderbolt.h"
 
-namespace editor {
-namespace environment {
+namespace editor
+{
+namespace environment
+{
 
 class manager;
 
-namespace thunderbolts {
+namespace thunderbolts
+{
 
 class manager;
 
 class thunderbolt :
-	public SThunderboltDesc,
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public SThunderboltDesc,
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 private:
-	typedef SThunderboltDesc			inherited;
+    typedef SThunderboltDesc inherited;
 
 public:
-							thunderbolt				(manager* manager, shared_str const& id);
-	virtual					~thunderbolt			();
-			void			load					(CInifile& config);
-			void			save					(CInifile& config);
-			void			fill					(::editor::environment::manager& environment, editor::property_holder_collection* collection);
-	inline	LPCSTR			id						() const { return m_id.c_str(); }
-	virtual	void			create_top_gradient		(CInifile& pIni, shared_str const& sect);
-	virtual	void			create_center_gradient	(CInifile& pIni, shared_str const& sect);
+    thunderbolt(manager* manager, shared_str const& id);
+    virtual ~thunderbolt();
+    void load(CInifile& config);
+    void save(CInifile& config);
+    void fill(::editor::environment::manager& environment, editor::property_holder_collection* collection);
+    inline LPCSTR id() const { return m_id.c_str(); }
+    virtual void create_top_gradient(CInifile& pIni, shared_str const& sect);
+    virtual void create_center_gradient(CInifile& pIni, shared_str const& sect);
 
 private:
-			LPCSTR xr_stdcall id_getter	() const;
-			void   xr_stdcall id_setter	(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
 private:
-	typedef editor::property_holder		property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type* object();
+    virtual property_holder_type* object();
 
 private:
-	shared_str				m_id;
-	manager&				m_manager;
-	property_holder_type*	m_property_holder;
+    shared_str m_id;
+    manager& m_manager;
+    property_holder_type* m_property_holder;
 
 private:
-	gradient*				m_center;
-	gradient*				m_top;
-	shared_str				m_color_animator;
-	shared_str				m_lighting_model;
-	shared_str				m_sound;
+    gradient* m_center;
+    gradient* m_top;
+    shared_str m_color_animator;
+    shared_str m_lighting_model;
+    shared_str m_sound;
 }; // class thunderbolt
 
 } // namespace thunderbolts
diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp
index 786bbf80864..97c67c23e94 100644
--- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp
+++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_thunderbolt_id.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts thunderbolt identifier class
+// Module : editor_environment_thunderbolts_thunderbolt_id.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts thunderbolt identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -16,60 +16,60 @@
 using editor::environment::thunderbolts::thunderbolt_id;
 using editor::environment::thunderbolts::manager;
 
-thunderbolt_id::thunderbolt_id			(manager const& manager, shared_str const& id) :
-	m_manager						(manager),
-	m_id							(id),
-	m_property_holder				(0)
+thunderbolt_id::thunderbolt_id(manager const& manager, shared_str const& id) :
+    m_manager(manager),
+    m_id(id),
+    m_property_holder(0)
 {
 }
 
-thunderbolt_id::~thunderbolt_id			()
+thunderbolt_id::~thunderbolt_id()
 {
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy					(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
 LPCSTR const* thunderbolt_id::collection()
 {
-	return							(&*m_manager.thunderbolts_ids().begin());
+    return (&*m_manager.thunderbolts_ids().begin());
 }
 
-u32 thunderbolt_id::collection_size		()
+u32 thunderbolt_id::collection_size()
 {
-	return							(m_manager.thunderbolts_ids().size());
+    return (m_manager.thunderbolts_ids().size());
 }
 
-void thunderbolt_id::fill				(editor::property_holder_collection* collection)
+void thunderbolt_id::fill(editor::property_holder_collection* collection)
 {
-	VERIFY							(!m_property_holder);
-	m_property_holder				= ::ide().create_property_holder(m_id.c_str(), collection, this);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this);
 
-	typedef editor::property_holder::string_collection_getter_type	collection_getter_type;
-	collection_getter_type			collection_getter;
-	collection_getter.bind			(this, &thunderbolt_id::collection);
+    typedef editor::property_holder::string_collection_getter_type collection_getter_type;
+    collection_getter_type collection_getter;
+    collection_getter.bind(this, &thunderbolt_id::collection);
 
-	typedef editor::property_holder::string_collection_size_getter_type	collection_size_getter_type;
-	collection_size_getter_type		collection_size_getter;
-	collection_size_getter.bind		(this, &thunderbolt_id::collection_size);
+    typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type;
+    collection_size_getter_type collection_size_getter;
+    collection_size_getter.bind(this, &thunderbolt_id::collection_size);
 
-	m_property_holder->add_property	(
-		"thunderbolt",
-		"properties",
-		"this option is resposible for thunderbolt",
-		m_id.c_str(),
-		m_id,
-		collection_getter,
-		collection_size_getter,
-		editor::property_holder::value_editor_combo_box,
-		editor::property_holder::cannot_enter_text
-	);
+    m_property_holder->add_property(
+        "thunderbolt",
+        "properties",
+        "this option is resposible for thunderbolt",
+        m_id.c_str(),
+        m_id,
+        collection_getter,
+        collection_size_getter,
+        editor::property_holder::value_editor_combo_box,
+        editor::property_holder::cannot_enter_text
+    );
 }
 
-thunderbolt_id::property_holder_type* thunderbolt_id::object	()
+thunderbolt_id::property_holder_type* thunderbolt_id::object()
 {
-	return							(m_property_holder);
+    return (m_property_holder);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp
index a0b23daa190..f857e170095 100644
--- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp
+++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_thunderbolts_thunderbolt_id.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment thunderbolts thunderbolt identifier class
+// Module : editor_environment_thunderbolts_thunderbolt_id.hpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment thunderbolts thunderbolt identifier class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_WEATHER_THUNDERBOLTS_THUNDERBOLT_ID_HPP_INCLUDED
@@ -14,38 +14,42 @@
 #include <boost/noncopyable.hpp>
 #include "../include/editor/property_holder.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder_collection;
 
-namespace environment {
-namespace thunderbolts {
+namespace environment
+{
+namespace thunderbolts
+{
 
 class manager;
 
 class thunderbolt_id :
-	public editor::property_holder_holder,
-	private boost::noncopyable {
+    public editor::property_holder_holder,
+    private boost::noncopyable
+{
 public:
-							thunderbolt_id	(manager const& manager, shared_str const& thunderbolt);
-	virtual					~thunderbolt_id	();
-			void			fill			(editor::property_holder_collection* collection);
-	inline	LPCSTR			id				() const { return m_id.c_str(); }
+    thunderbolt_id(manager const& manager, shared_str const& thunderbolt);
+    virtual ~thunderbolt_id();
+    void fill(editor::property_holder_collection* collection);
+    inline LPCSTR id() const { return m_id.c_str(); }
 
 private:
-	typedef editor::property_holder			property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-	virtual	property_holder_type* object	();
+    virtual property_holder_type* object();
 
 private:
-	LPCSTR const* xr_stdcall collection		();
-	u32  xr_stdcall			collection_size	();
+    LPCSTR const* xr_stdcall collection();
+    u32 xr_stdcall collection_size();
 
 private:
-	property_holder_type*	m_property_holder;
-	manager const&			m_manager;
-	shared_str				m_id;
+    property_holder_type* m_property_holder;
+    manager const& m_manager;
+    shared_str m_id;
 }; // class thunderbolt_id
 } // namespace thunderbolts
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_weathers_manager.cpp b/src/xrEngine/editor_environment_weathers_manager.cpp
index 0f14c2dbac5..2e16ada7ec6 100644
--- a/src/xrEngine/editor_environment_weathers_manager.cpp
+++ b/src/xrEngine/editor_environment_weathers_manager.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_manager.cpp
-//	Created 	: 04.01.2008
-//  Modified 	: 04.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment manager class
+// Module : editor_environment_manager.cpp
+// Created : 04.01.2008
+// Modified : 04.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -24,327 +24,335 @@ using editor::environment::weathers::weather;
 using editor::environment::detail::logical_string_predicate;
 
 template <>
-void property_collection<manager::weather_container_type, manager>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<manager::weather_container_type, manager>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy						(buffer, buffer_size, m_container[item_index]->id().c_str());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
 
 template <>
-editor::property_holder* property_collection<manager::weather_container_type, manager>::create	()
+editor::property_holder* property_collection<manager::weather_container_type, manager>::create()
 {
-	weather*						object = xr_new<weather>(&m_holder.m_manager, generate_unique_id("weather_unique_id_").c_str());
-	object->fill					(this);
-	return							(object->object());
+    weather* object = xr_new<weather>(&m_holder.m_manager, generate_unique_id("weather_unique_id_").c_str());
+    object->fill(this);
+    return (object->object());
 }
 
-manager::manager			(editor::environment::manager* manager) :
-	m_manager						(*manager),
-	m_collection					(0),
-	m_changed						(true)
+manager::manager(editor::environment::manager* manager) :
+    m_manager(*manager),
+    m_collection(0),
+    m_changed(true)
 {
-	m_collection					= xr_new<collection_type>(&m_weathers, this, &m_changed);
+    m_collection = xr_new<collection_type>(&m_weathers, this, &m_changed);
 }
 
-manager::~manager			()
+manager::~manager()
 {
-	xr_delete						(m_collection);
-	delete_data						(m_weathers);
+    xr_delete(m_collection);
+    delete_data(m_weathers);
 
-	delete_data						(m_weather_ids);
-	delete_data						(m_times_ids);
+    delete_data(m_weather_ids);
+    delete_data(m_times_ids);
 }
 
-void manager::load			()
+void manager::load()
 {
-	typedef xr_vector<LPSTR>		file_list_type;
-	file_list_type*					file_list = FS.file_list_open("$game_weathers$","");
-	VERIFY							(file_list);
+    typedef xr_vector<LPSTR> file_list_type;
+    file_list_type* file_list = FS.file_list_open("$game_weathers$", "");
+    VERIFY(file_list);
     xr_string id;
-	file_list_type::const_iterator	i = file_list->begin();
-	file_list_type::const_iterator	e = file_list->end();
-	for ( ; i != e; ++i) {
-		u32							length = xr_strlen(*i);
-		if (length <= 4)
-			continue;
+    file_list_type::const_iterator i = file_list->begin();
+    file_list_type::const_iterator e = file_list->end();
+    for (; i != e; ++i)
+    {
+        u32 length = xr_strlen(*i);
+        if (length <= 4)
+            continue;
 
-		if ((*i)[length - 4] != '.')
-			continue;
+        if ((*i)[length - 4] != '.')
+            continue;
 
-		if ((*i)[length - 3] != 'l')
-			continue;
+        if ((*i)[length - 3] != 'l')
+            continue;
 
-		if ((*i)[length - 2] != 't')
-			continue;
+        if ((*i)[length - 2] != 't')
+            continue;
 
-		if ((*i)[length - 1] != 'x')
-			continue;
+        if ((*i)[length - 1] != 'x')
+            continue;
 
         id = *i;
-        id[length-4] = 0;
-		weather*					object = xr_new<weather>(&m_manager, id.c_str());
-		object->load				();
-		object->fill				(m_collection);
-		m_weathers.push_back		(object);
-	}
-
-	FS.file_list_close				(file_list);
+        id[length - 4] = 0;
+        weather* object = xr_new<weather>(&m_manager, id.c_str());
+        object->load();
+        object->fill(m_collection);
+        m_weathers.push_back(object);
+    }
+
+    FS.file_list_close(file_list);
 }
 
-void manager::save					()
+void manager::save()
 {
-	weather_container_type::iterator	i =m_weathers.begin();
-	weather_container_type::iterator	e =m_weathers.end();
-	for ( ; i != e; ++i)
-		(*i)->save					();
+    weather_container_type::iterator i = m_weathers.begin();
+    weather_container_type::iterator e = m_weathers.end();
+    for (; i != e; ++i)
+        (*i)->save();
 }
 
-LPCSTR const* manager::weathers_getter	() const
+LPCSTR const* manager::weathers_getter() const
 {
-	return							(&*weather_ids().begin());
+    return (&*weather_ids().begin());
 }
 
-u32 manager::weathers_size_getter		() const
+u32 manager::weathers_size_getter() const
 {
-	return							(weather_ids().size());
+    return (weather_ids().size());
 }
 
-struct predicate {
-	shared_str		value;
+struct predicate
+{
+    shared_str value;
 
-	inline			predicate	(LPCSTR const& value_) :
-		value						(value_)
-	{
-	}
+    inline predicate(LPCSTR const& value_) :
+        value(value_)
+    {
+    }
 
-	inline	bool	operator()	(weather const* weather) const
-	{
-		return						(value._get() == weather->id()._get());
-	}
+    inline bool operator() (weather const* weather) const
+    {
+        return (value._get() == weather->id()._get());
+    }
 }; // struct predicate
 
-LPCSTR const* manager::frames_getter	(LPCSTR weather_id) const
+LPCSTR const* manager::frames_getter(LPCSTR weather_id) const
 {
-	delete_data						(m_times_ids);
+    delete_data(m_times_ids);
 
-	weather_container_type::const_iterator	found =
-		std::find_if(
-			m_weathers.begin(),
-			m_weathers.end(),
-			predicate(weather_id)
-		);
+    weather_container_type::const_iterator found =
+        std::find_if(
+            m_weathers.begin(),
+            m_weathers.end(),
+            predicate(weather_id)
+        );
 
-	if (found == m_weathers.end())
-		return						(0);
+    if (found == m_weathers.end())
+        return (0);
 
-	typedef weather::container_type	container_type;
-	container_type const&			times = (*found)->times();
+    typedef weather::container_type container_type;
+    container_type const& times = (*found)->times();
 
-	m_times_ids.resize				(times.size());
-	times_ids_type::iterator		j = m_times_ids.begin();
-	container_type::const_iterator	i = times.begin();
-	container_type::const_iterator	e = times.end();
-	for ( ; i != e; ++i, ++j)
-		*j							= xr_strdup((*i)->id().c_str());
+    m_times_ids.resize(times.size());
+    times_ids_type::iterator j = m_times_ids.begin();
+    container_type::const_iterator i = times.begin();
+    container_type::const_iterator e = times.end();
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id().c_str());
 
-	return							(&*m_times_ids.begin());
+    return (&*m_times_ids.begin());
 }
 
-u32 manager::frames_size_getter			(LPCSTR weather_id) const
+u32 manager::frames_size_getter(LPCSTR weather_id) const
 {
-	weather_container_type::const_iterator	found =
-		std::find_if(
-			m_weathers.begin(),
-			m_weathers.end(),
-			predicate(weather_id)
-		);
+    weather_container_type::const_iterator found =
+        std::find_if(
+            m_weathers.begin(),
+            m_weathers.end(),
+            predicate(weather_id)
+        );
 
-	if (found == m_weathers.end())
-		return						(0);
+    if (found == m_weathers.end())
+        return (0);
 
 #pragma todo("Dima to Dima: dangerous scheme: it depends on the call sequence (frames_getter should be called berfore frames_size_getter to get correct results)")
-	return							(m_times_ids.size());
+    return (m_times_ids.size());
 }
 
-void manager::fill					(property_holder_type* holder)
+void manager::fill(property_holder_type* holder)
 {
-	VERIFY							(holder);
-	holder->add_property			(
-		"weathers",
-		"weathers",
-		"this option is resposible for weathers",
-		m_collection
-	);
-
-	typedef ::editor::ide::weathers_getter_type			weathers_getter_type;
-	weathers_getter_type			weathers_getter;
-	weathers_getter.bind			(this, &manager::weathers_getter);
-
-	typedef ::editor::ide::weathers_size_getter_type	weathers_size_getter_type;
-	weathers_size_getter_type		weathers_size_getter;
-	weathers_size_getter.bind		(this, &manager::weathers_size_getter);
-
-	typedef ::editor::ide::frames_getter_type			frames_getter_type;
-	frames_getter_type				frames_getter;
-	frames_getter.bind				(this, &manager::frames_getter);
-
-	typedef ::editor::ide::frames_size_getter_type		frames_size_getter_type;
-	frames_size_getter_type			frames_size_getter;
-	frames_size_getter.bind			(this, &manager::frames_size_getter);
-
-	::ide().weather_editor_setup	(
-		weathers_getter,
-		weathers_size_getter,
-		frames_getter,
-		frames_size_getter
-	);
+    VERIFY(holder);
+    holder->add_property(
+        "weathers",
+        "weathers",
+        "this option is resposible for weathers",
+        m_collection
+    );
+
+    typedef ::editor::ide::weathers_getter_type weathers_getter_type;
+    weathers_getter_type weathers_getter;
+    weathers_getter.bind(this, &manager::weathers_getter);
+
+    typedef ::editor::ide::weathers_size_getter_type weathers_size_getter_type;
+    weathers_size_getter_type weathers_size_getter;
+    weathers_size_getter.bind(this, &manager::weathers_size_getter);
+
+    typedef ::editor::ide::frames_getter_type frames_getter_type;
+    frames_getter_type frames_getter;
+    frames_getter.bind(this, &manager::frames_getter);
+
+    typedef ::editor::ide::frames_size_getter_type frames_size_getter_type;
+    frames_size_getter_type frames_size_getter;
+    frames_size_getter.bind(this, &manager::frames_size_getter);
+
+    ::ide().weather_editor_setup(
+        weathers_getter,
+        weathers_size_getter,
+        frames_getter,
+        frames_size_getter
+    );
 }
 
-manager::weather_ids_type const& manager::weather_ids	() const
+manager::weather_ids_type const& manager::weather_ids() const
 {
-	if (!m_changed)
-		return						(m_weather_ids);
+    if (!m_changed)
+        return (m_weather_ids);
 
-	m_changed						= false;
+    m_changed = false;
 
-	delete_data						(m_weather_ids);
+    delete_data(m_weather_ids);
 
-	m_weather_ids.resize			(m_weathers.size());
+    m_weather_ids.resize(m_weathers.size());
 
-	weather_container_type::const_iterator	i = m_weathers.begin();
-	weather_container_type::const_iterator	e = m_weathers.end();
-	weather_ids_type::iterator		j = m_weather_ids.begin();
-	for ( ; i != e; ++i, ++j)
-		*j							= xr_strdup((*i)->id().c_str());
+    weather_container_type::const_iterator i = m_weathers.begin();
+    weather_container_type::const_iterator e = m_weathers.end();
+    weather_ids_type::iterator j = m_weather_ids.begin();
+    for (; i != e; ++i, ++j)
+        *j = xr_strdup((*i)->id().c_str());
 
-	std::sort						(m_weather_ids.begin(), m_weather_ids.end(), logical_string_predicate());
+    std::sort(m_weather_ids.begin(), m_weather_ids.end(), logical_string_predicate());
 
-	return							(m_weather_ids);
+    return (m_weather_ids);
 }
 
-shared_str manager::unique_id			(shared_str const& id) const
+shared_str manager::unique_id(shared_str const& id) const
 {
-	if (m_collection->unique_id(id.c_str()))
-		return						(id);
+    if (m_collection->unique_id(id.c_str()))
+        return (id);
 
-	return							(m_collection->generate_unique_id(id.c_str()));
+    return (m_collection->generate_unique_id(id.c_str()));
 }
 
-bool manager::save_current_blend		(char* buffer, u32 const& buffer_size)
+bool manager::save_current_blend(char* buffer, u32 const& buffer_size)
 {
-	CInifile		temp(0, FALSE, FALSE, FALSE);
+    CInifile temp(0, FALSE, FALSE, FALSE);
 
-	using editor::environment::weathers::time;
-	time*			frame = static_cast<time*>(m_manager.CurrentEnv);
-	frame->save		(temp);
+    using editor::environment::weathers::time;
+    time* frame = static_cast<time*>(m_manager.CurrentEnv);
+    frame->save(temp);
 
-	CMemoryWriter	writer;
-	temp.save_as	(writer);
-	if (writer.size() > buffer_size)
-		return		(false);
+    CMemoryWriter writer;
+    temp.save_as(writer);
+    if (writer.size() > buffer_size)
+        return (false);
 
-	writer.w_u8		(0);
-	writer.seek		(0);
-	Memory.mem_copy	(buffer, writer.pointer(), writer.size());
-	return			(true);
+    writer.w_u8(0);
+    writer.seek(0);
+    Memory.mem_copy(buffer, writer.pointer(), writer.size());
+    return (true);
 }
 
-bool manager::paste_current_time_frame	(char const* buffer, u32 const& buffer_size)
+bool manager::paste_current_time_frame(char const* buffer, u32 const& buffer_size)
 {
-	if (!m_manager.Current[0])
-		return							(false);
+    if (!m_manager.Current[0])
+        return (false);
 
-	weather_container_type::iterator	i = m_weathers.begin();
-	weather_container_type::iterator	e = m_weathers.end();
-	for ( ; i != e; ++i) {
-		if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
-			continue;
+    weather_container_type::iterator i = m_weathers.begin();
+    weather_container_type::iterator e = m_weathers.end();
+    for (; i != e; ++i)
+    {
+        if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
+            continue;
 
-		return						((*i)->paste_time_frame(m_manager.Current[0]->m_identifier, buffer, buffer_size));
-	}
+        return ((*i)->paste_time_frame(m_manager.Current[0]->m_identifier, buffer, buffer_size));
+    }
 
-	return							(false);
+    return (false);
 }
 
-bool manager::paste_target_time_frame	(char const* buffer, u32 const& buffer_size)
+bool manager::paste_target_time_frame(char const* buffer, u32 const& buffer_size)
 {
-	if (!m_manager.Current[1])
-		return							(false);
+    if (!m_manager.Current[1])
+        return (false);
 
-	weather_container_type::iterator	i = m_weathers.begin();
-	weather_container_type::iterator	e = m_weathers.end();
-	for ( ; i != e; ++i) {
-		if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
-			continue;
+    weather_container_type::iterator i = m_weathers.begin();
+    weather_container_type::iterator e = m_weathers.end();
+    for (; i != e; ++i)
+    {
+        if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
+            continue;
 
-		return						((*i)->paste_time_frame(m_manager.Current[1]->m_identifier, buffer, buffer_size));
-	}
+        return ((*i)->paste_time_frame(m_manager.Current[1]->m_identifier, buffer, buffer_size));
+    }
 
-	return							(false);
+    return (false);
 }
 
-bool manager::add_time_frame			(char const* buffer, u32 const& buffer_size)
+bool manager::add_time_frame(char const* buffer, u32 const& buffer_size)
 {
-	weather_container_type::iterator	i = m_weathers.begin();
-	weather_container_type::iterator	e = m_weathers.end();
-	for ( ; i != e; ++i) {
-		if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
-			continue;
+    weather_container_type::iterator i = m_weathers.begin();
+    weather_container_type::iterator e = m_weathers.end();
+    for (; i != e; ++i)
+    {
+        if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
+            continue;
 
-		return							((*i)->add_time_frame(buffer, buffer_size));
-	}
+        return ((*i)->add_time_frame(buffer, buffer_size));
+    }
 
-	return								(false);
+    return (false);
 }
 
-void manager::reload_current_time_frame	()
+void manager::reload_current_time_frame()
 {
-	if (!m_manager.Current[0])
-		return;
-
-	weather_container_type::iterator	i = m_weathers.begin();
-	weather_container_type::iterator	e = m_weathers.end();
-	for ( ; i != e; ++i) {
-		if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
-			continue;
-
-		(*i)->reload_time_frame			(m_manager.Current[0]->m_identifier);
-		return;
-	}
+    if (!m_manager.Current[0])
+        return;
+
+    weather_container_type::iterator i = m_weathers.begin();
+    weather_container_type::iterator e = m_weathers.end();
+    for (; i != e; ++i)
+    {
+        if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
+            continue;
+
+        (*i)->reload_time_frame(m_manager.Current[0]->m_identifier);
+        return;
+    }
 }
 
-void manager::reload_target_time_frame	()
+void manager::reload_target_time_frame()
 {
-	if (!m_manager.Current[1])
-		return;
-
-	weather_container_type::iterator	i = m_weathers.begin();
-	weather_container_type::iterator	e = m_weathers.end();
-	for ( ; i != e; ++i) {
-		if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
-			continue;
-
-		(*i)->reload_time_frame			(m_manager.Current[1]->m_identifier);
-		return;
-	}
+    if (!m_manager.Current[1])
+        return;
+
+    weather_container_type::iterator i = m_weathers.begin();
+    weather_container_type::iterator e = m_weathers.end();
+    for (; i != e; ++i)
+    {
+        if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
+            continue;
+
+        (*i)->reload_time_frame(m_manager.Current[1]->m_identifier);
+        return;
+    }
 }
 
-void manager::reload_current_weather	()
+void manager::reload_current_weather()
 {
-	weather_container_type::iterator	i = m_weathers.begin();
-	weather_container_type::iterator	e = m_weathers.end();
-	for ( ; i != e; ++i) {
-		if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
-			continue;
-
-		(*i)->reload					();
-		return;
-	}
+    weather_container_type::iterator i = m_weathers.begin();
+    weather_container_type::iterator e = m_weathers.end();
+    for (; i != e; ++i)
+    {
+        if (m_manager.CurrentWeatherName._get() != (*i)->id()._get())
+            continue;
+
+        (*i)->reload();
+        return;
+    }
 }
 
-void manager::reload					()
+void manager::reload()
 {
-	delete_data							(m_weathers);
-	load								();
+    delete_data(m_weathers);
+    load();
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_weathers_manager.hpp b/src/xrEngine/editor_environment_weathers_manager.hpp
index 13f4be1e258..66ac374960e 100644
--- a/src/xrEngine/editor_environment_weathers_manager.hpp
+++ b/src/xrEngine/editor_environment_weathers_manager.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_weathers_manager.hpp
-//	Created 	: 04.01.2008
-//  Modified 	: 11.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment weathers manager class
+// Module : editor_environment_weathers_manager.hpp
+// Created : 04.01.2008
+// Modified : 11.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment weathers manager class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_ENVIRONMENT_WEATHERS_MANAGER_HPP_INCLUDED
@@ -14,65 +14,69 @@
 #include <boost/noncopyable.hpp>
 #include "property_collection_forward.hpp"
 
-namespace editor {
+namespace editor
+{
 
 class property_holder;
 
-namespace environment {
+namespace environment
+{
 
-	class manager;
+class manager;
 
-namespace weathers {
+namespace weathers
+{
 
 class weather;
 
-class manager : private boost::noncopyable {
+class manager : private boost::noncopyable
+{
 public:
-							manager				(environment::manager* manager);
-							~manager			();
-			void			load				();
-			void			save				();
-			void			fill				(::editor::property_holder* property_holder);
-			shared_str		unique_id			(shared_str const& id) const;
-			bool	save_current_blend			(char* buffer, u32 const& buffer_size);
-			bool	paste_current_time_frame	(char const* buffer, u32 const& buffer_size);
-			bool	paste_target_time_frame		(char const* buffer, u32 const& buffer_size);
-			void	reload_current_time_frame	();
-			void	reload_target_time_frame	();
-			void	reload_current_weather		();
-			void	reload						();
-			bool	add_time_frame				(char const* buffer, u32 const& buffer_size);
+    manager(environment::manager* manager);
+    ~manager();
+    void load();
+    void save();
+    void fill(::editor::property_holder* property_holder);
+    shared_str unique_id(shared_str const& id) const;
+    bool save_current_blend(char* buffer, u32 const& buffer_size);
+    bool paste_current_time_frame(char const* buffer, u32 const& buffer_size);
+    bool paste_target_time_frame(char const* buffer, u32 const& buffer_size);
+    void reload_current_time_frame();
+    void reload_target_time_frame();
+    void reload_current_weather();
+    void reload();
+    bool add_time_frame(char const* buffer, u32 const& buffer_size);
 
 public:
-	typedef xr_vector<LPCSTR>					weather_ids_type;
-	typedef xr_vector<LPCSTR>					times_ids_type;
-	typedef xr_vector<weather*>					weather_container_type;
+    typedef xr_vector<LPCSTR> weather_ids_type;
+    typedef xr_vector<LPCSTR> times_ids_type;
+    typedef xr_vector<weather*> weather_container_type;
 
 public:
-	weather_ids_type const& weather_ids			() const;
+    weather_ids_type const& weather_ids() const;
 
 private:
-	typedef editor::property_holder				property_holder_type;
-	typedef property_collection<
-				weather_container_type,
-				manager
-			>									collection_type;
+    typedef editor::property_holder property_holder_type;
+    typedef property_collection <
+    weather_container_type,
+    manager
+    > collection_type;
 
 private:
-	LPCSTR const* xr_stdcall weathers_getter	() const;
-	u32 xr_stdcall weathers_size_getter			() const;
-	LPCSTR const* xr_stdcall frames_getter		(LPCSTR weather_id) const;
-	u32 xr_stdcall frames_size_getter			(LPCSTR weather_id) const;
+    LPCSTR const* xr_stdcall weathers_getter() const;
+    u32 xr_stdcall weathers_size_getter() const;
+    LPCSTR const* xr_stdcall frames_getter(LPCSTR weather_id) const;
+    u32 xr_stdcall frames_size_getter(LPCSTR weather_id) const;
 
 private:
-	weather_container_type						m_weathers;
-	mutable weather_ids_type					m_weather_ids;
-	collection_type*							m_collection;
-	mutable times_ids_type						m_times_ids;
+    weather_container_type m_weathers;
+    mutable weather_ids_type m_weather_ids;
+    collection_type* m_collection;
+    mutable times_ids_type m_times_ids;
 
 public:
-	environment::manager&						m_manager;
-	mutable bool								m_changed;
+    environment::manager& m_manager;
+    mutable bool m_changed;
 }; // class manager
 } // namespace weathers
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_weathers_time.cpp b/src/xrEngine/editor_environment_weathers_time.cpp
index 1049e3ce4c6..8108d3aab69 100644
--- a/src/xrEngine/editor_environment_weathers_time.cpp
+++ b/src/xrEngine/editor_environment_weathers_time.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_weathers_time.cpp
-//	Created 	: 12.01.2008
-//  Modified 	: 12.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment weathers time class
+// Module : editor_environment_weathers_time.cpp
+// Created : 12.01.2008
+// Modified : 12.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment weathers time class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -25,655 +25,656 @@ using editor::environment::weathers::weather;
 
 static inline editor::color create_color(float const& r, float const& g, float const& b)
 {
-	editor::color			result;
-	result.r				= r;
-	result.g				= g;
-	result.b				= b;
-	return					(result);
-}
-
-time::time					(
-		editor::environment::manager* manager,
-		weather const* weather,
-		shared_str const& id
-	) :
-	CEnvDescriptorMixer		(id),
-	m_manager				(*manager),
-	m_weather				(weather),
-	m_property_holder		(0),
-	m_ambient				(""),
-	m_sun					(""),
-	m_thunderbolt_collection("")
-{
-}
-
-time::~time					()
-{
-	if (!Device.editor())
-		return;
-
-	::ide().destroy		(m_property_holder);
-}
-
-void time::load_from		(shared_str const& id, CInifile& config, shared_str const& new_id)
-{
-	m_identifier		= id;
-	load				(config);
-	m_identifier		= new_id;
+    editor::color result;
+    result.r = r;
+    result.g = g;
+    result.b = b;
+    return (result);
+}
+
+time::time(
+    editor::environment::manager* manager,
+    weather const* weather,
+    shared_str const& id
+) :
+    CEnvDescriptorMixer(id),
+    m_manager(*manager),
+    m_weather(weather),
+    m_property_holder(0),
+    m_ambient(""),
+    m_sun(""),
+    m_thunderbolt_collection("")
+{
+}
+
+time::~time()
+{
+    if (!Device.editor())
+        return;
+
+    ::ide().destroy(m_property_holder);
+}
+
+void time::load_from(shared_str const& id, CInifile& config, shared_str const& new_id)
+{
+    m_identifier = id;
+    load(config);
+    m_identifier = new_id;
 }
 
-void time::load				(CInifile& config)
+void time::load(CInifile& config)
 {
-//	Ivector3 tm					={0,0,0};
-//	sscanf						(m_identifier.c_str(),"%d:%d:%d",&tm.x,&tm.y,&tm.z);
-//	R_ASSERT3					((tm.x>=0)&&(tm.x<24)&&(tm.y>=0)&&(tm.y<60)&&(tm.z>=0)&&(tm.z<60),"Incorrect weather time",m_identifier.c_str());
-//	exec_time					= tm.x*3600.f+tm.y*60.f+tm.z;
-//	exec_time_loaded			= exec_time;
+    // Ivector3 tm ={0,0,0};
+    // sscanf (m_identifier.c_str(),"%d:%d:%d",&tm.x,&tm.y,&tm.z);
+    // R_ASSERT3 ((tm.x>=0)&&(tm.x<24)&&(tm.y>=0)&&(tm.y<60)&&(tm.z>=0)&&(tm.z<60),"Incorrect weather time",m_identifier.c_str());
+    // exec_time = tm.x*3600.f+tm.y*60.f+tm.z;
+    // exec_time_loaded = exec_time;
+
+    m_ambient = config.r_string(m_identifier, "ambient");
+    // ambient = config.r_fvector3(m_identifier, "ambient_color");
+    // clouds_texture_name = config.r_string(m_identifier, "clouds_texture");
+    // far_plane = config.r_float(m_identifier, "far_plane");
+    // fog_distance = config.r_float(m_identifier, "fog_distance");
+    // fog_density = config.r_float(m_identifier, "fog_density");
+    // fog_color = config.r_fvector3(m_identifier, "fog_color");
+    // rain_color = config.r_fvector3(m_identifier, "rain_color");
+    // rain_density = config.r_float(m_identifier, "rain_density");
+    // sky_color = config.r_fvector3(m_identifier, "sky_color");
+    // sky_rotation = config.r_float(m_identifier, "sky_rotation");
 
-	m_ambient					= config.r_string(m_identifier, "ambient");
-//	ambient						= config.r_fvector3(m_identifier, "ambient_color");
-//	clouds_texture_name			= config.r_string(m_identifier, "clouds_texture");
-//	far_plane					= config.r_float(m_identifier, 	"far_plane");
-//	fog_distance				= config.r_float(m_identifier, 	"fog_distance");
-//	fog_density					= config.r_float(m_identifier, 	"fog_density");
-//	fog_color					= config.r_fvector3(m_identifier, "fog_color");
-//	rain_color					= config.r_fvector3(m_identifier, "rain_color");
-//	rain_density				= config.r_float(m_identifier,	"rain_density");
-//	sky_color					= config.r_fvector3(m_identifier, "sky_color");
-//	sky_rotation				= config.r_float(m_identifier,	"sky_rotation");
-	
-//	sky_texture_name			= config.r_string(m_identifier, "sky_texture");
-//	string_path					st_env;
-//	strconcat					(sizeof(st_env), st_env, sky_texture_name.c_str(), "#small");
-//	sky_texture_env_name		= st_env;
+    // sky_texture_name = config.r_string(m_identifier, "sky_texture");
+    // string_path st_env;
+    // strconcat (sizeof(st_env), st_env, sky_texture_name.c_str(), "#small");
+    // sky_texture_env_name = st_env;
 
-//	sun_color					= config.r_fvector3(m_identifier, "sun_color");
-//	m_fSunShaftsIntensity		= config.r_float(m_identifier,	"sun_shafts_intensity");
-	m_sun						= config.r_string(m_identifier, "sun");
-	m_thunderbolt_collection	= config.r_string(m_identifier, "thunderbolt_collection");
-//	bolt_duration				= config.r_float(m_identifier, 	"bolt_duration");
-//	bolt_period					= config.r_float(m_identifier, 	"bolt_period");
-//	m_fWaterIntensity			= config.r_float(m_identifier, 	"water_intensity");
-//	wind_direction				= config.r_float(m_identifier, 	"wind_direction");
-//	wind_velocity				= config.r_float(m_identifier, 	"wind_velocity");
+    // sun_color = config.r_fvector3(m_identifier, "sun_color");
+    // m_fSunShaftsIntensity = config.r_float(m_identifier, "sun_shafts_intensity");
+    m_sun = config.r_string(m_identifier, "sun");
+    m_thunderbolt_collection = config.r_string(m_identifier, "thunderbolt_collection");
+    // bolt_duration = config.r_float(m_identifier, "bolt_duration");
+    // bolt_period = config.r_float(m_identifier, "bolt_period");
+    // m_fWaterIntensity = config.r_float(m_identifier, "water_intensity");
+    // wind_direction = config.r_float(m_identifier, "wind_direction");
+    // wind_velocity = config.r_float(m_identifier, "wind_velocity");
 
-//	hemi_color					= config.r_fvector4(m_identifier, "hemi_color");
+    // hemi_color = config.r_fvector4(m_identifier, "hemi_color");
 
-//	Fvector2					coords = config.r_fvector2(m_identifier, "sun_dir");
-//	sun_dir.setHP				(deg2rad(coords.y), deg2rad(coords.x));
+    // Fvector2 coords = config.r_fvector2(m_identifier, "sun_dir");
+    // sun_dir.setHP (deg2rad(coords.y), deg2rad(coords.x));
 
-//	clouds_color				= config.r_fvector4(m_identifier, "clouds_color");
+    // clouds_color = config.r_fvector4(m_identifier, "clouds_color");
 
-//	LPCSTR						clouds = config.r_string(m_identifier, "clouds_color");
-//	VERIFY						(_GetItemCount(clouds) == 5);
-//	string256					temp;
-//	((Fvector&)clouds_color).mul(.5f*(float)atof(_GetItem(clouds,4,temp)));
+    // LPCSTR clouds = config.r_string(m_identifier, "clouds_color");
+    // VERIFY (_GetItemCount(clouds) == 5);
+    // string256 temp;
+    // ((Fvector&)clouds_color).mul(.5f*(float)atof(_GetItem(clouds,4,temp)));
 
-//	on_device_create			();
-	inherited::load				(m_manager, config);
+    // on_device_create ();
+    inherited::load(m_manager, config);
 }
 
-void time::save				(CInifile& config)
+void time::save(CInifile& config)
 {
-	config.w_string				(m_identifier.c_str(),"ambient", m_ambient.c_str());
-	config.w_fvector3			(m_identifier.c_str(),"ambient_color", ambient);
-	config.w_string				(m_identifier.c_str(),"clouds_texture", clouds_texture_name.c_str());
-	config.w_float				(m_identifier.c_str(),"far_plane", far_plane);
-	config.w_float				(m_identifier.c_str(),"fog_distance", fog_distance);
-	config.w_float				(m_identifier.c_str(),"fog_density", fog_density);
-	config.w_fvector3			(m_identifier.c_str(),"fog_color", fog_color);
-	config.w_fvector3			(m_identifier.c_str(),"rain_color", rain_color);
-	config.w_float				(m_identifier.c_str(),"rain_density", rain_density);
-	config.w_fvector3			(m_identifier.c_str(),"sky_color", sky_color);
-	config.w_float				(m_identifier.c_str(),"sky_rotation", rad2deg(sky_rotation));
-	config.w_string				(m_identifier.c_str(),"sky_texture", sky_texture_name.c_str());
-	config.w_fvector3			(m_identifier.c_str(),"sun_color", sun_color);
-	config.w_float				(m_identifier.c_str(),"sun_shafts_intensity", m_fSunShaftsIntensity);
-	config.w_string				(m_identifier.c_str(),"sun", m_sun.c_str());
-	config.w_string				(m_identifier.c_str(),"thunderbolt_collection", m_thunderbolt_collection.c_str());
-	config.w_float				(m_identifier.c_str(),"thunderbolt_duration", bolt_duration);
-	config.w_float				(m_identifier.c_str(),"thunderbolt_period", bolt_period);
-	config.w_float				(m_identifier.c_str(),"water_intensity", m_fWaterIntensity);
-	config.w_float				(m_identifier.c_str(),"wind_direction", rad2deg(wind_direction));
-	config.w_float				(m_identifier.c_str(),"wind_velocity", wind_velocity);
-	config.w_fvector4			(m_identifier.c_str(),"hemisphere_color", hemi_color);
-	config.w_float				(m_identifier.c_str(),"sun_altitude", rad2deg(sun_dir.getH()));
-	config.w_float				(m_identifier.c_str(),"sun_longitude", rad2deg(sun_dir.getP()));
-	config.w_fvector4			(m_identifier.c_str(),"clouds_color", clouds_color);
+    config.w_string(m_identifier.c_str(), "ambient", m_ambient.c_str());
+    config.w_fvector3(m_identifier.c_str(), "ambient_color", ambient);
+    config.w_string(m_identifier.c_str(), "clouds_texture", clouds_texture_name.c_str());
+    config.w_float(m_identifier.c_str(), "far_plane", far_plane);
+    config.w_float(m_identifier.c_str(), "fog_distance", fog_distance);
+    config.w_float(m_identifier.c_str(), "fog_density", fog_density);
+    config.w_fvector3(m_identifier.c_str(), "fog_color", fog_color);
+    config.w_fvector3(m_identifier.c_str(), "rain_color", rain_color);
+    config.w_float(m_identifier.c_str(), "rain_density", rain_density);
+    config.w_fvector3(m_identifier.c_str(), "sky_color", sky_color);
+    config.w_float(m_identifier.c_str(), "sky_rotation", rad2deg(sky_rotation));
+    config.w_string(m_identifier.c_str(), "sky_texture", sky_texture_name.c_str());
+    config.w_fvector3(m_identifier.c_str(), "sun_color", sun_color);
+    config.w_float(m_identifier.c_str(), "sun_shafts_intensity", m_fSunShaftsIntensity);
+    config.w_string(m_identifier.c_str(), "sun", m_sun.c_str());
+    config.w_string(m_identifier.c_str(), "thunderbolt_collection", m_thunderbolt_collection.c_str());
+    config.w_float(m_identifier.c_str(), "thunderbolt_duration", bolt_duration);
+    config.w_float(m_identifier.c_str(), "thunderbolt_period", bolt_period);
+    config.w_float(m_identifier.c_str(), "water_intensity", m_fWaterIntensity);
+    config.w_float(m_identifier.c_str(), "wind_direction", rad2deg(wind_direction));
+    config.w_float(m_identifier.c_str(), "wind_velocity", wind_velocity);
+    config.w_fvector4(m_identifier.c_str(), "hemisphere_color", hemi_color);
+    config.w_float(m_identifier.c_str(), "sun_altitude", rad2deg(sun_dir.getH()));
+    config.w_float(m_identifier.c_str(), "sun_longitude", rad2deg(sun_dir.getP()));
+    config.w_fvector4(m_identifier.c_str(), "clouds_color", clouds_color);
 }
 
-LPCSTR time::id_getter		() const
+LPCSTR time::id_getter() const
 {
-	return						(m_identifier.c_str());
+    return (m_identifier.c_str());
 }
 
-void time::id_setter		(LPCSTR value_)
+void time::id_setter(LPCSTR value_)
 {
-	shared_str					value = value_;
-	if (m_identifier._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (m_identifier._get() == value._get())
+        return;
 
-	if (m_weather)
-		m_identifier			= m_weather->unique_id(m_identifier, value);
-	else
-		m_identifier			= value;
+    if (m_weather)
+        m_identifier = m_weather->unique_id(m_identifier, value);
+    else
+        m_identifier = value;
 }
 
-LPCSTR const* time::ambients_collection		()
+LPCSTR const* time::ambients_collection()
 {
-	return				(&*m_manager.ambients().ambients_ids().begin());
+    return (&*m_manager.ambients().ambients_ids().begin());
 }
 
-u32 time::ambients_collection_size			()
+u32 time::ambients_collection_size()
 {
-	return				(m_manager.ambients().ambients_ids().size());
+    return (m_manager.ambients().ambients_ids().size());
 }
 
-LPCSTR const* time::suns_collection			()
+LPCSTR const* time::suns_collection()
 {
-	return				(&*m_manager.suns().suns_ids().begin());
+    return (&*m_manager.suns().suns_ids().begin());
 }
 
-u32 time::suns_collection_size				()
+u32 time::suns_collection_size()
 {
-	return				(m_manager.suns().suns_ids().size());
+    return (m_manager.suns().suns_ids().size());
 }
 
-LPCSTR const* time::thunderbolts_collection	()
+LPCSTR const* time::thunderbolts_collection()
 {
-	return				(&*m_manager.thunderbolts().collections_ids().begin());
+    return (&*m_manager.thunderbolts().collections_ids().begin());
 }
 
-u32 time::thunderbolts_collection_size		()
+u32 time::thunderbolts_collection_size()
 {
-	return				(m_manager.thunderbolts().collections_ids().size());
+    return (m_manager.thunderbolts().collections_ids().size());
 }
 
-float time::sun_altitude_getter				() const
+float time::sun_altitude_getter() const
 {
-	float				y, x;
-	sun_dir.getHP		(y, x);
-	return				(rad2deg(y));
+    float y, x;
+    sun_dir.getHP(y, x);
+    return (rad2deg(y));
 }
 
-void time::sun_altitude_setter				(float value)
+void time::sun_altitude_setter(float value)
 {
-	float				y, x;
-	sun_dir.getHP		(y, x);
-	sun_dir.setHP		(deg2rad(value), x);
+    float y, x;
+    sun_dir.getHP(y, x);
+    sun_dir.setHP(deg2rad(value), x);
 }
 
-float time::sun_longitude_getter			() const
+float time::sun_longitude_getter() const
 {
-	float				y, x;
-	sun_dir.getHP		(y, x);
-	return				(rad2deg(x));
+    float y, x;
+    sun_dir.getHP(y, x);
+    return (rad2deg(x));
 }
 
-void time::sun_longitude_setter				(float value)
+void time::sun_longitude_setter(float value)
 {
-	float				y, x;
-	sun_dir.getHP		(y, x);
-	sun_dir.setHP		(y, deg2rad(value));
+    float y, x;
+    sun_dir.getHP(y, x);
+    sun_dir.setHP(y, deg2rad(value));
 }
 
-LPCSTR time::ambient_getter					() const
+LPCSTR time::ambient_getter() const
 {
-	return				(m_ambient.c_str());
+    return (m_ambient.c_str());
 }
 
-void time::ambient_setter					(LPCSTR value)
+void time::ambient_setter(LPCSTR value)
 {
-	if (m_ambient._get() == shared_str(value)._get())
-		return;
+    if (m_ambient._get() == shared_str(value)._get())
+        return;
 
-	m_ambient			= value;
-	env_ambient			= m_manager.AppendEnvAmb(value);
+    m_ambient = value;
+    env_ambient = m_manager.AppendEnvAmb(value);
 }
 
-LPCSTR time::sun_getter					() const
+LPCSTR time::sun_getter() const
 {
-	return				(m_sun.c_str());
+    return (m_sun.c_str());
 }
 
-void time::sun_setter					(LPCSTR value)
+void time::sun_setter(LPCSTR value)
 {
-	if (m_sun._get() == shared_str(value)._get())
-		return;
+    if (m_sun._get() == shared_str(value)._get())
+        return;
 
-	m_sun			= value;
-	lens_flare_id		= m_manager.eff_LensFlare->AppendDef(m_manager, m_manager.m_suns_config, value);
+    m_sun = value;
+    lens_flare_id = m_manager.eff_LensFlare->AppendDef(m_manager, m_manager.m_suns_config, value);
 }
 
-LPCSTR time::thunderbolt_getter				() const
+LPCSTR time::thunderbolt_getter() const
 {
-	return				(m_thunderbolt_collection.c_str());
+    return (m_thunderbolt_collection.c_str());
 }
 
-void time::thunderbolt_setter				(LPCSTR value)
+void time::thunderbolt_setter(LPCSTR value)
 {
-	if (m_thunderbolt_collection._get() == shared_str(value)._get())
-		return;
+    if (m_thunderbolt_collection._get() == shared_str(value)._get())
+        return;
 
-	m_thunderbolt_collection	= value;
-	tb_id				= m_manager.eff_Thunderbolt->AppendDef(m_manager, m_manager.m_thunderbolt_collections_config, m_manager.m_thunderbolts_config, value);
+    m_thunderbolt_collection = value;
+    tb_id = m_manager.eff_Thunderbolt->AppendDef(m_manager, m_manager.m_thunderbolt_collections_config, m_manager.m_thunderbolts_config, value);
 }
 
-LPCSTR time::sky_texture_getter				() const
+LPCSTR time::sky_texture_getter() const
 {
-	return				(sky_texture_name.c_str());
+    return (sky_texture_name.c_str());
 }
 
-void time::sky_texture_setter				(LPCSTR value)
+void time::sky_texture_setter(LPCSTR value)
 {
-	if (sky_texture_name._get() == shared_str(value)._get())
-		return;
+    if (sky_texture_name._get() == shared_str(value)._get())
+        return;
 
-	sky_texture_name	= value;
+    sky_texture_name = value;
 
-	string_path			st_env;
-	strconcat			(sizeof(st_env), st_env, value, "#small");
-	sky_texture_env_name= st_env;
-	m_pDescriptor->OnDeviceCreate(*this);
+    string_path st_env;
+    strconcat(sizeof(st_env), st_env, value, "#small");
+    sky_texture_env_name = st_env;
+    m_pDescriptor->OnDeviceCreate(*this);
 }
 
-LPCSTR time::clouds_texture_getter			() const
+LPCSTR time::clouds_texture_getter() const
 {
-	return				(clouds_texture_name.c_str());
+    return (clouds_texture_name.c_str());
 }
 
-void time::clouds_texture_setter			(LPCSTR value)
+void time::clouds_texture_setter(LPCSTR value)
 {
-	if (clouds_texture_name._get() == shared_str(value)._get())
-		return;
+    if (clouds_texture_name._get() == shared_str(value)._get())
+        return;
 
-	clouds_texture_name	= value;
-	m_pDescriptor->OnDeviceCreate(*this);
+    clouds_texture_name = value;
+    m_pDescriptor->OnDeviceCreate(*this);
 }
 
-float time::sky_rotation_getter				() const
+float time::sky_rotation_getter() const
 {
-	return				(rad2deg(sky_rotation));
+    return (rad2deg(sky_rotation));
 }
 
-void time::sky_rotation_setter				(float value)
+void time::sky_rotation_setter(float value)
 {
-	sky_rotation		= deg2rad(value);
+    sky_rotation = deg2rad(value);
 }
 
-float time::wind_direction_getter			() const
+float time::wind_direction_getter() const
 {
-	return				(rad2deg(wind_direction));
+    return (rad2deg(wind_direction));
 }
 
-void time::wind_direction_setter			(float value)
+void time::wind_direction_setter(float value)
 {
-	wind_direction		= deg2rad(value);
+    wind_direction = deg2rad(value);
 }
 
-void time::fill				(editor::property_holder_collection* collection)
+void time::fill(editor::property_holder_collection* collection)
 {
-	VERIFY							(!m_property_holder);
-	m_property_holder				= ::ide().create_property_holder(m_identifier.c_str(), collection, this);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_identifier.c_str(), collection, this);
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &time::id_getter);
 
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type				string_getter;
-	string_getter.bind				(this, &time::id_getter);
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &time::id_setter);
 
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type				string_setter;
-	string_setter.bind				(this, &time::id_setter);
+    m_property_holder->add_property(
+        "id",
+        "properties",
+        "this option is resposible for time interval",
+        m_identifier.c_str(),
+        string_getter,
+        string_setter
+    );
 
-	m_property_holder->add_property	(
-		"id",
-		"properties",
-		"this option is resposible for time interval",
-		m_identifier.c_str(),
-		string_getter,
-		string_setter
-	);
-	
-	m_property_holder->add_property	(
-		"color",
-		"sun",
-		"this option is resposible for sun color",
-		(editor::color const&)sun_color,
-		(editor::color&)sun_color
-	);
-	m_property_holder->add_property	(
-		"shafts intensity",
-		"sun",
-		"this option is resposible for sun shafts intensity",
-		m_fSunShaftsIntensity,
-		m_fSunShaftsIntensity,
-		0.f,
-		1.f
-	);
+    m_property_holder->add_property(
+        "color",
+        "sun",
+        "this option is resposible for sun color",
+        (editor::color const&)sun_color,
+        (editor::color&)sun_color
+    );
+    m_property_holder->add_property(
+        "shafts intensity",
+        "sun",
+        "this option is resposible for sun shafts intensity",
+        m_fSunShaftsIntensity,
+        m_fSunShaftsIntensity,
+        0.f,
+        1.f
+    );
 
-	typedef editor::property_holder::float_getter_type	float_getter_type;
-	float_getter_type				sun_altitude_getter;
-	sun_altitude_getter.bind		(this, &time::sun_altitude_getter);
+    typedef editor::property_holder::float_getter_type float_getter_type;
+    float_getter_type sun_altitude_getter;
+    sun_altitude_getter.bind(this, &time::sun_altitude_getter);
 
-	typedef editor::property_holder::float_setter_type	float_setter_type;
-	float_setter_type				sun_altitude_setter;
-	sun_altitude_setter.bind		(this, &time::sun_altitude_setter);
+    typedef editor::property_holder::float_setter_type float_setter_type;
+    float_setter_type sun_altitude_setter;
+    sun_altitude_setter.bind(this, &time::sun_altitude_setter);
 
-	m_property_holder->add_property	(
-		"altitude",
-		"sun",
-		"this option is resposible for sun altitude (in degrees)",
-		sun_altitude_getter(),
-		sun_altitude_getter,
-		sun_altitude_setter,
-		-360.f,
-		 360.f
-	);
-
-	float_getter_type				sun_longitude_getter;
-	sun_longitude_getter.bind		(this, &time::sun_longitude_getter);
-
-	float_setter_type				sun_longitude_setter;
-	sun_longitude_setter.bind		(this, &time::sun_longitude_setter);
-
-	m_property_holder->add_property	(
-		"longitude",
-		"sun",
-		"this option is resposible for sun longitude (in degrees)",
-		sun_longitude_getter(),
-		sun_longitude_getter,
-		sun_longitude_setter,
-		-360.f,
-		 360.f
-	);
-
-	typedef editor::property_holder::string_collection_getter_type	collection_getter_type;
-	collection_getter_type			collection_getter;
-
-	typedef editor::property_holder::string_collection_size_getter_type	collection_size_getter_type;
-	collection_size_getter_type		collection_size_getter;
-
-	collection_getter.bind			(this, &time::suns_collection);
-	collection_size_getter.bind		(this, &time::suns_collection_size);
-	m_property_holder->add_property	(
-		"sun",
-		"sun",
-		"this option is resposible for ambient",
-		m_sun.c_str(),
-		m_sun,
-		collection_getter,
-		collection_size_getter,
-		editor::property_holder::value_editor_combo_box,
-		editor::property_holder::cannot_enter_text
-	);
-
-	string_getter_type		sky_texture_getter;
-	sky_texture_getter.bind	(this, &time::sky_texture_getter);
-
-	string_setter_type		sky_texture_setter;
-	sky_texture_setter.bind	(this, &time::sky_texture_setter);
-
-	m_property_holder->add_property	(
-		"texture",
-		"hemisphere",
-		"this option is resposible for sky texture",
-		sky_texture_name.c_str(),
-		sky_texture_getter,
-		sky_texture_setter,
-		".dds",
-		"Texture files (*.dds)|*.dds",
-		detail::real_path("$game_textures$", "").c_str(),
-		"Select texture...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
-
-	m_property_holder->add_property	(
-		"sky color",
-		"hemisphere",
-		"this option is resposible for sky color",
-		(editor::color const&)sky_color,
-		(editor::color&)sky_color
-	);
-
-	m_property_holder->add_property	(
-		"hemi color",
-		"hemisphere",
-		"this option is resposible for hemisphere color",
-		(editor::color const&)hemi_color,
-		(editor::color&)hemi_color
-	);
-
-	typedef ::editor::property_holder::float_getter_type	float_getter_type;
-	float_getter_type				float_getter;
-
-	typedef ::editor::property_holder::float_setter_type	float_setter_type;
-	float_setter_type				float_setter;
-
-	float_getter.bind				(this, &time::sky_rotation_getter);
-	float_setter.bind				(this, &time::sky_rotation_setter);
-	m_property_holder->add_property	(
-		"sky rotation",
-		"hemisphere",
-		"this option is resposible for sky rotation",
-		sky_rotation,
-		float_getter,
-		float_setter,
-		-360.0f,
-		 360.f
-	);
-
-	string_getter.bind				(this, &time::clouds_texture_getter);
-	string_setter.bind				(this, &time::clouds_texture_setter);
-	m_property_holder->add_property	(
-		"texture",
-		"clouds",
-		"this option is resposible for clouds texture",
-		clouds_texture_name.c_str(),
-		string_getter,
-		string_setter,
-		".dds",
-		"Texture files (*.dds)|*.dds",
-		detail::real_path("$game_textures$", "").c_str(),
-		"Select texture...",
-		editor::property_holder::cannot_enter_text,
-		editor::property_holder::remove_extension
-	);
-
-	m_property_holder->add_property	(
-		"color",
-		"clouds",
-		"this option is resposible for clouds color",
-		(editor::color const&)clouds_color,
-		(editor::color&)clouds_color
-	);
-
-	m_property_holder->add_property	(
-		"transparency",
-		"clouds",
-		"this option is resposible for clouds transparency",
-		clouds_color.w,
-		clouds_color.w,
-		0.f,
-		1.f
-	);
-
-	m_property_holder->add_property	(
-		"color",
-		"ambient",
-		"this option is resposible for ambient color",
-		(editor::color const&)ambient,
-		(editor::color&)ambient
-	);
-
-	collection_getter.bind			(this, &time::ambients_collection);
-	collection_size_getter.bind		(this, &time::ambients_collection_size);
-
-	string_getter.bind				(this, &time::ambient_getter);
-	string_setter.bind				(this, &time::ambient_setter);
-	m_property_holder->add_property	(
-		"ambient",
-		"ambient",
-		"this option is resposible for ambient",
-		m_ambient.c_str(),
-		string_getter,
-		string_setter,
-		collection_getter,
-		collection_size_getter,
-		editor::property_holder::value_editor_combo_box,
-		editor::property_holder::cannot_enter_text
-	);
-
-	m_property_holder->add_property	(
-		"color",
-		"fog",
-		"this option is resposible for fog density (0..1)",
-		(editor::color const&)fog_color,
-		(editor::color&)fog_color
-	);
-	m_property_holder->add_property	(
-		"far plane",
-		"fog",
-		"this option is resposible for far plane",
-		far_plane,
-		far_plane
-	);
-	m_property_holder->add_property	(
-		"distance",
-		"fog",
-		"this option is resposible for fog distance (shoudl be less than far plane)",
-		fog_distance,
-		fog_distance
-	);
-	m_property_holder->add_property	(
-		"density",
-		"fog",
-		"this option is resposible for fog density (0..1)",
-		fog_density,
-		fog_density,
-		0.f,
-		1.f
-	);
-	m_property_holder->add_property	(
-		"water intensity",
-		"fog",
-		"this option is resposible for water intensity (0..1)",
-		m_fWaterIntensity,
-		m_fWaterIntensity,
-		0.f,
-		1.f
-	);
-
-	m_property_holder->add_property	(
-		"rain color",
-		"rain",
-		"this option is resposible for rain color",
-		(editor::color const&)rain_color,
-		(editor::color&)rain_color
-	);
-	m_property_holder->add_property	(
-		"rain density",
-		"rain",
-		"this option is resposible for rain density (0..1)",
-		rain_density,
-		rain_density,
-		0.f,
-		1.f
-	);
-
-	collection_getter.bind			(this, &time::thunderbolts_collection);
-	collection_size_getter.bind		(this, &time::thunderbolts_collection_size);
-	m_property_holder->add_property	(
-		"collection",
-		"thunderbolts",
-		"this option is resposible for ambient",
-		m_thunderbolt_collection.c_str(),
-		m_thunderbolt_collection,
-		collection_getter,
-		collection_size_getter,
-		editor::property_holder::value_editor_combo_box,
-		editor::property_holder::cannot_enter_text
-	);
-
-	m_property_holder->add_property	(
-		"duration",
-		"thunderbolts",
-		"this option is resposible for thunderbolt duration",
-		bolt_duration,
-		bolt_duration
-	);
-	m_property_holder->add_property	(
-		"period",
-		"thunderbolts",
-		"this option is resposible for thunderbolt period",
-		bolt_period,
-		bolt_period
-	);
-	
-	float_getter.bind				(this, &time::wind_direction_getter);
-	float_setter.bind				(this, &time::wind_direction_setter);
-	m_property_holder->add_property	(
-		"direction",
-		"wind",
-		"this option is resposible for wind direction (in degrees)",
-		wind_direction,
-		float_getter,
-		float_setter,
-		-360.f,
-		 360.f
-	);
-	m_property_holder->add_property	(
-		"velocity",
-		"wind",
-		"this option is resposible for wind velocity (meters per second)",
-		wind_velocity,
-		wind_velocity,
-		0.f,
-		1000.f
-	);
-}
-
-void time::lerp	(CEnvironment* parent, CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& M, float m_power)
-{
-	float					start_time = m_manager.Current[0]->exec_time;
-	float					stop_time = m_manager.Current[1]->exec_time;
-	float					current_time = m_manager.GetGameTime();
-	if (start_time >= stop_time) {
-		if (current_time >= start_time)
-			clamp			(current_time, start_time, 24.f*60.f*60.f);
-		else
-			clamp			(current_time, 0.f, stop_time);
-
-		if (current_time <= stop_time)
-			current_time	+= 24.f*60.f*60.f;
-
-		stop_time			+= 24.f*60.f*60.f;
-	}
-	else
-		clamp				(current_time, start_time, stop_time);
-
-	VERIFY					(start_time < stop_time);
-	
-	u32						current_time_u32 = iFloor(current_time);
-	current_time_u32		= current_time_u32%(24*60*60);
-
-	u32						hours = current_time_u32/(60*60);
-	current_time_u32		%= (60*60);
-
-	u32						minutes = current_time_u32/60;
-	u32						seconds = current_time_u32%60;
-
-	string16				temp;
-	xr_sprintf				(temp, "%02d:%02d:%02d", hours, minutes, seconds);
-	m_identifier			= temp;
-
-	time&					a = static_cast<time&>(A);
-	m_ambient				= a.m_ambient;
-	clouds_texture_name		= a.clouds_texture_name;
-	sky_texture_name		= a.sky_texture_name;
-	m_sun					= a.m_sun;
-	m_thunderbolt_collection= a.m_thunderbolt_collection;
-
-	inherited::lerp			(parent, A, B, f, M, m_power);
+    m_property_holder->add_property(
+        "altitude",
+        "sun",
+        "this option is resposible for sun altitude (in degrees)",
+        sun_altitude_getter(),
+        sun_altitude_getter,
+        sun_altitude_setter,
+        -360.f,
+        360.f
+    );
+
+    float_getter_type sun_longitude_getter;
+    sun_longitude_getter.bind(this, &time::sun_longitude_getter);
+
+    float_setter_type sun_longitude_setter;
+    sun_longitude_setter.bind(this, &time::sun_longitude_setter);
+
+    m_property_holder->add_property(
+        "longitude",
+        "sun",
+        "this option is resposible for sun longitude (in degrees)",
+        sun_longitude_getter(),
+        sun_longitude_getter,
+        sun_longitude_setter,
+        -360.f,
+        360.f
+    );
+
+    typedef editor::property_holder::string_collection_getter_type collection_getter_type;
+    collection_getter_type collection_getter;
+
+    typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type;
+    collection_size_getter_type collection_size_getter;
+
+    collection_getter.bind(this, &time::suns_collection);
+    collection_size_getter.bind(this, &time::suns_collection_size);
+    m_property_holder->add_property(
+        "sun",
+        "sun",
+        "this option is resposible for ambient",
+        m_sun.c_str(),
+        m_sun,
+        collection_getter,
+        collection_size_getter,
+        editor::property_holder::value_editor_combo_box,
+        editor::property_holder::cannot_enter_text
+    );
+
+    string_getter_type sky_texture_getter;
+    sky_texture_getter.bind(this, &time::sky_texture_getter);
+
+    string_setter_type sky_texture_setter;
+    sky_texture_setter.bind(this, &time::sky_texture_setter);
+
+    m_property_holder->add_property(
+        "texture",
+        "hemisphere",
+        "this option is resposible for sky texture",
+        sky_texture_name.c_str(),
+        sky_texture_getter,
+        sky_texture_setter,
+        ".dds",
+        "Texture files (*.dds)|*.dds",
+        detail::real_path("$game_textures$", "").c_str(),
+        "Select texture...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
+
+    m_property_holder->add_property(
+        "sky color",
+        "hemisphere",
+        "this option is resposible for sky color",
+        (editor::color const&)sky_color,
+        (editor::color&)sky_color
+    );
+
+    m_property_holder->add_property(
+        "hemi color",
+        "hemisphere",
+        "this option is resposible for hemisphere color",
+        (editor::color const&)hemi_color,
+        (editor::color&)hemi_color
+    );
+
+    typedef ::editor::property_holder::float_getter_type float_getter_type;
+    float_getter_type float_getter;
+
+    typedef ::editor::property_holder::float_setter_type float_setter_type;
+    float_setter_type float_setter;
+
+    float_getter.bind(this, &time::sky_rotation_getter);
+    float_setter.bind(this, &time::sky_rotation_setter);
+    m_property_holder->add_property(
+        "sky rotation",
+        "hemisphere",
+        "this option is resposible for sky rotation",
+        sky_rotation,
+        float_getter,
+        float_setter,
+        -360.0f,
+        360.f
+    );
+
+    string_getter.bind(this, &time::clouds_texture_getter);
+    string_setter.bind(this, &time::clouds_texture_setter);
+    m_property_holder->add_property(
+        "texture",
+        "clouds",
+        "this option is resposible for clouds texture",
+        clouds_texture_name.c_str(),
+        string_getter,
+        string_setter,
+        ".dds",
+        "Texture files (*.dds)|*.dds",
+        detail::real_path("$game_textures$", "").c_str(),
+        "Select texture...",
+        editor::property_holder::cannot_enter_text,
+        editor::property_holder::remove_extension
+    );
+
+    m_property_holder->add_property(
+        "color",
+        "clouds",
+        "this option is resposible for clouds color",
+        (editor::color const&)clouds_color,
+        (editor::color&)clouds_color
+    );
+
+    m_property_holder->add_property(
+        "transparency",
+        "clouds",
+        "this option is resposible for clouds transparency",
+        clouds_color.w,
+        clouds_color.w,
+        0.f,
+        1.f
+    );
+
+    m_property_holder->add_property(
+        "color",
+        "ambient",
+        "this option is resposible for ambient color",
+        (editor::color const&)ambient,
+        (editor::color&)ambient
+    );
+
+    collection_getter.bind(this, &time::ambients_collection);
+    collection_size_getter.bind(this, &time::ambients_collection_size);
+
+    string_getter.bind(this, &time::ambient_getter);
+    string_setter.bind(this, &time::ambient_setter);
+    m_property_holder->add_property(
+        "ambient",
+        "ambient",
+        "this option is resposible for ambient",
+        m_ambient.c_str(),
+        string_getter,
+        string_setter,
+        collection_getter,
+        collection_size_getter,
+        editor::property_holder::value_editor_combo_box,
+        editor::property_holder::cannot_enter_text
+    );
+
+    m_property_holder->add_property(
+        "color",
+        "fog",
+        "this option is resposible for fog density (0..1)",
+        (editor::color const&)fog_color,
+        (editor::color&)fog_color
+    );
+    m_property_holder->add_property(
+        "far plane",
+        "fog",
+        "this option is resposible for far plane",
+        far_plane,
+        far_plane
+    );
+    m_property_holder->add_property(
+        "distance",
+        "fog",
+        "this option is resposible for fog distance (shoudl be less than far plane)",
+        fog_distance,
+        fog_distance
+    );
+    m_property_holder->add_property(
+        "density",
+        "fog",
+        "this option is resposible for fog density (0..1)",
+        fog_density,
+        fog_density,
+        0.f,
+        1.f
+    );
+    m_property_holder->add_property(
+        "water intensity",
+        "fog",
+        "this option is resposible for water intensity (0..1)",
+        m_fWaterIntensity,
+        m_fWaterIntensity,
+        0.f,
+        1.f
+    );
+
+    m_property_holder->add_property(
+        "rain color",
+        "rain",
+        "this option is resposible for rain color",
+        (editor::color const&)rain_color,
+        (editor::color&)rain_color
+    );
+    m_property_holder->add_property(
+        "rain density",
+        "rain",
+        "this option is resposible for rain density (0..1)",
+        rain_density,
+        rain_density,
+        0.f,
+        1.f
+    );
+
+    collection_getter.bind(this, &time::thunderbolts_collection);
+    collection_size_getter.bind(this, &time::thunderbolts_collection_size);
+    m_property_holder->add_property(
+        "collection",
+        "thunderbolts",
+        "this option is resposible for ambient",
+        m_thunderbolt_collection.c_str(),
+        m_thunderbolt_collection,
+        collection_getter,
+        collection_size_getter,
+        editor::property_holder::value_editor_combo_box,
+        editor::property_holder::cannot_enter_text
+    );
+
+    m_property_holder->add_property(
+        "duration",
+        "thunderbolts",
+        "this option is resposible for thunderbolt duration",
+        bolt_duration,
+        bolt_duration
+    );
+    m_property_holder->add_property(
+        "period",
+        "thunderbolts",
+        "this option is resposible for thunderbolt period",
+        bolt_period,
+        bolt_period
+    );
+
+    float_getter.bind(this, &time::wind_direction_getter);
+    float_setter.bind(this, &time::wind_direction_setter);
+    m_property_holder->add_property(
+        "direction",
+        "wind",
+        "this option is resposible for wind direction (in degrees)",
+        wind_direction,
+        float_getter,
+        float_setter,
+        -360.f,
+        360.f
+    );
+    m_property_holder->add_property(
+        "velocity",
+        "wind",
+        "this option is resposible for wind velocity (meters per second)",
+        wind_velocity,
+        wind_velocity,
+        0.f,
+        1000.f
+    );
+}
+
+void time::lerp(CEnvironment* parent, CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& M, float m_power)
+{
+    float start_time = m_manager.Current[0]->exec_time;
+    float stop_time = m_manager.Current[1]->exec_time;
+    float current_time = m_manager.GetGameTime();
+    if (start_time >= stop_time)
+    {
+        if (current_time >= start_time)
+            clamp(current_time, start_time, 24.f*60.f*60.f);
+        else
+            clamp(current_time, 0.f, stop_time);
+
+        if (current_time <= stop_time)
+            current_time += 24.f*60.f*60.f;
+
+        stop_time += 24.f*60.f*60.f;
+    }
+    else
+        clamp(current_time, start_time, stop_time);
+
+    VERIFY(start_time < stop_time);
+
+    u32 current_time_u32 = iFloor(current_time);
+    current_time_u32 = current_time_u32 % (24 * 60 * 60);
+
+    u32 hours = current_time_u32 / (60 * 60);
+    current_time_u32 %= (60 * 60);
+
+    u32 minutes = current_time_u32 / 60;
+    u32 seconds = current_time_u32 % 60;
+
+    string16 temp;
+    xr_sprintf(temp, "%02d:%02d:%02d", hours, minutes, seconds);
+    m_identifier = temp;
+
+    time& a = static_cast<time&>(A);
+    m_ambient = a.m_ambient;
+    clouds_texture_name = a.clouds_texture_name;
+    sky_texture_name = a.sky_texture_name;
+    m_sun = a.m_sun;
+    m_thunderbolt_collection = a.m_thunderbolt_collection;
+
+    inherited::lerp(parent, A, B, f, M, m_power);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_weathers_time.hpp b/src/xrEngine/editor_environment_weathers_time.hpp
index 7b9f1daaf47..89ff974e5fa 100644
--- a/src/xrEngine/editor_environment_weathers_time.hpp
+++ b/src/xrEngine/editor_environment_weathers_time.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_weathers_time.hpp
-//	Created 	: 12.01.2008
-//  Modified 	: 12.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment weathers time class
+// Module : editor_environment_weathers_time.hpp
+// Created : 12.01.2008
+// Modified : 12.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment weathers time class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_ENVIRONMENT_WEATHERS_TIME_HPP_INCLUDED
@@ -15,80 +15,83 @@
 #include "../include/editor/property_holder.hpp"
 #include "environment.h"
 
-namespace editor {
-namespace environment {
+namespace editor
+{
+namespace environment
+{
 
 class manager;
 
-namespace weathers {
+namespace weathers
+{
 
 class weather;
 
 class time :
-	public CEnvDescriptorMixer,
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public CEnvDescriptorMixer,
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 private:
-	typedef CEnvDescriptorMixer			inherited;
+    typedef CEnvDescriptorMixer inherited;
 
 public:
-	typedef editor::property_holder		property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-										time						(
-											editor::environment::manager* manager,
-											weather const* weather,
-											shared_str const& id
-										);
-	virtual								~time						();
-			void						load						(CInifile& config);
-			void						load_from					(shared_str const& id, CInifile& config, shared_str const& new_id);
-			void						save						(CInifile& config);
-			void						fill						(::editor::property_holder_collection* holder);
-	inline	shared_str const&			id							() const { return m_identifier; }
-	virtual	property_holder_type*		object						() { return m_property_holder; }
-	virtual	void						lerp						(CEnvironment* parent, CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& M, float m_power);
+    time(
+        editor::environment::manager* manager,
+        weather const* weather,
+        shared_str const& id
+    );
+    virtual ~time();
+    void load(CInifile& config);
+    void load_from(shared_str const& id, CInifile& config, shared_str const& new_id);
+    void save(CInifile& config);
+    void fill(::editor::property_holder_collection* holder);
+    inline shared_str const& id() const { return m_identifier; }
+    virtual property_holder_type* object() { return m_property_holder; }
+    virtual void lerp(CEnvironment* parent, CEnvDescriptor& A, CEnvDescriptor& B, float f, CEnvModifier& M, float m_power);
 
 private:
-	LPCSTR const*	xr_stdcall			ambients_collection			();
-	u32				xr_stdcall			ambients_collection_size	();
-	LPCSTR const*	xr_stdcall			suns_collection				();
-	u32				xr_stdcall			suns_collection_size		();
-	LPCSTR const*	xr_stdcall			thunderbolts_collection		();
-	u32				xr_stdcall			thunderbolts_collection_size();
+    LPCSTR const* xr_stdcall ambients_collection();
+    u32 xr_stdcall ambients_collection_size();
+    LPCSTR const* xr_stdcall suns_collection();
+    u32 xr_stdcall suns_collection_size();
+    LPCSTR const* xr_stdcall thunderbolts_collection();
+    u32 xr_stdcall thunderbolts_collection_size();
 
 private:
-	LPCSTR			xr_stdcall			id_getter					() const;
-	void			xr_stdcall			id_setter					(LPCSTR value);
-	float			xr_stdcall			sun_altitude_getter			() const;
-	void			xr_stdcall			sun_altitude_setter			(float value);
-	float			xr_stdcall			sun_longitude_getter		() const;
-	void			xr_stdcall			sun_longitude_setter		(float value);
-	float			xr_stdcall			sky_rotation_getter			() const;
-	void			xr_stdcall			sky_rotation_setter			(float value);
-	float			xr_stdcall			wind_direction_getter		() const;
-	void			xr_stdcall			wind_direction_setter		(float value);
-	LPCSTR			xr_stdcall			ambient_getter				() const;
-	void			xr_stdcall			ambient_setter				(LPCSTR value);
-	LPCSTR			xr_stdcall			sun_getter					() const;
-	void			xr_stdcall			sun_setter					(LPCSTR value);
-	LPCSTR			xr_stdcall			thunderbolt_getter			() const;
-	void			xr_stdcall			thunderbolt_setter			(LPCSTR value);
-	LPCSTR			xr_stdcall			sky_texture_getter			() const;
-	void			xr_stdcall			sky_texture_setter			(LPCSTR value);
-	LPCSTR			xr_stdcall			clouds_texture_getter		() const;
-	void			xr_stdcall			clouds_texture_setter		(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
+    float xr_stdcall sun_altitude_getter() const;
+    void xr_stdcall sun_altitude_setter(float value);
+    float xr_stdcall sun_longitude_getter() const;
+    void xr_stdcall sun_longitude_setter(float value);
+    float xr_stdcall sky_rotation_getter() const;
+    void xr_stdcall sky_rotation_setter(float value);
+    float xr_stdcall wind_direction_getter() const;
+    void xr_stdcall wind_direction_setter(float value);
+    LPCSTR xr_stdcall ambient_getter() const;
+    void xr_stdcall ambient_setter(LPCSTR value);
+    LPCSTR xr_stdcall sun_getter() const;
+    void xr_stdcall sun_setter(LPCSTR value);
+    LPCSTR xr_stdcall thunderbolt_getter() const;
+    void xr_stdcall thunderbolt_setter(LPCSTR value);
+    LPCSTR xr_stdcall sky_texture_getter() const;
+    void xr_stdcall sky_texture_setter(LPCSTR value);
+    LPCSTR xr_stdcall clouds_texture_getter() const;
+    void xr_stdcall clouds_texture_setter(LPCSTR value);
 
 private:
-	shared_str							m_ambient;
-	shared_str							m_sun;
-	shared_str							m_thunderbolt_collection;
+    shared_str m_ambient;
+    shared_str m_sun;
+    shared_str m_thunderbolt_collection;
 
 private:
-	editor::environment::manager&		m_manager;
-	weather const*						m_weather;
-	property_holder_type*				m_property_holder;
+    editor::environment::manager& m_manager;
+    weather const* m_weather;
+    property_holder_type* m_property_holder;
 }; // class time
 } // namespace weathers
 } // namespace environment
diff --git a/src/xrEngine/editor_environment_weathers_weather.cpp b/src/xrEngine/editor_environment_weathers_weather.cpp
index b03fa35dbfd..097318040dc 100644
--- a/src/xrEngine/editor_environment_weathers_weather.cpp
+++ b/src/xrEngine/editor_environment_weathers_weather.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_weathers_weather.cpp
-//	Created 	: 11.01.2008
-//  Modified 	: 11.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment weathers weather class
+// Module : editor_environment_weathers_weather.cpp
+// Created : 11.01.2008
+// Modified : 11.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment weathers weather class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -21,371 +21,379 @@ using editor::environment::weathers::manager;
 using editor::environment::weathers::time;
 
 template <>
-void property_collection<weather::container_type, weather>::display_name	(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
+void property_collection<weather::container_type, weather>::display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size)
 {
-	xr_strcpy			(buffer, buffer_size, m_container[item_index]->id().c_str());
+    xr_strcpy(buffer, buffer_size, m_container[item_index]->id().c_str());
 }
 
 template <>
-editor::property_holder* property_collection<weather::container_type, weather>::create	()
+editor::property_holder* property_collection<weather::container_type, weather>::create()
 {
-	using ::editor::environment::weathers::time;
-	time*				object = xr_new<time>(&m_holder.m_manager, &m_holder, m_holder.generate_unique_id().c_str());
-	object->fill		(this);
-	return				(object->object());
+    using ::editor::environment::weathers::time;
+    time* object = xr_new<time>(&m_holder.m_manager, &m_holder, m_holder.generate_unique_id().c_str());
+    object->fill(this);
+    return (object->object());
 }
 
-weather::weather	(
-		editor::environment::manager* manager,
-		shared_str const& id
-	) :
-	m_manager			(*manager),
-	m_id				(id),
-	m_property_holder	(0),
-	m_collection		(0)
+weather::weather(
+    editor::environment::manager* manager,
+    shared_str const& id
+) :
+    m_manager(*manager),
+    m_id(id),
+    m_property_holder(0),
+    m_collection(0)
 {
-	m_collection		= xr_new<collection_type>(&m_times, this);
+    m_collection = xr_new<collection_type>(&m_times, this);
 }
 
-weather::~weather	()
+weather::~weather()
 {
-	xr_delete			(m_collection);
-	delete_data			(m_times);
+    xr_delete(m_collection);
+    delete_data(m_times);
 
-	if (!Device.editor())
-		return;
+    if (!Device.editor())
+        return;
 
-	::ide().destroy		(m_property_holder);
+    ::ide().destroy(m_property_holder);
 }
 
-void weather::load			()
+void weather::load()
 {
-	string_path			file_name;
-	FS.update_path		(file_name, "$game_weathers$", m_id.c_str());
-	xr_strcat			(file_name, ".ltx");
-	CInifile*			config = CInifile::Create(file_name);
-
-	m_manager.WeatherCycles[m_id].clear	();
-
-	typedef CInifile::Root	sections_type;
-	sections_type&			sections = config->sections();
-	m_times.reserve			(sections.size());
-	sections_type::const_iterator	i = sections.begin();
-	sections_type::const_iterator	e = sections.end();
-	for ( ; i != e; ++i) {
-		time*				object = xr_new<time>(&m_manager, this, (*i)->Name);
-		object->load		(*config);
-		object->fill		(m_collection);
-		m_times.push_back	(object);
-		m_manager.WeatherCycles[m_id].push_back	(object);
-	}
-
-	CInifile::Destroy	(config);
+    string_path file_name;
+    FS.update_path(file_name, "$game_weathers$", m_id.c_str());
+    xr_strcat(file_name, ".ltx");
+    CInifile* config = CInifile::Create(file_name);
+
+    m_manager.WeatherCycles[m_id].clear();
+
+    typedef CInifile::Root sections_type;
+    sections_type& sections = config->sections();
+    m_times.reserve(sections.size());
+    sections_type::const_iterator i = sections.begin();
+    sections_type::const_iterator e = sections.end();
+    for (; i != e; ++i)
+    {
+        time* object = xr_new<time>(&m_manager, this, (*i)->Name);
+        object->load(*config);
+        object->fill(m_collection);
+        m_times.push_back(object);
+        m_manager.WeatherCycles[m_id].push_back(object);
+    }
+
+    CInifile::Destroy(config);
 }
 
-void weather::save			()
+void weather::save()
 {
-	string_path			file_name;
-	FS.update_path		(file_name, "$game_weathers$", m_id.c_str());
-	xr_strcat			(file_name, ".ltx");
-	CInifile*			config = xr_new<CInifile>(file_name, FALSE, FALSE, TRUE);
+    string_path file_name;
+    FS.update_path(file_name, "$game_weathers$", m_id.c_str());
+    xr_strcat(file_name, ".ltx");
+    CInifile* config = xr_new<CInifile>(file_name, FALSE, FALSE, TRUE);
 
-	container_type::iterator	i = m_times.begin();
-	container_type::iterator	e = m_times.end();
-	for ( ; i != e; ++i)
-		(*i)->save		(*config);
+    container_type::iterator i = m_times.begin();
+    container_type::iterator e = m_times.end();
+    for (; i != e; ++i)
+        (*i)->save(*config);
 
-	CInifile::Destroy	(config);
+    CInifile::Destroy(config);
 }
 
-LPCSTR weather::id_getter	() const
+LPCSTR weather::id_getter() const
 {
-	return				(m_id.c_str());
+    return (m_id.c_str());
 }
 
-void weather::id_setter		(LPCSTR value_)
+void weather::id_setter(LPCSTR value_)
 {
-	shared_str			value = value_;
-	if (m_id._get() == value._get())
-		return;
+    shared_str value = value_;
+    if (m_id._get() == value._get())
+        return;
 
-	m_id				= m_manager.weathers().unique_id(value);
+    m_id = m_manager.weathers().unique_id(value);
 }
 
-void weather::fill			(editor::property_holder_collection* collection)
+void weather::fill(editor::property_holder_collection* collection)
 {
-	VERIFY				(!m_property_holder);
-	m_property_holder	= ::ide().create_property_holder(m_id.c_str(), collection, this);
-
-	typedef editor::property_holder::string_getter_type	string_getter_type;
-	string_getter_type	string_getter;
-	string_getter.bind	(this, &weather::id_getter);
-
-	typedef editor::property_holder::string_setter_type	string_setter_type;
-	string_setter_type	string_setter;
-	string_setter.bind	(this, &weather::id_setter);
-
-	m_property_holder->add_property	(
-		"id",
-		"properties",
-		"this option is resposible for weather identifier",
-		m_id.c_str(),
-		string_getter,
-		string_setter
-	);
-	m_property_holder->add_property	(
-		"times",
-		"properties",
-		"this option is resposible for times",
-		m_collection
-	);
+    VERIFY(!m_property_holder);
+    m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this);
+
+    typedef editor::property_holder::string_getter_type string_getter_type;
+    string_getter_type string_getter;
+    string_getter.bind(this, &weather::id_getter);
+
+    typedef editor::property_holder::string_setter_type string_setter_type;
+    string_setter_type string_setter;
+    string_setter.bind(this, &weather::id_setter);
+
+    m_property_holder->add_property(
+        "id",
+        "properties",
+        "this option is resposible for weather identifier",
+        m_id.c_str(),
+        string_getter,
+        string_setter
+    );
+    m_property_holder->add_property(
+        "times",
+        "properties",
+        "this option is resposible for times",
+        m_collection
+    );
 }
 
-static inline bool is_digit				(char const& test)
+static inline bool is_digit(char const& test)
 {
-	if (test < '0')
-		return			(false);
+    if (test < '0')
+        return (false);
 
-	if (test > '9')
-		return			(false);
+    if (test > '9')
+        return (false);
 
-	return				(true);
+    return (true);
 }
 
-bool weather::valid_id					(shared_str const& id_) const
+bool weather::valid_id(shared_str const& id_) const
 {
-	LPCSTR				id = id_.c_str();
-	if (!is_digit(id[0]))
-		return			(false);
+    LPCSTR id = id_.c_str();
+    if (!is_digit(id[0]))
+        return (false);
 
-	if (!is_digit(id[1]))
-		return			(false);
+    if (!is_digit(id[1]))
+        return (false);
 
-	if (id[2] != ':')
-		return			(false);
+    if (id[2] != ':')
+        return (false);
 
-	if (!is_digit(id[3]))
-		return			(false);
+    if (!is_digit(id[3]))
+        return (false);
 
-	if (!is_digit(id[4]))
-		return			(false);
+    if (!is_digit(id[4]))
+        return (false);
 
-	if (id[5] != ':')
-		return			(false);
+    if (id[5] != ':')
+        return (false);
 
-	if (!is_digit(id[6]))
-		return			(false);
+    if (!is_digit(id[6]))
+        return (false);
 
-	if (!is_digit(id[7]))
-		return			(false);
+    if (!is_digit(id[7]))
+        return (false);
 
-	return				(true);
+    return (true);
 }
 
-shared_str weather::unique_id			(shared_str const& current, shared_str const& id) const
+shared_str weather::unique_id(shared_str const& current, shared_str const& id) const
 {
-	if (!valid_id(id))
-		return			(current);
+    if (!valid_id(id))
+        return (current);
 
-	if (m_collection->unique_id(id.c_str()))
-		return			(id);
+    if (m_collection->unique_id(id.c_str()))
+        return (id);
 
-	return				(generate_unique_id(id));
+    return (generate_unique_id(id));
 }
 
-bool weather::try_hours					(u32& hours, u32& minutes, u32& seconds, shared_str& result) const
+bool weather::try_hours(u32& hours, u32& minutes, u32& seconds, shared_str& result) const
 {
-	for (u32 i=hours + 1; i<24; ++i) {
-		string16		temp;
-		xr_sprintf		(temp, "%02d:%02d:%02d", i, minutes, seconds);
-		if (!m_collection->unique_id(temp))
-			continue;
-
-		result			= temp;
-		return			(true);
-	}
-
-	return				(false);
+    for (u32 i = hours + 1; i < 24; ++i)
+    {
+        string16 temp;
+        xr_sprintf(temp, "%02d:%02d:%02d", i, minutes, seconds);
+        if (!m_collection->unique_id(temp))
+            continue;
+
+        result = temp;
+        return (true);
+    }
+
+    return (false);
 }
 
-bool weather::try_minutes				(u32& hours, u32& minutes, u32& seconds, shared_str& result) const
+bool weather::try_minutes(u32& hours, u32& minutes, u32& seconds, shared_str& result) const
 {
-	for (u32 i=minutes + 1; i<60; ++i) {
-		string16		temp;
-		xr_sprintf		(temp, "%02d:%02d:%02d", hours, i, seconds);
-		if (!m_collection->unique_id(temp))
-			continue;
-
-		result			= temp;
-		return			(true);
-	}
-
-	return				(false);
+    for (u32 i = minutes + 1; i < 60; ++i)
+    {
+        string16 temp;
+        xr_sprintf(temp, "%02d:%02d:%02d", hours, i, seconds);
+        if (!m_collection->unique_id(temp))
+            continue;
+
+        result = temp;
+        return (true);
+    }
+
+    return (false);
 }
 
-shared_str weather::try_all				(u32& hours_, u32& minutes_, u32& seconds_) const
+shared_str weather::try_all(u32& hours_, u32& minutes_, u32& seconds_) const
 {
-	for (u32 hours = hours_; hours<24; ++hours)
-		for (u32 minutes = minutes_; minutes<60; ++minutes)
-			for (u32 seconds = seconds_ + 1; seconds<60; ++seconds) {
-				string16	temp;
-				xr_sprintf	(temp, "%02d:%02d:%02d", hours, minutes, seconds);
-				if (!m_collection->unique_id(temp))
-					continue;
-
-				return		(temp);
-			}
-	return					("can not generate weather id");
+    for (u32 hours = hours_; hours < 24; ++hours)
+        for (u32 minutes = minutes_; minutes < 60; ++minutes)
+            for (u32 seconds = seconds_ + 1; seconds < 60; ++seconds)
+            {
+                string16 temp;
+                xr_sprintf(temp, "%02d:%02d:%02d", hours, minutes, seconds);
+                if (!m_collection->unique_id(temp))
+                    continue;
+
+                return (temp);
+            }
+    return ("can not generate weather id");
 }
 
-shared_str weather::generate_unique_id	(shared_str const& start) const
+shared_str weather::generate_unique_id(shared_str const& start) const
 {
-	string16			id;
-	xr_strcpy			(id, start.c_str());
+    string16 id;
+    xr_strcpy(id, start.c_str());
 
-	VERIFY				(xr_strlen(id) == 8);
-	VERIFY				(is_digit(id[0]));
-	VERIFY				(is_digit(id[1]));
-	VERIFY				(id[2] == ':');
-	VERIFY				(is_digit(id[3]));
-	VERIFY				(is_digit(id[4]));
-	VERIFY				(id[5] == ':');
-	VERIFY				(is_digit(id[6]));
-	VERIFY				(is_digit(id[7]));
+    VERIFY(xr_strlen(id) == 8);
+    VERIFY(is_digit(id[0]));
+    VERIFY(is_digit(id[1]));
+    VERIFY(id[2] == ':');
+    VERIFY(is_digit(id[3]));
+    VERIFY(is_digit(id[4]));
+    VERIFY(id[5] == ':');
+    VERIFY(is_digit(id[6]));
+    VERIFY(is_digit(id[7]));
 
-	u32					hours, minutes, seconds;
-	sscanf_s			(id, "%02d:%02d:%02d", &hours, &minutes, &seconds);
+    u32 hours, minutes, seconds;
+    sscanf_s(id, "%02d:%02d:%02d", &hours, &minutes, &seconds);
 
-	shared_str			result;
+    shared_str result;
 
-	if (try_hours(hours, minutes, seconds, result))
-		return			(result);
+    if (try_hours(hours, minutes, seconds, result))
+        return (result);
 
-	if (try_minutes(hours, minutes, seconds, result))
-		return			(result);
+    if (try_minutes(hours, minutes, seconds, result))
+        return (result);
 
-	return				(try_all(hours, minutes, seconds));
+    return (try_all(hours, minutes, seconds));
 }
 
-shared_str weather::generate_unique_id	() const
+shared_str weather::generate_unique_id() const
 {
-	if (m_times.empty())
-		return			("00:00:00");
+    if (m_times.empty())
+        return ("00:00:00");
 
-	return				(generate_unique_id(m_times.back()->id()));
+    return (generate_unique_id(m_times.back()->id()));
 }
 
-bool weather::save_time_frame			(shared_str const& frame_id, char* buffer, u32 const& buffer_size)
+bool weather::save_time_frame(shared_str const& frame_id, char* buffer, u32 const& buffer_size)
 {
-	container_type::iterator	i = m_times.begin();
-	container_type::iterator	e = m_times.end();
-	for ( ; i != e; ++i) {
-		if (frame_id._get() != (*i)->id()._get())
-			continue;
-
-		CInifile		temp(0, FALSE, FALSE, FALSE);
-		(*i)->save		(temp);
-
-		CMemoryWriter	writer;
-		temp.save_as	(writer);
-		if (writer.size() > buffer_size)
-			return		(false);
-
-		writer.seek		(0);
-		Memory.mem_copy	(buffer, writer.pointer(), writer.size());
-		return			(true);
-	}
-
-	return				(false);
+    container_type::iterator i = m_times.begin();
+    container_type::iterator e = m_times.end();
+    for (; i != e; ++i)
+    {
+        if (frame_id._get() != (*i)->id()._get())
+            continue;
+
+        CInifile temp(0, FALSE, FALSE, FALSE);
+        (*i)->save(temp);
+
+        CMemoryWriter writer;
+        temp.save_as(writer);
+        if (writer.size() > buffer_size)
+            return (false);
+
+        writer.seek(0);
+        Memory.mem_copy(buffer, writer.pointer(), writer.size());
+        return (true);
+    }
+
+    return (false);
 }
 
-bool weather::paste_time_frame			(shared_str const& frame_id, char const* buffer, u32 const& buffer_size)
+bool weather::paste_time_frame(shared_str const& frame_id, char const* buffer, u32 const& buffer_size)
 {
-	container_type::iterator	i = m_times.begin();
-	container_type::iterator	e = m_times.end();
-	for ( ; i != e; ++i) {
-		if (frame_id._get() != (*i)->id()._get())
-			continue;
-
-		IReader			reader(const_cast<char*>(buffer), buffer_size);
-		CInifile		temp(&reader);
-		if (temp.sections().empty())
-			return		(false);
-
-		(*i)->load_from	((*temp.sections().begin())->Name, temp, shared_str((*i)->id()));
-		return			(true);
-	}
-
-	return				(false);
+    container_type::iterator i = m_times.begin();
+    container_type::iterator e = m_times.end();
+    for (; i != e; ++i)
+    {
+        if (frame_id._get() != (*i)->id()._get())
+            continue;
+
+        IReader reader(const_cast<char*>(buffer), buffer_size);
+        CInifile temp(&reader);
+        if (temp.sections().empty())
+            return (false);
+
+        (*i)->load_from((*temp.sections().begin())->Name, temp, shared_str((*i)->id()));
+        return (true);
+    }
+
+    return (false);
 }
 
-bool weather::add_time_frame			(char const* buffer, u32 const& buffer_size)
+bool weather::add_time_frame(char const* buffer, u32 const& buffer_size)
 {
-	IReader				reader(const_cast<char*>(buffer), buffer_size);
-	CInifile			temp(&reader);
-	if (temp.sections().empty())
-		return			(false);
-
-	shared_str const&	section = (*temp.sections().begin())->Name;
-	container_type::const_iterator	i = m_times.begin();
-	container_type::const_iterator	e = m_times.end();
-	for ( ; i != e; ++i)
-		if (section._get() == (*i)->id()._get())
-			return		(false);
-
-	time*				object = xr_new<time>(&m_manager, this, section);
-	object->load		(temp);
-	object->fill		(m_collection);
-
-	struct id {
-		static inline	bool	predicate	(time* const& time, shared_str const& id)
-		{
-			return		(xr_strcmp(time->id(), id) < 0);
-		}
-	}; // struct id
-
-	container_type::iterator	found =
-		std::lower_bound(
-			m_times.begin(),
-			m_times.end(),
-			section,
-			&id::predicate
-		);
-
-	u32					index = u32(found - m_times.begin());
-	m_times.insert		(found, object);
-	m_manager.WeatherCycles[m_id].insert	(m_manager.WeatherCycles[m_id].begin() + index, object);
-	return				(true);
+    IReader reader(const_cast<char*>(buffer), buffer_size);
+    CInifile temp(&reader);
+    if (temp.sections().empty())
+        return (false);
+
+    shared_str const& section = (*temp.sections().begin())->Name;
+    container_type::const_iterator i = m_times.begin();
+    container_type::const_iterator e = m_times.end();
+    for (; i != e; ++i)
+        if (section._get() == (*i)->id()._get())
+            return (false);
+
+    time* object = xr_new<time>(&m_manager, this, section);
+    object->load(temp);
+    object->fill(m_collection);
+
+    struct id
+    {
+        static inline bool predicate(time* const& time, shared_str const& id)
+        {
+            return (xr_strcmp(time->id(), id) < 0);
+        }
+    }; // struct id
+
+    container_type::iterator found =
+        std::lower_bound(
+            m_times.begin(),
+            m_times.end(),
+            section,
+            &id::predicate
+        );
+
+    u32 index = u32(found - m_times.begin());
+    m_times.insert(found, object);
+    m_manager.WeatherCycles[m_id].insert(m_manager.WeatherCycles[m_id].begin() + index, object);
+    return (true);
 }
 
-void weather::reload_time_frame	(shared_str const& frame_id)
+void weather::reload_time_frame(shared_str const& frame_id)
 {
-	string_path			file_name;
-	FS.update_path		(file_name, "$game_weathers$", m_id.c_str());
-	xr_strcat			(file_name, ".ltx");
-	CInifile*			config = CInifile::Create(file_name);
-
-	container_type::iterator	i = m_times.begin();
-	container_type::iterator	e = m_times.end();
-	for ( ; i != e; ++i) {
-		if (frame_id._get() != (*i)->id()._get())
-			continue;
-
-		if (!config->section_exist((*i)->id()))
-			return;
-
-		(*i)->load_from		((*i)->id(), *config, (*i)->id());
-		CInifile::Destroy	(config);
-		return;
-	}
-
-	CInifile::Destroy	(config);
+    string_path file_name;
+    FS.update_path(file_name, "$game_weathers$", m_id.c_str());
+    xr_strcat(file_name, ".ltx");
+    CInifile* config = CInifile::Create(file_name);
+
+    container_type::iterator i = m_times.begin();
+    container_type::iterator e = m_times.end();
+    for (; i != e; ++i)
+    {
+        if (frame_id._get() != (*i)->id()._get())
+            continue;
+
+        if (!config->section_exist((*i)->id()))
+            return;
+
+        (*i)->load_from((*i)->id(), *config, (*i)->id());
+        CInifile::Destroy(config);
+        return;
+    }
+
+    CInifile::Destroy(config);
 }
 
-void weather::reload			()
+void weather::reload()
 {
-	delete_data			(m_times);
-	load				();
+    delete_data(m_times);
+    load();
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/editor_environment_weathers_weather.hpp b/src/xrEngine/editor_environment_weathers_weather.hpp
index 8de83192998..47b78b744f2 100644
--- a/src/xrEngine/editor_environment_weathers_weather.hpp
+++ b/src/xrEngine/editor_environment_weathers_weather.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: editor_environment_weathers_weather.hpp
-//	Created 	: 11.01.2008
-//  Modified 	: 11.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : editor environment weathers weather class
+// Module : editor_environment_weathers_weather.hpp
+// Created : 11.01.2008
+// Modified : 11.01.2008
+// Author : Dmitriy Iassenev
+// Description : editor environment weathers weather class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef EDITOR_ENVIRONMENT_WEATHERS_WEATHER_HPP_INCLUDED
@@ -15,73 +15,76 @@
 #include "../include/editor/property_holder.hpp"
 #include "property_collection_forward.hpp"
 
-namespace editor {
-namespace environment {
+namespace editor
+{
+namespace environment
+{
 
-	class manager;
+class manager;
 
-namespace weathers {
+namespace weathers
+{
 
 class manager;
 class time;
 
 class weather :
-	public editor::property_holder_holder,
-	private boost::noncopyable
+    public editor::property_holder_holder,
+    private boost::noncopyable
 {
 public:
-	typedef editor::property_holder	property_holder_type;
+    typedef editor::property_holder property_holder_type;
 
 public:
-									weather				(
-										environment::manager* manager,
-										shared_str const& id
-									);
-	virtual							~weather			();
-			void					load				();
-			void					save				();
-			void					fill				(::editor::property_holder_collection* holder);
-	inline	shared_str const&		id					() const { return m_id; }
-			shared_str				unique_id			(shared_str const& current, shared_str const& id) const;
-			shared_str				generate_unique_id	() const;
-	virtual	property_holder_type*	object				() { return m_property_holder; }
-			bool					save_time_frame		(shared_str const& frame_id, char* buffer, u32 const& buffer_size);
-			bool					paste_time_frame	(shared_str const& frame_id, char const* buffer, u32 const& buffer_size);
-			void					reload_time_frame	(shared_str const& frame_id);
-			void					reload				();
-			bool					add_time_frame		(char const* buffer, u32 const& buffer_size);
+    weather(
+        environment::manager* manager,
+        shared_str const& id
+    );
+    virtual ~weather();
+    void load();
+    void save();
+    void fill(::editor::property_holder_collection* holder);
+    inline shared_str const& id() const { return m_id; }
+    shared_str unique_id(shared_str const& current, shared_str const& id) const;
+    shared_str generate_unique_id() const;
+    virtual property_holder_type* object() { return m_property_holder; }
+    bool save_time_frame(shared_str const& frame_id, char* buffer, u32 const& buffer_size);
+    bool paste_time_frame(shared_str const& frame_id, char const* buffer, u32 const& buffer_size);
+    void reload_time_frame(shared_str const& frame_id);
+    void reload();
+    bool add_time_frame(char const* buffer, u32 const& buffer_size);
 
 private:
-			bool					valid_id			(shared_str const& id_) const;
-			bool					try_hours			(u32& hours, u32& minutes, u32& seconds, shared_str& result) const;
-			bool					try_minutes			(u32& hours, u32& minutes, u32& seconds, shared_str& result) const;
-			shared_str				try_all				(u32& hours, u32& minutes, u32& seconds) const;
-			shared_str				generate_unique_id	(shared_str const& start) const;
+    bool valid_id(shared_str const& id_) const;
+    bool try_hours(u32& hours, u32& minutes, u32& seconds, shared_str& result) const;
+    bool try_minutes(u32& hours, u32& minutes, u32& seconds, shared_str& result) const;
+    shared_str try_all(u32& hours, u32& minutes, u32& seconds) const;
+    shared_str generate_unique_id(shared_str const& start) const;
 
 private:
-			LPCSTR	xr_stdcall		id_getter			() const;
-			void	xr_stdcall		id_setter			(LPCSTR value);
+    LPCSTR xr_stdcall id_getter() const;
+    void xr_stdcall id_setter(LPCSTR value);
 
 public:
-	typedef xr_vector<time*>		container_type;
+    typedef xr_vector<time*> container_type;
 
 public:
-	inline	container_type const&	times				() const { return m_times; }
+    inline container_type const& times() const { return m_times; }
 
 private:
-	typedef property_collection<
-				container_type,
-				weather
-			>						collection_type;
+    typedef property_collection <
+    container_type,
+    weather
+    > collection_type;
 
 private:
-	shared_str						m_id;
-	container_type					m_times;
-	collection_type*				m_collection;
-	property_holder_type*			m_property_holder;
+    shared_str m_id;
+    container_type m_times;
+    collection_type* m_collection;
+    property_holder_type* m_property_holder;
 
 public:
-	environment::manager&			m_manager;
+    environment::manager& m_manager;
 }; // class weather
 } // namespace weathers
 } // namespace environment
diff --git a/src/xrEngine/engine_impl.cpp b/src/xrEngine/engine_impl.cpp
index 38995dbcc4e..fe21faf9d5b 100644
--- a/src/xrEngine/engine_impl.cpp
+++ b/src/xrEngine/engine_impl.cpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: engine_impl.cpp
-//	Created 	: 04.12.2007
-//  Modified 	: 04.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : engine implementation class
+// Module : engine_impl.cpp
+// Created : 04.12.2007
+// Modified : 04.12.2007
+// Author : Dmitriy Iassenev
+// Description : engine implementation class
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -22,423 +22,429 @@ ENGINE_API extern CConsole* Console;
 
 using editor::property_holder;
 
-engine_impl::engine_impl		() :
-	m_input_receiver(xr_new<IInputReceiver>()),
-	m_input_captured(false)
+engine_impl::engine_impl() :
+    m_input_receiver(xr_new<IInputReceiver>()),
+    m_input_captured(false)
 {
 }
 
-engine_impl::~engine_impl		()
+engine_impl::~engine_impl()
 {
-	capture_input	(false);
-	xr_delete		(m_input_receiver);
+    capture_input(false);
+    xr_delete(m_input_receiver);
 }
 
-bool engine_impl::on_message	(
-		HWND hWnd,
-		UINT uMsg,
-		WPARAM wParam,
-		LPARAM lParam,
-		LRESULT &result
-	)
+bool engine_impl::on_message(
+    HWND hWnd,
+    UINT uMsg,
+    WPARAM wParam,
+    LPARAM lParam,
+    LRESULT& result
+)
 {
-	return			(Device.on_message(hWnd, uMsg, wParam, lParam, result));
+    return (Device.on_message(hWnd, uMsg, wParam, lParam, result));
 }
 
-void engine_impl::on_idle		()
+void engine_impl::on_idle()
 {
-	Device.on_idle	();
+    Device.on_idle();
 }
 
-void engine_impl::on_resize		()
+void engine_impl::on_resize()
 {
-	if (Console)
-		Console->Execute("vid_restart");
+    if (Console)
+        Console->Execute("vid_restart");
 }
 
-void engine_impl::pause			(bool const &value)
+void engine_impl::pause(bool const& value)
 {
-	if (value == !!Device.Paused())
-		return;
+    if (value == !!Device.Paused())
+        return;
 
-	Device.Pause						(value ? TRUE : FALSE, TRUE, TRUE, "editor query");
+    Device.Pause(value ? TRUE : FALSE, TRUE, TRUE, "editor query");
 }
 
-void engine_impl::capture_input	(bool const &value)
+void engine_impl::capture_input(bool const& value)
 {
-	if (value == m_input_captured)
-		return;
+    if (value == m_input_captured)
+        return;
 
-	m_input_captured					= value;
+    m_input_captured = value;
 
-	if (value)
-		m_input_receiver->IR_Capture	();
-	else
-		m_input_receiver->IR_Release	();
+    if (value)
+        m_input_receiver->IR_Capture();
+    else
+        m_input_receiver->IR_Release();
 }
 
-void engine_impl::disconnect	()
+void engine_impl::disconnect()
 {
-	Console->Execute("quit");
+    Console->Execute("quit");
 }
 
-void engine_impl::value					(LPCSTR value, shared_str& result)
+void engine_impl::value(LPCSTR value, shared_str& result)
 {
-	result			= value;
+    result = value;
 }
 
-LPCSTR engine_impl::value				(shared_str const& value)
+LPCSTR engine_impl::value(shared_str const& value)
 {
-	return			(value.c_str());
+    return (value.c_str());
 }
 
-void engine_impl::weather				(LPCSTR value)
+void engine_impl::weather(LPCSTR value)
 {
-	if (!g_pGamePersistent)
-		return;
+    if (!g_pGamePersistent)
+        return;
 
-	shared_str						new_weather_id = value;
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	if (environment.CurrentWeatherName._get() == new_weather_id._get())
-		return;
+    shared_str new_weather_id = value;
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    if (environment.CurrentWeatherName._get() == new_weather_id._get())
+        return;
 
-	typedef CEnvironment::EnvsMap	EnvsMap;
-	EnvsMap const&					weathers = environment.WeatherCycles;
-	EnvsMap::const_iterator			i = weathers.find(value);
-	if (i == weathers.end())
-		return;
+    typedef CEnvironment::EnvsMap EnvsMap;
+    EnvsMap const& weathers = environment.WeatherCycles;
+    EnvsMap::const_iterator i = weathers.find(value);
+    if (i == weathers.end())
+        return;
 
-	float const game_time						= g_pGamePersistent->Environment().GetGameTime();
-	environment.SetWeather						(value, true);
-	g_pGameLevel->SetEnvironmentGameTimeFactor	(iFloor(game_time), environment.fTimeFactor);
-	g_pGamePersistent->Environment().SelectEnvs	(game_time);
+    float const game_time = g_pGamePersistent->Environment().GetGameTime();
+    environment.SetWeather(value, true);
+    g_pGameLevel->SetEnvironmentGameTimeFactor(iFloor(game_time), environment.fTimeFactor);
+    g_pGamePersistent->Environment().SelectEnvs(game_time);
 }
 
-LPCSTR engine_impl::weather			()
+LPCSTR engine_impl::weather()
 {
-	if (!g_pGamePersistent)
-		return		("");
+    if (!g_pGamePersistent)
+        return ("");
 
-	return			(g_pGamePersistent->Environment().GetWeather().c_str());
+    return (g_pGamePersistent->Environment().GetWeather().c_str());
 }
 
-void engine_impl::current_weather_frame		(LPCSTR frame_id)
+void engine_impl::current_weather_frame(LPCSTR frame_id)
 {
-	if (!g_pGamePersistent)
-		return;
+    if (!g_pGamePersistent)
+        return;
 
-	shared_str				new_frame_id = frame_id;
+    shared_str new_frame_id = frame_id;
 
-	CEnvironment&			environment = g_pGamePersistent->Environment();
-	VERIFY					(environment.CurrentWeather);
-	typedef CEnvironment::EnvVec	EnvVec;
-	EnvVec const&			frames = *environment.CurrentWeather;
-	EnvVec::const_iterator	i = frames.begin();
-	EnvVec::const_iterator	e = frames.end();
-	for ( ; i != e; ++i)
-		if ((*i)->m_identifier._get() == new_frame_id._get()) {
-			environment.Current[0]	= (*i);
-			environment.Current[1]	= ((i + 1) == e) ? (*frames.begin()) : *(i + 1);
-			bool			set_time = true;
-			if (environment.Current[0]->exec_time < environment.Current[1]->exec_time) {
-				if (environment.GetGameTime() > environment.Current[0]->exec_time)
-					if (environment.GetGameTime() < environment.Current[1]->exec_time)
-						set_time	= false;
-			}
-			else {
-				if (environment.GetGameTime() > environment.Current[0]->exec_time)
-					set_time	= false;
-			}
-			if (set_time) {
-				environment.SetGameTime	((*i)->exec_time, environment.fTimeFactor);
-				g_pGameLevel->SetEnvironmentGameTimeFactor	(iFloor((*i)->exec_time*1000.f), environment.fTimeFactor);
-			}
-			break;
-		}
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    VERIFY(environment.CurrentWeather);
+    typedef CEnvironment::EnvVec EnvVec;
+    EnvVec const& frames = *environment.CurrentWeather;
+    EnvVec::const_iterator i = frames.begin();
+    EnvVec::const_iterator e = frames.end();
+    for (; i != e; ++i)
+        if ((*i)->m_identifier._get() == new_frame_id._get())
+        {
+            environment.Current[0] = (*i);
+            environment.Current[1] = ((i + 1) == e) ? (*frames.begin()) : *(i + 1);
+            bool set_time = true;
+            if (environment.Current[0]->exec_time < environment.Current[1]->exec_time)
+            {
+                if (environment.GetGameTime() > environment.Current[0]->exec_time)
+                    if (environment.GetGameTime() < environment.Current[1]->exec_time)
+                        set_time = false;
+            }
+            else
+            {
+                if (environment.GetGameTime() > environment.Current[0]->exec_time)
+                    set_time = false;
+            }
+            if (set_time)
+            {
+                environment.SetGameTime((*i)->exec_time, environment.fTimeFactor);
+                g_pGameLevel->SetEnvironmentGameTimeFactor(iFloor((*i)->exec_time*1000.f), environment.fTimeFactor);
+            }
+            break;
+        }
 }
 
-LPCSTR engine_impl::current_weather_frame	()
+LPCSTR engine_impl::current_weather_frame()
 {
-	if (!g_pGamePersistent)
-		return				("");
+    if (!g_pGamePersistent)
+        return ("");
 
-	if (!g_pGamePersistent->Environment().Current[0])
-		return				("");
+    if (!g_pGamePersistent->Environment().Current[0])
+        return ("");
 
-	return					(g_pGamePersistent->Environment().Current[0]->m_identifier.c_str());
+    return (g_pGamePersistent->Environment().Current[0]->m_identifier.c_str());
 }
 
-void engine_impl::track_frame				(float const& time)
+void engine_impl::track_frame(float const& time)
 {
-	VERIFY					(time >= 0.f);
-	VERIFY					(time <= 1.f);
+    VERIFY(time >= 0.f);
+    VERIFY(time <= 1.f);
 
-	if (!g_pGameLevel)
-		return;
+    if (!g_pGameLevel)
+        return;
 
-	CEnvironment&			environment = g_pGamePersistent->Environment();
-	if (!environment.Current[0])
-		return;
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    if (!environment.Current[0])
+        return;
 
-	if (!environment.Current[1])
-		return;
+    if (!environment.Current[1])
+        return;
 
-	float					start_time = environment.Current[0]->exec_time;
-	float					stop_time = environment.Current[1]->exec_time;
-	float					current_time;
-	if (start_time < stop_time)
-		current_time		= start_time + time*(stop_time - start_time);
-	else {
-		stop_time			+= 24.f*60.f*60.f;
-		current_time		= start_time + time*(stop_time - start_time);
-		if (current_time >= 24.f*60.f*60.f)
-			current_time	-= 24.f*60.f*60.f;
-	}
-	environment.SetGameTime	(current_time, environment.fTimeFactor);
-	g_pGameLevel->SetEnvironmentGameTimeFactor	(iFloor(current_time*1000.f), environment.fTimeFactor);
+    float start_time = environment.Current[0]->exec_time;
+    float stop_time = environment.Current[1]->exec_time;
+    float current_time;
+    if (start_time < stop_time)
+        current_time = start_time + time*(stop_time - start_time);
+    else
+    {
+        stop_time += 24.f*60.f*60.f;
+        current_time = start_time + time*(stop_time - start_time);
+        if (current_time >= 24.f*60.f*60.f)
+            current_time -= 24.f*60.f*60.f;
+    }
+    environment.SetGameTime(current_time, environment.fTimeFactor);
+    g_pGameLevel->SetEnvironmentGameTimeFactor(iFloor(current_time*1000.f), environment.fTimeFactor);
 }
 
-float engine_impl::track_frame				()
+float engine_impl::track_frame()
 {
-	if (!g_pGamePersistent)
-		return				(0.f);
+    if (!g_pGamePersistent)
+        return (0.f);
 
-	CEnvironment&			environment = g_pGamePersistent->Environment();
-	if (!environment.Current[0])
-		return				(0.f);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    if (!environment.Current[0])
+        return (0.f);
 
-	float					start_time = environment.Current[0]->exec_time;
-	float					stop_time = environment.Current[1]->exec_time;
-	float					current_time = g_pGamePersistent->Environment().GetGameTime();
-	if (start_time >= stop_time) {
-		if (current_time >= start_time)
-			clamp			(current_time, start_time, 24.f*60.f*60.f);
-		else
-			clamp			(current_time, 0.f, stop_time);
+    float start_time = environment.Current[0]->exec_time;
+    float stop_time = environment.Current[1]->exec_time;
+    float current_time = g_pGamePersistent->Environment().GetGameTime();
+    if (start_time >= stop_time)
+    {
+        if (current_time >= start_time)
+            clamp(current_time, start_time, 24.f*60.f*60.f);
+        else
+            clamp(current_time, 0.f, stop_time);
 
-		if (current_time <= stop_time)
-			current_time	+= 24.f*60.f*60.f;
+        if (current_time <= stop_time)
+            current_time += 24.f*60.f*60.f;
 
-		stop_time			+= 24.f*60.f*60.f;
-	}
-	else
-		clamp				(current_time, start_time, stop_time);
+        stop_time += 24.f*60.f*60.f;
+    }
+    else
+        clamp(current_time, start_time, stop_time);
 
-	VERIFY					(start_time < stop_time);
-	return					((current_time - start_time)/(stop_time - start_time));
+    VERIFY(start_time < stop_time);
+    return ((current_time - start_time) / (stop_time - start_time));
 }
 
-void engine_impl::track_weather			(float const& time)
+void engine_impl::track_weather(float const& time)
 {
-	VERIFY					(time < 24*60*60);
+    VERIFY(time < 24 * 60 * 60);
 
-	bool	paused = g_pGamePersistent->Environment().m_paused;
+    bool paused = g_pGamePersistent->Environment().m_paused;
 
-	g_pGamePersistent->Environment().m_paused = false;
-	g_pGamePersistent->Environment().SetGameTime(time*24*60*60, g_pGamePersistent->Environment().fTimeFactor);
-	g_pGamePersistent->Environment().m_paused = true;
-	g_pGamePersistent->Environment().SetGameTime(time*24*60*60, g_pGamePersistent->Environment().fTimeFactor);
-	
-	g_pGamePersistent->Environment().m_paused = paused;
+    g_pGamePersistent->Environment().m_paused = false;
+    g_pGamePersistent->Environment().SetGameTime(time * 24 * 60 * 60, g_pGamePersistent->Environment().fTimeFactor);
+    g_pGamePersistent->Environment().m_paused = true;
+    g_pGamePersistent->Environment().SetGameTime(time * 24 * 60 * 60, g_pGamePersistent->Environment().fTimeFactor);
 
-	float										weight;
-	g_pGamePersistent->Environment().Invalidate	();
-	g_pGamePersistent->Environment().lerp		(weight);
+    g_pGamePersistent->Environment().m_paused = paused;
+
+    float weight;
+    g_pGamePersistent->Environment().Invalidate();
+    g_pGamePersistent->Environment().lerp(weight);
 }
 
-float engine_impl::track_weather			()
+float engine_impl::track_weather()
 {
-	return					(g_pGamePersistent->Environment().GetGameTime()/(24*60*60));
+    return (g_pGamePersistent->Environment().GetGameTime() / (24 * 60 * 60));
 }
 
-property_holder* engine_impl::current_frame_property_holder	()
+property_holder* engine_impl::current_frame_property_holder()
 {
-	CEnvironment&			environment = g_pGamePersistent->Environment();
-	if (!environment.Current[0])
-		return				(0);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    if (!environment.Current[0])
+        return (0);
 
-	return					(
-		((editor::environment::weathers::time&)(
-			*environment.Current[0]
-		)).object()
-	);
+    return (
+               ((editor::environment::weathers::time&)(
+                    *environment.Current[0]
+                )).object()
+           );
 }
 
-property_holder* engine_impl::blend_frame_property_holder	()
+property_holder* engine_impl::blend_frame_property_holder()
 {
-	CEnvironment&			environment = g_pGamePersistent->Environment();
-	if (!environment.CurrentEnv)
-		return				(0);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    if (!environment.CurrentEnv)
+        return (0);
 
-	return					(
-		((editor::environment::weathers::time&)(
-			*environment.CurrentEnv
-		)).object()
-	);
+    return (
+               ((editor::environment::weathers::time&)(
+                    *environment.CurrentEnv
+                )).object()
+           );
 }
 
-property_holder* engine_impl::target_frame_property_holder	()
+property_holder* engine_impl::target_frame_property_holder()
 {
-	CEnvironment&			environment = g_pGamePersistent->Environment();
-	if (!environment.Current[1])
-		return				(0);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    if (!environment.Current[1])
+        return (0);
 
-	return					(
-		((editor::environment::weathers::time&)(
-			*environment.Current[1]
-		)).object()
-	);
+    return (
+               ((editor::environment::weathers::time&)(
+                    *environment.Current[1]
+                )).object()
+           );
 }
 
-void engine_impl::weather_paused		(bool const &value)
+void engine_impl::weather_paused(bool const& value)
 {
-	g_pGamePersistent->Environment().m_paused		= value;
+    g_pGamePersistent->Environment().m_paused = value;
 }
 
-bool engine_impl::weather_paused		()
+bool engine_impl::weather_paused()
 {
-	return					(g_pGamePersistent->Environment().m_paused);
+    return (g_pGamePersistent->Environment().m_paused);
 }
 
-void engine_impl::weather_time_factor	(float const &value_raw)
+void engine_impl::weather_time_factor(float const& value_raw)
 {
-	float					value = value_raw;
-	clamp					(value, .01f, 100000.f);
-	
+    float value = value_raw;
+    clamp(value, .01f, 100000.f);
+
     if (g_pGameLevel && g_pGamePersistent)
-		g_pGameLevel->SetEnvironmentGameTimeFactor	(iFloor(g_pGamePersistent->Environment().GetGameTime()*1000.f), value);
+        g_pGameLevel->SetEnvironmentGameTimeFactor(iFloor(g_pGamePersistent->Environment().GetGameTime()*1000.f), value);
 
-	if (g_pGamePersistent)
-		g_pGamePersistent->Environment().fTimeFactor= value;
+    if (g_pGamePersistent)
+        g_pGamePersistent->Environment().fTimeFactor = value;
 }
 
-float engine_impl::weather_time_factor	()
+float engine_impl::weather_time_factor()
 {
-	if (!g_pGamePersistent)
-		return				(1.f);
+    if (!g_pGamePersistent)
+        return (1.f);
 
-	return					(g_pGamePersistent->Environment().fTimeFactor);
+    return (g_pGamePersistent->Environment().fTimeFactor);
 }
 
-void engine_impl::save_weathers			()
+void engine_impl::save_weathers()
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
-	manager.save					();
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
+    manager.save();
 }
 
-bool engine_impl::save_time_frame		(char* buffer, u32 const& buffer_size)
+bool engine_impl::save_time_frame(char* buffer, u32 const& buffer_size)
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
-	return							(
-		manager.weathers().save_current_blend(
-			buffer,
-			buffer_size
-		)
-	);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
+    return (
+               manager.weathers().save_current_blend(
+                   buffer,
+                   buffer_size
+               )
+           );
 }
 
-bool engine_impl::paste_current_time_frame	(char const* buffer, u32 const& buffer_size)
+bool engine_impl::paste_current_time_frame(char const* buffer, u32 const& buffer_size)
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
-	return							(
-		manager.weathers().paste_current_time_frame(
-			buffer,
-			buffer_size
-		)
-	);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
+    return (
+               manager.weathers().paste_current_time_frame(
+                   buffer,
+                   buffer_size
+               )
+           );
 }
 
-bool engine_impl::paste_target_time_frame	(char const* buffer, u32 const& buffer_size)
+bool engine_impl::paste_target_time_frame(char const* buffer, u32 const& buffer_size)
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
-	return							(
-		manager.weathers().paste_target_time_frame(
-			buffer,
-			buffer_size
-		)
-	);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
+    return (
+               manager.weathers().paste_target_time_frame(
+                   buffer,
+                   buffer_size
+               )
+           );
 }
 
-bool engine_impl::add_time_frame		(char const* buffer, u32 const& buffer_size)
+bool engine_impl::add_time_frame(char const* buffer, u32 const& buffer_size)
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
-	return							(
-		manager.weathers().add_time_frame	(
-			buffer,
-			buffer_size
-		)
-	);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
+    return (
+               manager.weathers().add_time_frame(
+                   buffer,
+                   buffer_size
+               )
+           );
 }
 
-char const*	engine_impl::weather_current_time	() const
+char const* engine_impl::weather_current_time() const
 {
-	return	(g_pGamePersistent->Environment().CurrentEnv->m_identifier.c_str());
+    return (g_pGamePersistent->Environment().CurrentEnv->m_identifier.c_str());
 }
 
-void engine_impl::weather_current_time			(char const* time)
+void engine_impl::weather_current_time(char const* time)
 {
-	u32		hours, minutes, seconds;
-	sscanf_s(time, "%d:%d:%d", &hours, &minutes, &seconds);
-	bool	paused = g_pGamePersistent->Environment().m_paused;
+    u32 hours, minutes, seconds;
+    sscanf_s(time, "%d:%d:%d", &hours, &minutes, &seconds);
+    bool paused = g_pGamePersistent->Environment().m_paused;
 
-	g_pGamePersistent->Environment().m_paused = false;
-	g_pGamePersistent->Environment().SetGameTime(float(hours*60*60 + minutes*60 + seconds), g_pGamePersistent->Environment().fTimeFactor);
-	g_pGamePersistent->Environment().m_paused = paused;
+    g_pGamePersistent->Environment().m_paused = false;
+    g_pGamePersistent->Environment().SetGameTime(float(hours * 60 * 60 + minutes * 60 + seconds), g_pGamePersistent->Environment().fTimeFactor);
+    g_pGamePersistent->Environment().m_paused = paused;
 
-	float										weight;
-	g_pGamePersistent->Environment().Invalidate	();
-	g_pGamePersistent->Environment().lerp		(weight);
+    float weight;
+    g_pGamePersistent->Environment().Invalidate();
+    g_pGamePersistent->Environment().lerp(weight);
 }
 
-void engine_impl::reload_current_time_frame		()
+void engine_impl::reload_current_time_frame()
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
-	manager.weathers().reload_current_time_frame();
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
+    manager.weathers().reload_current_time_frame();
 }
 
-void engine_impl::reload_target_time_frame		()
+void engine_impl::reload_target_time_frame()
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
-	manager.weathers().reload_target_time_frame();
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
+    manager.weathers().reload_target_time_frame();
 }
 
-void engine_impl::reload_current_weather		()
+void engine_impl::reload_current_weather()
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
 
-	float const game_time						= g_pGamePersistent->Environment().GetGameTime();
-	manager.weathers().reload_current_weather	();
-	g_pGameLevel->SetEnvironmentGameTimeFactor	(iFloor(game_time), environment.fTimeFactor);
-	g_pGamePersistent->Environment().Current[0]	= 0;
-	g_pGamePersistent->Environment().Current[1]	= 0;
-	g_pGamePersistent->Environment().SelectEnvs	(game_time);
-	VERIFY										(g_pGamePersistent->Environment().Current[1]);
-	if (g_pGamePersistent->Environment().Current[1]->exec_time == game_time)
-		g_pGamePersistent->Environment().SelectEnvs	(game_time + .1f);
+    float const game_time = g_pGamePersistent->Environment().GetGameTime();
+    manager.weathers().reload_current_weather();
+    g_pGameLevel->SetEnvironmentGameTimeFactor(iFloor(game_time), environment.fTimeFactor);
+    g_pGamePersistent->Environment().Current[0] = 0;
+    g_pGamePersistent->Environment().Current[1] = 0;
+    g_pGamePersistent->Environment().SelectEnvs(game_time);
+    VERIFY(g_pGamePersistent->Environment().Current[1]);
+    if (g_pGamePersistent->Environment().Current[1]->exec_time == game_time)
+        g_pGamePersistent->Environment().SelectEnvs(game_time + .1f);
 }
 
-void engine_impl::reload_weathers				()
+void engine_impl::reload_weathers()
 {
-	CEnvironment&					environment = g_pGamePersistent->Environment();
-	editor::environment::manager&	manager = dynamic_cast<editor::environment::manager&>(environment);
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    editor::environment::manager& manager = dynamic_cast<editor::environment::manager&>(environment);
 
-	float const game_time						= g_pGamePersistent->Environment().GetGameTime();
-	manager.weathers().reload					();
-	g_pGameLevel->SetEnvironmentGameTimeFactor	(iFloor(game_time), environment.fTimeFactor);
-	g_pGamePersistent->Environment().Current[0]	= 0;
-	g_pGamePersistent->Environment().Current[1]	= 0;
-	g_pGamePersistent->Environment().SelectEnvs	(game_time);
-	VERIFY										(g_pGamePersistent->Environment().Current[1]);
-	if (g_pGamePersistent->Environment().Current[1]->exec_time == game_time)
-		g_pGamePersistent->Environment().SelectEnvs	(game_time + .1f);
+    float const game_time = g_pGamePersistent->Environment().GetGameTime();
+    manager.weathers().reload();
+    g_pGameLevel->SetEnvironmentGameTimeFactor(iFloor(game_time), environment.fTimeFactor);
+    g_pGamePersistent->Environment().Current[0] = 0;
+    g_pGamePersistent->Environment().Current[1] = 0;
+    g_pGamePersistent->Environment().SelectEnvs(game_time);
+    VERIFY(g_pGamePersistent->Environment().Current[1]);
+    if (g_pGamePersistent->Environment().Current[1]->exec_time == game_time)
+        g_pGamePersistent->Environment().SelectEnvs(game_time + .1f);
 }
 
 #endif // #ifdef INGAME_EDITOR
\ No newline at end of file
diff --git a/src/xrEngine/engine_impl.hpp b/src/xrEngine/engine_impl.hpp
index c75160fa230..cf19ef6856d 100644
--- a/src/xrEngine/engine_impl.hpp
+++ b/src/xrEngine/engine_impl.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: engine_impl.hpp
-//	Created 	: 04.12.2007
-//  Modified 	: 04.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : engine implementation class
+// Module : engine_impl.hpp
+// Created : 04.12.2007
+// Modified : 04.12.2007
+// Author : Dmitriy Iassenev
+// Description : engine implementation class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef ENGINE_IMPL_HPP_INCLUDED
@@ -15,72 +15,73 @@
 
 class IInputReceiver;
 
-class engine_impl : public editor::engine {
+class engine_impl : public editor::engine
+{
 public:
-						engine_impl				();
-	virtual				~engine_impl			();
+    engine_impl();
+    virtual ~engine_impl();
 
 private:
-	virtual	bool		on_message				(
-							HWND hWnd,
-							UINT uMsg,
-							WPARAM wParam,
-							LPARAM lParam,
-							LRESULT &result
-						);
-	virtual	void		on_idle					();
-	virtual	void		on_resize				();
-	virtual	void		pause					(bool const &value);
-	virtual	void		capture_input			(bool const &value);
-	virtual	void		disconnect				();
+    virtual bool on_message(
+        HWND hWnd,
+        UINT uMsg,
+        WPARAM wParam,
+        LPARAM lParam,
+        LRESULT& result
+        );
+    virtual void on_idle();
+    virtual void on_resize();
+    virtual void pause(bool const& value);
+    virtual void capture_input(bool const& value);
+    virtual void disconnect();
 
-	virtual	void		value					(LPCSTR value, shared_str& result);
-	virtual	LPCSTR		value					(shared_str const& value);
+    virtual void value(LPCSTR value, shared_str& result);
+    virtual LPCSTR value(shared_str const& value);
 
-	virtual	void		weather					(LPCSTR value);
-	virtual	LPCSTR		weather					();
+    virtual void weather(LPCSTR value);
+    virtual LPCSTR weather();
 
-	virtual	void		current_weather_frame	(LPCSTR frame_id);
-	virtual	LPCSTR		current_weather_frame	();
+    virtual void current_weather_frame(LPCSTR frame_id);
+    virtual LPCSTR current_weather_frame();
 
-	virtual	void		track_frame				(float const& time);
-	virtual	float		track_frame				();
+    virtual void track_frame(float const& time);
+    virtual float track_frame();
 
-	virtual	void		track_weather			(float const& time);
-	virtual	float		track_weather			();
+    virtual void track_weather(float const& time);
+    virtual float track_weather();
 
-	virtual	editor::property_holder*	current_frame_property_holder	();
-	virtual	editor::property_holder*	blend_frame_property_holder		();
-	virtual	editor::property_holder*	target_frame_property_holder	();
+    virtual editor::property_holder* current_frame_property_holder();
+    virtual editor::property_holder* blend_frame_property_holder();
+    virtual editor::property_holder* target_frame_property_holder();
 
-	virtual	void		save_weathers			();
+    virtual void save_weathers();
 
-	virtual	bool		save_time_frame			(char* buffer, u32 const& buffer_size);
+    virtual bool save_time_frame(char* buffer, u32 const& buffer_size);
 
-	virtual	bool		paste_current_time_frame(char const* buffer, u32 const& buffer_size);
-	virtual	bool		paste_target_time_frame	(char const* buffer, u32 const& buffer_size);
+    virtual bool paste_current_time_frame(char const* buffer, u32 const& buffer_size);
+    virtual bool paste_target_time_frame(char const* buffer, u32 const& buffer_size);
 
-	virtual	void		reload_current_time_frame	();
-	virtual	void		reload_target_time_frame	();
+    virtual void reload_current_time_frame();
+    virtual void reload_target_time_frame();
 
-	virtual	void		reload_current_weather	();
-	virtual	void		reload_weathers			();
+    virtual void reload_current_weather();
+    virtual void reload_weathers();
 
-	virtual	bool		add_time_frame			(char const* buffer, u32 const& buffer_size);
+    virtual bool add_time_frame(char const* buffer, u32 const& buffer_size);
 
-	virtual	char const*	weather_current_time	() const;
-	virtual	void		weather_current_time	(char const* time);
+    virtual char const* weather_current_time() const;
+    virtual void weather_current_time(char const* time);
 
 private:
-	virtual	void		weather_paused			(bool const &value);
-	virtual	bool		weather_paused			();
+    virtual void weather_paused(bool const& value);
+    virtual bool weather_paused();
 
-	virtual	void		weather_time_factor		(float const &value);
-	virtual	float		weather_time_factor		();
+    virtual void weather_time_factor(float const& value);
+    virtual float weather_time_factor();
 
 private:
-	IInputReceiver		*m_input_receiver;
-	bool				m_input_captured;
+    IInputReceiver* m_input_receiver;
+    bool m_input_captured;
 }; // class engine_impl
 
 #endif // #ifdef INGAME_EDITOR
diff --git a/src/xrEngine/envelope.h b/src/xrEngine/envelope.h
index 24494e035e9..a6bc16be908 100644
--- a/src/xrEngine/envelope.h
+++ b/src/xrEngine/envelope.h
@@ -9,134 +9,139 @@ class IReader;
 ======================================================================
 envelope.h
 
-  Definitions for local copies of LightWave envelopes.
+Definitions for local copies of LightWave envelopes.
 
-	Ernie Wright  31 Aug 00
+Ernie Wright 31 Aug 00
 
-	  The LightWave plug-in SDK provides its own representation of LightWave
-	  envelopes that plug-ins can use.  These definitions are for standalone
-	  programs that, for example, read scene or object files and must store
-	  the envelopes.
+The LightWave plug-in SDK provides its own representation of LightWave
+envelopes that plug-ins can use. These definitions are for standalone
+programs that, for example, read scene or object files and must store
+the envelopes.
 ====================================================================== */
 
-#define SHAPE_TCB   0
-#define SHAPE_HERM  1
-#define SHAPE_BEZI  2
-#define SHAPE_LINE  3
-#define SHAPE_STEP  4
-#define SHAPE_BEZ2  5
+#define SHAPE_TCB 0
+#define SHAPE_HERM 1
+#define SHAPE_BEZI 2
+#define SHAPE_LINE 3
+#define SHAPE_STEP 4
+#define SHAPE_BEZ2 5
 
-#define BEH_RESET      0
-#define BEH_CONSTANT   1
-#define BEH_REPEAT     2
-#define BEH_OSCILLATE  3
-#define BEH_OFFSET     4
-#define BEH_LINEAR     5
+#define BEH_RESET 0
+#define BEH_CONSTANT 1
+#define BEH_REPEAT 2
+#define BEH_OSCILLATE 3
+#define BEH_OFFSET 4
+#define BEH_LINEAR 5
 
 
 #pragma pack( push,1 )
-struct st_Key{
-	enum{
-    	ktStepped = 1<<0,
+struct st_Key
+{
+    enum
+    {
+        ktStepped = 1 << 0,
     };
-	float		value;
-	float		time;
-	u8			shape;
-	float		tension;
-	float		continuity;
-	float		bias;
-	float		param[ 4 ];
-				st_Key		(){ZeroMemory(this,sizeof(st_Key));}
-    IC bool		equal		(const st_Key& tgt)
+    float value;
+    float time;
+    u8 shape;
+    float tension;
+    float continuity;
+    float bias;
+    float param[4];
+    st_Key() { ZeroMemory(this, sizeof(st_Key)); }
+    IC bool equal(const st_Key& tgt)
     {
-    	if (!fsimilar(value,tgt.value)) 			return false;
-    	if (!fsimilar(shape,tgt.shape)) 			return false;
-    	if (!fsimilar(tension,tgt.tension)) 		return false;
-    	if (!fsimilar(continuity,tgt.continuity)) 	return false;
-    	if (!fsimilar(bias,tgt.bias)) 				return false;
-    	if (!fsimilar(param[0],tgt.param[0])) 		return false;
-    	if (!fsimilar(param[1],tgt.param[1]))	 	return false;
-    	if (!fsimilar(param[2],tgt.param[2])) 		return false;
-    	if (!fsimilar(param[3],tgt.param[3])) 		return false;
+        if (!fsimilar(value, tgt.value)) return false;
+        if (!fsimilar(shape, tgt.shape)) return false;
+        if (!fsimilar(tension, tgt.tension)) return false;
+        if (!fsimilar(continuity, tgt.continuity)) return false;
+        if (!fsimilar(bias, tgt.bias)) return false;
+        if (!fsimilar(param[0], tgt.param[0])) return false;
+        if (!fsimilar(param[1], tgt.param[1])) return false;
+        if (!fsimilar(param[2], tgt.param[2])) return false;
+        if (!fsimilar(param[3], tgt.param[3])) return false;
         return true;
     }
-    IC void		Save		(IWriter& F)
+    IC void Save(IWriter& F)
     {
-        F.w_float	(value);
-        F.w_float	(time);
-        F.w_u8		(shape);
-        if (shape!=4){ // ! Stepped
-            F.w_float_q16(tension,-32.f,32.f);
-            F.w_float_q16(continuity,-32.f,32.f);
-            F.w_float_q16(bias,-32.f,32.f);
-            F.w_float_q16(param[0],-32.f,32.f);
-            F.w_float_q16(param[1],-32.f,32.f);
-            F.w_float_q16(param[2],-32.f,32.f);
-            F.w_float_q16(param[3],-32.f,32.f);
+        F.w_float(value);
+        F.w_float(time);
+        F.w_u8(shape);
+        if (shape != 4)  // ! Stepped
+        {
+            F.w_float_q16(tension, -32.f, 32.f);
+            F.w_float_q16(continuity, -32.f, 32.f);
+            F.w_float_q16(bias, -32.f, 32.f);
+            F.w_float_q16(param[0], -32.f, 32.f);
+            F.w_float_q16(param[1], -32.f, 32.f);
+            F.w_float_q16(param[2], -32.f, 32.f);
+            F.w_float_q16(param[3], -32.f, 32.f);
         }
     }
-	IC void		Load_1		(IReader& F)
+    IC void Load_1(IReader& F)
     {
-        value		= F.r_float();
-        time		= F.r_float();
-        shape		= u8((u8)F.r_u32()&0xff);
-        tension		= F.r_float();
-        continuity	= F.r_float();
-        bias		= F.r_float();
-        F.r			(&param,sizeof(float)*4);
+        value = F.r_float();
+        time = F.r_float();
+        shape = u8((u8)F.r_u32() & 0xff);
+        tension = F.r_float();
+        continuity = F.r_float();
+        bias = F.r_float();
+        F.r(&param, sizeof(float) * 4);
     }
-	IC void		Load_2		(IReader& F)
+    IC void Load_2(IReader& F)
     {
-        value		= F.r_float();
-        time		= F.r_float();
-        shape		= F.r_u8();
-        if (shape!=4){ // ! Stepped
-            tension		= F.r_float_q16(-32.f,32.f);
-            continuity	= F.r_float_q16(-32.f,32.f);
-            bias		= F.r_float_q16(-32.f,32.f);
-            param[0]	= F.r_float_q16(-32.f,32.f);
-            param[1]	= F.r_float_q16(-32.f,32.f);
-            param[2]	= F.r_float_q16(-32.f,32.f);
-            param[3]	= F.r_float_q16(-32.f,32.f);
+        value = F.r_float();
+        time = F.r_float();
+        shape = F.r_u8();
+        if (shape != 4)  // ! Stepped
+        {
+            tension = F.r_float_q16(-32.f, 32.f);
+            continuity = F.r_float_q16(-32.f, 32.f);
+            bias = F.r_float_q16(-32.f, 32.f);
+            param[0] = F.r_float_q16(-32.f, 32.f);
+            param[1] = F.r_float_q16(-32.f, 32.f);
+            param[2] = F.r_float_q16(-32.f, 32.f);
+            param[3] = F.r_float_q16(-32.f, 32.f);
         }
     }
 };
 #pragma pack( pop )
 
-DEFINE_VECTOR(st_Key*,KeyVec,KeyIt);
+DEFINE_VECTOR(st_Key*, KeyVec, KeyIt);
 
 // refs
 class CExporter;
 
-class ENGINE_API CEnvelope {
+class ENGINE_API CEnvelope
+{
 public:
-	KeyVec		keys;
-	int			behavior[2];
+    KeyVec keys;
+    int behavior[2];
 public:
-				CEnvelope	(){behavior[0]=1;behavior[1]=1;}
-				CEnvelope	(CEnvelope* source);
-	virtual		~CEnvelope	();
-
-	float		Evaluate	(float t);
-
-	void		Clear		();
-	void		ClearAndFree();
-	void		Save		(IWriter& F);
-	void		Load_1		(IReader& F);
-	void		Load_2		(IReader& F);
-	void		SaveA		(IWriter& F);
-	void		LoadA		(IReader& F);
-
-    void		RotateKeys	(float angle);
-
-    KeyIt		FindKey		(float t, float eps);
-    void		FindNearestKey(float t, KeyIt& min, KeyIt& max, float eps);
-    void		InsertKey	(float t, float val);                                   
-    void		DeleteKey	(float t);
-    BOOL		ScaleKeys	(float from_time, float to_time, float scale_factor, float eps);
-    float		GetLength	(float* mn, float* mx);
-
-    void		Optimize	();
+    CEnvelope() { behavior[0] = 1; behavior[1] = 1; }
+    CEnvelope(CEnvelope* source);
+    virtual ~CEnvelope();
+
+    float Evaluate(float t);
+
+    void Clear();
+    void ClearAndFree();
+    void Save(IWriter& F);
+    void Load_1(IReader& F);
+    void Load_2(IReader& F);
+    void SaveA(IWriter& F);
+    void LoadA(IReader& F);
+
+    void RotateKeys(float angle);
+
+    KeyIt FindKey(float t, float eps);
+    void FindNearestKey(float t, KeyIt& min, KeyIt& max, float eps);
+    void InsertKey(float t, float val);
+    void DeleteKey(float t);
+    BOOL ScaleKeys(float from_time, float to_time, float scale_factor, float eps);
+    float GetLength(float* mn, float* mx);
+
+    void Optimize();
 };
 
 #endif //_ENVELOPE_H_
diff --git a/src/xrEngine/fmesh.cpp b/src/xrEngine/fmesh.cpp
index eeb2a77e2b5..7706dd7ae6e 100644
--- a/src/xrEngine/fmesh.cpp
+++ b/src/xrEngine/fmesh.cpp
@@ -8,26 +8,26 @@
 
 //BOOL ValidateIndices(u32 vCount, u32 iCount, u16* pIndices)
 //{
-//	if (vCount>65535)	return FALSE;
-//	if (iCount%3)		return FALSE;
+// if (vCount>65535) return FALSE;
+// if (iCount%3) return FALSE;
 //
-//	for (u32 I=0; I<iCount; I++)
-//	{
-//		if (u32(pIndices[I])>=vCount)	return FALSE;
-//	}
-//	return TRUE;
+// for (u32 I=0; I<iCount; I++)
+// {
+// if (u32(pIndices[I])>=vCount) return FALSE;
+// }
+// return TRUE;
 //}
 
 //static u32 dwPositionPart[8] =
 //{
-//	0,	// no position
-//	3,	// x,y,z
-//	4,	// sx,sy,sz,rhw
-//	4,	// x,y,z,b1
-//	5,	// x,y,z,b1,b2
-//	6,	// x,y,z,b1,b2,b3
-//	7,	// x,y,z,b1,b2,b3,b4
-//	8	// x,y,z,b1,b2,b3,b4,b5
+// 0, // no position
+// 3, // x,y,z
+// 4, // sx,sy,sz,rhw
+// 4, // x,y,z,b1
+// 5, // x,y,z,b1,b2
+// 6, // x,y,z,b1,b2,b3
+// 7, // x,y,z,b1,b2,b3,b4
+// 8 // x,y,z,b1,b2,b3,b4,b5
 //};
 
 //#define FAKES 0xffffffff
@@ -37,149 +37,149 @@
 void ConvertVertices(u32 dwTypeDest, void *pDest, u32 dwTypeSrc, void *pSource, u32 dwCount)
 // assuming that pDest is large enought to maintain all the data
 {
-	u32	TransferMask	[64];
-	u32	tmPos			= 0;
-	u32	tmPosSrc		= 0;
-	u32	dwSizeSrc		= D3DXGetFVFVertexSize(dwTypeSrc)/4;
-	u32	dwSizeDest		= D3DXGetFVFVertexSize(dwTypeDest)/4;
-	u32*	dest		= (u32*)pDest;
-	u32*	src			= (u32*)pSource;
+u32 TransferMask [64];
+u32 tmPos = 0;
+u32 tmPosSrc = 0;
+u32 dwSizeSrc = D3DXGetFVFVertexSize(dwTypeSrc)/4;
+u32 dwSizeDest = D3DXGetFVFVertexSize(dwTypeDest)/4;
+u32* dest = (u32*)pDest;
+u32* src = (u32*)pSource;
 
-	// avoid redundant processing
-	if (dwTypeDest==dwTypeSrc) {
-		CopyMemory	(pDest,pSource,dwSizeDest*dwCount*4);
-		return;
-	}
+// avoid redundant processing
+if (dwTypeDest==dwTypeSrc) {
+CopyMemory (pDest,pSource,dwSizeDest*dwCount*4);
+return;
+}
 
-	// how many bytes to 'simple copy'
-	u32 dwPosDest	= (dwTypeDest&D3DFVF_POSITION_MASK)>>1;
-	u32 dwPosSrc	= (dwTypeSrc&D3DFVF_POSITION_MASK)>>1;
-	if (dwPosDest==dwPosSrc) {
-		u32 cnt = dwPositionPart[dwPosSrc];
-		for (u32 i=0; i<cnt; i++) TransferMask[tmPos++]=i;
-		tmPosSrc = tmPos;
-	} else {
-		FATAL		("Can't convert between different vertex positions");
-	}
+// how many bytes to 'simple copy'
+u32 dwPosDest = (dwTypeDest&D3DFVF_POSITION_MASK)>>1;
+u32 dwPosSrc = (dwTypeSrc&D3DFVF_POSITION_MASK)>>1;
+if (dwPosDest==dwPosSrc) {
+u32 cnt = dwPositionPart[dwPosSrc];
+for (u32 i=0; i<cnt; i++) TransferMask[tmPos++]=i;
+tmPosSrc = tmPos;
+} else {
+FATAL ("Can't convert between different vertex positions");
+}
 
-	// ---------------------- "Reserved" property
-	if ((dwTypeDest&D3DFVF_PSIZE) && (dwTypeSrc&D3DFVF_PSIZE))
-	{	// DEST & SRC
-		TransferMask[tmPos++]=tmPosSrc++;
-	}
-	if ((dwTypeDest&D3DFVF_PSIZE) && !(dwTypeSrc&D3DFVF_PSIZE))
-	{	// DEST & !SRC
-		TransferMask[tmPos++]=FAKEZ;// fake data
-	}
-	if (!(dwTypeDest&D3DFVF_PSIZE) && (dwTypeSrc&D3DFVF_PSIZE))
-	{	// !DEST & SRC
-		tmPosSrc++;					// skip it
-	}
+// ---------------------- "Reserved" property
+if ((dwTypeDest&D3DFVF_PSIZE) && (dwTypeSrc&D3DFVF_PSIZE))
+{ // DEST & SRC
+TransferMask[tmPos++]=tmPosSrc++;
+}
+if ((dwTypeDest&D3DFVF_PSIZE) && !(dwTypeSrc&D3DFVF_PSIZE))
+{ // DEST & !SRC
+TransferMask[tmPos++]=FAKEZ;// fake data
+}
+if (!(dwTypeDest&D3DFVF_PSIZE) && (dwTypeSrc&D3DFVF_PSIZE))
+{ // !DEST & SRC
+tmPosSrc++; // skip it
+}
 
-	// ---------------------- "Normal" property
-	if ((dwTypeDest&D3DFVF_NORMAL) && (dwTypeSrc&D3DFVF_NORMAL))
-	{	// DEST & SRC
-		TransferMask[tmPos++]=tmPosSrc++;
-		TransferMask[tmPos++]=tmPosSrc++;
-		TransferMask[tmPos++]=tmPosSrc++;
-	}
-	if ((dwTypeDest&D3DFVF_NORMAL) && !(dwTypeSrc&D3DFVF_NORMAL))
-	{	// DEST & !SRC
-		FATAL	("Source format doesn't have NORMAL but destination HAS");
-	}
-	if (!(dwTypeDest&D3DFVF_NORMAL) && (dwTypeSrc&D3DFVF_NORMAL))
-	{	// !DEST & SRC
-		tmPosSrc++;					// skip it
-		tmPosSrc++;					// skip it
-		tmPosSrc++;					// skip it
-	}
+// ---------------------- "Normal" property
+if ((dwTypeDest&D3DFVF_NORMAL) && (dwTypeSrc&D3DFVF_NORMAL))
+{ // DEST & SRC
+TransferMask[tmPos++]=tmPosSrc++;
+TransferMask[tmPos++]=tmPosSrc++;
+TransferMask[tmPos++]=tmPosSrc++;
+}
+if ((dwTypeDest&D3DFVF_NORMAL) && !(dwTypeSrc&D3DFVF_NORMAL))
+{ // DEST & !SRC
+FATAL ("Source format doesn't have NORMAL but destination HAS");
+}
+if (!(dwTypeDest&D3DFVF_NORMAL) && (dwTypeSrc&D3DFVF_NORMAL))
+{ // !DEST & SRC
+tmPosSrc++; // skip it
+tmPosSrc++; // skip it
+tmPosSrc++; // skip it
+}
 
-	// ---------------------- "Diffuse" property
-	if ((dwTypeDest&D3DFVF_DIFFUSE) && (dwTypeSrc&D3DFVF_DIFFUSE))
-	{	// DEST & SRC
-		TransferMask[tmPos++]=tmPosSrc++;
-	}
-	if ((dwTypeDest&D3DFVF_DIFFUSE) && !(dwTypeSrc&D3DFVF_DIFFUSE))
-	{	// DEST & !SRC
-		TransferMask[tmPos++]=FAKES;	// fake data - white
-	}
-	if (!(dwTypeDest&D3DFVF_DIFFUSE) && (dwTypeSrc&D3DFVF_DIFFUSE))
-	{	// !DEST & SRC
-		tmPosSrc++;						// skip it
-	}
+// ---------------------- "Diffuse" property
+if ((dwTypeDest&D3DFVF_DIFFUSE) && (dwTypeSrc&D3DFVF_DIFFUSE))
+{ // DEST & SRC
+TransferMask[tmPos++]=tmPosSrc++;
+}
+if ((dwTypeDest&D3DFVF_DIFFUSE) && !(dwTypeSrc&D3DFVF_DIFFUSE))
+{ // DEST & !SRC
+TransferMask[tmPos++]=FAKES; // fake data - white
+}
+if (!(dwTypeDest&D3DFVF_DIFFUSE) && (dwTypeSrc&D3DFVF_DIFFUSE))
+{ // !DEST & SRC
+tmPosSrc++; // skip it
+}
 
-	// ---------------------- "Specular" property
-	if ((dwTypeDest&D3DFVF_SPECULAR) && (dwTypeSrc&D3DFVF_SPECULAR))
-	{	// DEST & SRC
-		TransferMask[tmPos++]=tmPosSrc++;
-	}
-	if ((dwTypeDest&D3DFVF_SPECULAR) && !(dwTypeSrc&D3DFVF_SPECULAR))
-	{	// DEST & !SRC
-		TransferMask[tmPos++]=FAKES;	// fake data - white
-	}
-	if (!(dwTypeDest&D3DFVF_SPECULAR) && (dwTypeSrc&D3DFVF_SPECULAR))
-	{	// !DEST & SRC
-		tmPosSrc++;						// skip it
-	}
+// ---------------------- "Specular" property
+if ((dwTypeDest&D3DFVF_SPECULAR) && (dwTypeSrc&D3DFVF_SPECULAR))
+{ // DEST & SRC
+TransferMask[tmPos++]=tmPosSrc++;
+}
+if ((dwTypeDest&D3DFVF_SPECULAR) && !(dwTypeSrc&D3DFVF_SPECULAR))
+{ // DEST & !SRC
+TransferMask[tmPos++]=FAKES; // fake data - white
+}
+if (!(dwTypeDest&D3DFVF_SPECULAR) && (dwTypeSrc&D3DFVF_SPECULAR))
+{ // !DEST & SRC
+tmPosSrc++; // skip it
+}
 
-	// ---------------------- "Texture coords" property
-	u32 dwTDest = ((dwTypeDest&D3DFVF_TEXCOUNT_MASK)>>D3DFVF_TEXCOUNT_SHIFT);
-	u32 dwTSrc  = ((dwTypeSrc &D3DFVF_TEXCOUNT_MASK)>>D3DFVF_TEXCOUNT_SHIFT);
-	if (dwTDest<=dwTSrc) {
-		for (u32 i=0; i<dwTDest; i++) {
-			TransferMask[tmPos++]=tmPosSrc++;
-			TransferMask[tmPos++]=tmPosSrc++;
-		}
-	} else {
-		if (dwTSrc==0) {
-			FATAL	("Source vertex format doesn't has texture coords at all");
-		}
-		// Copy real TC
-		u32 dwStage0TC = tmPosSrc;
-		for (u32 i=0; i<dwTSrc; i++) {
-			TransferMask[tmPos++]=tmPosSrc++;
-			TransferMask[tmPos++]=tmPosSrc++;
-		}
-		// Duplicate stage0 TC
-		for (i=dwTSrc; i<dwTDest; i++) {
-			TransferMask[tmPos++]=dwStage0TC;
-			TransferMask[tmPos++]=dwStage0TC+1;
-		}
-	}
+// ---------------------- "Texture coords" property
+u32 dwTDest = ((dwTypeDest&D3DFVF_TEXCOUNT_MASK)>>D3DFVF_TEXCOUNT_SHIFT);
+u32 dwTSrc = ((dwTypeSrc &D3DFVF_TEXCOUNT_MASK)>>D3DFVF_TEXCOUNT_SHIFT);
+if (dwTDest<=dwTSrc) {
+for (u32 i=0; i<dwTDest; i++) {
+TransferMask[tmPos++]=tmPosSrc++;
+TransferMask[tmPos++]=tmPosSrc++;
+}
+} else {
+if (dwTSrc==0) {
+FATAL ("Source vertex format doesn't has texture coords at all");
+}
+// Copy real TC
+u32 dwStage0TC = tmPosSrc;
+for (u32 i=0; i<dwTSrc; i++) {
+TransferMask[tmPos++]=tmPosSrc++;
+TransferMask[tmPos++]=tmPosSrc++;
+}
+// Duplicate stage0 TC
+for (i=dwTSrc; i<dwTDest; i++) {
+TransferMask[tmPos++]=dwStage0TC;
+TransferMask[tmPos++]=dwStage0TC+1;
+}
+}
 
-	// ---------------------- REAL CONVERTION USING BUILDED MASK
-	for (u32 i=0; i<dwCount; i++) {
-		// one vertex
-		for (u32 j=0; j<dwSizeDest; j++) {
-			u32 m = TransferMask[j];
-			if (m == FAKES) dest[j]=0xffffffff;
-			else if (m == FAKEZ) dest[j]=0;
-			else dest[j]=src[m];
-		}
-		dest	+= dwSizeDest;
-		src		+= dwSizeSrc;
-	}
-	return;
+// ---------------------- REAL CONVERTION USING BUILDED MASK
+for (u32 i=0; i<dwCount; i++) {
+// one vertex
+for (u32 j=0; j<dwSizeDest; j++) {
+u32 m = TransferMask[j];
+if (m == FAKES) dest[j]=0xffffffff;
+else if (m == FAKEZ) dest[j]=0;
+else dest[j]=src[m];
+}
+dest += dwSizeDest;
+src += dwSizeSrc;
+}
+return;
 }
 */
 void ogf_desc::Load(IReader& F)
 {
-	F.r_stringZ	(source_file);
-    F.r_stringZ	(build_name);
-    F.r			(&build_time,sizeof(build_time));
-    F.r_stringZ	(create_name);
-    F.r			(&create_time,sizeof(create_time));
-    F.r_stringZ	(modif_name);
-    F.r			(&modif_time,sizeof(modif_time));
+    F.r_stringZ(source_file);
+    F.r_stringZ(build_name);
+    F.r(&build_time, sizeof(build_time));
+    F.r_stringZ(create_name);
+    F.r(&create_time, sizeof(create_time));
+    F.r_stringZ(modif_name);
+    F.r(&modif_time, sizeof(modif_time));
 }
 void ogf_desc::Save(IWriter& F)
 {
-	F.w_stringZ	(source_file);
-    F.w_stringZ	(build_name);
-    F.w			(&build_time,sizeof(build_time));
-    F.w_stringZ	(create_name);
-    F.w			(&create_time,sizeof(create_time));
-    F.w_stringZ	(modif_name);
-    F.w			(&modif_time,sizeof(modif_time));
+    F.w_stringZ(source_file);
+    F.w_stringZ(build_name);
+    F.w(&build_time, sizeof(build_time));
+    F.w_stringZ(create_name);
+    F.w(&create_time, sizeof(create_time));
+    F.w_stringZ(modif_name);
+    F.w(&modif_time, sizeof(modif_time));
 }
 
diff --git a/src/xrEngine/ide.hpp b/src/xrEngine/ide.hpp
index 1022c4a2efb..d3d4821bfa1 100644
--- a/src/xrEngine/ide.hpp
+++ b/src/xrEngine/ide.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: ide.hpp
-//	Created 	: 11.12.2007
-//  Modified 	: 29.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : editor ide function
+// Module : ide.hpp
+// Created : 11.12.2007
+// Modified : 29.12.2007
+// Author : Dmitriy Iassenev
+// Description : editor ide function
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef IDE_HPP_INCLUDED
@@ -13,14 +13,15 @@
 
 #include "../include/editor/ide.hpp"
 
-namespace editor {
-	class ide;
+namespace editor
+{
+class ide;
 } // namespace editor
 
-inline editor::ide&	ide	()
+inline editor::ide& ide()
 {
-	VERIFY	(Device.editor());
-	return	(*Device.editor());
+    VERIFY(Device.editor());
+    return (*Device.editor());
 }
 
 #endif // #ifdef INGAME_EDITOR
diff --git a/src/xrEngine/interp.cpp b/src/xrEngine/interp.cpp
index 4af1ee0a67d..cf7137f1ff0 100644
--- a/src/xrEngine/interp.cpp
+++ b/src/xrEngine/interp.cpp
@@ -3,7 +3,7 @@
 //
 //Interpolation (and extrapolation) of LightWave envelopes.
 //
-//Ernie Wright  16 Nov 00
+//Ernie Wright 16 Nov 00
 //
 //The LightWave plug-in SDK provides functions for evaluating envelopes
 //and channels at arbitrary times, which is what plug-ins should use.
@@ -19,22 +19,24 @@
 //range()
 //
 //Given the value v of a periodic function, returns the equivalent value
-//v2 in the principal interval [lo, hi].  If i isn't NULL, it receives
+//v2 in the principal interval [lo, hi]. If i isn't NULL, it receives
 //the number of wavelengths between v and v2.
 //
-//   v2 = v - i * (hi - lo)
+// v2 = v - i * (hi - lo)
 //
 //For example, range( 3 pi, 0, 2 pi, i ) returns pi, with i = 1.
 //======================================================================
-static float range( float v, float lo, float hi, int *i ){
-   float v2, r = hi - lo;
-   if ( r == 0.0 ){
-      if ( i ) *i = 0;
-      return lo;
-   }
-   v2 = lo + v - r * ( float ) floor(( float ) v / r );
-   if ( i ) *i = -( int )(( v2 - v ) / r + ( v2 > v ? 0.5 : -0.5 ));
-   return v2;
+static float range(float v, float lo, float hi, int* i)
+{
+    float v2, r = hi - lo;
+    if (r == 0.0)
+    {
+        if (i) *i = 0;
+        return lo;
+    }
+    v2 = lo + v - r * (float)floor((float)v / r);
+    if (i) *i = -(int)((v2 - v) / r + (v2 > v ? 0.5 : -0.5));
+    return v2;
 }
 
 
@@ -43,16 +45,17 @@ static float range( float v, float lo, float hi, int *i ){
 //
 //Calculate the Hermite coefficients.
 //======================================================================
-static void hermite( float t, float *h1, float *h2, float *h3, float *h4 ){
-   float t2, t3;
+static void hermite(float t, float* h1, float* h2, float* h3, float* h4)
+{
+    float t2, t3;
 
-   t2 = t * t;
-   t3 = t * t2;
+    t2 = t * t;
+    t3 = t * t2;
 
-   *h2 = 3.0f * t2 - t3 - t3;
-   *h1 = 1.0f - *h2;
-   *h4 = t3 - t2;
-   *h3 = *h4 - t2 + t;
+    *h2 = 3.0f * t2 - t3 - t3;
+    *h1 = 1.0f - *h2;
+    *h4 = t3 - t2;
+    *h3 = *h4 - t2 + t;
 }
 
 
@@ -61,42 +64,45 @@ static void hermite( float t, float *h1, float *h2, float *h3, float *h4 ){
 //
 //Interpolate the value of a 1D Bezier curve.
 //======================================================================
-static float bezier( float x0, float x1, float x2, float x3, float t ){
-   float a, b, c, t2, t3;
+static float bezier(float x0, float x1, float x2, float x3, float t)
+{
+    float a, b, c, t2, t3;
 
-   t2 = t * t;
-   t3 = t2 * t;
+    t2 = t * t;
+    t3 = t2 * t;
 
-   c = 3.0f * ( x1 - x0 );
-   b = 3.0f * ( x2 - x1 ) - c;
-   a = x3 - x0 - c - b;
+    c = 3.0f * (x1 - x0);
+    b = 3.0f * (x2 - x1) - c;
+    a = x3 - x0 - c - b;
 
-   return a * t3 + b * t2 + c * t + x0;
+    return a * t3 + b * t2 + c * t + x0;
 }
 
 
 //======================================================================
 //bez2_time()
 //
-//Find the t for which bezier() returns the input time.  The handle
+//Find the t for which bezier() returns the input time. The handle
 //endpoints of a BEZ2 curve represent the control points, and these have
 //(time, value) coordinates, so time is used as both a coordinate and a
 //parameter for this curve type.
 //======================================================================
-static float bez2_time( float x0, float x1, float x2, float x3, float time, float *t0, float *t1 ){
-   float v, t;
-
-   t = *t0 + ( *t1 - *t0 ) * 0.5f;
-   v = bezier( x0, x1, x2, x3, t );
-   if ( _abs( time - v ) > .0001f ) {
-      if ( v > time )
-         *t1 = t;
-      else
-         *t0 = t;
-      return bez2_time( x0, x1, x2, x3, time, t0, t1 );
-   }
-   else
-      return t;
+static float bez2_time(float x0, float x1, float x2, float x3, float time, float* t0, float* t1)
+{
+    float v, t;
+
+    t = *t0 + (*t1 - *t0) * 0.5f;
+    v = bezier(x0, x1, x2, x3, t);
+    if (_abs(time - v) > .0001f)
+    {
+        if (v > time)
+            *t1 = t;
+        else
+            *t0 = t;
+        return bez2_time(x0, x1, x2, x3, time, t0, t1);
+    }
+    else
+        return t;
 }
 
 
@@ -105,138 +111,148 @@ static float bez2_time( float x0, float x1, float x2, float x3, float time, floa
 //
 //Interpolate the value of a BEZ2 curve.
 //======================================================================
-static float bez2( st_Key *key0, st_Key *key1, float time ){
-   float x, y, t, t0 = 0.0f, t1 = 1.0f;
+static float bez2(st_Key* key0, st_Key* key1, float time)
+{
+    float x, y, t, t0 = 0.0f, t1 = 1.0f;
 
-   if ( key0->shape == SHAPE_BEZ2 )
-      x = key0->time + key0->param[ 2 ];
-   else
-      x = key0->time + ( key1->time - key0->time ) / 3.0f;
+    if (key0->shape == SHAPE_BEZ2)
+        x = key0->time + key0->param[2];
+    else
+        x = key0->time + (key1->time - key0->time) / 3.0f;
 
-   t = bez2_time( key0->time, x, key1->time + key1->param[ 0 ], key1->time,
-      time, &t0, &t1 );
+    t = bez2_time(key0->time, x, key1->time + key1->param[0], key1->time,
+        time, &t0, &t1);
 
-   if ( key0->shape == SHAPE_BEZ2 )
-      y = key0->value + key0->param[ 3 ];
-   else
-      y = key0->value + key0->param[ 1 ] / 3.0f;
+    if (key0->shape == SHAPE_BEZ2)
+        y = key0->value + key0->param[3];
+    else
+        y = key0->value + key0->param[1] / 3.0f;
 
-   return bezier( key0->value, y, key1->param[ 1 ] + key1->value, key1->value, t );
+    return bezier(key0->value, y, key1->param[1] + key1->value, key1->value, t);
 }
 
 
 //======================================================================
 //outgoing()
 //
-//Return the outgoing tangent to the curve at key0.  The value returned
+//Return the outgoing tangent to the curve at key0. The value returned
 //for the BEZ2 case is used when extrapolating a linear pre behavior and
 //when interpolating a non-BEZ2 span.
 //======================================================================
-static float outgoing( st_Key *key0p, st_Key *key0, st_Key *key1 ){
-   float a, b, d, t, out;
-
-   switch ( key0->shape ){
-      case SHAPE_TCB:
-         a = ( 1.0f - key0->tension ) * ( 1.0f + key0->continuity ) * ( 1.0f + key0->bias );
-         b = ( 1.0f - key0->tension ) * ( 1.0f - key0->continuity ) * ( 1.0f - key0->bias );
-         d = key1->value - key0->value;
-
-         if ( key0p ) {
-            t = ( key1->time - key0->time ) / ( key1->time - key0p->time );
-            out = t * ( a * ( key0->value - key0p->value ) + b * d );
-         }else
+static float outgoing(st_Key* key0p, st_Key* key0, st_Key* key1)
+{
+    float a, b, d, t, out;
+
+    switch (key0->shape)
+    {
+    case SHAPE_TCB:
+        a = (1.0f - key0->tension) * (1.0f + key0->continuity) * (1.0f + key0->bias);
+        b = (1.0f - key0->tension) * (1.0f - key0->continuity) * (1.0f - key0->bias);
+        d = key1->value - key0->value;
+
+        if (key0p)
+        {
+            t = (key1->time - key0->time) / (key1->time - key0p->time);
+            out = t * (a * (key0->value - key0p->value) + b * d);
+        }
+        else
             out = b * d;
-         break;
-
-      case SHAPE_LINE:
-         d = key1->value - key0->value;
-         if ( key0p ) {
-            t = ( key1->time - key0->time ) / ( key1->time - key0p->time );
-            out = t * ( key0->value - key0p->value + d );
-         }
-         else
+        break;
+
+    case SHAPE_LINE:
+        d = key1->value - key0->value;
+        if (key0p)
+        {
+            t = (key1->time - key0->time) / (key1->time - key0p->time);
+            out = t * (key0->value - key0p->value + d);
+        }
+        else
             out = d;
-         break;
-
-      case SHAPE_BEZI:
-      case SHAPE_HERM:
-         out = key0->param[ 1 ];
-         if ( key0p )
-            out *= ( key1->time - key0->time ) / ( key1->time - key0p->time );
-         break;
-
-      case SHAPE_BEZ2:
-         out = key0->param[ 3 ] * ( key1->time - key0->time );
-         if ( _abs( key0->param[ 2 ] ) > 1e-5f )
-            out /= key0->param[ 2 ];
-         else
+        break;
+
+    case SHAPE_BEZI:
+    case SHAPE_HERM:
+        out = key0->param[1];
+        if (key0p)
+            out *= (key1->time - key0->time) / (key1->time - key0p->time);
+        break;
+
+    case SHAPE_BEZ2:
+        out = key0->param[3] * (key1->time - key0->time);
+        if (_abs(key0->param[2]) > 1e-5f)
+            out /= key0->param[2];
+        else
             out *= 1e5f;
-         break;
+        break;
 
-      case SHAPE_STEP:
-      default:
-         out = 0.0f;
-         break;
-   }
+    case SHAPE_STEP:
+    default:
+        out = 0.0f;
+        break;
+    }
 
-   return out;
+    return out;
 }
 
 //======================================================================
 //incoming()
 //
-//Return the incoming tangent to the curve at key1.  The value returned
+//Return the incoming tangent to the curve at key1. The value returned
 //for the BEZ2 case is used when extrapolating a linear post behavior.
 //======================================================================
-static float incoming( st_Key *key0, st_Key *key1, st_Key *key1n ){
-   float a, b, d, t, in;
-
-   switch ( key1->shape ){
-      case SHAPE_LINE:
-         d = key1->value - key0->value;
-         if ( key1n ) {
-            t = ( key1->time - key0->time ) / ( key1n->time - key0->time );
-            in = t * ( key1n->value - key1->value + d );
-         }
-         else
+static float incoming(st_Key* key0, st_Key* key1, st_Key* key1n)
+{
+    float a, b, d, t, in;
+
+    switch (key1->shape)
+    {
+    case SHAPE_LINE:
+        d = key1->value - key0->value;
+        if (key1n)
+        {
+            t = (key1->time - key0->time) / (key1n->time - key0->time);
+            in = t * (key1n->value - key1->value + d);
+        }
+        else
             in = d;
-         break;
-
-      case SHAPE_TCB:
-         a = ( 1.0f - key1->tension ) * ( 1.0f - key1->continuity ) * ( 1.0f + key1->bias );
-         b = ( 1.0f - key1->tension ) * ( 1.0f + key1->continuity ) * ( 1.0f - key1->bias );
-         d = key1->value - key0->value;
-
-         if ( key1n ) {
-            t = ( key1->time - key0->time ) / ( key1n->time - key0->time );
-            in = t * ( b * ( key1n->value - key1->value ) + a * d );
-         }
-         else
+        break;
+
+    case SHAPE_TCB:
+        a = (1.0f - key1->tension) * (1.0f - key1->continuity) * (1.0f + key1->bias);
+        b = (1.0f - key1->tension) * (1.0f + key1->continuity) * (1.0f - key1->bias);
+        d = key1->value - key0->value;
+
+        if (key1n)
+        {
+            t = (key1->time - key0->time) / (key1n->time - key0->time);
+            in = t * (b * (key1n->value - key1->value) + a * d);
+        }
+        else
             in = a * d;
-         break;
-
-      case SHAPE_BEZI:
-      case SHAPE_HERM:
-         in = key1->param[ 0 ];
-         if ( key1n )
-            in *= ( key1->time - key0->time ) / ( key1n->time - key0->time );
-         break;
-
-      case SHAPE_BEZ2:
-         in = key1->param[ 1 ] * ( key1->time - key0->time );
-         if ( _abs( key1->param[ 0 ] ) > 1e-5f )
-            in /= key1->param[ 0 ];
-         else
+        break;
+
+    case SHAPE_BEZI:
+    case SHAPE_HERM:
+        in = key1->param[0];
+        if (key1n)
+            in *= (key1->time - key0->time) / (key1n->time - key0->time);
+        break;
+
+    case SHAPE_BEZ2:
+        in = key1->param[1] * (key1->time - key0->time);
+        if (_abs(key1->param[0]) > 1e-5f)
+            in /= key1->param[0];
+        else
             in *= 1e5f;
-         break;
+        break;
 
-      case SHAPE_STEP:
-      default:
-         in = 0.0f;
-         break;
-   }
+    case SHAPE_STEP:
+    default:
+        in = 0.0f;
+        break;
+    }
 
-   return in;
+    return in;
 }
 
 
@@ -247,100 +263,113 @@ static float incoming( st_Key *key0, st_Key *key1, st_Key *key1n ){
 //Given a _list_ of keys and a time, returns the interpolated value of the
 //envelope at that time.
 //======================================================================
-float evalEnvelope( CEnvelope *env, float time ){
-   	st_Key *key0, *key1, *skey, *ekey, *skey_n, *ekey_p, *key0_p=0, *key1_n=0;
-   	float t, h1, h2, h3, h4, in, out, offset = 0.0f;
-   	int noff;
-
-
-   	// if there's no key, the value is 0
-   	if ( env->keys.empty() ) return 0.0f;
-
-   	// if there's only one key, the value is constant
-   	if ( env->keys.size() == 1 )
-      	return env->keys[0]->value;
-
-   // find the first and last keys
-	int sz = env->keys.size();
-   	skey = env->keys[0];
-   	ekey = env->keys[sz-1];
-   	skey_n=env->keys[1];
-   	ekey_p=env->keys[sz-2];
-
-   	// use pre-behavior if time is before first key time
-   	if ( time < skey->time ){
-      	switch ( env->behavior[ 0 ] ){
-         	case BEH_RESET:            return 0.0f;
-         	case BEH_CONSTANT:			return skey->value;
-         	case BEH_REPEAT:
-            	time = range( time, skey->time, ekey->time, NULL );
+float evalEnvelope(CEnvelope* env, float time)
+{
+    st_Key* key0, *key1, *skey, *ekey, *skey_n, *ekey_p, *key0_p = 0, *key1_n = 0;
+    float t, h1, h2, h3, h4, in, out, offset = 0.0f;
+    int noff;
+
+
+    // if there's no key, the value is 0
+    if (env->keys.empty()) return 0.0f;
+
+    // if there's only one key, the value is constant
+    if (env->keys.size() == 1)
+        return env->keys[0]->value;
+
+    // find the first and last keys
+    int sz = env->keys.size();
+    skey = env->keys[0];
+    ekey = env->keys[sz - 1];
+    skey_n = env->keys[1];
+    ekey_p = env->keys[sz - 2];
+
+    // use pre-behavior if time is before first key time
+    if (time < skey->time)
+    {
+        switch (env->behavior[0])
+        {
+        case BEH_RESET:
+            return 0.0f;
+        case BEH_CONSTANT:
+            return skey->value;
+        case BEH_REPEAT:
+            time = range(time, skey->time, ekey->time, NULL);
             break;
-         	case BEH_OSCILLATE:
-            	time = range( time, skey->time, ekey->time, &noff );
-            	if ( noff % 2 )
-               		time = ekey->time - skey->time - time;
+        case BEH_OSCILLATE:
+            time = range(time, skey->time, ekey->time, &noff);
+            if (noff % 2)
+                time = ekey->time - skey->time - time;
             break;
-         	case BEH_OFFSET:
-            	time = range( time, skey->time, ekey->time, &noff );
-            	offset = noff * ( ekey->value - skey->value );
+        case BEH_OFFSET:
+            time = range(time, skey->time, ekey->time, &noff);
+            offset = noff * (ekey->value - skey->value);
             break;
-         	case BEH_LINEAR:
-            	out = outgoing( 0, skey, skey_n ) / ( skey_n->time - skey->time );
-            	return out * ( time - skey->time ) + skey->value;
-      	}
-   	}
-   	// use post-behavior if time is after last key time
-   	else if ( time > ekey->time ) {
-      	switch ( env->behavior[ 1 ] ){
-         	case BEH_RESET:            return 0.0f;
-         	case BEH_CONSTANT:			return ekey->value;
-         	case BEH_REPEAT:
-            	time = range( time, skey->time, ekey->time, NULL );
+        case BEH_LINEAR:
+            out = outgoing(0, skey, skey_n) / (skey_n->time - skey->time);
+            return out * (time - skey->time) + skey->value;
+        }
+    }
+    // use post-behavior if time is after last key time
+    else if (time > ekey->time)
+    {
+        switch (env->behavior[1])
+        {
+        case BEH_RESET:
+            return 0.0f;
+        case BEH_CONSTANT:
+            return ekey->value;
+        case BEH_REPEAT:
+            time = range(time, skey->time, ekey->time, NULL);
             break;
-         	case BEH_OSCILLATE:
-            	time = range( time, skey->time, ekey->time, &noff );
-            	if ( noff % 2 )
-               		time = ekey->time - skey->time - time;
+        case BEH_OSCILLATE:
+            time = range(time, skey->time, ekey->time, &noff);
+            if (noff % 2)
+                time = ekey->time - skey->time - time;
             break;
-         	case BEH_OFFSET:
-            	time = range( time, skey->time, ekey->time, &noff );
-            	offset = noff * ( ekey->value - skey->value );
+        case BEH_OFFSET:
+            time = range(time, skey->time, ekey->time, &noff);
+            offset = noff * (ekey->value - skey->value);
             break;
-         	case BEH_LINEAR:
-            	in = incoming( ekey_p, ekey, 0 ) / ( ekey->time - ekey_p->time );
-            	return in * ( time - ekey->time ) + ekey->value;
-      	}
-   	}
-   	// get the endpoints of the interval being evaluated
-    int k=0;
-    while (time>env->keys[k+1]->time) k++;
-    VERIFY((k+1)<sz);
-
-    key1 = env->keys[k+1];
-	key0 = env->keys[k];
-    if (k>0)  		key0_p = env->keys[k-1];
-    if ((k+2)<sz) 	key1_n = env->keys[k+2];
-
-   	// check for singularities first
-   	if ( time == key0->time )		return key0->value + offset;
-   	else if ( time == key1->time )	return key1->value + offset;
-
-   	// get interval length, time in [0, 1]
-   	t = ( time - key0->time ) / ( key1->time - key0->time );
-
-   	// interpolate
-   	switch ( key1->shape ){
-      	case SHAPE_TCB:
-      	case SHAPE_BEZI:
-      	case SHAPE_HERM:
-         	out = outgoing( key0_p, key0, key1 );
-         	in = incoming( key0, key1, key1_n );
-         	hermite( t, &h1, &h2, &h3, &h4 );
-         	return h1 * key0->value + h2 * key1->value + h3 * out + h4 * in + offset;
-      	case SHAPE_BEZ2:         return bez2( key0, key1, time ) + offset;
-      	case SHAPE_LINE:         return key0->value + t * ( key1->value - key0->value ) + offset;
-      	case SHAPE_STEP:         return key0->value + offset;
-      	default:
-         	return offset;
-   	}
+        case BEH_LINEAR:
+            in = incoming(ekey_p, ekey, 0) / (ekey->time - ekey_p->time);
+            return in * (time - ekey->time) + ekey->value;
+        }
+    }
+    // get the endpoints of the interval being evaluated
+    int k = 0;
+    while (time > env->keys[k + 1]->time) k++;
+    VERIFY((k + 1) < sz);
+
+    key1 = env->keys[k + 1];
+    key0 = env->keys[k];
+    if (k > 0) key0_p = env->keys[k - 1];
+    if ((k + 2) < sz) key1_n = env->keys[k + 2];
+
+    // check for singularities first
+    if (time == key0->time) return key0->value + offset;
+    else if (time == key1->time) return key1->value + offset;
+
+    // get interval length, time in [0, 1]
+    t = (time - key0->time) / (key1->time - key0->time);
+
+    // interpolate
+    switch (key1->shape)
+    {
+    case SHAPE_TCB:
+    case SHAPE_BEZI:
+    case SHAPE_HERM:
+        out = outgoing(key0_p, key0, key1);
+        in = incoming(key0, key1, key1_n);
+        hermite(t, &h1, &h2, &h3, &h4);
+        return h1 * key0->value + h2 * key1->value + h3 * out + h4 * in + offset;
+    case SHAPE_BEZ2:
+        return bez2(key0, key1, time) + offset;
+    case SHAPE_LINE:
+        return key0->value + t * (key1->value - key0->value) + offset;
+    case SHAPE_STEP:
+        return key0->value + offset;
+    default:
+        return offset;
+    }
 }
diff --git a/src/xrEngine/line_edit_control.cpp b/src/xrEngine/line_edit_control.cpp
index aae34a8317d..c76cf8330a6 100644
--- a/src/xrEngine/line_edit_control.cpp
+++ b/src/xrEngine/line_edit_control.cpp
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: line_edit_control.cpp
-//	Created 	: 21.02.2008
-//	Author		: Evgeniy Sokolov
-//	Description : line edit control class implementation
+// Module : line_edit_control.cpp
+// Created : 21.02.2008
+// Author : Evgeniy Sokolov
+// Description : line edit control class implementation
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -19,802 +19,834 @@ ENGINE_API float g_console_sensitive = 0.15f;
 namespace text_editor
 {
 
-static bool terminate_char( char c, bool check_space = false )
-{
-	switch ( c )
-	{
-		case ' ':
-			return check_space;
-		case '(':	case ')':
-		case '{':	case '}':
-		case '[':	case ']':
-		case '<':	case '>':
-		case '\'':	case '\"':
-		case '=':	case '+':	case '-':	case '*':	case '\\':
-		case '/':	case '&':	case '|':
-		case '!':	case '@':	case '#':	case '~':	case '`':
-		case '$':	case '%':	case '^':
-		case ':':	case ';':
-		case '?':	case ',':	case '.':
-		case '_':
-			return true;
-	}
-	return false;
+static bool terminate_char(char c, bool check_space = false)
+{
+    switch (c)
+    {
+    case ' ':
+        return check_space;
+    case '(':
+    case ')':
+    case '{':
+    case '}':
+    case '[':
+    case ']':
+    case '<':
+    case '>':
+    case '\'':
+    case '\"':
+    case '=':
+    case '+':
+    case '-':
+    case '*':
+    case '\\':
+    case '/':
+    case '&':
+    case '|':
+    case '!':
+    case '@':
+    case '#':
+    case '~':
+    case '`':
+    case '$':
+    case '%':
+    case '^':
+    case ':':
+    case ';':
+    case '?':
+    case ',':
+    case '.':
+    case '_':
+        return true;
+    }
+    return false;
 }
 
 // -------------------------------------------------------------------------------------------------
 
-line_edit_control::line_edit_control( u32 str_buffer_size )
+line_edit_control::line_edit_control(u32 str_buffer_size)
 {
-	m_edit_str	= NULL;
-	m_inserted	= NULL;
-	m_undo_buf	= NULL;
-	m_buf0		= NULL;
-	m_buf1		= NULL;
-	m_buf2		= NULL;
-	m_buf3		= NULL;
+    m_edit_str = NULL;
+    m_inserted = NULL;
+    m_undo_buf = NULL;
+    m_buf0 = NULL;
+    m_buf1 = NULL;
+    m_buf2 = NULL;
+    m_buf3 = NULL;
 
-	for ( u32 i = 0; i < DIK_COUNT; ++i )
-	{
-		m_actions[i] = NULL;
-	}
+    for (u32 i = 0; i < DIK_COUNT; ++i)
+    {
+        m_actions[i] = NULL;
+    }
 
-	init( str_buffer_size );
+    init(str_buffer_size);
 
-	update_key_states	();
+    update_key_states();
 }
 
 line_edit_control::~line_edit_control()
 {
-	xr_free( m_edit_str );
-	xr_free( m_inserted );
-	xr_free( m_undo_buf );
-	xr_free( m_buf0 );
-	xr_free( m_buf1 );
-	xr_free( m_buf2 );
-	xr_free( m_buf3 );
-
-	size_t const array_size	= sizeof(m_actions)/sizeof(m_actions[0]);
-	buffer_vector<Base*>	actions(m_actions, array_size, &m_actions[0], &m_actions[0] + array_size);
-	std::sort				(actions.begin(), actions.end());
-	actions.erase			(
-		std::unique(
-			actions.begin(),
-			actions.end()
-		),
-		actions.end()
-	);
-	delete_data				( actions );
-}
-
-static inline bool get_caps_lock_state	()
+    xr_free(m_edit_str);
+    xr_free(m_inserted);
+    xr_free(m_undo_buf);
+    xr_free( m_buf0 );
+    xr_free( m_buf1 );
+    xr_free( m_buf2 );
+    xr_free( m_buf3 );
+
+    size_t const array_size = sizeof(m_actions)/sizeof(m_actions[0]);
+    buffer_vector<Base*> actions(m_actions, array_size, &m_actions[0], &m_actions[0] + array_size);
+    std::sort (actions.begin(), actions.end());
+    actions.erase (
+        std::unique(
+        actions.begin(),
+        actions.end()
+        ),
+        actions.end()
+        );
+    delete_data(actions);
+}
+
+static inline bool get_caps_lock_state()
 {
 #if 0
-	static bool first_time					= true;
-	static bool is_windows_vista_or_later	= false;
-	if ( first_time ) {
-		first_time							= false;
-		OSVERSIONINFO						version_info;
-		ZeroMemory							( &version_info, sizeof(version_info) );
-		version_info.dwOSVersionInfoSize	= sizeof(version_info);
-		GetVersionEx						( &version_info );
-		is_windows_vista_or_later			= version_info.dwMajorVersion >= 6;
-	}
-
-	if ( is_windows_vista_or_later )
-		return		!!(GetKeyState(VK_CAPITAL) & 1);
-	else
+    static bool first_time = true;
+    static bool is_windows_vista_or_later = false;
+    if (first_time)
+    {
+        first_time = false;
+        OSVERSIONINFO version_info;
+        ZeroMemory(&version_info, sizeof(version_info));
+        version_info.dwOSVersionInfoSize = sizeof(version_info);
+        GetVersionEx(&version_info);
+        is_windows_vista_or_later = version_info.dwMajorVersion >= 6;
+    }
+
+    if (is_windows_vista_or_later)
+        return !!(GetKeyState(VK_CAPITAL) & 1);
+    else
 #else // #if 0
-		return		false;
+    return false;
 #endif // #if 0
 }
 
-void line_edit_control::update_key_states	()
+void line_edit_control::update_key_states()
 {
-	m_key_state.zero( );
+    m_key_state.zero();
 
-	set_key_state	( ks_LShift,	!!pInput->iGetAsyncKeyState(DIK_LSHIFT)		);
-	set_key_state	( ks_RShift,	!!pInput->iGetAsyncKeyState(DIK_RSHIFT)		);
-	set_key_state	( ks_LCtrl,		!!pInput->iGetAsyncKeyState(DIK_LCONTROL)	);
-	set_key_state	( ks_RCtrl,		!!pInput->iGetAsyncKeyState(DIK_RCONTROL)	);
-	set_key_state	( ks_LAlt,		!!pInput->iGetAsyncKeyState(DIK_LALT)		);
-	set_key_state	( ks_RAlt,		!!pInput->iGetAsyncKeyState(DIK_RALT)		);
-	set_key_state	( ks_CapsLock,	text_editor::get_caps_lock_state()			);
+    set_key_state(ks_LShift, !!pInput->iGetAsyncKeyState(DIK_LSHIFT));
+    set_key_state(ks_RShift, !!pInput->iGetAsyncKeyState(DIK_RSHIFT));
+    set_key_state(ks_LCtrl, !!pInput->iGetAsyncKeyState(DIK_LCONTROL));
+    set_key_state(ks_RCtrl, !!pInput->iGetAsyncKeyState(DIK_RCONTROL));
+    set_key_state(ks_LAlt, !!pInput->iGetAsyncKeyState(DIK_LALT));
+    set_key_state(ks_RAlt, !!pInput->iGetAsyncKeyState(DIK_RALT));
+    set_key_state(ks_CapsLock, text_editor::get_caps_lock_state());
 }
 
 void line_edit_control::clear_states()
 {
-	m_edit_str[0]	= 0;
-	clear_inserted();
-	m_undo_buf[0]	= 0;
-
-	m_buf0[0]		= 0;
-	m_buf1[0]		= 0;
-	m_buf2[0]		= 0;
-	m_buf3[0]		= 0;
-
-	m_cur_pos		= 0;
-	m_select_start	= 0;
-	m_p1			= 0;
-	m_p2			= 0;
-
-	m_accel				= 1.0f;
-	m_cur_time			= 0.0f;
-	m_rep_time			= 0.0f;
-	m_last_frame_time	= 0;
-	m_last_key_time		= 0.0f;
-	m_last_changed_frame  = 0;
-
-	m_hold_mode			= false;
-	m_insert_mode		= false;
-	m_repeat_mode		= false;
-	m_mark				= false;
-	m_cursor_view		= false;
-	m_need_update		= false;
-	m_unselected_mode	= false;
-
-	update_key_states	( );
-}
-
-void line_edit_control::init( u32 str_buffer_size, init_mode mode )
-{
-	m_buffer_size = str_buffer_size;
-	clamp( m_buffer_size, (int)MIN_BUF_SIZE, (int)MAX_BUF_SIZE );
-
-	xr_free( m_edit_str );	m_edit_str = (LPSTR)xr_malloc( m_buffer_size * sizeof(char) );
-	xr_free( m_inserted );	m_inserted = (LPSTR)xr_malloc( m_buffer_size * sizeof(char) );
-	xr_free( m_undo_buf );	m_undo_buf = (LPSTR)xr_malloc( m_buffer_size * sizeof(char) );
-	
-	xr_free( m_buf0 );		m_buf0 = (LPSTR)xr_malloc( m_buffer_size * sizeof(char) );
-	xr_free( m_buf1 );		m_buf1 = (LPSTR)xr_malloc( m_buffer_size * sizeof(char) );
-	xr_free( m_buf2 );		m_buf2 = (LPSTR)xr_malloc( m_buffer_size * sizeof(char) );
-	xr_free( m_buf3 );		m_buf3 = (LPSTR)xr_malloc( m_buffer_size * sizeof(char) );
-
-	clear_states();
-
-	for ( u32 i = 0; i < DIK_COUNT; ++i )
-	{
-		xr_delete( m_actions[i] );
-		m_actions[i] = NULL;
-	}
-
-	if ( mode == im_read_only )
-	{
-		assign_callback( DIK_A     , ks_Ctrl, Callback( this, &line_edit_control::select_all_buf       ) );
-		assign_callback( DIK_C     , ks_Ctrl, Callback( this, &line_edit_control::copy_to_clipboard    ) );
-		assign_callback( DIK_INSERT, ks_Ctrl, Callback( this, &line_edit_control::copy_to_clipboard    ) );
-
-		assign_callback( DIK_HOME  , ks_free, Callback( this, &line_edit_control::move_pos_home        ) );
-		assign_callback( DIK_END   , ks_free, Callback( this, &line_edit_control::move_pos_end         ) );
-		assign_callback( DIK_LEFT  , ks_free, Callback( this, &line_edit_control::move_pos_left        ) );
-		assign_callback( DIK_RIGHT , ks_free, Callback( this, &line_edit_control::move_pos_right       ) );
-		assign_callback( DIK_LEFT  , ks_Ctrl, Callback( this, &line_edit_control::move_pos_left_word   ) );
-		assign_callback( DIK_RIGHT , ks_Ctrl, Callback( this, &line_edit_control::move_pos_right_word  ) );
-	}
-	else
-	{
-		assign_char_pairs( mode );
-
-		assign_callback( DIK_INSERT, ks_free, Callback( this, &line_edit_control::flip_insert_mode     ) );
-		assign_callback( DIK_A     , ks_Ctrl, Callback( this, &line_edit_control::select_all_buf       ) );
-		assign_callback( DIK_Z     , ks_Ctrl, Callback( this, &line_edit_control::undo_buf             ) );
-
-		assign_callback( DIK_C     , ks_Ctrl, Callback( this, &line_edit_control::copy_to_clipboard    ) );
-		assign_callback( DIK_V     , ks_Ctrl, Callback( this, &line_edit_control::paste_from_clipboard ) );
-		assign_callback( DIK_X     , ks_Ctrl, Callback( this, &line_edit_control::cut_to_clipboard     ) );
-
-		assign_callback( DIK_INSERT, ks_Ctrl, Callback( this, &line_edit_control::copy_to_clipboard    ) );
-		assign_callback( DIK_INSERT, ks_Shift,Callback( this, &line_edit_control::paste_from_clipboard ) );
-		assign_callback( DIK_DELETE, ks_Shift,Callback( this, &line_edit_control::cut_to_clipboard     ) );
-
-		assign_callback( DIK_HOME  , ks_free, Callback( this, &line_edit_control::move_pos_home        ) );
-		assign_callback( DIK_END   , ks_free, Callback( this, &line_edit_control::move_pos_end         ) );
-		assign_callback( DIK_LEFT  , ks_free, Callback( this, &line_edit_control::move_pos_left        ) );
-		assign_callback( DIK_RIGHT , ks_free, Callback( this, &line_edit_control::move_pos_right       ) );
-		assign_callback( DIK_LEFT  , ks_Ctrl, Callback( this, &line_edit_control::move_pos_left_word   ) );
-		assign_callback( DIK_RIGHT , ks_Ctrl, Callback( this, &line_edit_control::move_pos_right_word  ) );
-
-		assign_callback( DIK_BACK  , ks_free, Callback( this, &line_edit_control::delete_selected_back ) );
-		assign_callback( DIK_DELETE, ks_free, Callback( this, &line_edit_control::delete_selected_forward ) );
-		assign_callback( DIK_BACK  , ks_Ctrl, Callback( this, &line_edit_control::delete_word_back     ) );
-		assign_callback( DIK_DELETE, ks_Ctrl, Callback( this, &line_edit_control::delete_word_forward  ) );
-
-		assign_callback( DIK_LSHIFT, ks_Ctrl, Callback( this, &line_edit_control::SwitchKL ) );
-		assign_callback( DIK_LSHIFT, ks_Alt, Callback( this, &line_edit_control::SwitchKL  ) );
-
-	} // if mode
-
-	create_key_state( DIK_LSHIFT  , ks_LShift );
-	create_key_state( DIK_RSHIFT  , ks_RShift );
-	create_key_state( DIK_LCONTROL, ks_LCtrl  );
-	create_key_state( DIK_RCONTROL, ks_RCtrl  );
-	create_key_state( DIK_LALT    , ks_LAlt   );
-	create_key_state( DIK_RALT    , ks_RAlt   );
-}
-
-void line_edit_control::assign_char_pairs( init_mode mode )
-{
-	create_char_pair( DIK_NUMPAD0, '0', '0' );
-	create_char_pair( DIK_NUMPAD1, '1', '1' );
-	create_char_pair( DIK_NUMPAD2, '2', '2' );
-	create_char_pair( DIK_NUMPAD3, '3', '3' );
-	create_char_pair( DIK_NUMPAD4, '4', '4' );
-	create_char_pair( DIK_NUMPAD5, '5', '5' );
-	create_char_pair( DIK_NUMPAD6, '6', '6' );
-	create_char_pair( DIK_NUMPAD7, '7', '7' );
-	create_char_pair( DIK_NUMPAD8, '8', '8' );
-	create_char_pair( DIK_NUMPAD9, '9', '9' );
-
-	if ( mode == im_number_only )
-	{
-		create_char_pair( DIK_0, '0', '0' );
-		create_char_pair( DIK_1, '1', '1' );
-		create_char_pair( DIK_2, '2', '2' );
-		create_char_pair( DIK_3, '3', '3' );
-		create_char_pair( DIK_4, '4', '4' );
-		create_char_pair( DIK_5, '5', '5' );
-		create_char_pair( DIK_6, '6', '6' );
-		create_char_pair( DIK_7, '7', '7' );
-		create_char_pair( DIK_8, '8', '8' );
-		create_char_pair( DIK_9, '9', '9' );
-		create_char_pair( DIK_NUMPADMINUS , '-', '-' );
-		create_char_pair( DIK_MINUS       , '-', '-' );
-		create_char_pair( DIK_NUMPADPLUS  , '+', '+' );
-		create_char_pair( DIK_EQUALS	  , '+', '+' );
-		return;
-	}
-
-	if ( mode != im_file_name_mode )
-	{
-		create_char_pair( DIK_0, '0', ')', true );
-		create_char_pair( DIK_1, '1', '!', true );
-		create_char_pair( DIK_2, '2', '@', true );
-		create_char_pair( DIK_3, '3', '#', true );
-		create_char_pair( DIK_4, '4', '$', true );
-		create_char_pair( DIK_5, '5', '%', true );
-		create_char_pair( DIK_6, '6', '^', true );
-		create_char_pair( DIK_7, '7', '&', true );
-		create_char_pair( DIK_8, '8', '*', true );
-		create_char_pair( DIK_9, '9', '(', true );
-
-		create_char_pair( DIK_BACKSLASH , '\\', '|', true );
-		create_char_pair( DIK_LBRACKET  , '[' , '{', true );
-		create_char_pair( DIK_RBRACKET  , ']' , '}', true );
-		create_char_pair( DIK_APOSTROPHE, '\'', '\"',true );
-		create_char_pair( DIK_COMMA     , ',' , '<', true );
-		create_char_pair( DIK_PERIOD    , '.' , '>', true );
-		create_char_pair( DIK_EQUALS    , '=' , '+', true );
-		create_char_pair( DIK_SEMICOLON , ';' , ':', true );
-		create_char_pair( DIK_SLASH     , '/' , '?', true );
-
-		create_char_pair( DIK_NUMPADSTAR , '*', '*' );
-		create_char_pair( DIK_NUMPADSLASH, '/', '/' );
-	}
-	else
-	{
-		create_char_pair( DIK_0, '0', '0' );
-		create_char_pair( DIK_1, '1', '1' );
-		create_char_pair( DIK_2, '2', '2' );
-		create_char_pair( DIK_3, '3', '3' );
-		create_char_pair( DIK_4, '4', '4' );
-		create_char_pair( DIK_5, '5', '5' );
-		create_char_pair( DIK_6, '6', '6' );
-		create_char_pair( DIK_7, '7', '7' );
-		create_char_pair( DIK_8, '8', '8' );
-		create_char_pair( DIK_9, '9', '9' );
-	}
-
-	create_char_pair( DIK_NUMPADMINUS , '-', '-' );
-	create_char_pair( DIK_NUMPADPLUS  , '+', '+' );
-	create_char_pair( DIK_NUMPADPERIOD, '.', '.' );
-
-	create_char_pair( DIK_MINUS       , '-', '_', true );
-	create_char_pair( DIK_SPACE       , ' ', ' ' );
-	create_char_pair( DIK_GRAVE       , '`', '~', true );
-
-	create_char_pair( DIK_A, 'a', 'A', true );
-	create_char_pair( DIK_B, 'b', 'B', true );
-	create_char_pair( DIK_C, 'c', 'C', true );
-	create_char_pair( DIK_D, 'd', 'D', true );
-	create_char_pair( DIK_E, 'e', 'E', true );
-	create_char_pair( DIK_F, 'f', 'F', true );
-	create_char_pair( DIK_G, 'g', 'G', true );
-	create_char_pair( DIK_H, 'h', 'H', true );
-	create_char_pair( DIK_I, 'i', 'I', true );
-	create_char_pair( DIK_J, 'j', 'J', true );
-	create_char_pair( DIK_K, 'k', 'K', true );
-	create_char_pair( DIK_L, 'l', 'L', true );
-	create_char_pair( DIK_M, 'm', 'M', true );
-	create_char_pair( DIK_N, 'n', 'N', true );
-	create_char_pair( DIK_O, 'o', 'O', true );
-	create_char_pair( DIK_P, 'p', 'P', true );
-	create_char_pair( DIK_Q, 'q', 'Q', true );
-	create_char_pair( DIK_R, 'r', 'R', true );
-	create_char_pair( DIK_S, 's', 'S', true );
-	create_char_pair( DIK_T, 't', 'T', true );
-	create_char_pair( DIK_U, 'u', 'U', true );
-	create_char_pair( DIK_V, 'v', 'V', true );
-	create_char_pair( DIK_W, 'w', 'W', true );
-	create_char_pair( DIK_X, 'x', 'X', true );
-	create_char_pair( DIK_Y, 'y', 'Y', true );
-	create_char_pair( DIK_Z, 'z', 'Z', true );
-}
-
-void line_edit_control::create_key_state( u32 const dik, key_state state )
-{
-	Base* prev = m_actions[dik];
-	//if ( m_actions[dik] )
-	//{
-	//	xr_delete( m_actions[dik] );
-	//}
-	m_actions[dik] = xr_new<text_editor::key_state_base>( state, prev );
-}
-
-void line_edit_control::create_char_pair( u32 const dik, char c, char c_shift, bool translate )
-{
-	if ( m_actions[dik] )
-	{
-		xr_delete( m_actions[dik] );
-	}
-
-	m_actions[dik] = xr_new<text_editor::type_pair>( dik, c, c_shift, translate );
-}
-
-void line_edit_control::assign_callback( u32 const dik, key_state state, Callback const& callback )
-{
-	VERIFY( dik < DIK_COUNT );
-	Base* prev_action = m_actions[dik];
-	m_actions[dik] = xr_new<text_editor::callback_base>( callback, state );
-	m_actions[dik]->on_assign( prev_action );
-}
-
-void line_edit_control::insert_character( char c )
-{
-	m_inserted[0] = c;
+    m_edit_str[0] = 0;
+    clear_inserted();
+    m_undo_buf[0] = 0;
+
+    m_buf0[0] = 0;
+    m_buf1[0] = 0;
+    m_buf2[0] = 0;
+    m_buf3[0] = 0;
+
+    m_cur_pos = 0;
+    m_select_start = 0;
+    m_p1 = 0;
+    m_p2 = 0;
+
+    m_accel = 1.0f;
+    m_cur_time = 0.0f;
+    m_rep_time = 0.0f;
+    m_last_frame_time = 0;
+    m_last_key_time = 0.0f;
+    m_last_changed_frame = 0;
+
+    m_hold_mode = false;
+    m_insert_mode = false;
+    m_repeat_mode = false;
+    m_mark = false;
+    m_cursor_view = false;
+    m_need_update = false;
+    m_unselected_mode = false;
+
+    update_key_states();
+}
+
+void line_edit_control::init(u32 str_buffer_size, init_mode mode)
+{
+    m_buffer_size = str_buffer_size;
+    clamp(m_buffer_size, (int)MIN_BUF_SIZE, (int)MAX_BUF_SIZE);
+
+    xr_free(m_edit_str);
+    m_edit_str = (LPSTR)xr_malloc(m_buffer_size * sizeof(char));
+    xr_free(m_inserted);
+    m_inserted = (LPSTR)xr_malloc(m_buffer_size * sizeof(char));
+    xr_free(m_undo_buf);
+    m_undo_buf = (LPSTR)xr_malloc(m_buffer_size * sizeof(char));
+
+    xr_free(m_buf0);
+    m_buf0 = (LPSTR)xr_malloc(m_buffer_size * sizeof(char));
+    xr_free(m_buf1);
+    m_buf1 = (LPSTR)xr_malloc(m_buffer_size * sizeof(char));
+    xr_free(m_buf2);
+    m_buf2 = (LPSTR)xr_malloc(m_buffer_size * sizeof(char));
+    xr_free(m_buf3);
+    m_buf3 = (LPSTR)xr_malloc(m_buffer_size * sizeof(char));
+
+    clear_states();
+
+    for (u32 i = 0; i < DIK_COUNT; ++i)
+    {
+        xr_delete(m_actions[i]);
+        m_actions[i] = NULL;
+    }
+
+    if (mode == im_read_only)
+    {
+        assign_callback(DIK_A, ks_Ctrl, Callback(this, &line_edit_control::select_all_buf));
+        assign_callback(DIK_C, ks_Ctrl, Callback(this, &line_edit_control::copy_to_clipboard));
+        assign_callback(DIK_INSERT, ks_Ctrl, Callback(this, &line_edit_control::copy_to_clipboard));
+
+        assign_callback(DIK_HOME, ks_free, Callback(this, &line_edit_control::move_pos_home));
+        assign_callback(DIK_END, ks_free, Callback(this, &line_edit_control::move_pos_end));
+        assign_callback(DIK_LEFT, ks_free, Callback(this, &line_edit_control::move_pos_left));
+        assign_callback(DIK_RIGHT, ks_free, Callback(this, &line_edit_control::move_pos_right));
+        assign_callback(DIK_LEFT, ks_Ctrl, Callback(this, &line_edit_control::move_pos_left_word));
+        assign_callback(DIK_RIGHT, ks_Ctrl, Callback(this, &line_edit_control::move_pos_right_word));
+    }
+    else
+    {
+        assign_char_pairs(mode);
+
+        assign_callback(DIK_INSERT, ks_free, Callback(this, &line_edit_control::flip_insert_mode));
+        assign_callback(DIK_A, ks_Ctrl, Callback(this, &line_edit_control::select_all_buf));
+        assign_callback(DIK_Z, ks_Ctrl, Callback(this, &line_edit_control::undo_buf));
+
+        assign_callback(DIK_C, ks_Ctrl, Callback(this, &line_edit_control::copy_to_clipboard));
+        assign_callback(DIK_V, ks_Ctrl, Callback(this, &line_edit_control::paste_from_clipboard));
+        assign_callback(DIK_X, ks_Ctrl, Callback(this, &line_edit_control::cut_to_clipboard));
+
+        assign_callback(DIK_INSERT, ks_Ctrl, Callback(this, &line_edit_control::copy_to_clipboard));
+        assign_callback(DIK_INSERT, ks_Shift, Callback(this, &line_edit_control::paste_from_clipboard));
+        assign_callback(DIK_DELETE, ks_Shift, Callback(this, &line_edit_control::cut_to_clipboard));
+
+        assign_callback(DIK_HOME, ks_free, Callback(this, &line_edit_control::move_pos_home));
+        assign_callback(DIK_END, ks_free, Callback(this, &line_edit_control::move_pos_end));
+        assign_callback(DIK_LEFT, ks_free, Callback(this, &line_edit_control::move_pos_left));
+        assign_callback(DIK_RIGHT, ks_free, Callback(this, &line_edit_control::move_pos_right));
+        assign_callback(DIK_LEFT, ks_Ctrl, Callback(this, &line_edit_control::move_pos_left_word));
+        assign_callback(DIK_RIGHT, ks_Ctrl, Callback(this, &line_edit_control::move_pos_right_word));
+
+        assign_callback(DIK_BACK, ks_free, Callback(this, &line_edit_control::delete_selected_back));
+        assign_callback(DIK_DELETE, ks_free, Callback(this, &line_edit_control::delete_selected_forward));
+        assign_callback(DIK_BACK, ks_Ctrl, Callback(this, &line_edit_control::delete_word_back));
+        assign_callback(DIK_DELETE, ks_Ctrl, Callback(this, &line_edit_control::delete_word_forward));
+
+        assign_callback(DIK_LSHIFT, ks_Ctrl, Callback(this, &line_edit_control::SwitchKL));
+        assign_callback(DIK_LSHIFT, ks_Alt, Callback(this, &line_edit_control::SwitchKL));
+
+    } // if mode
+
+    create_key_state(DIK_LSHIFT, ks_LShift);
+    create_key_state(DIK_RSHIFT, ks_RShift);
+    create_key_state(DIK_LCONTROL, ks_LCtrl);
+    create_key_state(DIK_RCONTROL, ks_RCtrl);
+    create_key_state(DIK_LALT, ks_LAlt);
+    create_key_state(DIK_RALT, ks_RAlt);
+}
+
+void line_edit_control::assign_char_pairs(init_mode mode)
+{
+    create_char_pair(DIK_NUMPAD0, '0', '0');
+    create_char_pair(DIK_NUMPAD1, '1', '1');
+    create_char_pair(DIK_NUMPAD2, '2', '2');
+    create_char_pair(DIK_NUMPAD3, '3', '3');
+    create_char_pair(DIK_NUMPAD4, '4', '4');
+    create_char_pair(DIK_NUMPAD5, '5', '5');
+    create_char_pair(DIK_NUMPAD6, '6', '6');
+    create_char_pair(DIK_NUMPAD7, '7', '7');
+    create_char_pair(DIK_NUMPAD8, '8', '8');
+    create_char_pair(DIK_NUMPAD9, '9', '9');
+
+    if (mode == im_number_only)
+    {
+        create_char_pair(DIK_0, '0', '0');
+        create_char_pair(DIK_1, '1', '1');
+        create_char_pair(DIK_2, '2', '2');
+        create_char_pair(DIK_3, '3', '3');
+        create_char_pair(DIK_4, '4', '4');
+        create_char_pair(DIK_5, '5', '5');
+        create_char_pair(DIK_6, '6', '6');
+        create_char_pair(DIK_7, '7', '7');
+        create_char_pair(DIK_8, '8', '8');
+        create_char_pair(DIK_9, '9', '9');
+        create_char_pair(DIK_NUMPADMINUS, '-', '-');
+        create_char_pair(DIK_MINUS, '-', '-');
+        create_char_pair(DIK_NUMPADPLUS, '+', '+');
+        create_char_pair(DIK_EQUALS, '+', '+');
+        return;
+    }
+
+    if (mode != im_file_name_mode)
+    {
+        create_char_pair(DIK_0, '0', ')', true);
+        create_char_pair(DIK_1, '1', '!', true);
+        create_char_pair(DIK_2, '2', '@', true);
+        create_char_pair(DIK_3, '3', '#', true);
+        create_char_pair(DIK_4, '4', '$', true);
+        create_char_pair(DIK_5, '5', '%', true);
+        create_char_pair(DIK_6, '6', '^', true);
+        create_char_pair(DIK_7, '7', '&', true);
+        create_char_pair(DIK_8, '8', '*', true);
+        create_char_pair(DIK_9, '9', '(', true);
+
+        create_char_pair(DIK_BACKSLASH, '\\', '|', true);
+        create_char_pair(DIK_LBRACKET, '[', '{', true);
+        create_char_pair(DIK_RBRACKET, ']', '}', true);
+        create_char_pair(DIK_APOSTROPHE, '\'', '\"', true);
+        create_char_pair(DIK_COMMA, ',', '<', true);
+        create_char_pair(DIK_PERIOD, '.', '>', true);
+        create_char_pair(DIK_EQUALS, '=', '+', true);
+        create_char_pair(DIK_SEMICOLON, ';', ':', true);
+        create_char_pair(DIK_SLASH, '/', '?', true);
+
+        create_char_pair(DIK_NUMPADSTAR, '*', '*');
+        create_char_pair(DIK_NUMPADSLASH, '/', '/');
+    }
+    else
+    {
+        create_char_pair(DIK_0, '0', '0');
+        create_char_pair(DIK_1, '1', '1');
+        create_char_pair(DIK_2, '2', '2');
+        create_char_pair(DIK_3, '3', '3');
+        create_char_pair(DIK_4, '4', '4');
+        create_char_pair(DIK_5, '5', '5');
+        create_char_pair(DIK_6, '6', '6');
+        create_char_pair(DIK_7, '7', '7');
+        create_char_pair(DIK_8, '8', '8');
+        create_char_pair(DIK_9, '9', '9');
+    }
+
+    create_char_pair(DIK_NUMPADMINUS, '-', '-');
+    create_char_pair(DIK_NUMPADPLUS, '+', '+');
+    create_char_pair(DIK_NUMPADPERIOD, '.', '.');
+
+    create_char_pair(DIK_MINUS, '-', '_', true);
+    create_char_pair(DIK_SPACE, ' ', ' ');
+    create_char_pair(DIK_GRAVE, '`', '~', true);
+
+    create_char_pair(DIK_A, 'a', 'A', true);
+    create_char_pair(DIK_B, 'b', 'B', true);
+    create_char_pair(DIK_C, 'c', 'C', true);
+    create_char_pair(DIK_D, 'd', 'D', true);
+    create_char_pair(DIK_E, 'e', 'E', true);
+    create_char_pair(DIK_F, 'f', 'F', true);
+    create_char_pair(DIK_G, 'g', 'G', true);
+    create_char_pair(DIK_H, 'h', 'H', true);
+    create_char_pair(DIK_I, 'i', 'I', true);
+    create_char_pair(DIK_J, 'j', 'J', true);
+    create_char_pair(DIK_K, 'k', 'K', true);
+    create_char_pair(DIK_L, 'l', 'L', true);
+    create_char_pair(DIK_M, 'm', 'M', true);
+    create_char_pair(DIK_N, 'n', 'N', true);
+    create_char_pair(DIK_O, 'o', 'O', true);
+    create_char_pair(DIK_P, 'p', 'P', true);
+    create_char_pair(DIK_Q, 'q', 'Q', true);
+    create_char_pair(DIK_R, 'r', 'R', true);
+    create_char_pair(DIK_S, 's', 'S', true);
+    create_char_pair(DIK_T, 't', 'T', true);
+    create_char_pair(DIK_U, 'u', 'U', true);
+    create_char_pair(DIK_V, 'v', 'V', true);
+    create_char_pair(DIK_W, 'w', 'W', true);
+    create_char_pair(DIK_X, 'x', 'X', true);
+    create_char_pair(DIK_Y, 'y', 'Y', true);
+    create_char_pair(DIK_Z, 'z', 'Z', true);
+}
+
+void line_edit_control::create_key_state(u32 const dik, key_state state)
+{
+    Base* prev = m_actions[dik];
+    //if ( m_actions[dik] )
+    //{
+    // xr_delete( m_actions[dik] );
+    //}
+    m_actions[dik] = xr_new<text_editor::key_state_base>(state, prev);
+}
+
+void line_edit_control::create_char_pair(u32 const dik, char c, char c_shift, bool translate)
+{
+    if (m_actions[dik])
+    {
+        xr_delete(m_actions[dik]);
+    }
+
+    m_actions[dik] = xr_new<text_editor::type_pair>(dik, c, c_shift, translate);
+}
+
+void line_edit_control::assign_callback(u32 const dik, key_state state, Callback const& callback)
+{
+    VERIFY(dik < DIK_COUNT);
+    Base* prev_action = m_actions[dik];
+    m_actions[dik] = xr_new<text_editor::callback_base>(callback, state);
+    m_actions[dik]->on_assign(prev_action);
+}
+
+void line_edit_control::insert_character(char c)
+{
+    m_inserted[0] = c;
 }
 
 void line_edit_control::clear_inserted()
 {
-	m_inserted[0] = m_inserted[1] = 0;
+    m_inserted[0] = m_inserted[1] = 0;
 }
 
 bool line_edit_control::empty_inserted()
 {
-	return (m_inserted[0] == 0);
+    return (m_inserted[0] == 0);
 }
 
-void line_edit_control::set_edit( LPCSTR str )
+void line_edit_control::set_edit(LPCSTR str)
 {
-	u32 str_size = xr_strlen( str );
-	clamp( str_size, (u32)0, (u32)(m_buffer_size-1) );
-	strncpy_s( m_edit_str, m_buffer_size, str, str_size );
-	m_edit_str[str_size] = 0;
+    u32 str_size = xr_strlen(str);
+    clamp(str_size, (u32)0, (u32)(m_buffer_size - 1));
+    strncpy_s(m_edit_str, m_buffer_size, str, str_size);
+    m_edit_str[str_size] = 0;
 
-	m_cur_pos      = str_size;
-	m_select_start = m_cur_pos;
-	m_accel        = 1.0f;
-	update_bufs();
+    m_cur_pos = str_size;
+    m_select_start = m_cur_pos;
+    m_accel = 1.0f;
+    update_bufs();
 }
 
 // ========================================================
 
-void line_edit_control::on_key_press( int dik )
-{
-	if ( DIK_COUNT <= dik )
-	{
-		return;
-	}
-	if ( !m_hold_mode )
-	{
-		m_last_key_time = 0.0f;
-		m_accel = 1.0f;
-	}
-	m_mark = true;
-
-	clamp_cur_pos();
-	clear_inserted();
-	compute_positions();
-
-	if ( m_actions[dik] )
-	{
-		m_actions[dik]->on_key_press( this );
-	}
-	// ===========
-	if ( dik == DIK_LCONTROL || dik == DIK_RCONTROL )
-	{
-		m_mark = false;	
-	}
-	
-	m_edit_str[m_buffer_size-1] = 0;
-	clamp_cur_pos();
-
-	add_inserted_text();
-	if ( m_mark && (!get_key_state( ks_Shift ) || !empty_inserted() ) )
-	{
-		m_select_start = m_cur_pos;
-	}
-	compute_positions();
-
-	m_repeat_mode = false;
-	m_rep_time    = 0.0f;
-	
-	update_key_states( );
-	update_bufs();
+void line_edit_control::on_key_press(int dik)
+{
+    if (DIK_COUNT <= dik)
+    {
+        return;
+    }
+    if (!m_hold_mode)
+    {
+        m_last_key_time = 0.0f;
+        m_accel = 1.0f;
+    }
+    m_mark = true;
+
+    clamp_cur_pos();
+    clear_inserted();
+    compute_positions();
+
+    if (m_actions[dik])
+    {
+        m_actions[dik]->on_key_press(this);
+    }
+    // ===========
+    if (dik == DIK_LCONTROL || dik == DIK_RCONTROL)
+    {
+        m_mark = false;
+    }
+
+    m_edit_str[m_buffer_size - 1] = 0;
+    clamp_cur_pos();
+
+    add_inserted_text();
+    if (m_mark && (!get_key_state(ks_Shift) || !empty_inserted()))
+    {
+        m_select_start = m_cur_pos;
+    }
+    compute_positions();
+
+    m_repeat_mode = false;
+    m_rep_time = 0.0f;
+
+    update_key_states();
+    update_bufs();
 }
 
 // -------------------------------------------------------------------------------------------------
 
-void line_edit_control::on_key_hold( int dik )
+void line_edit_control::on_key_hold(int dik)
 {
-	update_key_states( );
-	update_bufs();
-	switch ( dik )
-	{
-	case DIK_TAB:
-	case DIK_LSHIFT:   case DIK_RSHIFT:
-	case DIK_LCONTROL: case DIK_RCONTROL:
-	case DIK_LALT:     case DIK_RALT:
-		return;
-		break;
-	}
+    update_key_states();
+    update_bufs();
+    switch (dik)
+    {
+    case DIK_TAB:
+    case DIK_LSHIFT:
+    case DIK_RSHIFT:
+    case DIK_LCONTROL:
+    case DIK_RCONTROL:
+    case DIK_LALT:
+    case DIK_RALT:
+        return;
+        break;
+    }
 
-	if ( m_repeat_mode && m_last_key_time > 5.0f * g_console_sensitive )
-	{
-		float buf_time = m_rep_time;
-		m_hold_mode    = true;
-		
-		on_key_press( dik );
-		
-		m_hold_mode    = false;
-		m_rep_time     = buf_time;
-	}
+    if (m_repeat_mode && m_last_key_time > 5.0f * g_console_sensitive)
+    {
+        float buf_time = m_rep_time;
+        m_hold_mode = true;
+
+        on_key_press(dik);
+
+        m_hold_mode = false;
+        m_rep_time = buf_time;
+    }
 }
 
-void line_edit_control::on_key_release( int dik )
+void line_edit_control::on_key_release(int dik)
 {
-	m_accel         = 1.0f;
-	m_rep_time      = 0.0f;
-	m_last_key_time = 0.0f;
+    m_accel = 1.0f;
+    m_rep_time = 0.0f;
+    m_last_key_time = 0.0f;
 
-	update_key_states( );
-	update_bufs		( );
+    update_key_states();
+    update_bufs();
 }
 
 void line_edit_control::on_frame()
 {
-	update_key_states	( );
-
-	u32   fr_time = Device.dwTimeContinual;
-	float dt      = (fr_time - m_last_frame_time) * 0.001f;
-	if ( dt > 0.06666f )
-	{
-		dt = 0.06666f;
-	}
-	m_last_frame_time = fr_time;
-	m_cur_time += dt;
-
-	m_cursor_view = true;
-	if ( m_cur_time > 0.3f ) { m_cursor_view = false; }
-	if ( m_cur_time > 0.4f ) { m_cur_time = 0.0f; }
-
-	m_rep_time += dt * m_accel;
-	if ( m_rep_time > g_console_sensitive )//0.2
-	{
-		m_rep_time    = 0.0f;
-		m_repeat_mode = true;
-		m_accel       += 0.2f;
-	}
-	m_last_key_time += dt;
-
-	if ( m_last_changed_frame + 1 < Device.dwFrame )
-	{
-		m_need_update = false;
-	}
-	
-	/*if ( Device.dwFrame % 100 == 0 )
-	{
-	Msg( " cur_time=%.2f  re=%d  acc=%.2f   rep_time=%.2f", cur_time, bRepeat, fAccel, rep_time );
-	}*/
+    update_key_states();
+
+    u32 fr_time = Device.dwTimeContinual;
+    float dt = (fr_time - m_last_frame_time) * 0.001f;
+    if (dt > 0.06666f)
+    {
+        dt = 0.06666f;
+    }
+    m_last_frame_time = fr_time;
+    m_cur_time += dt;
+
+    m_cursor_view = true;
+    if (m_cur_time > 0.3f) { m_cursor_view = false; }
+    if (m_cur_time > 0.4f) { m_cur_time = 0.0f; }
+
+    m_rep_time += dt * m_accel;
+    if (m_rep_time > g_console_sensitive)//0.2
+    {
+        m_rep_time = 0.0f;
+        m_repeat_mode = true;
+        m_accel += 0.2f;
+    }
+    m_last_key_time += dt;
+
+    if (m_last_changed_frame + 1 < Device.dwFrame)
+    {
+        m_need_update = false;
+    }
+
+    /*if ( Device.dwFrame % 100 == 0 )
+    {
+    Msg( " cur_time=%.2f re=%d acc=%.2f rep_time=%.2f", cur_time, bRepeat, fAccel, rep_time );
+    }*/
 }
 
 void line_edit_control::update_bufs()
 {
-	//separate_buffer
-	m_buf0[0] = 0;
-	m_buf1[0] = 0;
-	m_buf2[0] = 0;
-	m_buf3[0] = 0;
-
-	int edit_size = (int)xr_strlen( m_edit_str );
-	int ds = (m_cursor_view && m_insert_mode && m_p2 < edit_size)? 1 : 0;
-	strncpy_s( m_buf0, m_buffer_size, m_edit_str,             m_cur_pos             );
-	strncpy_s( m_buf1, m_buffer_size, m_edit_str,             m_p1                  );
-	strncpy_s( m_buf2, m_buffer_size, m_edit_str + m_p1,      m_p2 - m_p1 + ds      );
-	strncpy_s( m_buf3, m_buffer_size, m_edit_str + m_p2 + ds, edit_size - m_p2 - ds );
-	
-	m_need_update = true;
-	m_last_changed_frame = Device.dwFrame;
-//	if ( m_cursor_view )	{
-//		Msg( " m_p1=%d  m_p2=%d  cur=%d  sstart=%d", m_p1, m_p2, m_cur_pos, m_select_start );	}
+    //separate_buffer
+    m_buf0[0] = 0;
+    m_buf1[0] = 0;
+    m_buf2[0] = 0;
+    m_buf3[0] = 0;
+
+    int edit_size = (int)xr_strlen(m_edit_str);
+    int ds = (m_cursor_view && m_insert_mode && m_p2 < edit_size) ? 1 : 0;
+    strncpy_s(m_buf0, m_buffer_size, m_edit_str, m_cur_pos);
+    strncpy_s(m_buf1, m_buffer_size, m_edit_str, m_p1);
+    strncpy_s(m_buf2, m_buffer_size, m_edit_str + m_p1, m_p2 - m_p1 + ds);
+    strncpy_s(m_buf3, m_buffer_size, m_edit_str + m_p2 + ds, edit_size - m_p2 - ds);
+
+    m_need_update = true;
+    m_last_changed_frame = Device.dwFrame;
+    // if ( m_cursor_view ) {
+    // Msg( " m_p1=%d m_p2=%d cur=%d sstart=%d", m_p1, m_p2, m_cur_pos, m_select_start ); }
 }
 
 void line_edit_control::add_inserted_text()
 {
-	if ( empty_inserted() )
-	{
-		return;
-	}
-	
-	int old_edit_size = (int)xr_strlen( m_edit_str );
-	for ( int i = 0; i < old_edit_size; ++i )
-	{
-		if ( ( m_edit_str[i] == '\n' ) || ( m_edit_str[i] == '\t' ) )
-		{
-			m_edit_str[i]=' ';
-		}
-	}
-
-	PSTR buf = (PSTR)_alloca( (m_buffer_size + 1) * sizeof(char) );
-
-	strncpy_s( buf,        m_buffer_size, m_edit_str,        m_p1        ); // part 1
-	strncpy_s( m_undo_buf, m_buffer_size, m_edit_str + m_p1, m_p2 - m_p1 );
-
-	int new_size = (int)xr_strlen( m_inserted );
-	if ( m_buffer_size - 1 < m_p1 + new_size )
-	{
-		m_inserted[m_buffer_size - 1 - m_p1] = 0;
-		new_size = xr_strlen( m_inserted );
-	}
-	strncpy_s( buf + m_p1, m_buffer_size, m_inserted, _min(new_size, m_buffer_size - m_p1) ); // part 2
-
-	u8 ds = (m_insert_mode && m_p2 < old_edit_size)? 1 : 0;
-	strncpy_s( buf + m_p1 + new_size, m_buffer_size, m_edit_str + m_p2 + ds,
-		_min(old_edit_size - m_p2 - ds, m_buffer_size - m_p1 - new_size) ); // part 3
-	buf[m_buffer_size] = 0;
-
-	int szn = m_p1 + new_size + old_edit_size - m_p2 - ds;
-	if ( szn < m_buffer_size )
-	{
-		strncpy_s( m_edit_str, m_buffer_size, buf, szn ); // part 1+2+3
-		m_edit_str[m_buffer_size-1] = 0;
-		m_cur_pos = m_p1 + new_size;
-	}
-	clamp_cur_pos();
+    if (empty_inserted())
+    {
+        return;
+    }
+
+    int old_edit_size = (int)xr_strlen(m_edit_str);
+    for (int i = 0; i < old_edit_size; ++i)
+    {
+        if ((m_edit_str[i] == '\n') || (m_edit_str[i] == '\t'))
+        {
+            m_edit_str[i] = ' ';
+        }
+    }
+
+    PSTR buf = (PSTR)_alloca((m_buffer_size + 1) * sizeof(char));
+
+    strncpy_s(buf, m_buffer_size, m_edit_str, m_p1); // part 1
+    strncpy_s(m_undo_buf, m_buffer_size, m_edit_str + m_p1, m_p2 - m_p1);
+
+    int new_size = (int)xr_strlen(m_inserted);
+    if (m_buffer_size - 1 < m_p1 + new_size)
+    {
+        m_inserted[m_buffer_size - 1 - m_p1] = 0;
+        new_size = xr_strlen(m_inserted);
+    }
+    strncpy_s(buf + m_p1, m_buffer_size, m_inserted, _min(new_size, m_buffer_size - m_p1)); // part 2
+
+    u8 ds = (m_insert_mode && m_p2 < old_edit_size) ? 1 : 0;
+    strncpy_s(buf + m_p1 + new_size, m_buffer_size, m_edit_str + m_p2 + ds,
+        _min(old_edit_size - m_p2 - ds, m_buffer_size - m_p1 - new_size)); // part 3
+    buf[m_buffer_size] = 0;
+
+    int szn = m_p1 + new_size + old_edit_size - m_p2 - ds;
+    if (szn < m_buffer_size)
+    {
+        strncpy_s(m_edit_str, m_buffer_size, buf, szn); // part 1+2+3
+        m_edit_str[m_buffer_size - 1] = 0;
+        m_cur_pos = m_p1 + new_size;
+    }
+    clamp_cur_pos();
 }
 
 //------------------------------------------------
 
 void line_edit_control::copy_to_clipboard()
 {
-	if ( m_p1 >= m_p2 )
-	{
-		return;
-	}
-	u32 edit_len = xr_strlen( m_edit_str );
-	PSTR buf = (PSTR)_alloca( (edit_len + 1) * sizeof(char) );
-	strncpy_s( buf, edit_len + 1, m_edit_str + m_p1, m_p2 - m_p1 );
-	buf[edit_len] = 0;
-	os_clipboard::copy_to_clipboard( buf );
-	m_mark = false;
+    if (m_p1 >= m_p2)
+    {
+        return;
+    }
+    u32 edit_len = xr_strlen(m_edit_str);
+    PSTR buf = (PSTR)_alloca((edit_len + 1) * sizeof(char));
+    strncpy_s(buf, edit_len + 1, m_edit_str + m_p1, m_p2 - m_p1);
+    buf[edit_len] = 0;
+    os_clipboard::copy_to_clipboard(buf);
+    m_mark = false;
 }
 
 void line_edit_control::paste_from_clipboard()
 {
-	os_clipboard::paste_from_clipboard( m_inserted, m_buffer_size-1 );
+    os_clipboard::paste_from_clipboard(m_inserted, m_buffer_size - 1);
 }
 
 void line_edit_control::cut_to_clipboard()
 {
-	copy_to_clipboard();
-	delete_selected_forward();
+    copy_to_clipboard();
+    delete_selected_forward();
 }
 
 // =================================================================================================
 
 void line_edit_control::undo_buf()
 {
-	xr_strcpy( m_inserted, m_buffer_size, m_undo_buf );
-	m_undo_buf[0] = 0;
+    xr_strcpy(m_inserted, m_buffer_size, m_undo_buf);
+    m_undo_buf[0] = 0;
 }
 
 void line_edit_control::select_all_buf()
 {
-	m_select_start = 0;
-	m_cur_pos = (int)xr_strlen( m_edit_str );
-	m_mark = false;
+    m_select_start = 0;
+    m_cur_pos = (int)xr_strlen(m_edit_str);
+    m_mark = false;
 }
 
 void line_edit_control::flip_insert_mode()
 {
-	m_insert_mode = !m_insert_mode;
+    m_insert_mode = !m_insert_mode;
 }
 
 
 void line_edit_control::delete_selected_back()
 {
-	delete_selected( true );
+    delete_selected(true);
 }
 
 void line_edit_control::delete_selected_forward()
 {
-	delete_selected( false );
-}
-
-void line_edit_control::delete_selected( bool back )
-{
-	clamp_cur_pos();
-	int edit_len = (int)xr_strlen( m_edit_str );
-	if ( edit_len > 0 )
-	{
-		if ( back )
-		{
-			u8 dp = ( (m_p1 == m_p2) && m_p1 > 0 )? 1 : 0;
-			strncpy_s( m_undo_buf,             m_buffer_size, m_edit_str + m_p1 - dp, m_p2 - m_p1 + dp );
-			strncpy_s( m_edit_str + m_p1 - dp, m_buffer_size, m_edit_str + m_p2,      edit_len - m_p2  );
-			m_cur_pos = m_p1 - dp;
-		}
-		else
-		{
-			u8 dn = ( (m_p1 == m_p2) && m_p2 < edit_len )? 1 : 0;
-			strncpy_s( m_undo_buf,        m_buffer_size, m_edit_str + m_p1,      m_p2 - m_p1 + dn     );
-			strncpy_s( m_edit_str + m_p1, m_buffer_size, m_edit_str + m_p2 + dn, edit_len - m_p2 - dn );
-			m_cur_pos = m_p1;
-		}
-		clamp_cur_pos();
-	}
-	m_select_start = m_cur_pos;
+    delete_selected(false);
+}
+
+void line_edit_control::delete_selected(bool back)
+{
+    clamp_cur_pos();
+    int edit_len = (int)xr_strlen(m_edit_str);
+    if (edit_len > 0)
+    {
+        if (back)
+        {
+            u8 dp = ((m_p1 == m_p2) && m_p1 > 0) ? 1 : 0;
+            strncpy_s(m_undo_buf, m_buffer_size, m_edit_str + m_p1 - dp, m_p2 - m_p1 + dp);
+            strncpy_s(m_edit_str + m_p1 - dp, m_buffer_size, m_edit_str + m_p2, edit_len - m_p2);
+            m_cur_pos = m_p1 - dp;
+        }
+        else
+        {
+            u8 dn = ((m_p1 == m_p2) && m_p2 < edit_len) ? 1 : 0;
+            strncpy_s(m_undo_buf, m_buffer_size, m_edit_str + m_p1, m_p2 - m_p1 + dn);
+            strncpy_s(m_edit_str + m_p1, m_buffer_size, m_edit_str + m_p2 + dn, edit_len - m_p2 - dn);
+            m_cur_pos = m_p1;
+        }
+        clamp_cur_pos();
+    }
+    m_select_start = m_cur_pos;
 }
 
 void line_edit_control::delete_word_back()
 {
-	bool const left_shift	= get_key_state(ks_LShift);
-	bool const right_shift	= get_key_state(ks_RShift);
-	set_key_state			( ks_Shift, true );
+    bool const left_shift = get_key_state(ks_LShift);
+    bool const right_shift = get_key_state(ks_RShift);
+    set_key_state(ks_Shift, true);
 
-	move_pos_left_word		( );
-	compute_positions		( );
-	delete_selected			( true );
+    move_pos_left_word();
+    compute_positions();
+    delete_selected(true);
 
-	set_key_state			( ks_LShift, left_shift );
-	set_key_state			( ks_RShift, right_shift );
+    set_key_state(ks_LShift, left_shift);
+    set_key_state(ks_RShift, right_shift);
 }
 
 void line_edit_control::delete_word_forward()
 {
-	set_key_state( ks_Shift, true );
-	move_pos_right_word();
-	compute_positions();
-	delete_selected( false );
-	set_key_state( ks_Shift, false );
+    set_key_state(ks_Shift, true);
+    move_pos_right_word();
+    compute_positions();
+    delete_selected(false);
+    set_key_state(ks_Shift, false);
 }
 
 void line_edit_control::move_pos_home()
 {
-	m_cur_pos = 0;
+    m_cur_pos = 0;
 }
 
 void line_edit_control::move_pos_end()
 {
-	m_cur_pos = (int)xr_strlen( m_edit_str );
+    m_cur_pos = (int)xr_strlen(m_edit_str);
 }
 
 void line_edit_control::move_pos_left()
 {
-	--m_cur_pos;
+    --m_cur_pos;
 }
 
 void line_edit_control::move_pos_right()
 {
-	++m_cur_pos;
+    ++m_cur_pos;
 }
 
 void line_edit_control::move_pos_left_word()
 {
-	int i = m_cur_pos - 1;
-	while ( i >= 0 && m_edit_str[i] == ' ' ) { --i; }
-	if ( !terminate_char( m_edit_str[i] ) )
-	{
-		while ( i >= 0 && !terminate_char( m_edit_str[i], true )  ) { --i; }
-		++i;
-	}
-	m_cur_pos = i;
+    int i = m_cur_pos - 1;
+    while (i >= 0 && m_edit_str[i] == ' ') { --i; }
+    if (!terminate_char(m_edit_str[i]))
+    {
+        while (i >= 0 && !terminate_char(m_edit_str[i], true)) { --i; }
+        ++i;
+    }
+    m_cur_pos = i;
 }
 
 void line_edit_control::move_pos_right_word()
 {
-	int edit_len = (int)xr_strlen( m_edit_str );
-	int i = m_cur_pos + 1;
-	while( i < edit_len && !terminate_char( m_edit_str[i], true ) )	{ ++i; }
-	//while( i < edit_len && terminate_char( m_edit_str[i] ) )		{ ++i; }
-	while( i < edit_len && m_edit_str[i] == ' ' )					{ ++i; }
-	m_cur_pos = i;
+    int edit_len = (int)xr_strlen(m_edit_str);
+    int i = m_cur_pos + 1;
+    while (i < edit_len && !terminate_char(m_edit_str[i], true)) { ++i; }
+    //while( i < edit_len && terminate_char( m_edit_str[i] ) ) { ++i; }
+    while (i < edit_len && m_edit_str[i] == ' ') { ++i; }
+    m_cur_pos = i;
 }
 
 void line_edit_control::compute_positions()
 {
-	m_p1 = m_cur_pos;
-	m_p2 = m_cur_pos;
-	if ( m_unselected_mode )
-	{
-		return;
-	}
+    m_p1 = m_cur_pos;
+    m_p2 = m_cur_pos;
+    if (m_unselected_mode)
+    {
+        return;
+    }
 
-	if( m_cur_pos > m_select_start )
-	{
-		m_p1 = m_select_start;
-	}
-	else if( m_cur_pos < m_select_start )
-	{
-		m_p2 = m_select_start;
-	}
+    if (m_cur_pos > m_select_start)
+    {
+        m_p1 = m_select_start;
+    }
+    else if (m_cur_pos < m_select_start)
+    {
+        m_p2 = m_select_start;
+    }
 }
 
 void line_edit_control::clamp_cur_pos()
 {
-	clamp( m_cur_pos, 0, (int)xr_strlen( m_edit_str ) );
+    clamp(m_cur_pos, 0, (int)xr_strlen(m_edit_str));
 }
 
 void line_edit_control::SwitchKL()
 {
-	ActivateKeyboardLayout( (HKL)HKL_NEXT, 0 );
+    ActivateKeyboardLayout((HKL)HKL_NEXT, 0);
 }
 
 // -------------------------------------------------------------------------------------------------
 
-void remove_spaces( PSTR str ) // in & out
-{
-	u32 str_size = xr_strlen( str );
-	if ( str_size < 1 )
-	{
-		return;
-	}
-	PSTR new_str = (PSTR)_alloca( (str_size + 1) * sizeof(char) );
-	new_str[0] = 0;
-
-	u32 a = 0, b = 0, i = 0;
-	while ( b < str_size )
-	{
-		a = b;
-		while ( a < str_size && str[a] == ' ' ) { ++a; }
-		b = a;
-		while ( b < str_size && str[b] != ' ' ) { ++b; }
-		strncpy_s( new_str + i, str_size+1, str + a, b - a );
-		i += (b-a);
-		if ( i < str_size ) 
-		{
-			new_str[i] = ' ';
-		}
-		++b;
-		++i;
-	}
-	--i;
-	if ( i < str_size )
-	{
-		strncpy_s( str, str_size, new_str, i );
-	}
-}
-
-void split_cmd( PSTR first, PSTR second, LPCSTR str )
-{
-	first[0] = 0;
-	second[0] = 0;
-	u32 str_size = xr_strlen( str );
-	if ( str_size < 1 )
-	{
-		return;
-	}
-
-	// split into =>>(cmd) (params)
-	u32 a = 0;
-	while ( a < str_size && str[a] != ' ' ) { ++a; }
-	strncpy_s( first, str_size+1, str, a );
-	if ( a < str_size )		{ first[a] = 0; }	else	{ first[str_size] = 0; }
-	++a;
-	if ( a < str_size )
-	{
-		strncpy_s( second, str_size+1, str + a, str_size - a );
-		second[str_size - a] = 0;
-	}
+void remove_spaces(PSTR str) // in & out
+{
+    u32 str_size = xr_strlen(str);
+    if (str_size < 1)
+    {
+        return;
+    }
+    PSTR new_str = (PSTR)_alloca((str_size + 1) * sizeof(char));
+    new_str[0] = 0;
+
+    u32 a = 0, b = 0, i = 0;
+    while (b < str_size)
+    {
+        a = b;
+        while (a < str_size && str[a] == ' ') { ++a; }
+        b = a;
+        while (b < str_size && str[b] != ' ') { ++b; }
+        strncpy_s(new_str + i, str_size + 1, str + a, b - a);
+        i += (b - a);
+        if (i < str_size)
+        {
+            new_str[i] = ' ';
+        }
+        ++b;
+        ++i;
+    }
+    --i;
+    if (i < str_size)
+    {
+        strncpy_s(str, str_size, new_str, i);
+    }
+}
+
+void split_cmd(PSTR first, PSTR second, LPCSTR str)
+{
+    first[0] = 0;
+    second[0] = 0;
+    u32 str_size = xr_strlen(str);
+    if (str_size < 1)
+    {
+        return;
+    }
+
+    // split into =>>(cmd) (params)
+    u32 a = 0;
+    while (a < str_size && str[a] != ' ') { ++a; }
+    strncpy_s(first, str_size + 1, str, a);
+    if (a < str_size) { first[a] = 0; }
+    else { first[str_size] = 0; }
+    ++a;
+    if (a < str_size)
+    {
+        strncpy_s(second, str_size + 1, str + a, str_size - a);
+        second[str_size - a] = 0;
+    }
 }
 
 } // namespace text_editor
\ No newline at end of file
diff --git a/src/xrEngine/line_edit_control.h b/src/xrEngine/line_edit_control.h
index 3e505babd27..9d87125d9e6 100644
--- a/src/xrEngine/line_edit_control.h
+++ b/src/xrEngine/line_edit_control.h
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: line_edit_control.h
-//	Created 	: 21.02.2008
-//	Author		: Evgeniy Sokolov
-//	Description : line edit control class
+// Module : line_edit_control.h
+// Created : 21.02.2008
+// Author : Evgeniy Sokolov
+// Description : line edit control class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef LINE_EDIT_CONTROL_H_INCLUDED
@@ -13,155 +13,155 @@
 namespace text_editor
 {
 
-void remove_spaces( PSTR str ); // in & out
-void split_cmd( PSTR first, PSTR second, LPCSTR str );
+void remove_spaces(PSTR str); // in & out
+void split_cmd(PSTR first, PSTR second, LPCSTR str);
 
 class base;
 
 enum key_state // Flags32
 {
-	ks_free   	= u32(0),
-	ks_LShift 	= u32(1) << 0,
-	ks_RShift 	= u32(1) << 1,
-	ks_LCtrl  	= u32(1) << 2,
-	ks_RCtrl  	= u32(1) << 3,
-	ks_LAlt   	= u32(1) << 4,
-	ks_RAlt   	= u32(1) << 5,
-	ks_CapsLock	= u32(1) << 6,
+    ks_free = u32(0),
+    ks_LShift = u32(1) << 0,
+    ks_RShift = u32(1) << 1,
+    ks_LCtrl = u32(1) << 2,
+    ks_RCtrl = u32(1) << 3,
+    ks_LAlt = u32(1) << 4,
+    ks_RAlt = u32(1) << 5,
+    ks_CapsLock = u32(1) << 6,
 
-	ks_Shift  	= u32( ks_LShift | ks_RShift ),
-	ks_Ctrl   	= u32( ks_LCtrl  | ks_RCtrl  ),
-	ks_Alt    	= u32( ks_LAlt   | ks_RAlt   ),
+    ks_Shift = u32(ks_LShift | ks_RShift),
+    ks_Ctrl = u32(ks_LCtrl | ks_RCtrl),
+    ks_Alt = u32(ks_LAlt | ks_RAlt),
 
-	ks_force  	= u32(-1)
+    ks_force = u32(-1)
 
 };// enum key_state
 
 enum init_mode
 {
-	im_standart = 0,
-	im_number_only,
-	im_read_only,
-	im_file_name_mode, // not "/\\:*?\"<>|^()[]%" 
+    im_standart = 0,
+    im_number_only,
+    im_read_only,
+    im_file_name_mode, // not "/\\:*?\"<>|^()[]%"
 
-	im_count
+    im_count
 };// init_mode
 
 
 class ENGINE_API line_edit_control
 {
 private:
-	typedef  text_editor::base						Base;
-	typedef  fastdelegate::FastDelegate0<void>	Callback;
+    typedef text_editor::base Base;
+    typedef fastdelegate::FastDelegate0<void> Callback;
 
 public:
-					line_edit_control	( u32 str_buffer_size );
-			void	init				( u32 str_buffer_size, init_mode mode = im_standart );
-					~line_edit_control	();
+    line_edit_control(u32 str_buffer_size);
+    void init(u32 str_buffer_size, init_mode mode = im_standart);
+    ~line_edit_control();
 
-			void	clear_states		();
-			void	on_key_press		( int dik );
-			void	on_key_hold			( int dik );
-			void	on_key_release		( int dik );
-			void	on_frame			();
+    void clear_states();
+    void on_key_press(int dik);
+    void on_key_hold(int dik);
+    void on_key_release(int dik);
+    void on_frame();
 
-			void	assign_callback		( u32 const dik, key_state state, Callback const& callback );
+    void assign_callback(u32 const dik, key_state state, Callback const& callback);
 
-			void	insert_character	( char c );
+    void insert_character(char c);
 
-	IC	bool		get_key_state		( key_state mask ) const			{ return (mask)? !!(m_key_state.test( mask ) ) : true; }
-	IC	void		set_key_state		( key_state mask, bool value )		{ m_key_state.set( mask, value ); }
+    IC bool get_key_state(key_state mask) const { return (mask) ? !!(m_key_state.test(mask)) : true; }
+    IC void set_key_state(key_state mask, bool value) { m_key_state.set(mask, value); }
 
-	IC	bool		cursor_view			()	const	{ return m_cursor_view; }
-	IC	bool		need_update			()	const	{ return m_need_update; }
+    IC bool cursor_view() const { return m_cursor_view; }
+    IC bool need_update() const { return m_need_update; }
 
-	IC	LPCSTR		str_edit			()	const	{ return m_edit_str; }
-	IC	LPCSTR		str_before_cursor	()	const	{ return m_buf0; }
-	IC	LPCSTR		str_before_mark		()	const	{ return m_buf1; }
-	IC	LPCSTR		str_mark			()	const	{ return m_buf2; }
-	IC	LPCSTR		str_after_mark		()	const	{ return m_buf3; }
+    IC LPCSTR str_edit() const { return m_edit_str; }
+    IC LPCSTR str_before_cursor() const { return m_buf0; }
+    IC LPCSTR str_before_mark() const { return m_buf1; }
+    IC LPCSTR str_mark() const { return m_buf2; }
+    IC LPCSTR str_after_mark() const { return m_buf3; }
 
-		void		set_edit			( LPCSTR str );
-		void		set_selected_mode	( bool status )		{ m_unselected_mode = !status; }
-		bool		get_selected_mode	() const			{ return !m_unselected_mode; }
+    void set_edit(LPCSTR str);
+    void set_selected_mode(bool status) { m_unselected_mode = !status; }
+    bool get_selected_mode() const { return !m_unselected_mode; }
 
 private:
-					line_edit_control	( line_edit_control const& );
-	line_edit_control const& operator=	( line_edit_control const& );
-
-			void	update_key_states	();
-			void	update_bufs			();
-
-	void xr_stdcall	undo_buf			();
-	void xr_stdcall	select_all_buf		();
-	void xr_stdcall flip_insert_mode	();
-
-	void xr_stdcall	copy_to_clipboard	();
-	void xr_stdcall	paste_from_clipboard();
-	void xr_stdcall cut_to_clipboard	();
-
-	void xr_stdcall	move_pos_home		();
-	void xr_stdcall	move_pos_end		();
-	void xr_stdcall move_pos_left		();
-	void xr_stdcall	move_pos_right		();
-	void xr_stdcall move_pos_left_word	();
-	void xr_stdcall	move_pos_right_word	();
-
-	void xr_stdcall	delete_selected_back();
-	void xr_stdcall delete_selected_forward();
-	void xr_stdcall	delete_word_back	();
-	void xr_stdcall	delete_word_forward	();
-	void xr_stdcall SwitchKL			();
-			
-			void	assign_char_pairs	( init_mode mode );
-			void	create_key_state	( u32 const dik, key_state state );
-			void	create_char_pair	( u32 const dik, char c, char c_shift, bool translate = false );
-
-			void	clear_inserted		();
-			bool	empty_inserted		();
-
-			void	add_inserted_text	();
-
-			void	delete_selected		( bool back );
-			void	compute_positions	();
-			void	clamp_cur_pos		();
+    line_edit_control(line_edit_control const&);
+    line_edit_control const& operator= (line_edit_control const&);
+
+    void update_key_states();
+    void update_bufs();
+
+    void xr_stdcall undo_buf();
+    void xr_stdcall select_all_buf();
+    void xr_stdcall flip_insert_mode();
+
+    void xr_stdcall copy_to_clipboard();
+    void xr_stdcall paste_from_clipboard();
+    void xr_stdcall cut_to_clipboard();
+
+    void xr_stdcall move_pos_home();
+    void xr_stdcall move_pos_end();
+    void xr_stdcall move_pos_left();
+    void xr_stdcall move_pos_right();
+    void xr_stdcall move_pos_left_word();
+    void xr_stdcall move_pos_right_word();
+
+    void xr_stdcall delete_selected_back();
+    void xr_stdcall delete_selected_forward();
+    void xr_stdcall delete_word_back();
+    void xr_stdcall delete_word_forward();
+    void xr_stdcall SwitchKL();
+
+    void assign_char_pairs(init_mode mode);
+    void create_key_state(u32 const dik, key_state state);
+    void create_char_pair(u32 const dik, char c, char c_shift, bool translate = false);
+
+    void clear_inserted();
+    bool empty_inserted();
+
+    void add_inserted_text();
+
+    void delete_selected(bool back);
+    void compute_positions();
+    void clamp_cur_pos();
 
 private:
-	enum			{ DIK_COUNT = 256 };
-	Base*			m_actions[DIK_COUNT];
-
-	char*			m_edit_str;
-	char*			m_undo_buf;
-	char*			m_inserted;
-	char*			m_buf0;
-	char*			m_buf1;
-	char*			m_buf2;
-	char*			m_buf3;
-
-	enum			{ MIN_BUF_SIZE = 8, MAX_BUF_SIZE = 4096 };
-	int				m_buffer_size;
-
-	int				m_cur_pos;
-	int				m_select_start;
-	int				m_p1;
-	int				m_p2;
-
-	float			m_accel;
-	float			m_cur_time;
-	float			m_rep_time;
-	float			m_last_key_time;
-	u32				m_last_frame_time;
-	u32				m_last_changed_frame;
-
-	Flags32			m_key_state;
-
-	bool			m_hold_mode;
-	bool			m_insert_mode;
-	bool			m_repeat_mode;
-	bool			m_mark;
-	bool			m_cursor_view;
-	bool			m_need_update;
-	bool			m_unselected_mode;
+    enum { DIK_COUNT = 256 };
+    Base* m_actions[DIK_COUNT];
+
+    char* m_edit_str;
+    char* m_undo_buf;
+    char* m_inserted;
+    char* m_buf0;
+    char* m_buf1;
+    char* m_buf2;
+    char* m_buf3;
+
+    enum { MIN_BUF_SIZE = 8, MAX_BUF_SIZE = 4096 };
+    int m_buffer_size;
+
+    int m_cur_pos;
+    int m_select_start;
+    int m_p1;
+    int m_p2;
+
+    float m_accel;
+    float m_cur_time;
+    float m_rep_time;
+    float m_last_key_time;
+    u32 m_last_frame_time;
+    u32 m_last_changed_frame;
+
+    Flags32 m_key_state;
+
+    bool m_hold_mode;
+    bool m_insert_mode;
+    bool m_repeat_mode;
+    bool m_mark;
+    bool m_cursor_view;
+    bool m_need_update;
+    bool m_unselected_mode;
 }; // class line_edit_control
 
 } // namespace text_editor
diff --git a/src/xrEngine/line_editor.cpp b/src/xrEngine/line_editor.cpp
index 59ed4ff8080..7aba6609388 100644
--- a/src/xrEngine/line_editor.cpp
+++ b/src/xrEngine/line_editor.cpp
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: line_editor.cpp
-//	Created 	: 22.02.2008
-//	Author		: Evgeniy Sokolov
-//	Description : line editor class implementation
+// Module : line_editor.cpp
+// Created : 22.02.2008
+// Author : Evgeniy Sokolov
+// Description : line editor class implementation
 ////////////////////////////////////////////////////////////////////////////
 
 
@@ -12,8 +12,8 @@
 namespace text_editor
 {
 
-line_editor::line_editor( u32 str_buffer_size )
-	: m_control( str_buffer_size )
+line_editor::line_editor(u32 str_buffer_size)
+    : m_control(str_buffer_size)
 {
 }
 
@@ -23,22 +23,22 @@ line_editor::~line_editor()
 
 void line_editor::on_frame()
 {
-	m_control.on_frame();
+    m_control.on_frame();
 }
 
-void line_editor::IR_OnKeyboardPress( int dik )
+void line_editor::IR_OnKeyboardPress(int dik)
 {
-	m_control.on_key_press( dik );
+    m_control.on_key_press(dik);
 }
 
-void line_editor::IR_OnKeyboardHold( int dik )
+void line_editor::IR_OnKeyboardHold(int dik)
 {
-	m_control.on_key_hold( dik );
+    m_control.on_key_hold(dik);
 }
 
-void line_editor::IR_OnKeyboardRelease( int dik )
+void line_editor::IR_OnKeyboardRelease(int dik)
 {
-	m_control.on_key_release( dik );
+    m_control.on_key_release(dik);
 }
 
 } // namespace text_editor
diff --git a/src/xrEngine/line_editor.h b/src/xrEngine/line_editor.h
index 78bf8c8377b..9fb5cd49830 100644
--- a/src/xrEngine/line_editor.h
+++ b/src/xrEngine/line_editor.h
@@ -1,8 +1,8 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: line_editor.h
-//	Created 	: 22.02.2008
-//	Author		: Evgeniy Sokolov
-//	Description : line editor class, controller of line_edit_control
+// Module : line_editor.h
+// Created : 22.02.2008
+// Author : Evgeniy Sokolov
+// Description : line editor class, controller of line_edit_control
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef LINE_EDITOR_H_INCLUDED
@@ -14,23 +14,23 @@
 namespace text_editor
 {
 
-class line_editor :	public IInputReceiver
+class line_editor : public IInputReceiver
 {
 public:
-					line_editor		( u32 str_buffer_size );
-	virtual			~line_editor	();
+    line_editor(u32 str_buffer_size);
+    virtual ~line_editor();
 
-	IC line_edit_control&	control	()				{ return m_control; }
+    IC line_edit_control& control() { return m_control; }
 
-			void	on_frame		();
+    void on_frame();
 
 protected:
-	virtual void	IR_OnKeyboardPress	( int dik );
-	virtual void	IR_OnKeyboardHold	( int dik );
-	virtual void	IR_OnKeyboardRelease( int dik );
+    virtual void IR_OnKeyboardPress(int dik);
+    virtual void IR_OnKeyboardHold(int dik);
+    virtual void IR_OnKeyboardRelease(int dik);
 
 private:
-	line_edit_control		m_control;
+    line_edit_control m_control;
 
 }; // class line_editor
 
diff --git a/src/xrEngine/mailSlot.cpp b/src/xrEngine/mailSlot.cpp
index 33369cd8c18..11b60a5a7d1 100644
--- a/src/xrEngine/mailSlot.cpp
+++ b/src/xrEngine/mailSlot.cpp
@@ -3,82 +3,83 @@
 
 #ifdef DEBUG
 
-static HANDLE hLocalSlot	= INVALID_HANDLE_VALUE;
+static HANDLE hLocalSlot = INVALID_HANDLE_VALUE;
 
-extern	void msParse(LPCSTR cmd);
+extern void msParse(LPCSTR cmd);
 
-void msCreate		(LPCSTR name)
+void msCreate(LPCSTR name)
 {
-	string256		fn;
-	xr_sprintf		(fn,sizeof(fn),"\\\\.\\mailslot\\%s",name);
+    string256 fn;
+    xr_sprintf(fn, sizeof(fn), "\\\\.\\mailslot\\%s", name);
     hLocalSlot = CreateMailslot(
-		fn,
-        0,                             // no maximum message size
-        MAILSLOT_WAIT_FOREVER,         // no time-out for operations
-        (LPSECURITY_ATTRIBUTES) NULL); // no security attributes
+        fn,
+        0, // no maximum message size
+        MAILSLOT_WAIT_FOREVER, // no time-out for operations
+        (LPSECURITY_ATTRIBUTES)NULL); // no security attributes
     if (hLocalSlot == INVALID_HANDLE_VALUE) return;
-	// Msg				("* mailSLOT successfully created.");
+    // Msg ("* mailSLOT successfully created.");
 }
 
-void msRead			(void) 
+void msRead(void)
 {
-    DWORD	cbMessage, cMessage, cbRead;
-	BOOL	fResult;
-	LPSTR	lpszBuffer; 
+    DWORD cbMessage, cMessage, cbRead;
+    BOOL fResult;
+    LPSTR lpszBuffer;
 
     cbMessage = cMessage = cbRead = 0;
-    fResult = GetMailslotInfo(hLocalSlot,	// mailslot handle
-        (LPDWORD) NULL,						// no maximum message size
-        &cbMessage,							// size of next message
-        &cMessage,							// number of messages
-        (LPDWORD) NULL);					// no read time-out
-	if (!fResult) return;
-	if (cbMessage == MAILSLOT_NO_MESSAGE) return;
-    while (cMessage != 0)  // retrieve all messages    
-	{ 
-		// Allocate memory for the message.  
-		lpszBuffer = (LPSTR) GlobalAlloc(GPTR, cbMessage);          
-		lpszBuffer[0] = '\0'; 
-		fResult = ReadFile	(hLocalSlot, lpszBuffer, cbMessage, &cbRead, (LPOVERLAPPED) NULL);  
-		if (!fResult) {
-			GlobalFree((HGLOBAL) lpszBuffer);
-			return;
-		}
-		msParse		(lpszBuffer);
-		GlobalFree((HGLOBAL) lpszBuffer);
-		fResult = GetMailslotInfo(hLocalSlot,	// mailslot handle 
-			(LPDWORD) NULL,							// no maximum message size 
-			&cbMessage,								// size of next message 
-			&cMessage,								// number of messages 
-			(LPDWORD) NULL);						// no read time-out  
-		if (!fResult) return;
+    fResult = GetMailslotInfo(hLocalSlot, // mailslot handle
+        (LPDWORD)NULL, // no maximum message size
+        &cbMessage, // size of next message
+        &cMessage, // number of messages
+        (LPDWORD)NULL); // no read time-out
+    if (!fResult) return;
+    if (cbMessage == MAILSLOT_NO_MESSAGE) return;
+    while (cMessage != 0) // retrieve all messages
+    {
+        // Allocate memory for the message.
+        lpszBuffer = (LPSTR)GlobalAlloc(GPTR, cbMessage);
+        lpszBuffer[0] = '\0';
+        fResult = ReadFile(hLocalSlot, lpszBuffer, cbMessage, &cbRead, (LPOVERLAPPED)NULL);
+        if (!fResult)
+        {
+            GlobalFree((HGLOBAL)lpszBuffer);
+            return;
+        }
+        msParse(lpszBuffer);
+        GlobalFree((HGLOBAL)lpszBuffer);
+        fResult = GetMailslotInfo(hLocalSlot, // mailslot handle
+            (LPDWORD)NULL, // no maximum message size
+            &cbMessage, // size of next message
+            &cMessage, // number of messages
+            (LPDWORD)NULL); // no read time-out
+        if (!fResult) return;
     }
 }
 
-void	msWrite(char *name, char* dest, char *msg) 
+void msWrite(char* name, char* dest, char* msg)
 {
-	HANDLE	hFile; 
-	DWORD	cbWritten;
-	BOOL	fResult;
-	char    cName[256];
+    HANDLE hFile;
+    DWORD cbWritten;
+    BOOL fResult;
+    char cName[256];
 
-	xr_sprintf(cName,sizeof(cName),"\\\\%s\\mailslot\\%s",name,dest);
-	hFile = CreateFile(
-		cName, 
-		GENERIC_WRITE, 
-		FILE_SHARE_READ,  // required to write to a mailslot 
-		(LPSECURITY_ATTRIBUTES) NULL,
-		OPEN_EXISTING,
-		FILE_ATTRIBUTE_NORMAL, 
-		(HANDLE) NULL);  
-	if (hFile == INVALID_HANDLE_VALUE) return;
-	fResult = WriteFile(
-		hFile, 
-		msg, 
-		(u32) lstrlen(msg) + 1,
-		&cbWritten,     
-		(LPOVERLAPPED) NULL);  
-	fResult = CloseHandle(hFile);
+    xr_sprintf(cName, sizeof(cName), "\\\\%s\\mailslot\\%s", name, dest);
+    hFile = CreateFile(
+        cName,
+        GENERIC_WRITE,
+        FILE_SHARE_READ, // required to write to a mailslot
+        (LPSECURITY_ATTRIBUTES)NULL,
+        OPEN_EXISTING,
+        FILE_ATTRIBUTE_NORMAL,
+        (HANDLE)NULL);
+    if (hFile == INVALID_HANDLE_VALUE) return;
+    fResult = WriteFile(
+        hFile,
+        msg,
+        (u32)lstrlen(msg) + 1,
+        &cbWritten,
+        (LPOVERLAPPED)NULL);
+    fResult = CloseHandle(hFile);
 }
 
 #endif
diff --git a/src/xrEngine/motion.cpp b/src/xrEngine/motion.cpp
index f35493be9a8..5b59403f3c6 100644
--- a/src/xrEngine/motion.cpp
+++ b/src/xrEngine/motion.cpp
@@ -2,15 +2,15 @@
 #pragma hdrstop
 
 #include "motion.h"
-#include "envelope.h"      
+#include "envelope.h"
 
-#define EOBJ_OMOTION   			0x1100
-#define EOBJ_SMOTION   			0x1200
-#define EOBJ_OMOTION_VERSION   	0x0005
-#define EOBJ_SMOTION_VERSION   	0x0007
+#define EOBJ_OMOTION 0x1100
+#define EOBJ_SMOTION 0x1200
+#define EOBJ_OMOTION_VERSION 0x0005
+#define EOBJ_SMOTION_VERSION 0x0007
 
 #ifdef _LW_EXPORT
-	extern void ReplaceSpaceAndLowerCase(shared_str& s);
+extern void ReplaceSpaceAndLowerCase(shared_str& s);
 #endif
 
 
@@ -19,13 +19,14 @@
 //------------------------------------------------------------------------------------------
 CCustomMotion::CCustomMotion()
 {
-    iFrameStart		=0;
-    iFrameEnd		=0;
-    fFPS			=30.f;
+    iFrameStart = 0;
+    iFrameEnd = 0;
+    fFPS = 30.f;
 }
 
-CCustomMotion::CCustomMotion(CCustomMotion* source){
-	*this			= *source;
+CCustomMotion::CCustomMotion(CCustomMotion* source)
+{
+    *this = *source;
 }
 
 CCustomMotion::~CCustomMotion()
@@ -35,208 +36,230 @@ CCustomMotion::~CCustomMotion()
 void CCustomMotion::Save(IWriter& F)
 {
 #ifdef _LW_EXPORT
-	ReplaceSpaceAndLowerCase(name);
+    ReplaceSpaceAndLowerCase(name);
 #endif
-	F.w_stringZ	(name);
-	F.w_u32		(iFrameStart);
-	F.w_u32		(iFrameEnd);
-	F.w_float	(fFPS);
+    F.w_stringZ(name);
+    F.w_u32(iFrameStart);
+    F.w_u32(iFrameEnd);
+    F.w_float(fFPS);
 }
 
 bool CCustomMotion::Load(IReader& F)
 {
-	F.r_stringZ	(name);
-	iFrameStart	= F.r_u32();
-	iFrameEnd	= F.r_u32();
-	fFPS		= F.r_float();
-	return true;
+    F.r_stringZ(name);
+    iFrameStart = F.r_u32();
+    iFrameEnd = F.r_u32();
+    fFPS = F.r_float();
+    return true;
 }
 
 //------------------------------------------------------------------------------------------
 // Object Motion
 //------------------------------------------------------------------------------------------
-COMotion::COMotion():CCustomMotion()
+COMotion::COMotion() :CCustomMotion()
 {
-	mtype			=mtObject;
-	for (int ch=0; ch<ctMaxChannel; ch++)
-		envs[ch]	= xr_new<CEnvelope> ();
+    mtype = mtObject;
+    for (int ch = 0; ch < ctMaxChannel; ch++)
+        envs[ch] = xr_new<CEnvelope>();
 }
 
-COMotion::COMotion(COMotion* source):CCustomMotion(source)
+COMotion::COMotion(COMotion* source) :CCustomMotion(source)
 {
-	// bone motions
-	mtype = source->mtype;
-	for (int ch=0; ch<ctMaxChannel; ch++)
-		envs[ch]	= xr_new<CEnvelope> (source->envs[ch]);
+    // bone motions
+    mtype = source->mtype;
+    for (int ch = 0; ch < ctMaxChannel; ch++)
+        envs[ch] = xr_new<CEnvelope>(source->envs[ch]);
 }
 
 COMotion::~COMotion()
 {
-	Clear			();
+    Clear();
 }
 
 void COMotion::Clear()
 {
-	for (int ch=0; ch<ctMaxChannel; ch++) xr_delete(envs[ch]);
+    for (int ch = 0; ch < ctMaxChannel; ch++) xr_delete(envs[ch]);
 }
 
 void COMotion::_Evaluate(float t, Fvector& T, Fvector& R)
 {
-	T.x = envs[ctPositionX]->Evaluate(t);
-	T.y = envs[ctPositionY]->Evaluate(t);
-	T.z = envs[ctPositionZ]->Evaluate(t);
+    T.x = envs[ctPositionX]->Evaluate(t);
+    T.y = envs[ctPositionY]->Evaluate(t);
+    T.z = envs[ctPositionZ]->Evaluate(t);
 
-	R.y = envs[ctRotationH]->Evaluate(t);
-	R.x = envs[ctRotationP]->Evaluate(t);
-	R.z = envs[ctRotationB]->Evaluate(t);
+    R.y = envs[ctRotationH]->Evaluate(t);
+    R.x = envs[ctRotationP]->Evaluate(t);
+    R.z = envs[ctRotationB]->Evaluate(t);
 }
 
-void COMotion::SaveMotion(const char* buf){
-	CMemoryWriter	F;
-	F.open_chunk	(EOBJ_OMOTION);
-	Save			(F);
-	F.close_chunk	();
-	if (!F.save_to(buf)) 
-        Log			("!Can't save object motion:",buf);
+void COMotion::SaveMotion(const char* buf)
+{
+    CMemoryWriter F;
+    F.open_chunk(EOBJ_OMOTION);
+    Save(F);
+    F.close_chunk();
+    if (!F.save_to(buf))
+        Log("!Can't save object motion:", buf);
 }
 
 bool COMotion::LoadMotion(const char* buf)
 {
-	destructor<IReader>	F(FS.r_open(buf));
-	R_ASSERT(F().find_chunk(EOBJ_OMOTION));
-	return Load		(F());
+    destructor<IReader> F(FS.r_open(buf));
+    R_ASSERT(F().find_chunk(EOBJ_OMOTION));
+    return Load(F());
 }
 
 void COMotion::Save(IWriter& F)
 {
-	CCustomMotion::Save(F);
-	F.w_u16		(EOBJ_OMOTION_VERSION);
-	for (int ch=0; ch<ctMaxChannel; ch++)
-		envs[ch]->Save(F);
+    CCustomMotion::Save(F);
+    F.w_u16(EOBJ_OMOTION_VERSION);
+    for (int ch = 0; ch < ctMaxChannel; ch++)
+        envs[ch]->Save(F);
 }
 
 bool COMotion::Load(IReader& F)
 {
-	CCustomMotion::Load(F);
-	u16 vers	= F.r_u16();
-    if (vers==0x0003){
-	    Clear	();
-        for (int ch=0; ch<ctMaxChannel; ch++){
-            envs[ch] = xr_new<CEnvelope> ();
+    CCustomMotion::Load(F);
+    u16 vers = F.r_u16();
+    if (vers == 0x0003)
+    {
+        Clear();
+        for (int ch = 0; ch < ctMaxChannel; ch++)
+        {
+            envs[ch] = xr_new<CEnvelope>();
             envs[ch]->Load_1(F);
         }
-    }else if (vers==0x0004){
-	    Clear	();
-        envs[ctPositionX] = xr_new<CEnvelope>();	envs[ctPositionX]->Load_2(F);
-        envs[ctPositionY] = xr_new<CEnvelope>();	envs[ctPositionY]->Load_2(F);
-        envs[ctPositionZ] = xr_new<CEnvelope>();	envs[ctPositionZ]->Load_2(F);
-        envs[ctRotationP] = xr_new<CEnvelope>();	envs[ctRotationP]->Load_2(F);
-        envs[ctRotationH] = xr_new<CEnvelope>();	envs[ctRotationH]->Load_2(F);
-        envs[ctRotationB] = xr_new<CEnvelope>();	envs[ctRotationB]->Load_2(F);
-    }else{
-		if (vers!=EOBJ_OMOTION_VERSION) return false;
-	    Clear	();
-
-        for (int ch=0; ch<ctMaxChannel; ch++){
+    }
+    else if (vers == 0x0004)
+    {
+        Clear();
+        envs[ctPositionX] = xr_new<CEnvelope>();
+        envs[ctPositionX]->Load_2(F);
+        envs[ctPositionY] = xr_new<CEnvelope>();
+        envs[ctPositionY]->Load_2(F);
+        envs[ctPositionZ] = xr_new<CEnvelope>();
+        envs[ctPositionZ]->Load_2(F);
+        envs[ctRotationP] = xr_new<CEnvelope>();
+        envs[ctRotationP]->Load_2(F);
+        envs[ctRotationH] = xr_new<CEnvelope>();
+        envs[ctRotationH]->Load_2(F);
+        envs[ctRotationB] = xr_new<CEnvelope>();
+        envs[ctRotationB]->Load_2(F);
+    }
+    else
+    {
+        if (vers!=EOBJ_OMOTION_VERSION) return false;
+        Clear ();
+
+        for (int ch=0; ch<ctMaxChannel; ch++)
+        {
             envs[ch] = xr_new<CEnvelope> ();
             envs[ch]->Load_2(F);
         }
     }
-	return true;
+    return true;
 }
 
 #ifdef _EDITOR
 void COMotion::CreateKey(float t, const Fvector& P, const Fvector& R)
 {
-	envs[ctPositionX]->InsertKey(t,P.x);
-	envs[ctPositionY]->InsertKey(t,P.y);
-	envs[ctPositionZ]->InsertKey(t,P.z);
-	envs[ctRotationH]->InsertKey(t,R.y);
-	envs[ctRotationP]->InsertKey(t,R.x);
-	envs[ctRotationB]->InsertKey(t,R.z);
+    envs[ctPositionX]->InsertKey(t,P.x);
+    envs[ctPositionY]->InsertKey(t,P.y);
+    envs[ctPositionZ]->InsertKey(t,P.z);
+    envs[ctRotationH]->InsertKey(t,R.y);
+    envs[ctRotationP]->InsertKey(t,R.x);
+    envs[ctRotationB]->InsertKey(t,R.z);
 }
 void COMotion::DeleteKey(float t)
 {
-	envs[ctPositionX]->DeleteKey(t);
-	envs[ctPositionY]->DeleteKey(t);
-	envs[ctPositionZ]->DeleteKey(t);
-	envs[ctRotationH]->DeleteKey(t);
-	envs[ctRotationP]->DeleteKey(t);
-	envs[ctRotationB]->DeleteKey(t);
+    envs[ctPositionX]->DeleteKey(t);
+    envs[ctPositionY]->DeleteKey(t);
+    envs[ctPositionZ]->DeleteKey(t);
+    envs[ctRotationH]->DeleteKey(t);
+    envs[ctRotationP]->DeleteKey(t);
+    envs[ctRotationB]->DeleteKey(t);
 }
 int COMotion::KeyCount()
 {
-	return envs[ctPositionX]->keys.size();
+    return envs[ctPositionX]->keys.size();
 }
 void COMotion::FindNearestKey(float t, float& mn, float& mx, float eps)
 {
-	KeyIt min_k;
+    KeyIt min_k;
     KeyIt max_k;
-	envs[ctPositionX]->FindNearestKey(t, min_k, max_k, eps);
-    mn = (min_k!=envs[ctPositionX]->keys.end())?(*min_k)->time:t; 
-    mx = (max_k!=envs[ctPositionX]->keys.end())?(*max_k)->time:t; 
+    envs[ctPositionX]->FindNearestKey(t, min_k, max_k, eps);
+    mn = (min_k!=envs[ctPositionX]->keys.end())?(*min_k)->time:t;
+    mx = (max_k!=envs[ctPositionX]->keys.end())?(*max_k)->time:t;
 }
 float COMotion::GetLength(float* mn, float* mx)
 {
-	float ln,len=0.f; 
+    float ln,len=0.f;
     for (int ch=0; ch<ctMaxChannel; ch++)
         if ((ln=envs[ch]->GetLength(mn,mx))>len) len=ln;
     return len;
 }
 BOOL COMotion::ScaleKeys(float from_time, float to_time, float scale_factor)
 {
-	BOOL bRes=TRUE;
+    BOOL bRes=TRUE;
     for (int ch=0; ch<ctMaxChannel; ch++)
         if (FALSE==(bRes=envs[ch]->ScaleKeys(from_time, to_time, scale_factor, 1.f/fFPS))) break;
     return bRes;
 }
 BOOL COMotion::NormalizeKeys(float from_time, float to_time, float speed)
 {
-	if (to_time<from_time) return FALSE;
-	CEnvelope* E 	= Envelope(ctPositionX);
-    float new_tm	= 0;
-    float t0		= E->keys.front()->time;
+    if (to_time<from_time) return FALSE;
+    CEnvelope* E = Envelope(ctPositionX);
+    float new_tm = 0;
+    float t0 = E->keys.front()->time;
     FloatVec tms;
-    tms.push_back	(t0);
-    for (KeyIt it=E->keys.begin()+1; it!=E->keys.end(); it++){
-    	if ((*it)->time>from_time){
-        	if ((*it)->time<to_time+EPS){
-                float dist	= 0;
+    tms.push_back (t0);
+    for (KeyIt it=E->keys.begin()+1; it!=E->keys.end(); it++)
+    {
+        if ((*it)->time>from_time)
+        {
+            if ((*it)->time<to_time+EPS)
+            {
+                float dist = 0;
                 Fvector PT,T,R;
-                _Evaluate	(t0, PT, R);
-                for (float tm=t0+1.f/fFPS; tm<=(*it)->time; tm+=EPS_L){
-                    _Evaluate	(tm, T, R);
-                    dist		+= PT.distance_to(T);
-                    PT.set		(T);
+                _Evaluate (t0, PT, R);
+                for (float tm=t0+1.f/fFPS; tm<=(*it)->time; tm+=EPS_L)
+                {
+                    _Evaluate (tm, T, R);
+                    dist += PT.distance_to(T);
+                    PT.set (T);
                 }
-                new_tm			+= dist / speed;
-                t0				= (*it)->time;
-                tms.push_back	(new_tm);
-	        }else{
-                float dt		= (*it)->time-t0;
-                t0				= (*it)->time;
-                new_tm			+=dt;
-                tms.push_back	(new_tm);
+                new_tm += dist / speed;
+                t0 = (*it)->time;
+                tms.push_back (new_tm);
             }
-        }
+            else
+            {
+                float dt = (*it)->time-t0;
+                t0 = (*it)->time;
+                new_tm +=dt;
+                tms.push_back (new_tm);
     }
-    for (int ch=0; ch<ctMaxChannel; ch++){
-    	E				= Envelope(EChannelType(ch));
-        FloatIt	f_it	= tms.begin();   VERIFY(tms.size()==E->keys.size());
-	    for (KeyIt k_it=E->keys.begin(); k_it!=E->keys.end(); k_it++,f_it++)
-            (*k_it)->time = *f_it;
+}
     }
-    
-/*
-	CEnvelope* E = Envelope();
-    for (KeyIt it=E->keys.begin(); it!=E->keys.end(); it++){
-    	if (((*it)->time>from_time)&&((*it)->time<to_time)){
-		    for (float tm=from_time; tm<=to_time; tm+=1.f/fFPS){
-        	
-        }
+    for (int ch = 0; ch < ctMaxChannel; ch++)
+    {
+        E = Envelope(EChannelType(ch));
+        FloatIt f_it = tms.begin();
+        VERIFY(tms.size()==E->keys.size());
+        for (KeyIt k_it=E->keys.begin(); k_it!=E->keys.end(); k_it++,f_it++)
+            (*k_it)->time = *f_it;
     }
-*/
-	return TRUE;
+
+    /*
+     CEnvelope* E = Envelope();
+     for (KeyIt it=E->keys.begin(); it!=E->keys.end(); it++){
+     if (((*it)->time>from_time)&&((*it)->time<to_time)){
+     for (float tm=from_time; tm<=to_time; tm+=1.f/fFPS){
+
+     }
+     }
+     */
+    return TRUE;
 }
 #endif
 
@@ -249,301 +272,323 @@ BOOL COMotion::NormalizeKeys(float from_time, float to_time, float speed)
 //#include "SkeletonCustom.h"
 CSMotion::CSMotion():CCustomMotion()
 {
-	mtype			=mtSkeleton;
-    m_BoneOrPart	=BI_NONE;
-    fSpeed			=1.0f;
-    fAccrue			=2.0f;
-    fFalloff		=2.0f;
-    fPower			=1.f;
-	m_Flags.zero	();
-}
-
-CSMotion::CSMotion(CSMotion* source):CCustomMotion(source){
-	// bone motions
-	st_BoneMotion*	src;
-	st_BoneMotion*	dest;
-    for(u32 i=0; i<bone_mots.size(); i++){
-    	dest 		= &bone_mots[i];
-    	src 		= &source->bone_mots[i];
-		for (int ch=0; ch<ctMaxChannel; ch++)
-			dest->envs[ch] = xr_new<CEnvelope> (src->envs[ch]);
+    mtype =mtSkeleton;
+    m_BoneOrPart =BI_NONE;
+    fSpeed =1.0f;
+    fAccrue =2.0f;
+    fFalloff =2.0f;
+    fPower =1.f;
+    m_Flags.zero ();
+}
+
+CSMotion::CSMotion(CSMotion* source):CCustomMotion(source)
+{
+    // bone motions
+    st_BoneMotion* src;
+    st_BoneMotion* dest;
+    for(u32 i=0; i<bone_mots.size(); i++)
+    {
+        dest = &bone_mots[i];
+        src = &source->bone_mots[i];
+        for (int ch=0; ch<ctMaxChannel; ch++)
+            dest->envs[ch] = xr_new<CEnvelope> (src->envs[ch]);
     }
 }
 
-CSMotion::~CSMotion(){
-	Clear();
+CSMotion::~CSMotion()
+{
+    Clear();
 }
 
 void CSMotion::Clear()
 {
-	for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
-	{
-		for (int ch=0; ch<ctMaxChannel; ch++) xr_delete(bm_it->envs[ch]);
+    for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
+    {
+        for (int ch=0; ch<ctMaxChannel; ch++) xr_delete(bm_it->envs[ch]);
     }
-	bone_mots.clear();
+    bone_mots.clear();
 }
 
 st_BoneMotion* CSMotion::FindBoneMotion(shared_str name)
 {
-	for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
-    	if (bm_it->name.equal(name)) return &*bm_it;
+    for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
+        if (bm_it->name.equal(name)) return &*bm_it;
     return 0;
 }
 
-void CSMotion::add_empty_motion	(shared_str const &bone_id)
+void CSMotion::add_empty_motion (shared_str const& bone_id)
 {
-	VERIFY					(!FindBoneMotion(bone_id));
+    VERIFY (!FindBoneMotion(bone_id));
 
-    st_BoneMotion			motion;
+    st_BoneMotion motion;
 
-	motion.SetName			(bone_id.c_str());
-	// flRKeyAbsent = (1<<1),
-	motion.m_Flags.assign	( 1 << 1);
+    motion.SetName (bone_id.c_str());
+    // flRKeyAbsent = (1<<1),
+    motion.m_Flags.assign ( 1 << 1);
 
-	for (int ch=0; ch<ctMaxChannel; ch++){
-		motion.envs[ch] = xr_new<CEnvelope> ();
-//		motion.envs[ch];
-	}
+    for (int ch=0; ch<ctMaxChannel; ch++)
+    {
+        motion.envs[ch] = xr_new<CEnvelope> ();
+        // motion.envs[ch];
+    }
 
-	bone_mots.push_back		(motion);
+    bone_mots.push_back (motion);
 }
 
-void CSMotion::CopyMotion(CSMotion* source){
-	Clear();
+void CSMotion::CopyMotion(CSMotion* source)
+{
+    Clear();
 
-	iFrameStart		= source->iFrameStart;
-    iFrameEnd		= source->iFrameEnd;
-	fFPS			= source->fFPS;
-	st_BoneMotion*	src;
-	st_BoneMotion*	dest;
+    iFrameStart = source->iFrameStart;
+    iFrameEnd = source->iFrameEnd;
+    fFPS = source->fFPS;
+    st_BoneMotion* src;
+    st_BoneMotion* dest;
     bone_mots.resize(source->bone_mots.size());
-    for(u32 i=0; i<bone_mots.size(); i++){
-    	dest 		= &bone_mots[i];
-    	src 		= &source->bone_mots[i];
-		for (int ch=0; ch<ctMaxChannel; ch++)
-			dest->envs[ch] = xr_new<CEnvelope> (src->envs[ch]);
+    for(u32 i=0; i<bone_mots.size(); i++)
+    {
+        dest = &bone_mots[i];
+        src = &source->bone_mots[i];
+        for (int ch=0; ch<ctMaxChannel; ch++)
+            dest->envs[ch] = xr_new<CEnvelope> (src->envs[ch]);
     }
 }
 
 void CSMotion::_Evaluate(int bone_idx, float t, Fvector& T, Fvector& R)
 {
-	VERIFY(bone_idx<(int)bone_mots.size());
-	CEnvelope** envs = bone_mots[bone_idx].envs;
-	T.x = envs[ctPositionX]->Evaluate(t);
-	T.y = envs[ctPositionY]->Evaluate(t);
-	T.z = envs[ctPositionZ]->Evaluate(t);
+    VERIFY(bone_idx<(int)bone_mots.size());
+    CEnvelope** envs = bone_mots[bone_idx].envs;
+    T.x = envs[ctPositionX]->Evaluate(t);
+    T.y = envs[ctPositionY]->Evaluate(t);
+    T.z = envs[ctPositionZ]->Evaluate(t);
 
-	R.y = envs[ctRotationH]->Evaluate(t);
-	R.x = envs[ctRotationP]->Evaluate(t);
-	R.z = envs[ctRotationB]->Evaluate(t);
+    R.y = envs[ctRotationH]->Evaluate(t);
+    R.x = envs[ctRotationP]->Evaluate(t);
+    R.z = envs[ctRotationB]->Evaluate(t);
 }
 
 void CSMotion::WorldRotate(int boneId, float h, float p, float b)
 {
-	R_ASSERT((boneId>=0)&&(boneId<(int)bone_mots.size()));
+    R_ASSERT((boneId>=0)&&(boneId<(int)bone_mots.size()));
     st_BoneMotion& BM = bone_mots[boneId];
 
-	BM.envs[ctRotationH]->RotateKeys(h);
-	BM.envs[ctRotationP]->RotateKeys(p);
-	BM.envs[ctRotationB]->RotateKeys(b);
+    BM.envs[ctRotationH]->RotateKeys(h);
+    BM.envs[ctRotationP]->RotateKeys(p);
+    BM.envs[ctRotationB]->RotateKeys(b);
 }
 
-void CSMotion::SaveMotion(const char* buf){
-	CMemoryWriter	F;
-	F.open_chunk	(EOBJ_SMOTION);
-	Save			(F);
-	F.close_chunk	();
-	if (!F.save_to(buf)) 
-        Log			("!Can't save skeleton motion:",buf);
+void CSMotion::SaveMotion(const char* buf)
+{
+    CMemoryWriter F;
+    F.open_chunk (EOBJ_SMOTION);
+    Save (F);
+    F.close_chunk ();
+    if (!F.save_to(buf))
+        Log ("!Can't save skeleton motion:",buf);
 }
 
 bool CSMotion::LoadMotion(const char* buf)
 {
-	destructor<IReader>	F(FS.r_open(buf));
-	R_ASSERT		(F().find_chunk(EOBJ_SMOTION));
-	return Load		(F());
+    destructor<IReader> F(FS.r_open(buf));
+    R_ASSERT (F().find_chunk(EOBJ_SMOTION));
+    return Load (F());
 }
 
 void CSMotion::Save(IWriter& F)
 {
-	CCustomMotion::Save(F);
-	F.w_u16		(EOBJ_SMOTION_VERSION);
-	F.w_s8		(m_Flags.get());
-    F.w_u16		(m_BoneOrPart);
-    F.w_float	(fSpeed);           
-    F.w_float	(fAccrue);
-    F.w_float	(fFalloff);
-    F.w_float	(fPower);
-	F.w_u16		((u16)bone_mots.size());
-	for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++){
-    	xr_strlwr	(bm_it->name);
-    	F.w_stringZ	(bm_it->name);
-		F.w_u8		(bm_it->m_Flags.get());
-		for (int ch=0; ch<ctMaxChannel; ch++)
-			bm_it->envs[ch]->Save(F);
-	}
-
-    u32 sz			= marks.size();
-    F.w_u32			(sz);
+    CCustomMotion::Save(F);
+    F.w_u16 (EOBJ_SMOTION_VERSION);
+    F.w_s8 (m_Flags.get());
+    F.w_u16 (m_BoneOrPart);
+    F.w_float (fSpeed);
+    F.w_float (fAccrue);
+    F.w_float (fFalloff);
+    F.w_float (fPower);
+    F.w_u16 ((u16)bone_mots.size());
+    for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
+    {
+        xr_strlwr (bm_it->name);
+        F.w_stringZ (bm_it->name);
+        F.w_u8 (bm_it->m_Flags.get());
+        for (int ch=0; ch<ctMaxChannel; ch++)
+            bm_it->envs[ch]->Save(F);
+    }
+
+    u32 sz = marks.size();
+    F.w_u32 (sz);
     for(u32 i=0; i<sz; ++i)
-      marks[i].Save(&F);
+        marks[i].Save(&F);
 
 }
 
 bool CSMotion::Load(IReader& F)
 {
-	CCustomMotion::Load(F);
-	u16 vers	= F.r_u16();
-	if (vers==0x0004){
-	    m_BoneOrPart= u16(F.r_u32()&0xffff);
-		m_Flags.set	(esmFX,F.r_u8());
-		m_Flags.set	(esmStopAtEnd,F.r_u8());
-		fSpeed		= F.r_float();
-	    fAccrue		= F.r_float();
-		fFalloff	= F.r_float();
-	    fPower		= F.r_float();
-		bone_mots.resize(F.r_u32());
-        string64	temp_buf;
-		for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++){
-        	bm_it->SetName	(itoa(int(bm_it-bone_mots.begin()),temp_buf,10));
-			bm_it->m_Flags.assign((u8)F.r_u32());
-			for (int ch=0; ch<ctMaxChannel; ch++){
-				bm_it->envs[ch] = xr_new<CEnvelope> ();
-				bm_it->envs[ch]->Load_1(F);
-			}
-		}
-	}else{
-		if (vers==0x0005){
-            m_Flags.assign	((u8)F.r_u32());
+    CCustomMotion::Load(F);
+    u16 vers = F.r_u16();
+    if (vers==0x0004)
+    {
+        m_BoneOrPart= u16(F.r_u32()&0xffff);
+        m_Flags.set (esmFX,F.r_u8());
+        m_Flags.set (esmStopAtEnd,F.r_u8());
+        fSpeed = F.r_float();
+        fAccrue = F.r_float();
+        fFalloff = F.r_float();
+        fPower = F.r_float();
+        bone_mots.resize(F.r_u32());
+        string64 temp_buf;
+        for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
+        {
+            bm_it->SetName (itoa(int(bm_it-bone_mots.begin()),temp_buf,10));
+            bm_it->m_Flags.assign((u8)F.r_u32());
+            for (int ch=0; ch<ctMaxChannel; ch++)
+            {
+                bm_it->envs[ch] = xr_new<CEnvelope> ();
+                bm_it->envs[ch]->Load_1(F);
+            }
+        }
+    }
+    else
+    {
+        if (vers==0x0005)
+        {
+            m_Flags.assign ((u8)F.r_u32());
             m_BoneOrPart= u16(F.r_u32()&0xffff);
-            fSpeed		= F.r_float();
-            fAccrue		= F.r_float();
-            fFalloff	= F.r_float();
-            fPower		= F.r_float();
+            fSpeed = F.r_float();
+            fAccrue = F.r_float();
+            fFalloff = F.r_float();
+            fPower = F.r_float();
             bone_mots.resize(F.r_u32());
-            string64 	buf;
-            for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++){
-                F.r_stringZ		(buf,sizeof(buf));
-                bm_it->SetName	(buf);
+            string64 buf;
+            for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
+            {
+                F.r_stringZ (buf,sizeof(buf));
+                bm_it->SetName (buf);
                 bm_it->m_Flags.assign((u8)F.r_u32());
-                for (int ch=0; ch<ctMaxChannel; ch++){
+                for (int ch=0; ch<ctMaxChannel; ch++)
+                {
                     bm_it->envs[ch] = xr_new<CEnvelope> ();
                     bm_it->envs[ch]->Load_1(F);
                 }
             }
-        }else{
+        }
+        else
+        {
             if (vers>=0x0006)
             {
-                m_Flags.assign	(F.r_u8());
+                m_Flags.assign (F.r_u8());
                 m_BoneOrPart= F.r_u16();
-                fSpeed		= F.r_float();
-                fAccrue		= F.r_float();
-                fFalloff	= F.r_float();
-                fPower		= F.r_float();
+                fSpeed = F.r_float();
+                fAccrue = F.r_float();
+                fFalloff = F.r_float();
+                fPower = F.r_float();
                 bone_mots.resize(F.r_u16());
-                string64 	buf;
-                for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++){
-                    F.r_stringZ		(buf,sizeof(buf));
-                    bm_it->SetName	(buf);
+                string64 buf;
+                for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
+                {
+                    F.r_stringZ (buf,sizeof(buf));
+                    bm_it->SetName (buf);
                     bm_it->m_Flags.assign(F.r_u8());
-                    for (int ch=0; ch<ctMaxChannel; ch++){
+                    for (int ch=0; ch<ctMaxChannel; ch++)
+                    {
                         bm_it->envs[ch] = xr_new<CEnvelope> ();
                         bm_it->envs[ch]->Load_2(F);
                     }
                 }
             }
         }
-	}
+    }
     if(vers>=0x0007)
     {
-    	u32 sz 			= F.r_u32();
+        u32 sz = F.r_u32();
         if(sz>0)
         {
-        	marks.resize	(sz);
+            marks.resize (sz);
             for(u32 i=0; i<sz; ++i)
-              marks[i].Load(&F);
+                marks[i].Load(&F);
         }
     }
-	for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
-    	xr_strlwr		(bm_it->name);
-	return true;
-}
+    for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++)
+        xr_strlwr (bm_it->name);
+    return true;
+    }
 
 void CSMotion::Optimize()
 {
-    for(BoneMotionIt bm_it=bone_mots.begin(); bm_it!=bone_mots.end(); bm_it++){
-        for (int ch=0; ch<ctMaxChannel; ch++)
+    for (BoneMotionIt bm_it = bone_mots.begin(); bm_it != bone_mots.end(); bm_it++)
+    {
+        for (int ch = 0; ch < ctMaxChannel; ch++)
             bm_it->envs[ch]->Optimize();
     }
 }
 
 void CSMotion::SortBonesBySkeleton(BoneVec& bones)
 {
-	BoneMotionVec new_bone_mots;
-	for (BoneIt b_it=bones.begin(); b_it!=bones.end(); ++b_it)
+    BoneMotionVec new_bone_mots;
+    for (BoneIt b_it = bones.begin(); b_it != bones.end(); ++b_it)
     {
-    	st_BoneMotion* BM 		= FindBoneMotion((*b_it)->Name());
-        if(!BM)
+        st_BoneMotion* BM = FindBoneMotion((*b_it)->Name());
+        if (!BM)
         {
-        	CBone* B 				= *(b_it);
-        	bone_mots.push_back		(st_BoneMotion());
-            st_BoneMotion& bm0 		= bone_mots[0];
-            st_BoneMotion& bm 		= bone_mots.back();
-            bm.SetName				(B->Name().c_str());
-            bm.m_Flags.assign		(bm0.m_Flags);
-            
-            for (int ch=0; ch<ctMaxChannel; ++ch)
+            CBone* B = *(b_it);
+            bone_mots.push_back(st_BoneMotion());
+            st_BoneMotion& bm0 = bone_mots[0];
+            st_BoneMotion& bm = bone_mots.back();
+            bm.SetName(B->Name().c_str());
+            bm.m_Flags.assign(bm0.m_Flags);
+
+            for (int ch = 0; ch < ctMaxChannel; ++ch)
             {
-                bm.envs[ch] = xr_new<CEnvelope> ();
-//.                bm.envs[ch]->Load_2(F);
+                bm.envs[ch] = xr_new<CEnvelope>();
+                //. bm.envs[ch]->Load_2(F);
             }
-            bm.envs[ctPositionX]->InsertKey(0.0f,B->_Offset().x);
-            bm.envs[ctPositionY]->InsertKey(0.0f,B->_Offset().y);
-            bm.envs[ctPositionZ]->InsertKey(0.0f,B->_Offset().z);
-            bm.envs[ctRotationH]->InsertKey(0.0f,B->_Rotate().x);
-            bm.envs[ctRotationP]->InsertKey(0.0f,B->_Rotate().y);
-            bm.envs[ctRotationB]->InsertKey(0.0f,B->_Rotate().z);
-          BM			= &bm;
+            bm.envs[ctPositionX]->InsertKey(0.0f, B->_Offset().x);
+            bm.envs[ctPositionY]->InsertKey(0.0f, B->_Offset().y);
+            bm.envs[ctPositionZ]->InsertKey(0.0f, B->_Offset().z);
+            bm.envs[ctRotationH]->InsertKey(0.0f, B->_Rotate().x);
+            bm.envs[ctRotationP]->InsertKey(0.0f, B->_Rotate().y);
+            bm.envs[ctRotationB]->InsertKey(0.0f, B->_Rotate().z);
+            BM = &bm;
         };
-		new_bone_mots.push_back(*BM);
+        new_bone_mots.push_back(*BM);
     }
-    bone_mots.clear	();
-    bone_mots 		= new_bone_mots;
+    bone_mots.clear();
+    bone_mots = new_bone_mots;
 }
 #endif
 
 void SAnimParams::Set(float start_frame, float end_frame, float fps)
 {
-    min_t=start_frame/fps;
-    max_t=end_frame/fps;
+    min_t = start_frame / fps;
+    max_t = end_frame / fps;
 }
 
 void SAnimParams::Set(CCustomMotion* M)
 {
-    Set((float)M->FrameStart(),(float)M->FrameEnd(),M->FPS());
-	t_current	= min_t;
-    tmp 		= t_current;
-//    bPlay=true;
+    Set((float)M->FrameStart(), (float)M->FrameEnd(), M->FPS());
+    t_current = min_t;
+    tmp = t_current;
+    // bPlay=true;
 }
 void SAnimParams::Update(float dt, float speed, bool loop)
 {
-	if (!bPlay) return;
-	bWrapped	= false;
+    if (!bPlay) return;
+    bWrapped = false;
 
-	t_current	+=speed*dt;
-    tmp 		= t_current;
+    t_current += speed*dt;
+    tmp = t_current;
 
-    if (t_current>max_t)
+    if (t_current > max_t)
     {
-		bWrapped= true;
-		if (loop)
+        bWrapped = true;
+        if (loop)
         {
-        	float len = max_t-min_t;
-        	float k = float(iFloor((t_current-min_t)/len));
-        	t_current	= t_current-k*len;
-        }else
-            t_current   = max_t;
-
-    tmp 		= t_current;
-	}
+            float len = max_t - min_t;
+            float k = float(iFloor((t_current - min_t) / len));
+            t_current = t_current - k*len;
+        }
+        else
+            t_current = max_t;
+
+        tmp = t_current;
+    }
 }
\ No newline at end of file
diff --git a/src/xrEngine/motion.h b/src/xrEngine/motion.h
index 20a7ab8ec5f..97cb7393b90 100644
--- a/src/xrEngine/motion.h
+++ b/src/xrEngine/motion.h
@@ -15,180 +15,185 @@ class IWriter;
 class IReader;
 class motion_marks;
 
-enum EChannelType{
-	ctUnsupported = -1,
-	ctPositionX=0,
-	ctPositionY,
-	ctPositionZ,
-	ctRotationH,
-	ctRotationP,
-	ctRotationB,
-	ctMaxChannel
+enum EChannelType
+{
+    ctUnsupported = -1,
+    ctPositionX = 0,
+    ctPositionY,
+    ctPositionZ,
+    ctRotationH,
+    ctRotationP,
+    ctRotationB,
+    ctMaxChannel
 };
 
 struct st_BoneMotion
 {
-	enum {
-		flWorldOrient = 1<<0,
-	};
-	shared_str		name;
-	CEnvelope*	envs			[ctMaxChannel];
-	Flags8		m_Flags;
-    			st_BoneMotion()	{name=0; m_Flags.zero(); ZeroMemory(envs,sizeof(CEnvelope*)*ctMaxChannel);}
-    void        SetName(LPCSTR nm)	{	name=nm;	}
+    enum
+    {
+        flWorldOrient = 1 << 0,
+    };
+    shared_str name;
+    CEnvelope* envs[ctMaxChannel];
+    Flags8 m_Flags;
+    st_BoneMotion() { name = 0; m_Flags.zero(); ZeroMemory(envs, sizeof(CEnvelope*)*ctMaxChannel); }
+    void SetName(LPCSTR nm) { name = nm; }
 };
 // vector ïî êîñòÿì
-DEFINE_VECTOR(st_BoneMotion,BoneMotionVec,BoneMotionIt);
+DEFINE_VECTOR(st_BoneMotion, BoneMotionVec, BoneMotionIt);
 
 //--------------------------------------------------------------------------
 class ENGINE_API CCustomMotion
 {
 protected:
-	enum EMotionType
-	{
-		mtObject	= 0,
-		mtSkeleton,
-		ForceDWORD	= u32(-1)
-	};
-	EMotionType		mtype;
-	int				iFrameStart, iFrameEnd;
-	float			fFPS;
+    enum EMotionType
+    {
+        mtObject = 0,
+        mtSkeleton,
+        ForceDWORD = u32(-1)
+    };
+    EMotionType mtype;
+    int iFrameStart, iFrameEnd;
+    float fFPS;
 public:
-	shared_str		name;
+    shared_str name;
 public:
-					CCustomMotion	();
-					CCustomMotion	(CCustomMotion* src);
-	virtual			~CCustomMotion	();
+    CCustomMotion();
+    CCustomMotion(CCustomMotion* src);
+    virtual ~CCustomMotion();
 
-	void			SetName			(const char* n)	{string256 tmp; tmp[0]=0; if(n){xr_strcpy(tmp,n); strlwr(tmp);} name=tmp;}
-	LPCSTR			Name			()				{return name.c_str();}
-    int				FrameStart		()				{return iFrameStart;}
-    int				FrameEnd		()				{return iFrameEnd;}
-    float			FPS				()				{return fFPS;}
-    int				Length			()				{return iFrameEnd-iFrameStart+1;}
+    void SetName(const char* n) { string256 tmp; tmp[0] = 0; if (n) { xr_strcpy(tmp, n); strlwr(tmp); } name = tmp; }
+    LPCSTR Name() { return name.c_str(); }
+    int FrameStart() { return iFrameStart; }
+    int FrameEnd() { return iFrameEnd; }
+    float FPS() { return fFPS; }
+    int Length() { return iFrameEnd - iFrameStart + 1; }
 
-	void			SetParam		(int s, int e, float fps){iFrameStart=s; iFrameEnd=e; fFPS=fps;}
+    void SetParam(int s, int e, float fps) { iFrameStart = s; iFrameEnd = e; fFPS = fps; }
 
-	virtual void	Save			(IWriter& F);
-	virtual bool	Load			(IReader& F);
+    virtual void Save(IWriter& F);
+    virtual bool Load(IReader& F);
 
-	virtual void	SaveMotion		(const char* buf)=0;
-	virtual bool	LoadMotion		(const char* buf)=0;
+    virtual void SaveMotion(const char* buf) = 0;
+    virtual bool LoadMotion (const char* buf)=0;
 
 #ifdef _LW_EXPORT
-	CEnvelope*		CreateEnvelope	(LWChannelID chan, LWChannelID* chan_parent=0);
+    CEnvelope* CreateEnvelope(LWChannelID chan, LWChannelID* chan_parent = 0);
 #endif
 };
 
 //--------------------------------------------------------------------------
-class ENGINE_API COMotion: public CCustomMotion
+class ENGINE_API COMotion : public CCustomMotion
 {
-	CEnvelope*		envs			[ctMaxChannel];
+    CEnvelope* envs[ctMaxChannel];
 public:
-					COMotion		();
-					COMotion		(COMotion* src);
-	virtual			~COMotion		();
+    COMotion();
+    COMotion(COMotion* src);
+    virtual ~COMotion();
 
-	void			Clear			();
+    void Clear();
 
-	void			_Evaluate		(float t, Fvector& T, Fvector& R);
-	virtual void	Save			(IWriter& F);
-	virtual bool	Load			(IReader& F);
+    void _Evaluate(float t, Fvector& T, Fvector& R);
+    virtual void Save(IWriter& F);
+    virtual bool Load(IReader& F);
 
-	virtual void	SaveMotion		(const char* buf);
-	virtual bool	LoadMotion		(const char* buf);
+    virtual void SaveMotion(const char* buf);
+    virtual bool LoadMotion (const char* buf);
 
 #ifdef _LW_EXPORT
-	void			ParseObjectMotion(LWItemID object);
+    void ParseObjectMotion(LWItemID object);
 #endif
 #ifdef _EDITOR
-	void 			FindNearestKey	(float t, float& min_k, float& max_k, float eps=EPS_L);
-	void			CreateKey		(float t, const Fvector& P, const Fvector& R);
-	void			DeleteKey		(float t);
-    void			NormalizeKeys	();
-    int				KeyCount		();
-	CEnvelope*		Envelope		(EChannelType et=ctPositionX){return envs[et];}
-    BOOL			ScaleKeys		(float from_time, float to_time, float scale_factor);
-    BOOL			NormalizeKeys	(float from_time, float to_time, float speed);
-    float			GetLength		(float* mn=0, float* mx=0);
+    void FindNearestKey (float t, float& min_k, float& max_k, float eps=EPS_L);
+    void CreateKey (float t, const Fvector& P, const Fvector& R);
+    void DeleteKey (float t);
+    void NormalizeKeys ();
+    int KeyCount ();
+    CEnvelope* Envelope (EChannelType et=ctPositionX) {return envs[et];}
+    BOOL ScaleKeys (float from_time, float to_time, float scale_factor);
+    BOOL NormalizeKeys(float from_time, float to_time, float speed);
+    float GetLength(float* mn = 0, float* mx = 0);
 #endif
 };
 
 //--------------------------------------------------------------------------
 
-enum ESMFlags{
-    esmFX				= 1<<0,
-    esmStopAtEnd		= 1<<1,
-    esmNoMix			= 1<<2,
-    esmSyncPart			= 1<<3,
-    esmUseFootSteps    	= 1<<4,
-	esmRootMover     	= 1<<5,
-	esmIdle             = 1<<6,
-	esmUseWeaponBone	= 1<<7,
+enum ESMFlags
+{
+    esmFX = 1 << 0,
+    esmStopAtEnd = 1 << 1,
+    esmNoMix = 1 << 2,
+    esmSyncPart = 1 << 3,
+    esmUseFootSteps = 1 << 4,
+    esmRootMover = 1 << 5,
+    esmIdle = 1 << 6,
+    esmUseWeaponBone = 1<<7,
 };
 
 #if defined(_EDITOR) || defined(_MAX_EXPORT) || defined(_MAYA_EXPORT)
-	#include "SkeletonMotions.h"
+#include "SkeletonMotions.h"
 
-class ENGINE_API CSMotion: public CCustomMotion{
-	BoneMotionVec	bone_mots;
+class ENGINE_API CSMotion: public CCustomMotion
+{
+    BoneMotionVec bone_mots;
 public:
-    u16			           	        m_BoneOrPart;
-    float		           	        fSpeed;
-    float		           	        fAccrue;
-    float		           	        fFalloff;
-    float		           	        fPower;
-	Flags8		           	        m_Flags;
+    u16 m_BoneOrPart;
+    float fSpeed;
+    float fAccrue;
+    float fFalloff;
+    float fPower;
+    Flags8 m_Flags;
 
-	xr_vector<motion_marks>			marks;
+    xr_vector<motion_marks> marks;
 
-    void			Clear			();
+    void Clear ();
 public:
-					CSMotion		();
-					CSMotion		(CSMotion* src);
-	virtual			~CSMotion		();
+    CSMotion ();
+    CSMotion (CSMotion* src);
+    virtual ~CSMotion ();
 
-	void			_Evaluate		(int bone_idx, float t, Fvector& T, Fvector& R);
+    void _Evaluate (int bone_idx, float t, Fvector& T, Fvector& R);
 
-    void			CopyMotion		(CSMotion* src);
+    void CopyMotion (CSMotion* src);
 
-    st_BoneMotion*	FindBoneMotion	(shared_str name);
-    BoneMotionVec&	BoneMotions		()				{return bone_mots;}
-	Flags8			GetMotionFlags	(int bone_idx)	{return bone_mots[bone_idx].m_Flags;}
-	void			add_empty_motion(shared_str const &bone_id);
+    st_BoneMotion* FindBoneMotion (shared_str name);
+    BoneMotionVec& BoneMotions () {return bone_mots;}
+    Flags8 GetMotionFlags (int bone_idx) {return bone_mots[bone_idx].m_Flags;}
+    void add_empty_motion(shared_str const& bone_id);
 
-	virtual void	Save			(IWriter& F);
-	virtual bool	Load			(IReader& F);
+    virtual void Save (IWriter& F);
+    virtual bool Load (IReader& F);
 
-	virtual void	SaveMotion		(const char* buf);
-	virtual bool	LoadMotion		(const char* buf);
+    virtual void SaveMotion (const char* buf);
+    virtual bool LoadMotion (const char* buf);
 
-    void			SortBonesBySkeleton(BoneVec& bones);
-    void			WorldRotate		(int boneId, float h, float p, float b);
+    void SortBonesBySkeleton(BoneVec& bones);
+    void WorldRotate (int boneId, float h, float p, float b);
 
-    void			Optimize		();
-	#ifdef _LW_EXPORT
-	void			ParseBoneMotion	(LWItemID bone);
-	#endif
+    void Optimize ();
+#ifdef _LW_EXPORT
+    void ParseBoneMotion(LWItemID bone);
+#endif
 };
 #endif
 
-struct ECORE_API SAnimParams		{
-    float			t_current;
-    float			tmp;
-    float			min_t;
-    float			max_t;
-    BOOL			bPlay;
-	BOOL			bWrapped;
+struct ECORE_API SAnimParams
+{
+    float t_current;
+    float tmp;
+    float min_t;
+    float max_t;
+    BOOL bPlay;
+    BOOL bWrapped;
 public:
-					SAnimParams(){bWrapped=false;bPlay=false;t_current=0.f;min_t=0.f;max_t=0.f;tmp=0.f;}
-    void			Set		(CCustomMotion* M);
-	void 			Set		(float start_frame, float end_frame, float fps);
-    float			Frame	()			{ return t_current;}
-    void			Update	(float dt, float speed, bool loop);
-    void			Play	(){bPlay=true; t_current=min_t; tmp=min_t;}
-    void			Stop	(){bPlay=false; t_current=min_t; tmp=min_t;}
-    void			Pause	(bool val){bPlay=!val;}
+    SAnimParams() { bWrapped = false; bPlay = false; t_current = 0.f; min_t = 0.f; max_t = 0.f; tmp = 0.f; }
+    void Set(CCustomMotion* M);
+    void Set(float start_frame, float end_frame, float fps);
+    float Frame() { return t_current; }
+    void Update(float dt, float speed, bool loop);
+    void Play() { bPlay = true; t_current = min_t; tmp = min_t; }
+    void Stop() { bPlay = false; t_current = min_t; tmp = min_t; }
+    void Pause(bool val) { bPlay = !val; }
 };
 
 #endif
diff --git a/src/xrEngine/mp_logging.h b/src/xrEngine/mp_logging.h
index 1cb36d8d435..b896f8f0c25 100644
--- a/src/xrEngine/mp_logging.h
+++ b/src/xrEngine/mp_logging.h
@@ -6,7 +6,7 @@
 #define MP_DEBUG_AUTH 0x7ebf746e
 
 #ifdef DEBUG
-	#define MP_LOGGING
+#define MP_LOGGING
 #endif
 
 #endif //#ifndef MP_LOGGING_H
diff --git a/src/xrEngine/no_single.h b/src/xrEngine/no_single.h
index e0d26bcfc23..57814880feb 100644
--- a/src/xrEngine/no_single.h
+++ b/src/xrEngine/no_single.h
@@ -3,5 +3,5 @@
 //#define NO_SINGLE
 
 #ifdef DEDICATED_SERVER_ONLY
-#	define NO_SINGLE
+# define NO_SINGLE
 #endif //#ifdef DEDICATED_SERVER_ONLY
\ No newline at end of file
diff --git a/src/xrEngine/perlin.cpp b/src/xrEngine/perlin.cpp
index 9489c7124fc..c7dc9f201e4 100644
--- a/src/xrEngine/perlin.cpp
+++ b/src/xrEngine/perlin.cpp
@@ -10,101 +10,104 @@
 #define BM (SAMPLE_SIZE-1)
 
 #define N 0x1000
-#define NP 12   /* 2^N */
+#define NP 12 /* 2^N */
 #define NM 0xfff
 
 #define s_curve(t) ( t * t * (3.0f - 2.0f * t) )
 #define lerp(t, a, b) ( a + t * (b - a) )
 
 #define setup(i,b0,b1,r0,r1)\
-	t = vec[i] + N;\
-	b0 = ((int)t) & BM;\
-	b1 = (b0+1) & BM;\
-	r0 = t - (int)t;\
-	r1 = r0 - 1.0f;
+ t = vec[i] + N;\
+ b0 = ((int)t) & BM;\
+ b1 = (b0+1) & BM;\
+ r0 = t - (int)t;\
+ r1 = r0 - 1.0f;
 
 //-------------------------------------------------------------------------------------------------
 // CPerlinNoise1D
 //-------------------------------------------------------------------------------------------------
 void CPerlinNoise1D::init()
 {
-	int i, j, k;
-
-	for (i = 0 ; i < B ; i++)
-	{
-		p[i] = i;
-		g1[i] = (float)((rand() % (B + B)) - B) / B;
-	}
-
-	while (--i)
-	{
-		k = p[i];
-		p[i] = p[j = rand() % B];
-		p[j] = k;
-	}
-
-	for (i = 0 ; i < B + 2 ; i++)
-	{
-		p[B + i] = p[i];
-		g1[B + i] = g1[i];
-	}
+    int i, j, k;
+
+    for (i = 0; i < B; i++)
+    {
+        p[i] = i;
+        g1[i] = (float)((rand() % (B + B)) - B) / B;
+    }
+
+    while (--i)
+    {
+        k = p[i];
+        p[i] = p[j = rand() % B];
+        p[j] = k;
+    }
+
+    for (i = 0; i < B + 2; i++)
+    {
+        p[B + i] = p[i];
+        g1[B + i] = g1[i];
+    }
 }
 
 float CPerlinNoise1D::noise(float arg)
 {
-	int bx0, bx1;
-	float rx0, rx1, sx, t, u, v, vec[1];
+    int bx0, bx1;
+    float rx0, rx1, sx, t, u, v, vec[1];
 
-	vec[0] = arg;
+    vec[0] = arg;
 
-	if (!mReady){ 
-		srand(mSeed);
-		mReady = true;
-		init();
-	}
+    if (!mReady)
+    {
+        srand(mSeed);
+        mReady = true;
+        init();
+    }
 
-	setup(0, bx0,bx1, rx0,rx1);
+    setup(0, bx0, bx1, rx0, rx1);
 
-	sx = s_curve(rx0);
+    sx = s_curve(rx0);
 
-	u = rx0 * g1[ p[ bx0 ] ];
-	v = rx1 * g1[ p[ bx1 ] ];
+    u = rx0 * g1[p[bx0]];
+    v = rx1 * g1[p[bx1]];
 
-	return lerp(sx, u, v);
+    return lerp(sx, u, v);
 }
 
 float CPerlinNoise1D::Get(float v)
 {
-	float result	= 0.0f;
-	float amp		= mAmplitude;
-	v				*=mFrequency;
-	for(int i=0; i<mOctaves; i++){
-		result		+= noise(v)*amp;
-		v			*= 2.0f;
-		amp			*= 0.5f;
-	}
-	return result;
+    float result = 0.0f;
+    float amp = mAmplitude;
+    v *= mFrequency;
+    for (int i = 0; i < mOctaves; i++)
+    {
+        result += noise(v)*amp;
+        v *= 2.0f;
+        amp *= 0.5f;
+    }
+    return result;
 }
 
 float CPerlinNoise1D::GetContinious(float v)
 {
-	float t_v=v;
-	if (mPrevContiniousTime!=0.0f)
-	{
-		v-=mPrevContiniousTime;
-	}
-	mPrevContiniousTime=t_v;
-	float result	= 0.0f;
-	float amp		= mAmplitude;
-	v				*=mFrequency;
-	for(int i=0; i<mOctaves; i++){
-		float		octave_time=mTimes[i];
-		mTimes[i]	=octave_time+v;
-		result		+= noise(octave_time+v)*amp;
-		v			*= 2.0f;
-		amp			*= 0.5f;
-	}
-	return result;
+    float t_v = v;
+    if (mPrevContiniousTime != 0.0f)
+    {
+        v -= mPrevContiniousTime;
+    }
+    mPrevContiniousTime = t_v;
+    float result = 0.0f;
+    float amp = mAmplitude;
+    v *= mFrequency;
+    for (int i = 0; i < mOctaves; i++)
+    {
+        float octave_time = mTimes[i];
+        mTimes[i] = octave_time + v;
+        result += noise(octave_time + v)*amp;
+        v *= 2.0f;
+        amp *= 0.5f;
+    }
+    return result;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -112,98 +115,100 @@ float CPerlinNoise1D::GetContinious(float v)
 //-------------------------------------------------------------------------------------------------
 void CPerlinNoise2D::init()
 {
-	int i, j, k;
-
-	for (i = 0 ; i < B ; i++)
-	{
-		p[i] = i;
-		for (j = 0 ; j < 2 ; j++)
-			g2[i][j] = (float)((rand() % (B + B)) - B) / B;
-		normalize(g2[i]);
-	}
-
-	while (--i)
-	{
-		k = p[i];
-		p[i] = p[j = rand() % B];
-		p[j] = k;
-	}
-
-	for (i = 0 ; i < B + 2 ; i++)
-	{
-		p[B + i] = p[i];
-		for (j = 0 ; j < 2 ; j++)
-			g2[B + i][j] = g2[i][j];
-	}
+    int i, j, k;
+
+    for (i = 0; i < B; i++)
+    {
+        p[i] = i;
+        for (j = 0; j < 2; j++)
+            g2[i][j] = (float)((rand() % (B + B)) - B) / B;
+        normalize(g2[i]);
+    }
+
+    while (--i)
+    {
+        k = p[i];
+        p[i] = p[j = rand() % B];
+        p[j] = k;
+    }
+
+    for (i = 0; i < B + 2; i++)
+    {
+        p[B + i] = p[i];
+        for (j = 0; j < 2; j++)
+            g2[B + i][j] = g2[i][j];
+    }
 }
 
 float CPerlinNoise2D::noise(const Fvector2& vec)
 {
-	int bx0, bx1, by0, by1, b00, b10, b01, b11;
-	float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
-	int i, j;
+    int bx0, bx1, by0, by1, b00, b10, b01, b11;
+    float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
+    int i, j;
 
-	if (!mReady){ 
-		srand(mSeed);
-		mReady = true;
-		init();
-	}
+    if (!mReady)
+    {
+        srand(mSeed);
+        mReady = true;
+        init();
+    }
 
-	setup(0,bx0,bx1,rx0,rx1);
-	setup(1,by0,by1,ry0,ry1);
+    setup(0, bx0, bx1, rx0, rx1);
+    setup(1, by0, by1, ry0, ry1);
 
-	i = p[bx0];
-	j = p[bx1];
+    i = p[bx0];
+    j = p[bx1];
 
-	b00 = p[i + by0];
-	b10 = p[j + by0];
-	b01 = p[i + by1];
-	b11 = p[j + by1];
+    b00 = p[i + by0];
+    b10 = p[j + by0];
+    b01 = p[i + by1];
+    b11 = p[j + by1];
 
-	sx = s_curve(rx0);
-	sy = s_curve(ry0);
+    sx = s_curve(rx0);
+    sy = s_curve(ry0);
 
 #define at2(rx,ry) ( rx * q[0] + ry * q[1] )
 
-	q = g2[b00];
-	u = at2(rx0,ry0);
-	q = g2[b10];
-	v = at2(rx1,ry0);
-	a = lerp(sx, u, v);
+    q = g2[b00];
+    u = at2(rx0, ry0);
+    q = g2[b10];
+    v = at2(rx1, ry0);
+    a = lerp(sx, u, v);
 
-	q = g2[b01];
-	u = at2(rx0,ry1);
-	q = g2[b11];
-	v = at2(rx1,ry1);
-	b = lerp(sx, u, v);
+    q = g2[b01];
+    u = at2(rx0, ry1);
+    q = g2[b11];
+    v = at2(rx1, ry1);
+    b = lerp(sx, u, v);
 
-	return lerp(sy, a, b);
+    return lerp(sy, a, b);
 }
 
 void CPerlinNoise2D::normalize(float v[2])
 {
-	float s;
+    float s;
 
-	s = _sqrt(v[0] * v[0] + v[1] * v[1]);
-	s = 1.0f/s;
-	v[0] = v[0] * s;
-	v[1] = v[1] * s;
+    s = _sqrt(v[0] * v[0] + v[1] * v[1]);
+    s = 1.0f / s;
+    v[0] = v[0] * s;
+    v[1] = v[1] * s;
 }
 
 float CPerlinNoise2D::Get(float x, float y)
 {
-	Fvector2 vec	= {x,y};
-	float result	= 0.0f;
-	float amp		= mAmplitude;
-	vec[0]			*=mFrequency;
-	vec[1]			*=mFrequency;
-	for(int i=0; i<mOctaves; i++){
-		result		+= noise(vec)*amp;
-		vec[0]		*= 2.0f;
-		vec[1]		*= 2.0f;
-		amp			*= 0.5f;
-	}
-	return result;
+    Fvector2 vec = {x, y};
+    float result = 0.0f;
+    float amp = mAmplitude;
+    vec[0] *= mFrequency;
+    vec[1] *= mFrequency;
+    for (int i = 0; i < mOctaves; i++)
+    {
+        result += noise(vec)*amp;
+        vec[0] *= 2.0f;
+        vec[1] *= 2.0f;
+        amp *= 0.5f;
+    }
+    return result;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -211,111 +216,121 @@ float CPerlinNoise2D::Get(float x, float y)
 //-------------------------------------------------------------------------------------------------
 void CPerlinNoise3D::init()
 {
-	int i, j, k;
-
-	for (i = 0 ; i < B ; i++)
-	{
-		p[i] = i;
-		for (j = 0 ; j < 3 ; j++)
-			g3[i][j] = (float)((rand() % (B + B)) - B) / B;
-		normalize(g3[i]);
-	}
-
-	while (--i)
-	{
-		k = p[i];
-		p[i] = p[j = rand() % B];
-		p[j] = k;
-	}
-
-	for (i = 0 ; i < B + 2 ; i++)
-	{
-		p[B + i] = p[i];
-		for (j = 0 ; j < 3 ; j++)
-			g3[B + i][j] = g3[i][j];
-	}
+    int i, j, k;
+
+    for (i = 0; i < B; i++)
+    {
+        p[i] = i;
+        for (j = 0; j < 3; j++)
+            g3[i][j] = (float)((rand() % (B + B)) - B) / B;
+        normalize(g3[i]);
+    }
+
+    while (--i)
+    {
+        k = p[i];
+        p[i] = p[j = rand() % B];
+        p[j] = k;
+    }
+
+    for (i = 0; i < B + 2; i++)
+    {
+        p[B + i] = p[i];
+        for (j = 0; j < 3; j++)
+            g3[B + i][j] = g3[i][j];
+    }
 }
 
 float CPerlinNoise3D::noise(const Fvector3& vec)
 {
-	int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
-	float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
-	int i, j;
+    int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
+    float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
+    int i, j;
 
-	if (!mReady){ 
-		srand(mSeed);
-		mReady = true;
-		init();
-	}
+    if (!mReady)
+    {
+        srand(mSeed);
+        mReady = true;
+        init();
+    }
 
-	setup(0, bx0,bx1, rx0,rx1);
-	setup(1, by0,by1, ry0,ry1);
-	setup(2, bz0,bz1, rz0,rz1);
+    setup(0, bx0, bx1, rx0, rx1);
+    setup(1, by0, by1, ry0, ry1);
+    setup(2, bz0, bz1, rz0, rz1);
 
-	i = p[ bx0 ];
-	j = p[ bx1 ];
+    i = p[bx0];
+    j = p[bx1];
 
-	b00 = p[ i + by0 ];
-	b10 = p[ j + by0 ];
-	b01 = p[ i + by1 ];
-	b11 = p[ j + by1 ];
+    b00 = p[i + by0];
+    b10 = p[j + by0];
+    b01 = p[i + by1];
+    b11 = p[j + by1];
 
-	t  = s_curve(rx0);
-	sy = s_curve(ry0);
-	sz = s_curve(rz0);
+    t = s_curve(rx0);
+    sy = s_curve(ry0);
+    sz = s_curve(rz0);
 
 #define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
 
-	q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
-	q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
-	a = lerp(t, u, v);
+    q = g3[b00 + bz0];
+    u = at3(rx0, ry0, rz0);
+    q = g3[b10 + bz0];
+    v = at3(rx1, ry0, rz0);
+    a = lerp(t, u, v);
 
-	q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
-	q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
-	b = lerp(t, u, v);
+    q = g3[b01 + bz0];
+    u = at3(rx0, ry1, rz0);
+    q = g3[b11 + bz0];
+    v = at3(rx1, ry1, rz0);
+    b = lerp(t, u, v);
 
-	c = lerp(sy, a, b);
+    c = lerp(sy, a, b);
 
-	q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
-	q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
-	a = lerp(t, u, v);
+    q = g3[b00 + bz1];
+    u = at3(rx0, ry0, rz1);
+    q = g3[b10 + bz1];
+    v = at3(rx1, ry0, rz1);
+    a = lerp(t, u, v);
 
-	q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
-	q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
-	b = lerp(t, u, v);
+    q = g3[b01 + bz1];
+    u = at3(rx0, ry1, rz1);
+    q = g3[b11 + bz1];
+    v = at3(rx1, ry1, rz1);
+    b = lerp(t, u, v);
 
-	d = lerp(sy, a, b);
+    d = lerp(sy, a, b);
 
-	return lerp(sz, c, d);
+    return lerp(sz, c, d);
 }
 
 void CPerlinNoise3D::normalize(float v[3])
 {
-	float s;
+    float s;
 
-	s = _sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
-	s = 1.0f/s;
+    s = _sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+    s = 1.0f / s;
 
-	v[0] = v[0] * s;
-	v[1] = v[1] * s;
-	v[2] = v[2] * s;
+    v[0] = v[0] * s;
+    v[1] = v[1] * s;
+    v[2] = v[2] * s;
 }
 
 float CPerlinNoise3D::Get(float x, float y, float z)
 {
-	Fvector3 vec	= {x,y,z};
-	float result	= 0.0f;
-	float amp		= mAmplitude;
-	vec[0]			*=mFrequency;
-	vec[1]			*=mFrequency;
-	vec[2]			*=mFrequency;
-	for(int i=0; i<mOctaves; i++){
-		result		+= noise(vec)*amp;
-		vec[0]		*= 2.0f;
-		vec[1]		*= 2.0f;
-		vec[2]		*= 2.0f;
-		amp			*= 0.5f;
-	}
-	return result;
+    Fvector3 vec = {x, y, z};
+    float result = 0.0f;
+    float amp = mAmplitude;
+    vec[0] *= mFrequency;
+    vec[1] *= mFrequency;
+    vec[2] *= mFrequency;
+    for (int i = 0; i < mOctaves; i++)
+    {
+        result += noise(vec)*amp;
+        vec[0] *= 2.0f;
+        vec[1] *= 2.0f;
+        vec[2] *= 2.0f;
+        amp *= 0.5f;
+    }
+    return result;
 }
 
diff --git a/src/xrEngine/perlin.h b/src/xrEngine/perlin.h
index 292e2e29049..9b9fd23484c 100644
--- a/src/xrEngine/perlin.h
+++ b/src/xrEngine/perlin.h
@@ -6,69 +6,69 @@
 class ENGINE_API CPerlinNoiseCustom
 {
 protected:
-	int		mSeed;
-	bool	mReady;
+    int mSeed;
+    bool mReady;
 
-	int		p					[SAMPLE_SIZE + SAMPLE_SIZE + 2];
+    int p[SAMPLE_SIZE + SAMPLE_SIZE + 2];
 protected:
-	int		mOctaves;
-	float	mFrequency;
-	float	mAmplitude;
-	xr_vector<float> mTimes;
+    int mOctaves;
+    float mFrequency;
+    float mAmplitude;
+    xr_vector<float> mTimes;
 public:
-			CPerlinNoiseCustom	(int seed):
-								mOctaves(2),mFrequency(1),mAmplitude(1),mSeed(seed),mReady(false){}
-	IC void	SetParams			(int oct, float freq, float amp)
-	{
-		mOctaves				= oct;
-		mFrequency				= freq;
-		mAmplitude				= amp;
-	}
-	IC void	SetOctaves			(int oct)	{mOctaves	= oct; mTimes.resize(mOctaves);}
-	IC void	SetFrequency		(float freq){mFrequency	= freq;}
-	IC void	SetAmplitude		(float amp)	{mAmplitude	= amp;}
+    CPerlinNoiseCustom(int seed) :
+        mOctaves(2), mFrequency(1), mAmplitude(1), mSeed(seed), mReady(false) {}
+    IC void SetParams(int oct, float freq, float amp)
+    {
+        mOctaves = oct;
+        mFrequency = freq;
+        mAmplitude = amp;
+    }
+    IC void SetOctaves(int oct) { mOctaves = oct; mTimes.resize(mOctaves); }
+    IC void SetFrequency(float freq) { mFrequency = freq; }
+    IC void SetAmplitude(float amp) { mAmplitude = amp; }
 };
 
-class ENGINE_API CPerlinNoise1D: public CPerlinNoiseCustom
+class ENGINE_API CPerlinNoise1D : public CPerlinNoiseCustom
 {
 private:
-	float	noise				(float arg);
-	float	g1					[SAMPLE_SIZE + SAMPLE_SIZE + 2];
+    float noise(float arg);
+    float g1[SAMPLE_SIZE + SAMPLE_SIZE + 2];
 
-	void	init				();
-	float	mPrevContiniousTime;
+    void init();
+    float mPrevContiniousTime;
 public:
-			CPerlinNoise1D		(int seed):CPerlinNoiseCustom(seed){mPrevContiniousTime=0.0f;}
-	float	Get					(float x);
-	float	GetContinious		(float v);
+    CPerlinNoise1D(int seed) :CPerlinNoiseCustom(seed) { mPrevContiniousTime = 0.0f; }
+    float Get(float x);
+    float GetContinious(float v);
 };
 
-class ENGINE_API CPerlinNoise2D: public CPerlinNoiseCustom
+class ENGINE_API CPerlinNoise2D : public CPerlinNoiseCustom
 {
 private:
-	float	noise				(const Fvector2& vec);
-	void	normalize			(float v[2]);
+    float noise(const Fvector2& vec);
+    void normalize(float v[2]);
 
-	float	g2					[SAMPLE_SIZE + SAMPLE_SIZE + 2][2];
+    float g2[SAMPLE_SIZE + SAMPLE_SIZE + 2][2];
 
-	void	init				();
+    void init();
 public:
-			CPerlinNoise2D		(int seed):CPerlinNoiseCustom(seed){}
-	float	Get					(float x, float y);
+    CPerlinNoise2D(int seed) :CPerlinNoiseCustom(seed) {}
+    float Get(float x, float y);
 };
 
-class ENGINE_API CPerlinNoise3D: public CPerlinNoiseCustom
+class ENGINE_API CPerlinNoise3D : public CPerlinNoiseCustom
 {
 private:
-	float	noise				(const Fvector3& vec);
-	void	normalize			(float v[3]);
+    float noise(const Fvector3& vec);
+    void normalize(float v[3]);
 
-	float	g3					[SAMPLE_SIZE + SAMPLE_SIZE + 2][3];
+    float g3[SAMPLE_SIZE + SAMPLE_SIZE + 2][3];
 
-	void	init				();
+    void init();
 public:
-			CPerlinNoise3D		(int seed):CPerlinNoiseCustom(seed){}
-	float	Get					(float x, float y, float z);
+    CPerlinNoise3D(int seed) :CPerlinNoiseCustom(seed) {}
+    float Get(float x, float y, float z);
 };
 
 #endif
diff --git a/src/xrEngine/phdebug.cpp b/src/xrEngine/phdebug.cpp
index b00347ccfcb..0c06b1f19e9 100644
--- a/src/xrEngine/phdebug.cpp
+++ b/src/xrEngine/phdebug.cpp
@@ -1,5 +1,5 @@
-#include	"stdafx.h"
+#include "stdafx.h"
 
-#include	"iphdebug.h"
+#include "iphdebug.h"
 
 IPhDebugRender* ph_debug_render = 0;
\ No newline at end of file
diff --git a/src/xrEngine/property_collection.hpp b/src/xrEngine/property_collection.hpp
index b283aa896ed..39ea5c3bd78 100644
--- a/src/xrEngine/property_collection.hpp
+++ b/src/xrEngine/property_collection.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: property_collection.hpp
-//	Created 	: 12.12.2007
-//  Modified 	: 27.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : property collection template class
+// Module : property_collection.hpp
+// Created : 12.12.2007
+// Modified : 27.12.2007
+// Author : Dmitriy Iassenev
+// Description : property collection template class
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef PROPERTY_COLLECTION_HPP_INCLUDED
@@ -15,57 +15,59 @@
 
 template <typename container_type, typename holder_type>
 class property_collection :
-	public editor::property_holder_collection,
-	private boost::noncopyable
+    public editor::property_holder_collection,
+    private boost::noncopyable
 {
 public:
-	typedef editor::property_holder					property_holder;
+    typedef editor::property_holder property_holder;
 
 public:
-	inline						property_collection	(container_type* container, holder_type* holder, bool* changed = 0);
-	virtual						~property_collection();
-	inline	holder_type&		holder				() const;
-	virtual	void				clear				();
-	virtual	u32					size				();
-	virtual	void				insert				(property_holder* holder, u32 const& position);
-	virtual	void				erase				(u32 const& position);
-	virtual	property_holder*	item				(u32 const& position);
-	virtual	int					index				(property_holder* holder);
-	virtual	void				destroy				(property_holder* holder);
+    inline property_collection(container_type* container, holder_type* holder, bool* changed = 0);
+    virtual ~property_collection();
+    inline holder_type& holder() const;
+    virtual void clear();
+    virtual u32 size();
+    virtual void insert(property_holder* holder, u32 const& position);
+    virtual void erase(u32 const& position);
+    virtual property_holder* item(u32 const& position);
+    virtual int index(property_holder* holder);
+    virtual void destroy(property_holder* holder);
 
 public:
-	// these functions should be implemented for each specializations
-	// in the place when they are visible by the specialization user
-	virtual	void				display_name		(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size);
-	virtual	property_holder*	create				();
+    // these functions should be implemented for each specializations
+    // in the place when they are visible by the specialization user
+    virtual void display_name(u32 const& item_index, LPSTR const& buffer, u32 const& buffer_size);
+    virtual property_holder* create();
 
 public:
-			bool				unique_id			(LPCSTR id) const;
-			shared_str			generate_unique_id	(LPCSTR prefix) const;
+    bool unique_id(LPCSTR id) const;
+    shared_str generate_unique_id(LPCSTR prefix) const;
 
 private:
-	inline	void				make_state_changed	();
+    inline void make_state_changed();
 
 private:
-	struct predicate {
-		property_holder*		m_holder;
+    struct predicate
+    {
+        property_holder* m_holder;
 
-		inline					predicate			(property_holder* holder);
-		inline bool				operator()			(typename container_type::value_type const& value) const;
-	};
+        inline predicate(property_holder* holder);
+        inline bool operator() (typename container_type::value_type const& value) const;
+    };
 
 private:
-	struct unique_id_predicate {
-		LPCSTR					m_id;
+    struct unique_id_predicate
+    {
+        LPCSTR m_id;
 
-		inline					unique_id_predicate	(LPCSTR id);
-		inline bool				operator()			(typename container_type::value_type const& value) const;
-	};
+        inline unique_id_predicate(LPCSTR id);
+        inline bool operator() (typename container_type::value_type const& value) const;
+    };
 
 private:
-	container_type&				m_container;
-	holder_type&				m_holder;
-	bool*						m_changed;
+    container_type& m_container;
+    holder_type& m_holder;
+    bool* m_changed;
 }; // class property_collection
 
 #include "property_collection_inline.hpp"
diff --git a/src/xrEngine/property_collection_forward.hpp b/src/xrEngine/property_collection_forward.hpp
index 00c1442c947..0912c67eab9 100644
--- a/src/xrEngine/property_collection_forward.hpp
+++ b/src/xrEngine/property_collection_forward.hpp
@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: property_collection_forward.hpp
-//	Created 	: 15.01.2008
-//  Modified 	: 15.01.2008
-//	Author		: Dmitriy Iassenev
-//	Description : property collection template class forward declaration
+// Module : property_collection_forward.hpp
+// Created : 15.01.2008
+// Modified : 15.01.2008
+// Author : Dmitriy Iassenev
+// Description : property collection template class forward declaration
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef PROPERTY_COLLECTION_FORWARD_HPP_INCLUDED
diff --git a/src/xrEngine/property_collection_inline.hpp b/src/xrEngine/property_collection_inline.hpp
index 4e164ee0a34..05d8beee4fe 100644
--- a/src/xrEngine/property_collection_inline.hpp
+++ b/src/xrEngine/property_collection_inline.hpp
@@ -1,170 +1,171 @@
 ////////////////////////////////////////////////////////////////////////////
-//	Module 		: property_collection_inline.hpp
-//	Created 	: 12.12.2007
-//  Modified 	: 27.12.2007
-//	Author		: Dmitriy Iassenev
-//	Description : property collection template class inline functions
+// Module : property_collection_inline.hpp
+// Created : 12.12.2007
+// Modified : 27.12.2007
+// Author : Dmitriy Iassenev
+// Description : property collection template class inline functions
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef PROPERTY_COLLECTION_INLINE_HPP_INCLUDED
 #define PROPERTY_COLLECTION_INLINE_HPP_INCLUDED
 
-#define SPECIALIZATION		template <typename container_type, typename holder_type>
-#define PROPERTY_COLLECTION	property_collection<container_type, holder_type>
+#define SPECIALIZATION template <typename container_type, typename holder_type>
+#define PROPERTY_COLLECTION property_collection<container_type, holder_type>
 
 SPECIALIZATION
-inline PROPERTY_COLLECTION::property_collection			(
-		container_type* container,
-		holder_type* holder,
-		bool* changed
-	) :
-	m_container			(*container),
-	m_holder			(*holder),
-	m_changed			(changed)
+inline PROPERTY_COLLECTION::property_collection(
+    container_type* container,
+    holder_type* holder,
+    bool* changed
+) :
+    m_container(*container),
+    m_holder(*holder),
+    m_changed(changed)
 {
 }
 
 SPECIALIZATION
-inline PROPERTY_COLLECTION::~property_collection		()
+inline PROPERTY_COLLECTION::~property_collection()
 {
-	delete_data			(m_container);
-//	Msg					("container is destroyed");
+    delete_data(m_container);
+    // Msg ("container is destroyed");
 }
 
 SPECIALIZATION
-inline holder_type& PROPERTY_COLLECTION::holder			() const
+inline holder_type& PROPERTY_COLLECTION::holder() const
 {
-	return				(m_holder);
+    return (m_holder);
 }
 
 SPECIALIZATION
-void PROPERTY_COLLECTION::clear							()
+void PROPERTY_COLLECTION::clear()
 {
-	make_state_changed	();
-	m_container.clear	();
-//	Msg					("container is cleared");
+    make_state_changed();
+    m_container.clear();
+    // Msg ("container is cleared");
 }
 
 SPECIALIZATION
-u32 PROPERTY_COLLECTION::size							()
+u32 PROPERTY_COLLECTION::size()
 {
-	return				(m_container.size());
+    return (m_container.size());
 }
 
 SPECIALIZATION
-void PROPERTY_COLLECTION::insert						(property_holder* holder, u32 const& position)
+void PROPERTY_COLLECTION::insert(property_holder* holder, u32 const& position)
 {
-//	Msg					("insert into container");
-	make_state_changed	();
+    // Msg ("insert into container");
+    make_state_changed();
 
-	VERIFY				(position <= m_container.size());
-	
-	editor::property_holder_holder*	value_raw = holder->holder();
-	VERIFY				(value_raw);
-	
-	typedef typename container_type::value_type	value_type;
-	value_type			value = dynamic_cast<value_type>(value_raw);
-	VERIFY				(value);
+    VERIFY(position <= m_container.size());
 
-	m_container.insert	(m_container.begin() + position, value);
+    editor::property_holder_holder* value_raw = holder->holder();
+    VERIFY(value_raw);
+
+    typedef typename container_type::value_type value_type;
+    value_type value = dynamic_cast<value_type>(value_raw);
+    VERIFY(value);
+
+    m_container.insert(m_container.begin() + position, value);
 }
 
 SPECIALIZATION
-void PROPERTY_COLLECTION::erase							(u32 const& position)
+void PROPERTY_COLLECTION::erase(u32 const& position)
 {
-//	Msg					("erase from container");
-	make_state_changed	();
+    // Msg ("erase from container");
+    make_state_changed();
 
-	VERIFY				(position < m_container.size());
-	container_type::value_type	value = m_container[position];
-	m_container.erase	(m_container.begin() + position);
-	delete_data			(value);
+    VERIFY(position < m_container.size());
+    container_type::value_type value = m_container[position];
+    m_container.erase(m_container.begin() + position);
+    delete_data(value);
 }
 
 SPECIALIZATION
-editor::property_holder* PROPERTY_COLLECTION::item		(u32 const& position)
+editor::property_holder* PROPERTY_COLLECTION::item(u32 const& position)
 {
-	return				(m_container[position]->object());
+    return (m_container[position]->object());
 }
 
 SPECIALIZATION
-inline PROPERTY_COLLECTION::predicate::predicate		(property_holder* holder) :
-	m_holder			(holder)
+inline PROPERTY_COLLECTION::predicate::predicate(property_holder* holder) :
+    m_holder(holder)
 {
 }
 
 SPECIALIZATION
-inline bool PROPERTY_COLLECTION::predicate::operator()	(typename container_type::value_type const& value) const
+inline bool PROPERTY_COLLECTION::predicate::operator() (typename container_type::value_type const& value) const
 {
-	return				(m_holder == value->object());
+    return (m_holder == value->object());
 }
 
 SPECIALIZATION
-int PROPERTY_COLLECTION::index							(property_holder* holder)
+int PROPERTY_COLLECTION::index(property_holder* holder)
 {
-	typedef typename container_type::iterator	iterator_type;
-	iterator_type		i = std::find_if(m_container.begin(), m_container.end(), predicate(holder));
-	if (i == m_container.end())
-		return			(-1);
+    typedef typename container_type::iterator iterator_type;
+    iterator_type i = std::find_if(m_container.begin(), m_container.end(), predicate(holder));
+    if (i == m_container.end())
+        return (-1);
 
-	return				(int(i - m_container.begin()));
+    return (int(i - m_container.begin()));
 }
 
 SPECIALIZATION
-void PROPERTY_COLLECTION::destroy						(editor::property_holder* holder)
+void PROPERTY_COLLECTION::destroy(editor::property_holder* holder)
 {
-	delete_data			(holder->holder());
+    delete_data(holder->holder());
 }
 
 SPECIALIZATION
 inline PROPERTY_COLLECTION::unique_id_predicate::unique_id_predicate(LPCSTR id) :
-	m_id				(id)
+    m_id(id)
 {
 }
 
 SPECIALIZATION
-inline bool PROPERTY_COLLECTION::unique_id_predicate::operator()	(typename container_type::value_type const& value) const
+inline bool PROPERTY_COLLECTION::unique_id_predicate::operator() (typename container_type::value_type const& value) const
 {
-	return				(!xr_strcmp(m_id, value->id()));
+    return (!xr_strcmp(m_id, value->id()));
 }
 
 SPECIALIZATION
-bool PROPERTY_COLLECTION::unique_id						(LPCSTR id) const
+bool PROPERTY_COLLECTION::unique_id(LPCSTR id) const
 {
-	return				(
-		std::find_if(
-			m_container.begin(),
-			m_container.end(),
-			unique_id_predicate(id)
-		) == m_container.end()
-	);
+    return (
+               std::find_if(
+                   m_container.begin(),
+                   m_container.end(),
+                   unique_id_predicate(id)
+               ) == m_container.end()
+           );
 }
 
 SPECIALIZATION
-shared_str PROPERTY_COLLECTION::generate_unique_id		(LPCSTR prefix) const
+shared_str PROPERTY_COLLECTION::generate_unique_id(LPCSTR prefix) const
 {
-	for (u32 i=0; ; ++i) {
-		string_path		result;
-		xr_strcpy		(result, prefix);
+    for (u32 i = 0;; ++i)
+    {
+        string_path result;
+        xr_strcpy(result, prefix);
 
-		string_path		number;
-		R_ASSERT		(!_itoa_s(i, number, 10));
-		xr_strcat		(result, number);
+        string_path number;
+        R_ASSERT(!_itoa_s(i, number, 10));
+        xr_strcat(result, number);
 
-		if (!unique_id(result))
-			continue;
+        if (!unique_id(result))
+            continue;
 
-		return			(result);
-	}
+        return (result);
+    }
 }
 
 SPECIALIZATION
-inline void PROPERTY_COLLECTION::make_state_changed		()
+inline void PROPERTY_COLLECTION::make_state_changed()
 {
-	if (!m_changed)
-		return;
+    if (!m_changed)
+        return;
 
-	*m_changed			= true;
+    *m_changed = true;
 }
 
 #undef PROPERTY_COLLECTION
diff --git a/src/xrEngine/psystem.h b/src/xrEngine/psystem.h
index e5cdd057648..d3882d64f8b 100644
--- a/src/xrEngine/psystem.h
+++ b/src/xrEngine/psystem.h
@@ -3,158 +3,161 @@
 #pragma once
 
 #ifdef XR_PARTICLES_EXPORTS
-	#define PARTICLES_API __declspec(dllexport)
+#define PARTICLES_API __declspec(dllexport)
 #else
-	#define PARTICLES_API __declspec(dllimport)
-	#ifdef _EDITOR
-		#pragma comment(lib,"x:\\xrParticlesB.lib")
-	#else
-		#pragma comment(lib,"xrParticles.lib")
-	#endif
+#define PARTICLES_API __declspec(dllimport)
+#ifdef _EDITOR
+#pragma comment(lib,"x:\\xrParticlesB.lib")
+#else
+#pragma comment(lib,"xrParticles.lib")
+#endif
 #endif
 
 // Actually this must be < sqrt(MAXFLOAT) since we store this value squared.
-#define P_MAXFLOAT	1.0e16f
+#define P_MAXFLOAT 1.0e16f
 
 #ifdef MAXINT
-	#define P_MAXINT	MAXINT
+#define P_MAXINT MAXINT
 #else
-	#define P_MAXINT	0x7fffffff
+#define P_MAXINT 0x7fffffff
 #endif
 
-#define drand48()		::Random.randF()
+#define drand48() ::Random.randF()
 //#define drand48() (((float) rand())/((float) RAND_MAX))
 
-namespace PAPI{
-	class pVector	: public Fvector
-	{
-	public:
-		IC 			pVector		(float ax, float ay, float az)	{ set(ax,ay,az);								}
-		IC 			pVector		()								{}
-		IC float 	length		() const						{	return _sqrt(x*x+y*y+z*z);					}
-		IC float 	length2		() const						{	return (x*x+y*y+z*z);						}
-		IC float 	operator*	(const pVector &a) const		{	return x*a.x + y*a.y + z*a.z;				}
-		IC pVector 	operator*	(const float s) const			{	return pVector(x*s, y*s, z*s);				}
-		IC pVector 	operator/	(const float s) const			{	float invs = 1.0f / s;	return pVector(x*invs, y*invs, z*invs);	}
-		IC pVector 	operator+	(const pVector& a) const		{	return pVector(x+a.x, y+a.y, z+a.z);		}
-		IC pVector 	operator-	(const pVector& a) const		{	return pVector(x-a.x, y-a.y, z-a.z);		}
-		IC pVector 	operator-	()								{	x = -x;	y = -y;	z = -z;	return *this;		}
-		IC pVector& operator+=	(const pVector& a)				{	x += a.x;y += a.y;z += a.z;	return *this;	}
-		IC pVector& operator-=	(const pVector& a)		 		{	x -= a.x;y -= a.y;z -= a.z;	return *this;	}
-		IC pVector& operator*=	(const float a)					{	x *= a;	y *= a;	z *= a;	return *this;		}
-		IC pVector& operator/=	(const float a)					{	float b = 1.0f / a;	x *= b;	y *= b;	z *= b;	return *this;		}
-		IC pVector& operator=	(const pVector& a)				{	x = a.x;y = a.y;z = a.z;return *this;		}
-		IC pVector 	operator^	(const pVector& b) const		{	return pVector(y*b.z-z*b.y,z*b.x-x*b.z,x*b.y-y*b.x);		}
-	};
-	// A single particle
-	struct Particle
-	{
-		enum{
-			ANIMATE_CCW	= (1<<0),
-		};
-		pVector		pos;	// 12
-		pVector		posB;   // 12
-		pVector		vel;    // 12  	
-		pVector		size;   // 12
-		pVector		rot;	// 12   60
-		u32			color;	// 4
-		float		age;	// 4       
-		u16			frame;	// 2
-		Flags16		flags;	// 2
-	};                  	// 		72
+namespace PAPI
+{
+class pVector : public Fvector
+{
+public:
+    IC pVector(float ax, float ay, float az) { set(ax, ay, az); }
+    IC pVector() {}
+    IC float length() const { return _sqrt(x*x + y*y + z*z); }
+    IC float length2() const { return (x*x + y*y + z*z); }
+    IC float operator* (const pVector& a) const { return x*a.x + y*a.y + z*a.z; }
+    IC pVector operator* (const float s) const { return pVector(x*s, y*s, z*s); }
+    IC pVector operator/ (const float s) const { float invs = 1.0f / s; return pVector(x*invs, y*invs, z*invs); }
+    IC pVector operator+ (const pVector& a) const { return pVector(x + a.x, y + a.y, z + a.z); }
+    IC pVector operator- (const pVector& a) const { return pVector(x - a.x, y - a.y, z - a.z); }
+    IC pVector operator- () { x = -x; y = -y; z = -z; return *this; }
+    IC pVector& operator+= (const pVector& a) { x += a.x; y += a.y; z += a.z; return *this; }
+    IC pVector& operator-= (const pVector& a) { x -= a.x; y -= a.y; z -= a.z; return *this; }
+    IC pVector& operator*= (const float a) { x *= a; y *= a; z *= a; return *this; }
+    IC pVector& operator/= (const float a) { float b = 1.0f / a; x *= b; y *= b; z *= b; return *this; }
+    IC pVector& operator= (const pVector& a) { x = a.x; y = a.y; z = a.z; return *this; }
+    IC pVector operator^ (const pVector& b) const { return pVector(y*b.z - z*b.y, z*b.x - x*b.z, x*b.y - y*b.x); }
+};
+// A single particle
+struct Particle
+{
+    enum
+    {
+        ANIMATE_CCW = (1 << 0),
+    };
+    pVector pos; // 12
+    pVector posB; // 12
+    pVector vel; // 12
+    pVector size; // 12
+    pVector rot; // 12 60
+    u32 color; // 4
+    float age; // 4
+    u16 frame; // 2
+    Flags16 flags; // 2
+}; // 72
 
-	typedef void (* OnBirthParticleCB)	(void* owner, u32 param, PAPI::Particle& P, u32 idx);
-	typedef void (* OnDeadParticleCB)	(void* owner, u32 param, PAPI::Particle& P, u32 idx);
-	//////////////////////////////////////////////////////////////////////
-	// Type codes for domains
-	enum PDomainEnum
-	{
-		PDPoint 	= 0,	// Single point
-		PDLine 		= 1,	// Line segment
-		PDTriangle 	= 2,	// Triangle
-		PDPlane 	= 3,	// Arbitrarily-oriented plane
-		PDBox 		= 4,	// Axis-aligned box
-		PDSphere 	= 5,	// Sphere
-		PDCylinder 	= 6,	// Cylinder
-		PDCone 		= 7,	// Cone
-		PDBlob 		= 8,	// Gaussian blob
-		PDDisc 		= 9,	// Arbitrarily-oriented disc
-		PDRectangle = 10,	// Rhombus-shaped planar region
-		domain_enum_force_dword = u32(-1)
-	};
-	//////////////////////////////////////////////////////////////////////
-	// Type codes for all actions
-	enum PActionEnum
-	{
-		PAAvoidID,			// Avoid entering the domain of space.
-		PABounceID,			// Bounce particles off a domain of space.
-		PACallActionListID_obsolette,	// 
-		PACopyVertexBID,	// Set the secondary position from current position.
-		PADampingID,		// Dampen particle velocities.
-		PAExplosionID,		// An Explosion.
-		PAFollowID,			// Accelerate toward the previous particle in the effect.
-		PAGravitateID,		// Accelerate each particle toward each other particle.
-		PAGravityID,		// Acceleration in the given direction.
-		PAJetID,			// 
-		PAKillOldID,		// 
-		PAMatchVelocityID,	// 
-		PAMoveID,			// 
-		PAOrbitLineID,		// 
-		PAOrbitPointID,		// 
-		PARandomAccelID,	// 
-		PARandomDisplaceID,	// 
-		PARandomVelocityID,	// 
-		PARestoreID,		// 
-		PASinkID,			// 
-		PASinkVelocityID,	// 
-		PASourceID,			// 
-		PASpeedLimitID,		// 
-		PATargetColorID,	// 
-		PATargetSizeID,		// 
-		PATargetRotateID,	// 
-		PATargetRotateDID,	// 
-		PATargetVelocityID,	// 
-		PATargetVelocityDID,// 
-		PAVortexID,			// 
-        PATurbulenceID,     //
-        PAScatterID, 	    //
-		action_enum_force_dword = u32(-1)
-	};
-    struct ParticleAction;
+typedef void(*OnBirthParticleCB) (void* owner, u32 param, PAPI::Particle& P, u32 idx);
+typedef void(*OnDeadParticleCB) (void* owner, u32 param, PAPI::Particle& P, u32 idx);
+//////////////////////////////////////////////////////////////////////
+// Type codes for domains
+enum PDomainEnum
+{
+    PDPoint = 0, // Single point
+    PDLine = 1, // Line segment
+    PDTriangle = 2, // Triangle
+    PDPlane = 3, // Arbitrarily-oriented plane
+    PDBox = 4, // Axis-aligned box
+    PDSphere = 5, // Sphere
+    PDCylinder = 6, // Cylinder
+    PDCone = 7, // Cone
+    PDBlob = 8, // Gaussian blob
+    PDDisc = 9, // Arbitrarily-oriented disc
+    PDRectangle = 10, // Rhombus-shaped planar region
+    domain_enum_force_dword = u32(-1)
+};
+//////////////////////////////////////////////////////////////////////
+// Type codes for all actions
+enum PActionEnum
+{
+    PAAvoidID, // Avoid entering the domain of space.
+    PABounceID, // Bounce particles off a domain of space.
+    PACallActionListID_obsolette, //
+    PACopyVertexBID, // Set the secondary position from current position.
+    PADampingID, // Dampen particle velocities.
+    PAExplosionID, // An Explosion.
+    PAFollowID, // Accelerate toward the previous particle in the effect.
+    PAGravitateID, // Accelerate each particle toward each other particle.
+    PAGravityID, // Acceleration in the given direction.
+    PAJetID, //
+    PAKillOldID, //
+    PAMatchVelocityID, //
+    PAMoveID, //
+    PAOrbitLineID, //
+    PAOrbitPointID, //
+    PARandomAccelID, //
+    PARandomDisplaceID, //
+    PARandomVelocityID, //
+    PARestoreID, //
+    PASinkID, //
+    PASinkVelocityID, //
+    PASourceID, //
+    PASpeedLimitID, //
+    PATargetColorID, //
+    PATargetSizeID, //
+    PATargetRotateID, //
+    PATargetRotateDID, //
+    PATargetVelocityID, //
+    PATargetVelocityDID,//
+    PAVortexID, //
+    PATurbulenceID, //
+    PAScatterID, //
+    action_enum_force_dword = u32(-1)
+};
+struct ParticleAction;
 
-    class IParticleManager{
-    public:
-		    						IParticleManager	(){}
-        virtual						~IParticleManager	(){}
+class IParticleManager
+{
+public:
+    IParticleManager() {}
+    virtual ~IParticleManager() {}
 
-		// create&destroy
-		virtual int					CreateEffect		(u32 max_particles)=0;
-		virtual void				DestroyEffect		(int effect_id)=0;
-		virtual int					CreateActionList	()=0;
-		virtual void				DestroyActionList	(int alist_id)=0;
+    // create&destroy
+    virtual int CreateEffect(u32 max_particles) = 0;
+    virtual void DestroyEffect(int effect_id) = 0;
+    virtual int CreateActionList() = 0;
+    virtual void DestroyActionList(int alist_id) = 0;
 
-        // control
-        virtual void				PlayEffect			(int effect_id, int alist_id)=0;
-        virtual void				StopEffect			(int effect_id, int alist_id, BOOL deffered=TRUE)=0;
+    // control
+    virtual void PlayEffect(int effect_id, int alist_id) = 0;
+    virtual void StopEffect(int effect_id, int alist_id, BOOL deffered = TRUE) = 0;
 
-        // update&render
-        virtual void				Update				(int effect_id, int alist_id, float dt)=0;
-        virtual void				Render				(int effect_id)=0;
-        virtual void				Transform			(int alist_id, const Fmatrix& m, const Fvector& velocity)=0;
+    // update&render
+    virtual void Update(int effect_id, int alist_id, float dt) = 0;
+    virtual void Render(int effect_id) = 0;
+    virtual void Transform(int alist_id, const Fmatrix& m, const Fvector& velocity) = 0;
 
-        // effect
-        virtual void				RemoveParticle		(int effect_id, u32 p_id)=0;
-        virtual void				SetMaxParticles		(int effect_id, u32 max_particles)=0;
-        virtual void				SetCallback			(int effect_id, OnBirthParticleCB b, OnDeadParticleCB d, void* owner, u32 param)=0;
-    	virtual void				GetParticles		(int effect_id, Particle*& particles, u32& cnt)=0;
-    	virtual u32					GetParticlesCount	(int effect_id)=0;
-        
-        // action
-        virtual ParticleAction*		CreateAction		(PActionEnum type)=0;
-        virtual u32					LoadActions			(int alist_id, IReader& R)=0;
-        virtual void				SaveActions			(int alist_id, IWriter& W)=0;
-    };
+    // effect
+    virtual void RemoveParticle(int effect_id, u32 p_id) = 0;
+    virtual void SetMaxParticles(int effect_id, u32 max_particles) = 0;
+    virtual void SetCallback(int effect_id, OnBirthParticleCB b, OnDeadParticleCB d, void* owner, u32 param) = 0;
+    virtual void GetParticles(int effect_id, Particle*& particles, u32& cnt) = 0;
+    virtual u32 GetParticlesCount(int effect_id) = 0;
+
+    // action
+    virtual ParticleAction* CreateAction(PActionEnum type) = 0;
+    virtual u32 LoadActions(int alist_id, IReader& R) = 0;
+    virtual void SaveActions(int alist_id, IWriter& W) = 0;
+};
 
-    PARTICLES_API IParticleManager* ParticleManager		();
+PARTICLES_API IParticleManager* ParticleManager();
 };
 #endif //PSystemH
diff --git a/src/xrEngine/pure.cpp b/src/xrEngine/pure.cpp
index 6d9189c2244..bff437271d9 100644
--- a/src/xrEngine/pure.cpp
+++ b/src/xrEngine/pure.cpp
@@ -3,11 +3,11 @@
 
 #include "pure.h"
 
-//ENGINE_API int	__cdecl	_REG_Compare(const void *e1, const void *e2)
+//ENGINE_API int __cdecl _REG_Compare(const void *e1, const void *e2)
 //{
-//	_REG_INFO *p1 = (_REG_INFO *)e1;
-//	_REG_INFO *p2 = (_REG_INFO *)e2;
-//	return (p2->Prio - p1->Prio);
+// _REG_INFO *p1 = (_REG_INFO *)e1;
+// _REG_INFO *p2 = (_REG_INFO *)e2;
+// return (p2->Prio - p1->Prio);
 //}
 
 DECLARE_RP(Frame);
diff --git a/src/xrEngine/pure.h b/src/xrEngine/pure.h
index 510c86ed0d7..a87c554ea6f 100644
--- a/src/xrEngine/pure.h
+++ b/src/xrEngine/pure.h
@@ -2,19 +2,19 @@
 #define _PURE_H_AAA_
 
 // messages
-#define REG_PRIORITY_LOW		0x11111111ul
-#define REG_PRIORITY_NORMAL		0x22222222ul
-#define REG_PRIORITY_HIGH		0x33333333ul
-#define REG_PRIORITY_CAPTURE	0x7ffffffful
-#define REG_PRIORITY_INVALID	0xfffffffful
+#define REG_PRIORITY_LOW 0x11111111ul
+#define REG_PRIORITY_NORMAL 0x22222222ul
+#define REG_PRIORITY_HIGH 0x33333333ul
+#define REG_PRIORITY_CAPTURE 0x7ffffffful
+#define REG_PRIORITY_INVALID 0xfffffffful
 
-typedef void __fastcall RP_FUNC		(void *obj);
-#define DECLARE_MESSAGE_CL(name,calling)		extern ENGINE_API RP_FUNC rp_##name; class ENGINE_API pure##name { public: virtual void calling On##name(void)=0;	}
-	
-#define DECLARE_MESSAGE( name )	DECLARE_MESSAGE_CL(name, )
+typedef void __fastcall RP_FUNC(void* obj);
+#define DECLARE_MESSAGE_CL(name,calling) extern ENGINE_API RP_FUNC rp_##name; class ENGINE_API pure##name { public: virtual void calling On##name(void)=0; }
+
+#define DECLARE_MESSAGE( name ) DECLARE_MESSAGE_CL(name, )
 #define DECLARE_RP(name) void __fastcall rp_##name(void *p) { ((pure##name *)p)->On##name(); }
 
-DECLARE_MESSAGE_CL(Frame,_BCL);
+DECLARE_MESSAGE_CL(Frame, _BCL);
 DECLARE_MESSAGE(Render);
 DECLARE_MESSAGE(AppActivate);
 DECLARE_MESSAGE(AppDeactivate);
@@ -26,78 +26,82 @@ DECLARE_MESSAGE(ScreenResolutionChanged);
 
 
 //-----------------------------------------------------------------------------
-struct _REG_INFO {
-	void*	Object;
-	int		Prio;
-	u32		Flags;
+struct _REG_INFO
+{
+    void* Object;
+    int Prio;
+    u32 Flags;
 };
 
-//ENGINE_API extern int	__cdecl	_REG_Compare(const void *, const void *);
+//ENGINE_API extern int __cdecl _REG_Compare(const void *, const void *);
 
-template <class T> class CRegistrator		// the registrator itself
+template <class T> class CRegistrator // the registrator itself
 {
-//	friend ENGINE_API int	__cdecl	_REG_Compare(const void *, const void *);
-static int	__cdecl	_REG_Compare(const void *e1, const void *e2)
-{
-	_REG_INFO *p1 = (_REG_INFO *)e1;
-	_REG_INFO *p2 = (_REG_INFO *)e2;
-	return (p2->Prio - p1->Prio);
-}
+    // friend ENGINE_API int __cdecl _REG_Compare(const void *, const void *);
+    static int __cdecl _REG_Compare(const void* e1, const void* e2)
+    {
+        _REG_INFO* p1 = (_REG_INFO*)e1;
+        _REG_INFO* p2 = (_REG_INFO*)e2;
+        return (p2->Prio - p1->Prio);
+    }
 public:
-	xr_vector<_REG_INFO>	R;
-	// constructor
-	struct {
-		u32		in_process	:1;
-		u32		changed		:1;
-	};
-	CRegistrator()			{ in_process=false; changed=false;}
+    xr_vector<_REG_INFO> R;
+    // constructor
+    struct
+    {
+        u32 in_process : 1;
+        u32 changed : 1;
+    };
+    CRegistrator() { in_process = false; changed = false; }
 
-	//
-	void Add	(T *obj, int priority=REG_PRIORITY_NORMAL, u32 flags=0)
-	{
+    //
+    void Add(T* obj, int priority = REG_PRIORITY_NORMAL, u32 flags = 0)
+    {
 #ifdef DEBUG
-		VERIFY	(priority!=REG_PRIORITY_INVALID);
-		VERIFY	(obj);
-		for		(u32 i=0; i<R.size(); i++) VERIFY( !((R[i].Prio!=REG_PRIORITY_INVALID)&&(R[i].Object==(void*)obj))   );
+        VERIFY(priority != REG_PRIORITY_INVALID);
+        VERIFY(obj);
+        for (u32 i = 0; i < R.size(); i++) VERIFY(!((R[i].Prio != REG_PRIORITY_INVALID) && (R[i].Object == (void*)obj)));
 #endif
-		_REG_INFO			I;
-		I.Object			=obj;
-		I.Prio				=priority;
-		I.Flags				=flags;
-		R.push_back			(I);
-		
-		if(in_process)		changed=true;
-		else Resort			( );
-	};
-	void Remove	(T *obj)
-	{
-		for (u32 i=0; i<R.size(); i++) {
-			if (R[i].Object==obj) R[i].Prio = REG_PRIORITY_INVALID;
-		}
-		if(in_process)		changed=true;
-		else Resort			( );
-	};
-	void Process(RP_FUNC *f)
-	{
-		in_process = true;
-    	if (R.empty()) return;
-		if (R[0].Prio==REG_PRIORITY_CAPTURE)	f(R[0].Object);
-		else {
-			for (u32 i=0; i<R.size(); i++)
-				if(R[i].Prio!=REG_PRIORITY_INVALID)
-					f(R[i].Object);
+        _REG_INFO I;
+        I.Object = obj;
+        I.Prio = priority;
+        I.Flags = flags;
+        R.push_back(I);
+
+        if (in_process) changed = true;
+        else Resort();
+    };
+    void Remove(T* obj)
+    {
+        for (u32 i = 0; i < R.size(); i++)
+        {
+            if (R[i].Object == obj) R[i].Prio = REG_PRIORITY_INVALID;
+        }
+        if (in_process) changed = true;
+        else Resort();
+    };
+    void Process(RP_FUNC* f)
+    {
+        in_process = true;
+        if (R.empty()) return;
+        if (R[0].Prio == REG_PRIORITY_CAPTURE) f(R[0].Object);
+        else
+        {
+            for (u32 i = 0; i < R.size(); i++)
+                if (R[i].Prio != REG_PRIORITY_INVALID)
+                    f(R[i].Object);
 
-		}
-		if(changed)	Resort();
-		in_process = false;
-	};
-	void Resort	(void)
-	{
-		qsort	(&*R.begin(),R.size(),sizeof(_REG_INFO),_REG_Compare);
-		while	((R.size()) && (R[R.size()-1].Prio==REG_PRIORITY_INVALID)) R.pop_back();
-		if (R.empty())		R.clear		();
-		changed				= false;
-	};
+        }
+        if (changed) Resort();
+        in_process = false;
+    };
+    void Resort(void)
+    {
+        qsort(&*R.begin(), R.size(), sizeof(_REG_INFO), _REG_Compare);
+        while ((R.size()) && (R[R.size() - 1].Prio == REG_PRIORITY_INVALID)) R.pop_back();
+        if (R.empty()) R.clear();
+        changed = false;
+    };
 };
 
 #endif
diff --git a/src/xrEngine/pure_relcase.cpp b/src/xrEngine/pure_relcase.cpp
index 471ae855011..c5302d15c30 100644
--- a/src/xrEngine/pure_relcase.cpp
+++ b/src/xrEngine/pure_relcase.cpp
@@ -3,8 +3,8 @@
 #include "xr_object_list.h"
 #include "IGame_Level.h"
 
-pure_relcase::~pure_relcase	()
+pure_relcase::~pure_relcase()
 {
-	if (g_pGameLevel) 
-		g_pGameLevel->Objects.relcase_unregister	(&m_ID);
+    if (g_pGameLevel)
+        g_pGameLevel->Objects.relcase_unregister(&m_ID);
 }
diff --git a/src/xrEngine/pure_relcase.h b/src/xrEngine/pure_relcase.h
index ffb36f960a1..da86cbaa655 100644
--- a/src/xrEngine/pure_relcase.h
+++ b/src/xrEngine/pure_relcase.h
@@ -1,24 +1,25 @@
 #ifndef pure_relcaseH
 #define pure_relcaseH
 
-class ENGINE_API pure_relcase{
+class ENGINE_API pure_relcase
+{
 private:
-	int							m_ID;
+    int m_ID;
 public:
-	template <typename class_type>
-			pure_relcase		(void (xr_stdcall class_type::* function_to_bind)(CObject*))
-	{
-		R_ASSERT				(g_pGameLevel);
-		class_type				*self = static_cast<class_type*>(this);
-		g_pGameLevel->Objects.relcase_register	(
-			CObjectList::RELCASE_CALLBACK (
-				self,
-				function_to_bind
-			),
-			&m_ID
-		);
-	}
-	virtual ~pure_relcase		();
+    template <typename class_type>
+    pure_relcase(void (xr_stdcall class_type::* function_to_bind)(CObject*))
+    {
+        R_ASSERT(g_pGameLevel);
+        class_type* self = static_cast<class_type*>(this);
+        g_pGameLevel->Objects.relcase_register(
+            CObjectList::RELCASE_CALLBACK(
+                self,
+                function_to_bind
+            ),
+            &m_ID
+        );
+    }
+    virtual ~pure_relcase();
 };
 
 #endif // pure_relcaseH
diff --git a/src/xrEngine/resource.h b/src/xrEngine/resource.h
index 6f99e7baac6..a7ff7dbe3bf 100644
--- a/src/xrEngine/resource.h
+++ b/src/xrEngine/resource.h
@@ -2,29 +2,29 @@
 // Microsoft Visual C++ generated include file.
 // Used by resource.rc
 //
-#define IDDEBUG                         3
-#define IDD_STARTUP                     106
-#define IDI_ICON1                       111
-#define IDB_BITMAP2                     116
-#define IDB_BITMAP3                     120
-#define IDB_BITMAP1                     123
-#define IDC_LIST                        1000
-#define IDC_FILE                        1001
-#define IDC_LINE                        1002
-#define IDC_DESC                        1003
-#define IDSTOP                          1004
-#define IDC_STACK                       1006
-#define IDC_STATIC_LOGO                 1007
-#define RC_VIRT_MEM_ERROR               2071
-#define RC_VIRT_MEM_TEXT                2072
+#define IDDEBUG 3
+#define IDD_STARTUP 106
+#define IDI_ICON1 111
+#define IDB_BITMAP2 116
+#define IDB_BITMAP3 120
+#define IDB_BITMAP1 123
+#define IDC_LIST 1000
+#define IDC_FILE 1001
+#define IDC_LINE 1002
+#define IDC_DESC 1003
+#define IDSTOP 1004
+#define IDC_STACK 1006
+#define IDC_STATIC_LOGO 1007
+#define RC_VIRT_MEM_ERROR 2071
+#define RC_VIRT_MEM_TEXT 2072
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        124
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1008
-#define _APS_NEXT_SYMED_VALUE           101
+#define _APS_NEXT_RESOURCE_VALUE 124
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1008
+#define _APS_NEXT_SYMED_VALUE 101
 #endif
 #endif
diff --git a/src/xrEngine/securom_api.h b/src/xrEngine/securom_api.h
index e51d71593e5..0d35d31cb52 100644
--- a/src/xrEngine/securom_api.h
+++ b/src/xrEngine/securom_api.h
@@ -2,9 +2,9 @@
 // Copyright (c) 2005 Sony DADC
 // All rights reserved.
 //
-// $FileName    : securom_api.h
+// $FileName : securom_api.h
 // $ProjectName : SDK
-// $Created     : 02.03.2005  12:14
+// $Created : 02.03.2005 12:14
 //
 // Content:
 //
@@ -16,23 +16,23 @@
 #undef USE_SECUROM_MARKERS_API
 
 #ifdef DEDICATED_SERVER
-	#undef USE_SECUROM_MARKERS_API
+ #undef USE_SECUROM_MARKERS_API
 #endif // DEDICATED_SERVER
 
 #ifdef _EDITOR
-	#undef USE_SECUROM_MARKERS_API
+ #undef USE_SECUROM_MARKERS_API
 #endif // _EDITOR
 
 #ifndef USE_SECUROM_MARKERS_API
 
-	#define SECUROM_MARKER_PERFORMANCE_ON(id)
-	#define SECUROM_MARKER_PERFORMANCE_OFF(id)
+ #define SECUROM_MARKER_PERFORMANCE_ON(id)
+ #define SECUROM_MARKER_PERFORMANCE_OFF(id)
 
-	#define SECUROM_MARKER_SECURITY_ON(id)
-	#define SECUROM_MARKER_SECURITY_OFF(id)
+ #define SECUROM_MARKER_SECURITY_ON(id)
+ #define SECUROM_MARKER_SECURITY_OFF(id)
 
-	#define SECUROM_MARKER_HIGH_SECURITY_ON(id)
-	#define SECUROM_MARKER_HIGH_SECURITY_OFF(id)
+ #define SECUROM_MARKER_HIGH_SECURITY_ON(id)
+ #define SECUROM_MARKER_HIGH_SECURITY_OFF(id)
 
 #else // USE_SECUROM_MARKERS_API
 
@@ -42,133 +42,133 @@
 #if 0
 static BOOL SecuROM_Tripwire() 
 { 
-	char	event_name[50];
-		
-	sprintf(event_name, "v7_%04d", (GetCurrentProcessId() ^ 0x19EA3FD3) );
-	
-	if(HANDLE S7hnd = OpenEventA(EVENT_MODIFY_STATE, FALSE, event_name))
-	{
-		CloseHandle(S7hnd);
-		return TRUE;
-	}
-
-	return FALSE;
+ char event_name[50];
+ 
+ sprintf(event_name, "v7_%04d", (GetCurrentProcessId() ^ 0x19EA3FD3) );
+ 
+ if(HANDLE S7hnd = OpenEventA(EVENT_MODIFY_STATE, FALSE, event_name))
+ {
+ CloseHandle(S7hnd);
+ return TRUE;
+ }
+
+ return FALSE;
 }
 #endif // 0
 
 #define SECUROM_MARKER_PERFORMANCE_ON(id) { { __asm _emit 0xEB __asm _emit 0x0E __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x01 __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) }
 #define SECUROM_MARKER_PERFORMANCE_OFF(id) { __asm _emit 0xEB __asm _emit 0x0E __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x02 __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) } }
 
-#define SECUROM_MARKER_SECURITY_ON(id) { { __asm _emit 0xEB __asm _emit 0x0E __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x11  __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) }
+#define SECUROM_MARKER_SECURITY_ON(id) { { __asm _emit 0xEB __asm _emit 0x0E __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x11 __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) }
 #define SECUROM_MARKER_SECURITY_OFF(id) { __asm _emit 0xEB __asm _emit 0x0E __asm __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x12 __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) } }
 
-#define SECUROM_MARKER_HIGH_SECURITY_ON(id) { { __asm _emit 0xEB __asm _emit 0x0E __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x21  __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) }
+#define SECUROM_MARKER_HIGH_SECURITY_ON(id) { { __asm _emit 0xEB __asm _emit 0x0E __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x21 __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) }
 #define SECUROM_MARKER_HIGH_SECURITY_OFF(id) { __asm _emit 0xEB __asm _emit 0x0E __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' __asm _emit 0x22 __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) } }
 
 
-#define SECUROM_MARKER_VM_CALL(id, code, data) { __asm _emit 0xEB __asm _emit 0x18  \
-			__asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' \
-			__asm _emit 0x31   \
-			__asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF)  \
-			__asm push offset code \
-			__asm push offset data }
+#define SECUROM_MARKER_VM_CALL(id, code, data) { __asm _emit 0xEB __asm _emit 0x18 \
+ __asm _emit 'M' __asm _emit 'a' __asm _emit '0' __asm _emit 'W' __asm _emit 'y' __asm _emit 'G' __asm _emit '1' __asm _emit 'k' __asm _emit 'm' \
+ __asm _emit 0x31 \
+ __asm _emit (id & 0xFF) __asm _emit ((id >> 8) & 0xFF) __asm _emit ((id >> 16) & 0xFF) __asm _emit ((id >> 24) & 0xFF) \
+ __asm push offset code \
+ __asm push offset data }
 
 
 static unsigned char MACRO_ADD[] =
 {
-	0xEC,0xAF,0xCA,0x36,0xB7,0x0D,0x59,0xC1,0xFA,0xA7,0x71,0xB1,0x23,0xC5,0x8E,0x65,0xD1,0x36,0x03,0x12,
-	0x7A,0x2C,0x31,0x3A,0x3E,0x14,0x5D,0xD2,0x0C,0x51,0x66,0xC7,0xE1,0x60,0x98,0x6A,0x16,0x9D,0xA8,0x80,
-	0xE4,0x7A,0x94,0xB2,0xA2,0xF5,0x6E,0x27,0xF5,0x0A,0x3F,0xC5,0xFF,0x20,0x4C,0xB8,0xC5,0x72,0x71,0x9A,
-	0xA9,0xA0,0xDD,0x4F,0x68,0x53,0xB1,0xFA,0x26,0x14,0x85,0x94,0x21,0x14,0x80,0x5C,0x70,0xBA,0xC5,0xF6,
-	0x58,0xDB,0xAE,0xE5,0x8D,0xCD,0xDC,0x6A,0x9C,0x11,0xFC,0x6D,0x33,0x17,0xFB,0xF2,0x30,0xF2,0xE0,0xD3,
-	0xE3,0x92,0xAC,0x46,0xC7,0x86,0x9B,0x6E,0x74,0x5D,0xB1,0x05,0xB9,0xFA,0x75,0x9F,0x84,0x57,0x2A,0x40,
-	0x72,0xE7,0xC9,0xCB
+ 0xEC,0xAF,0xCA,0x36,0xB7,0x0D,0x59,0xC1,0xFA,0xA7,0x71,0xB1,0x23,0xC5,0x8E,0x65,0xD1,0x36,0x03,0x12,
+ 0x7A,0x2C,0x31,0x3A,0x3E,0x14,0x5D,0xD2,0x0C,0x51,0x66,0xC7,0xE1,0x60,0x98,0x6A,0x16,0x9D,0xA8,0x80,
+ 0xE4,0x7A,0x94,0xB2,0xA2,0xF5,0x6E,0x27,0xF5,0x0A,0x3F,0xC5,0xFF,0x20,0x4C,0xB8,0xC5,0x72,0x71,0x9A,
+ 0xA9,0xA0,0xDD,0x4F,0x68,0x53,0xB1,0xFA,0x26,0x14,0x85,0x94,0x21,0x14,0x80,0x5C,0x70,0xBA,0xC5,0xF6,
+ 0x58,0xDB,0xAE,0xE5,0x8D,0xCD,0xDC,0x6A,0x9C,0x11,0xFC,0x6D,0x33,0x17,0xFB,0xF2,0x30,0xF2,0xE0,0xD3,
+ 0xE3,0x92,0xAC,0x46,0xC7,0x86,0x9B,0x6E,0x74,0x5D,0xB1,0x05,0xB9,0xFA,0x75,0x9F,0x84,0x57,0x2A,0x40,
+ 0x72,0xE7,0xC9,0xCB
 };
 
 static unsigned char MACRO_SUB[] =
 {
-	0xEC,0xAF,0xCA,0x36,0xB7,0x0D,0x59,0xC1,0xFA,0xA7,0x71,0xB1,0x23,0xC5,0x8E,0x65,0xD1,0x36,0x03,0x12,
-	0x7A,0x2C,0x31,0x3A,0x3E,0x14,0x5D,0xD2,0x0C,0x51,0x66,0xC7,0xE1,0x60,0x98,0x6A,0x16,0x9D,0xA8,0x80,
-	0xE4,0x7A,0x94,0xB2,0xA2,0xF5,0x6E,0x27,0xF5,0x0A,0x3F,0xC5,0xFF,0x20,0x4C,0xB8,0xC5,0x72,0x71,0x9A,
-	0xA9,0xA0,0xDD,0x4F,0x68,0x53,0xB1,0xFA,0x26,0x14,0x85,0x94,0x21,0x14,0x80,0x5C,0x70,0xBA,0xC5,0xF6,
-	0x58,0xDB,0xAE,0xE5,0x8D,0xCD,0xDC,0x6A,0x9C,0x11,0xFC,0x6D,0x33,0x17,0xFB,0xF2,0x22,0xEC,0xB5,0xFD,
-	0x75,0xCA,0x2B,0x55,0xCC,0x2B,0xBE,0xFC,0xC6,0x73,0x3C,0xEF,0xFD,0xD7,0x8B,0x86,0x69,0x4A,0x6A,0x80,
-	0xF0,0x6E,0xA7,0x09
+ 0xEC,0xAF,0xCA,0x36,0xB7,0x0D,0x59,0xC1,0xFA,0xA7,0x71,0xB1,0x23,0xC5,0x8E,0x65,0xD1,0x36,0x03,0x12,
+ 0x7A,0x2C,0x31,0x3A,0x3E,0x14,0x5D,0xD2,0x0C,0x51,0x66,0xC7,0xE1,0x60,0x98,0x6A,0x16,0x9D,0xA8,0x80,
+ 0xE4,0x7A,0x94,0xB2,0xA2,0xF5,0x6E,0x27,0xF5,0x0A,0x3F,0xC5,0xFF,0x20,0x4C,0xB8,0xC5,0x72,0x71,0x9A,
+ 0xA9,0xA0,0xDD,0x4F,0x68,0x53,0xB1,0xFA,0x26,0x14,0x85,0x94,0x21,0x14,0x80,0x5C,0x70,0xBA,0xC5,0xF6,
+ 0x58,0xDB,0xAE,0xE5,0x8D,0xCD,0xDC,0x6A,0x9C,0x11,0xFC,0x6D,0x33,0x17,0xFB,0xF2,0x22,0xEC,0xB5,0xFD,
+ 0x75,0xCA,0x2B,0x55,0xCC,0x2B,0xBE,0xFC,0xC6,0x73,0x3C,0xEF,0xFD,0xD7,0x8B,0x86,0x69,0x4A,0x6A,0x80,
+ 0xF0,0x6E,0xA7,0x09
 };
 
 static unsigned char MACRO_IF_EQL[] =
 {
-	0xEC,0xAF,0xAA,0x93,0x2D,0x04,0xA3,0x8F,0x8A,0x10,0x67,0x91,0xC9,0xE1,0xDA,0x2C,0x31,0x1D,0x82,0xE2,
-	0x07,0xF9,0xE8,0x24,0x75,0xE9,0x9D,0x54,0x70,0x36,0x4F,0xFF,0xDD,0x4A,0x82,0x14,0x88,0x48,0x74,0x51,
-	0x3F,0xBA,0x51,0x98,0xE9,0x1D,0x27,0xB1,0x7B,0x97,0x27,0x46,0x9A,0x46,0x64,0xD4,0xEF,0x92,0xF0,0x05,
-	0x5E,0x79,0xED,0x8D,0x34,0x52,0x8A,0x90,0xE9,0xBA,0x3C,0xBE,0x8B,0xE5,0xCA,0x28,0xB0,0x92,0xDE,0x4C,
-	0xD8,0x31,0xCE,0xCE,0x8E,0x22,0x78,0xF8,0x7C,0xCE,0xF6,0x4E,0x84,0xD0,0xEE,0xB5,0x0B,0x8E,0x53,0xD5,
-	0xCE,0x7C,0x4F,0x2F,0xFA,0xF6,0xBF,0xC8,0x70,0x5A,0x0E,0x00,0xDB,0x93,0x44,0x83,0xF4,0xFC,0xEB,0x2F,
-	0x31,0x1D,0x02,0x23,0x9E,0x8A,0xB5,0x13,0x68,0x48,0x3D,0x76,0x01,0xFE,0x40,0x78,0x2C,0xB7,0x09,0x39,
-	0xCF,0xA4,0x58,0x87,0x72,0xF8,0xA0,0xBC,0xE9,0xA3,0xD0,0xC0,0x78,0x80,0xFA,0xDC,0x05,0x9A,0x0C,0x40,
-	0x9C,0xB6,0x62,0xD4,0x6E,0xA0,0x18,0x9A,0xEE,0x85,0x4A,0xB0,0x63,0xD3,0x2A,0x84,0xCA,0x3C,0x55,0xA9,
-	0xD2,0x18,0xAE,0x4D,0x40,0x80,0xE5,0x7A,0x95,0x33,0x90,0xF2,0xF6,0x06,0xD9,0x65,0x4D,0x2B,0x95,0x29,
-	0x02,0xB9,0xF9,0xA6,0x05,0x56,0x13,0x2B,0x9F,0x69,0xFA,0xF1,0xBB,0x28,0xA6,0x71,0x40,0x11,0xD7,0x86,
-	0x04,0xEE,0xB6,0xEE,0xBA,0xC6,0x45,0x07,0x75,0xEC,0xC5,0xD0,0x7D,0x8C,0xC5,0x51,0x63,0xB4,0xEA,0x51,
-	0x63,0xB4,0xEA,0xD6,0x61,0xB1,0xE1,0xBF,0xD4,0x5E,0xAD,0x7D,0xD5,0x03,0x53,0x50,0x9C,0x68,0x1B,0xA5,
-	0xB4,0xF8,0x66,0x1E,0xC6,0x76,0x19,0xA9,0x2F,0x54,0xE6,0xC1,0x41,0x47,0xF1,0x1A,0x37,0x47,0x78,0xC5,
-	0x40,0x7A,0x28,0xA6,0xF1,0x44,0x14,0x8E,0x88,0x15,0xAE,0xF0,0x91,0x0F,0x6A,0xE3,0x9D,0x9B,0x71,0x99,
-	0x02,0x34,0xE8,0x5F,0x02,0xB5,0x6F,0x45,0x2A,0x5A,0xEF,0x4B,0xD2,0x7A,0xEF,0x4B,0x53,0x58,0x73,0xA4,
-	0x1A,0x1B,0x15,0xE8,0x04,0xC2,0xC3,0x65,0xA5,0x0B,0x16,0xCC,0x26,0xF0,0x26,0xDB,0xCA,0x4A,0x37,0x03,
-	0x79,0x64,0x0D,0x2A,0xBA,0x57,0x61,0xBD,0xFC,0xE7,0x0D,0xCD,0x72,0xF9,0xDE,0xAB,0x87,0x54,0x8F,0x0E,
-	0x26,0xD5,0x8A,0x78,0x15,0x6C,0x4B,0xDB,0x15,0x6C,0x4B,0xDB,0x15,0x6C,0x4B,0xDB,0x95,0x12,0xF0,0xF9,
-	0x1D,0x10,0x9F,0xC3,0xA8,0x84,0xB0,0x47,0x58,0x67,0x94,0x58,0x6D,0x8A,0xFE,0x64,0xDA,0x71,0xCF,0x2D,
-	0xDA,0xD3,0x6D,0x83,0xE2,0x07,0x1F,0x47,0xB7,0x1B,0xAF,0x88,0x21,0xDE,0x8C,0x98,0x52,0xA8,0x70,0x32,
-	0x92,0x80,0x1B,0x00,0xFD,0x49,0x32,0xF0,0x1E,0xB8,0xDB,0x65,0x33,0x93,0x93,0x8E,0xA0,0x97,0xEF,0xA7,
-	0xE3,0xD2,0x84,0x49,0x2C,0xE0,0xD9,0xC0,0x59,0xF8,0xCD,0x62,0x83,0xEF,0x7B,0x55,0x5D,0x6B,0x7F
+ 0xEC,0xAF,0xAA,0x93,0x2D,0x04,0xA3,0x8F,0x8A,0x10,0x67,0x91,0xC9,0xE1,0xDA,0x2C,0x31,0x1D,0x82,0xE2,
+ 0x07,0xF9,0xE8,0x24,0x75,0xE9,0x9D,0x54,0x70,0x36,0x4F,0xFF,0xDD,0x4A,0x82,0x14,0x88,0x48,0x74,0x51,
+ 0x3F,0xBA,0x51,0x98,0xE9,0x1D,0x27,0xB1,0x7B,0x97,0x27,0x46,0x9A,0x46,0x64,0xD4,0xEF,0x92,0xF0,0x05,
+ 0x5E,0x79,0xED,0x8D,0x34,0x52,0x8A,0x90,0xE9,0xBA,0x3C,0xBE,0x8B,0xE5,0xCA,0x28,0xB0,0x92,0xDE,0x4C,
+ 0xD8,0x31,0xCE,0xCE,0x8E,0x22,0x78,0xF8,0x7C,0xCE,0xF6,0x4E,0x84,0xD0,0xEE,0xB5,0x0B,0x8E,0x53,0xD5,
+ 0xCE,0x7C,0x4F,0x2F,0xFA,0xF6,0xBF,0xC8,0x70,0x5A,0x0E,0x00,0xDB,0x93,0x44,0x83,0xF4,0xFC,0xEB,0x2F,
+ 0x31,0x1D,0x02,0x23,0x9E,0x8A,0xB5,0x13,0x68,0x48,0x3D,0x76,0x01,0xFE,0x40,0x78,0x2C,0xB7,0x09,0x39,
+ 0xCF,0xA4,0x58,0x87,0x72,0xF8,0xA0,0xBC,0xE9,0xA3,0xD0,0xC0,0x78,0x80,0xFA,0xDC,0x05,0x9A,0x0C,0x40,
+ 0x9C,0xB6,0x62,0xD4,0x6E,0xA0,0x18,0x9A,0xEE,0x85,0x4A,0xB0,0x63,0xD3,0x2A,0x84,0xCA,0x3C,0x55,0xA9,
+ 0xD2,0x18,0xAE,0x4D,0x40,0x80,0xE5,0x7A,0x95,0x33,0x90,0xF2,0xF6,0x06,0xD9,0x65,0x4D,0x2B,0x95,0x29,
+ 0x02,0xB9,0xF9,0xA6,0x05,0x56,0x13,0x2B,0x9F,0x69,0xFA,0xF1,0xBB,0x28,0xA6,0x71,0x40,0x11,0xD7,0x86,
+ 0x04,0xEE,0xB6,0xEE,0xBA,0xC6,0x45,0x07,0x75,0xEC,0xC5,0xD0,0x7D,0x8C,0xC5,0x51,0x63,0xB4,0xEA,0x51,
+ 0x63,0xB4,0xEA,0xD6,0x61,0xB1,0xE1,0xBF,0xD4,0x5E,0xAD,0x7D,0xD5,0x03,0x53,0x50,0x9C,0x68,0x1B,0xA5,
+ 0xB4,0xF8,0x66,0x1E,0xC6,0x76,0x19,0xA9,0x2F,0x54,0xE6,0xC1,0x41,0x47,0xF1,0x1A,0x37,0x47,0x78,0xC5,
+ 0x40,0x7A,0x28,0xA6,0xF1,0x44,0x14,0x8E,0x88,0x15,0xAE,0xF0,0x91,0x0F,0x6A,0xE3,0x9D,0x9B,0x71,0x99,
+ 0x02,0x34,0xE8,0x5F,0x02,0xB5,0x6F,0x45,0x2A,0x5A,0xEF,0x4B,0xD2,0x7A,0xEF,0x4B,0x53,0x58,0x73,0xA4,
+ 0x1A,0x1B,0x15,0xE8,0x04,0xC2,0xC3,0x65,0xA5,0x0B,0x16,0xCC,0x26,0xF0,0x26,0xDB,0xCA,0x4A,0x37,0x03,
+ 0x79,0x64,0x0D,0x2A,0xBA,0x57,0x61,0xBD,0xFC,0xE7,0x0D,0xCD,0x72,0xF9,0xDE,0xAB,0x87,0x54,0x8F,0x0E,
+ 0x26,0xD5,0x8A,0x78,0x15,0x6C,0x4B,0xDB,0x15,0x6C,0x4B,0xDB,0x15,0x6C,0x4B,0xDB,0x95,0x12,0xF0,0xF9,
+ 0x1D,0x10,0x9F,0xC3,0xA8,0x84,0xB0,0x47,0x58,0x67,0x94,0x58,0x6D,0x8A,0xFE,0x64,0xDA,0x71,0xCF,0x2D,
+ 0xDA,0xD3,0x6D,0x83,0xE2,0x07,0x1F,0x47,0xB7,0x1B,0xAF,0x88,0x21,0xDE,0x8C,0x98,0x52,0xA8,0x70,0x32,
+ 0x92,0x80,0x1B,0x00,0xFD,0x49,0x32,0xF0,0x1E,0xB8,0xDB,0x65,0x33,0x93,0x93,0x8E,0xA0,0x97,0xEF,0xA7,
+ 0xE3,0xD2,0x84,0x49,0x2C,0xE0,0xD9,0xC0,0x59,0xF8,0xCD,0x62,0x83,0xEF,0x7B,0x55,0x5D,0x6B,0x7F
 };
 
 #pragma pack(push, 1)
 typedef struct
 {
-	void  *code_ptr;
-	
-	union
-	{
-		struct
-		{
-			DWORD Param1;
-			DWORD Param2;
-			DWORD Param3;
-			DWORD Param4;
-			DWORD Param5;
-			DWORD Param6;
-		}std;
-		struct
-		{
-			DWORD dest;
-			DWORD src;
-			DWORD Param3;
-			DWORD Param4;
-			DWORD Param5;
-			DWORD Param6;
-		}arithmetic;
-		struct
-		{	
-			DWORD compare_me;
-			DWORD with_value;
-			DWORD if_equal;
-			DWORD if_not_equal;
-			DWORD Param5;
-			DWORD Param6;
-		}cmp;
-	};	
-	
-	
+ void *code_ptr;
+ 
+ union
+ {
+ struct
+ {
+ DWORD Param1;
+ DWORD Param2;
+ DWORD Param3;
+ DWORD Param4;
+ DWORD Param5;
+ DWORD Param6;
+ }std;
+ struct
+ {
+ DWORD dest;
+ DWORD src;
+ DWORD Param3;
+ DWORD Param4;
+ DWORD Param5;
+ DWORD Param6;
+ }arithmetic;
+ struct
+ { 
+ DWORD compare_me;
+ DWORD with_value;
+ DWORD if_equal;
+ DWORD if_not_equal;
+ DWORD Param5;
+ DWORD Param6;
+ }cmp;
+ }; 
+ 
+ 
 } VirtualMachine_t;
 #pragma pack(pop)
 
 #define SET_LABEL_ADDR(param, label_addr) \
-	{ \
-		DWORD addr; \
-		__asm { mov addr, offset label_addr } \
-		param = addr; \
-	}
+ { \
+ DWORD addr; \
+ __asm { mov addr, offset label_addr } \
+ param = addr; \
+ }
 
 #endif // USE_SECUROM_MARKERS_API
 
diff --git a/src/xrEngine/std_classes.h b/src/xrEngine/std_classes.h
index 45d33398fea..eb8b81e9f8f 100644
--- a/src/xrEngine/std_classes.h
+++ b/src/xrEngine/std_classes.h
@@ -2,9 +2,9 @@
 #define _STD_CLSID_
 
 //***** Standart extension classes
-#define CLSID_HUDMANAGER		MK_CLSID('H','U','D','_','M','N','G','R')
-#define CLSID_GAME_LEVEL		MK_CLSID('G','_','L','E','V','E','L',' ')
-#define CLSID_GAME_PERSISTANT	MK_CLSID('G','_','P','E','R','S','I','S')
-#define CLSID_OBJECT			MK_CLSID('O','B','J','E','C','T',' ',' ')
+#define CLSID_HUDMANAGER MK_CLSID('H','U','D','_','M','N','G','R')
+#define CLSID_GAME_LEVEL MK_CLSID('G','_','L','E','V','E','L',' ')
+#define CLSID_GAME_PERSISTANT MK_CLSID('G','_','P','E','R','S','I','S')
+#define CLSID_OBJECT MK_CLSID('O','B','J','E','C','T',' ',' ')
 
 #endif
diff --git a/src/xrEngine/stdafx.h b/src/xrEngine/stdafx.h
index 8eb6bcecdda..79c0de04a0c 100644
--- a/src/xrEngine/stdafx.h
+++ b/src/xrEngine/stdafx.h
@@ -1,26 +1,26 @@
-#ifndef	STDAFX_3DA
+#ifndef STDAFX_3DA
 #define STDAFX_3DA
 #pragma once
 
 #ifdef _EDITOR
-	#include "..\editors\ECore\stdafx.h"
+#include "..\editors\ECore\stdafx.h"
 #else
 
 #ifndef NDEBUG
-#	ifndef INGAME_EDITOR
-#		define	INGAME_EDITOR
-#	endif // #ifndef INGAME_EDITOR
+# ifndef INGAME_EDITOR
+# define INGAME_EDITOR
+# endif // #ifndef INGAME_EDITOR
 #endif // #ifndef NDEBUG
 
 #ifdef INGAME_EDITOR
-#	define _WIN32_WINNT 0x0550
+# define _WIN32_WINNT 0x0550
 #endif // #ifdef INGAME_EDITOR
 
 #include "../xrCore/xrCore.h"
 #include "../Include/xrAPI/xrAPI.h"
 
 #ifdef _DEBUG
-#	define D3D_DEBUG_INFO
+# define D3D_DEBUG_INFO
 #endif
 
 #pragma warning(disable:4995)
@@ -31,17 +31,17 @@
 // you must define ENGINE_BUILD then building the engine itself
 // and not define it if you are about to build DLL
 #ifndef NO_ENGINE_API
-	#ifdef	ENGINE_BUILD
-		#define DLL_API			__declspec(dllimport)
-		#define ENGINE_API		__declspec(dllexport)
-	#else
-		#undef	DLL_API
-		#define DLL_API			__declspec(dllexport)
-		#define ENGINE_API		__declspec(dllimport)
-	#endif
+#ifdef ENGINE_BUILD
+#define DLL_API __declspec(dllimport)
+#define ENGINE_API __declspec(dllexport)
 #else
-	#define ENGINE_API
-	#define DLL_API
+#undef DLL_API
+#define DLL_API __declspec(dllexport)
+#define ENGINE_API __declspec(dllimport)
+#endif
+#else
+#define ENGINE_API
+#define DLL_API
 #endif // NO_ENGINE_API
 
 #define ECORE_API
@@ -59,36 +59,36 @@
 
 #include "../xrSound/sound.h"
 
-extern ENGINE_API CInifile *pGameIni;
+extern ENGINE_API CInifile* pGameIni;
 
-#pragma comment( lib, "xrCore.lib"	)
-#pragma comment( lib, "xrCDB.lib"	)
-#pragma comment( lib, "xrSound.lib"	)
+#pragma comment( lib, "xrCore.lib" )
+#pragma comment( lib, "xrCDB.lib" )
+#pragma comment( lib, "xrSound.lib" )
 
 #include "lua/library_linkage.h"
 #include "luabind/library_linkage.h"
 
-#pragma comment( lib, "xrAPI.lib"	)
+#pragma comment( lib, "xrAPI.lib" )
 
-#pragma comment( lib, "winmm.lib"		)
+#pragma comment( lib, "winmm.lib" )
 
-#pragma comment( lib, "d3d9.lib"		)
-#pragma comment( lib, "dinput8.lib"		)
-#pragma comment( lib, "dxguid.lib"		)
+#pragma comment( lib, "d3d9.lib" )
+#pragma comment( lib, "dinput8.lib" )
+#pragma comment( lib, "dxguid.lib" )
 
 #ifndef DEBUG
-#	define LUABIND_NO_ERROR_CHECKING
+# define LUABIND_NO_ERROR_CHECKING
 #endif
 
-#if	!defined(DEBUG) || defined(FORCE_NO_EXCEPTIONS)
-#	define LUABIND_NO_EXCEPTIONS
-#	define BOOST_NO_EXCEPTIONS
+#if !defined(DEBUG) || defined(FORCE_NO_EXCEPTIONS)
+# define LUABIND_NO_EXCEPTIONS
+# define BOOST_NO_EXCEPTIONS
 #endif
 
 #define LUABIND_DONT_COPY_STRINGS
 
 #define READ_IF_EXISTS(ltx,method,section,name,default_value)\
-	(((ltx)->line_exist(section, name)) ? ((ltx)->method(section, name)) : (default_value))
+ (((ltx)->line_exist(section, name)) ? ((ltx)->method(section, name)) : (default_value))
 
 #endif // !M_BORLAND
 #endif // !defined STDAFX_3DA
\ No newline at end of file
diff --git a/src/xrEngine/thunderbolt.cpp b/src/xrEngine/thunderbolt.cpp
index 54a8fcd6356..a2a3dde0f51 100644
--- a/src/xrEngine/thunderbolt.cpp
+++ b/src/xrEngine/thunderbolt.cpp
@@ -2,110 +2,111 @@
 #pragma once
 
 #ifndef _EDITOR
-    #include "render.h"
-#endif    
+#include "render.h"
+#endif
 #include "Thunderbolt.h"
 #include "igame_persistent.h"
 #include "LightAnimLibrary.h"
 
 #ifdef _EDITOR
-    #include "ui_toolscustom.h"
+#include "ui_toolscustom.h"
 #else
-	#include "igame_level.h"
-	#include "../xrcdb/xr_area.h"
-	#include "xr_object.h"
+#include "igame_level.h"
+#include "../xrcdb/xr_area.h"
+#include "xr_object.h"
 #endif
 
-SThunderboltDesc::SThunderboltDesc	() :
-	m_GradientTop				(0),
-	m_GradientCenter			(0)
+SThunderboltDesc::SThunderboltDesc() :
+    m_GradientTop(0),
+    m_GradientCenter(0)
 {
 }
 
 SThunderboltDesc::~SThunderboltDesc()
 {
-	m_pRender->DestroyModel		();
-    //::Render->model_Delete	(l_model);
-	m_GradientTop->m_pFlare->DestroyShader();
-	m_GradientCenter->m_pFlare->DestroyShader();
-    //m_GradientTop.hShader.destroy	();
+    m_pRender->DestroyModel();
+    //::Render->model_Delete (l_model);
+    m_GradientTop->m_pFlare->DestroyShader();
+    m_GradientCenter->m_pFlare->DestroyShader();
+    //m_GradientTop.hShader.destroy ();
     //m_GradientCenter.hShader.destroy();
-    snd.destroy					();
+    snd.destroy();
 
-	xr_delete					(m_GradientTop);
-	xr_delete					(m_GradientCenter);
+    xr_delete(m_GradientTop);
+    xr_delete(m_GradientCenter);
 }
 
-void SThunderboltDesc::create_top_gradient		(CInifile& pIni, shared_str const& sect)
+void SThunderboltDesc::create_top_gradient(CInifile& pIni, shared_str const& sect)
 {
-	m_GradientTop				= xr_new<SFlare>();
-    m_GradientTop->shader 		= pIni.r_string		( sect,"gradient_top_shader" );
-    m_GradientTop->texture		= pIni.r_string		( sect,"gradient_top_texture" );
-    m_GradientTop->fRadius		= pIni.r_fvector2	(sect,"gradient_top_radius"  );
-    m_GradientTop->fOpacity		= pIni.r_float		( sect,"gradient_top_opacity" );
-	m_GradientTop->m_pFlare->CreateShader			(*m_GradientTop->shader,*m_GradientTop->texture);
+    m_GradientTop = xr_new<SFlare>();
+    m_GradientTop->shader = pIni.r_string(sect, "gradient_top_shader");
+    m_GradientTop->texture = pIni.r_string(sect, "gradient_top_texture");
+    m_GradientTop->fRadius = pIni.r_fvector2(sect, "gradient_top_radius");
+    m_GradientTop->fOpacity = pIni.r_float(sect, "gradient_top_opacity");
+    m_GradientTop->m_pFlare->CreateShader(*m_GradientTop->shader, *m_GradientTop->texture);
 }
 
-void SThunderboltDesc::create_center_gradient	(CInifile& pIni, shared_str const& sect)
+void SThunderboltDesc::create_center_gradient(CInifile& pIni, shared_str const& sect)
 {
-	m_GradientCenter			= xr_new<SFlare>();
-    m_GradientCenter->shader 	= pIni.r_string		( sect,"gradient_center_shader" );
-    m_GradientCenter->texture	= pIni.r_string		( sect,"gradient_center_texture" );
-    m_GradientCenter->fRadius	= pIni.r_fvector2	(sect,"gradient_center_radius"  );
-    m_GradientCenter->fOpacity 	= pIni.r_float		( sect,"gradient_center_opacity" );
-	m_GradientCenter->m_pFlare->CreateShader		(*m_GradientCenter->shader,*m_GradientCenter->texture);
+    m_GradientCenter = xr_new<SFlare>();
+    m_GradientCenter->shader = pIni.r_string(sect, "gradient_center_shader");
+    m_GradientCenter->texture = pIni.r_string(sect, "gradient_center_texture");
+    m_GradientCenter->fRadius = pIni.r_fvector2(sect, "gradient_center_radius");
+    m_GradientCenter->fOpacity = pIni.r_float(sect, "gradient_center_opacity");
+    m_GradientCenter->m_pFlare->CreateShader(*m_GradientCenter->shader, *m_GradientCenter->texture);
 }
 
-void SThunderboltDesc::load						(CInifile& pIni, shared_str const& sect)
+void SThunderboltDesc::load(CInifile& pIni, shared_str const& sect)
 {
-	create_top_gradient			(pIni, sect);
-	create_center_gradient		(pIni, sect);
+    create_top_gradient(pIni, sect);
+    create_center_gradient(pIni, sect);
 
-	name						= sect;
-	color_anim					= LALib.FindItem (pIni.r_string ( sect,"color_anim" ));
-	VERIFY						(color_anim);
-	color_anim->fFPS			= (float)color_anim->iFrameCount;
+    name = sect;
+    color_anim = LALib.FindItem(pIni.r_string(sect, "color_anim"));
+    VERIFY(color_anim);
+    color_anim->fFPS = (float)color_anim->iFrameCount;
 
     // models
-	LPCSTR m_name;
-	m_name						= pIni.r_string(sect,"lightning_model");
-	m_pRender->CreateModel		(m_name);
+    LPCSTR m_name;
+    m_name = pIni.r_string(sect, "lightning_model");
+    m_pRender->CreateModel(m_name);
 
-	/*
-    IReader* F			= 0;
-	F					= FS.r_open("$game_meshes$",m_name); R_ASSERT2(F,"Empty 'lightning_model'.");
-	l_model				= ::Render->model_CreateDM(F);
-    FS.r_close			(F);
-	*/
+    /*
+    IReader* F = 0;
+    F = FS.r_open("$game_meshes$",m_name); R_ASSERT2(F,"Empty 'lightning_model'.");
+    l_model = ::Render->model_CreateDM(F);
+    FS.r_close (F);
+    */
 
     // sound
-	m_name				= pIni.r_string(sect,"sound");
-    if (m_name&&m_name[0]) snd.create(m_name,st_Effect,sg_Undefined);
+    m_name = pIni.r_string(sect, "sound");
+    if (m_name&&m_name[0]) snd.create(m_name, st_Effect, sg_Undefined);
 }
 
 //----------------------------------------------------------------------------------------------
 // collection
 //----------------------------------------------------------------------------------------------
-SThunderboltCollection::SThunderboltCollection	()
+SThunderboltCollection::SThunderboltCollection()
 {
 }
 
-void SThunderboltCollection::load				(CInifile* pIni, CInifile* thunderbolts, LPCSTR sect)
+void SThunderboltCollection::load(CInifile* pIni, CInifile* thunderbolts, LPCSTR sect)
 {
-	section			= sect;
-	int tb_count	= pIni->line_count(sect);
-	for (int tb_idx=0; tb_idx<tb_count; tb_idx++){
-		LPCSTR		N, V;
-		if (pIni->r_line(sect,tb_idx,&N,&V))
-			palette.push_back	(g_pGamePersistent->Environment().thunderbolt_description(*thunderbolts, N));
-	}
+    section = sect;
+    int tb_count = pIni->line_count(sect);
+    for (int tb_idx = 0; tb_idx < tb_count; tb_idx++)
+    {
+        LPCSTR N, V;
+        if (pIni->r_line(sect, tb_idx, &N, &V))
+            palette.push_back(g_pGamePersistent->Environment().thunderbolt_description(*thunderbolts, N));
+    }
 }
-SThunderboltCollection::~SThunderboltCollection	()
+SThunderboltCollection::~SThunderboltCollection()
 {
-	for (DescIt d_it=palette.begin(); d_it!=palette.end(); d_it++)
-		xr_delete	(*d_it);
+    for (DescIt d_it = palette.begin(); d_it != palette.end(); d_it++)
+        xr_delete(*d_it);
 
-	palette.clear	();
+    palette.clear();
 }
 
 //----------------------------------------------------------------------------------------------
@@ -113,63 +114,66 @@ SThunderboltCollection::~SThunderboltCollection	()
 //----------------------------------------------------------------------------------------------
 CEffect_Thunderbolt::CEffect_Thunderbolt()
 {
-	current		= 0;
-	life_time	= 0.f;
-    state		= stIdle;
+    current = 0;
+    life_time = 0.f;
+    state = stIdle;
     next_lightning_time = 0.f;
-    bEnabled	= FALSE;
+    bEnabled = FALSE;
 
     // geom
-	//hGeom_model.create	(D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1, RCache.Vertex.Buffer(), RCache.Index.Buffer());
-	//hGeom_gradient.create(FVF::F_LIT,RCache.Vertex.Buffer(),RCache.QuadIB);
+    //hGeom_model.create (D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1, RCache.Vertex.Buffer(), RCache.Index.Buffer());
+    //hGeom_gradient.create(FVF::F_LIT,RCache.Vertex.Buffer(),RCache.QuadIB);
 
     // params
-//	p_var_alt		= pSettings->r_fvector2							( "environment","altitude" );  
-//	p_var_alt.x		= deg2rad(p_var_alt.x); p_var_alt.y	= deg2rad(p_var_alt.y);
-//	p_var_long		= deg2rad	(				 pSettings->r_float	( "environment","delta_longitude" ));
-//	p_min_dist		= _min		(.95f,pSettings->r_float	( "environment","min_dist_factor" ));
-//	p_tilt			= deg2rad	(pSettings->r_float					( "environment","tilt" ));
-//	p_second_prop	= pSettings->r_float							( "environment","second_propability" );
-//	clamp			(p_second_prop,0.f,1.f);
-//	p_sky_color		= pSettings->r_float							( "environment","sky_color" );
-//	p_sun_color		= pSettings->r_float							( "environment","sun_color" );
-//	p_fog_color		= pSettings->r_float							( "environment","fog_color" );
+    // p_var_alt = pSettings->r_fvector2 ( "environment","altitude" );
+    // p_var_alt.x = deg2rad(p_var_alt.x); p_var_alt.y = deg2rad(p_var_alt.y);
+    // p_var_long = deg2rad ( pSettings->r_float ( "environment","delta_longitude" ));
+    // p_min_dist = _min (.95f,pSettings->r_float ( "environment","min_dist_factor" ));
+    // p_tilt = deg2rad (pSettings->r_float ( "environment","tilt" ));
+    // p_second_prop = pSettings->r_float ( "environment","second_propability" );
+    // clamp (p_second_prop,0.f,1.f);
+    // p_sky_color = pSettings->r_float ( "environment","sky_color" );
+    // p_sun_color = pSettings->r_float ( "environment","sun_color" );
+    // p_fog_color = pSettings->r_float ( "environment","fog_color" );
 }
 
 CEffect_Thunderbolt::~CEffect_Thunderbolt()
 {
-	for (CollectionVecIt d_it=collection.begin(); d_it!=collection.end(); d_it++)
-    	xr_delete				(*d_it);
-	collection.clear			();
-	//hGeom_model.destroy			();
-	//hGeom_gradient.destroy		();
+    for (CollectionVecIt d_it = collection.begin(); d_it != collection.end(); d_it++)
+        xr_delete(*d_it);
+    collection.clear();
+    //hGeom_model.destroy ();
+    //hGeom_gradient.destroy ();
 }
 
 shared_str CEffect_Thunderbolt::AppendDef(CEnvironment& environment, CInifile* pIni, CInifile* thunderbolts, LPCSTR sect)
 {
-	if (!sect||(0==sect[0])) return "";
-	for (CollectionVecIt it=collection.begin(); it!=collection.end(); it++)
-		if ((*it)->section==sect)	return (*it)->section;
-	collection.push_back		(environment.thunderbolt_collection(pIni, thunderbolts, sect));
-	return collection.back()->section;
+    if (!sect || (0 == sect[0])) return "";
+    for (CollectionVecIt it = collection.begin(); it != collection.end(); it++)
+        if ((*it)->section == sect) return (*it)->section;
+    collection.push_back(environment.thunderbolt_collection(pIni, thunderbolts, sect));
+    return collection.back()->section;
 }
 
 BOOL CEffect_Thunderbolt::RayPick(const Fvector& s, const Fvector& d, float& dist)
 {
-	BOOL bRes 	= TRUE;
+    BOOL bRes = TRUE;
 #ifdef _EDITOR
-    bRes 				= Tools->RayPick	(s,d,dist,0,0);
+    bRes = Tools->RayPick(s, d, dist, 0, 0);
 #else
-	collide::rq_result	RQ;
-	CObject* E 			= g_pGameLevel->CurrentViewEntity();
-	bRes 				= g_pGameLevel->ObjectSpace.RayPick(s,d,dist,collide::rqtBoth,RQ,E);	
-    if (bRes) dist	 	= RQ.range;
-    else{
-        Fvector N	={0.f,-1.f,0.f};
-        Fvector P	={0.f,0.f,0.f};
-        Fplane PL; PL.build(P,N);
-        float dst	=dist;
-        if (PL.intersectRayDist(s,d,dst)&&(dst<=dist)){dist=dst; return true;}else return false;
+    collide::rq_result RQ;
+    CObject* E = g_pGameLevel->CurrentViewEntity();
+    bRes = g_pGameLevel->ObjectSpace.RayPick(s, d, dist, collide::rqtBoth, RQ, E);
+    if (bRes) dist = RQ.range;
+    else
+    {
+        Fvector N = {0.f, -1.f, 0.f};
+        Fvector P = {0.f, 0.f, 0.f};
+        Fplane PL;
+        PL.build(P, N);
+        float dst = dist;
+        if (PL.intersectRayDist(s, d, dst) && (dst <= dist)) { dist = dst; return true; }
+        else return false;
     }
 #endif
     return bRes;
@@ -178,160 +182,169 @@ BOOL CEffect_Thunderbolt::RayPick(const Fvector& s, const Fvector& d, float& dis
 
 void CEffect_Thunderbolt::Bolt(shared_str id, float period, float lt)
 {
-	VERIFY					(id.size());
-	state 		            = stWorking;
-	life_time	            = lt+Random.randF(-lt*0.5f,lt*0.5f);
-    current_time            = 0.f;
-
-    current		            = g_pGamePersistent->Environment().thunderbolt_collection(collection, id)->GetRandomDesc(); VERIFY(current);
-
-    Fmatrix XF,S;
-    Fvector pos,dev;
-    float sun_h, sun_p; 
-	CEnvironment&			environment = g_pGamePersistent->Environment();
-    environment.CurrentEnv->sun_dir.getHP			(sun_h,sun_p);
-    float alt	            = environment.p_var_alt;//Random.randF(environment.p_var_alt.x,environment.p_var_alt.y);
-    float lng	            = Random.randF(sun_h-environment.p_var_long+PI,sun_h+environment.p_var_long+PI); 
-    float dist	            = Random.randF(FAR_DIST*environment.p_min_dist,FAR_DIST*.95f);
-    current_direction.setHP	(lng,alt);
-    pos.mad		            (Device.vCameraPosition,current_direction,dist);
-    dev.x		            = Random.randF(-environment.p_tilt,environment.p_tilt);
-    dev.y		            = Random.randF(0,PI_MUL_2);
-    dev.z		            = Random.randF(-environment.p_tilt,environment.p_tilt);
-    XF.setXYZi	            (dev);               
-
-    Fvector light_dir 		= {0.f,-1.f,0.f};
-    XF.transform_dir		(light_dir);
-    lightning_size			= FAR_DIST*2.f;
-    RayPick					(pos,light_dir,lightning_size);
-
-    lightning_center.mad	(pos,light_dir,lightning_size*0.5f);
-
-    S.scale					(lightning_size,lightning_size,lightning_size);
-    XF.translate_over		(pos);
-    current_xform.mul_43	(XF,S);
-
-    float next_v			= Random.randF();
-
-    if (next_v<environment.p_second_prop){
-	    next_lightning_time = Device.fTimeGlobal+lt+EPS_L;
-    }else{
-	    next_lightning_time = Device.fTimeGlobal+period+Random.randF(-period*0.3f,period*0.3f);
-		current->snd.play_no_feedback		(0,0,dist/300.f,&pos,0,0,&Fvector2().set(dist/2,dist*2.f));
+    VERIFY(id.size());
+    state = stWorking;
+    life_time = lt + Random.randF(-lt*0.5f, lt*0.5f);
+    current_time = 0.f;
+
+    current = g_pGamePersistent->Environment().thunderbolt_collection(collection, id)->GetRandomDesc();
+    VERIFY(current);
+
+    Fmatrix XF, S;
+    Fvector pos, dev;
+    float sun_h, sun_p;
+    CEnvironment& environment = g_pGamePersistent->Environment();
+    environment.CurrentEnv->sun_dir.getHP(sun_h, sun_p);
+    float alt = environment.p_var_alt;//Random.randF(environment.p_var_alt.x,environment.p_var_alt.y);
+    float lng = Random.randF(sun_h - environment.p_var_long + PI, sun_h + environment.p_var_long + PI);
+    float dist = Random.randF(FAR_DIST*environment.p_min_dist, FAR_DIST*.95f);
+    current_direction.setHP(lng, alt);
+    pos.mad(Device.vCameraPosition, current_direction, dist);
+    dev.x = Random.randF(-environment.p_tilt, environment.p_tilt);
+    dev.y = Random.randF(0, PI_MUL_2);
+    dev.z = Random.randF(-environment.p_tilt, environment.p_tilt);
+    XF.setXYZi(dev);
+
+    Fvector light_dir = {0.f, -1.f, 0.f};
+    XF.transform_dir(light_dir);
+    lightning_size = FAR_DIST*2.f;
+    RayPick(pos, light_dir, lightning_size);
+
+    lightning_center.mad(pos, light_dir, lightning_size*0.5f);
+
+    S.scale(lightning_size, lightning_size, lightning_size);
+    XF.translate_over(pos);
+    current_xform.mul_43(XF, S);
+
+    float next_v = Random.randF();
+
+    if (next_v < environment.p_second_prop)
+    {
+        next_lightning_time = Device.fTimeGlobal + lt + EPS_L;
+    }
+    else
+    {
+        next_lightning_time = Device.fTimeGlobal + period + Random.randF(-period*0.3f, period*0.3f);
+        current->snd.play_no_feedback(0, 0, dist / 300.f, &pos, 0, 0, &Fvector2().set(dist / 2, dist*2.f));
     }
 
 
-	current_direction.invert			();	// for env-sun
+    current_direction.invert(); // for env-sun
 }
 
 void CEffect_Thunderbolt::OnFrame(shared_str id, float period, float duration)
 {
-	BOOL enabled			= !!(id.size());
-	if (bEnabled!=enabled){
-    	bEnabled			= enabled;
-	    next_lightning_time = Device.fTimeGlobal+period+Random.randF(-period*0.5f,period*0.5f);
-    }else if (bEnabled&&(Device.fTimeGlobal>next_lightning_time)){ 
-    	if (state==stIdle && !!(id.size())) Bolt(id,period,duration);
+    BOOL enabled = !!(id.size());
+    if (bEnabled != enabled)
+    {
+        bEnabled = enabled;
+        next_lightning_time = Device.fTimeGlobal + period + Random.randF(-period*0.5f, period*0.5f);
+    }
+    else if (bEnabled && (Device.fTimeGlobal > next_lightning_time))
+    {
+        if (state == stIdle && !!(id.size())) Bolt(id, period, duration);
     }
-	if (state==stWorking){
-    	if (current_time>life_time) state = stIdle;
-    	current_time	+= Device.fTimeDelta;
-		Fvector fClr;		
-		int frame;
-		u32 uClr		= current->color_anim->CalculateRGB(current_time/life_time,frame);
-		fClr.set		(
-			clampr(float(color_get_R(uClr)/255.f), 0.f, 1.f),
-			clampr(float(color_get_G(uClr)/255.f), 0.f, 1.f),
-			clampr(float(color_get_B(uClr)/255.f), 0.f, 1.f)
-		);
-
-        lightning_phase	= 1.5f*(current_time/life_time);
-        clamp			(lightning_phase,0.f,1.f);
-
-		CEnvironment&	environment = g_pGamePersistent->Environment();
-		
-		Fvector&		sky_color = environment.CurrentEnv->sky_color;
-        sky_color.mad	( fClr, environment.p_sky_color );
-		clamp			( sky_color.x, 0.f, 1.f );
-		clamp			( sky_color.y, 0.f, 1.f );
-		clamp			( sky_color.z, 0.f, 1.f );
-
-        environment.CurrentEnv->sun_color.mad(fClr,environment.p_sun_color);
-		environment.CurrentEnv->fog_color.mad(fClr,environment.p_fog_color);
-
-		if (::Render->get_generation()==IRender_interface::GENERATION_R2)	{
-			R_ASSERT	( _valid(current_direction) );
-			g_pGamePersistent->Environment().CurrentEnv->sun_dir = current_direction;
-			VERIFY2(g_pGamePersistent->Environment().CurrentEnv->sun_dir.y<0,"Invalid sun direction settings while CEffect_Thunderbolt");
-
-		} 
+    if (state == stWorking)
+    {
+        if (current_time > life_time) state = stIdle;
+        current_time += Device.fTimeDelta;
+        Fvector fClr;
+        int frame;
+        u32 uClr = current->color_anim->CalculateRGB(current_time / life_time, frame);
+        fClr.set(
+            clampr(float(color_get_R(uClr) / 255.f), 0.f, 1.f),
+            clampr(float(color_get_G(uClr) / 255.f), 0.f, 1.f),
+            clampr(float(color_get_B(uClr) / 255.f), 0.f, 1.f)
+        );
+
+        lightning_phase = 1.5f*(current_time / life_time);
+        clamp(lightning_phase, 0.f, 1.f);
+
+        CEnvironment& environment = g_pGamePersistent->Environment();
+
+        Fvector& sky_color = environment.CurrentEnv->sky_color;
+        sky_color.mad(fClr, environment.p_sky_color);
+        clamp(sky_color.x, 0.f, 1.f);
+        clamp(sky_color.y, 0.f, 1.f);
+        clamp(sky_color.z, 0.f, 1.f);
+
+        environment.CurrentEnv->sun_color.mad(fClr, environment.p_sun_color);
+        environment.CurrentEnv->fog_color.mad(fClr, environment.p_fog_color);
+
+        if (::Render->get_generation() == IRender_interface::GENERATION_R2)
+        {
+            R_ASSERT(_valid(current_direction));
+            g_pGamePersistent->Environment().CurrentEnv->sun_dir = current_direction;
+            VERIFY2(g_pGamePersistent->Environment().CurrentEnv->sun_dir.y < 0, "Invalid sun direction settings while CEffect_Thunderbolt");
+
+        }
     }
 }
 
 void CEffect_Thunderbolt::Render()
-{                  
-	if (state==stWorking)
-	{
-		m_pRender->Render(*this);
+{
+    if (state == stWorking)
+    {
+        m_pRender->Render(*this);
 
-		/*
-    	VERIFY	(current);
+        /*
+        VERIFY (current);
 
         // lightning model
-        float dv			= lightning_phase*0.5f;
-        dv					= (lightning_phase>0.5f)?Random.randI(2)*0.5f:dv;
-
-		RCache.set_CullMode	(CULL_NONE);
-        u32					v_offset,i_offset;
-        u32					vCount_Lock		= current->l_model->number_vertices;
-        u32					iCount_Lock		= current->l_model->number_indices;
-        IRender_DetailModel::fvfVertexOut* v_ptr= (IRender_DetailModel::fvfVertexOut*) 	RCache.Vertex.Lock	(vCount_Lock, hGeom_model->vb_stride, v_offset);
-        u16*				i_ptr				=										RCache.Index.Lock	(iCount_Lock, i_offset);
+        float dv = lightning_phase*0.5f;
+        dv = (lightning_phase>0.5f)?Random.randI(2)*0.5f:dv;
+
+        RCache.set_CullMode (CULL_NONE);
+        u32 v_offset,i_offset;
+        u32 vCount_Lock = current->l_model->number_vertices;
+        u32 iCount_Lock = current->l_model->number_indices;
+        IRender_DetailModel::fvfVertexOut* v_ptr= (IRender_DetailModel::fvfVertexOut*) RCache.Vertex.Lock (vCount_Lock, hGeom_model->vb_stride, v_offset);
+        u16* i_ptr = RCache.Index.Lock (iCount_Lock, i_offset);
         // XForm verts
         current->l_model->transfer(current_xform,v_ptr,0xffffffff,i_ptr,0,0.f,dv);
         // Flush if needed
         RCache.Vertex.Unlock(vCount_Lock,hGeom_model->vb_stride);
-        RCache.Index.Unlock	(iCount_Lock);
+        RCache.Index.Unlock (iCount_Lock);
         RCache.set_xform_world(Fidentity);
-        RCache.set_Shader	(current->l_model->shader);
-        RCache.set_Geometry	(hGeom_model);
-        RCache.Render		(D3DPT_TRIANGLELIST,v_offset,0,vCount_Lock,i_offset,iCount_Lock/3);
-		RCache.set_CullMode	(CULL_CCW);
+        RCache.set_Shader (current->l_model->shader);
+        RCache.set_Geometry (hGeom_model);
+        RCache.Render (D3DPT_TRIANGLELIST,v_offset,0,vCount_Lock,i_offset,iCount_Lock/3);
+        RCache.set_CullMode (CULL_CCW);
 
         // gradient
-        Fvector				vecSx, vecSy;
-        u32					VS_Offset;
-        FVF::LIT *pv		= (FVF::LIT*) RCache.Vertex.Lock(8,hGeom_gradient.stride(),VS_Offset);
+        Fvector vecSx, vecSy;
+        u32 VS_Offset;
+        FVF::LIT *pv = (FVF::LIT*) RCache.Vertex.Lock(8,hGeom_gradient.stride(),VS_Offset);
         // top
         {
-            u32 c_val		= iFloor(current->m_GradientTop.fOpacity*lightning_phase*255.f);
-            u32 c			= color_rgba(c_val,c_val,c_val,c_val);
-            vecSx.mul		(Device.vCameraRight, 	current->m_GradientTop.fRadius.x*lightning_size);
-            vecSy.mul		(Device.vCameraTop, 	-current->m_GradientTop.fRadius.y*lightning_size);
-            pv->set			(current_xform.c.x+vecSx.x-vecSy.x, current_xform.c.y+vecSx.y-vecSy.y, current_xform.c.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
-            pv->set			(current_xform.c.x+vecSx.x+vecSy.x, current_xform.c.y+vecSx.y+vecSy.y, current_xform.c.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
-            pv->set			(current_xform.c.x-vecSx.x-vecSy.x, current_xform.c.y-vecSx.y-vecSy.y, current_xform.c.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
-            pv->set			(current_xform.c.x-vecSx.x+vecSy.x, current_xform.c.y-vecSx.y+vecSy.y, current_xform.c.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
+        u32 c_val = iFloor(current->m_GradientTop.fOpacity*lightning_phase*255.f);
+        u32 c = color_rgba(c_val,c_val,c_val,c_val);
+        vecSx.mul (Device.vCameraRight, current->m_GradientTop.fRadius.x*lightning_size);
+        vecSy.mul (Device.vCameraTop, -current->m_GradientTop.fRadius.y*lightning_size);
+        pv->set (current_xform.c.x+vecSx.x-vecSy.x, current_xform.c.y+vecSx.y-vecSy.y, current_xform.c.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
+        pv->set (current_xform.c.x+vecSx.x+vecSy.x, current_xform.c.y+vecSx.y+vecSy.y, current_xform.c.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
+        pv->set (current_xform.c.x-vecSx.x-vecSy.x, current_xform.c.y-vecSx.y-vecSy.y, current_xform.c.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
+        pv->set (current_xform.c.x-vecSx.x+vecSy.x, current_xform.c.y-vecSx.y+vecSy.y, current_xform.c.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
         }
         // center
         {
-            u32 c_val		= iFloor(current->m_GradientTop.fOpacity*lightning_phase*255.f);
-            u32 c			= color_rgba(c_val,c_val,c_val,c_val);
-            vecSx.mul		(Device.vCameraRight, 	current->m_GradientCenter.fRadius.x*lightning_size);
-            vecSy.mul		(Device.vCameraTop, 	-current->m_GradientCenter.fRadius.y*lightning_size);
-            pv->set			(lightning_center.x+vecSx.x-vecSy.x, lightning_center.y+vecSx.y-vecSy.y, lightning_center.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
-            pv->set			(lightning_center.x+vecSx.x+vecSy.x, lightning_center.y+vecSx.y+vecSy.y, lightning_center.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
-            pv->set			(lightning_center.x-vecSx.x-vecSy.x, lightning_center.y-vecSx.y-vecSy.y, lightning_center.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
-            pv->set			(lightning_center.x-vecSx.x+vecSy.x, lightning_center.y-vecSx.y+vecSy.y, lightning_center.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
+        u32 c_val = iFloor(current->m_GradientTop.fOpacity*lightning_phase*255.f);
+        u32 c = color_rgba(c_val,c_val,c_val,c_val);
+        vecSx.mul (Device.vCameraRight, current->m_GradientCenter.fRadius.x*lightning_size);
+        vecSy.mul (Device.vCameraTop, -current->m_GradientCenter.fRadius.y*lightning_size);
+        pv->set (lightning_center.x+vecSx.x-vecSy.x, lightning_center.y+vecSx.y-vecSy.y, lightning_center.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
+        pv->set (lightning_center.x+vecSx.x+vecSy.x, lightning_center.y+vecSx.y+vecSy.y, lightning_center.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
+        pv->set (lightning_center.x-vecSx.x-vecSy.x, lightning_center.y-vecSx.y-vecSy.y, lightning_center.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
+        pv->set (lightning_center.x-vecSx.x+vecSy.x, lightning_center.y-vecSx.y+vecSy.y, lightning_center.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
         }
-        RCache.Vertex.Unlock	(8,hGeom_gradient.stride());
-        RCache.set_xform_world	(Fidentity);
-        RCache.set_Geometry		(hGeom_gradient);
-        RCache.set_Shader		(current->m_GradientTop.hShader);
-        RCache.Render			(D3DPT_TRIANGLELIST,VS_Offset, 0,4,0,2);
-        RCache.set_Shader		(current->m_GradientCenter.hShader);
-        RCache.Render			(D3DPT_TRIANGLELIST,VS_Offset+4, 0,4,0,2);
-		*/
+        RCache.Vertex.Unlock (8,hGeom_gradient.stride());
+        RCache.set_xform_world (Fidentity);
+        RCache.set_Geometry (hGeom_gradient);
+        RCache.set_Shader (current->m_GradientTop.hShader);
+        RCache.Render (D3DPT_TRIANGLELIST,VS_Offset, 0,4,0,2);
+        RCache.set_Shader (current->m_GradientCenter.hShader);
+        RCache.Render (D3DPT_TRIANGLELIST,VS_Offset+4, 0,4,0,2);
+        */
     }
 }
 
diff --git a/src/xrEngine/thunderbolt.h b/src/xrEngine/thunderbolt.h
index 290bda35b42..a08e8287af3 100644
--- a/src/xrEngine/thunderbolt.h
+++ b/src/xrEngine/thunderbolt.h
@@ -16,111 +16,111 @@ class ENGINE_API CLAItem;
 #include "../Include/xrRender/ThunderboltRender.h"
 
 #ifdef INGAME_EDITOR
-#	define	INGAME_EDITOR_VIRTUAL	virtual
+# define INGAME_EDITOR_VIRTUAL virtual
 #else // #ifdef INGAME_EDITOR
-#	define	INGAME_EDITOR_VIRTUAL
+# define INGAME_EDITOR_VIRTUAL
 #endif // #ifdef INGAME_EDITOR
 
 class CEnvironment;
 
 struct SThunderboltDesc
 {
-	// geom
-	//IRender_DetailModel*		l_model;
-	FactoryPtr<IThunderboltDescRender>	m_pRender;
+    // geom
+    //IRender_DetailModel* l_model;
+    FactoryPtr<IThunderboltDescRender> m_pRender;
     // sound
-    ref_sound					snd;
+    ref_sound snd;
     // gradient
-	struct SFlare
-	{
-    	float					fOpacity;
-	    Fvector2				fRadius;
-        shared_str				texture;
-        shared_str				shader;
-        //ref_shader				hShader;
-		FactoryPtr<IFlareRender>	m_pFlare;
-    	SFlare()				{ fOpacity = 0; fRadius.set(0.f,0.f);}
-	};
-    SFlare*						m_GradientTop;
-    SFlare*						m_GradientCenter;
-    shared_str					name;
-	CLAItem*					color_anim;
+    struct SFlare
+    {
+        float fOpacity;
+        Fvector2 fRadius;
+        shared_str texture;
+        shared_str shader;
+        //ref_shader hShader;
+        FactoryPtr<IFlareRender> m_pFlare;
+        SFlare() { fOpacity = 0; fRadius.set(0.f, 0.f); }
+    };
+    SFlare* m_GradientTop;
+    SFlare* m_GradientCenter;
+    shared_str name;
+    CLAItem* color_anim;
 public:
-								SThunderboltDesc		();
-	INGAME_EDITOR_VIRTUAL	    ~SThunderboltDesc		();
-						  void	load					(CInifile& pIni, shared_str const& sect);
-	INGAME_EDITOR_VIRTUAL void	create_top_gradient		(CInifile& pIni, shared_str const& sect);
-	INGAME_EDITOR_VIRTUAL void	create_center_gradient	(CInifile& pIni, shared_str const& sect);
+    SThunderboltDesc();
+    INGAME_EDITOR_VIRTUAL ~SThunderboltDesc();
+    void load(CInifile& pIni, shared_str const& sect);
+    INGAME_EDITOR_VIRTUAL void create_top_gradient(CInifile& pIni, shared_str const& sect);
+    INGAME_EDITOR_VIRTUAL void create_center_gradient(CInifile& pIni, shared_str const& sect);
 };
 
 #undef INGAME_EDITOR_VIRTUAL
 
 struct SThunderboltCollection
 {
-	DEFINE_VECTOR(SThunderboltDesc*,DescVec,DescIt);
-	DescVec			  			palette;
-	shared_str					section;
+    DEFINE_VECTOR(SThunderboltDesc*, DescVec, DescIt);
+    DescVec palette;
+    shared_str section;
 public:
-								SThunderboltCollection	();
-								~SThunderboltCollection	();
-						void	load					(CInifile* pIni, CInifile* thunderbolts, LPCSTR sect);
-	SThunderboltDesc*			GetRandomDesc			(){VERIFY(palette.size()>0); return palette[Random.randI(palette.size())];}
+    SThunderboltCollection();
+    ~SThunderboltCollection();
+    void load(CInifile* pIni, CInifile* thunderbolts, LPCSTR sect);
+    SThunderboltDesc* GetRandomDesc() { VERIFY(palette.size() > 0); return palette[Random.randI(palette.size())]; }
 };
 
-#define THUNDERBOLT_CACHE_SIZE	8
+#define THUNDERBOLT_CACHE_SIZE 8
 //
 class ENGINE_API CEffect_Thunderbolt
 {
-	friend class dxThunderboltRender;
+    friend class dxThunderboltRender;
 protected:
-	DEFINE_VECTOR(SThunderboltCollection*,CollectionVec,CollectionVecIt);
-	CollectionVec				collection;
-	SThunderboltDesc*			current;
+    DEFINE_VECTOR(SThunderboltCollection*, CollectionVec, CollectionVecIt);
+    CollectionVec collection;
+    SThunderboltDesc* current;
 private:
-    Fmatrix				  		current_xform;
-	Fvector3					current_direction;
+    Fmatrix current_xform;
+    Fvector3 current_direction;
 
-	FactoryPtr<IThunderboltRender>	m_pRender;
-	//ref_geom			  		hGeom_model;
+    FactoryPtr<IThunderboltRender> m_pRender;
+    //ref_geom hGeom_model;
     // states
-	enum EState
-	{
+    enum EState
+    {
         stIdle,
-		stWorking
-	};
-	EState						state;
+        stWorking
+    };
+    EState state;
 
-	//ref_geom			  		hGeom_gradient;
+    //ref_geom hGeom_gradient;
 
-    Fvector						lightning_center;
-    float						lightning_size;
-    float						lightning_phase;
+    Fvector lightning_center;
+    float lightning_size;
+    float lightning_phase;
 
-    float						life_time;
-    float						current_time;
-    float						next_lightning_time;
-	BOOL						bEnabled;
+    float life_time;
+    float current_time;
+    float next_lightning_time;
+    BOOL bEnabled;
 
     // params
-//	Fvector2					p_var_alt;
-//	float						p_var_long;
-//	float						p_min_dist;
-//	float						p_tilt;
-//	float						p_second_prop;
-//	float						p_sky_color;
-//	float						p_sun_color;
-//	float						p_fog_color;
+    // Fvector2 p_var_alt;
+    // float p_var_long;
+    // float p_min_dist;
+    // float p_tilt;
+    // float p_second_prop;
+    // float p_sky_color;
+    // float p_sun_color;
+    // float p_fog_color;
 private:
-	BOOL						RayPick				(const Fvector& s, const Fvector& d, float& range);
-    void						Bolt				(shared_str id, float period, float life_time);
-public:                     
-								CEffect_Thunderbolt	(); 
-								~CEffect_Thunderbolt();
+    BOOL RayPick(const Fvector& s, const Fvector& d, float& range);
+    void Bolt(shared_str id, float period, float life_time);
+public:
+    CEffect_Thunderbolt();
+    ~CEffect_Thunderbolt();
 
-	void						OnFrame				(shared_str id,float period, float duration);
-	void						Render				();
+    void OnFrame(shared_str id, float period, float duration);
+    void Render();
 
-	shared_str 					AppendDef			(CEnvironment& environment, CInifile* pIni, CInifile* thunderbolts, LPCSTR sect);
+    shared_str AppendDef(CEnvironment& environment, CInifile* pIni, CInifile* thunderbolts, LPCSTR sect);
 };
 
 #endif //ThunderboltH
\ No newline at end of file
diff --git a/src/xrEngine/tntQAVI.cpp b/src/xrEngine/tntQAVI.cpp
index bdc5f14c483..799f04ddbd0 100644
--- a/src/xrEngine/tntQAVI.cpp
+++ b/src/xrEngine/tntQAVI.cpp
@@ -5,292 +5,321 @@
 
 #include "tntQAVI.h"
 
-CAviPlayerCustom::CAviPlayerCustom( )
+CAviPlayerCustom::CAviPlayerCustom()
 {
-	ZeroMemory( this, sizeof(*this) );
-	m_dwFrameCurrent	= 0xfffffffd;	// ñòðàõóåìñÿ îò 0xffffffff + 1 == 0
-	m_dwFirstFrameOffset=0;
+    ZeroMemory(this, sizeof(*this));
+    m_dwFrameCurrent = 0xfffffffd; // ñòðàõóåìñÿ îò 0xffffffff + 1 == 0
+    m_dwFirstFrameOffset = 0;
 }
 
-CAviPlayerCustom::~CAviPlayerCustom( )
+CAviPlayerCustom::~CAviPlayerCustom()
 {
-	if( m_aviIC ) {
+    if (m_aviIC)
+    {
 
-		ICDecompressEnd( m_aviIC );
-		ICClose( m_aviIC );
-	}
+        ICDecompressEnd(m_aviIC);
+        ICClose(m_aviIC);
+    }
 
-	if( m_pDecompressedBuf )	xr_free( m_pDecompressedBuf );
+    if (m_pDecompressedBuf) xr_free(m_pDecompressedBuf);
 
-	if( m_pMovieData )	xr_free( m_pMovieData );
-	if( m_pMovieIndex ) xr_free( m_pMovieIndex );
+    if (m_pMovieData) xr_free(m_pMovieData);
+    if (m_pMovieIndex) xr_free(m_pMovieIndex);
 
-	xr_delete(alpha);
+    xr_delete(alpha);
 }
 
 //---------------------------------
-BOOL CAviPlayerCustom::Load (char* fname)
+BOOL CAviPlayerCustom::Load(char* fname)
 {
-	// Check for alpha
-	string_path		aname;
-	strconcat		(sizeof(aname),aname,fname,"_alpha");
-	if (FS.exist(aname))	
-	{
-		alpha		= xr_new<CAviPlayerCustom>	();
-		alpha->Load	(aname);
-	}
-
-	// Îòêðûòü ÷åðåç mmioOpen( ) AVI ôàéë
-	HMMIO hmmioFile = mmioOpen( fname, NULL, MMIO_READ /*MMIO_EXCLUSIVE*/ );
-	if( hmmioFile == NULL ) {
-
-		return FALSE;
-	}
-
-	// Íàéòè ÷àíê FOURCC('movi')
-
-	MMCKINFO mmckinfoParent;
-	ZeroMemory( &mmckinfoParent, sizeof(mmckinfoParent) );
-	mmckinfoParent.fccType = mmioFOURCC('A', 'V', 'I', ' ');
-	MMRESULT res;
-	if( MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDRIFF)) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	ZeroMemory( &mmckinfoParent, sizeof(mmckinfoParent) );
-	mmckinfoParent.fccType = mmioFOURCC('h', 'd', 'r', 'l'); 
-	if( MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDLIST)) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-//-------------------------------------------------------------------
-	//++strl
-	ZeroMemory( &mmckinfoParent, sizeof(mmckinfoParent) );
-	mmckinfoParent.fccType = mmioFOURCC('s', 't', 'r', 'l'); 
-	if( MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDLIST)) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	//++strh
-	ZeroMemory( &mmckinfoParent, sizeof(mmckinfoParent) );
-	mmckinfoParent.fccType = mmioFOURCC('s', 't', 'r', 'h'); 
-	if( MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDCHUNK)) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	AVIStreamHeaderCustom	strh;
-	ZeroMemory( &strh, sizeof(strh) );
-	if( mmckinfoParent.cksize != (DWORD)mmioRead(hmmioFile, (HPSTR)&strh, mmckinfoParent.cksize) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-
-
-    AVIFileInit		();
-	PAVIFILE aviFile = 0;
-	if( AVIERR_OK != AVIFileOpen( &aviFile, fname, OF_READ, 0 ) )	return FALSE;
-
-	AVIFILEINFO		aviInfo;
-	ZeroMemory		(&aviInfo,sizeof(aviInfo));
-	if( AVIERR_OK != AVIFileInfo( aviFile, &aviInfo, sizeof(aviInfo) ) ){
-		AVIFileRelease( aviFile );
-		return FALSE;
-	}
-
-	m_dwFrameTotal	= aviInfo.dwLength;
-	m_fCurrentRate	= (float) aviInfo.dwRate / (float)aviInfo.dwScale;
-
-	m_dwWidth			= aviInfo.dwWidth;
-	m_dwHeight		= aviInfo.dwHeight;
-
-	AVIFileRelease( aviFile );
-
-	R_ASSERT			( m_dwWidth && m_dwHeight );
-
-	m_pDecompressedBuf	= (BYTE *)xr_malloc( m_dwWidth * m_dwHeight * 4 + 4);
-
-	//++strf
-	ZeroMemory( &mmckinfoParent, sizeof(mmckinfoParent) );
-	mmckinfoParent.fccType = mmioFOURCC('s', 't', 'r', 'f'); 
-	if( MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDCHUNK)) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	// ïîëó÷àåì âõîäíîé ôîðìàò äåêîìïðåññîðà â BITMAPINFOHEADER
-	if( mmckinfoParent.cksize != (DWORD)mmioRead(hmmioFile, (HPSTR)&m_biInFormat, mmckinfoParent.cksize) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	// ñîçäàåì âûõîäíîé ôîðìàò äåêîìïðåññîðà	(xRGB)
-	m_biOutFormat.biSize	= sizeof( m_biOutFormat );
-	m_biOutFormat.biBitCount= 32;
-	m_biOutFormat.biCompression	= BI_RGB;
-	m_biOutFormat.biPlanes	= 1;
-	m_biOutFormat.biWidth	= m_dwWidth;
-	m_biOutFormat.biHeight	= m_dwHeight;
-	m_biOutFormat.biSizeImage = m_dwWidth * m_dwHeight * 4;
-
-	// Íàéòè ïîäõîäÿùèé äåêîìïðåññîð
-	m_aviIC = ICLocate( ICTYPE_VIDEO, NULL, &m_biInFormat, &m_biOutFormat, \
-						// ICMODE_DECOMPRESS
-						ICMODE_FASTDECOMPRESS
-						);
-	if( m_aviIC == 0 ) {
-
-		return FALSE;
-	}
-
-	// Ïðîèíèòèòü äåêîìïðåññîð
-	if( ICERR_OK != ICDecompressBegin(m_aviIC, &m_biInFormat, &m_biOutFormat) ) {
-
-		return FALSE;
-	}
-
-	//--strf
-	if( MMSYSERR_NOERROR != mmioAscend( hmmioFile, &mmckinfoParent, 0 ) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	//--strh
-	if( MMSYSERR_NOERROR != mmioAscend( hmmioFile, &mmckinfoParent, 0 ) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	//--strl
-	if( MMSYSERR_NOERROR != mmioAscend( hmmioFile, &mmckinfoParent, 0 ) ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-//-------------------------------------------------------------------
-	MMCKINFO mmckinfoSubchunk;
-	ZeroMemory( &mmckinfoSubchunk, sizeof(mmckinfoSubchunk) );
-	mmckinfoSubchunk.fccType = mmioFOURCC('m', 'o', 'v', 'i'); 
-	if( MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoSubchunk, NULL, MMIO_FINDLIST)) \
-		|| mmckinfoSubchunk.cksize <= 4 )
-	{
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	mmioSeek( hmmioFile, mmckinfoSubchunk.dwDataOffset, SEEK_SET );
-	
-	// Âûäåëèòü ïàìÿòü ïîä ñæàòûå  äàííûå âñåãî êëèïà
-	m_pMovieData = (BYTE *)xr_malloc( mmckinfoSubchunk.cksize );
-	if( m_pMovieData == NULL ) {
-
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	if( mmckinfoSubchunk.cksize != (DWORD)mmioRead( hmmioFile, (HPSTR)m_pMovieData, mmckinfoSubchunk.cksize ) ) {
-
-		xr_free( m_pMovieData );	m_pMovieData	= NULL;
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	if( MMSYSERR_NOERROR != mmioAscend( hmmioFile, &mmckinfoSubchunk, 0 ) ) {
-
-		xr_free( m_pMovieData );	m_pMovieData	= NULL;
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	// Íàéòè ÷àíê FOURCC('idx1')
-	ZeroMemory( &mmckinfoSubchunk, sizeof(mmckinfoSubchunk) );
-	mmckinfoSubchunk.fccType = mmioFOURCC('i', 'd', 'x', '1'); 
-
-	if( MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoSubchunk, NULL, MMIO_FINDCHUNK)) \
-		|| mmckinfoSubchunk.cksize <= 4 )
-	{
-		xr_free( m_pMovieData );	m_pMovieData	= NULL;
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	// Âûäåëèòü ïàìÿòü ïîä èíäåêñ
-	m_pMovieIndex = (AVIINDEXENTRY *)xr_malloc( mmckinfoSubchunk.cksize );
-	if( m_pMovieIndex == NULL ) {
-
-		xr_free( m_pMovieData );	m_pMovieData	= NULL;
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	if( mmckinfoSubchunk.cksize != (DWORD)mmioRead( hmmioFile, (HPSTR)m_pMovieIndex, mmckinfoSubchunk.cksize ) ) {
-
-		xr_free( m_pMovieIndex );	m_pMovieIndex	= NULL;
-		xr_free( m_pMovieData );	m_pMovieData	= NULL;
-		mmioClose( hmmioFile, 0 );
-		return FALSE;
-	}
-
-	// Çàêðûòü AVI ôàéë ÷åðåç mmioClose( )
-	mmioClose( hmmioFile, 0 );
-
-	if (alpha)	{
-		R_ASSERT(m_dwWidth  == alpha->m_dwWidth	);
-		R_ASSERT(m_dwHeight == alpha->m_dwHeight);
-	}
-
-//-----------------------------------------------------------------
-	return TRUE;
+    // Check for alpha
+    string_path aname;
+    strconcat(sizeof(aname), aname, fname, "_alpha");
+    if (FS.exist(aname))
+    {
+        alpha = xr_new<CAviPlayerCustom>();
+        alpha->Load(aname);
+    }
+
+    // Îòêðûòü ÷åðåç mmioOpen( ) AVI ôàéë
+    HMMIO hmmioFile = mmioOpen(fname, NULL, MMIO_READ /*MMIO_EXCLUSIVE*/);
+    if (hmmioFile == NULL)
+    {
+
+        return FALSE;
+    }
+
+    // Íàéòè ÷àíê FOURCC('movi')
+
+    MMCKINFO mmckinfoParent;
+    ZeroMemory(&mmckinfoParent, sizeof(mmckinfoParent));
+    mmckinfoParent.fccType = mmioFOURCC('A', 'V', 'I', ' ');
+    MMRESULT res;
+    if (MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDRIFF)))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    ZeroMemory(&mmckinfoParent, sizeof(mmckinfoParent));
+    mmckinfoParent.fccType = mmioFOURCC('h', 'd', 'r', 'l');
+    if (MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDLIST)))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+    //-------------------------------------------------------------------
+    //++strl
+    ZeroMemory(&mmckinfoParent, sizeof(mmckinfoParent));
+    mmckinfoParent.fccType = mmioFOURCC('s', 't', 'r', 'l');
+    if (MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDLIST)))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    //++strh
+    ZeroMemory(&mmckinfoParent, sizeof(mmckinfoParent));
+    mmckinfoParent.fccType = mmioFOURCC('s', 't', 'r', 'h');
+    if (MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDCHUNK)))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    AVIStreamHeaderCustom strh;
+    ZeroMemory(&strh, sizeof(strh));
+    if (mmckinfoParent.cksize != (DWORD)mmioRead(hmmioFile, (HPSTR)&strh, mmckinfoParent.cksize))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+
+
+    AVIFileInit();
+    PAVIFILE aviFile = 0;
+    if (AVIERR_OK != AVIFileOpen(&aviFile, fname, OF_READ, 0)) return FALSE;
+
+    AVIFILEINFO aviInfo;
+    ZeroMemory(&aviInfo, sizeof(aviInfo));
+    if (AVIERR_OK != AVIFileInfo(aviFile, &aviInfo, sizeof(aviInfo)))
+    {
+        AVIFileRelease(aviFile);
+        return FALSE;
+    }
+
+    m_dwFrameTotal = aviInfo.dwLength;
+    m_fCurrentRate = (float)aviInfo.dwRate / (float)aviInfo.dwScale;
+
+    m_dwWidth = aviInfo.dwWidth;
+    m_dwHeight = aviInfo.dwHeight;
+
+    AVIFileRelease(aviFile);
+
+    R_ASSERT(m_dwWidth && m_dwHeight);
+
+    m_pDecompressedBuf = (BYTE*)xr_malloc(m_dwWidth * m_dwHeight * 4 + 4);
+
+    //++strf
+    ZeroMemory(&mmckinfoParent, sizeof(mmckinfoParent));
+    mmckinfoParent.fccType = mmioFOURCC('s', 't', 'r', 'f');
+    if (MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoParent, NULL, MMIO_FINDCHUNK)))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    // ïîëó÷àåì âõîäíîé ôîðìàò äåêîìïðåññîðà â BITMAPINFOHEADER
+    if (mmckinfoParent.cksize != (DWORD)mmioRead(hmmioFile, (HPSTR)&m_biInFormat, mmckinfoParent.cksize))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    // ñîçäàåì âûõîäíîé ôîðìàò äåêîìïðåññîðà (xRGB)
+    m_biOutFormat.biSize = sizeof(m_biOutFormat);
+    m_biOutFormat.biBitCount = 32;
+    m_biOutFormat.biCompression = BI_RGB;
+    m_biOutFormat.biPlanes = 1;
+    m_biOutFormat.biWidth = m_dwWidth;
+    m_biOutFormat.biHeight = m_dwHeight;
+    m_biOutFormat.biSizeImage = m_dwWidth * m_dwHeight * 4;
+
+    // Íàéòè ïîäõîäÿùèé äåêîìïðåññîð
+    m_aviIC = ICLocate(ICTYPE_VIDEO, NULL, &m_biInFormat, &m_biOutFormat, \
+                       // ICMODE_DECOMPRESS
+                       ICMODE_FASTDECOMPRESS
+                      );
+    if (m_aviIC == 0)
+    {
+
+        return FALSE;
+    }
+
+    // Ïðîèíèòèòü äåêîìïðåññîð
+    if (ICERR_OK != ICDecompressBegin(m_aviIC, &m_biInFormat, &m_biOutFormat))
+    {
+
+        return FALSE;
+    }
+
+    //--strf
+    if (MMSYSERR_NOERROR != mmioAscend(hmmioFile, &mmckinfoParent, 0))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    //--strh
+    if (MMSYSERR_NOERROR != mmioAscend(hmmioFile, &mmckinfoParent, 0))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    //--strl
+    if (MMSYSERR_NOERROR != mmioAscend(hmmioFile, &mmckinfoParent, 0))
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    //-------------------------------------------------------------------
+    MMCKINFO mmckinfoSubchunk;
+    ZeroMemory(&mmckinfoSubchunk, sizeof(mmckinfoSubchunk));
+    mmckinfoSubchunk.fccType = mmioFOURCC('m', 'o', 'v', 'i');
+    if (MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoSubchunk, NULL, MMIO_FINDLIST)) \
+            || mmckinfoSubchunk.cksize <= 4)
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    mmioSeek(hmmioFile, mmckinfoSubchunk.dwDataOffset, SEEK_SET);
+
+    // Âûäåëèòü ïàìÿòü ïîä ñæàòûå äàííûå âñåãî êëèïà
+    m_pMovieData = (BYTE*)xr_malloc(mmckinfoSubchunk.cksize);
+    if (m_pMovieData == NULL)
+    {
+
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    if (mmckinfoSubchunk.cksize != (DWORD)mmioRead(hmmioFile, (HPSTR)m_pMovieData, mmckinfoSubchunk.cksize))
+    {
+
+        xr_free(m_pMovieData);
+        m_pMovieData = NULL;
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    if (MMSYSERR_NOERROR != mmioAscend(hmmioFile, &mmckinfoSubchunk, 0))
+    {
+
+        xr_free(m_pMovieData);
+        m_pMovieData = NULL;
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    // Íàéòè ÷àíê FOURCC('idx1')
+    ZeroMemory(&mmckinfoSubchunk, sizeof(mmckinfoSubchunk));
+    mmckinfoSubchunk.fccType = mmioFOURCC('i', 'd', 'x', '1');
+
+    if (MMSYSERR_NOERROR != (res = mmioDescend(hmmioFile, &mmckinfoSubchunk, NULL, MMIO_FINDCHUNK)) \
+            || mmckinfoSubchunk.cksize <= 4)
+    {
+        xr_free(m_pMovieData);
+        m_pMovieData = NULL;
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    // Âûäåëèòü ïàìÿòü ïîä èíäåêñ
+    m_pMovieIndex = (AVIINDEXENTRY*)xr_malloc(mmckinfoSubchunk.cksize);
+    if (m_pMovieIndex == NULL)
+    {
+
+        xr_free(m_pMovieData);
+        m_pMovieData = NULL;
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    if (mmckinfoSubchunk.cksize != (DWORD)mmioRead(hmmioFile, (HPSTR)m_pMovieIndex, mmckinfoSubchunk.cksize))
+    {
+
+        xr_free(m_pMovieIndex);
+        m_pMovieIndex = NULL;
+        xr_free(m_pMovieData);
+        m_pMovieData = NULL;
+        mmioClose(hmmioFile, 0);
+        return FALSE;
+    }
+
+    // Çàêðûòü AVI ôàéë ÷åðåç mmioClose( )
+    mmioClose(hmmioFile, 0);
+
+    if (alpha)
+    {
+        R_ASSERT(m_dwWidth == alpha->m_dwWidth);
+        R_ASSERT(m_dwHeight == alpha->m_dwHeight);
+    }
+
+    //-----------------------------------------------------------------
+    return TRUE;
 }
 
-BOOL CAviPlayerCustom::DecompressFrame( DWORD dwFrameNum )
+BOOL CAviPlayerCustom::DecompressFrame(DWORD dwFrameNum)
 {
-	// ïîëó÷àåì ýëåìåíò èíäåêñà
-	AVIINDEXENTRY	*pCurrFrameIndex = &m_pMovieIndex[ dwFrameNum ];
-
-	m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
-	R_ASSERT( m_biInFormat.biSizeImage != 0 );
-
-	DWORD	dwFlags;
-	dwFlags = (pCurrFrameIndex->dwFlags & AVIIF_KEYFRAME) ? 0 : ICDECOMPRESS_NOTKEYFRAME;
-	m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
-	dwFlags |= (m_biInFormat.biSizeImage) ? 0 : ICDECOMPRESS_NULLFRAME;
-
-	if( ICERR_OK != ICDecompress(m_aviIC, dwFlags, &m_biInFormat, (m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8), &m_biOutFormat, m_pDecompressedBuf) ) {
-		return	FALSE;
-	}
-
-	if (alpha)	{
-		// update
-		BYTE*	alpha_buf;
-		alpha->GetFrame(&alpha_buf);
-		u32*	dst		= (u32*)m_pDecompressedBuf;
-		u32*	src		= (u32*)alpha_buf;
-		u32*	end		= dst+u32(m_dwWidth*m_dwHeight);
-		for (; dst!=end; src++,dst++)
-		{
-			u32&	d	= *dst;
-			u32		s	= *src;
-			u32		a	= (color_get_R(s)+color_get_G(s)+color_get_B(s))/3;
-			d			= subst_alpha	(d,a);
-		}
-	}
-
-	return	TRUE;
+    // ïîëó÷àåì ýëåìåíò èíäåêñà
+    AVIINDEXENTRY* pCurrFrameIndex = &m_pMovieIndex[dwFrameNum];
+
+    m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
+    R_ASSERT(m_biInFormat.biSizeImage != 0);
+
+    DWORD dwFlags;
+    dwFlags = (pCurrFrameIndex->dwFlags & AVIIF_KEYFRAME) ? 0 : ICDECOMPRESS_NOTKEYFRAME;
+    m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
+    dwFlags |= (m_biInFormat.biSizeImage) ? 0 : ICDECOMPRESS_NULLFRAME;
+
+    if (ICERR_OK != ICDecompress(m_aviIC, dwFlags, &m_biInFormat, (m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8), &m_biOutFormat, m_pDecompressedBuf))
+    {
+        return FALSE;
+    }
+
+    if (alpha)
+    {
+        // update
+        BYTE* alpha_buf;
+        alpha->GetFrame(&alpha_buf);
+        u32* dst = (u32*)m_pDecompressedBuf;
+        u32* src = (u32*)alpha_buf;
+        u32* end = dst + u32(m_dwWidth*m_dwHeight);
+        for (; dst != end; src++, dst++)
+        {
+            u32& d = *dst;
+            u32 s = *src;
+            u32 a = (color_get_R(s) + color_get_G(s) + color_get_B(s)) / 3;
+            d = subst_alpha(d, a);
+        }
+    }
+
+    return TRUE;
 }
 
 /*
@@ -298,141 +327,156 @@ GetFrame
 
 âîçâðàùàåò TRUE åñëè êàäð èçìåíèëñÿ, èíà÷å FALSE
 */
-BOOL CAviPlayerCustom::GetFrame( BYTE **pDest )
+BOOL CAviPlayerCustom::GetFrame(BYTE** pDest)
 {
-	R_ASSERT( pDest );
+    R_ASSERT(pDest);
+
+    DWORD dwCurrFrame;
+    dwCurrFrame = CalcFrame();
+
+    //** debug dwCurrFrame = 112;
 
-	DWORD	dwCurrFrame;
-	dwCurrFrame	= CalcFrame();
+    // Åñëè çàäàííûé êàäð ðàâåí ïðåäèäóùåìó
+    if (dwCurrFrame == m_dwFrameCurrent)
+    {
 
-//** debug	dwCurrFrame = 112;
+        *pDest = m_pDecompressedBuf;
 
-	// Åñëè çàäàííûé êàäð ðàâåí ïðåäèäóùåìó
-	if( dwCurrFrame == m_dwFrameCurrent ) {
+        return FALSE;
+    }
+    else
+        // Åñëè çàäàííûé êàäð ýòî Ïðåäèäóùèé êàäð + 1
+        if (dwCurrFrame == m_dwFrameCurrent + 1)
+        {
 
-		*pDest				= m_pDecompressedBuf;
+            ++m_dwFrameCurrent; // dwCurrFrame == m_dwFrameCurrent + 1
 
-		return	FALSE;
-	} else
-	// Åñëè çàäàííûé êàäð ýòî Ïðåäèäóùèé êàäð + 1
-	if( dwCurrFrame == m_dwFrameCurrent + 1 ) {
-	
-		++m_dwFrameCurrent;	//	dwCurrFrame == m_dwFrameCurrent + 1
+            *pDest = m_pDecompressedBuf;
 
-		*pDest	= m_pDecompressedBuf;
+            DecompressFrame(m_dwFrameCurrent);
+            return TRUE;
+        }
+        else
+        {
 
-		DecompressFrame( m_dwFrameCurrent );
-		return	TRUE;
-	} else {
-		
-		// Ýòî ïðîèçâîëüíûé êàäð
+            // Ýòî ïðîèçâîëüíûé êàäð
 
-		if( ! (m_pMovieIndex[ dwCurrFrame ].dwFlags & AVIIF_KEYFRAME) ) {
+            if (!(m_pMovieIndex[dwCurrFrame].dwFlags & AVIIF_KEYFRAME))
+            {
 
-			// Ýòî ÍÅ êëþ÷åâîé êàäð -
-			// äåëàåì PreRoll îò áëèæàéøåãî ïðåäèäóùåãî êëþ÷åâîãî êàäðà äî Çàäàííîãî-1
-			PreRoll( dwCurrFrame );
-		}			
+                // Ýòî ÍÅ êëþ÷åâîé êàäð -
+                // äåëàåì PreRoll îò áëèæàéøåãî ïðåäèäóùåãî êëþ÷åâîãî êàäðà äî Çàäàííîãî-1
+                PreRoll(dwCurrFrame);
+            }
 
-		m_dwFrameCurrent	= dwCurrFrame;
-		
-		*pDest	= m_pDecompressedBuf;
+            m_dwFrameCurrent = dwCurrFrame;
 
-		// Äåêîìïðåññèì çàäàííûé êàäð
-		DecompressFrame( m_dwFrameCurrent );
-		return	TRUE;
-	}
+            *pDest = m_pDecompressedBuf;
+
+            // Äåêîìïðåññèì çàäàííûé êàäð
+            DecompressFrame(m_dwFrameCurrent);
+            return TRUE;
+        }
 }
 
 // ìèíèìóì ïðîâåðîê íà âàëèäíîñòü ïåðåäàííîãî äëÿ ïðåðîëëà êàäðà - íóæíà ñêîðîñòü
-VOID CAviPlayerCustom::PreRoll( DWORD dwFrameNum )
+VOID CAviPlayerCustom::PreRoll(DWORD dwFrameNum)
 {
-	int i;
+    int i;
+
+    AVIINDEXENTRY* pCurrFrameIndex;
+    DWORD res;
 
-	AVIINDEXENTRY	*pCurrFrameIndex;
-	DWORD		res;
+    // íàõîäèì â ìàññèâå èíäåêñîâ ïåðâûé ïðåäøåñòâóþùèé åìó êëþ÷åâîé êàäð
+    // èëè áåðåì êàäð, êîððåêòíî ðàñæàòûé äî ýòîãî
+    for (i = (int)dwFrameNum - 1; i > 0; i--)
+    {
 
-	// íàõîäèì â ìàññèâå èíäåêñîâ ïåðâûé ïðåäøåñòâóþùèé åìó êëþ÷åâîé êàäð
-	// èëè áåðåì êàäð, êîððåêòíî ðàñæàòûé äî ýòîãî
-	for( i=(int)dwFrameNum-1 ; i>0 ; i-- ) {
+        if (m_pMovieIndex[i].dwFlags & AVIIF_KEYFRAME) break;
 
-		if( m_pMovieIndex[ i ].dwFlags & AVIIF_KEYFRAME )	break;
+        if ((int)m_dwFrameCurrent == i)
+        {
 
-		if( (int)m_dwFrameCurrent == i ) {
+            // íàì ðàíüøå âñòðåòèëñÿ ðàñæàòûé ïåðåä ýòèì êàäð:
+            // äåêîìïðåññèì âñå ïîñëåäóþùèå ÍÅêëþ÷åâûå êàäðû ñ ôëàãàìè PREROLL & NOTKEYFRAME
+            for (i++; i < (int)dwFrameNum; i++)
+            {
 
-			// íàì ðàíüøå âñòðåòèëñÿ ðàñæàòûé ïåðåä ýòèì êàäð:
-			// äåêîìïðåññèì âñå ïîñëåäóþùèå ÍÅêëþ÷åâûå êàäðû ñ ôëàãàìè PREROLL & NOTKEYFRAME
-			for( i++ ; i<(int)dwFrameNum ; i++ ) {
+                pCurrFrameIndex = &m_pMovieIndex[i];
 
-				pCurrFrameIndex = &m_pMovieIndex[ i ];
+                DWORD dwFlags;
+                dwFlags = ICDECOMPRESS_PREROLL | ICDECOMPRESS_NOTKEYFRAME | ICDECOMPRESS_HURRYUP;
+                m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
+                dwFlags |= (m_biInFormat.biSizeImage) ? 0 : ICDECOMPRESS_NULLFRAME;
 
-				DWORD	dwFlags;
-				dwFlags = ICDECOMPRESS_PREROLL | ICDECOMPRESS_NOTKEYFRAME | ICDECOMPRESS_HURRYUP;
-				m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
-				dwFlags |= (m_biInFormat.biSizeImage) ? 0 : ICDECOMPRESS_NULLFRAME;
+                res = ICDecompress(m_aviIC, dwFlags, &m_biInFormat, (m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8) /*m_pCompressedBuf*/, &m_biOutFormat, m_pDecompressedBuf);
+                if (ICERR_OK != res && ICERR_DONTDRAW != res)
+                {
+                    // ïðîâåðêà íà ICERR_DONTDRAW ââåäåíà èç-çà indeo 5.11
 
-				res = ICDecompress(m_aviIC, dwFlags, &m_biInFormat, (m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8) /*m_pCompressedBuf*/, &m_biOutFormat, m_pDecompressedBuf);
-				if( ICERR_OK != res && ICERR_DONTDRAW != res ) {	// ïðîâåðêà íà ICERR_DONTDRAW ââåäåíà èç-çà indeo 5.11
+                    R_ASSERT(0);
+                }
 
-					R_ASSERT( 0 );
-				}
+            } // for(...
 
-			} // for(...
-		
-			return;
-		}	// if( (int)m_dwFrameCurrent == i )...
-	}	// for( i=(int)dwFrameNum-1 ; i>0 ; i-- )...
+            return;
+        } // if( (int)m_dwFrameCurrent == i )...
+    } // for( i=(int)dwFrameNum-1 ; i>0 ; i-- )...
 
 
-	// ïîëó÷àåì ýëåìåíò èíäåêñà
-	pCurrFrameIndex = &m_pMovieIndex[ i ];
-	m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
-	R_ASSERT( m_biInFormat.biSizeImage );
+    // ïîëó÷àåì ýëåìåíò èíäåêñà
+    pCurrFrameIndex = &m_pMovieIndex[i];
+    m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
+    R_ASSERT(m_biInFormat.biSizeImage);
 
-	// äåêîìïðåññèì êëþ÷åâîé êàäð ñ ôëàãîì ICDECOMPRESS_PREROLL 
-	res = ICDecompress(m_aviIC, ICDECOMPRESS_PREROLL | ICDECOMPRESS_HURRYUP, &m_biInFormat, m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8/*m_pCompressedBuf*/, &m_biOutFormat, m_pDecompressedBuf);
-	if( ICERR_OK != res && ICERR_DONTDRAW != res ) {
+    // äåêîìïðåññèì êëþ÷åâîé êàäð ñ ôëàãîì ICDECOMPRESS_PREROLL
+    res = ICDecompress(m_aviIC, ICDECOMPRESS_PREROLL | ICDECOMPRESS_HURRYUP, &m_biInFormat, m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8/*m_pCompressedBuf*/, &m_biOutFormat, m_pDecompressedBuf);
+    if (ICERR_OK != res && ICERR_DONTDRAW != res)
+    {
 
-		R_ASSERT( 0 );
-	}
+        R_ASSERT(0);
+    }
 
-	// äåêîìïðåññèì âñå ïîñëåäóþùèå ÍÅêëþ÷åâûå êàäðû ñ ôëàãàìè PREROLL & NOTKEYFRAME
-	for( i++ ; i<(int)dwFrameNum ; i++ ) {
+    // äåêîìïðåññèì âñå ïîñëåäóþùèå ÍÅêëþ÷åâûå êàäðû ñ ôëàãàìè PREROLL & NOTKEYFRAME
+    for (i++; i < (int)dwFrameNum; i++)
+    {
 
-		pCurrFrameIndex = &m_pMovieIndex[ i ];
+        pCurrFrameIndex = &m_pMovieIndex[i];
 
-		DWORD	dwFlags;
-		dwFlags = ICDECOMPRESS_PREROLL | ICDECOMPRESS_NOTKEYFRAME | ICDECOMPRESS_HURRYUP;
-		m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
-		dwFlags |= (m_biInFormat.biSizeImage) ? 0 : ICDECOMPRESS_NULLFRAME;
+        DWORD dwFlags;
+        dwFlags = ICDECOMPRESS_PREROLL | ICDECOMPRESS_NOTKEYFRAME | ICDECOMPRESS_HURRYUP;
+        m_biInFormat.biSizeImage = pCurrFrameIndex->dwChunkLength;
+        dwFlags |= (m_biInFormat.biSizeImage) ? 0 : ICDECOMPRESS_NULLFRAME;
 
-		res = ICDecompress(m_aviIC, dwFlags, &m_biInFormat, (m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8) /*m_pCompressedBuf*/, &m_biOutFormat, m_pDecompressedBuf);
-		if( ICERR_OK != res && ICERR_DONTDRAW != res ) {	// ïðîâåðêà íà ICERR_DONTDRAW ââåäåíà èç-çà indeo 5.11
+        res = ICDecompress(m_aviIC, dwFlags, &m_biInFormat, (m_pMovieData + pCurrFrameIndex->dwChunkOffset + 8) /*m_pCompressedBuf*/, &m_biOutFormat, m_pDecompressedBuf);
+        if (ICERR_OK != res && ICERR_DONTDRAW != res)
+        {
+            // ïðîâåðêà íà ICERR_DONTDRAW ââåäåíà èç-çà indeo 5.11
 
-			R_ASSERT( 0 );
-		}
-	} // for(...
+            R_ASSERT(0);
+        }
+    } // for(...
 
 }
 
-VOID CAviPlayerCustom::GetSize(DWORD *dwWidth, DWORD *dwHeight)
+VOID CAviPlayerCustom::GetSize(DWORD* dwWidth, DWORD* dwHeight)
 {
-	if( dwWidth )	*dwWidth = m_dwWidth;
-	if( dwHeight )	*dwHeight = m_dwHeight;
+    if (dwWidth) *dwWidth = m_dwWidth;
+    if (dwHeight) *dwHeight = m_dwHeight;
 }
 
-INT CAviPlayerCustom::SetSpeed( INT nPercent )
+INT CAviPlayerCustom::SetSpeed(INT nPercent)
 {
-	INT		res = INT( m_fCurrentRate / m_fRate * 100 );
+    INT res = INT(m_fCurrentRate / m_fRate * 100);
 
-	m_fCurrentRate	= m_fRate * FLOAT( nPercent / 100.0f );
+    m_fCurrentRate = m_fRate * FLOAT(nPercent / 100.0f);
 
-	return	res;
+    return res;
 }
 DWORD CAviPlayerCustom::CalcFrame()
-	{	
-		if(0==m_dwFirstFrameOffset)
-			m_dwFirstFrameOffset = RDEVICE.dwTimeContinual-1;
+{
+    if (0 == m_dwFirstFrameOffset)
+        m_dwFirstFrameOffset = RDEVICE.dwTimeContinual - 1;
 
-	return DWORD( floor( (RDEVICE.dwTimeContinual-m_dwFirstFrameOffset) * m_fCurrentRate / 1000.0f) ) % m_dwFrameTotal;
+    return DWORD(floor((RDEVICE.dwTimeContinual - m_dwFirstFrameOffset) * m_fCurrentRate / 1000.0f)) % m_dwFrameTotal;
 }
diff --git a/src/xrEngine/tntQAVI.h b/src/xrEngine/tntQAVI.h
index 4ab523ad7a2..d68e97b125f 100644
--- a/src/xrEngine/tntQAVI.h
+++ b/src/xrEngine/tntQAVI.h
@@ -8,95 +8,97 @@
 #include "mmsystem.h"
 
 // replaced with standard AVIIF_KEYFRAME
-//rr #define	AVIINDEX_ISKEYFRAME		0x10	// êëþ÷åâîé êàäð
+//rr #define AVIINDEX_ISKEYFRAME 0x10 // êëþ÷åâîé êàäð
 
 // reverse enginered AVI index v.1 format
 /*struct AviIndex {
 
-	DWORD	dwChunkType;	// chunk type, i.e. '##dc' - DIB compressed
-	DWORD	dwFlags;		// key-frame etc.
-	DWORD	dwOffset;		// sub-chunk offset from the begining of the LIST chunk
-	DWORD	dwLenght;		// chunk lenght
-
-};
-
-typedef struct {
-	FOURCC fccType;
-	FOURCC fccHandler;
-	DWORD  dwFlags;
-	DWORD  dwPriority;
-	DWORD  dwInitialFrames;
-	DWORD  dwScale;
-	DWORD  dwRate;
-	DWORD  dwStart;
-	DWORD  dwLength;
-	DWORD  dwSuggestedBufferSize;
-	DWORD  dwQuality;
-	DWORD  dwSampleSize;
-	RECT   rcFrame;
-} AVIStreamHeader;
-*/
-typedef struct {
-	FOURCC fccType;
-	FOURCC fccHandler;
-	DWORD  dwFlags;
-	DWORD  dwPriority;
-	DWORD  dwInitialFrames;
-	DWORD  dwScale;
-	DWORD  dwRate;
-	DWORD  dwStart;
-	DWORD  dwLength;
-	DWORD  dwSuggestedBufferSize;
-	DWORD  dwQuality;
-	DWORD  dwSampleSize;
-	struct {
-
-		WORD	left;
-		WORD	top;
-		WORD	right;
-		WORD	bottom;
-	};
-//	RECT   rcFrame;		- ëàæà â MSDN
+ DWORD dwChunkType; // chunk type, i.e. '##dc' - DIB compressed
+ DWORD dwFlags; // key-frame etc.
+ DWORD dwOffset; // sub-chunk offset from the begining of the LIST chunk
+ DWORD dwLenght; // chunk lenght
+
+ };
+
+ typedef struct {
+ FOURCC fccType;
+ FOURCC fccHandler;
+ DWORD dwFlags;
+ DWORD dwPriority;
+ DWORD dwInitialFrames;
+ DWORD dwScale;
+ DWORD dwRate;
+ DWORD dwStart;
+ DWORD dwLength;
+ DWORD dwSuggestedBufferSize;
+ DWORD dwQuality;
+ DWORD dwSampleSize;
+ RECT rcFrame;
+ } AVIStreamHeader;
+ */
+typedef struct
+{
+    FOURCC fccType;
+    FOURCC fccHandler;
+    DWORD dwFlags;
+    DWORD dwPriority;
+    DWORD dwInitialFrames;
+    DWORD dwScale;
+    DWORD dwRate;
+    DWORD dwStart;
+    DWORD dwLength;
+    DWORD dwSuggestedBufferSize;
+    DWORD dwQuality;
+    DWORD dwSampleSize;
+    struct
+    {
+
+        WORD left;
+        WORD top;
+        WORD right;
+        WORD bottom;
+    };
+    // RECT rcFrame; - ëàæà â MSDN
 } AVIStreamHeaderCustom;
 
 class ENGINE_API CAviPlayerCustom
 {
 protected:
-	CAviPlayerCustom	*alpha;
+    CAviPlayerCustom* alpha;
 protected:
-	AVIINDEXENTRY		*m_pMovieIndex;
-	BYTE				*m_pMovieData;
-	HIC					m_aviIC;
-	BYTE				*m_pDecompressedBuf;
+    AVIINDEXENTRY* m_pMovieIndex;
+    BYTE* m_pMovieData;
+    HIC m_aviIC;
+    BYTE* m_pDecompressedBuf;
 
-	BITMAPINFOHEADER	m_biOutFormat;
-	BITMAPINFOHEADER	m_biInFormat;
+    BITMAPINFOHEADER m_biOutFormat;
+    BITMAPINFOHEADER m_biInFormat;
 
-	float				m_fRate;		// ñòàíäàðòíàÿ ñêîðîñòü, fps
-	float				m_fCurrentRate;	// òåêóùàÿ ñêîðîñòü, fps
+    float m_fRate; // ñòàíäàðòíàÿ ñêîðîñòü, fps
+    float m_fCurrentRate; // òåêóùàÿ ñêîðîñòü, fps
 
-	DWORD				m_dwFrameTotal;
-	DWORD				m_dwFrameCurrent;
-	u32					m_dwFirstFrameOffset;
+    DWORD m_dwFrameTotal;
+    DWORD m_dwFrameCurrent;
+    u32 m_dwFirstFrameOffset;
 
 
-	DWORD				CalcFrame			();
+    DWORD CalcFrame();
 
-	BOOL				DecompressFrame		( DWORD	dwFrameNum );
-	VOID				PreRoll				( DWORD dwFrameNum );
+    BOOL DecompressFrame(DWORD dwFrameNum);
+    VOID PreRoll(DWORD dwFrameNum);
 
 public:
-						CAviPlayerCustom		( );
-						~CAviPlayerCustom		( );
+    CAviPlayerCustom();
+    ~CAviPlayerCustom();
+
+    DWORD m_dwWidth, m_dwHeight;
 
-	DWORD				m_dwWidth, m_dwHeight;
+    VOID GetSize(DWORD* dwWidth, DWORD* dwHeight);
 
-	VOID				GetSize				( DWORD *dwWidth, DWORD *dwHeight );
-	
-	BOOL				Load				( char *fname  );
-	BOOL				GetFrame			( BYTE **pDest );
+    BOOL Load(char* fname);
+    BOOL GetFrame(BYTE** pDest);
 
-	BOOL				NeedUpdate			( ) { return CalcFrame( ) != m_dwFrameCurrent; }
-	INT					SetSpeed			( INT nPercent );
+    BOOL NeedUpdate() { return CalcFrame() != m_dwFrameCurrent; }
+    INT SetSpeed(INT nPercent);
 };
 #endif
diff --git a/src/xrEngine/trivial_encryptor.h b/src/xrEngine/trivial_encryptor.h
index a06e51c0dda..a098f1d2d25 100644
--- a/src/xrEngine/trivial_encryptor.h
+++ b/src/xrEngine/trivial_encryptor.h
@@ -11,148 +11,158 @@
 #include <malloc.h>
 #pragma warning(pop)
 
-//#define trivial_encryptor	temp_stuff
+//#define trivial_encryptor temp_stuff
 
 #define RUSSIAN_BUILD
 
-class trivial_encryptor {
+class trivial_encryptor
+{
 private:
-	typedef u8					type;
-	typedef void*				pvoid;
-	typedef const void*			pcvoid;
+    typedef u8 type;
+    typedef void* pvoid;
+    typedef const void* pcvoid;
 
 private:
-	enum						{alphabet_size = u32(1 << (8*sizeof(type)))};
+    enum { alphabet_size = u32(1 << (8 * sizeof(type))) };
 
 private:
-	class random32 {
-	private:
-		u32				m_seed;
-
-	public:
-		IC	void		seed	(const u32 &seed)
-		{
-			m_seed		= seed;
-		}
-
-		IC	u32			random	(const u32 &range)
-		{
-			m_seed		= 0x08088405*m_seed + 1;
-			return		(u32(u64(m_seed)*u64(range) >> 32));
-		}
-	};
+    class random32
+    {
+    private:
+        u32 m_seed;
+
+    public:
+        IC void seed(const u32& seed)
+        {
+            m_seed = seed;
+        }
+
+        IC u32 random(const u32& range)
+        {
+            m_seed = 0x08088405 * m_seed + 1;
+            return (u32(u64(m_seed)*u64(range) >> 32));
+        }
+    };
 
 public:
-	static	u32					m_table_iterations;
-	static	u32					m_table_seed;
-	static	u32					m_encrypt_seed;
+    static u32 m_table_iterations;
+    static u32 m_table_seed;
+    static u32 m_encrypt_seed;
 
 #ifdef TRIVIAL_ENCRYPTOR_ENCODER
-#	ifdef TRIVIAL_ENCRYPTOR_DECODER
-		private: static bool	m_initialized;
-#	endif // TRIVIAL_ENCRYPTOR_DECODER
+# ifdef TRIVIAL_ENCRYPTOR_DECODER
+private:
+    static bool m_initialized;
+# endif // TRIVIAL_ENCRYPTOR_DECODER
 #endif // TRIVIAL_ENCRYPTOR_ENCODER
 
 #ifdef TRIVIAL_ENCRYPTOR_ENCODER
-	private: static type		m_alphabet[alphabet_size];
+private:
+    static type m_alphabet[alphabet_size];
 #endif // TRIVIAL_ENCRYPTOR_ENCODER
 
 #ifdef TRIVIAL_ENCRYPTOR_DECODER
-	private: static type		m_alphabet_back[alphabet_size];
+private:
+    static type m_alphabet_back[alphabet_size];
 #endif // TRIVIAL_ENCRYPTOR_DECODER
 
 private:
-	IC	static void	initialize		()
-	{
-	#ifndef TRIVIAL_ENCRYPTOR_ENCODER
-		type					*m_alphabet = (type*)_alloca(sizeof(type)*alphabet_size);
-	#endif // TRIVIAL_ENCRYPTOR_ENCODER
-
-		for (u32 i=0; i<alphabet_size; ++i)
-			m_alphabet[i]		= (type)i;
-
-		random32				temp;
-		temp.seed				(m_table_seed);
-		for (u32 i=0; i<m_table_iterations; ++i) {
-			u32					j = temp.random(alphabet_size);
-			u32					k = temp.random(alphabet_size);
-			while (j == k)
-				k				= temp.random(alphabet_size);
-
-			std::swap			(m_alphabet[j],m_alphabet[k]);
-		}
-
-	#ifdef TRIVIAL_ENCRYPTOR_DECODER
-		for (u32 i=0; i<alphabet_size; ++i)
-			m_alphabet_back[m_alphabet[i]]	= (type)i;
-	#endif // TRIVIAL_ENCRYPTOR_DECODER
-	}
+    IC static void initialize()
+    {
+#ifndef TRIVIAL_ENCRYPTOR_ENCODER
+        type* m_alphabet = (type*)_alloca(sizeof(type)*alphabet_size);
+#endif // TRIVIAL_ENCRYPTOR_ENCODER
+
+        for (u32 i = 0; i < alphabet_size; ++i)
+            m_alphabet[i] = (type)i;
+
+        random32 temp;
+        temp.seed(m_table_seed);
+        for (u32 i = 0; i < m_table_iterations; ++i)
+        {
+            u32 j = temp.random(alphabet_size);
+            u32 k = temp.random(alphabet_size);
+            while (j == k)
+                k = temp.random(alphabet_size);
+
+            std::swap(m_alphabet[j], m_alphabet[k]);
+        }
+
+#ifdef TRIVIAL_ENCRYPTOR_DECODER
+        for (u32 i = 0; i < alphabet_size; ++i)
+            m_alphabet_back[m_alphabet[i]] = (type)i;
+#endif // TRIVIAL_ENCRYPTOR_DECODER
+    }
 
 #ifdef TRIVIAL_ENCRYPTOR_ENCODER
-	public:	IC	static void	encode	(pcvoid source, const u32 &source_size, pvoid destination)
-	{
-#	ifndef TRIVIAL_ENCRYPTOR_DECODER
-		static bool m_initialized	= false;
-#	endif // TRIVIAL_ENCRYPTOR_DECODER
-		if (!m_initialized) {
-			initialize			();
-			m_initialized		= true;
-		}
-
-		random32				temp;
-		temp.seed				(m_encrypt_seed);
-		const u8				*I = (const u8*)source;
-		const u8				*E = (const u8*)source + source_size;
-		u8						*J = (u8*)destination;
-		for ( ; I != E; ++I, ++J)
-			*J					= m_alphabet[*I] ^ type(temp.random(256) & 0xff);
-	}
+public:
+    IC static void encode(pcvoid source, const u32& source_size, pvoid destination)
+    {
+# ifndef TRIVIAL_ENCRYPTOR_DECODER
+        static bool m_initialized = false;
+# endif // TRIVIAL_ENCRYPTOR_DECODER
+        if (!m_initialized)
+        {
+            initialize();
+            m_initialized = true;
+        }
+
+        random32 temp;
+        temp.seed(m_encrypt_seed);
+        const u8* I = (const u8*)source;
+        const u8* E = (const u8*)source + source_size;
+        u8* J = (u8*)destination;
+        for (; I != E; ++I, ++J)
+            *J = m_alphabet[*I] ^ type(temp.random(256) & 0xff);
+    }
 #endif // TRIVIAL_ENCRYPTOR_ENCODER
 
 #ifdef TRIVIAL_ENCRYPTOR_DECODER
-	public:	IC	static void	decode	(pcvoid source, const u32 &source_size, pvoid destination)
-	{
-#	ifndef TRIVIAL_ENCRYPTOR_ENCODER
-		static bool m_initialized	= false;
-#	endif // TRIVIAL_ENCRYPTOR_ENCODER
-		if (!m_initialized) {
-			initialize			();
-			m_initialized		= true;
-		}
-
-		random32				temp;
-		temp.seed				(m_encrypt_seed);
-		const u8				*I = (const u8*)source;
-		const u8				*E = (const u8*)source + source_size;
-		u8						*J = (u8*)destination;
-		for ( ; I != E; ++I, ++J)
-			*J					= m_alphabet_back[(*I) ^ type(temp.random(256) & 0xff)];
-	}
+public:
+    IC static void decode(pcvoid source, const u32& source_size, pvoid destination)
+    {
+# ifndef TRIVIAL_ENCRYPTOR_ENCODER
+        static bool m_initialized = false;
+# endif // TRIVIAL_ENCRYPTOR_ENCODER
+        if (!m_initialized)
+        {
+            initialize();
+            m_initialized = true;
+        }
+
+        random32 temp;
+        temp.seed(m_encrypt_seed);
+        const u8* I = (const u8*)source;
+        const u8* E = (const u8*)source + source_size;
+        u8* J = (u8*)destination;
+        for (; I != E; ++I, ++J)
+            *J = m_alphabet_back[(*I) ^ type(temp.random(256) & 0xff)];
+    }
 #endif // TRIVIAL_ENCRYPTOR_DECODER
 };
 
 #ifdef TRIVIAL_ENCRYPTOR_ENCODER
-#	ifdef TRIVIAL_ENCRYPTOR_DECODER
-		bool trivial_encryptor::m_initialized	= false;
-#	endif // TRIVIAL_ENCRYPTOR_DECODER
+# ifdef TRIVIAL_ENCRYPTOR_DECODER
+bool trivial_encryptor::m_initialized = false;
+# endif // TRIVIAL_ENCRYPTOR_DECODER
 #endif // TRIVIAL_ENCRYPTOR_ENCODER
 
 #ifdef RUSSIAN_BUILD
-	u32	trivial_encryptor::m_table_iterations	= 4*1024;
-	u32	trivial_encryptor::m_table_seed			= 7071984;
-	u32	trivial_encryptor::m_encrypt_seed		= 24031979;
+u32 trivial_encryptor::m_table_iterations = 4 * 1024;
+u32 trivial_encryptor::m_table_seed = 7071984;
+u32 trivial_encryptor::m_encrypt_seed = 24031979;
 #else // RUSSIAN_BUILD
-	u32	trivial_encryptor::m_table_iterations	= 3*1024;
-	u32	trivial_encryptor::m_table_seed			= 24081978;
-	u32	trivial_encryptor::m_encrypt_seed		= 20041983;
+u32 trivial_encryptor::m_table_iterations = 3 * 1024;
+u32 trivial_encryptor::m_table_seed = 24081978;
+u32 trivial_encryptor::m_encrypt_seed = 20041983;
 #endif // RUSSIAN_BUILD
 
 #ifdef TRIVIAL_ENCRYPTOR_ENCODER
-	trivial_encryptor::type	trivial_encryptor::m_alphabet[trivial_encryptor::alphabet_size];
+trivial_encryptor::type trivial_encryptor::m_alphabet[trivial_encryptor::alphabet_size];
 #endif // TRIVIAL_ENCRYPTOR_ENCODER
 
 #ifdef TRIVIAL_ENCRYPTOR_DECODER
-	trivial_encryptor::type	trivial_encryptor::m_alphabet_back[trivial_encryptor::alphabet_size];
+trivial_encryptor::type trivial_encryptor::m_alphabet_back[trivial_encryptor::alphabet_size];
 #endif // TRIVIAL_ENCRYPTOR_DECODER
 
 #endif // TRIVIAL_ENCRYPTOR_H
\ No newline at end of file
diff --git a/src/xrEngine/vis_common.h b/src/xrEngine/vis_common.h
index f9ee0b5a82c..da8d08e03a6 100644
--- a/src/xrEngine/vis_common.h
+++ b/src/xrEngine/vis_common.h
@@ -3,25 +3,25 @@
 #pragma once
 
 #pragma pack(push,4)
-struct	vis_data
+struct vis_data
 {
-	Fsphere		sphere;				//
-	Fbox		box;				//
-	u32			marker;				// for different sub-renders
-	u32			accept_frame;		// when it was requisted accepted for main render
-	u32			hom_frame;			// when to perform test - shedule
-	u32			hom_tested;			// when it was last time tested
+    Fsphere sphere; //
+    Fbox box; //
+    u32 marker; // for different sub-renders
+    u32 accept_frame; // when it was requisted accepted for main render
+    u32 hom_frame; // when to perform test - shedule
+    u32 hom_tested; // when it was last time tested
 
-	IC void		clear			()
-	{
-		sphere.P.set	(0,0,0);
-		sphere.R		= 0;
-		box.invalidate	();
-		marker			= 0;
-		accept_frame	= 0;
-		hom_frame		= 0;
-		hom_tested		= 0;
-	}
+    IC void clear()
+    {
+        sphere.P.set(0, 0, 0);
+        sphere.R = 0;
+        box.invalidate();
+        marker = 0;
+        accept_frame = 0;
+        hom_frame = 0;
+        hom_tested = 0;
+    }
 };
 #pragma pack(pop)
 #endif
diff --git a/src/xrEngine/x_ray.cpp b/src/xrEngine/x_ray.cpp
index 5a932c376bc..18a1925788a 100644
--- a/src/xrEngine/x_ray.cpp
+++ b/src/xrEngine/x_ray.cpp
@@ -47,11 +47,13 @@ XRCORE_API u32 build_id;
 #endif // #ifdef MASTER_GOLD
 
 
-static LPSTR month_id[12] = {
+static LPSTR month_id[12] =
+{
     "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
 
-static int days_in_month[12] = {
+static int days_in_month[12] =
+{
     31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
 };
 
@@ -69,57 +71,60 @@ static int start_year = 1999; // 1999
 #define DEFAULT_MODULE_HASH "3CAABCFCFF6F3A810019C6A72180F166"
 static char szEngineHash[33] = DEFAULT_MODULE_HASH;
 
-PROTECT_API char * ComputeModuleHash( char * pszHash )
+PROTECT_API char* ComputeModuleHash(char* pszHash)
 {
     SECUROM_MARKER_HIGH_SECURITY_ON(3)
 
-        char szModuleFileName[ MAX_PATH ];
-    HANDLE hModuleHandle = NULL , hFileMapping = NULL;
+    char szModuleFileName[MAX_PATH];
+    HANDLE hModuleHandle = NULL, hFileMapping = NULL;
     LPVOID lpvMapping = NULL;
     MEMORY_BASIC_INFORMATION MemoryBasicInformation;
 
-    if ( ! GetModuleFileName( NULL , szModuleFileName , MAX_PATH ) )
+    if (!GetModuleFileName(NULL, szModuleFileName, MAX_PATH))
         return pszHash;
 
-    hModuleHandle = CreateFile( szModuleFileName , GENERIC_READ , FILE_SHARE_READ , NULL , OPEN_EXISTING , 0 , NULL );
+    hModuleHandle = CreateFile(szModuleFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
 
-    if ( hModuleHandle == INVALID_HANDLE_VALUE )
+    if (hModuleHandle == INVALID_HANDLE_VALUE)
         return pszHash;
 
-    hFileMapping = CreateFileMapping( hModuleHandle , NULL , PAGE_READONLY , 0 , 0 , NULL );
+    hFileMapping = CreateFileMapping(hModuleHandle, NULL, PAGE_READONLY, 0, 0, NULL);
 
-    if ( hFileMapping == NULL ) {
-        CloseHandle( hModuleHandle );
+    if (hFileMapping == NULL)
+    {
+        CloseHandle(hModuleHandle);
         return pszHash;
     }
 
-    lpvMapping = MapViewOfFile( hFileMapping , FILE_MAP_READ , 0 , 0 , 0 );
+    lpvMapping = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0);
 
-    if ( lpvMapping == NULL ) {
-        CloseHandle( hFileMapping );
-        CloseHandle( hModuleHandle );
+    if (lpvMapping == NULL)
+    {
+        CloseHandle(hFileMapping);
+        CloseHandle(hModuleHandle);
         return pszHash;
     }
 
-    ZeroMemory( &MemoryBasicInformation , sizeof( MEMORY_BASIC_INFORMATION ) );
+    ZeroMemory(&MemoryBasicInformation, sizeof(MEMORY_BASIC_INFORMATION));
 
-    VirtualQuery( lpvMapping , &MemoryBasicInformation , sizeof( MEMORY_BASIC_INFORMATION ) );
+    VirtualQuery(lpvMapping, &MemoryBasicInformation, sizeof(MEMORY_BASIC_INFORMATION));
 
-    if ( MemoryBasicInformation.RegionSize ) {
+    if (MemoryBasicInformation.RegionSize)
+    {
         char szHash[33];
-        MD5Digest( ( unsigned char *)lpvMapping , (unsigned int) MemoryBasicInformation.RegionSize , szHash );
-        MD5Digest( ( unsigned char *)szHash , 32 , pszHash );
-        for ( int i = 0 ; i < 32 ; ++i )
-            pszHash[ i ] = (char)toupper( pszHash[ i ] );
+        MD5Digest((unsigned char*)lpvMapping, (unsigned int)MemoryBasicInformation.RegionSize, szHash);
+        MD5Digest((unsigned char*)szHash, 32, pszHash);
+        for (int i = 0; i < 32; ++i)
+            pszHash[i] = (char)toupper(pszHash[i]);
     }
 
-    UnmapViewOfFile( lpvMapping );
-    CloseHandle( hFileMapping );
-    CloseHandle( hModuleHandle );
+    UnmapViewOfFile(lpvMapping);
+    CloseHandle(hFileMapping);
+    CloseHandle(hModuleHandle);
 
     SECUROM_MARKER_HIGH_SECURITY_OFF(3)
 
-        return pszHash;
+    return pszHash;
 }
 #endif // DEDICATED_SERVER
 
@@ -193,7 +198,7 @@ void InitEngine()
 
 struct path_excluder_predicate
 {
-    explicit path_excluder_predicate(xr_auth_strings_t const * ignore) :
+    explicit path_excluder_predicate(xr_auth_strings_t const* ignore) :
         m_ignore(ignore)
     {
     }
@@ -204,13 +209,13 @@ struct path_excluder_predicate
 
         return allow_to_include_path(*m_ignore, path);
     }
-    xr_auth_strings_t const * m_ignore;
+    xr_auth_strings_t const* m_ignore;
 };
 
 PROTECT_API void InitSettings()
 {
 #ifndef DEDICATED_SERVER
-    Msg( "EH: %s\n" , ComputeModuleHash( szEngineHash ) );
+    Msg("EH: %s\n", ComputeModuleHash(szEngineHash));
 #endif // DEDICATED_SERVER
 
     string_path fname;
@@ -229,13 +234,13 @@ PROTECT_API void InitSettings()
     CInifile::allow_include_func_t tmp_functor;
     tmp_functor.bind(&tmp_excluder, &path_excluder_predicate::is_allow_include);
     pSettingsAuth = xr_new<CInifile>(
-        fname,
-        TRUE,
-        TRUE,
-        FALSE,
-        0,
-        tmp_functor
-        );
+                        fname,
+                        TRUE,
+                        TRUE,
+                        FALSE,
+                        0,
+                        tmp_functor
+                    );
 
     FS.update_path(fname, "$game_config$", "game.ltx");
     pGameIni = xr_new<CInifile>(fname, TRUE);
@@ -250,9 +255,9 @@ PROTECT_API void InitConsole()
         Console = xr_new<CTextConsole>();
     }
 #else
-        // else
+    // else
     {
-        Console = xr_new<CConsole> ();
+        Console = xr_new<CConsole>();
     }
 #endif
     Console->Initialize();
@@ -359,10 +364,10 @@ void Startup()
         LPCSTR pStartup = strstr(Core.Params, "-start ");
         if (pStartup) Console->Execute(pStartup + 1);
     }
- {
-     LPCSTR pStartup = strstr(Core.Params, "-load ");
-     if (pStartup) Console->Execute(pStartup + 1);
- }
+    {
+        LPCSTR pStartup = strstr(Core.Params, "-load ");
+        if (pStartup) Console->Execute(pStartup + 1);
+    }
 
     // Initialize APP
     //#ifndef DEDICATED_SERVER
@@ -611,7 +616,7 @@ BOOL IsOutOfVirtualMemory()
 
     SECUROM_MARKER_HIGH_SECURITY_ON(1)
 
-        MEMORYSTATUSEX statex;
+    MEMORYSTATUSEX statex;
     DWORD dwPageFileInMB = 0;
     DWORD dwPhysMemInMB = 0;
     HINSTANCE hApp = 0;
@@ -643,7 +648,7 @@ BOOL IsOutOfVirtualMemory()
 
     SECUROM_MARKER_HIGH_SECURITY_OFF(1)
 
-        return 1;
+    return 1;
 }
 
 #include "xr_ioc_cmd.h"
@@ -657,36 +662,36 @@ BOOL IsOutOfVirtualMemory()
 //#define RUSSIAN_BUILD
 
 #if 0
-void foo ()
+void foo()
 {
-    typedef std::map<int,int> TEST_MAP;
+    typedef std::map<int, int> TEST_MAP;
     TEST_MAP temp;
-    temp.insert (std::make_pair(0,0));
+    temp.insert(std::make_pair(0, 0));
     TEST_MAP::const_iterator I = temp.upper_bound(2);
     if (I == temp.end())
-        OutputDebugString ("end() returned\r\n");
+        OutputDebugString("end() returned\r\n");
     else
-        OutputDebugString ("last element returned\r\n");
+        OutputDebugString("last element returned\r\n");
 
     typedef void* pvoid;
 
     LPCSTR path = "d:\\network\\stalker_net2";
-    FILE *f = fopen(path,"rb");
+    FILE* f = fopen(path, "rb");
     int file_handle = _fileno(f);
     u32 buffer_size = _filelength(file_handle);
     pvoid buffer = xr_malloc(buffer_size);
-    size_t result = fread(buffer,buffer_size,1,f);
-    R_ASSERT3 (!buffer_size || (result && (buffer_size >= result)),"Cannot read from file",path);
-    fclose (f);
+    size_t result = fread(buffer, buffer_size, 1, f);
+    R_ASSERT3(!buffer_size || (result && (buffer_size >= result)), "Cannot read from file", path);
+    fclose(f);
 
     u32 compressed_buffer_size = rtc_csize(buffer_size);
     pvoid compressed_buffer = xr_malloc(compressed_buffer_size);
-    u32 compressed_size = rtc_compress(compressed_buffer,compressed_buffer_size,buffer,buffer_size);
+    u32 compressed_size = rtc_compress(compressed_buffer, compressed_buffer_size, buffer, buffer_size);
 
     LPCSTR compressed_path = "d:\\network\\stalker_net2.rtc";
-    FILE *f1 = fopen(compressed_path,"wb");
-    fwrite (compressed_buffer,compressed_size,1,f1);
-    fclose (f1);
+    FILE* f1 = fopen(compressed_path, "wb");
+    fwrite(compressed_buffer, compressed_size, 1, f1);
+    fclose(f1);
 }
 #endif // 0
 
@@ -694,18 +699,18 @@ ENGINE_API bool g_dedicated_server = false;
 
 #ifndef DEDICATED_SERVER
 // forward declaration for Parental Control checks
-BOOL IsPCAccessAllowed(); 
+BOOL IsPCAccessAllowed();
 #endif // DEDICATED_SERVER
 
 int APIENTRY WinMain_impl(HINSTANCE hInstance,
-    HINSTANCE hPrevInstance,
-    char * lpCmdLine,
-    int nCmdShow)
+                          HINSTANCE hPrevInstance,
+                          char* lpCmdLine,
+                          int nCmdShow)
 {
 #ifdef DEDICATED_SERVER
     Debug._initialize(true);
 #else // DEDICATED_SERVER
-    Debug._initialize (false);
+    Debug._initialize(false);
 #endif // DEDICATED_SERVER
 
     if (!IsDebuggerPresent())
@@ -724,10 +729,10 @@ int APIENTRY WinMain_impl(HINSTANCE hInstance,
             BOOL const result =
 #endif // #ifdef DEBUG
                 heap_set_information(
-                GetProcessHeap(),
-                HeapCompatibilityInformation,
-                &HeapFragValue,
-                sizeof(HeapFragValue)
+                    GetProcessHeap(),
+                    HeapCompatibilityInformation,
+                    &HeapFragValue,
+                    sizeof(HeapFragValue)
                 );
             VERIFY2(result, "can't set process heap low fragmentation");
         }
@@ -737,12 +742,13 @@ int APIENTRY WinMain_impl(HINSTANCE hInstance,
 #ifndef DEDICATED_SERVER
 
     // Check for virtual memory
-    if ( ( strstr( lpCmdLine , "--skipmemcheck" ) == NULL ) && IsOutOfVirtualMemory() )
+    if ((strstr(lpCmdLine, "--skipmemcheck") == NULL) && IsOutOfVirtualMemory())
         return 0;
 
     // Parental Control for Vista and upper
-    if ( ! IsPCAccessAllowed() ) {
-        MessageBox( NULL , "Access restricted" , "Parental Control" , MB_OK | MB_ICONERROR );
+    if (!IsPCAccessAllowed())
+    {
+        MessageBox(NULL, "Access restricted", "Parental Control", MB_OK | MB_ICONERROR);
         return 1;
     }
 
@@ -751,16 +757,19 @@ int APIENTRY WinMain_impl(HINSTANCE hInstance,
 #define STALKER_PRESENCE_MUTEX "Local\\STALKER-COP"
 
     HANDLE hCheckPresenceMutex = INVALID_HANDLE_VALUE;
-    hCheckPresenceMutex = OpenMutex( READ_CONTROL , FALSE , STALKER_PRESENCE_MUTEX );
-    if ( hCheckPresenceMutex == NULL ) {
+    hCheckPresenceMutex = OpenMutex(READ_CONTROL, FALSE, STALKER_PRESENCE_MUTEX);
+    if (hCheckPresenceMutex == NULL)
+    {
         // New mutex
-        hCheckPresenceMutex = CreateMutex( NULL , FALSE , STALKER_PRESENCE_MUTEX );
-        if ( hCheckPresenceMutex == NULL )
+        hCheckPresenceMutex = CreateMutex(NULL, FALSE, STALKER_PRESENCE_MUTEX);
+        if (hCheckPresenceMutex == NULL)
             // Shit happens
             return 2;
-    } else {
+    }
+    else
+    {
         // Already running
-        CloseHandle( hCheckPresenceMutex );
+        CloseHandle(hCheckPresenceMutex);
         return 1;
     }
 #endif
@@ -789,7 +798,7 @@ int APIENTRY WinMain_impl(HINSTANCE hInstance,
         logoRect.right - logoRect.left,
         logoRect.bottom - logoRect.top,
         SWP_NOMOVE | SWP_SHOWWINDOW// | SWP_NOSIZE
-        );
+    );
     UpdateWindow(logoWindow);
 
     // AVI
@@ -823,93 +832,92 @@ int APIENTRY WinMain_impl(HINSTANCE hInstance,
     }
 
 #ifndef DEDICATED_SERVER
- {
-     damn_keys_filter filter;
-     (void)filter;
+    {
+        damn_keys_filter filter;
+        (void)filter;
 #endif // DEDICATED_SERVER
 
-     FPU::m24r();
-     InitEngine();
-
-     InitInput();
-
-     InitConsole();
-
-     Engine.External.CreateRendererList();
-
-     LPCSTR benchName = "-batch_benchmark ";
-     if (strstr(lpCmdLine, benchName))
-     {
-         int sz = xr_strlen(benchName);
-         string64 b_name;
-         sscanf(strstr(Core.Params, benchName) + sz, "%[^ ] ", b_name);
-         doBenchmark(b_name);
-         return 0;
-     }
-
-     Msg("command line %s", lpCmdLine);
-     LPCSTR sashName = "-openautomate ";
-     if (strstr(lpCmdLine, sashName))
-     {
-         int sz = xr_strlen(sashName);
-         string512 sash_arg;
-         sscanf(strstr(Core.Params, sashName) + sz, "%[^ ] ", sash_arg);
-         //doBenchmark (sash_arg);
-         g_SASH.Init(sash_arg);
-         g_SASH.MainLoop();
-         return 0;
-     }
-
-     if (strstr(lpCmdLine, "-launcher"))
-     {
-         int l_res = doLauncher();
-         if (l_res != 0)
-             return 0;
-     };
+        FPU::m24r();
+        InitEngine();
+
+        InitInput();
+
+        InitConsole();
+
+        Engine.External.CreateRendererList();
+
+        LPCSTR benchName = "-batch_benchmark ";
+        if (strstr(lpCmdLine, benchName))
+        {
+            int sz = xr_strlen(benchName);
+            string64 b_name;
+            sscanf(strstr(Core.Params, benchName) + sz, "%[^ ] ", b_name);
+            doBenchmark(b_name);
+            return 0;
+        }
+
+        Msg("command line %s", lpCmdLine);
+        LPCSTR sashName = "-openautomate ";
+        if (strstr(lpCmdLine, sashName))
+        {
+            int sz = xr_strlen(sashName);
+            string512 sash_arg;
+            sscanf(strstr(Core.Params, sashName) + sz, "%[^ ] ", sash_arg);
+            //doBenchmark (sash_arg);
+            g_SASH.Init(sash_arg);
+            g_SASH.MainLoop();
+            return 0;
+        }
+
+        if (strstr(lpCmdLine, "-launcher"))
+        {
+            int l_res = doLauncher();
+            if (l_res != 0)
+                return 0;
+        };
 
 #ifndef DEDICATED_SERVER
-     if(strstr(Core.Params,"-r2a")) 
-         Console->Execute ("renderer renderer_r2a");
-     else
-         if(strstr(Core.Params,"-r2")) 
-             Console->Execute ("renderer renderer_r2");
-         else
-         {
-             CCC_LoadCFG_custom* pTmp = xr_new<CCC_LoadCFG_custom>("renderer ");
-             pTmp->Execute (Console->ConfigFile);
-             xr_delete (pTmp);
-         }
+        if (strstr(Core.Params, "-r2a"))
+            Console->Execute("renderer renderer_r2a");
+        else if (strstr(Core.Params, "-r2"))
+            Console->Execute("renderer renderer_r2");
+        else
+        {
+            CCC_LoadCFG_custom* pTmp = xr_new<CCC_LoadCFG_custom>("renderer ");
+            pTmp->Execute(Console->ConfigFile);
+            xr_delete(pTmp);
+        }
 #else
-     Console->Execute("renderer renderer_r1");
+        Console->Execute("renderer renderer_r1");
 #endif
-     //. InitInput ( );
-     Engine.External.Initialize();
-     Console->Execute("stat_memory");
-
-     Startup();
-     Core._destroy();
-
-     // check for need to execute something external
-     if (/*xr_strlen(g_sLaunchOnExit_params) && */xr_strlen(g_sLaunchOnExit_app))
-     {
-         //CreateProcess need to return results to next two structures
-         STARTUPINFO si;
-         PROCESS_INFORMATION pi;
-         ZeroMemory(&si, sizeof(si));
-         si.cb = sizeof(si);
-         ZeroMemory(&pi, sizeof(pi));
-         //We use CreateProcess to setup working folder
-         char const * temp_wf = (xr_strlen(g_sLaunchWorkingFolder) > 0) ? g_sLaunchWorkingFolder : NULL;
-         CreateProcess(g_sLaunchOnExit_app, g_sLaunchOnExit_params, NULL, NULL, FALSE, 0, NULL,
-             temp_wf, &si, &pi);
-
-     }
+        //. InitInput ( );
+        Engine.External.Initialize();
+        Console->Execute("stat_memory");
+
+        Startup();
+        Core._destroy();
+
+        // check for need to execute something external
+        if (/*xr_strlen(g_sLaunchOnExit_params) && */xr_strlen(g_sLaunchOnExit_app))
+        {
+            //CreateProcess need to return results to next two structures
+            STARTUPINFO si;
+            PROCESS_INFORMATION pi;
+            ZeroMemory(&si, sizeof(si));
+            si.cb = sizeof(si);
+            ZeroMemory(&pi, sizeof(pi));
+            //We use CreateProcess to setup working folder
+            char const* temp_wf = (xr_strlen(g_sLaunchWorkingFolder) > 0) ? g_sLaunchWorkingFolder : NULL;
+            CreateProcess(g_sLaunchOnExit_app, g_sLaunchOnExit_params, NULL, NULL, FALSE, 0, NULL,
+                          temp_wf, &si, &pi);
+
+        }
 #ifndef DEDICATED_SERVER
-#ifdef NO_MULTI_INSTANCES 
-     // Delete application presence mutex
-     CloseHandle( hCheckPresenceMutex );
+#ifdef NO_MULTI_INSTANCES
+        // Delete application presence mutex
+        CloseHandle(hCheckPresenceMutex);
 #endif
- }
+    }
     // here damn_keys_filter class instanse will be destroyed
 #endif // DEDICATED_SERVER
 
@@ -933,9 +941,9 @@ int stack_overflow_exception_filter(int exception_code)
 #include <boost/crc.hpp>
 
 int APIENTRY WinMain(HINSTANCE hInstance,
-    HINSTANCE hPrevInstance,
-    char * lpCmdLine,
-    int nCmdShow)
+                     HINSTANCE hPrevInstance,
+                     char* lpCmdLine,
+                     int nCmdShow)
 {
     //FILE* file = 0;
     //fopen_s ( &file, "z:\\development\\call_of_prypiat\\resources\\gamedata\\shaders\\r3\\objects\\r4\\accum_sun_near_msaa_minmax.ps\\2048__1___________4_11141_", "rb" );
@@ -968,15 +976,15 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
 LPCSTR _GetFontTexName(LPCSTR section)
 {
-    static char* tex_names[] = { "texture800", "texture", "texture1600" };
+    static char* tex_names[] = {"texture800", "texture", "texture1600"};
     int def_idx = 1;//default 1024x768
     int idx = def_idx;
 
 #if 0
     u32 w = Device.dwWidth;
 
-    if(w<=800) idx = 0;
-    else if(w<=1280)idx = 1;
+    if (w <= 800) idx = 0;
+    else if (w <= 1280)idx = 1;
     else idx = 2;
 #else
     u32 h = Device.dwHeight;
@@ -1103,17 +1111,17 @@ void CApplication::OnEvent(EVENT E, u64 P1, u64 P2)
 
 #ifdef NO_SINGLE
         Console->Execute("main_menu on");
-        if ( (op_server == NULL) ||
-            (!xr_strlen(op_server)) ||
-            (
-            ( strstr(op_server, "/dm") || strstr(op_server, "/deathmatch") ||
-            strstr(op_server, "/tdm") || strstr(op_server, "/teamdeathmatch") ||
-            strstr(op_server, "/ah") || strstr(op_server, "/artefacthunt") ||
-            strstr(op_server, "/cta") || strstr(op_server, "/capturetheartefact")
-            ) && 
-            !strstr(op_server, "/alife")
-            )
-            )
+        if ((op_server == NULL) ||
+                (!xr_strlen(op_server)) ||
+                (
+                    (strstr(op_server, "/dm") || strstr(op_server, "/deathmatch") ||
+                     strstr(op_server, "/tdm") || strstr(op_server, "/teamdeathmatch") ||
+                     strstr(op_server, "/ah") || strstr(op_server, "/artefacthunt") ||
+                     strstr(op_server, "/cta") || strstr(op_server, "/capturetheartefact")
+                    ) &&
+                    !strstr(op_server, "/alife")
+                )
+           )
 #endif // #ifdef NO_SINGLE
         {
             Console->Execute("main_menu off");
@@ -1200,7 +1208,7 @@ void CApplication::LoadBegin()
         g_appLoaded = FALSE;
 
 #ifndef DEDICATED_SERVER
-        _InitializeFont (pFontSystem,"ui_font_letterica18_russian",0);
+        _InitializeFont(pFontSystem, "ui_font_letterica18_russian", 0);
 
         m_pRender->LoadBegin();
 #endif
@@ -1262,7 +1270,8 @@ void CApplication::LoadStage()
 {
     load_stage++;
     VERIFY(ll_dwReference);
-    Msg("* phase time: %d ms", phase_timer.GetElapsed_ms()); phase_timer.Start();
+    Msg("* phase time: %d ms", phase_timer.GetElapsed_ms());
+    phase_timer.Start();
     Msg("* phase cmem: %d K", Memory.mem_usage() / 1024);
 
     if (g_pGamePersistent->GameType() == 1 && strstr(Core.Params, "alife"))
@@ -1298,7 +1307,7 @@ void CApplication::Level_Append(LPCSTR folder)
         FS.exist("$game_levels$", N2) &&
         FS.exist("$game_levels$", N3) &&
         FS.exist("$game_levels$", N4)
-        )
+    )
     {
         sLevelInfo LI;
         LI.folder = xr_strdup(folder);
@@ -1311,11 +1320,11 @@ void CApplication::Level_Scan()
 {
     SECUROM_MARKER_PERFORMANCE_ON(8)
 
-        for (u32 i = 0; i < Levels.size(); i++)
-        {
+    for (u32 i = 0; i < Levels.size(); i++)
+    {
         xr_free(Levels[i].folder);
         xr_free(Levels[i].name);
-        }
+    }
     Levels.clear();
 
 
@@ -1347,7 +1356,7 @@ void CApplication::Level_Set(u32 L)
 {
     SECUROM_MARKER_PERFORMANCE_ON(9)
 
-        if (L >= Levels.size()) return;
+    if (L >= Levels.size()) return;
     FS.get_path("$level$")->_set(Levels[L].folder);
 
     static string_path path;
@@ -1390,7 +1399,7 @@ int CApplication::Level_ID(LPCSTR name, LPCSTR ver, bool bSet)
 
     SECUROM_MARKER_SECURITY_ON(7)
 
-        CLocatorAPI::archives_it it = FS.m_archives.begin();
+    CLocatorAPI::archives_it it = FS.m_archives.begin();
     CLocatorAPI::archives_it it_e = FS.m_archives.end();
     bool arch_res = false;
 
@@ -1431,7 +1440,7 @@ int CApplication::Level_ID(LPCSTR name, LPCSTR ver, bool bSet)
 
     SECUROM_MARKER_SECURITY_OFF(7)
 
-        return result;
+    return result;
 }
 
 CInifile* CApplication::GetArchiveHeader(LPCSTR name, LPCSTR ver)
@@ -1464,62 +1473,64 @@ void CApplication::LoadAllArchives()
 
 #ifndef DEDICATED_SERVER
 // Parential control for Vista and upper
-typedef BOOL (*PCCPROC)( CHAR* ); 
+typedef BOOL(*PCCPROC)(CHAR*);
 
 BOOL IsPCAccessAllowed()
 {
-    CHAR szPCtrlChk[ MAX_PATH ] , szGDF[ MAX_PATH ] , *pszLastSlash;
+    CHAR szPCtrlChk[MAX_PATH], szGDF[MAX_PATH], *pszLastSlash;
     HINSTANCE hPCtrlChk = NULL;
     PCCPROC pctrlchk = NULL;
     BOOL bAllowed = TRUE;
 
-    if ( ! GetModuleFileName( NULL , szPCtrlChk , MAX_PATH ) )
+    if (!GetModuleFileName(NULL, szPCtrlChk, MAX_PATH))
         return TRUE;
 
-    if ( ( pszLastSlash = strrchr( szPCtrlChk , '\\' ) ) == NULL )
+    if ((pszLastSlash = strrchr(szPCtrlChk, '\\')) == NULL)
         return TRUE;
 
     *pszLastSlash = '\0';
 
-    strcpy_s( szGDF , szPCtrlChk );
+    strcpy_s(szGDF, szPCtrlChk);
 
-    strcat_s( szPCtrlChk , "\\pctrlchk.dll" );
-    if ( GetFileAttributes( szPCtrlChk ) == INVALID_FILE_ATTRIBUTES )
+    strcat_s(szPCtrlChk, "\\pctrlchk.dll");
+    if (GetFileAttributes(szPCtrlChk) == INVALID_FILE_ATTRIBUTES)
         return TRUE;
 
-    if ( ( pszLastSlash = strrchr( szGDF , '\\' ) ) == NULL )
+    if ((pszLastSlash = strrchr(szGDF, '\\')) == NULL)
         return TRUE;
 
     *pszLastSlash = '\0';
 
-    strcat_s( szGDF , "\\Stalker-COP.exe" );
-    if ( GetFileAttributes( szGDF ) == INVALID_FILE_ATTRIBUTES )
+    strcat_s(szGDF, "\\Stalker-COP.exe");
+    if (GetFileAttributes(szGDF) == INVALID_FILE_ATTRIBUTES)
         return TRUE;
 
-    if ( ( hPCtrlChk = LoadLibrary( szPCtrlChk ) ) == NULL )
+    if ((hPCtrlChk = LoadLibrary(szPCtrlChk)) == NULL)
         return TRUE;
 
-    if ( ( pctrlchk = (PCCPROC) GetProcAddress( hPCtrlChk , "pctrlchk" ) ) == NULL ) {
-        FreeLibrary( hPCtrlChk );
+    if ((pctrlchk = (PCCPROC)GetProcAddress(hPCtrlChk, "pctrlchk")) == NULL)
+    {
+        FreeLibrary(hPCtrlChk);
         return TRUE;
     }
 
-    bAllowed = pctrlchk( szGDF );
+    bAllowed = pctrlchk(szGDF);
 
-    FreeLibrary( hPCtrlChk );
+    FreeLibrary(hPCtrlChk);
 
     return bAllowed;
 }
 #endif // DEDICATED_SERVER
 
 //launcher stuff----------------------------
-extern "C"{
+extern "C" {
     typedef int __cdecl LauncherFunc(int);
 }
 HMODULE hLauncher = NULL;
 LauncherFunc* pLauncher = NULL;
 
-void InitLauncher(){
+void InitLauncher()
+{
     if (hLauncher)
         return;
     hLauncher = LoadLibrary("xrLauncher.dll");
@@ -1530,11 +1541,13 @@ void InitLauncher(){
     R_ASSERT2(pLauncher, "Cannot obtain RunXRLauncher function from xrLauncher.dll");
 };
 
-void FreeLauncher(){
+void FreeLauncher()
+{
     if (hLauncher)
     {
         FreeLibrary(hLauncher);
-        hLauncher = NULL; pLauncher = NULL;
+        hLauncher = NULL;
+        pLauncher = NULL;
     };
 }
 
diff --git a/src/xrEngine/xrHemisphere.cpp b/src/xrEngine/xrHemisphere.cpp
index 4c624aceb6b..f863eb592c0 100644
--- a/src/xrEngine/xrHemisphere.cpp
+++ b/src/xrEngine/xrHemisphere.cpp
@@ -3,605 +3,612 @@
 
 #include "xrHemisphere.h"
 
-#define HEMI1_VERTS	26
-#define HEMI1_FACES	40
-#define HEMI2_VERTS	91
-#define HEMI2_FACES	160
-#define HEMI3_VERTS	196
+#define HEMI1_VERTS 26
+#define HEMI1_FACES 40
+#define HEMI2_VERTS 91
+#define HEMI2_FACES 160
+#define HEMI3_VERTS 196
 
 #pragma warning (disable:4305)
-const Fvector hemi_1[HEMI1_VERTS] = {
-	{ 0.525730,	 0.850655,	-0.000000},
-	{ 0.162460,	 0.850655,	 0.500000},
-	{ 0.000000,	 1.000000,	-0.000000},
-	{-0.425324,	 0.850655,	 0.309015},
-	{-0.425324,	 0.850655,	-0.309017},
-	{ 0.162460,	 0.850655,	-0.500000},
-	{ 0.688194,	 0.525730,	 0.500000},
-	{-0.262865,	 0.525730,	 0.809013},
-	{-0.850647,	 0.525730,	-0.000001},
-	{-0.262865,	 0.525730,	-0.809021},
-	{ 0.688194,	 0.525730,	-0.500000},
-	{ 0.894424,	 0.447212,	-0.000000},
-	{ 0.276394,	 0.447212,	 0.850647},
-	{-0.723610,	 0.447212,	 0.525730},
-	{-0.723610,	 0.447212,	-0.525734},
-	{ 0.276394,	 0.447212,	-0.850655},
-	{ 0.951057,	 0.000000,	 0.309017},
-	{ 0.587788,	 0.000000,	 0.809013},
-	{ 0.000000,	 0.000000,	 1.000000},
-	{-0.587784,	 0.000000,	 0.809013},
-	{-0.951057,	 0.000000,	 0.309015},
-	{-0.951057,	 0.000000,	-0.309017},
-	{-0.587784,	 0.000000,	-0.809021},
-	{ 0.000000,	 0.000000,	-1.000000},
-	{ 0.587788,	 0.000000,	-0.809013},
-	{ 0.951057,	 0.000000,	-0.309017},
+const Fvector hemi_1[HEMI1_VERTS] =
+{
+    {0.525730, 0.850655, -0.000000},
+    {0.162460, 0.850655, 0.500000},
+    {0.000000, 1.000000, -0.000000},
+    {-0.425324, 0.850655, 0.309015},
+    {-0.425324, 0.850655, -0.309017},
+    {0.162460, 0.850655, -0.500000},
+    {0.688194, 0.525730, 0.500000},
+    {-0.262865, 0.525730, 0.809013},
+    {-0.850647, 0.525730, -0.000001},
+    {-0.262865, 0.525730, -0.809021},
+    {0.688194, 0.525730, -0.500000},
+    {0.894424, 0.447212, -0.000000},
+    {0.276394, 0.447212, 0.850647},
+    {-0.723610, 0.447212, 0.525730},
+    {-0.723610, 0.447212, -0.525734},
+    {0.276394, 0.447212, -0.850655},
+    {0.951057, 0.000000, 0.309017},
+    {0.587788, 0.000000, 0.809013},
+    {0.000000, 0.000000, 1.000000},
+    {-0.587784, 0.000000, 0.809013},
+    {-0.951057, 0.000000, 0.309015},
+    {-0.951057, 0.000000, -0.309017},
+    {-0.587784, 0.000000, -0.809021},
+    {0.000000, 0.000000, -1.000000},
+    {0.587788, 0.000000, -0.809013},
+    {0.951057, 0.000000, -0.309017},
 };
-const u16 hemi_1v[HEMI1_FACES*3] = {
-	0,		1,		2,
-	1,		3,		2,
-	3,		4,		2,
-	4,		5,		2,
-	5,		0,		2,
-	1,		0,		6,
-	3,		1,		7,
-	4,		3,		8,
-	5,		4,		9,
-	0,		5,		10,
-	10,		11,		0,
-	11,		6,		0,
-	6,		12,		1,
-	12,		7,		1,
-	7,		13,		3,
-	13,		8,		3,
-	8,		14,		4,
-	14,		9,		4,
-	9,		15,		5,
-	15,		10,		5,
-	6,		11,		16,
-	12,		6,		17,
-	7,		12,		18,
-	13,		7,		19,
-	8,		13,		20,
-	14,		8,		21,
-	9,		14,		22,
-	15,		9,		23,
-	10,		15,		24,
-	11,		10,		25,
-	25,		16,		11,
-	16,		17,		6,
-	17,		18,		12,
-	18,		19,		7,
-	19,		20,		13,
-	20,		21,		8,
-	21,		22,		14,
-	22,		23,		9,
-	23,		24,		15,
-	24,		25,		10,
+const u16 hemi_1v[HEMI1_FACES * 3] =
+{
+    0, 1, 2,
+    1, 3, 2,
+    3, 4, 2,
+    4, 5, 2,
+    5, 0, 2,
+    1, 0, 6,
+    3, 1, 7,
+    4, 3, 8,
+    5, 4, 9,
+    0, 5, 10,
+    10, 11, 0,
+    11, 6, 0,
+    6, 12, 1,
+    12, 7, 1,
+    7, 13, 3,
+    13, 8, 3,
+    8, 14, 4,
+    14, 9, 4,
+    9, 15, 5,
+    15, 10, 5,
+    6, 11, 16,
+    12, 6, 17,
+    7, 12, 18,
+    13, 7, 19,
+    8, 13, 20,
+    14, 8, 21,
+    9, 14, 22,
+    15, 9, 23,
+    10, 15, 24,
+    11, 10, 25,
+    25, 16, 11,
+    16, 17, 6,
+    17, 18, 12,
+    18, 19, 7,
+    19, 20, 13,
+    20, 21, 8,
+    21, 22, 14,
+    22, 23, 9,
+    23, 24, 15,
+    24, 25, 10,
 };
 
-const Fvector hemi_2[HEMI2_VERTS] = 
+const Fvector hemi_2[HEMI2_VERTS] =
+{
+    {0.273268, 0.961937, -0.000000},
+    {0.084444, 0.961937, 0.259892},
+    {0.000000, 1.000000, -0.000000},
+    {0.525730, 0.850655, -0.000000},
+    {0.361805, 0.894424, 0.262865},
+    {0.162460, 0.850655, 0.500000},
+    {-0.221077, 0.961937, 0.160622},
+    {-0.138196, 0.894424, 0.425324},
+    {-0.425324, 0.850655, 0.309015},
+    {-0.221077, 0.961937, -0.160623},
+    {-0.447212, 0.894424, -0.000001},
+    {-0.425324, 0.850655, -0.309017},
+    {0.084445, 0.961937, -0.259892},
+    {-0.138196, 0.894424, -0.425327},
+    {0.162460, 0.850655, -0.500000},
+    {0.361805, 0.894424, -0.262865},
+    {0.447212, 0.723610, 0.525730},
+    {0.638195, 0.723610, 0.262865},
+    {0.688194, 0.525730, 0.500000},
+    {-0.361801, 0.723610, 0.587784},
+    {-0.052786, 0.723610, 0.688187},
+    {-0.262865, 0.525730, 0.809013},
+    {-0.670822, 0.723610, -0.162460},
+    {-0.670822, 0.723610, 0.162458},
+    {-0.850647, 0.525730, -0.000001},
+    {-0.052786, 0.723610, -0.688194},
+    {-0.361801, 0.723610, -0.587788},
+    {-0.262865, 0.525730, -0.809021},
+    {0.638195, 0.723610, -0.262865},
+    {0.447212, 0.723610, -0.525734},
+    {0.688194, 0.525730, -0.500000},
+    {0.738174, 0.674606, -0.000000},
+    {0.822617, 0.505722, -0.259892},
+    {0.894424, 0.447212, -0.000000},
+    {0.822617, 0.505722, 0.259892},
+    {0.228109, 0.674606, 0.702049},
+    {0.501377, 0.505722, 0.702049},
+    {0.276394, 0.447212, 0.850647},
+    {0.007032, 0.505722, 0.862671},
+    {-0.597195, 0.674606, 0.433887},
+    {-0.512752, 0.505722, 0.693779},
+    {-0.723602, 0.447212, 0.525730},
+    {-0.818275, 0.505722, 0.273266},
+    {-0.597195, 0.674606, -0.433887},
+    {-0.818275, 0.505722, -0.273268},
+    {-0.723602, 0.447212, -0.525734},
+    {-0.512753, 0.505722, -0.693779},
+    {0.228109, 0.674606, -0.702049},
+    {0.007032, 0.505722, -0.862671},
+    {0.276394, 0.447212, -0.850655},
+    {0.501377, 0.505722, -0.702049},
+    {0.861801, 0.276394, 0.425323},
+    {0.959251, 0.232454, 0.160622},
+    {0.951057, 0.000000, 0.309017},
+    {0.449184, 0.232454, 0.862671},
+    {0.670822, 0.276394, 0.688187},
+    {0.587788, 0.000000, 0.809013},
+    {-0.138196, 0.276394, 0.951057},
+    {0.143665, 0.232454, 0.961937},
+    {0.000000, 0.000000, 1.000000},
+    {-0.681641, 0.232454, 0.693779},
+    {-0.447212, 0.276394, 0.850647},
+    {-0.587784, 0.000000, 0.809013},
+    {-0.947212, 0.276394, 0.162458},
+    {-0.870460, 0.232454, 0.433887},
+    {-0.951057, 0.000000, 0.309015},
+    {-0.870460, 0.232454, -0.433887},
+    {-0.947212, 0.276394, -0.162460},
+    {-0.951057, 0.000000, -0.309017},
+    {-0.447212, 0.276394, -0.850655},
+    {-0.681641, 0.232454, -0.693779},
+    {-0.587784, 0.000000, -0.809021},
+    {0.143665, 0.232454, -0.961937},
+    {-0.138196, 0.276394, -0.951057},
+    {0.000000, 0.000000, -1.000000},
+    {0.670822, 0.276394, -0.688194},
+    {0.449188, 0.232454, -0.862671},
+    {0.587788, 0.000000, -0.809013},
+    {0.959251, 0.232454, -0.160623},
+    {0.861801, 0.276394, -0.425327},
+    {0.951057, 0.000000, -0.309017},
+    {1.000000, 0.000000, -0.000000},
+    {0.809021, 0.000000, 0.587784},
+    {0.309017, 0.000000, 0.951057},
+    {-0.309015, 0.000000, 0.951057},
+    {-0.809013, 0.000000, 0.587784},
+    {-1.000000, 0.000000, -0.000001},
+    {-0.809013, 0.000000, -0.587788},
+    {-0.309015, 0.000000, -0.951057},
+    {0.309017, 0.000000, -0.951057},
+    {0.809021, 0.000000, -0.587788},
+};
+const u16 hemi_2v[HEMI2_FACES * 3] =
 {
-	{ 0.273268,	 0.961937,	-0.000000},
-	{ 0.084444,	 0.961937,	 0.259892},
-	{ 0.000000,	 1.000000,	-0.000000},
-	{ 0.525730,	 0.850655,	-0.000000},
-	{ 0.361805,	 0.894424,	 0.262865},
-	{ 0.162460,	 0.850655,	 0.500000},
-	{-0.221077,	 0.961937,	 0.160622},
-	{-0.138196,	 0.894424,	 0.425324},
-	{-0.425324,	 0.850655,	 0.309015},
-	{-0.221077,	 0.961937,	-0.160623},
-	{-0.447212,	 0.894424,	-0.000001},
-	{-0.425324,	 0.850655,	-0.309017},
-	{ 0.084445,	 0.961937,	-0.259892},
-	{-0.138196,	 0.894424,	-0.425327},
-	{ 0.162460,	 0.850655,	-0.500000},
-	{ 0.361805,	 0.894424,	-0.262865},
-	{ 0.447212,	 0.723610,	 0.525730},
-	{ 0.638195,	 0.723610,	 0.262865},
-	{ 0.688194,	 0.525730,	 0.500000},
-	{-0.361801,	 0.723610,	 0.587784},
-	{-0.052786,	 0.723610,	 0.688187},
-	{-0.262865,	 0.525730,	 0.809013},
-	{-0.670822,	 0.723610,	-0.162460},
-	{-0.670822,	 0.723610,	 0.162458},
-	{-0.850647,	 0.525730,	-0.000001},
-	{-0.052786,	 0.723610,	-0.688194},
-	{-0.361801,	 0.723610,	-0.587788},
-	{-0.262865,	 0.525730,	-0.809021},
-	{ 0.638195,	 0.723610,	-0.262865},
-	{ 0.447212,	 0.723610,	-0.525734},
-	{ 0.688194,	 0.525730,	-0.500000},
-	{ 0.738174,	 0.674606,	-0.000000},
-	{ 0.822617,	 0.505722,	-0.259892},
-	{ 0.894424,	 0.447212,	-0.000000},
-	{ 0.822617,	 0.505722,	 0.259892},
-	{ 0.228109,	 0.674606,	 0.702049},
-	{ 0.501377,	 0.505722,	 0.702049},
-	{ 0.276394,	 0.447212,	 0.850647},
-	{ 0.007032,	 0.505722,	 0.862671},
-	{-0.597195,	 0.674606,	 0.433887},
-	{-0.512752,	 0.505722,	 0.693779},
-	{-0.723602,	 0.447212,	 0.525730},
-	{-0.818275,	 0.505722,	 0.273266},
-	{-0.597195,	 0.674606,	-0.433887},
-	{-0.818275,	 0.505722,	-0.273268},
-	{-0.723602,	 0.447212,	-0.525734},
-	{-0.512753,	 0.505722,	-0.693779},
-	{ 0.228109,	 0.674606,	-0.702049},
-	{ 0.007032,	 0.505722,	-0.862671},
-	{ 0.276394,	 0.447212,	-0.850655},
-	{ 0.501377,	 0.505722,	-0.702049},
-	{ 0.861801,	 0.276394,	 0.425323},
-	{ 0.959251,	 0.232454,	 0.160622},
-	{ 0.951057,	 0.000000,	 0.309017},
-	{ 0.449184,	 0.232454,	 0.862671},
-	{ 0.670822,	 0.276394,	 0.688187},
-	{ 0.587788,	 0.000000,	 0.809013},
-	{-0.138196,	 0.276394,	 0.951057},
-	{ 0.143665,	 0.232454,	 0.961937},
-	{ 0.000000,	 0.000000,	 1.000000},
-	{-0.681641,	 0.232454,	 0.693779},
-	{-0.447212,	 0.276394,	 0.850647},
-	{-0.587784,	 0.000000,	 0.809013},
-	{-0.947212,	 0.276394,	 0.162458},
-	{-0.870460,	 0.232454,	 0.433887},
-	{-0.951057,	 0.000000,	 0.309015},
-	{-0.870460,	 0.232454,	-0.433887},
-	{-0.947212,	 0.276394,	-0.162460},
-	{-0.951057,	 0.000000,	-0.309017},
-	{-0.447212,	 0.276394,	-0.850655},
-	{-0.681641,	 0.232454,	-0.693779},
-	{-0.587784,	 0.000000,	-0.809021},
-	{ 0.143665,	 0.232454,	-0.961937},
-	{-0.138196,	 0.276394,	-0.951057},
-	{ 0.000000,	 0.000000,	-1.000000},
-	{ 0.670822,	 0.276394,	-0.688194},
-	{ 0.449188,	 0.232454,	-0.862671},
-	{ 0.587788,	 0.000000,	-0.809013},
-	{ 0.959251,	 0.232454,	-0.160623},
-	{ 0.861801,	 0.276394,	-0.425327},
-	{ 0.951057,	 0.000000,	-0.309017},
-	{ 1.000000,	 0.000000,	-0.000000},
-	{ 0.809021,	 0.000000,	 0.587784},
-	{ 0.309017,	 0.000000,	 0.951057},
-	{-0.309015,	 0.000000,	 0.951057},
-	{-0.809013,	 0.000000,	 0.587784},
-	{-1.000000,	 0.000000,	-0.000001},
-	{-0.809013,	 0.000000,	-0.587788},
-	{-0.309015,	 0.000000,	-0.951057},
-	{ 0.309017,	 0.000000,	-0.951057},
-	{ 0.809021,	 0.000000,	-0.587788},
-};					   	
-const u16 hemi_2v[HEMI2_FACES*3] = {
-	0,		1,		2,
-	3,		4,		0,
-	4,		1,		0,
-	4,		5,		1,
-	1,		6,		2,
-	5,		7,		1,
-	7,		6,		1,
-	7,		8,		6,
-	6,		9,		2,
-	8,		10,		6,
-	10,		9,		6,
-	10,		11,		9,
-	9,		12,		2,
-	11,		13,		9,
-	13,		12,		9,
-	13,		14,		12,
-	12,		0,		2,
-	14,		15,		12,
-	15,		0,		12,
-	15,		3,		0,
-	16,		17,		18,
-	5,		4,		16,
-	4,		17,		16,
-	4,		3,		17,
-	19,		20,		21,
-	8,		7,		19,
-	7,		20,		19,
-	7,		5,		20,
-	22,		23,		24,
-	11,		10,		22,
-	10,		23,		22,
-	10,		8,		23,
-	25,		26,		27,
-	14,		13,		25,
-	13,		26,		25,
-	13,		11,		26,
-	28,		29,		30,
-	3,		15,		28,
-	15,		29,		28,
-	15,		14,		29,
-	28,		31,		3,
-	30,		32,		28,
-	32,		31,		28,
-	32,		33,		31,
-	31,		17,		3,
-	33,		34,		31,
-	34,		17,		31,
-	34,		18,		17,
-	16,		35,		5,
-	18,		36,		16,
-	36,		35,		16,
-	36,		37,		35,
-	35,		20,		5,
-	37,		38,		35,
-	38,		20,		35,
-	38,		21,		20,
-	19,		39,		8,
-	21,		40,		19,
-	40,		39,		19,
-	40,		41,		39,
-	39,		23,		8,
-	41,		42,		39,
-	42,		23,		39,
-	42,		24,		23,
-	22,		43,		11,
-	24,		44,		22,
-	44,		43,		22,
-	44,		45,		43,
-	43,		26,		11,
-	45,		46,		43,
-	46,		26,		43,
-	46,		27,		26,
-	25,		47,		14,
-	27,		48,		25,
-	48,		47,		25,
-	48,		49,		47,
-	47,		29,		14,
-	49,		50,		47,
-	50,		29,		47,
-	50,		30,		29,
-	51,		52,		53,
-	18,		34,		51,
-	34,		52,		51,
-	34,		33,		52,
-	54,		55,		56,
-	37,		36,		54,
-	36,		55,		54,
-	36,		18,		55,
-	57,		58,		59,
-	21,		38,		57,
-	38,		58,		57,
-	38,		37,		58,
-	60,		61,		62,
-	41,		40,		60,
-	40,		61,		60,
-	40,		21,		61,
-	63,		64,		65,
-	24,		42,		63,
-	42,		64,		63,
-	42,		41,		64,
-	66,		67,		68,
-	45,		44,		66,
-	44,		67,		66,
-	44,		24,		67,
-	69,		70,		71,
-	27,		46,		69,
-	46,		70,		69,
-	46,		45,		70,
-	72,		73,		74,
-	49,		48,		72,
-	48,		73,		72,
-	48,		27,		73,
-	75,		76,		77,
-	30,		50,		75,
-	50,		76,		75,
-	50,		49,		76,
-	78,		79,		80,
-	33,		32,		78,
-	32,		79,		78,
-	32,		30,		79,
-	78,		52,		33,
-	80,		81,		78,
-	81,		52,		78,
-	81,		53,		52,
-	51,		55,		18,
-	53,		82,		51,
-	82,		55,		51,
-	82,		56,		55,
-	54,		58,		37,
-	56,		83,		54,
-	83,		58,		54,
-	83,		59,		58,
-	57,		61,		21,
-	59,		84,		57,
-	84,		61,		57,
-	84,		62,		61,
-	60,		64,		41,
-	62,		85,		60,
-	85,		64,		60,
-	85,		65,		64,
-	63,		67,		24,
-	65,		86,		63,
-	86,		67,		63,
-	86,		68,		67,
-	66,		70,		45,
-	68,		87,		66,
-	87,		70,		66,
-	87,		71,		70,
-	69,		73,		27,
-	71,		88,		69,
-	88,		73,		69,
-	88,		74,		73,
-	72,		76,		49,
-	74,		89,		72,
-	89,		76,		72,
-	89,		77,		76,
-	75,		79,		30,
-	77,		90,		75,
-	90,		79,		75,
-	90,		80,		79,
+    0, 1, 2,
+    3, 4, 0,
+    4, 1, 0,
+    4, 5, 1,
+    1, 6, 2,
+    5, 7, 1,
+    7, 6, 1,
+    7, 8, 6,
+    6, 9, 2,
+    8, 10, 6,
+    10, 9, 6,
+    10, 11, 9,
+    9, 12, 2,
+    11, 13, 9,
+    13, 12, 9,
+    13, 14, 12,
+    12, 0, 2,
+    14, 15, 12,
+    15, 0, 12,
+    15, 3, 0,
+    16, 17, 18,
+    5, 4, 16,
+    4, 17, 16,
+    4, 3, 17,
+    19, 20, 21,
+    8, 7, 19,
+    7, 20, 19,
+    7, 5, 20,
+    22, 23, 24,
+    11, 10, 22,
+    10, 23, 22,
+    10, 8, 23,
+    25, 26, 27,
+    14, 13, 25,
+    13, 26, 25,
+    13, 11, 26,
+    28, 29, 30,
+    3, 15, 28,
+    15, 29, 28,
+    15, 14, 29,
+    28, 31, 3,
+    30, 32, 28,
+    32, 31, 28,
+    32, 33, 31,
+    31, 17, 3,
+    33, 34, 31,
+    34, 17, 31,
+    34, 18, 17,
+    16, 35, 5,
+    18, 36, 16,
+    36, 35, 16,
+    36, 37, 35,
+    35, 20, 5,
+    37, 38, 35,
+    38, 20, 35,
+    38, 21, 20,
+    19, 39, 8,
+    21, 40, 19,
+    40, 39, 19,
+    40, 41, 39,
+    39, 23, 8,
+    41, 42, 39,
+    42, 23, 39,
+    42, 24, 23,
+    22, 43, 11,
+    24, 44, 22,
+    44, 43, 22,
+    44, 45, 43,
+    43, 26, 11,
+    45, 46, 43,
+    46, 26, 43,
+    46, 27, 26,
+    25, 47, 14,
+    27, 48, 25,
+    48, 47, 25,
+    48, 49, 47,
+    47, 29, 14,
+    49, 50, 47,
+    50, 29, 47,
+    50, 30, 29,
+    51, 52, 53,
+    18, 34, 51,
+    34, 52, 51,
+    34, 33, 52,
+    54, 55, 56,
+    37, 36, 54,
+    36, 55, 54,
+    36, 18, 55,
+    57, 58, 59,
+    21, 38, 57,
+    38, 58, 57,
+    38, 37, 58,
+    60, 61, 62,
+    41, 40, 60,
+    40, 61, 60,
+    40, 21, 61,
+    63, 64, 65,
+    24, 42, 63,
+    42, 64, 63,
+    42, 41, 64,
+    66, 67, 68,
+    45, 44, 66,
+    44, 67, 66,
+    44, 24, 67,
+    69, 70, 71,
+    27, 46, 69,
+    46, 70, 69,
+    46, 45, 70,
+    72, 73, 74,
+    49, 48, 72,
+    48, 73, 72,
+    48, 27, 73,
+    75, 76, 77,
+    30, 50, 75,
+    50, 76, 75,
+    50, 49, 76,
+    78, 79, 80,
+    33, 32, 78,
+    32, 79, 78,
+    32, 30, 79,
+    78, 52, 33,
+    80, 81, 78,
+    81, 52, 78,
+    81, 53, 52,
+    51, 55, 18,
+    53, 82, 51,
+    82, 55, 51,
+    82, 56, 55,
+    54, 58, 37,
+    56, 83, 54,
+    83, 58, 54,
+    83, 59, 58,
+    57, 61, 21,
+    59, 84, 57,
+    84, 61, 57,
+    84, 62, 61,
+    60, 64, 41,
+    62, 85, 60,
+    85, 64, 60,
+    85, 65, 64,
+    63, 67, 24,
+    65, 86, 63,
+    86, 67, 63,
+    86, 68, 67,
+    66, 70, 45,
+    68, 87, 66,
+    87, 70, 66,
+    87, 71, 70,
+    69, 73, 27,
+    71, 88, 69,
+    88, 73, 69,
+    88, 74, 73,
+    72, 76, 49,
+    74, 89, 72,
+    89, 76, 72,
+    89, 77, 76,
+    75, 79, 30,
+    77, 90, 75,
+    90, 79, 75,
+    90, 80, 79,
 };
 
-const Fvector hemi_3[HEMI3_VERTS] = 
-{					   	
-	{+0.0000,	+0.5000,	+0.0000	},
-	{+0.2629,	+0.4253,	+0.0000	},
-	{+0.0812,	+0.4253,	+0.2500	},
-	{-0.2127,	+0.4253,	+0.1545	},
-	{-0.2127,	+0.4253,	-0.1545	},
-	{+0.0812,	+0.4253,	-0.2500	},
-	{+0.4472,	+0.2236,	+0.0000	},
-	{+0.1382,	+0.2236,	+0.4253	},
-	{-0.3618,	+0.2236,	+0.2629	},
-	{-0.3618,	+0.2236,	-0.2629	},
-	{+0.1382,	+0.2236,	-0.4253	},
-	{+0.3441,	+0.2629,	+0.2500	},
-	{-0.1314,	+0.2629,	+0.4045	},
-	{-0.4253,	+0.2629,	-0.0000	},
-	{-0.1314,	+0.2629,	-0.4045	},
-	{+0.3441,	+0.2629,	-0.2500	},
-	{+0.4755,	+0.0000,	+0.1545	},
-	{+0.2939,	+0.0000,	+0.4045	},
-	{-0.0000,	+0.0000,	+0.5000	},
-	{-0.2939,	+0.0000,	+0.4045	},
-	{-0.4755,	+0.0000,	+0.1545	},
-	{-0.4755,	+0.0000,	-0.1545	},
-	{-0.2939,	+0.0000,	-0.4045	},
-	{+0.0000,	+0.0000,	-0.5000	},
-	{+0.2939,	+0.0000,	-0.4045	},
-	{+0.4755,	+0.0000,	-0.1545	},
-	{+0.0917,	+0.4915,	+0.0000	},
-	{+0.1804,	+0.4663,	+0.0000	},
-	{+0.0283,	+0.4915,	+0.0872	},
-	{+0.0557,	+0.4663,	+0.1715	},
-	{-0.0742,	+0.4915,	+0.0539	},
-	{-0.1459,	+0.4663,	+0.1060	},
-	{-0.0742,	+0.4915,	-0.0539	},
-	{-0.1459,	+0.4663,	-0.1060	},
-	{+0.0283,	+0.4915,	-0.0872	},
-	{+0.0557,	+0.4663,	-0.1715	},
-	{+0.2106,	+0.4448,	+0.0884	},
-	{+0.1492,	+0.4448,	+0.1730	},
-	{-0.0190,	+0.4448,	+0.2276	},
-	{-0.1184,	+0.4448,	+0.1953	},
-	{-0.2224,	+0.4448,	+0.0523	},
-	{-0.2224,	+0.4448,	-0.0523	},
-	{-0.1184,	+0.4448,	-0.1953	},
-	{-0.0190,	+0.4448,	-0.2276	},
-	{+0.1492,	+0.4448,	-0.1730	},
-	{+0.2106,	+0.4448,	-0.0884	},
-	{+0.3364,	+0.3699,	+0.0000	},
-	{+0.3986,	+0.3019,	+0.0000	},
-	{+0.1040,	+0.3699,	+0.3200	},
-	{+0.1232,	+0.3019,	+0.3791	},
-	{-0.2722,	+0.3699,	+0.1978	},
-	{-0.3225,	+0.3019,	+0.2343	},
-	{-0.2722,	+0.3699,	-0.1978	},
-	{-0.3225,	+0.3019,	-0.2343	},
-	{+0.1040,	+0.3699,	-0.3200	},
-	{+0.1232,	+0.3019,	-0.3791	},
-	{+0.3036,	+0.3873,	+0.0884	},
-	{+0.3311,	+0.3323,	+0.1730	},
-	{+0.0097,	+0.3873,	+0.3161	},
-	{-0.0622,	+0.3323,	+0.3683	},
-	{-0.2976,	+0.3873,	+0.1069	},
-	{-0.3695,	+0.3323,	+0.0547	},
-	{-0.1936,	+0.3873,	-0.2500	},
-	{-0.1662,	+0.3323,	-0.3346	},
-	{+0.1779,	+0.3873,	-0.2614	},
-	{+0.2668,	+0.3323,	-0.2614	},
-	{+0.3036,	+0.3873,	-0.0884	},
-	{+0.3311,	+0.3323,	-0.1730	},
-	{+0.1779,	+0.3873,	+0.2614	},
-	{+0.2668,	+0.3323,	+0.2614	},
-	{-0.1936,	+0.3873,	+0.2500	},
-	{-0.1662,	+0.3323,	+0.3346	},
-	{-0.2976,	+0.3873,	-0.1069	},
-	{-0.3695,	+0.3323,	-0.0547	},
-	{+0.0097,	+0.3873,	-0.3161	},
-	{-0.0622,	+0.3323,	-0.3683	},
-	{+0.4269,	+0.2452,	+0.0872	},
-	{+0.3922,	+0.2584,	+0.1715	},
-	{+0.0490,	+0.2452,	+0.4330	},
-	{-0.0420,	+0.2584,	+0.4260	},
-	{-0.3967,	+0.2452,	+0.1804	},
-	{-0.4181,	+0.2584,	+0.0917	},
-	{-0.2941,	+0.2452,	-0.3215	},
-	{-0.2165,	+0.2584,	-0.3693	},
-	{+0.2149,	+0.2452,	-0.3791	},
-	{+0.2843,	+0.2584,	-0.3200	},
-	{+0.3922,	+0.2584,	-0.1715	},
-	{+0.4269,	+0.2452,	-0.0872	},
-	{+0.2843,	+0.2584,	+0.3200	},
-	{+0.2149,	+0.2452,	+0.3791	},
-	{-0.2165,	+0.2584,	+0.3693	},
-	{-0.2941,	+0.2452,	+0.3215	},
-	{-0.4181,	+0.2584,	-0.0917	},
-	{-0.3967,	+0.2452,	-0.1804	},
-	{-0.0420,	+0.2584,	-0.4260	},
-	{+0.0490,	+0.2452,	-0.4330	},
-	{+0.4728,	+0.1534,	+0.0539	},
-	{+0.4824,	+0.0780,	+0.1060	},
-	{+0.4063,	+0.1819,	+0.2276	},
-	{+0.4508,	+0.0930,	+0.1953	},
-	{+0.3421,	+0.1819,	+0.3161	},
-	{+0.3251,	+0.0930,	+0.3683	},
-	{+0.1974,	+0.1534,	+0.4330	},
-	{+0.2499,	+0.0780,	+0.4260	},
-	{+0.0948,	+0.1534,	+0.4663	},
-	{+0.0482,	+0.0780,	+0.4915	},
-	{-0.0909,	+0.1819,	+0.4568	},
-	{-0.0465,	+0.0930,	+0.4891	},
-	{-0.1949,	+0.1819,	+0.4230	},
-	{-0.2499,	+0.0930,	+0.4230	},
-	{-0.3508,	+0.1534,	+0.3215	},
-	{-0.3279,	+0.0780,	+0.3693	},
-	{-0.4142,	+0.1534,	+0.2343	},
-	{-0.4526,	+0.0780,	+0.1978	},
-	{-0.4625,	+0.1819,	+0.0547	},
-	{-0.4795,	+0.0930,	+0.1069	},
-	{-0.4625,	+0.1819,	-0.0547	},
-	{-0.4795,	+0.0930,	-0.1069	},
-	{-0.4142,	+0.1534,	-0.2343	},
-	{-0.4526,	+0.0780,	-0.1978	},
-	{-0.3508,	+0.1534,	-0.3215	},
-	{-0.3279,	+0.0780,	-0.3693	},
-	{-0.1949,	+0.1819,	-0.4230	},
-	{-0.2499,	+0.0930,	-0.4230	},
-	{-0.0909,	+0.1819,	-0.4568	},
-	{-0.0465,	+0.0930,	-0.4891	},
-	{+0.0948,	+0.1534,	-0.4663	},
-	{+0.0482,	+0.0780,	-0.4915	},
-	{+0.1974,	+0.1534,	-0.4330	},
-	{+0.2499,	+0.0780,	-0.4260	},
-	{+0.3421,	+0.1819,	-0.3161	},
-	{+0.3251,	+0.0930,	-0.3683	},
-	{+0.4063,	+0.1819,	-0.2276	},
-	{+0.4508,	+0.0930,	-0.1953	},
-	{+0.4728,	+0.1534,	-0.0539	},
-	{+0.4824,	+0.0780,	-0.1060	},
-	{+0.4330,	+0.0000,	+0.2500	},
-	{+0.3716,	+0.0000,	+0.3346	},
-	{+0.2034,	+0.0000,	+0.4568	},
-	{+0.1040,	+0.0000,	+0.4891	},
-	{-0.1040,	+0.0000,	+0.4891	},
-	{-0.2034,	+0.0000,	+0.4568	},
-	{-0.3716,	+0.0000,	+0.3346	},
-	{-0.4330,	+0.0000,	+0.2500	},
-	{-0.4973,	+0.0000,	+0.0523	},
-	{-0.4973,	+0.0000,	-0.0523	},
-	{-0.4330,	+0.0000,	-0.2500	},
-	{-0.3716,	+0.0000,	-0.3346	},
-	{-0.2034,	+0.0000,	-0.4568	},
-	{-0.1040,	+0.0000,	-0.4891	},
-	{+0.1040,	+0.0000,	-0.4891	},
-	{+0.2034,	+0.0000,	-0.4568	},
-	{+0.3716,	+0.0000,	-0.3346	},
-	{+0.4330,	+0.0000,	-0.2500	},
-	{+0.4973,	+0.0000,	-0.0523	},
-	{+0.4973,	+0.0000,	+0.0523	},
-	{+0.1208,	+0.4772,	+0.0878	},
-	{-0.0461,	+0.4772,	+0.1420	},
-	{-0.1493,	+0.4772,	-0.0000	},
-	{-0.0461,	+0.4772,	-0.1420	},
-	{+0.1208,	+0.4772,	-0.0878	},
-	{+0.2465,	+0.3965,	+0.1791	},
-	{-0.0941,	+0.3965,	+0.2897	},
-	{-0.3047,	+0.3965,	-0.0000	},
-	{-0.0941,	+0.3965,	-0.2897	},
-	{+0.2465,	+0.3965,	-0.1791	},
-	{+0.3715,	+0.3229,	-0.0881	},
-	{+0.3715,	+0.3229,	+0.0881	},
-	{+0.1986,	+0.3229,	+0.3261	},
-	{+0.0310,	+0.3229,	+0.3805	},
-	{-0.2488,	+0.3229,	+0.2896	},
-	{-0.3523,	+0.3229,	+0.1471	},
-	{-0.3523,	+0.3229,	-0.1471	},
-	{-0.2488,	+0.3229,	-0.2896	},
-	{+0.0310,	+0.3229,	-0.3805	},
-	{+0.1986,	+0.3229,	-0.3261	},
-	{+0.4476,	+0.1707,	+0.1433	},
-	{+0.2746,	+0.1707,	+0.3814	},
-	{+0.0020,	+0.1707,	+0.4700	},
-	{-0.2778,	+0.1707,	+0.3790	},
-	{-0.4463,	+0.1707,	+0.1471	},
-	{-0.4463,	+0.1707,	-0.1471	},
-	{-0.2778,	+0.1707,	-0.3790	},
-	{+0.0020,	+0.1707,	-0.4700	},
-	{+0.2746,	+0.1707,	-0.3814	},
-	{+0.4476,	+0.1707,	-0.1433	},
-	{+0.4936,	+0.0799,	+0.0000	},
-	{+0.3971,	+0.0952,	+0.2885	},
-	{+0.1525,	+0.0799,	+0.4694	},
-	{-0.1517,	+0.0952,	+0.4668	},
-	{-0.3993,	+0.0799,	+0.2901	},
-	{-0.4909,	+0.0952,	-0.0000	},
-	{-0.3993,	+0.0799,	-0.2901	},
-	{-0.1517,	+0.0952,	-0.4668	},
-	{+0.1525,	+0.0799,	-0.4694	},
-	{+0.3971,	+0.0952,	-0.2885	},
+const Fvector hemi_3[HEMI3_VERTS] =
+{
+    {+0.0000, +0.5000, +0.0000},
+    {+0.2629, +0.4253, +0.0000},
+    {+0.0812, +0.4253, +0.2500},
+    {-0.2127, +0.4253, +0.1545},
+    {-0.2127, +0.4253, -0.1545},
+    {+0.0812, +0.4253, -0.2500},
+    {+0.4472, +0.2236, +0.0000},
+    {+0.1382, +0.2236, +0.4253},
+    {-0.3618, +0.2236, +0.2629},
+    {-0.3618, +0.2236, -0.2629},
+    {+0.1382, +0.2236, -0.4253},
+    {+0.3441, +0.2629, +0.2500},
+    {-0.1314, +0.2629, +0.4045},
+    {-0.4253, +0.2629, -0.0000},
+    {-0.1314, +0.2629, -0.4045},
+    {+0.3441, +0.2629, -0.2500},
+    {+0.4755, +0.0000, +0.1545},
+    {+0.2939, +0.0000, +0.4045},
+    {-0.0000, +0.0000, +0.5000},
+    {-0.2939, +0.0000, +0.4045},
+    {-0.4755, +0.0000, +0.1545},
+    {-0.4755, +0.0000, -0.1545},
+    {-0.2939, +0.0000, -0.4045},
+    {+0.0000, +0.0000, -0.5000},
+    {+0.2939, +0.0000, -0.4045},
+    {+0.4755, +0.0000, -0.1545},
+    {+0.0917, +0.4915, +0.0000},
+    {+0.1804, +0.4663, +0.0000},
+    {+0.0283, +0.4915, +0.0872},
+    {+0.0557, +0.4663, +0.1715},
+    {-0.0742, +0.4915, +0.0539},
+    {-0.1459, +0.4663, +0.1060},
+    {-0.0742, +0.4915, -0.0539},
+    {-0.1459, +0.4663, -0.1060},
+    {+0.0283, +0.4915, -0.0872},
+    {+0.0557, +0.4663, -0.1715},
+    {+0.2106, +0.4448, +0.0884},
+    {+0.1492, +0.4448, +0.1730},
+    {-0.0190, +0.4448, +0.2276},
+    {-0.1184, +0.4448, +0.1953},
+    {-0.2224, +0.4448, +0.0523},
+    {-0.2224, +0.4448, -0.0523},
+    {-0.1184, +0.4448, -0.1953},
+    {-0.0190, +0.4448, -0.2276},
+    {+0.1492, +0.4448, -0.1730},
+    {+0.2106, +0.4448, -0.0884},
+    {+0.3364, +0.3699, +0.0000},
+    {+0.3986, +0.3019, +0.0000},
+    {+0.1040, +0.3699, +0.3200},
+    {+0.1232, +0.3019, +0.3791},
+    {-0.2722, +0.3699, +0.1978},
+    {-0.3225, +0.3019, +0.2343},
+    {-0.2722, +0.3699, -0.1978},
+    {-0.3225, +0.3019, -0.2343},
+    {+0.1040, +0.3699, -0.3200},
+    {+0.1232, +0.3019, -0.3791},
+    {+0.3036, +0.3873, +0.0884},
+    {+0.3311, +0.3323, +0.1730},
+    {+0.0097, +0.3873, +0.3161},
+    {-0.0622, +0.3323, +0.3683},
+    {-0.2976, +0.3873, +0.1069},
+    {-0.3695, +0.3323, +0.0547},
+    {-0.1936, +0.3873, -0.2500},
+    {-0.1662, +0.3323, -0.3346},
+    {+0.1779, +0.3873, -0.2614},
+    {+0.2668, +0.3323, -0.2614},
+    {+0.3036, +0.3873, -0.0884},
+    {+0.3311, +0.3323, -0.1730},
+    {+0.1779, +0.3873, +0.2614},
+    {+0.2668, +0.3323, +0.2614},
+    {-0.1936, +0.3873, +0.2500},
+    {-0.1662, +0.3323, +0.3346},
+    {-0.2976, +0.3873, -0.1069},
+    {-0.3695, +0.3323, -0.0547},
+    {+0.0097, +0.3873, -0.3161},
+    {-0.0622, +0.3323, -0.3683},
+    {+0.4269, +0.2452, +0.0872},
+    {+0.3922, +0.2584, +0.1715},
+    {+0.0490, +0.2452, +0.4330},
+    {-0.0420, +0.2584, +0.4260},
+    {-0.3967, +0.2452, +0.1804},
+    {-0.4181, +0.2584, +0.0917},
+    {-0.2941, +0.2452, -0.3215},
+    {-0.2165, +0.2584, -0.3693},
+    {+0.2149, +0.2452, -0.3791},
+    {+0.2843, +0.2584, -0.3200},
+    {+0.3922, +0.2584, -0.1715},
+    {+0.4269, +0.2452, -0.0872},
+    {+0.2843, +0.2584, +0.3200},
+    {+0.2149, +0.2452, +0.3791},
+    {-0.2165, +0.2584, +0.3693},
+    {-0.2941, +0.2452, +0.3215},
+    {-0.4181, +0.2584, -0.0917},
+    {-0.3967, +0.2452, -0.1804},
+    {-0.0420, +0.2584, -0.4260},
+    {+0.0490, +0.2452, -0.4330},
+    {+0.4728, +0.1534, +0.0539},
+    {+0.4824, +0.0780, +0.1060},
+    {+0.4063, +0.1819, +0.2276},
+    {+0.4508, +0.0930, +0.1953},
+    {+0.3421, +0.1819, +0.3161},
+    {+0.3251, +0.0930, +0.3683},
+    {+0.1974, +0.1534, +0.4330},
+    {+0.2499, +0.0780, +0.4260},
+    {+0.0948, +0.1534, +0.4663},
+    {+0.0482, +0.0780, +0.4915},
+    {-0.0909, +0.1819, +0.4568},
+    {-0.0465, +0.0930, +0.4891},
+    {-0.1949, +0.1819, +0.4230},
+    {-0.2499, +0.0930, +0.4230},
+    {-0.3508, +0.1534, +0.3215},
+    {-0.3279, +0.0780, +0.3693},
+    {-0.4142, +0.1534, +0.2343},
+    {-0.4526, +0.0780, +0.1978},
+    {-0.4625, +0.1819, +0.0547},
+    {-0.4795, +0.0930, +0.1069},
+    {-0.4625, +0.1819, -0.0547},
+    {-0.4795, +0.0930, -0.1069},
+    {-0.4142, +0.1534, -0.2343},
+    {-0.4526, +0.0780, -0.1978},
+    {-0.3508, +0.1534, -0.3215},
+    {-0.3279, +0.0780, -0.3693},
+    {-0.1949, +0.1819, -0.4230},
+    {-0.2499, +0.0930, -0.4230},
+    {-0.0909, +0.1819, -0.4568},
+    {-0.0465, +0.0930, -0.4891},
+    {+0.0948, +0.1534, -0.4663},
+    {+0.0482, +0.0780, -0.4915},
+    {+0.1974, +0.1534, -0.4330},
+    {+0.2499, +0.0780, -0.4260},
+    {+0.3421, +0.1819, -0.3161},
+    {+0.3251, +0.0930, -0.3683},
+    {+0.4063, +0.1819, -0.2276},
+    {+0.4508, +0.0930, -0.1953},
+    {+0.4728, +0.1534, -0.0539},
+    {+0.4824, +0.0780, -0.1060},
+    {+0.4330, +0.0000, +0.2500},
+    {+0.3716, +0.0000, +0.3346},
+    {+0.2034, +0.0000, +0.4568},
+    {+0.1040, +0.0000, +0.4891},
+    {-0.1040, +0.0000, +0.4891},
+    {-0.2034, +0.0000, +0.4568},
+    {-0.3716, +0.0000, +0.3346},
+    {-0.4330, +0.0000, +0.2500},
+    {-0.4973, +0.0000, +0.0523},
+    {-0.4973, +0.0000, -0.0523},
+    {-0.4330, +0.0000, -0.2500},
+    {-0.3716, +0.0000, -0.3346},
+    {-0.2034, +0.0000, -0.4568},
+    {-0.1040, +0.0000, -0.4891},
+    {+0.1040, +0.0000, -0.4891},
+    {+0.2034, +0.0000, -0.4568},
+    {+0.3716, +0.0000, -0.3346},
+    {+0.4330, +0.0000, -0.2500},
+    {+0.4973, +0.0000, -0.0523},
+    {+0.4973, +0.0000, +0.0523},
+    {+0.1208, +0.4772, +0.0878},
+    {-0.0461, +0.4772, +0.1420},
+    {-0.1493, +0.4772, -0.0000},
+    {-0.0461, +0.4772, -0.1420},
+    {+0.1208, +0.4772, -0.0878},
+    {+0.2465, +0.3965, +0.1791},
+    {-0.0941, +0.3965, +0.2897},
+    {-0.3047, +0.3965, -0.0000},
+    {-0.0941, +0.3965, -0.2897},
+    {+0.2465, +0.3965, -0.1791},
+    {+0.3715, +0.3229, -0.0881},
+    {+0.3715, +0.3229, +0.0881},
+    {+0.1986, +0.3229, +0.3261},
+    {+0.0310, +0.3229, +0.3805},
+    {-0.2488, +0.3229, +0.2896},
+    {-0.3523, +0.3229, +0.1471},
+    {-0.3523, +0.3229, -0.1471},
+    {-0.2488, +0.3229, -0.2896},
+    {+0.0310, +0.3229, -0.3805},
+    {+0.1986, +0.3229, -0.3261},
+    {+0.4476, +0.1707, +0.1433},
+    {+0.2746, +0.1707, +0.3814},
+    {+0.0020, +0.1707, +0.4700},
+    {-0.2778, +0.1707, +0.3790},
+    {-0.4463, +0.1707, +0.1471},
+    {-0.4463, +0.1707, -0.1471},
+    {-0.2778, +0.1707, -0.3790},
+    {+0.0020, +0.1707, -0.4700},
+    {+0.2746, +0.1707, -0.3814},
+    {+0.4476, +0.1707, -0.1433},
+    {+0.4936, +0.0799, +0.0000},
+    {+0.3971, +0.0952, +0.2885},
+    {+0.1525, +0.0799, +0.4694},
+    {-0.1517, +0.0952, +0.4668},
+    {-0.3993, +0.0799, +0.2901},
+    {-0.4909, +0.0952, -0.0000},
+    {-0.3993, +0.0799, -0.2901},
+    {-0.1517, +0.0952, -0.4668},
+    {+0.1525, +0.0799, -0.4694},
+    {+0.3971, +0.0952, -0.2885},
 };
 #pragma warning(default:4305)
 
-void ECORE_API xrHemisphereBuild	(int quality, float energy, xrHemisphereIterator* iterator, LPVOID param)
+void ECORE_API xrHemisphereBuild(int quality, float energy, xrHemisphereIterator* iterator, LPVOID param)
 {
-	const Fvector* hemi=0;
-	int h_count		= xrHemisphereVertices(quality,hemi); VERIFY(h_count>0);
+    const Fvector* hemi = 0;
+    int h_count = xrHemisphereVertices(quality, hemi);
+    VERIFY(h_count > 0);
     // Calculate energy
-    float total		= (float)h_count;
-    float E			= 1.f/total;
-		
+    float total = (float)h_count;
+    float E = 1.f / total;
+
     // Iterate
-    for (int i=0; i<h_count; i++){
-        float x		=	-float	(hemi[i][0]);
-        float y		=	-float	(hemi[i][1]);
-        float z		=	-float	(hemi[i][2]);
-        float mag	=	_sqrt	(x*x + y*y + z*z);
-        x /= mag;	y /= mag;	z /= mag;
-        iterator	(x,y,z,E*energy,param);
+    for (int i = 0; i < h_count; i++)
+    {
+        float x = -float(hemi[i][0]);
+        float y = -float(hemi[i][1]);
+        float z = -float(hemi[i][2]);
+        float mag = _sqrt(x*x + y*y + z*z);
+        x /= mag;
+        y /= mag;
+        z /= mag;
+        iterator(x, y, z, E*energy, param);
     }
 }
 
-int ECORE_API xrHemisphereVertices	(int quality, const Fvector*& verts)
+int ECORE_API xrHemisphereVertices(int quality, const Fvector*& verts)
 {
-	// SELECT table
-	int				h_count	= 0;
-	switch (quality)
-	{
-	case 1:	// LOW quality
-		h_count		= HEMI1_VERTS;
-		verts		= hemi_1;
-		break;
-	case 2:	// HIGH quality
-		h_count		= HEMI2_VERTS;
-		verts		= hemi_2;
-		break;
-	case 3:	// SUPER HIGH quality
-		h_count		= HEMI3_VERTS;
-		verts		= hemi_3;
-		break;
-	default:// NO 	
-		NODEFAULT;
-	}
-	return h_count;
+    // SELECT table
+    int h_count = 0;
+    switch (quality)
+    {
+    case 1: // LOW quality
+        h_count = HEMI1_VERTS;
+        verts = hemi_1;
+        break;
+    case 2: // HIGH quality
+        h_count = HEMI2_VERTS;
+        verts = hemi_2;
+        break;
+    case 3: // SUPER HIGH quality
+        h_count = HEMI3_VERTS;
+        verts = hemi_3;
+        break;
+    default:// NO
+        NODEFAULT;
+    }
+    return h_count;
 }
 
-int	ECORE_API xrHemisphereIndices	(int quality, const u16*& indices)
+int ECORE_API xrHemisphereIndices(int quality, const u16*& indices)
 {
-	// SELECT table
-	int				h_count	= 0;
-	switch (quality)
-	{
-	case 1:	// LOW quality
-		h_count		= HEMI1_FACES*3;
-		indices		= hemi_1v;
-		break;
-	case 2:	// HIGH quality
-		h_count		= HEMI2_FACES*3;
-		indices		= hemi_2v;
-		break;
-//	case 3:	// SUPER HIGH quality
-//		h_count		= HEMI3_FACES*3;
-//		indices		= hemi_3v;
-//		break;
-	default:// NO 	
-		NODEFAULT;
-	}
-	return h_count;
+    // SELECT table
+    int h_count = 0;
+    switch (quality)
+    {
+    case 1: // LOW quality
+        h_count = HEMI1_FACES * 3;
+        indices = hemi_1v;
+        break;
+    case 2: // HIGH quality
+        h_count = HEMI2_FACES * 3;
+        indices = hemi_2v;
+        break;
+    // case 3: // SUPER HIGH quality
+    // h_count = HEMI3_FACES*3;
+    // indices = hemi_3v;
+    // break;
+    default:// NO
+        NODEFAULT;
+    }
+    return h_count;
 }
diff --git a/src/xrEngine/xrHemisphere.h b/src/xrEngine/xrHemisphere.h
index 9f880a345fb..b33494b3da4 100644
--- a/src/xrEngine/xrHemisphere.h
+++ b/src/xrEngine/xrHemisphere.h
@@ -1,10 +1,10 @@
 #ifndef xrHemisphereH
 #define xrHemisphereH
 
-typedef void __stdcall		xrHemisphereIterator(float x, float y, float z, float energy, LPVOID param);
+typedef void __stdcall xrHemisphereIterator(float x, float y, float z, float energy, LPVOID param);
 
-void	ECORE_API	xrHemisphereBuild		(int quality, float energy, xrHemisphereIterator* it, LPVOID param);
-int		ECORE_API	xrHemisphereVertices	(int quality, const Fvector*& verts);
-int		ECORE_API	xrHemisphereIndices		(int quality, const u16*& indices);
+void ECORE_API xrHemisphereBuild(int quality, float energy, xrHemisphereIterator* it, LPVOID param);
+int ECORE_API xrHemisphereVertices(int quality, const Fvector*& verts);
+int ECORE_API xrHemisphereIndices(int quality, const u16*& indices);
 
 #endif //xrHemisphereH
diff --git a/src/xrEngine/xrImage_Resampler.cpp b/src/xrEngine/xrImage_Resampler.cpp
index edce6bb6766..1c12a0dce8a 100644
--- a/src/xrEngine/xrImage_Resampler.cpp
+++ b/src/xrEngine/xrImage_Resampler.cpp
@@ -1,7 +1,7 @@
 /*
- *		Filtered Image Rescaling
+ * Filtered Image Rescaling
  *
- *		  by Dale Schumacher
+ * by Dale Schumacher
  */
 
 #include "stdafx.h"
@@ -9,441 +9,541 @@
 
 #include "xrImage_Resampler.h"
 
-typedef	u32	Pixel;
+typedef u32 Pixel;
 struct Image
 {
-	int		xsize;		/* horizontal size of the image in Pixels */
-	int		ysize;		/* vertical size of the image in Pixels */
-	Pixel *	data;		/* pointer to first scanline of image */
-	int		span;		/* byte offset between two scanlines */
+    int xsize; /* horizontal size of the image in Pixels */
+    int ysize; /* vertical size of the image in Pixels */
+    Pixel* data;  /* pointer to first scanline of image */
+    int span; /* byte offset between two scanlines */
 };
 
-#define	WHITE_PIXEL		(255)
-#define	BLACK_PIXEL		(0)
+#define WHITE_PIXEL (255)
+#define BLACK_PIXEL (0)
 
 /*
- *	generic image access and i/o support routines
+ * generic image access and i/o support routines
  */
 
-Image *	new_image(int xsize, int ysize)		/* create a blank image */
+Image* new_image(int xsize, int ysize)  /* create a blank image */
 {
-	Image *image;
-
-	if((0!=(image = (Image *)xr_malloc(sizeof(Image)))) && (0!=(image->data = (Pixel *)xr_malloc(ysize*xsize*sizeof(Pixel)))))
-	{
-		ZeroMemory(image->data,ysize*xsize*sizeof(Pixel));
-		image->xsize	= xsize;
-		image->ysize	= ysize;
-		image->span		= xsize;
-	}
-	return	(image);
+    Image* image;
+
+    if ((0 != (image = (Image*)xr_malloc(sizeof(Image)))) && (0 != (image->data = (Pixel*)xr_malloc(ysize*xsize*sizeof(Pixel)))))
+    {
+        ZeroMemory(image->data, ysize*xsize*sizeof(Pixel));
+        image->xsize = xsize;
+        image->ysize = ysize;
+        image->span = xsize;
+    }
+    return (image);
 }
 
-void	free_image(Image* image)
+void free_image(Image* image)
 {
-	xr_free(image->data);
-	xr_free(image);
+    xr_free(image->data);
+    xr_free(image);
 }
 
-Pixel	get_pixel	(Image* image, int x, int y)
+Pixel get_pixel(Image* image, int x, int y)
 {
-	if((x < 0) || (x >= image->xsize) || (y < 0) || (y >= image->ysize)) return 0;
-	return image->data[(y * image->span) + x];
+    if ((x < 0) || (x >= image->xsize) || (y < 0) || (y >= image->ysize)) return 0;
+    return image->data[(y * image->span) + x];
 }
 
-void	get_row		(Pixel* row, Image* image, int y)
+void get_row(Pixel* row, Image* image, int y)
 {
-	if((y < 0) || (y >= image->ysize)) return;
-	CopyMemory(row,	image->data + (y * image->span), (sizeof(Pixel) * image->xsize));
+    if ((y < 0) || (y >= image->ysize)) return;
+    CopyMemory(row, image->data + (y * image->span), (sizeof(Pixel) * image->xsize));
 }
 
-void	get_column	(Pixel* column, Image* image, int x)
+void get_column(Pixel* column, Image* image, int x)
 {
-	int i, d;
-	Pixel *p;
+    int i, d;
+    Pixel* p;
 
-	if((x < 0) || (x >= image->xsize)) return;
+    if ((x < 0) || (x >= image->xsize)) return;
 
-	d	= image->span;
-	for(i = image->ysize, p = image->data + x; i-- > 0; p += d) {
-		*column++ = *p;
-	}
+    d = image->span;
+    for (i = image->ysize, p = image->data + x; i-- > 0; p += d)
+    {
+        *column++ = *p;
+    }
 }
 
-Pixel	put_pixel	(Image* image, int x, int y, Pixel data)
+Pixel put_pixel(Image* image, int x, int y, Pixel data)
 {
-	if((x < 0) || (x >= image->xsize) || (y < 0) || (y >= image->ysize)) return 0;
-	return	image->data[(y * image->span)+x] = data;
+    if ((x < 0) || (x >= image->xsize) || (y < 0) || (y >= image->ysize)) return 0;
+    return image->data[(y * image->span) + x] = data;
 }
 
 
 /*
- *	filter function definitions
+ * filter function definitions
  */
 
 //
-#define	filter_support		(1.0)
-float	filter				(float t)
+#define filter_support (1.0)
+float filter(float t)
 {
-	/* f(t) = 2|t|^3 - 3|t|^2 + 1, -1 <= t <= 1 */
-	if(t < 0.0) t = -t;
-	if(t < 1.0) return		float((2.0 * t - 3.0) * t * t + 1.0);
-	return(0.0);
+    /* f(t) = 2|t|^3 - 3|t|^2 + 1, -1 <= t <= 1 */
+    if (t < 0.0) t = -t;
+    if (t < 1.0) return float((2.0 * t - 3.0) * t * t + 1.0);
+    return(0.0);
 }
 
 //
-#define	box_support			(0.5)
-float	box_filter			(float t)
+#define box_support (0.5)
+float box_filter(float t)
 {
-	if((t > -0.5) && (t <= 0.5)) return(1.0);
-	return(0.0);
+    if ((t > -0.5) && (t <= 0.5)) return(1.0);
+    return(0.0);
 }
 
 //
-#define	triangle_support	(1.0)
-float	triangle_filter		(float t)
+#define triangle_support (1.0)
+float triangle_filter(float t)
 {
-	if(t < 0.0f) t = -t;
-	if(t < 1.0f) return(1.0f - t);
-	return(0.0f);
+    if (t < 0.0f) t = -t;
+    if (t < 1.0f) return(1.0f - t);
+    return(0.0f);
 }
 
 //
-#define	bell_support		(1.5)
-float	bell_filter			(float t)		/* box (*) box (*) box */
+#define bell_support (1.5)
+float bell_filter(float t) /* box (*) box (*) box */
 {
-	if(t < 0) t = -t;
-	if(t < .5) return float(.75 - (t * t));
-	if(t < 1.5) {
-		t = (t - 1.5f);
-		return(.5f * (t * t));
-	}
-	return(0.0);
+    if (t < 0) t = -t;
+    if (t < .5) return float(.75 - (t * t));
+    if (t < 1.5)
+    {
+        t = (t - 1.5f);
+        return(.5f * (t * t));
+    }
+    return(0.0);
 }
 
 //
-#define	B_spline_support	(2.0)
-float	B_spline_filter		(float t)	/* box (*) box (*) box (*) box */
+#define B_spline_support (2.0)
+float B_spline_filter(float t) /* box (*) box (*) box (*) box */
 {
-	float tt;
-
-	if(t < 0) t = -t;
-	if(t < 1) {
-		tt = t * t;
-		return((.5f * tt * t) - tt + (2.0f / 3.0f));
-	} else if(t < 2) {
-		t = 2 - t;
-		return((1.0f / 6.0f) * (t * t * t));
-	}
-	return(0.0f);
+    float tt;
+
+    if (t < 0) t = -t;
+    if (t < 1)
+    {
+        tt = t * t;
+        return((.5f * tt * t) - tt + (2.0f / 3.0f));
+    }
+    else if (t < 2)
+    {
+        t = 2 - t;
+        return((1.0f / 6.0f) * (t * t * t));
+    }
+    return(0.0f);
 }
 
 //
-#define	Lanczos3_support	(3.0)
-float	sinc				(float x)
+#define Lanczos3_support (3.0)
+float sinc(float x)
 {
-	x *= 3.1415926f;
-	if(x != 0) return(_sin(x) / x);
-	return(1.0);
+    x *= 3.1415926f;
+    if (x != 0) return(_sin(x) / x);
+    return(1.0);
 }
-float	Lanczos3_filter		(float t)
+float Lanczos3_filter(float t)
 {
-	if(t < 0) t = -t;
-	if(t < 3.0f) return	float(sinc(t) * sinc(t/3.0f));
-	return(0.0);
+    if (t < 0) t = -t;
+    if (t < 3.0f) return float(sinc(t) * sinc(t / 3.0f));
+    return(0.0);
 }
 
 //
-#define	Mitchell_support	(2.0)
-#define	B	(1.0f / 3.0f)
-#define	C	(1.0f / 3.0f)
+#define Mitchell_support (2.0)
+#define B (1.0f / 3.0f)
+#define C (1.0f / 3.0f)
 
-float	Mitchell_filter		(float t)
+float Mitchell_filter(float t)
 {
-	float tt;
-
-	tt = t * t;
-	if(t < 0) t = -t;
-	if(t < 1.0f) {
-		t = (((12.0f - 9.0f * B - 6.0f * C) * (t * tt))
-		   + ((-18.0f + 12.0f * B + 6.0f * C) * tt)
-		   + (6.0f - 2.0f * B));
-		return(t / 6.0f);
-	} else if(t < 2.0f) {
-		t = (((-1.0f * B - 6.0f * C) * (t * tt))
-		   + ((6.0f * B + 30.0f * C) * tt)
-		   + ((-12.0f * B - 48.0f * C) * t)
-		   + (8.0f * B + 24.f * C));
-		return(t / 6.0f);
-	}
-	return(0.0);
+    float tt;
+
+    tt = t * t;
+    if (t < 0) t = -t;
+    if (t < 1.0f)
+    {
+        t = (((12.0f - 9.0f * B - 6.0f * C) * (t * tt))
+             + ((-18.0f + 12.0f * B + 6.0f * C) * tt)
+             + (6.0f - 2.0f * B));
+        return(t / 6.0f);
+    }
+    else if (t < 2.0f)
+    {
+        t = (((-1.0f * B - 6.0f * C) * (t * tt))
+             + ((6.0f * B + 30.0f * C) * tt)
+             + ((-12.0f * B - 48.0f * C) * t)
+             + (8.0f * B + 24.f * C));
+        return(t / 6.0f);
+    }
+    return(0.0);
 }
 
 /*
- *	image rescaling routine
+ * image rescaling routine
  */
 
 struct CONTRIB
 {
-	int		pixel;
-	float	weight;
+    int pixel;
+    float weight;
 };
 
 struct CLIST
 {
-	int		n;					/* number of contributors */
-	CONTRIB	*p;					/* pointer to _list_ of contributions */
+    int n; /* number of contributors */
+    CONTRIB* p; /* pointer to _list_ of contributions */
 };
 
-u32	CC	(float a)
+u32 CC(float a)
 {
-	int	p		= iFloor(float(a)+.5f);
-	if	(p<0)	return 0; else if (p>255) return 255;
-	return p;
+    int p = iFloor(float(a) + .5f);
+    if (p < 0) return 0;
+    else if (p>255) return 255;
+    return p;
 }
 
-void	imf_Process	(u32* dstI, u32 dstW, u32 dstH, u32* srcI, u32 srcW, u32 srcH, EIMF_Type FILTER)
+void imf_Process(u32* dstI, u32 dstW, u32 dstH, u32* srcI, u32 srcW, u32 srcH, EIMF_Type FILTER)
 {
-	R_ASSERT		(dstI);	R_ASSERT	(dstW>1);	R_ASSERT	(dstH>1);
-	R_ASSERT		(srcI);	R_ASSERT	(srcW>1);	R_ASSERT	(srcH>1);
-
-	// SRC & DST images
-	Image		src;	src.xsize	= srcW;	src.ysize	= srcH;	src.data	= srcI;	src.span	= srcW;
-	Image		dst;	dst.xsize	= dstW;	dst.ysize	= dstH;	dst.data	= dstI;	dst.span	= dstW;
-
-	// Select filter
-	float		(*filterf)(float);	filterf		= 0;
-	float		fwidth	= 0;
-	switch		(FILTER)
-	{
-	case imf_filter:	filterf=filter;				fwidth = filter_support;	break;
-	case imf_box:		filterf=box_filter;			fwidth = box_support;		break;
-	case imf_triangle:	filterf=triangle_filter;	fwidth = triangle_support;	break;
-	case imf_bell:		filterf=bell_filter;		fwidth = bell_support;		break;
-	case imf_b_spline:	filterf=B_spline_filter;	fwidth = B_spline_support;	break;
-	case imf_lanczos3:	filterf=Lanczos3_filter;	fwidth = Lanczos3_support;	break;
-	case imf_mitchell:	filterf=Mitchell_filter;	fwidth = Mitchell_support;	break;
-	}
-
-
-	//
-	Image	*tmp	= 0;			/* intermediate image */
-	float	xscale	= 0, yscale = 0;/* zoom scale factors */
-	int		i, j, k;				/* loop variables */
-	int		n;						/* pixel number */
-	float	center, left,	right;	/* filter calculation variables */
-	float	width,	fscale, weight;	/* filter calculation variables */
-	Pixel	*raster	= 0;			/* a row or column of pixels */
-	CLIST	*contrib= 0;			/* array of contribution lists */
-
-	/* create intermediate image to hold horizontal zoom */
-	try	{
-		tmp		= new_image	(dst.xsize, src.ysize);
-		xscale	= float	(dst.xsize) / float(src.xsize);
-		yscale	= float	(dst.ysize) / float(src.ysize);
-	} catch (...) {
-		Msg		("imf_Process::1");
-	};
-
-	/* pre-calculate filter contributions for a row */
-	try	{
-		contrib = (CLIST *)	xr_malloc	(dst.xsize*sizeof(CLIST));
-		ZeroMemory(contrib,dst.xsize*sizeof(CLIST));
-	} catch (...) {
-		Msg		("imf_Process::2");
-	};
-	if(xscale < 1.0) {
-		try	{
-			width	= fwidth / xscale;
-			fscale	= 1.0f / xscale;
-			for(i = 0; i < dst.xsize; ++i)
-			{
-				contrib[i].n	= 0;
-				contrib[i].p	= (CONTRIB *)xr_malloc((int) (width * 2 + 1)*sizeof(CONTRIB));
-				ZeroMemory(contrib[i].p,(int) (width * 2 + 1)*sizeof(CONTRIB));
-				center			= float(i) / xscale;
-				left			= ceil	(center - width);
-				right			= floor	(center + width);
-				for(j = int(left); j <= int(right); ++j)
-				{
-					weight	= center - float(j);
-					weight	= filterf(weight / fscale) / fscale;
-					if(j < 0) {
-						n = -j;
-					} else if(j >= src.xsize) {
-						n = (src.xsize - j) + src.xsize - 1;
-					} else {
-						n = j;
-					}
-					k		= contrib[i].n++;
-					contrib[i].p[k].pixel	= (n<src.xsize)?n:(src.xsize-1);
-					contrib[i].p[k].weight	= weight;
-				}
-			}
-		} catch (...) {
-			Msg		("imf_Process::3 (xscale<1.0)");
-		};
-	} else {
-		try	{
-			for(i = 0; i < dst.xsize; ++i)
-			{
-				contrib[i].n	= 0;
-				contrib[i].p	= (CONTRIB *)xr_malloc((int) (fwidth * 2 + 1)*sizeof(CONTRIB));
-				ZeroMemory(contrib[i].p,(int) (fwidth * 2 + 1)*sizeof(CONTRIB));
-				center			= float(i) / xscale;
-				left			= ceil	(center - fwidth);
-				right			= floor	(center + fwidth);
-				for(j = int(left); j <= int(right); ++j)
-				{
-					weight	= center - (float) j;
-					weight	= (*filterf)(weight);
-					if(j < 0) {
-						n = -j;
-					} else if(j >= src.xsize) {
-						n = (src.xsize - j) + src.xsize - 1;
-					} else {
-						n = j;
-					}
-					k		= contrib[i].n++;
-					contrib[i].p[k].pixel	= (n<src.xsize)?n:(src.xsize-1);
-					contrib[i].p[k].weight	= weight;
-				}
-			}
-		} catch (...) {
-			Msg		("imf_Process::3 (xscale>1.0)");
-		};
-	}
-
-	/* apply filter to zoom horizontally from src to tmp */
-	try	{
-		raster	= (Pixel *)xr_malloc(src.xsize*sizeof(Pixel));
-		ZeroMemory(raster,src.xsize*sizeof(Pixel));
-	} catch (...) {	Msg		("imf_Process::4");	};
-	try	{
-		for	(k = 0; k < tmp->ysize; ++k)
-		{
-			get_row	(raster, &src, k);
-			for(i = 0; i < tmp->xsize; ++i)
-			{
-				float	w_r	= 0., w_g = 0., w_b	= 0., w_a = 0.;
-
-				for	(j = 0; j < contrib[i].n; ++j)
-				{
-					float	W	=	contrib[i].p[j].weight;
-					Pixel	P	=	raster[contrib[i].p[j].pixel];
-					w_r			+=	W*float(color_get_R(P));
-					w_g			+=	W*float(color_get_G(P));
-					w_b			+=	W*float(color_get_B(P));
-					w_a			+=	W*float(color_get_A(P));
-				}
-				put_pixel(tmp, i, k, color_rgba(CC(w_r),CC(w_g),CC(w_b),CC(w_a+0.5f)));
-			}
-		}
-		xr_free(raster);
-	} catch (...) {	Msg		("imf_Process::5");	};
-
-	/* xr_free the memory allocated for horizontal filter weights */
-	try	{
-		for(i = 0; i < tmp->xsize; ++i) xr_free(contrib[i].p);
-		xr_free(contrib);
-	} catch (...) {	Msg		("imf_Process::6");	};
-
-	/* pre-calculate filter contributions for a column */
-	try	{
-		contrib = (CLIST *)xr_malloc(dst.ysize*sizeof(CLIST));
-		ZeroMemory(contrib,dst.ysize*sizeof(CLIST));
-	} catch (...) {	Msg		("imf_Process::7");	};
-	if(yscale < 1.0) {
-		try	{
-			width	= fwidth / yscale;
-			fscale	= 1.0f / yscale;
-			for	(i = 0; i < dst.ysize; ++i)
-			{
-				contrib[i].n	= 0;
-				contrib[i].p	= (CONTRIB *)xr_malloc((int) (width * 2 + 1)*sizeof(CONTRIB));
-				ZeroMemory(contrib[i].p,(int) (width * 2 + 1)*sizeof(CONTRIB));
-				center			= (float) i / yscale;
-				left			= ceil	(center - width);
-				right			= floor	(center + width);
-				for(j = int(left); j <= int(right); ++j)
-				{
-					weight	= center - (float) j;
-					weight	= filterf(weight / fscale) / fscale;
-					if(j < 0) {
-						n = -j;
-					} else if(j >= tmp->ysize) {
-						n = (tmp->ysize - j) + tmp->ysize - 1;
-					} else {
-						n = j;
-					}
-					k = contrib[i].n++;
-					contrib[i].p[k].pixel	= (n<tmp->ysize)?n:(tmp->ysize-1);
-					contrib[i].p[k].weight	= weight;
-				}
-			}
-		} catch (...) {	Msg		("imf_Process::8 (yscale<1.0)");	};
-	} else {
-		try	{
-			for(i = 0; i < dst.ysize; ++i)
-			{
-				contrib[i].n	= 0;
-				contrib[i].p	= (CONTRIB *)xr_malloc((int) (fwidth * 2 + 1)*sizeof(CONTRIB));
-				ZeroMemory(contrib[i].p,(int) (fwidth * 2 + 1)*sizeof(CONTRIB));
-				center			= (float) i / yscale;
-				left			= ceil	(center - fwidth);
-				right			= floor	(center + fwidth);
-				for(j = int(left); j <= int(right); ++j) {
-					weight = center - (float) j;
-					weight = (*filterf)(weight);
-					if(j < 0) {
-						n = -j;
-					} else if(j >= tmp->ysize) {
-						n = (tmp->ysize - j) + tmp->ysize - 1;
-					} else {
-						n = j;
-					}
-					k = contrib[i].n++;
-					contrib[i].p[k].pixel	= (n<tmp->ysize)?n:(tmp->ysize-1);
-					contrib[i].p[k].weight	= weight;
-				}
-			}
-		} catch (...) {	Msg		("imf_Process::8 (yscale>1.0)");	};
-	}
-
-	/* apply filter to zoom vertically from tmp to dst */
-	try	{
-		raster = (Pixel *)xr_malloc(tmp->ysize*sizeof(Pixel));
-		ZeroMemory(raster,tmp->ysize*sizeof(Pixel));
-	} catch (...) {	Msg		("imf_Process::9");	};
-	try	{
-		for(k = 0; k < dst.xsize; ++k)
-		{
-			get_column	(raster, tmp, k);
-			for(i = 0; i < dst.ysize; ++i)
-			{
-				float	w_r	= 0., w_g = 0., w_b	= 0., w_a = 0.;
-
-				for	(j = 0; j < contrib[i].n; ++j)
-				{
-					float	W	=	contrib[i].p[j].weight;
-					Pixel	P	=	raster[contrib[i].p[j].pixel];
-					w_r			+=	W*float(color_get_R(P));
-					w_g			+=	W*float(color_get_G(P));
-					w_b			+=	W*float(color_get_B(P));
-					w_a			+=	W*float(color_get_A(P));
-				}
-				put_pixel(&dst, k, i, color_rgba(CC(w_r),CC(w_g),CC(w_b),CC(w_a+0.5f)));
-			}
-
-		}
-		xr_free(raster);
-	} catch (...) {	Msg		("imf_Process::A");	};
-
-	/* xr_free the memory allocated for vertical filter weights */
-	try	{
-		for	(i = 0; i < dst.ysize; ++i) xr_free(contrib[i].p);
-		xr_free(contrib);
-	} catch (...) {	Msg		("imf_Process::B");	};
-
-	free_image(tmp);
+    R_ASSERT(dstI);
+    R_ASSERT(dstW > 1);
+    R_ASSERT(dstH > 1);
+    R_ASSERT(srcI);
+    R_ASSERT(srcW > 1);
+    R_ASSERT(srcH > 1);
+
+    // SRC & DST images
+    Image src;
+    src.xsize = srcW;
+    src.ysize = srcH;
+    src.data = srcI;
+    src.span = srcW;
+    Image dst;
+    dst.xsize = dstW;
+    dst.ysize = dstH;
+    dst.data = dstI;
+    dst.span = dstW;
+
+    // Select filter
+    float(*filterf)(float);
+    filterf = 0;
+    float fwidth = 0;
+    switch (FILTER)
+    {
+    case imf_filter:
+        filterf = filter;
+        fwidth = filter_support;
+        break;
+    case imf_box:
+        filterf = box_filter;
+        fwidth = box_support;
+        break;
+    case imf_triangle:
+        filterf = triangle_filter;
+        fwidth = triangle_support;
+        break;
+    case imf_bell:
+        filterf = bell_filter;
+        fwidth = bell_support;
+        break;
+    case imf_b_spline:
+        filterf = B_spline_filter;
+        fwidth = B_spline_support;
+        break;
+    case imf_lanczos3:
+        filterf = Lanczos3_filter;
+        fwidth = Lanczos3_support;
+        break;
+    case imf_mitchell:
+        filterf = Mitchell_filter;
+        fwidth = Mitchell_support;
+        break;
+    }
+
+
+    //
+    Image* tmp = 0; /* intermediate image */
+    float xscale = 0, yscale = 0;/* zoom scale factors */
+    int i, j, k; /* loop variables */
+    int n; /* pixel number */
+    float center, left, right; /* filter calculation variables */
+    float width, fscale, weight; /* filter calculation variables */
+    Pixel* raster = 0; /* a row or column of pixels */
+    CLIST* contrib = 0; /* array of contribution lists */
+
+    /* create intermediate image to hold horizontal zoom */
+    try
+    {
+        tmp = new_image(dst.xsize, src.ysize);
+        xscale = float(dst.xsize) / float(src.xsize);
+        yscale = float(dst.ysize) / float(src.ysize);
+    }
+    catch (...)
+    {
+        Msg("imf_Process::1");
+    };
+
+    /* pre-calculate filter contributions for a row */
+    try
+    {
+        contrib = (CLIST*)xr_malloc(dst.xsize*sizeof(CLIST));
+        ZeroMemory(contrib, dst.xsize*sizeof(CLIST));
+    }
+    catch (...)
+    {
+        Msg("imf_Process::2");
+    };
+    if (xscale < 1.0)
+    {
+        try
+        {
+            width = fwidth / xscale;
+            fscale = 1.0f / xscale;
+            for (i = 0; i < dst.xsize; ++i)
+            {
+                contrib[i].n = 0;
+                contrib[i].p = (CONTRIB*)xr_malloc((int)(width * 2 + 1)*sizeof(CONTRIB));
+                ZeroMemory(contrib[i].p, (int)(width * 2 + 1)*sizeof(CONTRIB));
+                center = float(i) / xscale;
+                left = ceil(center - width);
+                right = floor(center + width);
+                for (j = int(left); j <= int(right); ++j)
+                {
+                    weight = center - float(j);
+                    weight = filterf(weight / fscale) / fscale;
+                    if (j < 0)
+                    {
+                        n = -j;
+                    }
+                    else if (j >= src.xsize)
+                    {
+                        n = (src.xsize - j) + src.xsize - 1;
+                    }
+                    else
+                    {
+                        n = j;
+                    }
+                    k = contrib[i].n++;
+                    contrib[i].p[k].pixel = (n < src.xsize) ? n : (src.xsize - 1);
+                    contrib[i].p[k].weight = weight;
+                }
+            }
+        }
+        catch (...)
+        {
+            Msg("imf_Process::3 (xscale<1.0)");
+        };
+    }
+    else
+    {
+        try
+        {
+            for (i = 0; i < dst.xsize; ++i)
+            {
+                contrib[i].n = 0;
+                contrib[i].p = (CONTRIB*)xr_malloc((int)(fwidth * 2 + 1)*sizeof(CONTRIB));
+                ZeroMemory(contrib[i].p, (int)(fwidth * 2 + 1)*sizeof(CONTRIB));
+                center = float(i) / xscale;
+                left = ceil(center - fwidth);
+                right = floor(center + fwidth);
+                for (j = int(left); j <= int(right); ++j)
+                {
+                    weight = center - (float)j;
+                    weight = (*filterf)(weight);
+                    if (j < 0)
+                    {
+                        n = -j;
+                    }
+                    else if (j >= src.xsize)
+                    {
+                        n = (src.xsize - j) + src.xsize - 1;
+                    }
+                    else
+                    {
+                        n = j;
+                    }
+                    k = contrib[i].n++;
+                    contrib[i].p[k].pixel = (n < src.xsize) ? n : (src.xsize - 1);
+                    contrib[i].p[k].weight = weight;
+                }
+            }
+        }
+        catch (...)
+        {
+            Msg("imf_Process::3 (xscale>1.0)");
+        };
+    }
+
+    /* apply filter to zoom horizontally from src to tmp */
+    try
+    {
+        raster = (Pixel*)xr_malloc(src.xsize*sizeof(Pixel));
+        ZeroMemory(raster, src.xsize*sizeof(Pixel));
+    }
+    catch (...) { Msg("imf_Process::4"); };
+    try
+    {
+        for (k = 0; k < tmp->ysize; ++k)
+        {
+            get_row(raster, &src, k);
+            for (i = 0; i < tmp->xsize; ++i)
+            {
+                float w_r = 0., w_g = 0., w_b = 0., w_a = 0.;
+
+                for (j = 0; j < contrib[i].n; ++j)
+                {
+                    float W = contrib[i].p[j].weight;
+                    Pixel P = raster[contrib[i].p[j].pixel];
+                    w_r += W*float(color_get_R(P));
+                    w_g += W*float(color_get_G(P));
+                    w_b += W*float(color_get_B(P));
+                    w_a += W*float(color_get_A(P));
+                }
+                put_pixel(tmp, i, k, color_rgba(CC(w_r), CC(w_g), CC(w_b), CC(w_a + 0.5f)));
+            }
+        }
+        xr_free(raster);
+    }
+    catch (...) { Msg("imf_Process::5"); };
+
+    /* xr_free the memory allocated for horizontal filter weights */
+    try
+    {
+        for (i = 0; i < tmp->xsize; ++i) xr_free(contrib[i].p);
+        xr_free(contrib);
+    }
+    catch (...) { Msg("imf_Process::6"); };
+
+    /* pre-calculate filter contributions for a column */
+    try
+    {
+        contrib = (CLIST*)xr_malloc(dst.ysize*sizeof(CLIST));
+        ZeroMemory(contrib, dst.ysize*sizeof(CLIST));
+    }
+    catch (...) { Msg("imf_Process::7"); };
+    if (yscale < 1.0)
+    {
+        try
+        {
+            width = fwidth / yscale;
+            fscale = 1.0f / yscale;
+            for (i = 0; i < dst.ysize; ++i)
+            {
+                contrib[i].n = 0;
+                contrib[i].p = (CONTRIB*)xr_malloc((int)(width * 2 + 1)*sizeof(CONTRIB));
+                ZeroMemory(contrib[i].p, (int)(width * 2 + 1)*sizeof(CONTRIB));
+                center = (float)i / yscale;
+                left = ceil(center - width);
+                right = floor(center + width);
+                for (j = int(left); j <= int(right); ++j)
+                {
+                    weight = center - (float)j;
+                    weight = filterf(weight / fscale) / fscale;
+                    if (j < 0)
+                    {
+                        n = -j;
+                    }
+                    else if (j >= tmp->ysize)
+                    {
+                        n = (tmp->ysize - j) + tmp->ysize - 1;
+                    }
+                    else
+                    {
+                        n = j;
+                    }
+                    k = contrib[i].n++;
+                    contrib[i].p[k].pixel = (n < tmp->ysize) ? n : (tmp->ysize - 1);
+                    contrib[i].p[k].weight = weight;
+                }
+            }
+        }
+        catch (...) { Msg("imf_Process::8 (yscale<1.0)"); };
+    }
+    else
+    {
+        try
+        {
+            for (i = 0; i < dst.ysize; ++i)
+            {
+                contrib[i].n = 0;
+                contrib[i].p = (CONTRIB*)xr_malloc((int)(fwidth * 2 + 1)*sizeof(CONTRIB));
+                ZeroMemory(contrib[i].p, (int)(fwidth * 2 + 1)*sizeof(CONTRIB));
+                center = (float)i / yscale;
+                left = ceil(center - fwidth);
+                right = floor(center + fwidth);
+                for (j = int(left); j <= int(right); ++j)
+                {
+                    weight = center - (float)j;
+                    weight = (*filterf)(weight);
+                    if (j < 0)
+                    {
+                        n = -j;
+                    }
+                    else if (j >= tmp->ysize)
+                    {
+                        n = (tmp->ysize - j) + tmp->ysize - 1;
+                    }
+                    else
+                    {
+                        n = j;
+                    }
+                    k = contrib[i].n++;
+                    contrib[i].p[k].pixel = (n < tmp->ysize) ? n : (tmp->ysize - 1);
+                    contrib[i].p[k].weight = weight;
+                }
+            }
+        }
+        catch (...) { Msg("imf_Process::8 (yscale>1.0)"); };
+    }
+
+    /* apply filter to zoom vertically from tmp to dst */
+    try
+    {
+        raster = (Pixel*)xr_malloc(tmp->ysize*sizeof(Pixel));
+        ZeroMemory(raster, tmp->ysize*sizeof(Pixel));
+    }
+    catch (...) { Msg("imf_Process::9"); };
+    try
+    {
+        for (k = 0; k < dst.xsize; ++k)
+        {
+            get_column(raster, tmp, k);
+            for (i = 0; i < dst.ysize; ++i)
+            {
+                float w_r = 0., w_g = 0., w_b = 0., w_a = 0.;
+
+                for (j = 0; j < contrib[i].n; ++j)
+                {
+                    float W = contrib[i].p[j].weight;
+                    Pixel P = raster[contrib[i].p[j].pixel];
+                    w_r += W*float(color_get_R(P));
+                    w_g += W*float(color_get_G(P));
+                    w_b += W*float(color_get_B(P));
+                    w_a += W*float(color_get_A(P));
+                }
+                put_pixel(&dst, k, i, color_rgba(CC(w_r), CC(w_g), CC(w_b), CC(w_a + 0.5f)));
+            }
+
+        }
+        xr_free(raster);
+    }
+    catch (...) { Msg("imf_Process::A"); };
+
+    /* xr_free the memory allocated for vertical filter weights */
+    try
+    {
+        for (i = 0; i < dst.ysize; ++i) xr_free(contrib[i].p);
+        xr_free(contrib);
+    }
+    catch (...) { Msg("imf_Process::B"); };
+
+    free_image(tmp);
 }
diff --git a/src/xrEngine/xrImage_Resampler.h b/src/xrEngine/xrImage_Resampler.h
index 6a5f0a1814c..3c155f6afb8 100644
--- a/src/xrEngine/xrImage_Resampler.h
+++ b/src/xrEngine/xrImage_Resampler.h
@@ -1,20 +1,20 @@
 #ifndef xrImage_ResamplerH
 #define xrImage_ResamplerH
 
-#pragma		once
+#pragma once
 
-enum		EIMF_Type
+enum EIMF_Type
 {
-	imf_filter=0,
-	imf_box,
-	imf_triangle,
-	imf_bell,
-	imf_b_spline,
-	imf_lanczos3,
-	imf_mitchell,
+    imf_filter = 0,
+    imf_box,
+    imf_triangle,
+    imf_bell,
+    imf_b_spline,
+    imf_lanczos3,
+    imf_mitchell,
 
-	imf_FORCEDWORD=0xffffffff
+    imf_FORCEDWORD = 0xffffffff
 };
-ENGINE_API	void imf_Process(u32* dst, u32 dstW, u32 dstH, u32* src, u32 srcW, u32 srcH, EIMF_Type FILTER);
+ENGINE_API void imf_Process(u32* dst, u32 dstW, u32 dstH, u32* src, u32 srcW, u32 srcH, EIMF_Type FILTER);
 
 #endif
diff --git a/src/xrEngine/xrLevel.h b/src/xrEngine/xrLevel.h
index a5acb3dc33c..e834844f432 100644
--- a/src/xrEngine/xrLevel.h
+++ b/src/xrEngine/xrLevel.h
@@ -3,311 +3,359 @@
 
 #pragma once
 
-struct xrGUID {
-	u64	g[2];
-
-	ICF	bool operator==	(const xrGUID &o) const
-	{
-		return	((g[0] == o.g[0]) && (g[1] == o.g[1]));
-	}
-
-	ICF	bool operator!=	(const xrGUID &o) const
-	{
-		return	!(*this == o);
-	}
+struct xrGUID
+{
+    u64 g[2];
+
+    ICF bool operator== (const xrGUID& o) const
+    {
+        return ((g[0] == o.g[0]) && (g[1] == o.g[1]));
+    }
+
+    ICF bool operator!= (const xrGUID& o) const
+    {
+        return !(*this == o);
+    }
     ICF void LoadLTX(CInifile& ini, LPCSTR section, LPCSTR name)
     {
-        string128				buff;
+        string128 buff;
 
-		g[0]                    = ini.r_u64(section,strconcat(sizeof(buff),buff,name,"_g0"));
-		g[1]                    = ini.r_u64(section,strconcat(sizeof(buff),buff,name,"_g1"));
+        g[0] = ini.r_u64(section, strconcat(sizeof(buff), buff, name, "_g0"));
+        g[1] = ini.r_u64(section, strconcat(sizeof(buff), buff, name, "_g1"));
     }
 
     ICF void SaveLTX(CInifile& ini, LPCSTR section, LPCSTR name)
     {
-        string128				buff;
+        string128 buff;
 
-        ini.w_u64				(section,strconcat(sizeof(buff),buff,name,"_g0"),g[0]);
-        ini.w_u64				(section,strconcat(sizeof(buff),buff,name,"_g1"),g[1]);
+        ini.w_u64(section, strconcat(sizeof(buff), buff, name, "_g0"), g[0]);
+        ini.w_u64(section, strconcat(sizeof(buff), buff, name, "_g1"), g[1]);
     }
 };
 
-enum fsL_Chunks			{
-	fsL_HEADER			=1,		//*
-	fsL_SHADERS			=2,		//*
-	fsL_VISUALS			=3,		//*
-	fsL_PORTALS			=4,		//*		- Portal polygons
-	fsL_LIGHT_DYNAMIC	=6,		//*
-	fsL_GLOWS			=7,		//*		- All glows inside level
-	fsL_SECTORS			=8,		//*		- All sectors on level
-	fsL_VB				=9,		//*		- Static geometry
-	fsL_IB				=10,	//*
-	fsL_SWIS			=11,	//*		- collapse info, usually for trees
-    fsL_forcedword		= 0xFFFFFFFF
+enum fsL_Chunks
+{
+    fsL_HEADER = 1, //*
+    fsL_SHADERS = 2, //*
+    fsL_VISUALS = 3, //*
+    fsL_PORTALS = 4, //* - Portal polygons
+    fsL_LIGHT_DYNAMIC = 6, //*
+    fsL_GLOWS = 7, //* - All glows inside level
+    fsL_SECTORS = 8, //* - All sectors on level
+    fsL_VB = 9, //* - Static geometry
+    fsL_IB = 10, //*
+    fsL_SWIS = 11, //* - collapse info, usually for trees
+    fsL_forcedword = 0xFFFFFFFF
 };
-enum fsESectorChunks	{
-	fsP_Portals = 1,	// - portal polygons
-	fsP_Root,			// - geometry root
-	fsP_forcedword = u32(-1)
+enum fsESectorChunks
+{
+    fsP_Portals = 1, // - portal polygons
+    fsP_Root, // - geometry root
+    fsP_forcedword = u32(-1)
 };
-enum fsSLS_Chunks		{
-	fsSLS_Description	= 1,	// Name of level
-	fsSLS_ServerState,
-	fsSLS_forcedword = u32(-1)
+enum fsSLS_Chunks
+{
+    fsSLS_Description = 1, // Name of level
+    fsSLS_ServerState,
+    fsSLS_forcedword = u32(-1)
 };
 
-enum EBuildQuality{
-	ebqDraft			= 0,			
-	ebqHigh,
-	ebqCustom,
-	ebq_force_u16		= u16(-1)
+enum EBuildQuality
+{
+    ebqDraft = 0,
+    ebqHigh,
+    ebqCustom,
+    ebq_force_u16 = u16(-1)
 };
 
 #pragma pack(push,8)
 struct hdrLEVEL
 {
-	u16		XRLC_version;
-	u16		XRLC_quality;
+    u16 XRLC_version;
+    u16 XRLC_quality;
 };
 
 struct hdrCFORM
 {
-	u32		version;
-	u32		vertcount;
-	u32		facecount;
-	Fbox	aabb;
+    u32 version;
+    u32 vertcount;
+    u32 facecount;
+    Fbox aabb;
 };
 
-struct	hdrNODES
+struct hdrNODES
 {
-	u32		version;
-	u32		count;
-	float	size;
-	float	size_y;
-	Fbox	aabb;
-	xrGUID	guid;
+    u32 version;
+    u32 count;
+    float size;
+    float size_y;
+    Fbox aabb;
+    xrGUID guid;
 };
 #pragma pack(pop)
 
 #pragma pack(push,1)
 #pragma pack(1)
 #ifndef _EDITOR
-class NodePosition {
-	u8	data[5];
-	
-	ICF	void xz	(u32 value)	{ CopyMemory	(data,&value,3);		}
-	ICF	void y	(u16 value)	{ CopyMemory	(data + 3,&value,2);	}
+class NodePosition
+{
+    u8 data[5];
+
+    ICF void xz(u32 value) { CopyMemory(data, &value, 3); }
+    ICF void y(u16 value) { CopyMemory(data + 3, &value, 2); }
 public:
-	ICF	u32	xz	() const	{
-		return			((*((u32*)data)) & 0x00ffffff);
-	}
-	ICF	u32	x	(u32 row) const		{
-		return			(xz() / row);
-	}
-	ICF	u32	z	(u32 row) const		{
-		return			(xz() % row);
-	}
-	ICF	u32	y	() const			{
-		return			(*((u16*)(data + 3)));
-	}
-
-	friend class	CLevelGraph;
-	friend struct	CNodePositionCompressor;
-	friend struct	CNodePositionConverter;
+    ICF u32 xz() const
+    {
+        return ((*((u32*)data)) & 0x00ffffff);
+    }
+    ICF u32 x(u32 row) const
+    {
+        return (xz() / row);
+    }
+    ICF u32 z(u32 row) const
+    {
+        return (xz() % row);
+    }
+    ICF u32 y() const
+    {
+        return (*((u16*)(data + 3)));
+    }
+
+    friend class CLevelGraph;
+    friend struct CNodePositionCompressor;
+    friend struct CNodePositionConverter;
 };
 
-struct NodeCompressed {
+struct NodeCompressed
+{
 public:
-	u8				data[12];
+    u8 data[12];
 private:
-	
-	ICF	void link(u8 link_index, u32 value)
-	{
-		value			&= 0x007fffff;
-		switch (link_index) {
-			case 0 : {
-				value	|= (*(u32*)data) & 0xff800000;
-				CopyMemory(data, &value, sizeof(u32));
-				break;
-			}
-			case 1 : {
-				value	<<= 7;
-				value	|= (*(u32*)(data + 2)) & 0xc000007f;
-				CopyMemory(data + 2, &value, sizeof(u32));
-				break;
-			}
-			case 2 : {
-				value	<<= 6;
-				value	|= (*(u32*)(data + 5)) & 0xe000003f;
-				CopyMemory(data + 5, &value, sizeof(u32));
-				break;
-			}
-			case 3 : {
-				value	<<= 5;
-				value	|= (*(u32*)(data + 8)) & 0xf000001f;
-				CopyMemory(data + 8, &value, sizeof(u32));
-				break;
-			}
-		}
-	}
-	
-	ICF	void light(u8 value)
-	{
-		data[10]		|= value << 4;
-	}
+
+    ICF void link(u8 link_index, u32 value)
+    {
+        value &= 0x007fffff;
+        switch (link_index)
+        {
+        case 0:
+        {
+            value |= (*(u32*)data) & 0xff800000;
+            CopyMemory(data, &value, sizeof(u32));
+            break;
+        }
+        case 1:
+        {
+            value <<= 7;
+            value |= (*(u32*)(data + 2)) & 0xc000007f;
+            CopyMemory(data + 2, &value, sizeof(u32));
+            break;
+        }
+        case 2:
+        {
+            value <<= 6;
+            value |= (*(u32*)(data + 5)) & 0xe000003f;
+            CopyMemory(data + 5, &value, sizeof(u32));
+            break;
+        }
+        case 3:
+        {
+            value <<= 5;
+            value |= (*(u32*)(data + 8)) & 0xf000001f;
+            CopyMemory(data + 8, &value, sizeof(u32));
+            break;
+        }
+        }
+    }
+
+    ICF void light(u8 value)
+    {
+        data[10] |= value << 4;
+    }
 
 public:
-	struct SCover {
-		u16			cover0 : 4;
-		u16			cover1 : 4;
-		u16			cover2 : 4;
-		u16			cover3 : 4; 
-
-		ICF	u16	cover(u8 index) const
-		{
-			switch (index) {
-				case 0 : return(cover0);
-				case 1 : return(cover1);
-				case 2 : return(cover2);
-				case 3 : return(cover3);
-				default : NODEFAULT;
-			}
-	#ifdef DEBUG
-			return				(u8(-1));
-	#endif
-		}
-	};
-
-	SCover			high;
-	SCover			low;
-	u16				plane;
-	NodePosition	p;
-	// 32 + 16 + 40 + 92 = 180 bits = 24.5 bytes => 25 bytes
-
-	ICF	u32	link(u8 index) const
-	{
-		switch (index) {
-			case 0 :	return	((*(u32*)data) & 0x007fffff);
-			case 1 :	return	(((*(u32*)(data + 2)) >> 7) & 0x007fffff);
-			case 2 :	return	(((*(u32*)(data + 5)) >> 6) & 0x007fffff);
-			case 3 :	return	(((*(u32*)(data + 8)) >> 5) & 0x007fffff);
-			default :	NODEFAULT;
-		}
+    struct SCover
+    {
+        u16 cover0 : 4;
+        u16 cover1 : 4;
+        u16 cover2 : 4;
+        u16 cover3 : 4;
+
+        ICF u16 cover(u8 index) const
+        {
+            switch (index)
+            {
+            case 0:
+                return(cover0);
+            case 1:
+                return(cover1);
+            case 2:
+                return(cover2);
+            case 3:
+                return(cover3);
+            default:
+                NODEFAULT;
+            }
+#ifdef DEBUG
+            return (u8(-1));
+#endif
+        }
+    };
+
+    SCover high;
+    SCover low;
+    u16 plane;
+    NodePosition p;
+    // 32 + 16 + 40 + 92 = 180 bits = 24.5 bytes => 25 bytes
+
+    ICF u32 link(u8 index) const
+    {
+        switch (index)
+        {
+        case 0:
+            return ((*(u32*)data) & 0x007fffff);
+        case 1:
+            return (((*(u32*)(data + 2)) >> 7) & 0x007fffff);
+        case 2:
+            return (((*(u32*)(data + 5)) >> 6) & 0x007fffff);
+        case 3:
+            return (((*(u32*)(data + 8)) >> 5) & 0x007fffff);
+        default:
+            NODEFAULT;
+        }
 #ifdef DEBUG
-		return			(0);
+        return (0);
 #endif
-	}
-	
-	friend class	CLevelGraph;
-	friend struct	CNodeCompressed;
-	friend class	CNodeRenumberer;
-	friend class	CRenumbererConverter;
+    }
+
+    friend class CLevelGraph;
+    friend struct CNodeCompressed;
+    friend class CNodeRenumberer;
+    friend class CRenumbererConverter;
 };
 #endif
 
 #ifdef AI_COMPILER
-struct NodeCompressed6 {
+struct NodeCompressed6
+{
 public:
-	u8				data[11];
+    u8 data[11];
 private:
-	
-	ICF	void link(u8 link_index, u32 value)
-	{
-		value			&= 0x001fffff;
-		switch (link_index) {
-			case 0 : {
-				value	|= (*(u32*)data) & 0xffe00000;
-				CopyMemory(data, &value, sizeof(u32));
-				break;
-			}
-			case 1 : {
-				value	<<= 5;
-				value	|= (*(u32*)(data + 2)) & 0xfc00001f;
-				CopyMemory(data + 2, &value, sizeof(u32));
-				break;
-			}
-			case 2 : {
-				value	<<= 2;
-				value	|= (*(u32*)(data + 5)) & 0xff800003;
-				CopyMemory(data + 5, &value, sizeof(u32));
-				break;
-			}
-			case 3 : {
-				value	<<= 7;
-				value	|= (*(u32*)(data + 7)) & 0xf000007f;
-				CopyMemory(data + 7, &value, sizeof(u32));
-				break;
-			}
-		}
-	}
-	
-	ICF	void light(u8 value)
-	{
-		data[10]		|= value << 4;
-	}
+
+    ICF void link(u8 link_index, u32 value)
+    {
+        value &= 0x001fffff;
+        switch (link_index)
+        {
+        case 0 :
+        {
+            value |= (*(u32*)data) & 0xffe00000;
+            CopyMemory(data, &value, sizeof(u32));
+            break;
+        }
+        case 1 :
+        {
+            value <<= 5;
+            value |= (*(u32*)(data + 2)) & 0xfc00001f;
+            CopyMemory(data + 2, &value, sizeof(u32));
+            break;
+        }
+        case 2 :
+        {
+            value <<= 2;
+            value |= (*(u32*)(data + 5)) & 0xff800003;
+            CopyMemory(data + 5, &value, sizeof(u32));
+            break;
+        }
+        case 3 :
+        {
+            value <<= 7;
+            value |= (*(u32*)(data + 7)) & 0xf000007f;
+            CopyMemory(data + 7, &value, sizeof(u32));
+            break;
+        }
+        }
+    }
+
+    ICF void light(u8 value)
+    {
+        data[10] |= value << 4;
+    }
 
 public:
-	u16				cover0 : 4;
-	u16				cover1 : 4;
-	u16				cover2 : 4;
-	u16				cover3 : 4;
-	u16				plane;
-	NodePosition	p;
-
-	ICF	u32	link(u8 index) const
-	{
-		switch (index) {
-			case 0 :	return	((*(u32*)data) & 0x001fffff);
-			case 1 :	return	(((*(u32*)(data + 2)) >> 5) & 0x001fffff);
-			case 2 :	return	(((*(u32*)(data + 5)) >> 2) & 0x001fffff);
-			case 3 :	return	(((*(u32*)(data + 7)) >> 7) & 0x001fffff);
-			default :	NODEFAULT;
-		}
+    u16 cover0 : 4;
+    u16 cover1 : 4;
+    u16 cover2 : 4;
+    u16 cover3 : 4;
+    u16 plane;
+    NodePosition p;
+
+    ICF u32 link(u8 index) const
+    {
+        switch (index)
+        {
+        case 0 :
+            return ((*(u32*)data) & 0x001fffff);
+        case 1 :
+            return (((*(u32*)(data + 2)) >> 5) & 0x001fffff);
+        case 2 :
+            return (((*(u32*)(data + 5)) >> 2) & 0x001fffff);
+        case 3 :
+            return (((*(u32*)(data + 7)) >> 7) & 0x001fffff);
+        default :
+            NODEFAULT;
+        }
 #ifdef DEBUG
-		return			(0);
+        return (0);
 #endif
-	}
-	
-	ICF	u8	light() const
-	{
-		return			(data[10] >> 4);
-	}
-	
-	ICF	u16	cover(u8 index) const
-	{
-		switch (index) {
-			case 0 : return(cover0);
-			case 1 : return(cover1);
-			case 2 : return(cover2);
-			case 3 : return(cover3);
-			default : NODEFAULT;
-		}
+    }
+
+    ICF u8 light() const
+    {
+        return (data[10] >> 4);
+    }
+
+    ICF u16 cover(u8 index) const
+    {
+        switch (index)
+        {
+        case 0 :
+            return(cover0);
+        case 1 :
+            return(cover1);
+        case 2 :
+            return(cover2);
+        case 3 :
+            return(cover3);
+        default :
+            NODEFAULT;
+        }
 #ifdef DEBUG
-		return				(u8(-1));
+        return (u8(-1));
 #endif
-	}
+    }
 
-	friend class CLevelGraph;
-	friend struct CNodeCompressed;
-	friend class CNodeRenumberer;
-};									// 2+5+2+11 = 20b
+    friend class CLevelGraph;
+    friend struct CNodeCompressed;
+    friend class CNodeRenumberer;
+}; // 2+5+2+11 = 20b
 #endif
 
-struct SNodePositionOld {
-	s16				x;
-	u16				y;
-	s16				z;
+struct SNodePositionOld
+{
+    s16 x;
+    u16 y;
+    s16 z;
 };
-#pragma pack	(pop)
+#pragma pack (pop)
 
 #ifdef _EDITOR
-typedef	SNodePositionOld NodePosition;
+typedef SNodePositionOld NodePosition;
 #endif
 
-const u32 XRCL_CURRENT_VERSION		=	18; //17;	// input
-const u32 XRCL_PRODUCTION_VERSION	=	14;	// output 
-const u32 CFORM_CURRENT_VERSION		=	4;
-const u32 MAX_NODE_BIT_COUNT		=	23;
-const u32 XRAI_CURRENT_VERSION		=	10;
+const u32 XRCL_CURRENT_VERSION = 18; //17; // input
+const u32 XRCL_PRODUCTION_VERSION = 14; // output
+const u32 CFORM_CURRENT_VERSION = 4;
+const u32 MAX_NODE_BIT_COUNT = 23;
+const u32 XRAI_CURRENT_VERSION = 10;
 
 #endif // xrLevelH
\ No newline at end of file
diff --git a/src/xrEngine/xrLoadSurface.cpp b/src/xrEngine/xrLoadSurface.cpp
index 7d9e55f5eb0..0d2a0ac4377 100644
--- a/src/xrEngine/xrLoadSurface.cpp
+++ b/src/xrEngine/xrLoadSurface.cpp
@@ -3,36 +3,47 @@
 
 #include <FreeImage.h>
 
-struct SExts{
-	xr_vector<LPSTR>	exts;
+struct SExts
+{
+    xr_vector<LPSTR> exts;
     void format_register(LPCSTR ext)
     {
-    	if (ext&&ext[0]){
-			for (u32 i=0; i<exts.size(); i++)
-    			if (0==stricmp(exts[i],ext)) return;
-    		exts.push_back(xr_strdup(ext));
+        if (ext && ext[0])
+        {
+            for (u32 i = 0; i < exts.size(); i++)
+                if (0 == stricmp(exts[i], ext)) return;
+            exts.push_back(xr_strdup(ext));
         }
     }
-    u32 size()	{	return (u32)exts.size();	}
-    LPSTR operator [](int k){return exts[k];}
-	~SExts()
+    u32 size()
+    {
+        return (u32)exts.size();
+    }
+    LPSTR operator [](int k)
+    {
+        return exts[k];
+    }
+    ~SExts()
     {
-		for (u32 i=0; i<exts.size(); i++)
-    		xr_free(exts[i]);
+        for (u32 i = 0; i < exts.size(); i++)
+            xr_free(exts[i]);
         exts.clear();
     }
 };
 SExts formats;
 
-void	Surface_FormatExt(FREE_IMAGE_FORMAT f)
+void Surface_FormatExt(FREE_IMAGE_FORMAT f)
 {
-	LPCSTR n=FreeImage_GetFIFExtensionList(f);
-    if (n){
+    LPCSTR n = FreeImage_GetFIFExtensionList(f);
+    if (n)
+    {
         LPSTR base = xr_strdup(n);
         LPSTR ext = base;
         LPSTR cur = ext;
-        for	(; ext[0]; ext++){
-        if (ext[0]==','){
+        for (; ext[0]; ext++)
+        {
+            if (ext[0] == ',')
+            {
                 ext[0] = 0;
                 formats.format_register(cur);
                 cur = ++ext;
@@ -42,84 +53,85 @@ void	Surface_FormatExt(FREE_IMAGE_FORMAT f)
         xr_free(base);
     }
 }
-void	Surface_Init()
+void Surface_Init()
 {
-	Msg("* ImageLibrary version: %s",FreeImage_GetVersion());
+    Msg("* ImageLibrary version: %s", FreeImage_GetVersion());
 
     formats.format_register("tga");
-	Surface_FormatExt(FIF_BMP);
-	Surface_FormatExt(FIF_ICO);
-	Surface_FormatExt(FIF_JPEG);
-	Surface_FormatExt(FIF_JNG);
-	Surface_FormatExt(FIF_KOALA);
-	Surface_FormatExt(FIF_LBM);
-	Surface_FormatExt(FIF_MNG);
-	Surface_FormatExt(FIF_PBM);
-	Surface_FormatExt(FIF_PBMRAW);
-	Surface_FormatExt(FIF_PCD);
-	Surface_FormatExt(FIF_PCX);
-	Surface_FormatExt(FIF_PGM);
-	Surface_FormatExt(FIF_PGMRAW);
-	Surface_FormatExt(FIF_PNG);
-	Surface_FormatExt(FIF_PPM);
-	Surface_FormatExt(FIF_PPMRAW);
-	Surface_FormatExt(FIF_RAS);
-	Surface_FormatExt(FIF_TARGA);
-	Surface_FormatExt(FIF_TIFF);
-	Surface_FormatExt(FIF_WBMP);
-	Surface_FormatExt(FIF_PSD);
-	Surface_FormatExt(FIF_IFF);
-
-	Msg("* %d supported formats",formats.size());
+    Surface_FormatExt(FIF_BMP);
+    Surface_FormatExt(FIF_ICO);
+    Surface_FormatExt(FIF_JPEG);
+    Surface_FormatExt(FIF_JNG);
+    Surface_FormatExt(FIF_KOALA);
+    Surface_FormatExt(FIF_LBM);
+    Surface_FormatExt(FIF_MNG);
+    Surface_FormatExt(FIF_PBM);
+    Surface_FormatExt(FIF_PBMRAW);
+    Surface_FormatExt(FIF_PCD);
+    Surface_FormatExt(FIF_PCX);
+    Surface_FormatExt(FIF_PGM);
+    Surface_FormatExt(FIF_PGMRAW);
+    Surface_FormatExt(FIF_PNG);
+    Surface_FormatExt(FIF_PPM);
+    Surface_FormatExt(FIF_PPMRAW);
+    Surface_FormatExt(FIF_RAS);
+    Surface_FormatExt(FIF_TARGA);
+    Surface_FormatExt(FIF_TIFF);
+    Surface_FormatExt(FIF_WBMP);
+    Surface_FormatExt(FIF_PSD);
+    Surface_FormatExt(FIF_IFF);
+
+    Msg("* %d supported formats", formats.size());
 }
 
-BOOL	Surface_Detect(string_path& F, LPSTR N)
+BOOL Surface_Detect(string_path& F, LPSTR N)
 {
-	FS.update_path		(F,"$game_textures$",strconcat(sizeof(F),F,N,".dds"));
-	int					h = _open(F,O_RDONLY|O_BINARY);
-	if (h > 0) {
-		_close			(h);
-		return			(TRUE);
-	}
-
-	return				(FALSE);
+    FS.update_path(F, "$game_textures$", strconcat(sizeof(F), F, N, ".dds"));
+    int h = _open(F, O_RDONLY | O_BINARY);
+    if (h > 0)
+    {
+        _close(h);
+        return (TRUE);
+    }
+
+    return (FALSE);
 }
 
-FIBITMAP*	Surface_Load(char* full_name)
+FIBITMAP* Surface_Load(char* full_name)
 {
-	// load
-	FREE_IMAGE_FORMAT	fif		= FreeImage_GetFIFFromFilename(full_name);
-	FIBITMAP*			map		= FreeImage_Load(fif,full_name);
-	if (0==map)			return NULL;
+    // load
+    FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(full_name);
+    FIBITMAP* map = FreeImage_Load(fif, full_name);
+    if (0 == map) return NULL;
 
-	// check if already 32bpp
-	if (32==FreeImage_GetBPP(map))	return map;
+    // check if already 32bpp
+    if (32 == FreeImage_GetBPP(map)) return map;
 
-	// convert
-	FIBITMAP*			map32	= FreeImage_ConvertTo32Bits(map);
-	if (0==map32)		map32	= map;
-	else				FreeImage_Unload(map);
+    // convert
+    FIBITMAP* map32 = FreeImage_ConvertTo32Bits(map);
+    if (0 == map32) map32 = map;
+    else FreeImage_Unload(map);
 
- 	return				map32;
+    return map32;
 }
 
-u32*	Surface_Load(char* name, u32& w, u32& h)
+u32* Surface_Load(char* name, u32& w, u32& h)
 {
-	if (strchr(name,'.')) *(strchr(name,'.')) = 0;
+    if (strchr(name, '.')) *(strchr(name, '.')) = 0;
 
-	// detect format
-	string_path		full;
-	if (!Surface_Detect(full,name)) return NULL;
+    // detect format
+    string_path full;
+    if (!Surface_Detect(full, name)) return NULL;
 
-	FIBITMAP* map32		= Surface_Load(full);
+    FIBITMAP* map32 = Surface_Load(full);
 
-	h					= FreeImage_GetHeight	(map32);
-	w					= FreeImage_GetWidth	(map32);
+    h = FreeImage_GetHeight(map32);
+    w = FreeImage_GetWidth(map32);
 
-	u32			memSize	= w*h*4;
-	u32*		memPTR	= (u32*)(xr_malloc(memSize));
-	u32*		memDATA	= (u32*)(FreeImage_GetScanLine(map32,0));
-	CopyMemory	(memPTR,memDATA,memSize);
-	FreeImage_Unload		(map32);
-	return		memPTR;
+    u32 memSize = w*h * 4;
+    u32* memPTR = (u32*)(xr_malloc(memSize));
+    u32* memDATA = (u32*)(FreeImage_GetScanLine(map32, 0));
+    CopyMemory(memPTR, memDATA, memSize);
+    FreeImage_Unload(map32);
+    return memPTR;
 }
diff --git a/src/xrEngine/xrSASH.cpp b/src/xrEngine/xrSASH.cpp
index b2a5fa7459f..3cc59c59d55 100644
--- a/src/xrEngine/xrSASH.cpp
+++ b/src/xrEngine/xrSASH.cpp
@@ -4,252 +4,252 @@
 #include "xr_ioconsole.h"
 #include "xr_ioc_cmd.h"
 
-xrSASH	ENGINE_API g_SASH;
+xrSASH ENGINE_API g_SASH;
 
-xrSASH::xrSASH() : m_bInited(false), 
-	m_bOpenAutomate(false), m_bBenchmarkRunning(false),
-	m_bRunning(false), m_bReinitEngine(false),
-	m_bExecutingConsoleCommand(false)
+xrSASH::xrSASH() : m_bInited(false),
+    m_bOpenAutomate(false), m_bBenchmarkRunning(false),
+    m_bRunning(false), m_bReinitEngine(false),
+    m_bExecutingConsoleCommand(false)
 {
-	;
+    ;
 }
 
 xrSASH::~xrSASH()
 {
-	VERIFY(!m_bRunning);
-	VERIFY(!m_bBenchmarkRunning);
+    VERIFY(!m_bRunning);
+    VERIFY(!m_bBenchmarkRunning);
 }
 
 bool xrSASH::Init(const char* pszParam)
 {
-	oaVersion ver;
-	oaBool res = oaInit(pszParam, &ver);
-	if (res)
-	{
-		m_bInited = true;
-		m_bOpenAutomate = true;
-
-		Msg("oa:: Version: %d.%d.%d.%d", ver.Major, ver.Minor, ver.Minor, ver.Custom);
-
-		return true;
-	}
-	else
-	{
-		m_bInited = true;
-		xr_strcpy( m_strBenchCfgName, pszParam);
-		Msg("oa:: Failed to init.");
-		Msg("oa:: Running native path.");
-		return false;
-	}
+    oaVersion ver;
+    oaBool res = oaInit(pszParam, &ver);
+    if (res)
+    {
+        m_bInited = true;
+        m_bOpenAutomate = true;
+
+        Msg("oa:: Version: %d.%d.%d.%d", ver.Major, ver.Minor, ver.Minor, ver.Custom);
+
+        return true;
+    }
+    else
+    {
+        m_bInited = true;
+        xr_strcpy(m_strBenchCfgName, pszParam);
+        Msg("oa:: Failed to init.");
+        Msg("oa:: Running native path.");
+        return false;
+    }
 }
 
 void xrSASH::MainLoop()
 {
-	m_bRunning = true;
-	m_bReinitEngine = false;
-
-	if (m_bOpenAutomate)
-	{
-		LoopOA();
-	}
-	else
-	{
-		//	Native benchmarks
-		LoopNative();
-	}
-
-	m_bRunning = false;
+    m_bRunning = true;
+    m_bReinitEngine = false;
+
+    if (m_bOpenAutomate)
+    {
+        LoopOA();
+    }
+    else
+    {
+        // Native benchmarks
+        LoopNative();
+    }
+
+    m_bRunning = false;
 }
 
 void xrSASH::LoopOA()
 {
-	oaCommand Command;
-	bool	bExit = false;
-
-	while (!bExit)
-	{
-		//	It must be called on the oaCommand object sent to 
-		//	oaGetNextCommand() before each call to oaGetNextCommand().
-		oaInitCommand(&Command);
-		switch(oaGetNextCommand(&Command))
-		{
-			/* No more commands, exit program */
-		case OA_CMD_EXIT:
-			Msg("SASH:: Exit.");
-			bExit = true;
-			break;
-
-			/* Run as normal */
-		case OA_CMD_RUN: 
-			//RunApp();
-			//Msg("SASH:: GetCurrentOptions.");
-			bExit = true;
-			break;
-
-			/* Enumerate all in-game options */
-		case OA_CMD_GET_ALL_OPTIONS: 
-			GetAllOptions();
-			break;
-
-			/* Return the option values currently set */
-		case OA_CMD_GET_CURRENT_OPTIONS:
-			GetCurrentOptions();
-			break;
-
-			/* Set all in-game options */
-		case OA_CMD_SET_OPTIONS: 
-			SetOptions();
-			break;
-
-			/* Enumerate all known benchmarks */
-		case OA_CMD_GET_BENCHMARKS: 
-			GetBenchmarks();
-			break;
-
-			/* Run benchmark */
-		case OA_CMD_RUN_BENCHMARK: 
-			RunBenchmark(Command.BenchmarkName);
-			break;
-		}
-	}
+    oaCommand Command;
+    bool bExit = false;
+
+    while (!bExit)
+    {
+        // It must be called on the oaCommand object sent to
+        // oaGetNextCommand() before each call to oaGetNextCommand().
+        oaInitCommand(&Command);
+        switch (oaGetNextCommand(&Command))
+        {
+        /* No more commands, exit program */
+        case OA_CMD_EXIT:
+            Msg("SASH:: Exit.");
+            bExit = true;
+            break;
+
+        /* Run as normal */
+        case OA_CMD_RUN:
+            //RunApp();
+            //Msg("SASH:: GetCurrentOptions.");
+            bExit = true;
+            break;
+
+        /* Enumerate all in-game options */
+        case OA_CMD_GET_ALL_OPTIONS:
+            GetAllOptions();
+            break;
+
+        /* Return the option values currently set */
+        case OA_CMD_GET_CURRENT_OPTIONS:
+            GetCurrentOptions();
+            break;
+
+        /* Set all in-game options */
+        case OA_CMD_SET_OPTIONS:
+            SetOptions();
+            break;
+
+        /* Enumerate all known benchmarks */
+        case OA_CMD_GET_BENCHMARKS:
+            GetBenchmarks();
+            break;
+
+        /* Run benchmark */
+        case OA_CMD_RUN_BENCHMARK:
+            RunBenchmark(Command.BenchmarkName);
+            break;
+        }
+    }
 }
 
 void xrSASH::LoopNative()
 {
-	string_path in_file;
-	FS.update_path(in_file,"$app_data_root$", m_strBenchCfgName);
+    string_path in_file;
+    FS.update_path(in_file, "$app_data_root$", m_strBenchCfgName);
 
-	CInifile ini(in_file);
+    CInifile ini(in_file);
 
-	IReader* R 	= FS.r_open(in_file);
-	if (R)
-	{
-		FS.r_close(R);
+    IReader* R = FS.r_open(in_file);
+    if (R)
+    {
+        FS.r_close(R);
 
-		int test_count = ini.line_count("benchmark");
-		LPCSTR test_name,t;
-		shared_str test_command;
+        int test_count = ini.line_count("benchmark");
+        LPCSTR test_name, t;
+        shared_str test_command;
 
-		for(int i=0;i<test_count;++i)
-		{
-			ini.r_line( "benchmark", i, &test_name, &t);
-			//xr_strcpy(g_sBenchmarkName, test_name);
+        for (int i = 0; i < test_count; ++i)
+        {
+            ini.r_line("benchmark", i, &test_name, &t);
+            //xr_strcpy(g_sBenchmarkName, test_name);
 
-			test_command = ini.r_string_wb("benchmark",test_name);
-            u32 cmdSize = test_command.size()+1;
+            test_command = ini.r_string_wb("benchmark", test_name);
+            u32 cmdSize = test_command.size() + 1;
             Core.Params = (char*)xr_realloc(Core.Params, cmdSize);
             xr_strcpy(Core.Params, cmdSize, test_command.c_str());
             xr_strlwr(Core.Params);
 
-			RunBenchmark(test_name);
+            RunBenchmark(test_name);
 
-			//	Output results
-			ReportNative(test_name);
-		}
-	}
-	else
-		Msg("oa:: Native path can't find \"%s\" config file.", in_file);
+            // Output results
+            ReportNative(test_name);
+        }
+    }
+    else
+        Msg("oa:: Native path can't find \"%s\" config file.", in_file);
 
-	FlushLog();
+    FlushLog();
 }
 
-void xrSASH::ReportNative( LPCSTR pszTestName )
+void xrSASH::ReportNative(LPCSTR pszTestName)
 {
-	string_path			fname;
-	xr_sprintf( fname, sizeof(fname), "%s.result", pszTestName );
-	FS.update_path( fname, "$app_data_root$", fname );
-	CInifile	res( fname, FALSE, FALSE, TRUE );
-
-	// min/max/average
-	float fMinFps	= flt_max;
-	float fMaxFps	= flt_min;
-
-	const u32 iWindowSize	=	15;
-
-	if ( m_aFrimeTimes.size() > iWindowSize*4 )
-	{
-		for (u32 it=0; it<m_aFrimeTimes.size()-iWindowSize; it++)
-		{
-			float	fTime = 0;
-
-			for (u32 i=0; i<iWindowSize; ++i)
-				fTime += m_aFrimeTimes[it+i];
-
-			float fFps	= iWindowSize / fTime;
-			if ( fFps<fMinFps ) fMinFps = fFps;
-			if ( fFps>fMaxFps ) fMaxFps = fFps;
-		}
-	}
-	else
-	{
-		for (u32	it=0; it<m_aFrimeTimes.size(); it++)
-		{
-			float fFps	= 1.f / m_aFrimeTimes[it];
-			if (fFps<fMinFps) fMinFps = fFps;
-			if (fFps>fMaxFps) fMaxFps = fFps;
-		}
-	}
-
-	//res.w_float			("general","test float",	float(1.0f)/10.f,	"dx-level required"		);
-	//res.w_float			("general","renderer",	float(::Render->get_generation())/10.f,	"dx-level required"		);
-	//res.w_float			("general","average",	rfps_average,							"average for this run"	);
-	//res.w_float			("general","middle",	rfps_middlepoint,						"per-frame middle-point");
-	float fTotal = 0;
-	float fNumFrames = 0;
-	for (u32	it=0; it<m_aFrimeTimes.size(); it++)
-	{
-		string32		id;
-		xr_sprintf		(id,sizeof(id),"%07d",it);
-		res.w_float		("per_frame_stats",	id, 1.f / m_aFrimeTimes[it]);
-		fTotal += m_aFrimeTimes[it];
-		fNumFrames += 1;
-	}
-
-	//	Output statistics
-	res.w_float			("general","average",	fNumFrames/fTotal,	"average for this run"	);
-	res.w_float			("general","min",		fMinFps,			"absolute (smoothed) minimum"		);
-	res.w_float			("general","max",		fMaxFps,			"absolute (smoothed) maximum"		);
+    string_path fname;
+    xr_sprintf(fname, sizeof(fname), "%s.result", pszTestName);
+    FS.update_path(fname, "$app_data_root$", fname);
+    CInifile res(fname, FALSE, FALSE, TRUE);
+
+    // min/max/average
+    float fMinFps = flt_max;
+    float fMaxFps = flt_min;
+
+    const u32 iWindowSize = 15;
+
+    if (m_aFrimeTimes.size() > iWindowSize * 4)
+    {
+        for (u32 it = 0; it < m_aFrimeTimes.size() - iWindowSize; it++)
+        {
+            float fTime = 0;
+
+            for (u32 i = 0; i < iWindowSize; ++i)
+                fTime += m_aFrimeTimes[it + i];
+
+            float fFps = iWindowSize / fTime;
+            if (fFps < fMinFps) fMinFps = fFps;
+            if (fFps > fMaxFps) fMaxFps = fFps;
+        }
+    }
+    else
+    {
+        for (u32 it = 0; it < m_aFrimeTimes.size(); it++)
+        {
+            float fFps = 1.f / m_aFrimeTimes[it];
+            if (fFps < fMinFps) fMinFps = fFps;
+            if (fFps > fMaxFps) fMaxFps = fFps;
+        }
+    }
+
+    //res.w_float ("general","test float", float(1.0f)/10.f, "dx-level required" );
+    //res.w_float ("general","renderer", float(::Render->get_generation())/10.f, "dx-level required" );
+    //res.w_float ("general","average", rfps_average, "average for this run" );
+    //res.w_float ("general","middle", rfps_middlepoint, "per-frame middle-point");
+    float fTotal = 0;
+    float fNumFrames = 0;
+    for (u32 it = 0; it < m_aFrimeTimes.size(); it++)
+    {
+        string32 id;
+        xr_sprintf(id, sizeof(id), "%07d", it);
+        res.w_float("per_frame_stats", id, 1.f / m_aFrimeTimes[it]);
+        fTotal += m_aFrimeTimes[it];
+        fNumFrames += 1;
+    }
+
+    // Output statistics
+    res.w_float("general", "average", fNumFrames / fTotal, "average for this run");
+    res.w_float("general", "min", fMinFps, "absolute (smoothed) minimum");
+    res.w_float("general", "max", fMaxFps, "absolute (smoothed) maximum");
 }
 
 void xrSASH::StartBenchmark()
 {
-	if (!m_bRunning) return;
+    if (!m_bRunning) return;
 
-	VERIFY(!m_bBenchmarkRunning);
+    VERIFY(!m_bBenchmarkRunning);
 
-	m_bBenchmarkRunning = true;
-	oaStartBenchmark();
+    m_bBenchmarkRunning = true;
+    oaStartBenchmark();
 
-	if (!m_bOpenAutomate)
-	{
-		m_aFrimeTimes.clear();
-		m_aFrimeTimes.reserve(1024);
-		m_FrameTimer.Start();
-	}
+    if (!m_bOpenAutomate)
+    {
+        m_aFrimeTimes.clear();
+        m_aFrimeTimes.reserve(1024);
+        m_FrameTimer.Start();
+    }
 }
 
 void xrSASH::DisplayFrame(float t)
 {
-	if (!m_bRunning) return;
+    if (!m_bRunning) return;
 
-	VERIFY(m_bBenchmarkRunning);
-	oaDisplayFrame(t);
+    VERIFY(m_bBenchmarkRunning);
+    oaDisplayFrame(t);
 
-	if (!m_bOpenAutomate)
-	{
-		m_aFrimeTimes.push_back(m_FrameTimer.GetElapsed_sec());
-		m_FrameTimer.Start();
-	}
+    if (!m_bOpenAutomate)
+    {
+        m_aFrimeTimes.push_back(m_FrameTimer.GetElapsed_sec());
+        m_FrameTimer.Start();
+    }
 }
 
 void xrSASH::EndBenchmark()
 {
-	if (!m_bRunning) return;
+    if (!m_bRunning) return;
 
-	VERIFY(m_bBenchmarkRunning);
+    VERIFY(m_bBenchmarkRunning);
 
-	m_bBenchmarkRunning = false;
-	oaEndBenchmark();
+    m_bBenchmarkRunning = false;
+    oaEndBenchmark();
 }
 
 void InitInput();
@@ -262,488 +262,489 @@ void destroyEngine();
 
 void xrSASH::GetAllOptions()
 {
-	Msg("SASH:: GetAllOptions.");
-	TryInitEngine();
-
-	oaNamedOptionStruct Option; 
-	oaInitOption(&Option);
-	
-	DescribeOption("renderer",		Option.Dependency);
-	DescribeOption("vid_mode",		Option.Dependency);
-	DescribeOption("rs_fullscreen", Option.Dependency);
-
-	DescribeOption("rs_vis_distance",				Option.Dependency);
-	DescribeOption("r__geometry_lod",				Option.Dependency);
-	DescribeOption("r__detail_density",				Option.Dependency);
-	DescribeOption("texture_lod",					Option.Dependency);
-	DescribeOption("r__tf_aniso",					Option.Dependency);
-	DescribeOption("ai_use_torch_dynamic_lights",	Option.Dependency);
-
-	//	r1 only
-	Option.Dependency.ParentName = TEXT("renderer");
-	Option.Dependency.ComparisonOp = OA_COMP_OP_EQUAL;
-	Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r1");
-	Option.Dependency.ComparisonValType = GetOptionType("renderer");
-	{
-		DescribeOption("r__supersample",		Option.Dependency);
-		DescribeOption("r1_no_detail_textures", Option.Dependency);
-	}
-
-	//	>=r2
-	oaInitOption(&Option);	//	Reset dependency info
-	//	Currently only equal/not equal works
-	//Option.Dependency.ParentName = TEXT("renderer");
-	//Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
-	//Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r2");
-	//Option.Dependency.ComparisonValType = GetOptionType("renderer");
-	{
-		DescribeOption("r2_sun", Option.Dependency);
-		DescribeOption("r2_sun_quality", Option.Dependency);
-		DescribeOption("r2_slight_fade", Option.Dependency);
-		DescribeOption("r2_ls_squality", Option.Dependency);
-		DescribeOption("r2_detail_bump", Option.Dependency);
-	}
-
-	//	>=r2.5
-	//Option.Dependency.ParentName = TEXT("renderer");
-	//Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
-	//Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r2.5");
-	//Option.Dependency.ComparisonValType = GetOptionType("renderer");
-	{
-		DescribeOption("r2_sun_shafts",			Option.Dependency);
-		DescribeOption("r2_ssao",				Option.Dependency);
-		DescribeOption("r2_ssao_opt_data",		Option.Dependency);
-		DescribeOption("r2_ssao_half_data",		Option.Dependency);
-		DescribeOption("r2_ssao_hbao",			Option.Dependency);
-		DescribeOption("r2_soft_water",			Option.Dependency);
-		DescribeOption("r2_soft_particles",		Option.Dependency);
-		DescribeOption("r2_dof_enable",			Option.Dependency);
-		DescribeOption("r2_volumetric_lights",	Option.Dependency);
-		DescribeOption("r2_steep_parallax",		Option.Dependency);
-	}
-
-	//	>=r3
-	//Option.Dependency.ParentName = TEXT("renderer");
-	//Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
-	//Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r3");
-	//Option.Dependency.ComparisonValType = GetOptionType("renderer");
-	{
-		DescribeOption("r3_dynamic_wet_surfaces",Option.Dependency);
-		DescribeOption("r3_volumetric_smoke",	Option.Dependency);
-		DescribeOption("r3_gbuff_opt",			Option.Dependency);
-		DescribeOption("r3_use_dx10_1",			Option.Dependency);
-		DescribeOption("r3_minmax_sm",			Option.Dependency);
-		DescribeOption("r3_msaa",				Option.Dependency);
-		//	>= 2x
-		//Option.Dependency.ParentName = TEXT("r3_msaa");
-		//Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
-		//Option.Dependency.ComparisonVal.Enum = TEXT("2x");
-		//Option.Dependency.ComparisonValType = GetOptionType("r3_msaa");
-		{
-			DescribeOption("r3_msaa_opt",			Option.Dependency);
-			DescribeOption("r3_msaa_alphatest",		Option.Dependency);
-		}
-	}
-
-	ReleaseEngine();
+    Msg("SASH:: GetAllOptions.");
+    TryInitEngine();
+
+    oaNamedOptionStruct Option;
+    oaInitOption(&Option);
+
+    DescribeOption("renderer", Option.Dependency);
+    DescribeOption("vid_mode", Option.Dependency);
+    DescribeOption("rs_fullscreen", Option.Dependency);
+
+    DescribeOption("rs_vis_distance", Option.Dependency);
+    DescribeOption("r__geometry_lod", Option.Dependency);
+    DescribeOption("r__detail_density", Option.Dependency);
+    DescribeOption("texture_lod", Option.Dependency);
+    DescribeOption("r__tf_aniso", Option.Dependency);
+    DescribeOption("ai_use_torch_dynamic_lights", Option.Dependency);
+
+    // r1 only
+    Option.Dependency.ParentName = TEXT("renderer");
+    Option.Dependency.ComparisonOp = OA_COMP_OP_EQUAL;
+    Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r1");
+    Option.Dependency.ComparisonValType = GetOptionType("renderer");
+    {
+        DescribeOption("r__supersample", Option.Dependency);
+        DescribeOption("r1_no_detail_textures", Option.Dependency);
+    }
+
+    // >=r2
+    oaInitOption(&Option); // Reset dependency info
+    // Currently only equal/not equal works
+    //Option.Dependency.ParentName = TEXT("renderer");
+    //Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
+    //Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r2");
+    //Option.Dependency.ComparisonValType = GetOptionType("renderer");
+    {
+        DescribeOption("r2_sun", Option.Dependency);
+        DescribeOption("r2_sun_quality", Option.Dependency);
+        DescribeOption("r2_slight_fade", Option.Dependency);
+        DescribeOption("r2_ls_squality", Option.Dependency);
+        DescribeOption("r2_detail_bump", Option.Dependency);
+    }
+
+    // >=r2.5
+    //Option.Dependency.ParentName = TEXT("renderer");
+    //Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
+    //Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r2.5");
+    //Option.Dependency.ComparisonValType = GetOptionType("renderer");
+    {
+        DescribeOption("r2_sun_shafts", Option.Dependency);
+        DescribeOption("r2_ssao", Option.Dependency);
+        DescribeOption("r2_ssao_opt_data", Option.Dependency);
+        DescribeOption("r2_ssao_half_data", Option.Dependency);
+        DescribeOption("r2_ssao_hbao", Option.Dependency);
+        DescribeOption("r2_soft_water", Option.Dependency);
+        DescribeOption("r2_soft_particles", Option.Dependency);
+        DescribeOption("r2_dof_enable", Option.Dependency);
+        DescribeOption("r2_volumetric_lights", Option.Dependency);
+        DescribeOption("r2_steep_parallax", Option.Dependency);
+    }
+
+    // >=r3
+    //Option.Dependency.ParentName = TEXT("renderer");
+    //Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
+    //Option.Dependency.ComparisonVal.Enum = TEXT("renderer_r3");
+    //Option.Dependency.ComparisonValType = GetOptionType("renderer");
+    {
+        DescribeOption("r3_dynamic_wet_surfaces", Option.Dependency);
+        DescribeOption("r3_volumetric_smoke", Option.Dependency);
+        DescribeOption("r3_gbuff_opt", Option.Dependency);
+        DescribeOption("r3_use_dx10_1", Option.Dependency);
+        DescribeOption("r3_minmax_sm", Option.Dependency);
+        DescribeOption("r3_msaa", Option.Dependency);
+        // >= 2x
+        //Option.Dependency.ParentName = TEXT("r3_msaa");
+        //Option.Dependency.ComparisonOp = OA_COMP_OP_GREATER_OR_EQUAL;
+        //Option.Dependency.ComparisonVal.Enum = TEXT("2x");
+        //Option.Dependency.ComparisonValType = GetOptionType("r3_msaa");
+        {
+            DescribeOption("r3_msaa_opt", Option.Dependency);
+            DescribeOption("r3_msaa_alphatest", Option.Dependency);
+        }
+    }
+
+    ReleaseEngine();
 }
 
 void xrSASH::GetCurrentOptions()
 {
-	Msg("SASH:: GetCurrentOptions.");
-	TryInitEngine();
-
-	GetOption("renderer");
-	GetOption("vid_mode");
-	GetOption("rs_fullscreen");
-
-	GetOption("rs_vis_distance");
-	GetOption("r__geometry_lod");
-	GetOption("r__detail_density");
-	GetOption("texture_lod");
-	GetOption("r__tf_aniso");
-	GetOption("ai_use_torch_dynamic_lights");
-
-	//	r1 only
-	GetOption("r__supersample");
-	GetOption("r1_no_detail_textures");
-
-	//	>=r2
-	GetOption("r2_sun");
-	GetOption("r2_sun_quality");
-	GetOption("r2_slight_fade");
-	GetOption("r2_ls_squality");
-	GetOption("r2_detail_bump");
-
-	//	>=r2.5
-	GetOption("r2_sun_shafts");
-	GetOption("r2_ssao");
-	GetOption("r2_ssao_opt_data");
-	GetOption("r2_ssao_half_data");
-	GetOption("r2_ssao_hbao");
-	GetOption("r2_soft_water");
-	GetOption("r2_soft_particles");
-	GetOption("r2_dof_enable");
-	GetOption("r2_volumetric_lights");
-	GetOption("r2_steep_parallax");
-
-	//	>=r3
-	GetOption("r3_dynamic_wet_surfaces");
-	GetOption("r3_volumetric_smoke");
-	GetOption("r3_use_dx10_1");
-	GetOption("r3_minmax_sm");
-	GetOption("r3_msaa");
-	GetOption("r3_msaa_opt");
-	GetOption("r3_msaa_alphatest");
-	GetOption("r3_gbuff_opt");
-	
-
-	ReleaseEngine();
+    Msg("SASH:: GetCurrentOptions.");
+    TryInitEngine();
+
+    GetOption("renderer");
+    GetOption("vid_mode");
+    GetOption("rs_fullscreen");
+
+    GetOption("rs_vis_distance");
+    GetOption("r__geometry_lod");
+    GetOption("r__detail_density");
+    GetOption("texture_lod");
+    GetOption("r__tf_aniso");
+    GetOption("ai_use_torch_dynamic_lights");
+
+    // r1 only
+    GetOption("r__supersample");
+    GetOption("r1_no_detail_textures");
+
+    // >=r2
+    GetOption("r2_sun");
+    GetOption("r2_sun_quality");
+    GetOption("r2_slight_fade");
+    GetOption("r2_ls_squality");
+    GetOption("r2_detail_bump");
+
+    // >=r2.5
+    GetOption("r2_sun_shafts");
+    GetOption("r2_ssao");
+    GetOption("r2_ssao_opt_data");
+    GetOption("r2_ssao_half_data");
+    GetOption("r2_ssao_hbao");
+    GetOption("r2_soft_water");
+    GetOption("r2_soft_particles");
+    GetOption("r2_dof_enable");
+    GetOption("r2_volumetric_lights");
+    GetOption("r2_steep_parallax");
+
+    // >=r3
+    GetOption("r3_dynamic_wet_surfaces");
+    GetOption("r3_volumetric_smoke");
+    GetOption("r3_use_dx10_1");
+    GetOption("r3_minmax_sm");
+    GetOption("r3_msaa");
+    GetOption("r3_msaa_opt");
+    GetOption("r3_msaa_alphatest");
+    GetOption("r3_gbuff_opt");
+
+
+    ReleaseEngine();
 }
 
 void xrSASH::SetOptions()
 {
-	Msg("SASH:: SetOptions.");
-	TryInitEngine();
+    Msg("SASH:: SetOptions.");
+    TryInitEngine();
 
-	oaNamedOption *Option;
+    oaNamedOption* Option;
 
-	while((Option = oaGetNextOption()) != NULL)
-		SetOption(Option);
+    while ((Option = oaGetNextOption()) != NULL)
+        SetOption(Option);
 
-	//Console->Save();
-	Console->Execute("cfg_save");
+    //Console->Save();
+    Console->Execute("cfg_save");
 
-	ReleaseEngine();
+    ReleaseEngine();
 }
 
 void xrSASH::GetBenchmarks()
 {
-	Msg("SASH:: GetBenchmarks.");
-	/* foreach known available benchmark */
-	{
-		/* Set BenchmarkName to a unique string identifying the benchmark */
-
-		oaAddBenchmark(TEXT("dummy"));
-		//sashAddBenchmark(TEXT("crates"));
-		//sashAddBenchmark(TEXT("map1"));
-	}
+    Msg("SASH:: GetBenchmarks.");
+    /* foreach known available benchmark */
+    {
+        /* Set BenchmarkName to a unique string identifying the benchmark */
+
+        oaAddBenchmark(TEXT("dummy"));
+        //sashAddBenchmark(TEXT("crates"));
+        //sashAddBenchmark(TEXT("map1"));
+    }
 }
 
 void Startup();
 
-void xrSASH::RunBenchmark( LPCSTR pszName)
+void xrSASH::RunBenchmark(LPCSTR pszName)
 {
-	Msg("SASH:: RunBenchmark.");
+    Msg("SASH:: RunBenchmark.");
 
-	TryInitEngine(false);
+    TryInitEngine(false);
 
-	Startup();
+    Startup();
 
-	m_bReinitEngine = true;
+    m_bReinitEngine = true;
 
-	//	no need to release engine. Startup will close everything itself.
+    // no need to release engine. Startup will close everything itself.
 }
 
-void xrSASH::TryInitEngine( bool bNoRun)
+void xrSASH::TryInitEngine(bool bNoRun)
 {
-	if (m_bReinitEngine)
-	{
-		InitEngine();
-		//	It was destroyed on previous exit
-		Console->Initialize();
-	}
-
-	xr_strcpy						(Console->ConfigFile,"user.ltx");
-	if (strstr(Core.Params,"-ltx ")) 
-	{
-		string64				c_name;
-		sscanf					(strstr(Core.Params,"-ltx ")+5,"%[^ ] ",c_name);
-		xr_strcpy				(Console->ConfigFile,c_name);
-	}
-
-	if(strstr(Core.Params,"-r2a"))	
-		Console->Execute			("renderer renderer_r2a");
-	else if(strstr(Core.Params,"-r2"))	
-		Console->Execute			("renderer renderer_r2");
-	else
-	{
-		CCC_LoadCFG_custom*	pTmp = xr_new<CCC_LoadCFG_custom>("renderer ");
-		pTmp->Execute				(Console->ConfigFile);
-		if (m_bOpenAutomate)
-			pTmp->Execute				("SASH.ltx");
-		else
-			pTmp->Execute				(Console->ConfigFile);
-		xr_delete					(pTmp);
-	}
-
-	InitInput();
-
-	Engine.External.Initialize( );
-
-	if (bNoRun)
-		InitSound1();
-
-	Console->Execute			("unbindall");
-	Console->ExecuteScript		(Console->ConfigFile);
-	if (m_bOpenAutomate)
-	{
-		//	Overwrite setting using SASH.ltx if has any.
-		xr_strcpy(Console->ConfigFile,"SASH.ltx");
-		Console->ExecuteScript		(Console->ConfigFile);
-	}
-
-	if (bNoRun)
-	{
-		InitSound2();
-		Device.Create();
-	}
+    if (m_bReinitEngine)
+    {
+        InitEngine();
+        // It was destroyed on previous exit
+        Console->Initialize();
+    }
+
+    xr_strcpy(Console->ConfigFile, "user.ltx");
+    if (strstr(Core.Params, "-ltx "))
+    {
+        string64 c_name;
+        sscanf(strstr(Core.Params, "-ltx ") + 5, "%[^ ] ", c_name);
+        xr_strcpy(Console->ConfigFile, c_name);
+    }
+
+    if (strstr(Core.Params, "-r2a"))
+        Console->Execute("renderer renderer_r2a");
+    else if (strstr(Core.Params, "-r2"))
+        Console->Execute("renderer renderer_r2");
+    else
+    {
+        CCC_LoadCFG_custom* pTmp = xr_new<CCC_LoadCFG_custom>("renderer ");
+        pTmp->Execute(Console->ConfigFile);
+        if (m_bOpenAutomate)
+            pTmp->Execute("SASH.ltx");
+        else
+            pTmp->Execute(Console->ConfigFile);
+        xr_delete(pTmp);
+    }
+
+    InitInput();
+
+    Engine.External.Initialize();
+
+    if (bNoRun)
+        InitSound1();
+
+    Console->Execute("unbindall");
+    Console->ExecuteScript(Console->ConfigFile);
+    if (m_bOpenAutomate)
+    {
+        // Overwrite setting using SASH.ltx if has any.
+        xr_strcpy(Console->ConfigFile, "SASH.ltx");
+        Console->ExecuteScript(Console->ConfigFile);
+    }
+
+    if (bNoRun)
+    {
+        InitSound2();
+        Device.Create();
+    }
 
 }
 
 void xrSASH::ReleaseEngine()
 {
-	m_bReinitEngine = true;
+    m_bReinitEngine = true;
 
-	destroyInput();
-	Console->Destroy();
-	destroySound();
-	destroyEngine();
+    destroyInput();
+    Console->Destroy();
+    destroySound();
+    destroyEngine();
 }
 
-oaOptionDataType xrSASH::GetOptionType( char* pszOptionName )
+oaOptionDataType xrSASH::GetOptionType(char* pszOptionName)
 {
-	CConsole::vecCMD_IT I = Console->Commands.find(pszOptionName);
-	if (I==Console->Commands.end())
-	{
-		Msg("SASH:: Option \"%s\" not found.", pszOptionName);
-		VERIFY(I!=Console->Commands.end());
-		return OA_TYPE_BOOL;
-	}
-
-	IConsole_Command* pCmd = I->second;
-	CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
-	CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
-	CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
-	CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
-
-	if (pMask)
-		return OA_TYPE_BOOL;
-	else if (pToken)
-		return OA_TYPE_ENUM;
-	else if (pFloat)
-		return OA_TYPE_FLOAT;
-	else if (pInt)
-		return OA_TYPE_INT;
-	else
-	{
-		VERIFY(!"Unsupported console command type.");
-		return OA_TYPE_BOOL;
-	}
+    CConsole::vecCMD_IT I = Console->Commands.find(pszOptionName);
+    if (I == Console->Commands.end())
+    {
+        Msg("SASH:: Option \"%s\" not found.", pszOptionName);
+        VERIFY(I != Console->Commands.end());
+        return OA_TYPE_BOOL;
+    }
+
+    IConsole_Command* pCmd = I->second;
+    CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
+    CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
+    CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
+    CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
+
+    if (pMask)
+        return OA_TYPE_BOOL;
+    else if (pToken)
+        return OA_TYPE_ENUM;
+    else if (pFloat)
+        return OA_TYPE_FLOAT;
+    else if (pInt)
+        return OA_TYPE_INT;
+    else
+    {
+        VERIFY(!"Unsupported console command type.");
+        return OA_TYPE_BOOL;
+    }
 
 }
 
-void xrSASH::DescribeOption( char* pszOptionName, const oaOptionDependency &Dependency)
+void xrSASH::DescribeOption(char* pszOptionName, const oaOptionDependency& Dependency)
 {
-	oaNamedOptionStruct Option; 
-	oaInitOption(&Option);
-
-	Option.Dependency = Dependency;
-
-	CConsole::vecCMD_IT I = Console->Commands.find(pszOptionName);
-	if (I==Console->Commands.end())
-	{
-		Msg("SASH:: Option \"%s\" not found.", pszOptionName);
-		VERIFY(I!=Console->Commands.end());
-		return;
-	}
-	
-	IConsole_Command* pCmd = I->second;
-	CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
-	CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
-	CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
-	CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
-
-	Option.Name = pszOptionName;
-
-	Msg("SASH:: Registering option \"%s\".", pszOptionName);
-
-	if (pMask)
-	{
-		Option.DataType = OA_TYPE_BOOL;
-		oaAddOption(&Option);
-	}
-	else if (pToken)
-	{
-		Option.DataType = OA_TYPE_ENUM;
-		xr_token* pXRToken = pToken->GetToken();
-
-		while (pXRToken->name)
-		{
-			Option.Value.Enum = (char*)pXRToken->name;
-			oaAddOption(&Option);
-			++pXRToken;
-		}
-	}
-	else if (pFloat)
-	{
-		Option.DataType = OA_TYPE_FLOAT;
-		float mn,mx;
-
-		pFloat->GetBounds		(mn, mx);
-		Option.MinValue.Float	= mn;
-		Option.MaxValue.Float	= mx;
-		Option.NumSteps			= (int)((mx - mn) / 0.1f);
-		oaAddOption				(&Option);
-	}
-	else if (pInt)
-	{
-		Option.DataType			= OA_TYPE_INT;
-		int mn, mx;
-		pInt->GetBounds			(mn, mx);
-		Option.MinValue.Int		= mn;
-		Option.MaxValue.Int		= mx;
-		oaAddOption				(&Option);
-	}
-	else
-	{
-		VERIFY(!"Unsupported console command type.");
-	}
+    oaNamedOptionStruct Option;
+    oaInitOption(&Option);
+
+    Option.Dependency = Dependency;
+
+    CConsole::vecCMD_IT I = Console->Commands.find(pszOptionName);
+    if (I == Console->Commands.end())
+    {
+        Msg("SASH:: Option \"%s\" not found.", pszOptionName);
+        VERIFY(I != Console->Commands.end());
+        return;
+    }
+
+    IConsole_Command* pCmd = I->second;
+    CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
+    CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
+    CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
+    CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
+
+    Option.Name = pszOptionName;
+
+    Msg("SASH:: Registering option \"%s\".", pszOptionName);
+
+    if (pMask)
+    {
+        Option.DataType = OA_TYPE_BOOL;
+        oaAddOption(&Option);
+    }
+    else if (pToken)
+    {
+        Option.DataType = OA_TYPE_ENUM;
+        xr_token* pXRToken = pToken->GetToken();
+
+        while (pXRToken->name)
+        {
+            Option.Value.Enum = (char*)pXRToken->name;
+            oaAddOption(&Option);
+            ++pXRToken;
+        }
+    }
+    else if (pFloat)
+    {
+        Option.DataType = OA_TYPE_FLOAT;
+        float mn, mx;
+
+        pFloat->GetBounds(mn, mx);
+        Option.MinValue.Float = mn;
+        Option.MaxValue.Float = mx;
+        Option.NumSteps = (int)((mx - mn) / 0.1f);
+        oaAddOption(&Option);
+    }
+    else if (pInt)
+    {
+        Option.DataType = OA_TYPE_INT;
+        int mn, mx;
+        pInt->GetBounds(mn, mx);
+        Option.MinValue.Int = mn;
+        Option.MaxValue.Int = mx;
+        oaAddOption(&Option);
+    }
+    else
+    {
+        VERIFY(!"Unsupported console command type.");
+    }
 }
 
-void xrSASH::GetOption( char* pszOptionName)
+void xrSASH::GetOption(char* pszOptionName)
 {
-	oaValue Val;
-
-	CConsole::vecCMD_IT I = Console->Commands.find(pszOptionName);
-	if (I==Console->Commands.end())
-	{
-		Msg("SASH:: Option \"%s\" not found.", pszOptionName);
-		VERIFY(I!=Console->Commands.end());
-		return;
-	}
-	
-
-	IConsole_Command* pCmd = I->second;
-	CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
-	CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
-	CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
-	CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
-
-	Msg("SASH:: Getting option \"%s\".", pszOptionName);
-
-	if (pMask)
-	{
-		Val.Bool = pMask->GetValue() ? OA_TRUE : OA_FALSE;
-		oaAddOptionValue( pszOptionName, OA_TYPE_BOOL, &Val );
-	}
-	else if (pToken)
-	{
-		IConsole_Command::TStatus stat;
-		pToken->Status(stat);
-		Val.Enum = stat;
-		oaAddOptionValue( pszOptionName, OA_TYPE_ENUM, &Val );
-	}
-	else if (pFloat)
-	{
-		Val.Float = pFloat->GetValue();
-		oaAddOptionValue( pszOptionName, OA_TYPE_FLOAT, &Val );
-	}
-	else if (pInt)
-	{
-		Val.Int = pInt->GetValue();
-		oaAddOptionValue( pszOptionName, OA_TYPE_INT, &Val );
-	}
-	else
-	{
-		VERIFY(!"Unsupported console command type.");
-	}
+    oaValue Val;
+
+    CConsole::vecCMD_IT I = Console->Commands.find(pszOptionName);
+    if (I == Console->Commands.end())
+    {
+        Msg("SASH:: Option \"%s\" not found.", pszOptionName);
+        VERIFY(I != Console->Commands.end());
+        return;
+    }
+
+
+    IConsole_Command* pCmd = I->second;
+    CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
+    CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
+    CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
+    CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
+
+    Msg("SASH:: Getting option \"%s\".", pszOptionName);
+
+    if (pMask)
+    {
+        Val.Bool = pMask->GetValue() ? OA_TRUE : OA_FALSE;
+        oaAddOptionValue(pszOptionName, OA_TYPE_BOOL, &Val);
+    }
+    else if (pToken)
+    {
+        IConsole_Command::TStatus stat;
+        pToken->Status(stat);
+        Val.Enum = stat;
+        oaAddOptionValue(pszOptionName, OA_TYPE_ENUM, &Val);
+    }
+    else if (pFloat)
+    {
+        Val.Float = pFloat->GetValue();
+        oaAddOptionValue(pszOptionName, OA_TYPE_FLOAT, &Val);
+    }
+    else if (pInt)
+    {
+        Val.Int = pInt->GetValue();
+        oaAddOptionValue(pszOptionName, OA_TYPE_INT, &Val);
+    }
+    else
+    {
+        VERIFY(!"Unsupported console command type.");
+    }
 }
 
-void xrSASH::SetOption(oaNamedOption *pOption)
+void xrSASH::SetOption(oaNamedOption* pOption)
 {
-	/*
-	* Set option value to persist for subsequent runs of the game 
-	* to the given value.  Option->Name will be the name of the value, 
-	* and Option->Value will contain the appropriate value.
-	*/
-	CConsole::vecCMD_IT I = Console->Commands.find(pOption->Name);
-	if (I==Console->Commands.end())
-	{
-		Msg("SASH:: Option \"%s\" not found.", pOption->Name);
-		VERIFY(I!=Console->Commands.end());
-		return;
-	}
-
-	IConsole_Command* pCmd = I->second;
-	CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
-	CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
-	CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
-	CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
-
-	Msg("SASH:: Setting option \"%s\".", pOption->Name);
-
-	string512	CmdBuf;
-
-	if (pMask)
-	{
-		xr_sprintf( CmdBuf, "%s %s", pOption->Name, (pOption->Value.Bool?"1":"0"));
-	}
-	else if (pToken)
-	{
-		xr_sprintf( CmdBuf, "%s %s", pOption->Name, pOption->Value.Enum);
-	}
-	else if (pFloat)
-	{
-		xr_sprintf( CmdBuf, "%s %f", pOption->Name, pOption->Value.Float);
-	}
-	else if (pInt)
-	{
-		xr_sprintf( CmdBuf, "%s %d", pOption->Name, pOption->Value.Int);
-	}
-	else
-	{
-		VERIFY(!"Unsupported console command type.");
-	}
-
-	m_bExecutingConsoleCommand = true;
-	Console->Execute(CmdBuf);
-	m_bExecutingConsoleCommand = false;
+    /*
+    * Set option value to persist for subsequent runs of the game
+    * to the given value. Option->Name will be the name of the value,
+    * and Option->Value will contain the appropriate value.
+    */
+    CConsole::vecCMD_IT I = Console->Commands.find(pOption->Name);
+    if (I == Console->Commands.end())
+    {
+        Msg("SASH:: Option \"%s\" not found.", pOption->Name);
+        VERIFY(I != Console->Commands.end());
+        return;
+    }
+
+    IConsole_Command* pCmd = I->second;
+    CCC_Mask* pMask = dynamic_cast<CCC_Mask*>(pCmd);
+    CCC_Token* pToken = dynamic_cast<CCC_Token*>(pCmd);
+    CCC_Float* pFloat = dynamic_cast<CCC_Float*>(pCmd);
+    CCC_Integer* pInt = dynamic_cast<CCC_Integer*>(pCmd);
+
+    Msg("SASH:: Setting option \"%s\".", pOption->Name);
+
+    string512 CmdBuf;
+
+    if (pMask)
+    {
+        xr_sprintf(CmdBuf, "%s %s", pOption->Name, (pOption->Value.Bool ? "1" : "0"));
+    }
+    else if (pToken)
+    {
+        xr_sprintf(CmdBuf, "%s %s", pOption->Name, pOption->Value.Enum);
+    }
+    else if (pFloat)
+    {
+        xr_sprintf(CmdBuf, "%s %f", pOption->Name, pOption->Value.Float);
+    }
+    else if (pInt)
+    {
+        xr_sprintf(CmdBuf, "%s %d", pOption->Name, pOption->Value.Int);
+    }
+    else
+    {
+        VERIFY(!"Unsupported console command type.");
+    }
+
+    m_bExecutingConsoleCommand = true;
+    Console->Execute(CmdBuf);
+    m_bExecutingConsoleCommand = false;
 }
 
-void xrSASH::Message( oaErrorType MessageType, const char * pszMsg)
+void xrSASH::Message(oaErrorType MessageType, const char* pszMsg)
 {
-	VERIFY(m_bInited);
+    VERIFY(m_bInited);
 
-	oaMessage Message;
-	oaInitMessage(&Message);
-	Message.Error = MessageType;
-	Message.Message = pszMsg;
-	oaSendSignal(OA_SIGNAL_ERROR, &Message);
+    oaMessage Message;
+    oaInitMessage(&Message);
+    Message.Error = MessageType;
+    Message.Message = pszMsg;
+    oaSendSignal(OA_SIGNAL_ERROR, &Message);
 }
 
-void xrSASH::Message( oaErrorType MessageType, const char * pszMsg, va_list &mark)
+void xrSASH::Message(oaErrorType MessageType, const char* pszMsg, va_list& mark)
 {
-	VERIFY(m_bInited);
+    VERIFY(m_bInited);
 
-	string2048	buf;
-	int sz		= _vsnprintf(buf, sizeof(buf)-1, pszMsg, mark ); buf[sizeof(buf)-1]=0;
+    string2048 buf;
+    int sz = _vsnprintf(buf, sizeof(buf) - 1, pszMsg, mark);
+    buf[sizeof(buf) - 1] = 0;
 
-	if (sz)	Message(MessageType, buf);
+    if (sz) Message(MessageType, buf);
 }
 
-void xrSASH::OnConsoleInvalidSyntax(bool bLastLine, const char * pszMsg, ...)
+void xrSASH::OnConsoleInvalidSyntax(bool bLastLine, const char* pszMsg, ...)
 {
-	if ( m_bInited && m_bExecutingConsoleCommand)
-	{
-		va_list		mark;
-		va_start	(mark, pszMsg );
-
-		if (bLastLine)
-			Message( OA_ERROR_INVALID_OPTION_VALUE, pszMsg, mark);
-		else
-			Message( OA_ERROR_LOG, pszMsg, mark);
-
-		va_end		(mark);
-	}
+    if (m_bInited && m_bExecutingConsoleCommand)
+    {
+        va_list mark;
+        va_start(mark, pszMsg);
+
+        if (bLastLine)
+            Message(OA_ERROR_INVALID_OPTION_VALUE, pszMsg, mark);
+        else
+            Message(OA_ERROR_LOG, pszMsg, mark);
+
+        va_end(mark);
+    }
 }
\ No newline at end of file
diff --git a/src/xrEngine/xrSASH.h b/src/xrEngine/xrSASH.h
index 1b5d81fe4f6..b2cce812fb3 100644
--- a/src/xrEngine/xrSASH.h
+++ b/src/xrEngine/xrSASH.h
@@ -1,5 +1,5 @@
-#ifndef	xrSASH_included
-#define	xrSASH_included
+#ifndef xrSASH_included
+#define xrSASH_included
 #pragma once
 
 #include <OpenAutomate.h>
@@ -13,69 +13,69 @@
 class ENGINE_API xrSASH
 {
 public:
-	xrSASH();
-	~xrSASH();
+    xrSASH();
+    ~xrSASH();
 
-	//	Execution control
-	bool	Init(const char* pszParam);
-	void	MainLoop();
+    // Execution control
+    bool Init(const char* pszParam);
+    void MainLoop();
 
-	bool	IsRunning() { return m_bRunning;}
-	bool	IsBenchmarkRunning() { return m_bBenchmarkRunning;}
+    bool IsRunning() { return m_bRunning; }
+    bool IsBenchmarkRunning() { return m_bBenchmarkRunning; }
 
-	//	Event handlers
-	void	StartBenchmark();
-	void	DisplayFrame(float t);
-	void	EndBenchmark();
+    // Event handlers
+    void StartBenchmark();
+    void DisplayFrame(float t);
+    void EndBenchmark();
 
-	//	Error report
-	void	OnConsoleInvalidSyntax(bool bLastLine, const char * pszMsg, ...);
+    // Error report
+    void OnConsoleInvalidSyntax(bool bLastLine, const char* pszMsg, ...);
 
 private:
-	//	Internal loops
-	void	LoopOA();
-	void	LoopNative();
-
-	//	Native specific
-	void	ReportNative( LPCSTR pszTestName);
-
-	//	OA command handlers
-	void	GetAllOptions();
-	void	GetCurrentOptions();
-	void	SetOptions();
-	void	GetBenchmarks();
-	void	RunBenchmark( LPCSTR pszName);
-
-	//	Effectively restores/releases some engine systems
-	void	TryInitEngine( bool bNoRun = true );
-	void	ReleaseEngine();
-
-	//	OA option handling
-	void	DescribeOption( char* pszOptionName, const oaOptionDependency &Dependency);
-	oaOptionDataType
-			GetOptionType( char* pszOptionName );
-	void	GetOption( char* pszOptionName);
-	void	SetOption(oaNamedOption *pOption);
-
-	//	OA Error report
-	void	Message( oaErrorType MessageType, const char * pszMsg);
-	void	Message( oaErrorType MessageType, const char * pszMsg, va_list &mark);
+    // Internal loops
+    void LoopOA();
+    void LoopNative();
+
+    // Native specific
+    void ReportNative(LPCSTR pszTestName);
+
+    // OA command handlers
+    void GetAllOptions();
+    void GetCurrentOptions();
+    void SetOptions();
+    void GetBenchmarks();
+    void RunBenchmark(LPCSTR pszName);
+
+    // Effectively restores/releases some engine systems
+    void TryInitEngine(bool bNoRun = true);
+    void ReleaseEngine();
+
+    // OA option handling
+    void DescribeOption(char* pszOptionName, const oaOptionDependency& Dependency);
+    oaOptionDataType
+    GetOptionType(char* pszOptionName);
+    void GetOption(char* pszOptionName);
+    void SetOption(oaNamedOption* pOption);
+
+    // OA Error report
+    void Message(oaErrorType MessageType, const char* pszMsg);
+    void Message(oaErrorType MessageType, const char* pszMsg, va_list& mark);
 
 private:
-	//	States
-	bool	m_bInited;
-	bool	m_bOpenAutomate;
-	bool	m_bRunning;
-	bool	m_bBenchmarkRunning;
-	bool	m_bReinitEngine;
-	//	Guards
-	bool	m_bExecutingConsoleCommand;	//	Guard to pass to OA only those command that were issued by OA
-	//	Native benchmarking
-	string64	m_strBenchCfgName;
-	CTimer		m_FrameTimer;
-	xr_vector<float>	m_aFrimeTimes;
+    // States
+    bool m_bInited;
+    bool m_bOpenAutomate;
+    bool m_bRunning;
+    bool m_bBenchmarkRunning;
+    bool m_bReinitEngine;
+    // Guards
+    bool m_bExecutingConsoleCommand; // Guard to pass to OA only those command that were issued by OA
+    // Native benchmarking
+    string64 m_strBenchCfgName;
+    CTimer m_FrameTimer;
+    xr_vector<float> m_aFrimeTimes;
 };
 
 extern xrSASH ENGINE_API g_SASH;
 
-#endif	//	xrSASH_included
\ No newline at end of file
+#endif // xrSASH_included
\ No newline at end of file
diff --git a/src/xrEngine/xrSheduler.cpp b/src/xrEngine/xrSheduler.cpp
index 6f8c6a44cb7..3a6ca921084 100644
--- a/src/xrEngine/xrSheduler.cpp
+++ b/src/xrEngine/xrSheduler.cpp
@@ -4,468 +4,492 @@
 
 //#define DEBUG_SCHEDULER
 
-float			psShedulerCurrent		= 10.f	;
-float			psShedulerTarget		= 10.f	;
-const	float	psShedulerReaction		= 0.1f	;
-BOOL			g_bSheduleInProgress	= FALSE	;
+float psShedulerCurrent = 10.f;
+float psShedulerTarget = 10.f;
+const float psShedulerReaction = 0.1f;
+BOOL g_bSheduleInProgress = FALSE;
 
 //-------------------------------------------------------------------------------------
-void CSheduler::Initialize		()
+void CSheduler::Initialize()
 {
-	m_current_step_obj	= NULL;
-	m_processing_now	= false;
+    m_current_step_obj = NULL;
+    m_processing_now = false;
 }
 
-void CSheduler::Destroy			()
+void CSheduler::Destroy()
 {
-	internal_Registration		();
-
-	for (u32 it=0; it<Items.size(); it++)
-	{
-		if (0==Items[it].Object)	
-		{
-			Items.erase(Items.begin()+it);
-			it	--;
-		}
-	}
-#ifdef DEBUG	
-	if (!Items.empty())
-	{
-		string1024		_objects; _objects[0]=0;
-
-		Msg				("! Sheduler work-list is not empty");
-		for (u32 it=0; it<Items.size(); it++)
-			Msg("%s", Items[it].Object->shedule_Name().c_str());
-	}
+    internal_Registration();
+
+    for (u32 it = 0; it < Items.size(); it++)
+    {
+        if (0 == Items[it].Object)
+        {
+            Items.erase(Items.begin() + it);
+            it--;
+        }
+    }
+#ifdef DEBUG
+    if (!Items.empty())
+    {
+        string1024 _objects;
+        _objects[0] = 0;
+
+        Msg("! Sheduler work-list is not empty");
+        for (u32 it = 0; it < Items.size(); it++)
+            Msg("%s", Items[it].Object->shedule_Name().c_str());
+    }
 #endif // DEBUG
-	ItemsRT.clear		();
-	Items.clear			();
-	ItemsProcessed.clear();
-	Registration.clear	();
+    ItemsRT.clear();
+    Items.clear();
+    ItemsProcessed.clear();
+    Registration.clear();
 }
 
-void	CSheduler::internal_Registration()
+void CSheduler::internal_Registration()
 {
-	for (u32 it=0; it<Registration.size(); it++)
-	{
-		ItemReg&	R	= Registration	[it];
-		if (R.OP)	{
-			// register
-			// search for paired "unregister"
-			BOOL	bFoundAndErased		= FALSE;
-			for (u32 pair=it+1; pair<Registration.size(); pair++)
-			{
-				ItemReg&	R_pair	= Registration	[pair];
-				if	((!R_pair.OP)&&(R_pair.Object == R.Object))	{
-					bFoundAndErased		= TRUE;
-					Registration.erase	(Registration.begin()+pair	);
-					break				;
-				}
-			}
-
-			// register if non-paired
-			if (!bFoundAndErased)		{
+    for (u32 it = 0; it < Registration.size(); it++)
+    {
+        ItemReg& R = Registration[it];
+        if (R.OP)
+        {
+            // register
+            // search for paired "unregister"
+            BOOL bFoundAndErased = FALSE;
+            for (u32 pair = it + 1; pair < Registration.size(); pair++)
+            {
+                ItemReg& R_pair = Registration[pair];
+                if ((!R_pair.OP) && (R_pair.Object == R.Object))
+                {
+                    bFoundAndErased = TRUE;
+                    Registration.erase(Registration.begin() + pair);
+                    break;
+                }
+            }
+
+            // register if non-paired
+            if (!bFoundAndErased)
+            {
 #ifdef DEBUG_SCHEDULER
-				Msg						("SCHEDULER: internal register [%s][%x][%s]",*R.Object->shedule_Name(),R.Object,R.RT ? "true" : "false");
+                Msg("SCHEDULER: internal register [%s][%x][%s]", *R.Object->shedule_Name(), R.Object, R.RT ? "true" : "false");
 #endif // DEBUG_SCHEDULER
-				internal_Register		(R.Object,R.RT);
-			}
+                internal_Register(R.Object, R.RT);
+            }
 #ifdef DEBUG_SCHEDULER
-			else 
-				Msg						("SCHEDULER: internal register skipped, because unregister found [%s][%x][%s]","unknown",R.Object,R.RT ? "true" : "false");
+            else
+                Msg("SCHEDULER: internal register skipped, because unregister found [%s][%x][%s]", "unknown", R.Object, R.RT ? "true" : "false");
 #endif // DEBUG_SCHEDULER
-		}
-		else		{
-			// unregister
-			internal_Unregister			(R.Object,R.RT);
-		}
-	}
-	Registration.clear	();
+        }
+        else
+        {
+            // unregister
+            internal_Unregister(R.Object, R.RT);
+        }
+    }
+    Registration.clear();
 }
 
-void CSheduler::internal_Register	(ISheduled* O, BOOL RT)
+void CSheduler::internal_Register(ISheduled* O, BOOL RT)
 {
-	VERIFY	(!O->shedule.b_locked)	;
-	if (RT)
-	{
-		// Fill item structure
-		Item						TNext;
-		TNext.dwTimeForExecute		= Device.dwTimeGlobal;
-		TNext.dwTimeOfLastExecute	= Device.dwTimeGlobal;
-		TNext.Object				= O;
-		TNext.scheduled_name		= O->shedule_Name();
-		O->shedule.b_RT				= TRUE;
-
-		ItemsRT.push_back			(TNext);
-	} else {
-		// Fill item structure
-		Item						TNext;
-		TNext.dwTimeForExecute		= Device.dwTimeGlobal;
-		TNext.dwTimeOfLastExecute	= Device.dwTimeGlobal;
-		TNext.Object				= O;
-		TNext.scheduled_name		= O->shedule_Name();
-		O->shedule.b_RT				= FALSE;
-
-		// Insert into priority Queue
-		Push						(TNext);
-	}
+    VERIFY(!O->shedule.b_locked);
+    if (RT)
+    {
+        // Fill item structure
+        Item TNext;
+        TNext.dwTimeForExecute = Device.dwTimeGlobal;
+        TNext.dwTimeOfLastExecute = Device.dwTimeGlobal;
+        TNext.Object = O;
+        TNext.scheduled_name = O->shedule_Name();
+        O->shedule.b_RT = TRUE;
+
+        ItemsRT.push_back(TNext);
+    }
+    else
+    {
+        // Fill item structure
+        Item TNext;
+        TNext.dwTimeForExecute = Device.dwTimeGlobal;
+        TNext.dwTimeOfLastExecute = Device.dwTimeGlobal;
+        TNext.Object = O;
+        TNext.scheduled_name = O->shedule_Name();
+        O->shedule.b_RT = FALSE;
+
+        // Insert into priority Queue
+        Push(TNext);
+    }
 }
 
-bool CSheduler::internal_Unregister	(ISheduled* O, BOOL RT, bool warn_on_not_found)
+bool CSheduler::internal_Unregister(ISheduled* O, BOOL RT, bool warn_on_not_found)
 {
-	//the object may be already dead
-	//VERIFY	(!O->shedule.b_locked)	;
-	if (RT)
-	{
-		for (u32 i=0; i<ItemsRT.size(); i++)
-		{
-			if (ItemsRT[i].Object==O) {
+    //the object may be already dead
+    //VERIFY (!O->shedule.b_locked) ;
+    if (RT)
+    {
+        for (u32 i = 0; i < ItemsRT.size(); i++)
+        {
+            if (ItemsRT[i].Object == O)
+            {
 #ifdef DEBUG_SCHEDULER
-				Msg					("SCHEDULER: internal unregister [%s][%x][%s]","unknown",O,"true");
+                Msg("SCHEDULER: internal unregister [%s][%x][%s]", "unknown", O, "true");
 #endif // DEBUG_SCHEDULER
-				ItemsRT.erase(ItemsRT.begin()+i);
-				return				(true);
-			}
-		}
-	} else {
-		for (u32 i=0; i<Items.size(); i++)
-		{
-			if (Items[i].Object==O) {
+                ItemsRT.erase(ItemsRT.begin() + i);
+                return (true);
+            }
+        }
+    }
+    else
+    {
+        for (u32 i = 0; i < Items.size(); i++)
+        {
+            if (Items[i].Object == O)
+            {
 #ifdef DEBUG_SCHEDULER
-				Msg					("SCHEDULER: internal unregister [%s][%x][%s]",*Items[i].scheduled_name,O,"false");
+                Msg("SCHEDULER: internal unregister [%s][%x][%s]", *Items[i].scheduled_name, O, "false");
 #endif // DEBUG_SCHEDULER
-				Items[i].Object	= NULL;
-				return				(true);
-			}
-		}
-	}
-	if (m_current_step_obj == O)
-	{
+                Items[i].Object = NULL;
+                return (true);
+            }
+        }
+    }
+    if (m_current_step_obj == O)
+    {
 #ifdef DEBUG_SCHEDULER
-		Msg					("SCHEDULER: internal unregister (self unregistering) [%x][%s]",O,"false");
+        Msg("SCHEDULER: internal unregister (self unregistering) [%x][%s]", O, "false");
 #endif // DEBUG_SCHEDULER
 
-		m_current_step_obj = NULL;
-		return true;
-	}
+        m_current_step_obj = NULL;
+        return true;
+    }
 
 #ifdef DEBUG
-	if (warn_on_not_found)
-		Msg							("! scheduled object %s tries to unregister but is not registered",*O->shedule_Name());
+    if (warn_on_not_found)
+        Msg("! scheduled object %s tries to unregister but is not registered", *O->shedule_Name());
 #endif // DEBUG
 
-	return							(false);
+    return (false);
 }
 
 #ifdef DEBUG
-bool CSheduler::Registered		(ISheduled *object) const
+bool CSheduler::Registered(ISheduled* object) const
 {
-	u32							count = 0;
-	typedef xr_vector<Item>		ITEMS;
-
-	{
-		ITEMS::const_iterator	I = ItemsRT.begin();
-		ITEMS::const_iterator	E = ItemsRT.end();
-		for ( ; I != E; ++I)
-			if ((*I).Object == object) {
-//				Msg				("0x%8x found in RT",object);
-				count			= 1;
-				break;
-			}
-	}
-	{
-		ITEMS::const_iterator	I = Items.begin();
-		ITEMS::const_iterator	E = Items.end();
-		for ( ; I != E; ++I)
-			if ((*I).Object == object) {
-//				Msg				("0x%8x found in non-RT",object);
-				VERIFY			(!count);
-				count			= 1;
-				break;
-			}
-	}
-
-	{
-		ITEMS::const_iterator	I = ItemsProcessed.begin();
-		ITEMS::const_iterator	E = ItemsProcessed.end();
-		for ( ; I != E; ++I)
-			if ((*I).Object == object) {
-//				Msg				("0x%8x found in process items",object);
-				VERIFY			(!count);
-				count			= 1;
-				break;
-			}
-	}
-
-	typedef xr_vector<ItemReg>	ITEMS_REG;
-	ITEMS_REG::const_iterator	I = Registration.begin();
-	ITEMS_REG::const_iterator	E = Registration.end();
-	for ( ; I != E; ++I) {
-		if ((*I).Object == object) {
-			if ((*I).OP) {
-//				Msg				("0x%8x found in registration on register",object);
-				VERIFY			(!count);
-				++count;
-			}
-			else {
-//				Msg				("0x%8x found in registration on UNregister",object);
-				VERIFY			(count == 1);
-				--count;
-			}
-		}
-	}
-
-	if (!count && (m_current_step_obj == object))
-	{
-		VERIFY2(m_processing_now, "trying to unregister self unregistering object while not processing now");
-		count = 1;
-	}
-	VERIFY						(!count || (count == 1));
-	return						(count == 1);
+    u32 count = 0;
+    typedef xr_vector<Item> ITEMS;
+
+    {
+        ITEMS::const_iterator I = ItemsRT.begin();
+        ITEMS::const_iterator E = ItemsRT.end();
+        for (; I != E; ++I)
+            if ((*I).Object == object)
+            {
+                // Msg ("0x%8x found in RT",object);
+                count = 1;
+                break;
+            }
+    }
+    {
+        ITEMS::const_iterator I = Items.begin();
+        ITEMS::const_iterator E = Items.end();
+        for (; I != E; ++I)
+            if ((*I).Object == object)
+            {
+                // Msg ("0x%8x found in non-RT",object);
+                VERIFY(!count);
+                count = 1;
+                break;
+            }
+    }
+
+    {
+        ITEMS::const_iterator I = ItemsProcessed.begin();
+        ITEMS::const_iterator E = ItemsProcessed.end();
+        for (; I != E; ++I)
+            if ((*I).Object == object)
+            {
+                // Msg ("0x%8x found in process items",object);
+                VERIFY(!count);
+                count = 1;
+                break;
+            }
+    }
+
+    typedef xr_vector<ItemReg> ITEMS_REG;
+    ITEMS_REG::const_iterator I = Registration.begin();
+    ITEMS_REG::const_iterator E = Registration.end();
+    for (; I != E; ++I)
+    {
+        if ((*I).Object == object)
+        {
+            if ((*I).OP)
+            {
+                // Msg ("0x%8x found in registration on register",object);
+                VERIFY(!count);
+                ++count;
+            }
+            else
+            {
+                // Msg ("0x%8x found in registration on UNregister",object);
+                VERIFY(count == 1);
+                --count;
+            }
+        }
+    }
+
+    if (!count && (m_current_step_obj == object))
+    {
+        VERIFY2(m_processing_now, "trying to unregister self unregistering object while not processing now");
+        count = 1;
+    }
+    VERIFY(!count || (count == 1));
+    return (count == 1);
 }
 #endif // DEBUG
 
-void	CSheduler::Register		(ISheduled* A, BOOL RT				)
+void CSheduler::Register(ISheduled* A, BOOL RT)
 {
-	VERIFY		(!Registered(A));
+    VERIFY(!Registered(A));
 
-	ItemReg		R;
-	R.OP		= TRUE				;
-	R.RT		= RT				;
-	R.Object	= A					;
-	R.Object->shedule.b_RT	= RT	;
+    ItemReg R;
+    R.OP = TRUE;
+    R.RT = RT;
+    R.Object = A;
+    R.Object->shedule.b_RT = RT;
 
 #ifdef DEBUG_SCHEDULER
-	Msg			("SCHEDULER: register [%s][%x]",*A->shedule_Name(),A);
+    Msg("SCHEDULER: register [%s][%x]", *A->shedule_Name(), A);
 #endif // DEBUG_SCHEDULER
 
-	Registration.push_back	(R);
+    Registration.push_back(R);
 }
 
-void	CSheduler::Unregister	(ISheduled* A						)
+void CSheduler::Unregister(ISheduled* A)
 {
-	VERIFY		(Registered(A));
+    VERIFY(Registered(A));
 
 #ifdef DEBUG_SCHEDULER
-	Msg			("SCHEDULER: unregister [%s][%x]",*A->shedule_Name(),A);
+    Msg("SCHEDULER: unregister [%s][%x]", *A->shedule_Name(), A);
 #endif // DEBUG_SCHEDULER
 
-	if (m_processing_now) {
-		if (internal_Unregister(A,A->shedule.b_RT,false))
-			return;
-	}
+    if (m_processing_now)
+    {
+        if (internal_Unregister(A, A->shedule.b_RT, false))
+            return;
+    }
 
-	ItemReg		R;
-	R.OP		= FALSE				;
-	R.RT		= A->shedule.b_RT	;
-	R.Object	= A					;
+    ItemReg R;
+    R.OP = FALSE;
+    R.RT = A->shedule.b_RT;
+    R.Object = A;
 
-	Registration.push_back			(R);
+    Registration.push_back(R);
 }
 
-void CSheduler::EnsureOrder		(ISheduled* Before, ISheduled* After)
+void CSheduler::EnsureOrder(ISheduled* Before, ISheduled* After)
 {
-	VERIFY(Before->shedule.b_RT && After->shedule.b_RT);
-
-	for (u32 i=0; i<ItemsRT.size(); i++)
-	{
-		if (ItemsRT[i].Object==After) 
-		{
-			Item	A			= ItemsRT[i];
-			ItemsRT.erase		(ItemsRT.begin()+i);
-			ItemsRT.push_back	(A);
-			return;
-		}
-	}
+    VERIFY(Before->shedule.b_RT && After->shedule.b_RT);
+
+    for (u32 i = 0; i < ItemsRT.size(); i++)
+    {
+        if (ItemsRT[i].Object == After)
+        {
+            Item A = ItemsRT[i];
+            ItemsRT.erase(ItemsRT.begin() + i);
+            ItemsRT.push_back(A);
+            return;
+        }
+    }
 }
 
-void CSheduler::Push				(Item& I)
+void CSheduler::Push(Item& I)
 {
-	Items.push_back	(I);
-	std::push_heap	(Items.begin(), Items.end());
+    Items.push_back(I);
+    std::push_heap(Items.begin(), Items.end());
 }
 
-void CSheduler::Pop					()
+void CSheduler::Pop()
 {
-	std::pop_heap	(Items.begin(), Items.end());
-	Items.pop_back	();
+    std::pop_heap(Items.begin(), Items.end());
+    Items.pop_back();
 }
 
-void CSheduler::ProcessStep			()
+void CSheduler::ProcessStep()
 {
-	// Normal priority
-	u32		dwTime					= Device.dwTimeGlobal;
-	CTimer							eTimer;
-	for (int i=0;!Items.empty() && Top().dwTimeForExecute < dwTime; ++i) {
-		u32		delta_ms			= dwTime - Top().dwTimeForExecute;
-
-		// Update
-		Item	T					= Top	();
+    // Normal priority
+    u32 dwTime = Device.dwTimeGlobal;
+    CTimer eTimer;
+    for (int i = 0; !Items.empty() && Top().dwTimeForExecute < dwTime; ++i)
+    {
+        u32 delta_ms = dwTime - Top().dwTimeForExecute;
+
+        // Update
+        Item T = Top();
 #ifdef DEBUG_SCHEDULER
-		Msg		("SCHEDULER: process step [%s][%x][false]",*T.scheduled_name,T.Object);
+        Msg("SCHEDULER: process step [%s][%x][false]", *T.scheduled_name, T.Object);
 #endif // DEBUG_SCHEDULER
-		u32		Elapsed				= dwTime-T.dwTimeOfLastExecute;
-		bool	condition;
-		
-		condition					= (NULL==T.Object || !T.Object->shedule_Needed());
-		if (condition) {
-			// Erase element
+        u32 Elapsed = dwTime - T.dwTimeOfLastExecute;
+        bool condition;
+
+        condition = (NULL == T.Object || !T.Object->shedule_Needed());
+        if (condition)
+        {
+            // Erase element
 #ifdef DEBUG_SCHEDULER
-			Msg						("SCHEDULER: process unregister [%s][%x][%s]",*T.scheduled_name,T.Object,"false");
+            Msg("SCHEDULER: process unregister [%s][%x][%s]", *T.scheduled_name, T.Object, "false");
 #endif // DEBUG_SCHEDULER
-//			if (T.Object)
-//				Msg					("0x%08x UNREGISTERS because shedule_Needed() returned false",T.Object);
-//			else
-//				Msg					("UNREGISTERS unknown object");
-			Pop						();
-			continue;
-		}
-
-		// Insert into priority Queue
-		Pop							();
-
-		// Real update call
-		// Msg						("------- %d:",Device.dwFrame);
+            // if (T.Object)
+            // Msg ("0x%08x UNREGISTERS because shedule_Needed() returned false",T.Object);
+            // else
+            // Msg ("UNREGISTERS unknown object");
+            Pop();
+            continue;
+        }
+
+        // Insert into priority Queue
+        Pop();
+
+        // Real update call
+        // Msg ("------- %d:",Device.dwFrame);
 #ifdef DEBUG
-		T.Object->dbg_startframe	= Device.dwFrame;
-		eTimer.Start				();
-//		LPCSTR		_obj_name		= T.Object->shedule_Name().c_str();
+        T.Object->dbg_startframe = Device.dwFrame;
+        eTimer.Start();
+        // LPCSTR _obj_name = T.Object->shedule_Name().c_str();
 #endif // DEBUG
 
-		// Calc next update interval
-		u32		dwMin				= _max(u32(30),T.Object->shedule.t_min);
-		u32		dwMax				= (1000+T.Object->shedule.t_max)/2;
-		float	scale				= T.Object->shedule_Scale	(); 
-		u32		dwUpdate			= dwMin+iFloor(float(dwMax-dwMin)*scale);
-		clamp	(dwUpdate,u32(_max(dwMin,u32(20))),dwMax);
+        // Calc next update interval
+        u32 dwMin = _max(u32(30), T.Object->shedule.t_min);
+        u32 dwMax = (1000 + T.Object->shedule.t_max) / 2;
+        float scale = T.Object->shedule_Scale();
+        u32 dwUpdate = dwMin + iFloor(float(dwMax - dwMin)*scale);
+        clamp(dwUpdate, u32(_max(dwMin, u32(20))), dwMax);
+
 
-		
 
-		m_current_step_obj = T.Object;
-//			try {
-			T.Object->shedule_Update	(clampr(Elapsed,u32(1),u32(_max(u32(T.Object->shedule.t_max),u32(1000)))) );
-			if (!m_current_step_obj)
-			{
+        m_current_step_obj = T.Object;
+        // try {
+        T.Object->shedule_Update(clampr(Elapsed, u32(1), u32(_max(u32(T.Object->shedule.t_max), u32(1000)))));
+        if (!m_current_step_obj)
+        {
 #ifdef DEBUG_SCHEDULER
-				Msg						("SCHEDULER: process unregister (self unregistering) [%s][%x][%s]",*T.scheduled_name,T.Object,"false");
+            Msg("SCHEDULER: process unregister (self unregistering) [%s][%x][%s]", *T.scheduled_name, T.Object, "false");
 #endif // DEBUG_SCHEDULER
-				continue;
-			}
-//			} catch (...) {
+            continue;
+        }
+        // } catch (...) {
 #ifdef DEBUG
-//				Msg		("! xrSheduler: object '%s' raised an exception", _obj_name);
-//				throw	;
+        // Msg ("! xrSheduler: object '%s' raised an exception", _obj_name);
+        // throw ;
 #endif // DEBUG
-//			}
-		m_current_step_obj = NULL;
+        // }
+        m_current_step_obj = NULL;
 
 #ifdef DEBUG
-//		u32	execTime				= eTimer.GetElapsed_ms		();
+        // u32 execTime = eTimer.GetElapsed_ms ();
 #endif // DEBUG
 
-		// Fill item structure
-		Item						TNext;
-		TNext.dwTimeForExecute		= dwTime+dwUpdate;
-		TNext.dwTimeOfLastExecute	= dwTime;
-		TNext.Object				= T.Object;
-		TNext.scheduled_name		= T.Object->shedule_Name();
-		ItemsProcessed.push_back	(TNext);
+        // Fill item structure
+        Item TNext;
+        TNext.dwTimeForExecute = dwTime + dwUpdate;
+        TNext.dwTimeOfLastExecute = dwTime;
+        TNext.Object = T.Object;
+        TNext.scheduled_name = T.Object->shedule_Name();
+        ItemsProcessed.push_back(TNext);
 
 
 #ifdef DEBUG
-//		u32	execTime				= eTimer.GetElapsed_ms		();
-		// VERIFY3					(T.Object->dbg_update_shedule == T.Object->dbg_startframe, "Broken sequence of calls to 'shedule_Update'", _obj_name );
-		if (delta_ms> 3*dwUpdate)	{
-			//Msg	("! xrSheduler: failed to shedule object [%s] (%dms)",	_obj_name, delta_ms	);
-		}
-//		if (execTime> 15)			{
-//			Msg	("* xrSheduler: too much time consumed by object [%s] (%dms)",	_obj_name, execTime	);
-//		}
+        // u32 execTime = eTimer.GetElapsed_ms ();
+        // VERIFY3 (T.Object->dbg_update_shedule == T.Object->dbg_startframe, "Broken sequence of calls to 'shedule_Update'", _obj_name );
+        if (delta_ms > 3 * dwUpdate)
+        {
+            //Msg ("! xrSheduler: failed to shedule object [%s] (%dms)", _obj_name, delta_ms );
+        }
+        // if (execTime> 15) {
+        // Msg ("* xrSheduler: too much time consumed by object [%s] (%dms)", _obj_name, execTime );
+        // }
 #endif // DEBUG
 
-		// 
-		if ((i % 3) != (3 - 1))
-			continue;
-
-		if (Device.dwPrecacheFrame==0 && CPU::QPC() > cycles_limit)		
-		{
-			// we have maxed out the load - increase heap
-			psShedulerTarget		+= (psShedulerReaction * 3);
-			break;
-		}
-	}
-
-	// Push "processed" back
-	while (ItemsProcessed.size())	{
-		Push	(ItemsProcessed.back())	;
-		ItemsProcessed.pop_back		()	;
-	}
-
-	// always try to decrease target
-	psShedulerTarget	-= psShedulerReaction;
+        //
+        if ((i % 3) != (3 - 1))
+            continue;
+
+        if (Device.dwPrecacheFrame == 0 && CPU::QPC() > cycles_limit)
+        {
+            // we have maxed out the load - increase heap
+            psShedulerTarget += (psShedulerReaction * 3);
+            break;
+        }
+    }
+
+    // Push "processed" back
+    while (ItemsProcessed.size())
+    {
+        Push(ItemsProcessed.back());
+        ItemsProcessed.pop_back();
+    }
+
+    // always try to decrease target
+    psShedulerTarget -= psShedulerReaction;
 }
 /*
-void CSheduler::Switch				()
+void CSheduler::Switch ()
 {
-	if (fibered)	
-	{
-		fibered						= FALSE;
-		SwitchToFiber				(fiber_main);
-	}
+if (fibered)
+{
+fibered = FALSE;
+SwitchToFiber (fiber_main);
+}
 }
 */
-void CSheduler::Update				()
+void CSheduler::Update()
 {
-	R_ASSERT						(Device.Statistic);
-	// Initialize
-	Device.Statistic->Sheduler.Begin();
-	cycles_start					= CPU::QPC			();
-	cycles_limit					= CPU::qpc_freq * u64 (iCeil(psShedulerCurrent)) / 1000i64 + cycles_start;
-	internal_Registration			();
-	g_bSheduleInProgress			= TRUE;
+    R_ASSERT(Device.Statistic);
+    // Initialize
+    Device.Statistic->Sheduler.Begin();
+    cycles_start = CPU::QPC();
+    cycles_limit = CPU::qpc_freq * u64(iCeil(psShedulerCurrent)) / 1000i64 + cycles_start;
+    internal_Registration();
+    g_bSheduleInProgress = TRUE;
 
 #ifdef DEBUG_SCHEDULER
-	Msg								("SCHEDULER: PROCESS STEP %d",Device.dwFrame);
+    Msg("SCHEDULER: PROCESS STEP %d", Device.dwFrame);
 #endif // DEBUG_SCHEDULER
-	// Realtime priority
-	m_processing_now				= true;
-	u32	dwTime						= Device.dwTimeGlobal;
-	for (u32 it=0; it<ItemsRT.size(); it++)
-	{
-		Item&	T					= ItemsRT[it];
-		R_ASSERT					(T.Object);
+    // Realtime priority
+    m_processing_now = true;
+    u32 dwTime = Device.dwTimeGlobal;
+    for (u32 it = 0; it < ItemsRT.size(); it++)
+    {
+        Item& T = ItemsRT[it];
+        R_ASSERT(T.Object);
 #ifdef DEBUG_SCHEDULER
-		Msg							("SCHEDULER: process step [%s][%x][true]",*T.Object->shedule_Name(),T.Object);
+        Msg("SCHEDULER: process step [%s][%x][true]", *T.Object->shedule_Name(), T.Object);
 #endif // DEBUG_SCHEDULER
-		if(!T.Object->shedule_Needed()){
+        if (!T.Object->shedule_Needed())
+        {
 #ifdef DEBUG_SCHEDULER
-			Msg						("SCHEDULER: process unregister [%s][%x][%s]",*T.Object->shedule_Name(),T.Object,"false");
+            Msg("SCHEDULER: process unregister [%s][%x][%s]", *T.Object->shedule_Name(), T.Object, "false");
 #endif // DEBUG_SCHEDULER
-			T.dwTimeOfLastExecute	= dwTime;
-			continue;
-		}
+            T.dwTimeOfLastExecute = dwTime;
+            continue;
+        }
 
-		u32	Elapsed					= dwTime-T.dwTimeOfLastExecute;
+        u32 Elapsed = dwTime - T.dwTimeOfLastExecute;
 #ifdef DEBUG
-		VERIFY						(T.Object->dbg_startframe != Device.dwFrame);
-		T.Object->dbg_startframe	= Device.dwFrame;
+        VERIFY(T.Object->dbg_startframe != Device.dwFrame);
+        T.Object->dbg_startframe = Device.dwFrame;
 #endif
-		T.Object->shedule_Update	(Elapsed);
-		T.dwTimeOfLastExecute		= dwTime;
-	}
+        T.Object->shedule_Update(Elapsed);
+        T.dwTimeOfLastExecute = dwTime;
+    }
 
-	// Normal (sheduled)
-	ProcessStep						();
-	m_processing_now				= false;
+    // Normal (sheduled)
+    ProcessStep();
+    m_processing_now = false;
 #ifdef DEBUG_SCHEDULER
-	Msg								("SCHEDULER: PROCESS STEP FINISHED %d",Device.dwFrame);
+    Msg("SCHEDULER: PROCESS STEP FINISHED %d", Device.dwFrame);
 #endif // DEBUG_SCHEDULER
-	clamp							(psShedulerTarget,3.f,66.f);
-	psShedulerCurrent				= 0.9f*psShedulerCurrent + 0.1f*psShedulerTarget;
-	Device.Statistic->fShedulerLoad	= psShedulerCurrent;
-
-	// Finalize
-	g_bSheduleInProgress			= FALSE;
-	internal_Registration			();
-	Device.Statistic->Sheduler.End	();
+    clamp(psShedulerTarget, 3.f, 66.f);
+    psShedulerCurrent = 0.9f*psShedulerCurrent + 0.1f*psShedulerTarget;
+    Device.Statistic->fShedulerLoad = psShedulerCurrent;
+
+    // Finalize
+    g_bSheduleInProgress = FALSE;
+    internal_Registration();
+    Device.Statistic->Sheduler.End();
 }
diff --git a/src/xrEngine/xrSheduler.h b/src/xrEngine/xrSheduler.h
index 8a45cdacbfd..1686934690a 100644
--- a/src/xrEngine/xrSheduler.h
+++ b/src/xrEngine/xrSheduler.h
@@ -3,60 +3,62 @@
 
 #include "ISheduled.h"
 
-class	ENGINE_API	CSheduler
+class ENGINE_API CSheduler
 {
 private:
-	struct Item
-	{
-		u32			dwTimeForExecute;
-		u32			dwTimeOfLastExecute;
-		shared_str	scheduled_name;
-		ISheduled*	Object;
-		u32			dwPadding;				// for align-issues
+    struct Item
+    {
+        u32 dwTimeForExecute;
+        u32 dwTimeOfLastExecute;
+        shared_str scheduled_name;
+        ISheduled* Object;
+        u32 dwPadding; // for align-issues
 
-		IC bool		operator < (Item& I)
-		{	return dwTimeForExecute > I.dwTimeForExecute; }
-	};
-	struct	ItemReg
-	{
-		BOOL		OP;
-		BOOL		RT;
-		ISheduled*	Object;
-	};
+        IC bool operator < (Item& I)
+        {
+            return dwTimeForExecute > I.dwTimeForExecute;
+        }
+    };
+    struct ItemReg
+    {
+        BOOL OP;
+        BOOL RT;
+        ISheduled* Object;
+    };
 private:
-	xr_vector<Item>			ItemsRT			;
-	xr_vector<Item>			Items			;
-	xr_vector<Item>			ItemsProcessed	;
-	xr_vector<ItemReg>		Registration	;
-	ISheduled*				m_current_step_obj;
-	bool					m_processing_now;
+    xr_vector<Item> ItemsRT;
+    xr_vector<Item> Items;
+    xr_vector<Item> ItemsProcessed;
+    xr_vector<ItemReg> Registration;
+    ISheduled* m_current_step_obj;
+    bool m_processing_now;
 
-	IC void			Push	(Item& I);
-	IC void			Pop		();
-	IC Item&		Top		()
-	{
-		return Items.front();
-	}
-	void			internal_Register		(ISheduled* A, BOOL RT=FALSE		);
-	bool			internal_Unregister		(ISheduled* A, BOOL RT, bool warn_on_not_found = true);
-	void			internal_Registration	();
+    IC void Push(Item& I);
+    IC void Pop();
+    IC Item& Top()
+    {
+        return Items.front();
+    }
+    void internal_Register(ISheduled* A, BOOL RT = FALSE);
+    bool internal_Unregister(ISheduled* A, BOOL RT, bool warn_on_not_found = true);
+    void internal_Registration();
 public:
-	u64				cycles_start;
-	u64				cycles_limit;
+    u64 cycles_start;
+    u64 cycles_limit;
 public:
-	void			ProcessStep	();
-	void			Process		();
-	void			Update		();
+    void ProcessStep();
+    void Process();
+    void Update();
 
 #ifdef DEBUG
-	bool			Registered	(ISheduled *object) const;
+    bool Registered(ISheduled* object) const;
 #endif // DEBUG
-	void			Register	(ISheduled* A, BOOL RT=FALSE		);
-	void			Unregister	(ISheduled* A						);
-	void			EnsureOrder	(ISheduled* Before, ISheduled* After);
+    void Register(ISheduled* A, BOOL RT = FALSE);
+    void Unregister(ISheduled* A);
+    void EnsureOrder(ISheduled* Before, ISheduled* After);
 
-	void			Initialize	();
-	void			Destroy		();
+    void Initialize();
+    void Destroy();
 };
 
 #endif // XRSHEDULER_H_INCLUDED
diff --git a/src/xrEngine/xrTheora_Stream.cpp b/src/xrEngine/xrTheora_Stream.cpp
index 2f8d29454b7..c876f67a18e 100644
--- a/src/xrEngine/xrTheora_Stream.cpp
+++ b/src/xrEngine/xrTheora_Stream.cpp
@@ -2,228 +2,252 @@
 #include "xrtheora_stream.h"
 
 #ifdef _EDITOR
-//#	pragma comment(lib,	"x:\\oggB.lib")
-//#	pragma comment(lib,	"x:\\theoraB.lib") 
+//# pragma comment(lib, "x:\\oggB.lib")
+//# pragma comment(lib, "x:\\theoraB.lib")
 #endif
 
-CTheoraStream::CTheoraStream()                        
+CTheoraStream::CTheoraStream()
 {
-	// clear self
-	source				= 0;
-	fpms				= 0.f;
-	d_frame				= -1;
-	tm_total			= 0;
-	key_rate			= 0;
-	// start up Ogg stream synchronization layer
-	ogg_sync_init		(&o_sync_state);
-	// init supporting Theora structures needed in header parsing
-	theora_comment_init	(&t_comment);
-	theora_info_init	(&t_info);
-	// clear struct
-	Memory.mem_fill		(&o_stream_state,0,sizeof(o_stream_state));
-	Memory.mem_fill		(&o_page,0,sizeof(o_page));
-	Memory.mem_fill		(&t_state,0,sizeof(t_state));
-	Memory.mem_fill		(&t_yuv_buffer,0,sizeof(t_yuv_buffer));
+    // clear self
+    source = 0;
+    fpms = 0.f;
+    d_frame = -1;
+    tm_total = 0;
+    key_rate = 0;
+    // start up Ogg stream synchronization layer
+    ogg_sync_init(&o_sync_state);
+    // init supporting Theora structures needed in header parsing
+    theora_comment_init(&t_comment);
+    theora_info_init(&t_info);
+    // clear struct
+    Memory.mem_fill(&o_stream_state, 0, sizeof(o_stream_state));
+    Memory.mem_fill(&o_page, 0, sizeof(o_page));
+    Memory.mem_fill(&t_state, 0, sizeof(t_state));
+    Memory.mem_fill(&t_yuv_buffer, 0, sizeof(t_yuv_buffer));
 }
 
 CTheoraStream::~CTheoraStream()
 {
-	ogg_sync_clear		(&o_sync_state);
-	ogg_stream_clear	(&o_stream_state);
-	theora_clear		(&t_state);
-	theora_comment_clear(&t_comment);
-	theora_info_clear	(&t_info);
-	FS.r_close			(source);
+    ogg_sync_clear(&o_sync_state);
+    ogg_stream_clear(&o_stream_state);
+    theora_clear(&t_state);
+    theora_comment_clear(&t_comment);
+    theora_info_clear(&t_info);
+    FS.r_close(source);
 }
 
 void CTheoraStream::Reset()
 {
-	source->seek		(0);
-	ogg_stream_reset	(&o_stream_state);
-	ogg_sync_reset		(&o_sync_state);
-	t_state.granulepos	= -1;
-	d_frame				= -1;
+    source->seek(0);
+    ogg_stream_reset(&o_stream_state);
+    ogg_sync_reset(&o_sync_state);
+    t_state.granulepos = -1;
+    d_frame = -1;
 }
 
-int	CTheoraStream::ReadData()
+int CTheoraStream::ReadData()
 {
-	char *buffer		= ogg_sync_buffer(&o_sync_state,4096);
-	long bytes			= 4096>(size_t)source->elapsed()?source->elapsed():4096;
-	source->r			(buffer, bytes);	
-	ogg_sync_wrote		(&o_sync_state,bytes);
-	return bytes;
+    char* buffer = ogg_sync_buffer(&o_sync_state, 4096);
+    long bytes = 4096 > (size_t)source->elapsed() ? source->elapsed() : 4096;
+    source->r(buffer, bytes);
+    ogg_sync_wrote(&o_sync_state, bytes);
+    return bytes;
 }
 
-BOOL CTheoraStream::ParseHeaders		()
+BOOL CTheoraStream::ParseHeaders()
 {
-	ogg_packet			o_packet;
-	int header_count	= 0;
-	BOOL stateflag		= FALSE;
-
-	// find Theora stream
-	while(!stateflag){
-		int ret			= ReadData(); 
-		if (ret==0)		break;
-		while(ogg_sync_pageout(&o_sync_state,&o_page)>0){
-			ogg_stream_state test;
-
-			// is this a mandated initial header? If not, stop parsing
-			if(!ogg_page_bos(&o_page)){
-				// don't leak the page; get it into the appropriate stream
-				ogg_stream_pagein	(&o_stream_state,&o_page);
-				stateflag			= 1;
-				break;
-			}
-
-			ogg_stream_init		(&test,ogg_page_serialno(&o_page));
-			ogg_stream_pagein	(&test,&o_page);
-			ogg_stream_packetout(&test,&o_packet);
-
-			// identify the codec: try theora 
-			if(!header_count && theora_decode_header(&t_info,&t_comment,&o_packet)>=0){
-				// it is theora 
-				CopyMemory	(&o_stream_state,&test,sizeof(test));
-				header_count	= 1;
-			}else{
-				// whatever it is, we don't care about it 
-				ogg_stream_clear(&test);
-			}
-		}
-		// fall through to non-bos page parsing 
-	}
-
-	// fail if theora stream not found in source
-	if (0==header_count)		return FALSE;
-
-	// we're expecting more header packets. 
-	while((header_count && header_count<3)){
-		int ret;
-
-		// look for further theora headers 
-		while(header_count && (header_count<3) && 0!=(ret=ogg_stream_packetout(&o_stream_state,&o_packet))){
-			if(ret<0){
-				fprintf(stderr,"Error parsing Theora stream headers; corrupt stream?\n");
-				exit(1);
-			}
-			if(theora_decode_header(&t_info,&t_comment,&o_packet)){
-				printf("Error parsing Theora stream headers; corrupt stream?\n");
-				exit(1);
-			}
-			header_count++;
-			if(header_count==3)break;
-		}
-
-		// The header pages/packets will arrive before anything else we
-		// care about, or the stream is not obeying spec
-		if(ogg_sync_pageout(&o_sync_state,&o_page)>0){
-			ogg_stream_pagein	(&o_stream_state,&o_page);
-		}else{
-			int ret=ReadData(); // someone needs more data
-			if(ret==0) FATAL	("End of file while searching for codec headers.");
-		}
-	}
-
-	if (3!=header_count)	return FALSE;
-	
-	// init decode
-	theora_decode_init		(&t_state,&t_info);
-	// calculate frame per ms
-	fpms					= ((float)t_info.fps_numerator/(float)t_info.fps_denominator)/1000.f;
-
-	//. XXX hack (maybe slow)
-	// calculate frame count & total length in ms & key rate
-	ogg_int64_t	frame_count	= 0;
-	ogg_int64_t p_key=0, c_key=0;
-	while (TRUE){
-		while(ogg_stream_packetout(&o_stream_state,&o_packet)>0){
-			if ((0==key_rate)&&theora_packet_iskeyframe(&o_packet)){
-				p_key		= c_key;
-				c_key		= frame_count;
-				key_rate	= (u32)(c_key-p_key);
-			}
-			frame_count++;
-		}
-		// check eof
-		if (source->eof())	break;
-		// no data yet for somebody.  Grab another page 
-		if (0==ReadData())	break;
-		while(ogg_sync_pageout(&o_sync_state,&o_page)>0)
-			ogg_stream_pagein(&o_stream_state,&o_page);
-	}
-	tm_total				= iFloor(frame_count/fpms);
-
-	// seek to 0
-	Reset					();
-
-	return TRUE;
+    ogg_packet o_packet;
+    int header_count = 0;
+    BOOL stateflag = FALSE;
+
+    // find Theora stream
+    while (!stateflag)
+    {
+        int ret = ReadData();
+        if (ret == 0) break;
+        while (ogg_sync_pageout(&o_sync_state, &o_page) > 0)
+        {
+            ogg_stream_state test;
+
+            // is this a mandated initial header? If not, stop parsing
+            if (!ogg_page_bos(&o_page))
+            {
+                // don't leak the page; get it into the appropriate stream
+                ogg_stream_pagein(&o_stream_state, &o_page);
+                stateflag = 1;
+                break;
+            }
+
+            ogg_stream_init(&test, ogg_page_serialno(&o_page));
+            ogg_stream_pagein(&test, &o_page);
+            ogg_stream_packetout(&test, &o_packet);
+
+            // identify the codec: try theora
+            if (!header_count && theora_decode_header(&t_info, &t_comment, &o_packet) >= 0)
+            {
+                // it is theora
+                CopyMemory(&o_stream_state, &test, sizeof(test));
+                header_count = 1;
+            }
+            else
+            {
+                // whatever it is, we don't care about it
+                ogg_stream_clear(&test);
+            }
+        }
+        // fall through to non-bos page parsing
+    }
+
+    // fail if theora stream not found in source
+    if (0 == header_count) return FALSE;
+
+    // we're expecting more header packets.
+    while ((header_count && header_count < 3))
+    {
+        int ret;
+
+        // look for further theora headers
+        while (header_count && (header_count < 3) && 0 != (ret = ogg_stream_packetout(&o_stream_state, &o_packet)))
+        {
+            if (ret < 0)
+            {
+                fprintf(stderr, "Error parsing Theora stream headers; corrupt stream?\n");
+                exit(1);
+            }
+            if (theora_decode_header(&t_info, &t_comment, &o_packet))
+            {
+                printf("Error parsing Theora stream headers; corrupt stream?\n");
+                exit(1);
+            }
+            header_count++;
+            if (header_count == 3)break;
+        }
+
+        // The header pages/packets will arrive before anything else we
+        // care about, or the stream is not obeying spec
+        if (ogg_sync_pageout(&o_sync_state, &o_page) > 0)
+        {
+            ogg_stream_pagein(&o_stream_state, &o_page);
+        }
+        else
+        {
+            int ret = ReadData(); // someone needs more data
+            if (ret == 0) FATAL("End of file while searching for codec headers.");
+        }
+    }
+
+    if (3 != header_count) return FALSE;
+
+    // init decode
+    theora_decode_init(&t_state, &t_info);
+    // calculate frame per ms
+    fpms = ((float)t_info.fps_numerator / (float)t_info.fps_denominator) / 1000.f;
+
+    //. XXX hack (maybe slow)
+    // calculate frame count & total length in ms & key rate
+    ogg_int64_t frame_count = 0;
+    ogg_int64_t p_key = 0, c_key = 0;
+    while (TRUE)
+    {
+        while (ogg_stream_packetout(&o_stream_state, &o_packet) > 0)
+        {
+            if ((0 == key_rate) && theora_packet_iskeyframe(&o_packet))
+            {
+                p_key = c_key;
+                c_key = frame_count;
+                key_rate = (u32)(c_key - p_key);
+            }
+            frame_count++;
+        }
+        // check eof
+        if (source->eof()) break;
+        // no data yet for somebody. Grab another page
+        if (0 == ReadData()) break;
+        while (ogg_sync_pageout(&o_sync_state, &o_page) > 0)
+            ogg_stream_pagein(&o_stream_state, &o_page);
+    }
+    tm_total = iFloor(frame_count / fpms);
+
+    // seek to 0
+    Reset();
+
+    return TRUE;
 }
 
 BOOL CTheoraStream::Decode(u32 in_tm_play)
 {
-	VERIFY				(in_tm_play<tm_total);
-	ogg_int64_t			t_frame;
-	t_frame				= iFloor(in_tm_play*fpms);
-	ogg_int64_t	k_frame	= t_frame-t_frame%key_rate;
-
-	if (d_frame<t_frame){
-		BOOL result		= FALSE;
-		ogg_packet		o_packet;
-		while (d_frame<t_frame){
-			while(FALSE==result){
-				// theora is one in, one out... 
-				if(ogg_stream_packetout(&o_stream_state,&o_packet)>0 && !theora_packet_isheader(&o_packet)){
-					d_frame++; 
-					//. hack preroll
-					if (d_frame<k_frame){		
-//.						dbg_log				((stderr,"%04d: preroll\n",d_frame));
-						VERIFY				((0!=d_frame%key_rate)||(0==d_frame%key_rate)&&theora_packet_iskeyframe(&o_packet));
-						continue; 
-					}
-					BOOL is_key				= theora_packet_iskeyframe(&o_packet);
-					VERIFY					( (d_frame!=k_frame) || ((d_frame==k_frame) && is_key) );
-					// real decode
-//.					dbg_log					((stderr,"%04d: decode\n",d_frame)); 
-					int res					= theora_decode_packetin(&t_state,&o_packet);
-					VERIFY					(res!=OC_BADPACKET);
-//.					dbg_log					((stderr,"%04d: granule frame\n",theora_granule_frame(&t_state,t_state.granulepos)));
-					if (d_frame>=t_frame)	result = TRUE;
-				}else						break;
-			}
-			// check eof
-			VERIFY(!(FALSE==result&&source->eof()));
-			if(FALSE==result){
-				// no data yet for somebody.  Grab another page 
-				if (ReadData()){
-					while(ogg_sync_pageout(&o_sync_state,&o_page)>0)
-						ogg_stream_pagein	(&o_stream_state,&o_page);
-				}
-			}
-		}
-		// all right - get yuv buffer
-		VERIFY								(TRUE==result);
-		VERIFY								(d_frame==t_frame);
-		theora_decode_YUVout				(&t_state,&t_yuv_buffer);
-//.		dbg_log								((stderr,"%04d: yuv out\n",d_frame));
-		return TRUE;
-	}
-	return FALSE;
+    VERIFY(in_tm_play < tm_total);
+    ogg_int64_t t_frame;
+    t_frame = iFloor(in_tm_play*fpms);
+    ogg_int64_t k_frame = t_frame - t_frame%key_rate;
+
+    if (d_frame < t_frame)
+    {
+        BOOL result = FALSE;
+        ogg_packet o_packet;
+        while (d_frame < t_frame)
+        {
+            while (FALSE == result)
+            {
+                // theora is one in, one out...
+                if (ogg_stream_packetout(&o_stream_state, &o_packet) > 0 && !theora_packet_isheader(&o_packet))
+                {
+                    d_frame++;
+                    //. hack preroll
+                    if (d_frame < k_frame)
+                    {
+                        //. dbg_log ((stderr,"%04d: preroll\n",d_frame));
+                        VERIFY((0 != d_frame%key_rate) || (0 == d_frame%key_rate) && theora_packet_iskeyframe(&o_packet));
+                        continue;
+                    }
+                    BOOL is_key = theora_packet_iskeyframe(&o_packet);
+                    VERIFY((d_frame != k_frame) || ((d_frame == k_frame) && is_key));
+                    // real decode
+                    //. dbg_log ((stderr,"%04d: decode\n",d_frame));
+                    int res = theora_decode_packetin(&t_state, &o_packet);
+                    VERIFY(res != OC_BADPACKET);
+                    //. dbg_log ((stderr,"%04d: granule frame\n",theora_granule_frame(&t_state,t_state.granulepos)));
+                    if (d_frame >= t_frame) result = TRUE;
+                }
+                else break;
+            }
+            // check eof
+            VERIFY(!(FALSE == result&&source->eof()));
+            if (FALSE == result)
+            {
+                // no data yet for somebody. Grab another page
+                if (ReadData())
+                {
+                    while (ogg_sync_pageout(&o_sync_state, &o_page) > 0)
+                        ogg_stream_pagein(&o_stream_state, &o_page);
+                }
+            }
+        }
+        // all right - get yuv buffer
+        VERIFY(TRUE == result);
+        VERIFY(d_frame == t_frame);
+        theora_decode_YUVout(&t_state, &t_yuv_buffer);
+        //. dbg_log ((stderr,"%04d: yuv out\n",d_frame));
+        return TRUE;
+    }
+    return FALSE;
 }
 
 BOOL CTheoraStream::Load(const char* fname)
 {
-	VERIFY				(0==source);
-	// open source
+    VERIFY(0 == source);
+    // open source
 #ifdef _EDITOR
-	source				= FS.r_open(0,fname);
+    source = FS.r_open(0, fname);
 #else
-	source				= FS.rs_open(0,fname);
+    source = FS.rs_open(0, fname);
 #endif
-	VERIFY				(source);
+    VERIFY(source);
 
-	// parse headers
-	BOOL res			= ParseHeaders();
-	// seek to start
-	Reset				();
-	return				res;
+    // parse headers
+    BOOL res = ParseHeaders();
+    // seek to start
+    Reset();
+    return res;
 }
 
diff --git a/src/xrEngine/xrTheora_Stream.h b/src/xrEngine/xrTheora_Stream.h
index 5e3167c347a..07644d3f421 100644
--- a/src/xrEngine/xrTheora_Stream.h
+++ b/src/xrEngine/xrTheora_Stream.h
@@ -5,41 +5,42 @@
 #include <theora/theora.h>
 #include "../xrCore/Stream_Reader.h"
 
-class ENGINE_API CTheoraStream{
-	friend	class		CTheoraSurface;
+class ENGINE_API CTheoraStream
+{
+    friend class CTheoraSurface;
 
-	ogg_sync_state		o_sync_state;
-	ogg_page			o_page;
-	ogg_stream_state	o_stream_state;
-	theora_info			t_info;
-	theora_comment		t_comment;
-	theora_state		t_state;
+    ogg_sync_state o_sync_state;
+    ogg_page o_page;
+    ogg_stream_state o_stream_state;
+    theora_info t_info;
+    theora_comment t_comment;
+    theora_state t_state;
 
 #ifdef _EDITOR
-	IReader		        *source;
+    IReader* source;
 #else
-	CStreamReader		*source;
+    CStreamReader* source;
 #endif
-	yuv_buffer			t_yuv_buffer;
+    yuv_buffer t_yuv_buffer;
 
-	ogg_int64_t			d_frame;
-	u32					tm_total;
-	u32					key_rate;			// theora have const key rate
-	float				fpms;
+    ogg_int64_t d_frame;
+    u32 tm_total;
+    u32 key_rate; // theora have const key rate
+    float fpms;
 protected:
-	int					ReadData			();
-	BOOL				ParseHeaders		();
+    int ReadData();
+    BOOL ParseHeaders();
 public:
-						CTheoraStream		();
-	virtual				~CTheoraStream		();
+    CTheoraStream();
+    virtual ~CTheoraStream();
 
-	BOOL				Load				(const char* fname);
+    BOOL Load(const char* fname);
 
-	void				Reset				();
+    void Reset();
 
-	BOOL				Decode				(u32 tm_play);
+    BOOL Decode(u32 tm_play);
 
-	yuv_buffer*			CurrentFrame		()					{return &t_yuv_buffer;}
+    yuv_buffer* CurrentFrame() { return &t_yuv_buffer; }
 };
 
 #endif //xrTheora_StreamH
diff --git a/src/xrEngine/xrTheora_Surface.cpp b/src/xrEngine/xrTheora_Surface.cpp
index 4c71a16afe3..6023b6b8419 100644
--- a/src/xrEngine/xrTheora_Surface.cpp
+++ b/src/xrEngine/xrTheora_Surface.cpp
@@ -4,339 +4,361 @@
 
 CTheoraSurface::CTheoraSurface()
 {
-	ready				= FALSE;
-	// streams
-	m_rgb				= 0;
-	m_alpha				= 0;
-	// timing
-	tm_play				= 0;
-	tm_total			= 0;
-	// sdl
+    ready = FALSE;
+    // streams
+    m_rgb = 0;
+    m_alpha = 0;
+    // timing
+    tm_play = 0;
+    tm_total = 0;
+    // sdl
 #ifdef SDL_OUTPUT
-	sdl_screen			= 0;
-	sdl_yuv_overlay		= 0;
+    sdl_screen = 0;
+    sdl_yuv_overlay = 0;
 #endif
-	// controls
-	playing				= FALSE;
-	looped				= FALSE;
-	bShaderYUV2RGB		= TRUE;
-	prefetch			= -2;
+    // controls
+    playing = FALSE;
+    looped = FALSE;
+    bShaderYUV2RGB = TRUE;
+    prefetch = -2;
 }
 
 CTheoraSurface::~CTheoraSurface()
 {
-	xr_delete			(m_rgb);
-	xr_delete			(m_alpha);
+    xr_delete(m_rgb);
+    xr_delete(m_alpha);
 #ifdef SDL_OUTPUT
-	SDL_Quit			();
+    SDL_Quit ();
 #endif
 }
 
 void CTheoraSurface::Reset()
 {
-	if (m_rgb)			m_rgb->Reset	();
-	if (m_alpha)		m_alpha->Reset	();
-	tm_play				= 0;
+    if (m_rgb) m_rgb->Reset();
+    if (m_alpha) m_alpha->Reset();
+    tm_play = 0;
 }
 
 BOOL CTheoraSurface::Valid()
 {
-	return				ready;
+    return ready;
 }
 
-void CTheoraSurface::Play(BOOL _looped, u32 _time)		
-{	
-	playing				= TRUE;
-	looped				= _looped;
-	tm_start			= _time;
-	prefetch			= -2;
+void CTheoraSurface::Play(BOOL _looped, u32 _time)
+{
+    playing = TRUE;
+    looped = _looped;
+    tm_start = _time;
+    prefetch = -2;
 }
 
 BOOL CTheoraSurface::Update(u32 _time)
 {
-	VERIFY				(Valid());
-	BOOL redraw			= FALSE;
-	
-	if(prefetch<0) //fake. first updated frame is data loading
-	{
-		++prefetch;
-		if(prefetch==0)
-			tm_start		= _time;
-
-		tm_play				= 0;
-	}else
-	{
-		if(playing)
-			tm_play			= _time-tm_start;
-	}
-	if (playing)
-	{
-		if (tm_play>=tm_total)
-		{ 
-			if (looped)
-			{
-				tm_start = tm_start+tm_total;
-				Reset	();
-			}else
-			{
-				Stop	();
-				return	FALSE;
-			}
-		}
-		if (m_rgb)		redraw|=m_rgb->Decode	(tm_play);
-		if (m_alpha)	redraw|=m_alpha->Decode	(tm_play);
-	}
-
-	return redraw;
-} 
+    VERIFY(Valid());
+    BOOL redraw = FALSE;
+
+    if (prefetch < 0) //fake. first updated frame is data loading
+    {
+        ++prefetch;
+        if (prefetch == 0)
+            tm_start = _time;
+
+        tm_play = 0;
+    }
+    else
+    {
+        if (playing)
+            tm_play = _time - tm_start;
+    }
+    if (playing)
+    {
+        if (tm_play >= tm_total)
+        {
+            if (looped)
+            {
+                tm_start = tm_start + tm_total;
+                Reset();
+            }
+            else
+            {
+                Stop();
+                return FALSE;
+            }
+        }
+        if (m_rgb) redraw |= m_rgb->Decode(tm_play);
+        if (m_alpha) redraw |= m_alpha->Decode(tm_play);
+    }
+
+    return redraw;
+}
 
 BOOL CTheoraSurface::Load(const char* fname)
 {
-	VERIFY				(FALSE==ready);
-	m_rgb				= xr_new<CTheoraStream>();
-	BOOL res			= m_rgb->Load(fname);
-	if (res){
-		string_path		alpha,ext;
-		xr_strcpy			(alpha,fname);
-		pstr pext		= strext(alpha);
-		if (pext){	
-			xr_strcpy		(ext,pext);
-			*pext		= 0;
-		}
-		strconcat		(sizeof(alpha),alpha,alpha,"#alpha",ext);
-		if (FS.exist(alpha)){
-			m_alpha		= xr_new<CTheoraStream>	();
-			if (!m_alpha->Load(alpha))	res = FALSE;
-		}
-	}
-	if (res){
+    VERIFY(FALSE == ready);
+    m_rgb = xr_new<CTheoraStream>();
+    BOOL res = m_rgb->Load(fname);
+    if (res)
+    {
+        string_path alpha, ext;
+        xr_strcpy(alpha, fname);
+        pstr pext = strext(alpha);
+        if (pext)
+        {
+            xr_strcpy(ext, pext);
+            *pext = 0;
+        }
+        strconcat(sizeof(alpha), alpha, alpha, "#alpha", ext);
+        if (FS.exist(alpha))
+        {
+            m_alpha = xr_new<CTheoraStream>();
+            if (!m_alpha->Load(alpha)) res = FALSE;
+        }
+    }
+    if (res)
+    {
 #ifdef DEBUG
-		if (m_alpha){
-			VERIFY		(m_rgb->tm_total==m_alpha->tm_total);
-			VERIFY		(m_rgb->t_info.frame_width==m_alpha->t_info.frame_width);
-			VERIFY		(m_rgb->t_info.frame_height==m_alpha->t_info.frame_height);
-			VERIFY		(m_rgb->t_info.pixelformat==m_alpha->t_info.pixelformat);
-		}
+        if (m_alpha)
+        {
+            VERIFY(m_rgb->tm_total == m_alpha->tm_total);
+            VERIFY(m_rgb->t_info.frame_width == m_alpha->t_info.frame_width);
+            VERIFY(m_rgb->t_info.frame_height == m_alpha->t_info.frame_height);
+            VERIFY(m_rgb->t_info.pixelformat == m_alpha->t_info.pixelformat);
+        }
 #endif
-//.		VERIFY3			(btwIsPow2(m_rgb->t_info.frame_width)&&btwIsPow2(m_rgb->t_info.frame_height),"Invalid size.",fname);
-		tm_total		= m_rgb->tm_total;
-		VERIFY			(0!=tm_total);
-		// reset playback
-		Reset			();
-		// open SDL video
+        //. VERIFY3 (btwIsPow2(m_rgb->t_info.frame_width)&&btwIsPow2(m_rgb->t_info.frame_height),"Invalid size.",fname);
+        tm_total = m_rgb->tm_total;
+        VERIFY(0 != tm_total);
+        // reset playback
+        Reset();
+        // open SDL video
 #ifdef SDL_OUTPUT
-		open_sdl_video	();
+        open_sdl_video ();
 #endif
-		ready			= TRUE;
-	}else{
-		xr_delete		(m_rgb);
-		xr_delete		(m_alpha);
-	}
-	if(res){
-		//	TODO: get shader version here for theora surface
-		//VERIFY(0);
-		
-		//u32		v_dev	= CAP_VERSION(HW.Caps.raster_major, HW.Caps.raster_minor);
-		//u32		v_need	= CAP_VERSION(2,0);
-		//bShaderYUV2RGB = (v_dev>=v_need);
+        ready = TRUE;
+    }
+    else
+    {
+        xr_delete(m_rgb);
+        xr_delete(m_alpha);
+    }
+    if (res)
+    {
+        // TODO: get shader version here for theora surface
+        //VERIFY(0);
+
+        //u32 v_dev = CAP_VERSION(HW.Caps.raster_major, HW.Caps.raster_minor);
+        //u32 v_need = CAP_VERSION(2,0);
+        //bShaderYUV2RGB = (v_dev>=v_need);
 #ifndef _EDITOR
-		R_ASSERT(Device.m_pRender);
-		bShaderYUV2RGB = Device.m_pRender->HWSupportsShaderYUV2RGB();
-#else	//	_EDITOR
-		bShaderYUV2RGB = false;
-#endif	//	_EDITOR
-
-	}
-	return				res;
+        R_ASSERT(Device.m_pRender);
+        bShaderYUV2RGB = Device.m_pRender->HWSupportsShaderYUV2RGB();
+#else // _EDITOR
+        bShaderYUV2RGB = false;
+#endif // _EDITOR
+
+    }
+    return res;
 }
 
-u32	CTheoraSurface::Width(bool bRealSize)
+u32 CTheoraSurface::Width(bool bRealSize)
 {
-//	return				m_rgb->t_info.frame_width;
+    // return m_rgb->t_info.frame_width;
 
-	if(bRealSize)
-		return				m_rgb->t_info.frame_width;
-	else
-		return btwPow2_Ceil((u32)m_rgb->t_info.frame_width);
+    if (bRealSize)
+        return m_rgb->t_info.frame_width;
+    else
+        return btwPow2_Ceil((u32)m_rgb->t_info.frame_width);
 
 }
 
-u32	CTheoraSurface::Height(bool bRealSize)
+u32 CTheoraSurface::Height(bool bRealSize)
 {
-//	return				m_rgb->t_info.frame_height;
+    // return m_rgb->t_info.frame_height;
 
-	if(bRealSize)
-		return				m_rgb->t_info.frame_height;
-	else
-		return btwPow2_Ceil((u32)m_rgb->t_info.frame_height);;
+    if (bRealSize)
+        return m_rgb->t_info.frame_height;
+    else
+        return btwPow2_Ceil((u32)m_rgb->t_info.frame_height);;
 
 }
 
 void CTheoraSurface::DecompressFrame(u32* data, u32 _width, int& _pos)
 {
-	VERIFY		(m_rgb);
-	yuv_buffer*	yuv_rgb		= m_rgb->CurrentFrame();
-	yuv_buffer*	yuv_alpha	= m_alpha?m_alpha->CurrentFrame():0;
-
-	u32 width				= Width(true);
-	u32 height				= Height(true);
-
-	static const float K = 0.256788f + 0.504129f + 0.097906f;
-
-	// we use ffmpeg2theora for encoding, so only OC_PF_420 valid
-//	u32 pixelformat			= m_rgb->t_info.pixelformat;
-
-	// rgb
-	if (yuv_rgb){
-		yuv_buffer&	yuv	= *yuv_rgb;
-
-		u32 pos = 0;
-
-		if( ! bShaderYUV2RGB ) {
-			for (u32 h=0; h<height; ++h) {
-
-				u32 uv_stride_add = yuv.uv_stride * ( h >> 1 );
-				u8* Y		= yuv.y + yuv.y_stride * h;
-				u8* U		= yuv.u + uv_stride_add;
-				u8* V		= yuv.v + uv_stride_add;
-
-				for (u32 w=0; w<width; ++w) {
-
-					u32 uv_idx = w >> 1;
-					u8 y	= Y[ w ];
-					u8 u	= U[ uv_idx ];
-					u8 v	= V[ uv_idx ];
-
-					int C	= y - 16;
-					int D	= u - 128;
-					int E	= v - 128;
-
-					int R	= clampr(( 298 * C           + 409 * E + 128) >> 8,0,255);
-					int G	= clampr(( 298 * C - 100 * D - 208 * E + 128) >> 8,0,255);
-					int B	= clampr(( 298 * C + 516 * D           + 128) >> 8,0,255);
-
-					data[pos] = color_rgba(R,G,B,255);
-
-					pos++;
-				}
-				pos += _width;
-			}
-		} else {
-
-			u32 buff_step = width + _width;
-			u32 buff_double_step = buff_step << 1;
-
-			for ( u32 y_h = 0 , uv_h = 0 ; y_h < height ; y_h += 2 , ++uv_h , pos += buff_double_step ) {
-
-				u32 uv_stride_add = yuv.uv_stride * uv_h;
-				u8* Y0		= yuv.y + yuv.y_stride * y_h;
-				u8* U		= yuv.u + uv_stride_add;
-				u8* Y1		= Y0 + yuv.y_stride;
-				u8* V		= yuv.v + uv_stride_add;
-
-				for ( u32 y_w = 0 , uv_w = 0 ; y_w < width ; y_w += 2 , ++uv_w ) {
-
-					u32 y00	= Y0[ y_w ] << 16;
-					u32 y01	= Y0[ y_w + 1 ] << 16;
-
-					u32 y10	= Y1[ y_w ] << 16;
-					u32 y11	= Y1[ y_w + 1 ] << 16;
-
-					u8 u	= U[ uv_w ];
-					u8 v	= V[ uv_w ];
-
-					u32 idx = pos + y_w;
-
-					u32 common_part = 255 << 24 | u << 8 | v;
-
-					data[ idx ]			= ( common_part | y00 );
-					data[ idx + 1 ]		= ( common_part | y01 );
-
-					idx += buff_step;
+    VERIFY(m_rgb);
+    yuv_buffer* yuv_rgb = m_rgb->CurrentFrame();
+    yuv_buffer* yuv_alpha = m_alpha ? m_alpha->CurrentFrame() : 0;
 
-					data[ idx ]			= ( common_part | y10 );
-					data[ idx + 1 ]		= ( common_part | y11 );
-				}				
-			}
-		}
-		_pos = pos;
-	}
+    u32 width = Width(true);
+    u32 height = Height(true);
 
-	// alpha
-	if (yuv_alpha)
-	{
-		yuv_buffer&	yuv			= *yuv_alpha;
-		u32 pos					= 0;
-		for (u32 h=0; h<height; ++h)
-		{
-			u8* Y		= yuv.y+yuv.y_stride*h;
-			for (u32 w=0; w<width; ++w)
-			{
-				u8 y			= Y[w];
-				u32& clr		= data[++pos];
-				clr				= subst_alpha(clr,iFloor(float((y-16))/K));
-			}
-		}
-	}
+    static const float K = 0.256788f + 0.504129f + 0.097906f;
+
+    // we use ffmpeg2theora for encoding, so only OC_PF_420 valid
+    // u32 pixelformat = m_rgb->t_info.pixelformat;
+
+    // rgb
+    if (yuv_rgb)
+    {
+        yuv_buffer& yuv = *yuv_rgb;
+
+        u32 pos = 0;
+
+        if (!bShaderYUV2RGB)
+        {
+            for (u32 h = 0; h < height; ++h)
+            {
+
+                u32 uv_stride_add = yuv.uv_stride * (h >> 1);
+                u8* Y = yuv.y + yuv.y_stride * h;
+                u8* U = yuv.u + uv_stride_add;
+                u8* V = yuv.v + uv_stride_add;
+
+                for (u32 w = 0; w < width; ++w)
+                {
+
+                    u32 uv_idx = w >> 1;
+                    u8 y = Y[w];
+                    u8 u = U[uv_idx];
+                    u8 v = V[uv_idx];
+
+                    int C = y - 16;
+                    int D = u - 128;
+                    int E = v - 128;
+
+                    int R = clampr((298 * C + 409 * E + 128) >> 8, 0, 255);
+                    int G = clampr((298 * C - 100 * D - 208 * E + 128) >> 8, 0, 255);
+                    int B = clampr((298 * C + 516 * D + 128) >> 8, 0, 255);
+
+                    data[pos] = color_rgba(R, G, B, 255);
+
+                    pos++;
+                }
+                pos += _width;
+            }
+        }
+        else
+        {
+
+            u32 buff_step = width + _width;
+            u32 buff_double_step = buff_step << 1;
+
+            for (u32 y_h = 0, uv_h = 0; y_h < height; y_h += 2, ++uv_h, pos += buff_double_step)
+            {
+
+                u32 uv_stride_add = yuv.uv_stride * uv_h;
+                u8* Y0 = yuv.y + yuv.y_stride * y_h;
+                u8* U = yuv.u + uv_stride_add;
+                u8* Y1 = Y0 + yuv.y_stride;
+                u8* V = yuv.v + uv_stride_add;
+
+                for (u32 y_w = 0, uv_w = 0; y_w < width; y_w += 2, ++uv_w)
+                {
+
+                    u32 y00 = Y0[y_w] << 16;
+                    u32 y01 = Y0[y_w + 1] << 16;
+
+                    u32 y10 = Y1[y_w] << 16;
+                    u32 y11 = Y1[y_w + 1] << 16;
+
+                    u8 u = U[uv_w];
+                    u8 v = V[uv_w];
+
+                    u32 idx = pos + y_w;
+
+                    u32 common_part = 255 << 24 | u << 8 | v;
+
+                    data[idx] = (common_part | y00);
+                    data[idx + 1] = (common_part | y01);
+
+                    idx += buff_step;
+
+                    data[idx] = (common_part | y10);
+                    data[idx + 1] = (common_part | y11);
+                }
+            }
+        }
+        _pos = pos;
+    }
+
+    // alpha
+    if (yuv_alpha)
+    {
+        yuv_buffer& yuv = *yuv_alpha;
+        u32 pos = 0;
+        for (u32 h = 0; h < height; ++h)
+        {
+            u8* Y = yuv.y + yuv.y_stride*h;
+            for (u32 w = 0; w < width; ++w)
+            {
+                u8 y = Y[w];
+                u32& clr = data[++pos];
+                clr = subst_alpha(clr, iFloor(float((y - 16)) / K));
+            }
+        }
+    }
 }
 
 #ifdef SDL_OUTPUT
 void CTheoraSurface::open_sdl_video()
 {
-	VERIFY(m_rgb);
-	theora_info& t_info		= m_rgb->t_info;
-
-	if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
-		msg					("Unable to init SDL: %s", SDL_GetError());
-		return;
-	}
-
-	sdl_screen				= SDL_SetVideoMode(t_info.frame_width, t_info.frame_height, 0, SDL_SWSURFACE);
-	if ( sdl_screen == NULL ) {
-		msg					("Unable to set %dx%d video: %s", t_info.frame_width,t_info.frame_height,SDL_GetError());
-		return;
-	}
-
-	sdl_yuv_overlay			= SDL_CreateYUVOverlay(t_info.frame_width, t_info.frame_height, SDL_YV12_OVERLAY, sdl_screen);
-	if ( sdl_yuv_overlay == NULL ) {
-		msg					("SDL: Couldn't create SDL_yuv_overlay: %s", SDL_GetError());
-		return;
-	}
-	sdl_rect.x				= 0;
-	sdl_rect.y				= 0;
-	sdl_rect.w				= t_info.frame_width;
-	sdl_rect.h				= t_info.frame_height;
-
-	SDL_DisplayYUVOverlay	(sdl_yuv_overlay, &sdl_rect);
+    VERIFY(m_rgb);
+    theora_info& t_info = m_rgb->t_info;
+
+    if ( SDL_Init(SDL_INIT_VIDEO) < 0 )
+    {
+        msg ("Unable to init SDL: %s", SDL_GetError());
+        return;
+    }
+
+    sdl_screen = SDL_SetVideoMode(t_info.frame_width, t_info.frame_height, 0, SDL_SWSURFACE);
+    if ( sdl_screen == NULL )
+    {
+        msg ("Unable to set %dx%d video: %s", t_info.frame_width,t_info.frame_height,SDL_GetError());
+        return;
+    }
+
+    sdl_yuv_overlay = SDL_CreateYUVOverlay(t_info.frame_width, t_info.frame_height, SDL_YV12_OVERLAY, sdl_screen);
+    if ( sdl_yuv_overlay == NULL )
+    {
+        msg ("SDL: Couldn't create SDL_yuv_overlay: %s", SDL_GetError());
+        return;
+    }
+    sdl_rect.x = 0;
+    sdl_rect.y = 0;
+    sdl_rect.w = t_info.frame_width;
+    sdl_rect.h = t_info.frame_height;
+
+    SDL_DisplayYUVOverlay (sdl_yuv_overlay, &sdl_rect);
 }
 
 void CTheoraSurface::write_sdl_video()
 {
-	VERIFY(m_rgb);
-	theora_info& t_info		= m_rgb->t_info;
-	yuv_buffer&	t_yuv_buffer= *m_rgb->current_yuv_buffer();
-	int i;
-	int crop_offset;
-	// Lock SDL_yuv_overlay 
-	if ( SDL_MUSTLOCK(sdl_screen) )  
-		if ( SDL_LockSurface(sdl_screen) < 0 ) return;
-	if (SDL_LockYUVOverlay(sdl_yuv_overlay) < 0) return;
-	// let's draw the data (*yuv[3]) on a SDL screen (*screen) 
-	// deal with border stride 
-	// reverse u and v for SDL 
-	// and crop input properly, respecting the encoded frame rect 
-	crop_offset=t_info.offset_x+t_yuv_buffer.y_stride*t_info.offset_y;
-	for(i=0;i<sdl_yuv_overlay->h;i++)
-		mem_copy(sdl_yuv_overlay->pixels[0]+sdl_yuv_overlay->pitches[0]*i, t_yuv_buffer.y+crop_offset+t_yuv_buffer.y_stride*i, sdl_yuv_overlay->w);
-	crop_offset=(t_info.offset_x/2)+(t_yuv_buffer.uv_stride)*(t_info.offset_y/2);
-	for(i=0;i<sdl_yuv_overlay->h/2;i++){
-		mem_copy(sdl_yuv_overlay->pixels[1]+sdl_yuv_overlay->pitches[1]*i, t_yuv_buffer.v+crop_offset+t_yuv_buffer.uv_stride*i, sdl_yuv_overlay->w/2);
-		mem_copy(sdl_yuv_overlay->pixels[2]+sdl_yuv_overlay->pitches[2]*i, t_yuv_buffer.u+crop_offset+t_yuv_buffer.uv_stride*i, sdl_yuv_overlay->w/2);
-	}
-	// Unlock SDL_yuv_overlay 
-	if ( SDL_MUSTLOCK(sdl_screen) ) SDL_UnlockSurface(sdl_screen);
-	SDL_UnlockYUVOverlay(sdl_yuv_overlay);
-	// Show, baby, show!
-	SDL_DisplayYUVOverlay(sdl_yuv_overlay, &sdl_rect);
+    VERIFY(m_rgb);
+    theora_info& t_info = m_rgb->t_info;
+    yuv_buffer& t_yuv_buffer= *m_rgb->current_yuv_buffer();
+    int i;
+    int crop_offset;
+    // Lock SDL_yuv_overlay
+    if ( SDL_MUSTLOCK(sdl_screen) )
+        if ( SDL_LockSurface(sdl_screen) < 0 ) return;
+    if (SDL_LockYUVOverlay(sdl_yuv_overlay) < 0) return;
+    // let's draw the data (*yuv[3]) on a SDL screen (*screen)
+    // deal with border stride
+    // reverse u and v for SDL
+    // and crop input properly, respecting the encoded frame rect
+    crop_offset=t_info.offset_x+t_yuv_buffer.y_stride*t_info.offset_y;
+    for(i=0; i<sdl_yuv_overlay->h; i++)
+        mem_copy(sdl_yuv_overlay->pixels[0]+sdl_yuv_overlay->pitches[0]*i, t_yuv_buffer.y+crop_offset+t_yuv_buffer.y_stride*i, sdl_yuv_overlay->w);
+    crop_offset=(t_info.offset_x/2)+(t_yuv_buffer.uv_stride)*(t_info.offset_y/2);
+    for(i=0; i<sdl_yuv_overlay->h/2; i++)
+    {
+        mem_copy(sdl_yuv_overlay->pixels[1]+sdl_yuv_overlay->pitches[1]*i, t_yuv_buffer.v+crop_offset+t_yuv_buffer.uv_stride*i, sdl_yuv_overlay->w/2);
+        mem_copy(sdl_yuv_overlay->pixels[2]+sdl_yuv_overlay->pitches[2]*i, t_yuv_buffer.u+crop_offset+t_yuv_buffer.uv_stride*i, sdl_yuv_overlay->w/2);
+    }
+    // Unlock SDL_yuv_overlay
+    if ( SDL_MUSTLOCK(sdl_screen) ) SDL_UnlockSurface(sdl_screen);
+    SDL_UnlockYUVOverlay(sdl_yuv_overlay);
+    // Show, baby, show!
+    SDL_DisplayYUVOverlay(sdl_yuv_overlay, &sdl_rect);
 }
 #endif
diff --git a/src/xrEngine/xrTheora_Surface.h b/src/xrEngine/xrTheora_Surface.h
index 5d29d6cb98a..0628e49ab8d 100644
--- a/src/xrEngine/xrTheora_Surface.h
+++ b/src/xrEngine/xrTheora_Surface.h
@@ -4,55 +4,56 @@
 
 #ifdef SDL_OUTPUT
 #include <SDL.h>
-#pragma comment	(lib,"SDL.lib")
+#pragma comment (lib,"SDL.lib")
 #endif
 
 // refs
 class CTheoraStream;
 
-class ENGINE_API CTheoraSurface{
+class ENGINE_API CTheoraSurface
+{
 #ifdef SDL_OUTPUT
-	// SDL Video playback structures 
-	SDL_Surface*		sdl_screen;
-	SDL_Overlay*		sdl_yuv_overlay;
-	SDL_Rect			sdl_rect;
+    // SDL Video playback structures
+    SDL_Surface* sdl_screen;
+    SDL_Overlay* sdl_yuv_overlay;
+    SDL_Rect sdl_rect;
 #endif
-	CTheoraStream*		m_rgb;
-	CTheoraStream*		m_alpha;
-
-	u32					tm_start;
-	u32					tm_play;
-	u32					tm_total;
-	BOOL				ready;
-	BOOL				bShaderYUV2RGB;
-	int					prefetch;
+    CTheoraStream* m_rgb;
+    CTheoraStream* m_alpha;
+
+    u32 tm_start;
+    u32 tm_play;
+    u32 tm_total;
+    BOOL ready;
+    BOOL bShaderYUV2RGB;
+    int prefetch;
 public:
-	BOOL				playing;
-	BOOL				looped;
+    BOOL playing;
+    BOOL looped;
 protected:
-	void				Reset				();
+    void Reset();
 
 #ifdef SDL_OUTPUT
-	void				open_sdl_video		();
-	void				write_sdl_video		();
+    void open_sdl_video ();
+    void write_sdl_video ();
 #endif
 public:
-						CTheoraSurface		();
-	virtual				~CTheoraSurface	();
+    CTheoraSurface();
+    virtual ~CTheoraSurface();
 
-	BOOL				Valid				();
-	BOOL				Load				(const char* fname);
+    BOOL Valid();
+    BOOL Load(const char* fname);
 
-	BOOL				Update				(u32 _time);
-	void				DecompressFrame		(u32* dst, u32 _width, int& count);
+    BOOL Update(u32 _time);
+    void DecompressFrame(u32* dst, u32 _width, int& count);
 
-	void				Play				(BOOL _looped, u32 _time);
-	void				Pause				(BOOL _pause)		{playing=!_pause;}
-	void				Stop				()					{playing=FALSE;Reset();}
-	BOOL				IsPlaying			()					{return playing;}
+    void Play(BOOL _looped, u32 _time);
+    void Pause(BOOL _pause) { playing = !_pause; }
+    void Stop() { playing = FALSE; Reset(); }
+    BOOL IsPlaying() { return playing; }
 
-	u32					Width				(bool bRealSize);
-	u32					Height				(bool bRealSize);
+    u32 Width(bool bRealSize);
+    u32 Height(bool bRealSize);
 };
 
 #endif //xrTheora_SurfaceH
diff --git a/src/xrEngine/xrTheora_Surface_mmx.cpp b/src/xrEngine/xrTheora_Surface_mmx.cpp
index 7c27c24b0f9..540e016a223 100644
--- a/src/xrEngine/xrTheora_Surface_mmx.cpp
+++ b/src/xrEngine/xrTheora_Surface_mmx.cpp
@@ -2,283 +2,276 @@
 
 #include "xrTheora_Surface_mmx.h"
 
-#pragma warning( disable : 4731 )
+#pragma warning(disable:4731)
 
-#pragma pack( push )
-#pragma pack( 1 )
+#pragma pack(push)
+#pragma pack(1)
 
-typedef tv_sshort tv_sshort_tables[ 256 ][ 4 ];
+typedef tv_sshort tv_sshort_tables[256][4];
 
-#pragma pack( pop )
+#pragma pack(pop)
 /*
 
 //. width_diff = surface_width - theora_width
 
-		u32 pos = 0;
-		for (u32 h=0; h<height; ++h){
+u32 pos = 0;
+for (u32 h=0; h<height; ++h){
 
-			u8* Y		= yuv.y+yuv.y_stride*h;
-			u8* U		= yuv.u+yuv.uv_stride*(h/uv_h);
-			u8* V		= yuv.v+yuv.uv_stride*(h/uv_h);
+u8* Y  = yuv.y+yuv.y_stride*h;
+u8* U  = yuv.u+yuv.uv_stride*(h/uv_h);
+u8* V  = yuv.v+yuv.uv_stride*(h/uv_h);
 
-			for (u32 w=0; w<width; ++w){
+for (u32 w=0; w<width; ++w){
 
-				u8 y	= Y[w];
-				u8 u	= U[w/uv_w];
-				u8 v	= V[w/uv_w];
+u8 y = Y[w];
+u8 u = U[w/uv_w];
+u8 v = V[w/uv_w];
 
-				int C	= y - 16;
-				int D	= u - 128;
-				int E	= v - 128;
+int C = y - 16;
+int D = u - 128;
+int E = v - 128;
 
-				int R	= clampr(( 298 * C           + 409 * E + 128) >> 8,0,255);
-				int G	= clampr(( 298 * C - 100 * D - 208 * E + 128) >> 8,0,255);
-				int B	= clampr(( 298 * C + 516 * D           + 128) >> 8,0,255);
+int R = clampr(( 298 * C           + 409 * E + 128) >> 8,0,255);
+int G = clampr(( 298 * C - 100 * D - 208 * E + 128) >> 8,0,255);
+int B = clampr(( 298 * C + 516 * D           + 128) >> 8,0,255);
 
-				data[++pos] = color_rgba(R,G,B,255);
+data[++pos] = color_rgba(R,G,B,255);
 
-				if(w==(width-1))
-					pos += width_diff;
-			}
-		}
+if(w==(width-1))
+pos += width_diff;
+}
+}
 */
 
-lp_tv_uchar tv_yuv2argb(
-						lp_tv_uchar			argb_plane ,
-						tv_slong			argb_width ,
-						tv_slong			argb_height ,
-						lp_tv_uchar			y_plane ,
-						tv_slong			y_width ,
-						tv_slong			y_height ,
-						tv_slong			y_stride ,
-						lp_tv_uchar 		u_plane ,
-						lp_tv_uchar 		v_plane ,
-						tv_slong 			uv_width ,
-						tv_slong 			uv_height ,
-						tv_slong 			uv_stride,
-						tv_slong 			width_diff 
-						)
+lp_tv_uchar tv_yuv2argb(lp_tv_uchar argb_plane, tv_slong argb_width, tv_slong argb_height, lp_tv_uchar y_plane,
+    tv_slong y_width, tv_slong y_height, tv_slong y_stride, lp_tv_uchar u_plane, lp_tv_uchar v_plane,
+    tv_slong uv_width, tv_slong uv_height, tv_slong uv_stride, tv_slong width_diff)
 {
-	tv_sshort_tables ttl;
+    tv_sshort_tables ttl;
 
-	__asm{
-		push  ebx
-		// helper constants
-		mov   esi,-14487936
-		mov   edi,-5822464
-		mov   ecx,-2785792
-		mov   edx,-14496256
+    __asm
+    {
+        push  ebx
+        // helper constants
+        mov   esi, -14487936
+        mov   edi, -5822464
+        mov   ecx, -2785792
+        mov   edx, -14496256
 
-		lea   ebx,DWORD PTR [ttl + 2]
+        lea   ebx, DWORD PTR[ttl+2]
 
-		// building helper tables
-		ALIGN 4
-_tb_loop:
-		mov   eax,esi
-		sar   eax,16
-		mov   WORD PTR [ebx-2],ax
+        // building helper tables
+        ALIGN 4
+    _tb_loop:
+        mov   eax, esi
+        sar   eax, 16
+        mov   WORD PTR[ebx-2], ax
 
-		mov   eax,edi
-		sar   eax,16
-		mov   WORD PTR [ebx+0],ax
+        mov   eax, edi
+        sar   eax, 16
+        mov   WORD PTR[ebx+0], ax
 
-		mov   eax,ecx
-		sar   eax,16
-		mov   WORD PTR [ebx+2],ax
+        mov   eax, ecx
+        sar   eax, 16
+        mov   WORD PTR[ebx+2], ax
 
-		mov   eax,edx
-		sar   eax,16
-		mov   WORD PTR [ebx+4],ax
+        mov   eax, edx
+        sar   eax, 16
+        mov   WORD PTR[ebx+4], ax
 
-		add   esi,113443
-		add   edi,45744
-		add   ecx,22020
-		add   edx,113508
+        add   esi, 113443
+        add   edi, 45744
+        add   ecx, 22020
+        add   edx, 113508
 
-		add   ebx,4 * ( TYPE tv_sshort )
-		cmp   esi,14553472
+        add   ebx, 4 * (TYPE tv_sshort)
+        cmp   esi, 14553472
 
-		jl   _tb_loop
+        jl   _tb_loop
 
-		pop   ebx
-	}
+        pop   ebx
+    }
 
-	lp_tv_uchar line1 = argb_plane;
-	lp_tv_uchar line2 = line1 + 4 * argb_width;
+    lp_tv_uchar line1 = argb_plane;
+    lp_tv_uchar line2 = line1 + 4 * argb_width;
 
-	lp_tv_uchar y1 = y_plane;
-	lp_tv_uchar y2 = y1 + y_stride;
+    lp_tv_uchar y1 = y_plane;
+    lp_tv_uchar y2 = y1 + y_stride;
 
-	lp_tv_uchar u = u_plane;
-	lp_tv_uchar v = v_plane;
+    lp_tv_uchar u = u_plane;
+    lp_tv_uchar v = v_plane;
 
-	int nTempX;
-	int nTempY;
-	int nTempX_;
+    int nTempX;
+    int nTempY;
+    int nTempX_;
 
-	for( nTempY = 0 ; nTempY < argb_height ; nTempY += 2 ){
-		for( nTempX = 0 ; nTempX < argb_width ; nTempX += 4 ){
-			nTempX_ = nTempX >> 1;
-			__asm{
-				push ebx       ;
+    for (nTempY = 0; nTempY < argb_height; nTempY += 2)
+    {
+        for (nTempX = 0; nTempX < argb_width; nTempX += 4)
+        {
+            nTempX_ = nTempX >> 1;
+            __asm
+            {
+                push ebx;
 
-				mov  eax,DWORD PTR y1   ; eax = y1
-				mov  ebx,DWORD PTR y2   ; ebx = y2
-				mov  edi,DWORD PTR v    ; edi = v
+                mov  eax, DWORD PTR y1; eax = y1
+                mov  ebx, DWORD PTR y2; ebx = y2
+                mov  edi, DWORD PTR v; edi = v
 
-				add  eax,DWORD PTR nTempX  ; eax = y1 + nTempX
-				add  ebx,DWORD PTR nTempX  ; ebx = y2 + nTempX
+                add  eax, DWORD PTR nTempX; eax = y1 + nTempX
+                add  ebx, DWORD PTR nTempX; ebx = y2 + nTempX
 
-				pxor mm2,mm2      ; mm2 = 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0
+                pxor mm2, mm2; mm2 = 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0
 
-				add  edi,DWORD PTR nTempX_  ; edi = v + nTempX_
-				lea  esi,DWORD PTR ttl   ; esi = ttl
+                add  edi, DWORD PTR nTempX_; edi = v + nTempX_
+                lea  esi, DWORD PTR ttl; esi = ttl
 
-				movd mm0,DWORD PTR [eax]   ; mm0 = 0 | 0 | 0 | 0 | nY4 | nY3 | nY2 | nY1
-				movd mm1,DWORD PTR [ebx]   ; mm1 = 0 | 0 | 0 | 0 | nY8 | nY7 | nY6 | nY5
+                movd mm0, DWORD PTR[eax]; mm0 = 0 | 0 | 0 | 0 | nY4 | nY3 | nY2 | nY1
+                movd mm1, DWORD PTR[ebx]; mm1 = 0 | 0 | 0 | 0 | nY8 | nY7 | nY6 | nY5
 
-				movzx edx,DWORD PTR [edi]   ; edx = V1
-				movzx ecx,DWORD PTR [edi+1]  ; ecx = V2
+                movzx edx, DWORD PTR[edi]; edx = V1
+                movzx ecx, DWORD PTR[edi + 1]; ecx = V2
 
-				punpcklbw mm0,mm2     ; mm0 = nY4 | nY3 | nY2 | nY1
-				punpcklbw mm1,mm2     ; mm1 = nY8 | nY7 | nY6 | nY5
+                punpcklbw mm0, mm2; mm0 = nY4 | nY3 | nY2 | nY1
+                punpcklbw mm1, mm2; mm1 = nY8 | nY7 | nY6 | nY5
 
-				pinsrw mm4,WORD PTR [esi+edx*8+0],00000000b ; mm4 = 0 | 0 | 0 | ttl[nV1][0]
-				pinsrw mm5,WORD PTR [esi+ecx*8+0],00000000b ; mm5 = 0 | 0 | 0 | ttl[nV2][0]
+                pinsrw mm4, WORD PTR[esi + edx * 8 + 0], 00000000b; mm4 = 0 | 0 | 0 | ttl[nV1][0]
+                pinsrw mm5, WORD PTR[esi + ecx * 8 + 0], 00000000b; mm5 = 0 | 0 | 0 | ttl[nV2][0]
 
-				movq mm3,mm0      ; mm3 = nY4 | nY3 | nY2 | nY1
-				mov  edi,DWORD PTR u    ; edi = u
+                movq mm3, mm0; mm3 = nY4 | nY3 | nY2 | nY1
+                mov  edi, DWORD PTR u; edi = u
 
-				punpckldq mm3,mm1     ; mm3 = nY6 | nY5 | nY2 | nY1
-				punpckhdq mm0,mm1     ; mm0 = nY8 | nY7 | nY4 | nY3
+                punpckldq mm3, mm1; mm3 = nY6 | nY5 | nY2 | nY1
+                punpckhdq mm0, mm1; mm0 = nY8 | nY7 | nY4 | nY3
 
-				pshufw mm4,mm4,00000000b   ; mm4 = ttl[nV1][0] | ttl[nV1][0] | ttl[nV1][0] | ttl[nV1][0]
-				pshufw mm5,mm5,00000000b   ; mm5 = ttl[nV2][0] | ttl[nV2][0] | ttl[nV2][0] | ttl[nV2][0]
+                pshufw mm4, mm4, 00000000b; mm4 = ttl[nV1][0] | ttl[nV1][0] | ttl[nV1][0] | ttl[nV1][0]
+                pshufw mm5, mm5, 00000000b; mm5 = ttl[nV2][0] | ttl[nV2][0] | ttl[nV2][0] | ttl[nV2][0]
 
-				add  edi,DWORD PTR nTempX_  ; edi = u + nTempX_
+                add  edi, DWORD PTR nTempX_; edi = u + nTempX_
 
-				paddsw mm4,mm3      ; mm4 = P6.R | P5.R | P2.R | P1.R
-				paddsw mm5,mm0      ; mm5 = P8.R | P7.R | P4.R | P3.R
+                paddsw mm4, mm3; mm4 = P6.R | P5.R | P2.R | P1.R
+                paddsw mm5, mm0; mm5 = P8.R | P7.R | P4.R | P3.R
 
-				pinsrw mm1,WORD PTR [esi+edx*8+2],00000000b ; mm1 = 0 | 0 | 0 | ttl[nV1][1]
-				pinsrw mm2,WORD PTR [esi+ecx*8+2],00000000b ; mm2 = 0 | 0 | 0 | ttl[nV2][1]
+                pinsrw mm1, WORD PTR[esi + edx * 8 + 2], 00000000b; mm1 = 0 | 0 | 0 | ttl[nV1][1]
+                pinsrw mm2, WORD PTR[esi + ecx * 8 + 2], 00000000b; mm2 = 0 | 0 | 0 | ttl[nV2][1]
 
-				movq mm6,mm3      ; mm6 = nY6 | nY5 | nY2 | nY1
-				movq mm7,mm0      ; mm7 = nY8 | nY7 | nY4 | nY3
+                movq mm6, mm3; mm6 = nY6 | nY5 | nY2 | nY1
+                movq mm7, mm0; mm7 = nY8 | nY7 | nY4 | nY3
 
-				movzx edx,DWORD PTR [edi]   ; edx = U1
-				movzx ecx,DWORD PTR [edi+1]  ; ecx = U2
+                movzx edx, DWORD PTR[edi]; edx = U1
+                movzx ecx, DWORD PTR[edi + 1]; ecx = U2
 
-				pshufw mm1,mm1,00000000b   ; mm1 = ttl[nV1][1] | ttl[nV1][1] | ttl[nV1][1] | ttl[nV1][1]
-				pshufw mm2,mm2,00000000b   ; mm2 = ttl[nV2][1] | ttl[nV2][1] | ttl[nV2][1] | ttl[nV2][1]
+                pshufw mm1, mm1, 00000000b; mm1 = ttl[nV1][1] | ttl[nV1][1] | ttl[nV1][1] | ttl[nV1][1]
+                pshufw mm2, mm2, 00000000b; mm2 = ttl[nV2][1] | ttl[nV2][1] | ttl[nV2][1] | ttl[nV2][1]
 
-				psubsw mm6,mm1      ; mm6 = nY6 - ttl[nV1][1] | nY5 - ttl[nV1][1] | nY2 - ttl[nV1][1] | nY1 - ttl[nV1][1]
-				psubsw mm7,mm2      ; mm7 = nY8 - ttl[nV2][1] | nY7 - ttl[nV2][1] | nY4 - ttl[nV2][1] | nY3 - ttl[nV2][1]
+                psubsw mm6, mm1; mm6 = nY6 - ttl[nV1][1] | nY5 - ttl[nV1][1] | nY2 - ttl[nV1][1] | nY1 - ttl[nV1][1]
+                psubsw mm7, mm2; mm7 = nY8 - ttl[nV2][1] | nY7 - ttl[nV2][1] | nY4 - ttl[nV2][1] | nY3 - ttl[nV2][1]
 
-				pinsrw mm1,WORD PTR [esi+edx*8+4],00000000b ; mm1 = 0 | 0 | 0 | ttl[nU1][2]
-				pinsrw mm2,WORD PTR [esi+ecx*8+4],00000000b ; mm2 = 0 | 0 | 0 | ttl[nU2][2]
+                pinsrw mm1, WORD PTR[esi + edx * 8 + 4], 00000000b; mm1 = 0 | 0 | 0 | ttl[nU1][2]
+                pinsrw mm2, WORD PTR[esi + ecx * 8 + 4], 00000000b; mm2 = 0 | 0 | 0 | ttl[nU2][2]
 
-				pshufw mm1,mm1,00000000b   ; mm1 = ttl[nU1][2] | ttl[nU1][2] | ttl[nU1][2] | ttl[nU1][2]
-				pshufw mm2,mm2,00000000b   ; mm2 = ttl[nU2][2] | ttl[nU2][2] | ttl[nU2][2] | ttl[nU2][2]
+                pshufw mm1, mm1, 00000000b; mm1 = ttl[nU1][2] | ttl[nU1][2] | ttl[nU1][2] | ttl[nU1][2]
+                pshufw mm2, mm2, 00000000b; mm2 = ttl[nU2][2] | ttl[nU2][2] | ttl[nU2][2] | ttl[nU2][2]
 
-				psubsw mm6,mm1      ; mm6 = P6.G | P5.G | P2.G | P1.G
-				psubsw mm7,mm2      ; mm7 = P8.G | P7.G | P4.G | P3.G
+                psubsw mm6, mm1; mm6 = P6.G | P5.G | P2.G | P1.G
+                psubsw mm7, mm2; mm7 = P8.G | P7.G | P4.G | P3.G
 
-				pinsrw mm1,WORD PTR [esi+edx*8+6],00000000b ; mm1 = 0 | 0 | 0 | ttl[nU1][3]
-				pinsrw mm2,WORD PTR [esi+ecx*8+6],00000000b ; mm2 = 0 | 0 | 0 | ttl[nU2][3]
+                pinsrw mm1, WORD PTR[esi + edx * 8 + 6], 00000000b; mm1 = 0 | 0 | 0 | ttl[nU1][3]
+                pinsrw mm2, WORD PTR[esi + ecx * 8 + 6], 00000000b; mm2 = 0 | 0 | 0 | ttl[nU2][3]
 
-				pshufw mm1,mm1,00000000b   ; mm1 = ttl[nU1][3] | ttl[nU1][3] | ttl[nU1][3] | ttl[nU1][3]
-				pshufw mm2,mm2,00000000b   ; mm2 = ttl[nU2][3] | ttl[nU2][3] | ttl[nU2][3] | ttl[nU2][3]
+                pshufw mm1, mm1, 00000000b; mm1 = ttl[nU1][3] | ttl[nU1][3] | ttl[nU1][3] | ttl[nU1][3]
+                pshufw mm2, mm2, 00000000b; mm2 = ttl[nU2][3] | ttl[nU2][3] | ttl[nU2][3] | ttl[nU2][3]
 
-				paddsw mm3,mm1      ; mm3 = P6.B | P5.B | P2.B | P1.B
-				paddsw mm0,mm2      ; mm0 = P8.B | P7.B | P4.B | P3.B
+                paddsw mm3, mm1; mm3 = P6.B | P5.B | P2.B | P1.B
+                paddsw mm0, mm2; mm0 = P8.B | P7.B | P4.B | P3.B
 
 
-				// we have
-				; mm4 = P6.R | P5.R | P2.R | P1.R
-				; mm6 = P6.G | P5.G | P2.G | P1.G
-				; mm3 = P6.B | P5.B | P2.B | P1.B
+                // we have
+                ; mm4 = P6.R | P5.R | P2.R | P1.R
+                ; mm6 = P6.G | P5.G | P2.G | P1.G
+                ; mm3 = P6.B | P5.B | P2.B | P1.B
 
-				; mm5 = P8.R | P7.R | P4.R | P3.R
-				; mm7 = P8.G | P7.G | P4.G | P3.G
-				; mm0 = P8.B | P7.B | P4.B | P3.B
+                ; mm5 = P8.R | P7.R | P4.R | P3.R
+                ; mm7 = P8.G | P7.G | P4.G | P3.G
+                ; mm0 = P8.B | P7.B | P4.B | P3.B
 
-				// saturation
-				packuswb mm4,mm5 ; mm4 = P8.R | P7.R | P4.R | P3.R | P6.R | P5.R | P2.R | P1.R
-				packuswb mm6,mm7 ; mm6 = P8.G | P7.G | P4.G | P3.G | P6.G | P5.G | P2.G | P1.G
-				packuswb mm3,mm0 ; mm3 = P8.B | P7.B | P4.B | P3.B | P6.B | P5.B | P2.B | P1.B
+                // saturation
+                packuswb mm4, mm5; mm4 = P8.R | P7.R | P4.R | P3.R | P6.R | P5.R | P2.R | P1.R
+                packuswb mm6, mm7; mm6 = P8.G | P7.G | P4.G | P3.G | P6.G | P5.G | P2.G | P1.G
+                packuswb mm3, mm0; mm3 = P8.B | P7.B | P4.B | P3.B | P6.B | P5.B | P2.B | P1.B
 
-				// calculating effective store address
-				mov  esi,DWORD PTR line1   ; esi = line1
-				mov  edi,DWORD PTR line2   ; edi = line2
+                // calculating effective store address
+                mov  esi, DWORD PTR line1; esi = line1
+                mov  edi, DWORD PTR line2; edi = line2
 
-				// we want
-				;px1 = 00 | P2.R | P2.G | P2.B | 00 | P1.R | P1.G | P1.B |
-				;px2 = 00 | P4.R | P4.G | P4.B | 00 | P3.R | P3.G | P3.B |
+                // we want
+                ; px1 = 00 | P2.R | P2.G | P2.B | 00 | P1.R | P1.G | P1.B |
+                ; px2 = 00 | P4.R | P4.G | P4.B | 00 | P3.R | P3.G | P3.B |
 
-				;px3 = 00 | P6.R | P6.G | P6.B | 00 | P5.R | P5.G | P5.B |
-				;px4 = 00 | P8.R | P8.G | P8.B | 00 | P7.R | P7.G | P7.B |
+                ; px3 = 00 | P6.R | P6.G | P6.B | 00 | P5.R | P5.G | P5.B |
+                ; px4 = 00 | P8.R | P8.G | P8.B | 00 | P7.R | P7.G | P7.B |
 
-				// Oh, real sex!
-				pcmpeqd mm0,mm0  ; mm0 = 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1
+                // Oh, real sex!
+                pcmpeqd mm0, mm0; mm0 = 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1
 
-				movq mm5,mm6  ; mm5 = P8.G | P7.G | P4.G | P3.G | P6.G | P5.G | P2.G | P1.G
-				movq mm7,mm3  ; mm7 = P8.B | P7.B | P4.B | P3.B | P6.B | P5.B | P2.B | P1.B
+                movq mm5, mm6; mm5 = P8.G | P7.G | P4.G | P3.G | P6.G | P5.G | P2.G | P1.G
+                movq mm7, mm3; mm7 = P8.B | P7.B | P4.B | P3.B | P6.B | P5.B | P2.B | P1.B
 
-				punpcklbw mm5,mm0 ; mm5 = 0 | P6.G | 0 | P5.G | 0 | P2.G | 0 | P1.G
-				punpcklbw mm7,mm4 ; mm7 = P6.R | P6.B | P5.R | P5.B | P2.R | P2.B | P1.R | P1.B
+                punpcklbw mm5, mm0; mm5 = 0 | P6.G | 0 | P5.G | 0 | P2.G | 0 | P1.G
+                punpcklbw mm7, mm4; mm7 = P6.R | P6.B | P5.R | P5.B | P2.R | P2.B | P1.R | P1.B
 
-				movq  mm1,mm7 ; mm1 = P6.R | P6.B | P5.R | P5.B | P2.R | P2.B | P1.R | P1.B
+                movq  mm1, mm7; mm1 = P6.R | P6.B | P5.R | P5.B | P2.R | P2.B | P1.R | P1.B
 
-				punpcklbw mm7,mm5 ; mm7 = 0 | P2.R | P2.G | P2.B | 0 | P1.R | P1.G | P1.B 
-				// px1
-				punpckhbw mm1,mm5 ; mm1 = 0 | P6.R | P6.G | P6.B | 0 | P5.R | P5.G | P5.B 
-				// px3
+                punpcklbw mm7, mm5; mm7 = 0 | P2.R | P2.G | P2.B | 0 | P1.R | P1.G | P1.B
+                // px1
+                punpckhbw mm1, mm5; mm1 = 0 | P6.R | P6.G | P6.B | 0 | P5.R | P5.G | P5.B
+                // px3
 
-				movq  mm2,mm6 ; mm2 = P8.G | P7.G | P4.G | P3.G | P6.G | P5.G | P2.G | P1.G
-				movq  mm5,mm3 ; mm5 = P8.B | P7.B | P4.B | P3.B | P6.B | P5.B | P2.B | P1.B
+                movq  mm2, mm6; mm2 = P8.G | P7.G | P4.G | P3.G | P6.G | P5.G | P2.G | P1.G
+                movq  mm5, mm3; mm5 = P8.B | P7.B | P4.B | P3.B | P6.B | P5.B | P2.B | P1.B
 
-				punpckhbw mm2,mm0 ; mm2 = 0 | P8.G | 0 | P7.G | 0 | P4.G | 0 | P3.G
-				punpckhbw mm5,mm4 ; mm5 = P8.R | P8.B | P7.R | P7.B | P4.R | P4.B | P3.R | P3.B
+                punpckhbw mm2, mm0; mm2 = 0 | P8.G | 0 | P7.G | 0 | P4.G | 0 | P3.G
+                punpckhbw mm5, mm4; mm5 = P8.R | P8.B | P7.R | P7.B | P4.R | P4.B | P3.R | P3.B
 
-				movq  mm0,mm5 ; mm0 = P8.R | P8.B | P7.R | P7.B | P4.R | P4.B | P3.R | P3.B
+                movq  mm0, mm5; mm0 = P8.R | P8.B | P7.R | P7.B | P4.R | P4.B | P3.R | P3.B
 
-				punpckhbw mm5,mm2 ; mm5 = 0 | P8.R | P8.G | P8.B | 0 | P7.R | P7.G | P7.B 
-				// px4
-				punpcklbw mm0,mm2 ; mm0 = 0 | P4.R | P4.G | P4.B | 0 | P3.R | P3.G | P3.B 
-				// px2
+                punpckhbw mm5, mm2; mm5 = 0 | P8.R | P8.G | P8.B | 0 | P7.R | P7.G | P7.B
+                // px4
+                punpcklbw mm0, mm2; mm0 = 0 | P4.R | P4.G | P4.B | 0 | P3.R | P3.G | P3.B
+                // px2
 
-				// storing using non-temporal hint
-				movntq  MMWORD PTR [esi+0],mm7 ;
-				movntq  MMWORD PTR [esi+8],mm0 ;
+                // storing using non-temporal hint
+                movntq  MMWORD PTR[esi+0], mm7;
+                movntq  MMWORD PTR[esi+8], mm0;
 
-				movntq  MMWORD PTR [edi+0],mm1 ;
-				movntq  MMWORD PTR [edi+8],mm5 ;
+                movntq  MMWORD PTR[edi+0], mm1;
+                movntq  MMWORD PTR[edi+8], mm5;
 
-				// we are the champions
-				pop  ebx       ;
-			}
+                // we are the champions
+                pop  ebx;
+            }
 
-			line1 += 16;
-			line2 += 16;
-		}
+            line1 += 16;
+            line2 += 16;
+        }
 
-		y1 += 2 * y_stride;
-		y2 = y1 + y_stride;
+        y1 += 2 * y_stride;
+        y2 = y1 + y_stride;
 
-		u += uv_stride;
-		v += uv_stride;
+        u += uv_stride;
+        v += uv_stride;
 
-		line1 += 4 * argb_width;
-		line2 = line1 + 4 * argb_width;
-	}
+        line1 += 4*argb_width;
+        line2 = line1+4*argb_width;
+    }
 
-	__asm{
-		sfence        ;
-		emms        ;
-	}
+    __asm
+    {
+        sfence;
+        emms;
+    }
 
-	return argb_plane;
+    return argb_plane;
 } // tv_yuv2argb
 
-#pragma warning( default : 4731 )
+#pragma warning(default:4731)
\ No newline at end of file
diff --git a/src/xrEngine/xrTheora_Surface_mmx.h b/src/xrEngine/xrTheora_Surface_mmx.h
index c609726a317..ba087e93844 100644
--- a/src/xrEngine/xrTheora_Surface_mmx.h
+++ b/src/xrEngine/xrTheora_Surface_mmx.h
@@ -1,13 +1,13 @@
 #pragma once
 
-typedef unsigned char  tv_uchar, * lp_tv_uchar ;
-typedef signed char   tv_schar, * lp_tv_schar ;
-typedef unsigned short int tv_ushort, * lp_tv_ushort ;
-typedef signed short int tv_sshort, * lp_tv_sshort ;
-typedef unsigned long int tv_ulong, * lp_tv_ulong ;
-typedef signed long int  tv_slong, * lp_tv_slong ;
+typedef unsigned char tv_uchar, *lp_tv_uchar;
+typedef signed char tv_schar, *lp_tv_schar;
+typedef unsigned short int tv_ushort, *lp_tv_ushort;
+typedef signed short int tv_sshort, *lp_tv_sshort;
+typedef unsigned long int tv_ulong, *lp_tv_ulong;
+typedef signed long int tv_slong, *lp_tv_slong;
 
-lp_tv_uchar tv_yuv2argb(lp_tv_uchar argb_plane, tv_slong argb_width, tv_slong argb_height, 
-						lp_tv_uchar y_plane, tv_slong y_width, tv_slong y_height, tv_slong y_stride,
-						lp_tv_uchar u_plane, lp_tv_uchar v_plane,
-						tv_slong uv_width, tv_slong uv_height, tv_slong uv_stride, tv_slong width_diff );
+lp_tv_uchar tv_yuv2argb(lp_tv_uchar argb_plane, tv_slong argb_width, tv_slong argb_height,
+    lp_tv_uchar y_plane, tv_slong y_width, tv_slong y_height, tv_slong y_stride,
+    lp_tv_uchar u_plane, lp_tv_uchar v_plane,
+    tv_slong uv_width, tv_slong uv_height, tv_slong uv_stride, tv_slong width_diff);
diff --git a/src/xrEngine/xrXRC.h b/src/xrEngine/xrXRC.h
index 84ab889a0a9..31f070db5bd 100644
--- a/src/xrEngine/xrXRC.h
+++ b/src/xrEngine/xrXRC.h
@@ -8,64 +8,64 @@
 
 #include "../xrCDB/xrCDB.h"
 
-class ENGINE_API xrXRC  
+class ENGINE_API xrXRC
 {
-	CDB::COLLIDER	CL;
+    CDB::COLLIDER CL;
 public:
-	IC void			ray_options		(u32 f)		
-	{ 
-		CL.ray_options(f); 
-	}
-	IC void			ray_query		(const CDB::MODEL *m_def, const Fvector& r_start,  const Fvector& r_dir, float r_range = 10000.f)
-	{
+    IC void ray_options(u32 f)
+    {
+        CL.ray_options(f);
+    }
+    IC void ray_query(const CDB::MODEL* m_def, const Fvector& r_start, const Fvector& r_dir, float r_range = 10000.f)
+    {
 #ifdef DEBUG
-		Device.Statistic->clRAY.Begin();
+        Device.Statistic->clRAY.Begin();
 #endif
-		CL.ray_query(m_def,r_start,r_dir,r_range);
+        CL.ray_query(m_def, r_start, r_dir, r_range);
 #ifdef DEBUG
-		Device.Statistic->clRAY.End	();
+        Device.Statistic->clRAY.End();
 #endif
-	}
-	
-	IC void			box_options		(u32 f)	
-	{	
-		CL.box_options(f);
-	}
-	IC void			box_query		(const CDB::MODEL *m_def, const Fvector& b_center, const Fvector& b_dim)
-	{
+    }
+
+    IC void box_options(u32 f)
+    {
+        CL.box_options(f);
+    }
+    IC void box_query(const CDB::MODEL* m_def, const Fvector& b_center, const Fvector& b_dim)
+    {
 #ifdef DEBUG
-		Device.Statistic->clBOX.Begin();
+        Device.Statistic->clBOX.Begin();
 #endif
-		CL.box_query(m_def,b_center,b_dim);
+        CL.box_query(m_def, b_center, b_dim);
 #ifdef DEBUG
-		Device.Statistic->clBOX.End	();
+        Device.Statistic->clBOX.End();
 #endif
-	}
-	
-	IC void			frustum_options	(u32 f)
-	{
-		CL.frustum_options(f);
-	}
-	IC void			frustum_query	(const CDB::MODEL *m_def, const CFrustum& F)
-	{
+    }
+
+    IC void frustum_options(u32 f)
+    {
+        CL.frustum_options(f);
+    }
+    IC void frustum_query(const CDB::MODEL* m_def, const CFrustum& F)
+    {
 #ifdef DEBUG
-		Device.Statistic->clFRUSTUM.Begin();
+        Device.Statistic->clFRUSTUM.Begin();
 #endif
-		CL.frustum_query(m_def,F);
+        CL.frustum_query(m_def, F);
 #ifdef DEBUG
-		Device.Statistic->clFRUSTUM.End	();
+        Device.Statistic->clFRUSTUM.End();
 #endif
-	}
-	
-	IC CDB::RESULT*	r_begin			()	{	return CL.r_begin();		};
-	IC CDB::RESULT*	r_end			()	{	return CL.r_end();			};
-	IC void			r_free			()	{	CL.r_free();				}
-	IC int			r_count			()	{	return CL.r_count();		};
-	IC void			r_clear			()	{	CL.r_clear();				};
-	IC void			r_clear_compact	()	{	CL.r_clear_compact();		};
-	
-	xrXRC();
-	~xrXRC();
+    }
+
+    IC CDB::RESULT* r_begin() { return CL.r_begin(); };
+    IC CDB::RESULT* r_end() { return CL.r_end(); };
+    IC void r_free() { CL.r_free(); }
+    IC int r_count() { return CL.r_count(); };
+    IC void r_clear() { CL.r_clear(); };
+    IC void r_clear_compact() { CL.r_clear_compact(); };
+
+    xrXRC();
+    ~xrXRC();
 };
 ENGINE_API extern xrXRC XRC;
 
diff --git a/src/xrEngine/xr_area.cpp b/src/xrEngine/xr_area.cpp
index b7a38f4b0bd..0f2bded67dc 100644
--- a/src/xrEngine/xr_area.cpp
+++ b/src/xrEngine/xr_area.cpp
@@ -8,237 +8,247 @@
 #include "x_ray.h"
 #include "GameFont.h"
 
-using namespace	collide;
+using namespace collide;
 
-extern	BOOL g_bLoaded;
+extern BOOL g_bLoaded;
 
-void	IGame_Level::SoundEvent_Register	( ref_sound_data_ptr S, float range )
+void IGame_Level::SoundEvent_Register(ref_sound_data_ptr S, float range)
 {
-	if (!g_bLoaded)									return;
-	if (!S)											return;
-	if (S->g_object && S->g_object->getDestroy())	{S->g_object=0; return;}
-	if (0==S->feedback)								return;
-
-	clamp					(range,0.1f,500.f);
-
-	const CSound_params* p	= S->feedback->get_params();
-	Fvector snd_position	= p->position;
-	if(S->feedback->is_2D()){
-		snd_position.add	(Sound->listener_position());
-	}
-
-	VERIFY					(p && _valid(range) );
-	range					= _min(range,p->max_ai_distance);
-	VERIFY					(_valid(snd_position));
-	VERIFY					(_valid(p->max_ai_distance));
-	VERIFY					(_valid(p->volume));
-
-	// Query objects
-	Fvector					bb_size	=	{range,range,range};
-	g_SpatialSpace->q_box	(snd_ER,0,STYPE_REACTTOSOUND,snd_position,bb_size);
-
-	// Iterate
-	xr_vector<ISpatial*>::iterator	it	= snd_ER.begin	();
-	xr_vector<ISpatial*>::iterator	end	= snd_ER.end	();
-	for (; it!=end; it++)	{
-		Feel::Sound* L		= (*it)->dcast_FeelSound	();
-		if (0==L)			continue;
-		CObject* CO = (*it)->dcast_CObject();	VERIFY(CO);
-		if (CO->getDestroy()) continue;
-
-		// Energy and signal
-		VERIFY				(_valid((*it)->spatial.sphere.P));
-		float dist			= snd_position.distance_to((*it)->spatial.sphere.P);
-		if (dist>p->max_ai_distance) continue;
-		VERIFY				(_valid(dist));
-		VERIFY2				(!fis_zero(p->max_ai_distance), S->handle->file_name());
-		float Power			= (1.f-dist/p->max_ai_distance)*p->volume;
-		VERIFY				(_valid(Power));
-		if (Power>EPS_S)	{
-			float occ		= Sound->get_occlusion_to((*it)->spatial.sphere.P,snd_position);
-			VERIFY			(_valid(occ))	;
-			Power			*= occ;
-			if (Power>EPS_S)	{
-				_esound_delegate	D	=	{ L, S, Power };
-				snd_Events.push_back	(D)	;
-			}
-		}
-	}
-	snd_ER.clear_not_free	();
+    if (!g_bLoaded) return;
+    if (!S) return;
+    if (S->g_object && S->g_object->getDestroy()) { S->g_object = 0; return; }
+    if (0 == S->feedback) return;
+
+    clamp(range, 0.1f, 500.f);
+
+    const CSound_params* p = S->feedback->get_params();
+    Fvector snd_position = p->position;
+    if (S->feedback->is_2D())
+    {
+        snd_position.add(Sound->listener_position());
+    }
+
+    VERIFY(p && _valid(range));
+    range = _min(range, p->max_ai_distance);
+    VERIFY(_valid(snd_position));
+    VERIFY(_valid(p->max_ai_distance));
+    VERIFY(_valid(p->volume));
+
+    // Query objects
+    Fvector bb_size = {range, range, range};
+    g_SpatialSpace->q_box(snd_ER, 0, STYPE_REACTTOSOUND, snd_position, bb_size);
+
+    // Iterate
+    xr_vector<ISpatial*>::iterator it = snd_ER.begin();
+    xr_vector<ISpatial*>::iterator end = snd_ER.end();
+    for (; it != end; it++)
+    {
+        Feel::Sound* L = (*it)->dcast_FeelSound();
+        if (0 == L) continue;
+        CObject* CO = (*it)->dcast_CObject();
+        VERIFY(CO);
+        if (CO->getDestroy()) continue;
+
+        // Energy and signal
+        VERIFY(_valid((*it)->spatial.sphere.P));
+        float dist = snd_position.distance_to((*it)->spatial.sphere.P);
+        if (dist > p->max_ai_distance) continue;
+        VERIFY(_valid(dist));
+        VERIFY2(!fis_zero(p->max_ai_distance), S->handle->file_name());
+        float Power = (1.f - dist / p->max_ai_distance)*p->volume;
+        VERIFY(_valid(Power));
+        if (Power > EPS_S)
+        {
+            float occ = Sound->get_occlusion_to((*it)->spatial.sphere.P, snd_position);
+            VERIFY(_valid(occ));
+            Power *= occ;
+            if (Power > EPS_S)
+            {
+                _esound_delegate D = {L, S, Power};
+                snd_Events.push_back(D);
+            }
+        }
+    }
+    snd_ER.clear_not_free();
 }
 
-void	IGame_Level::SoundEvent_Dispatch	( )
+void IGame_Level::SoundEvent_Dispatch()
 {
-	while	(!snd_Events.empty())	{
-		_esound_delegate&	D	= snd_Events.back	();
-		VERIFY				(D.dest && D.source);
-		if (D.source->feedback)	{
-			D.dest->feel_sound_new	(
-				D.source->g_object,
-				D.source->g_type,
-				D.source->g_userdata,
-				D.source->feedback->get_params()->position,
-				D.power
-				);
-		}
-		snd_Events.pop_back		();
-	}
+    while (!snd_Events.empty())
+    {
+        _esound_delegate& D = snd_Events.back();
+        VERIFY(D.dest && D.source);
+        if (D.source->feedback)
+        {
+            D.dest->feel_sound_new(
+                D.source->g_object,
+                D.source->g_type,
+                D.source->g_userdata,
+                D.source->feedback->get_params()->position,
+                D.power
+            );
+        }
+        snd_Events.pop_back();
+    }
 }
 
 // Lain: added
-void   IGame_Level::SoundEvent_OnDestDestroy (Feel::Sound* obj)
+void IGame_Level::SoundEvent_OnDestDestroy(Feel::Sound* obj)
 {
-	struct rem_pred
-	{
-		rem_pred(Feel::Sound* obj) : m_obj(obj) {}
+    struct rem_pred
+    {
+        rem_pred(Feel::Sound* obj) : m_obj(obj) {}
 
-		bool operator () (const _esound_delegate& d)
-		{
-			return d.dest == m_obj;
-		}
+        bool operator () (const _esound_delegate& d)
+        {
+            return d.dest == m_obj;
+        }
 
-	private:
-		Feel::Sound* m_obj;
-	};
+    private:
+        Feel::Sound* m_obj;
+    };
 
-	snd_Events.erase( std::remove_if(snd_Events.begin(), snd_Events.end(), rem_pred(obj)),
-	                  snd_Events.end() );
+    snd_Events.erase(std::remove_if(snd_Events.begin(), snd_Events.end(), rem_pred(obj)),
+                     snd_Events.end());
 }
 
-void __stdcall _sound_event		(ref_sound_data_ptr S, float range)
+void __stdcall _sound_event(ref_sound_data_ptr S, float range)
 {
-	if ( g_pGameLevel && S && S->feedback )	g_pGameLevel->SoundEvent_Register	(S,range);
+    if (g_pGameLevel && S && S->feedback) g_pGameLevel->SoundEvent_Register(S, range);
 }
 
 //----------------------------------------------------------------------
-// Class	: CObjectSpace
-// Purpose	: stores space slots
+// Class : CObjectSpace
+// Purpose : stores space slots
 //----------------------------------------------------------------------
-CObjectSpace::CObjectSpace	( )
+CObjectSpace::CObjectSpace()
 #ifdef PROFILE_CRITICAL_SECTIONS
-	:Lock(MUTEX_PROFILE_ID(CObjectSpace::Lock))
+    :Lock(MUTEX_PROFILE_ID(CObjectSpace::Lock))
 #endif // PROFILE_CRITICAL_SECTIONS
 {
 #ifdef DEBUG
-	//sh_debug.create				("debug\\wireframe","$null");
+    //sh_debug.create ("debug\\wireframe","$null");
 #endif
-	m_BoundingVolume.invalidate	();
+    m_BoundingVolume.invalidate();
 }
 //----------------------------------------------------------------------
-CObjectSpace::~CObjectSpace	( )
+CObjectSpace::~CObjectSpace()
 {
-	Sound->set_geometry_occ		(NULL);
-	Sound->set_handler			(NULL);
+    Sound->set_geometry_occ(NULL);
+    Sound->set_handler(NULL);
 #ifdef DEBUG
-	//sh_debug.destroy			();
+    //sh_debug.destroy ();
 #endif
 }
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
-int CObjectSpace::GetNearest		( xr_vector<ISpatial*>& q_spatial, xr_vector<CObject*>&	q_nearest, const Fvector &point, float range, CObject* ignore_object )
+int CObjectSpace::GetNearest(xr_vector<ISpatial*>& q_spatial, xr_vector<CObject*>& q_nearest, const Fvector& point, float range, CObject* ignore_object)
 {
-	q_spatial.clear_not_free		( );
-	// Query objects
-	q_nearest.clear_not_free		( );
-	Fsphere				Q;	Q.set	(point,range);
-	Fvector				B;	B.set	(range,range,range);
-	g_SpatialSpace->q_box(q_spatial,0,STYPE_COLLIDEABLE,point,B);
-
-	// Iterate
-	xr_vector<ISpatial*>::iterator	it	= q_spatial.begin	();
-	xr_vector<ISpatial*>::iterator	end	= q_spatial.end		();
-	for (; it!=end; it++)		{
-		CObject* O				= (*it)->dcast_CObject		();
-		if (0==O)				continue;
-		if (O==ignore_object)	continue;
-		Fsphere mS				= { O->spatial.sphere.P, O->spatial.sphere.R	};
-		if (Q.intersect(mS))	q_nearest.push_back(O);
-	}
-
-	return q_nearest.size();
+    q_spatial.clear_not_free();
+    // Query objects
+    q_nearest.clear_not_free();
+    Fsphere Q;
+    Q.set(point, range);
+    Fvector B;
+    B.set(range, range, range);
+    g_SpatialSpace->q_box(q_spatial, 0, STYPE_COLLIDEABLE, point, B);
+
+    // Iterate
+    xr_vector<ISpatial*>::iterator it = q_spatial.begin();
+    xr_vector<ISpatial*>::iterator end = q_spatial.end();
+    for (; it != end; it++)
+    {
+        CObject* O = (*it)->dcast_CObject();
+        if (0 == O) continue;
+        if (O == ignore_object) continue;
+        Fsphere mS = {O->spatial.sphere.P, O->spatial.sphere.R};
+        if (Q.intersect(mS)) q_nearest.push_back(O);
+    }
+
+    return q_nearest.size();
 }
 
 //----------------------------------------------------------------------
-IC int	CObjectSpace::GetNearest	( xr_vector<CObject*>&	q_nearest, const Fvector &point, float range, CObject* ignore_object )
+IC int CObjectSpace::GetNearest(xr_vector<CObject*>& q_nearest, const Fvector& point, float range, CObject* ignore_object)
 {
-	return							(
-		GetNearest(
-			r_spatial,
-			q_nearest,
-			point,
-			range,
-			ignore_object
-		)
-	);
+    return (
+               GetNearest(
+                   r_spatial,
+                   q_nearest,
+                   point,
+                   range,
+                   ignore_object
+               )
+           );
 }
 
 //----------------------------------------------------------------------
-IC int   CObjectSpace::GetNearest( xr_vector<CObject*>&	q_nearest, ICollisionForm* obj, float range)
+IC int CObjectSpace::GetNearest(xr_vector<CObject*>& q_nearest, ICollisionForm* obj, float range)
 {
-	CObject*	O		= obj->Owner	();
-	return				GetNearest( q_nearest, O->spatial.sphere.P, range + O->spatial.sphere.R, O );
+    CObject* O = obj->Owner();
+    return GetNearest(q_nearest, O->spatial.sphere.P, range + O->spatial.sphere.R, O);
 }
 
 //----------------------------------------------------------------------
-static void __stdcall	build_callback	(Fvector* V, int Vcnt, CDB::TRI* T, int Tcnt, void* params)
+static void __stdcall build_callback(Fvector* V, int Vcnt, CDB::TRI* T, int Tcnt, void* params)
 {
-	g_pGameLevel->Load_GameSpecific_CFORM( T, Tcnt );
+    g_pGameLevel->Load_GameSpecific_CFORM(T, Tcnt);
 }
-void CObjectSpace::Load	()
+void CObjectSpace::Load()
 {
-	IReader *F					= FS.r_open	("$level$", "level.cform");
-	R_ASSERT					(F);
-
-	hdrCFORM					H;
-	F->r						(&H,sizeof(hdrCFORM));
-	Fvector*	verts			= (Fvector*)F->pointer();
-	CDB::TRI*	tris			= (CDB::TRI*)(verts+H.vertcount);
-	R_ASSERT					(CFORM_CURRENT_VERSION==H.version);
-	Static.build				( verts, H.vertcount, tris, H.facecount, build_callback );
-
-	m_BoundingVolume.set				(H.aabb);
-	g_SpatialSpace->initialize			(H.aabb);
-	g_SpatialSpacePhysic->initialize	(H.aabb);
-	Sound->set_geometry_occ				( &Static );
-	Sound->set_handler					( _sound_event );
-
-	FS.r_close					(F);
+    IReader* F = FS.r_open("$level$", "level.cform");
+    R_ASSERT(F);
+
+    hdrCFORM H;
+    F->r(&H, sizeof(hdrCFORM));
+    Fvector* verts = (Fvector*)F->pointer();
+    CDB::TRI* tris = (CDB::TRI*)(verts + H.vertcount);
+    R_ASSERT(CFORM_CURRENT_VERSION == H.version);
+    Static.build(verts, H.vertcount, tris, H.facecount, build_callback);
+
+    m_BoundingVolume.set(H.aabb);
+    g_SpatialSpace->initialize(H.aabb);
+    g_SpatialSpacePhysic->initialize(H.aabb);
+    Sound->set_geometry_occ(&Static);
+    Sound->set_handler(_sound_event);
+
+    FS.r_close(F);
 }
 //----------------------------------------------------------------------
 #ifdef DEBUG
 void CObjectSpace::dbgRender()
 {
-	m_pRender->dbgRender();
+    m_pRender->dbgRender();
 }
 /*
 void CObjectSpace::dbgRender()
 {
-	R_ASSERT(bDebug);
-
-	RCache.set_Shader(sh_debug);
-	for (u32 i=0; i<q_debug.boxes.size(); i++)
-	{
-		Fobb&		obb		= q_debug.boxes[i];
-		Fmatrix		X,S,R;
-		obb.xform_get(X);
-		RCache.dbg_DrawOBB(X,obb.m_halfsize,D3DCOLOR_XRGB(255,0,0));
-		S.scale		(obb.m_halfsize);
-		R.mul		(X,S);
-		RCache.dbg_DrawEllipse(R,D3DCOLOR_XRGB(0,0,255));
-	}
-	q_debug.boxes.clear();
-
-	for (i=0; i<dbg_S.size(); i++)
-	{
-		std::pair<Fsphere,u32>& P = dbg_S[i];
-		Fsphere&	S = P.first;
-		Fmatrix		M;
-		M.scale		(S.R,S.R,S.R);
-		M.translate_over(S.P);
-		RCache.dbg_DrawEllipse(M,P.second);
-	}
-	dbg_S.clear();
+R_ASSERT(bDebug);
+
+RCache.set_Shader(sh_debug);
+for (u32 i=0; i<q_debug.boxes.size(); i++)
+{
+Fobb& obb = q_debug.boxes[i];
+Fmatrix X,S,R;
+obb.xform_get(X);
+RCache.dbg_DrawOBB(X,obb.m_halfsize,D3DCOLOR_XRGB(255,0,0));
+S.scale (obb.m_halfsize);
+R.mul (X,S);
+RCache.dbg_DrawEllipse(R,D3DCOLOR_XRGB(0,0,255));
+}
+q_debug.boxes.clear();
+
+for (i=0; i<dbg_S.size(); i++)
+{
+std::pair<Fsphere,u32>& P = dbg_S[i];
+Fsphere& S = P.first;
+Fmatrix M;
+M.scale (S.R,S.R,S.R);
+M.translate_over(S.P);
+RCache.dbg_DrawEllipse(M,P.second);
+}
+dbg_S.clear();
 }
 */
 #endif
diff --git a/src/xrEngine/xr_area.h b/src/xrEngine/xr_area.h
index 6e6beb9fc92..708cd56153c 100644
--- a/src/xrEngine/xr_area.h
+++ b/src/xrEngine/xr_area.h
@@ -5,9 +5,9 @@
 #include "xr_collide_defs.h"
 
 // refs
-class ENGINE_API	ISpatial;
-class ENGINE_API	ICollisionForm;
-class ENGINE_API	CObject;
+class ENGINE_API ISpatial;
+class ENGINE_API ICollisionForm;
+class ENGINE_API CObject;
 
 #include "../Include/xrRender/FactoryPtr.h"
 #include "../Include/xrRender/ObjectSpaceRender.h"
@@ -16,62 +16,62 @@ class ENGINE_API	CObject;
 //-----------------------------------------------------------------------------------------------------------
 //Space Area
 //-----------------------------------------------------------------------------------------------------------
-class	ENGINE_API						CObjectSpace
+class ENGINE_API CObjectSpace
 {
 private:
-	// Debug
-	xrCriticalSection					Lock;
-	CDB::MODEL							Static;
-	Fbox								m_BoundingVolume;
-	xrXRC								xrc;				// MT: dangerous
-	collide::rq_results					r_temp;				// MT: dangerous
-	xr_vector<ISpatial*>				r_spatial;			// MT: dangerous
+    // Debug
+    xrCriticalSection Lock;
+    CDB::MODEL Static;
+    Fbox m_BoundingVolume;
+    xrXRC xrc; // MT: dangerous
+    collide::rq_results r_temp; // MT: dangerous
+    xr_vector<ISpatial*> r_spatial; // MT: dangerous
 public:
 
 #ifdef DEBUG
-	FactoryPtr<IObjectSpaceRender>		m_pRender;
-	//ref_shader							sh_debug;
-	//clQueryCollision					q_debug;			// MT: dangerous
-	//xr_vector<std::pair<Fsphere,u32> >	dbg_S;				// MT: dangerous
+    FactoryPtr<IObjectSpaceRender> m_pRender;
+    //ref_shader sh_debug;
+    //clQueryCollision q_debug; // MT: dangerous
+    //xr_vector<std::pair<Fsphere,u32> > dbg_S; // MT: dangerous
 #endif
 
 private:
-	BOOL								_RayTest			( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object);
-	BOOL								_RayPick			( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::rq_result& R, CObject* ignore_object );
-	BOOL								_RayQuery			( collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
-	BOOL								_RayQuery2			( collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
-	BOOL								_RayQuery3			( collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
+    BOOL _RayTest(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object);
+    BOOL _RayPick(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, collide::rq_result& R, CObject* ignore_object);
+    BOOL _RayQuery(collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
+    BOOL _RayQuery2(collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
+    BOOL _RayQuery3(collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
 public:
-										CObjectSpace		( );
-										~CObjectSpace		( );
+    CObjectSpace();
+    ~CObjectSpace();
 
-	void								Load				( );
+    void Load();
 
-	// Occluded/No
-	BOOL								RayTest				( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object);
+    // Occluded/No
+    BOOL RayTest(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object);
 
-	// Game raypick (nearest) - returns object and addititional params
-	BOOL								RayPick				( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::rq_result& R, CObject* ignore_object );
+    // Game raypick (nearest) - returns object and addititional params
+    BOOL RayPick(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, collide::rq_result& R, CObject* ignore_object);
 
-	// General collision query
-	BOOL								RayQuery			( collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
-	BOOL								RayQuery			( collide::rq_results& dest, ICollisionForm* target, const collide::ray_defs& rq);
-	// void								BoxQuery			( collide::rq_results& dest, const Fbox& B, const Fmatrix& M, u32 flags=clGET_TRIS|clGET_BOXES|clQUERY_STATIC|clQUERY_DYNAMIC);
+    // General collision query
+    BOOL RayQuery(collide::rq_results& dest, const collide::ray_defs& rq, collide::rq_callback* cb, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object);
+    BOOL RayQuery(collide::rq_results& dest, ICollisionForm* target, const collide::ray_defs& rq);
+    // void BoxQuery ( collide::rq_results& dest, const Fbox& B, const Fmatrix& M, u32 flags=clGET_TRIS|clGET_BOXES|clQUERY_STATIC|clQUERY_DYNAMIC);
 
-	int									GetNearest			( xr_vector<CObject*>&	q_nearest, ICollisionForm *obj, float range );
-	int									GetNearest			( xr_vector<CObject*>&	q_nearest, const Fvector &point, float range, CObject* ignore_object );
-	int									GetNearest			( xr_vector<ISpatial*>& q_spatial, xr_vector<CObject*>&	q_nearest, const Fvector &point, float range, CObject* ignore_object );
+    int GetNearest(xr_vector<CObject*>& q_nearest, ICollisionForm* obj, float range);
+    int GetNearest(xr_vector<CObject*>& q_nearest, const Fvector& point, float range, CObject* ignore_object);
+    int GetNearest(xr_vector<ISpatial*>& q_spatial, xr_vector<CObject*>& q_nearest, const Fvector& point, float range, CObject* ignore_object);
 
-	CDB::TRI*							GetStaticTris		() { return Static.get_tris();	}
-	Fvector*							GetStaticVerts		() { return Static.get_verts(); }
-	CDB::MODEL*							GetStaticModel		() { return &Static;			}
+    CDB::TRI* GetStaticTris() { return Static.get_tris(); }
+    Fvector* GetStaticVerts() { return Static.get_verts(); }
+    CDB::MODEL* GetStaticModel() { return &Static; }
 
-	const Fbox&							GetBoundingVolume	() { return m_BoundingVolume;}
+    const Fbox& GetBoundingVolume() { return m_BoundingVolume; }
 
-	// Debugging
+    // Debugging
 #ifdef DEBUG
-	void								dbgRender			();
-	//ref_shader							dbgGetShader		()	{ return sh_debug;	}
+    void dbgRender();
+    //ref_shader dbgGetShader () { return sh_debug; }
 #endif
 };
 
diff --git a/src/xrEngine/xr_area_query.cpp b/src/xrEngine/xr_area_query.cpp
index 72af524cf8e..a95d50ae694 100644
--- a/src/xrEngine/xr_area_query.cpp
+++ b/src/xrEngine/xr_area_query.cpp
@@ -2,49 +2,49 @@
 #include "xr_area.h"
 #include "xr_object.h"
 
-using namespace	collide;
+using namespace collide;
 
 /*
-const u32	clStatic		= clQUERY_STATIC+clGET_TRIS;
+const u32 clStatic = clQUERY_STATIC+clGET_TRIS;
 
-void CObjectSpace::BoxQuery	(collide::rq_results& r_dest, const Fbox& B, const Fmatrix& M, u32 flags)
+void CObjectSpace::BoxQuery (collide::rq_results& r_dest, const Fbox& B, const Fmatrix& M, u32 flags)
 {
-	Fvector		bc,bd;
-	Fbox		xf; 
-	xf.xform	(B,M);
-	xf.get_CD	(bc,bd);
+Fvector bc,bd;
+Fbox xf;
+xf.xform (B,M);
+xf.get_CD (bc,bd);
 
-	q_result.Clear	();
-	xrc.box_options	(
-		(flags&clCOARSE?0:CDB::OPT_FULL_TEST)|
-		(flags&clQUERY_ONLYFIRST?CDB::OPT_ONLYFIRST:0)
-		);
+q_result.Clear ();
+xrc.box_options (
+(flags&clCOARSE?0:CDB::OPT_FULL_TEST)|
+(flags&clQUERY_ONLYFIRST?CDB::OPT_ONLYFIRST:0)
+);
 
-	if ((flags&clStatic) == clStatic)
-	{
-		xrc.box_query	(&Static, bc, bd);
-		if (xrc.r_count())
-		{
-			CDB::RESULT* it	=xrc.r_begin();
-			CDB::RESULT* end=xrc.r_end	();
-			for (; it!=end; it++)
-				q_result.AddTri(&Static.get_tris() [it->id],Static.get_verts());
-		}
-	};
+if ((flags&clStatic) == clStatic)
+{
+xrc.box_query (&Static, bc, bd);
+if (xrc.r_count())
+{
+CDB::RESULT* it =xrc.r_begin();
+CDB::RESULT* end=xrc.r_end ();
+for (; it!=end; it++)
+q_result.AddTri(&Static.get_tris() [it->id],Static.get_verts());
+}
+};
 
-	if (flags&clQUERY_DYNAMIC)
-	{
-		// Traverse object database
-		g_SpatialSpace->q_box	(r_spatial,0,STYPE_COLLIDEABLE,bc,bd);
+if (flags&clQUERY_DYNAMIC)
+{
+// Traverse object database
+g_SpatialSpace->q_box (r_spatial,0,STYPE_COLLIDEABLE,bc,bd);
 
-		// Determine visibility for dynamic part of scene
-		for (u32 o_it=0; o_it<r_spatial.size(); o_it++)
-		{
-			ISpatial*	spatial						= r_spatial[o_it];
-			CObject*	collidable					= spatial->dcast_CObject	();
-			if			(0==collidable)				continue;
-			collidable->collidable.model->_BoxQuery	(B,M,flags);
-		}
-	};
+// Determine visibility for dynamic part of scene
+for (u32 o_it=0; o_it<r_spatial.size(); o_it++)
+{
+ISpatial* spatial = r_spatial[o_it];
+CObject* collidable = spatial->dcast_CObject ();
+if (0==collidable) continue;
+collidable->collidable.model->_BoxQuery (B,M,flags);
+}
+};
 }
 */
diff --git a/src/xrEngine/xr_area_raypick.cpp b/src/xrEngine/xr_area_raypick.cpp
index 3ccc7fe4ec0..5d69b824aee 100644
--- a/src/xrEngine/xr_area_raypick.cpp
+++ b/src/xrEngine/xr_area_raypick.cpp
@@ -8,396 +8,458 @@
 #include "x_ray.h"
 #include "GameFont.h"
 
-using namespace	collide;
+using namespace collide;
 
 //--------------------------------------------------------------------------------
 // RayTest - Occluded/No
 //--------------------------------------------------------------------------------
-BOOL CObjectSpace::RayTest	( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object)
+BOOL CObjectSpace::RayTest(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object)
 {
-	Lock.Enter		();
-	BOOL	_ret	= _RayTest(start,dir,range,tgt,cache,ignore_object);
-	r_spatial.clear	();
-	Lock.Leave		();
-	return			_ret;
+    Lock.Enter();
+    BOOL _ret = _RayTest(start, dir, range, tgt, cache, ignore_object);
+    r_spatial.clear();
+    Lock.Leave();
+    return _ret;
 }
-BOOL CObjectSpace::_RayTest	( const Fvector &start, const Fvector &dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object)
+BOOL CObjectSpace::_RayTest(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, collide::ray_cache* cache, CObject* ignore_object)
 {
-	VERIFY					(_abs(dir.magnitude()-1)<EPS);
-	r_temp.r_clear			();
+    VERIFY(_abs(dir.magnitude() - 1) < EPS);
+    r_temp.r_clear();
 
-	xrc.ray_options			(CDB::OPT_ONLYFIRST);
-	collide::ray_defs	Q	(start,dir,range,CDB::OPT_ONLYFIRST,tgt);
+    xrc.ray_options(CDB::OPT_ONLYFIRST);
+    collide::ray_defs Q(start, dir, range, CDB::OPT_ONLYFIRST, tgt);
 
-	// dynamic test
-	if (tgt&rqtDyn){
-		u32			d_flags =	STYPE_COLLIDEABLE|((tgt&rqtObstacle)?STYPE_OBSTACLE:0)|((tgt&rqtShape)?STYPE_SHAPE:0);
-		// traverse object database
-		g_SpatialSpace->q_ray	(r_spatial,0,d_flags,start,dir,range);
-		// Determine visibility for dynamic part of scene
-		for (u32 o_it=0; o_it<r_spatial.size(); o_it++)
-		{
-			ISpatial*	spatial			= r_spatial[o_it];
-			CObject*	collidable		= spatial->dcast_CObject	();
-			if (collidable && (collidable!=ignore_object))	{
-				ECollisionFormType tp	= collidable->collidable.model->Type();
-				if ((tgt&(rqtObject|rqtObstacle))&&(tp==cftObject)&&collidable->collidable.model->_RayQuery(Q,r_temp))	return TRUE;
-				if ((tgt&rqtShape)&&(tp==cftShape)&&collidable->collidable.model->_RayQuery(Q,r_temp))		return TRUE;
-			}
-		}
-	}
-	// static test
-	if (tgt&rqtStatic){
-		// If we get here - test static model
-		if (cache) 
-		{
-			// 0. similar query???
-			if (cache->similar(start,dir,range))	{
-				return cache->result;
-			}
+    // dynamic test
+    if (tgt&rqtDyn)
+    {
+        u32 d_flags = STYPE_COLLIDEABLE | ((tgt&rqtObstacle) ? STYPE_OBSTACLE : 0) | ((tgt&rqtShape) ? STYPE_SHAPE : 0);
+        // traverse object database
+        g_SpatialSpace->q_ray(r_spatial, 0, d_flags, start, dir, range);
+        // Determine visibility for dynamic part of scene
+        for (u32 o_it = 0; o_it < r_spatial.size(); o_it++)
+        {
+            ISpatial* spatial = r_spatial[o_it];
+            CObject* collidable = spatial->dcast_CObject();
+            if (collidable && (collidable != ignore_object))
+            {
+                ECollisionFormType tp = collidable->collidable.model->Type();
+                if ((tgt&(rqtObject | rqtObstacle)) && (tp == cftObject) && collidable->collidable.model->_RayQuery(Q, r_temp)) return TRUE;
+                if ((tgt&rqtShape) && (tp == cftShape) && collidable->collidable.model->_RayQuery(Q, r_temp)) return TRUE;
+            }
+        }
+    }
+    // static test
+    if (tgt&rqtStatic)
+    {
+        // If we get here - test static model
+        if (cache)
+        {
+            // 0. similar query???
+            if (cache->similar(start, dir, range))
+            {
+                return cache->result;
+            }
 
-			// 1. Check cached polygon
-			float _u,_v,_range;
-			if (CDB::TestRayTri(start,dir,cache->verts,_u,_v,_range,false)) 
-			{
-				if (_range>0 && _range<range) return TRUE;
-			}
-			
-			// 2. Polygon doesn't pick - real database query
-			xrc.ray_query	(&Static,start,dir,range);
-			if (0==xrc.r_count()) {
-				cache->set		(start,dir,range,FALSE);
-				return FALSE;
-			} else {
-				// cache polygon
-				cache->set		(start,dir,range,TRUE);
-				CDB::RESULT*	R	= xrc.r_begin();
-				CDB::TRI&		T	= Static.get_tris() [ R->id ];
-				Fvector*		V	= Static.get_verts();
-				cache->verts[0].set	(V[T.verts[0]]);
-				cache->verts[1].set	(V[T.verts[1]]);
-				cache->verts[2].set	(V[T.verts[2]]);
-				return TRUE;
-			}
-		} else {
-			xrc.ray_query		(&Static,start,dir,range);
-			return xrc.r_count	();
-		}
-	}
-	return FALSE;
+            // 1. Check cached polygon
+            float _u, _v, _range;
+            if (CDB::TestRayTri(start, dir, cache->verts, _u, _v, _range, false))
+            {
+                if (_range > 0 && _range < range) return TRUE;
+            }
+
+            // 2. Polygon doesn't pick - real database query
+            xrc.ray_query(&Static, start, dir, range);
+            if (0 == xrc.r_count())
+            {
+                cache->set(start, dir, range, FALSE);
+                return FALSE;
+            }
+            else
+            {
+                // cache polygon
+                cache->set(start, dir, range, TRUE);
+                CDB::RESULT* R = xrc.r_begin();
+                CDB::TRI& T = Static.get_tris()[R->id];
+                Fvector* V = Static.get_verts();
+                cache->verts[0].set(V[T.verts[0]]);
+                cache->verts[1].set(V[T.verts[1]]);
+                cache->verts[2].set(V[T.verts[2]]);
+                return TRUE;
+            }
+        }
+        else
+        {
+            xrc.ray_query(&Static, start, dir, range);
+            return xrc.r_count();
+        }
+    }
+    return FALSE;
 }
 
 //--------------------------------------------------------------------------------
 // RayPick
 //--------------------------------------------------------------------------------
-BOOL CObjectSpace::RayPick	( const Fvector &start, const Fvector &dir, float range, rq_target tgt, rq_result& R, CObject* ignore_object)
+BOOL CObjectSpace::RayPick(const Fvector& start, const Fvector& dir, float range, rq_target tgt, rq_result& R, CObject* ignore_object)
 {
-	Lock.Enter		();
-	BOOL	_res	= _RayPick(start,dir,range,tgt,R,ignore_object);
-	r_spatial.clear	();
-	Lock.Leave		();
-	return	_res;
+    Lock.Enter();
+    BOOL _res = _RayPick(start, dir, range, tgt, R, ignore_object);
+    r_spatial.clear();
+    Lock.Leave();
+    return _res;
 }
-BOOL CObjectSpace::_RayPick	( const Fvector &start, const Fvector &dir, float range, rq_target tgt, rq_result& R, CObject* ignore_object)
+BOOL CObjectSpace::_RayPick(const Fvector& start, const Fvector& dir, float range, rq_target tgt, rq_result& R, CObject* ignore_object)
 {
-	r_temp.r_clear			();
-	R.O		= 0; R.range = range; R.element = -1;
-	// static test
-	if (tgt&rqtStatic){ 
-		xrc.ray_options		(CDB::OPT_ONLYNEAREST | CDB::OPT_CULL);
-		xrc.ray_query		(&Static,start,dir,range);
-		if (xrc.r_count())  R.set_if_less(xrc.r_begin());
-	}
-	// dynamic test
-	if (tgt&rqtDyn){ 
-		collide::ray_defs Q		(start,dir,R.range,CDB::OPT_ONLYNEAREST|CDB::OPT_CULL,tgt);
-		// traverse object database
-		u32			d_flags =	STYPE_COLLIDEABLE|((tgt&rqtObstacle)?STYPE_OBSTACLE:0)|((tgt&rqtShape)?STYPE_SHAPE:0);
-		g_SpatialSpace->q_ray	(r_spatial,0,d_flags,start,dir,range);
-		// Determine visibility for dynamic part of scene
-		for (u32 o_it=0; o_it<r_spatial.size(); o_it++){
-			ISpatial*	spatial			= r_spatial[o_it];
-			CObject*	collidable		= spatial->dcast_CObject();
-			if			(0==collidable)				continue;
-			if			(collidable==ignore_object)	continue;
-			ECollisionFormType tp		= collidable->collidable.model->Type();
-			if (((tgt&(rqtObject|rqtObstacle))&&(tp==cftObject))||((tgt&rqtShape)&&(tp==cftShape))){
-				u32		C	= D3DCOLOR_XRGB	(64,64,64);
-				Q.range		= R.range;
-				if (collidable->collidable.model->_RayQuery(Q,r_temp)){
-					C				= D3DCOLOR_XRGB(128,128,196);
-					R.set_if_less	(r_temp.r_begin());
-				}
+    r_temp.r_clear();
+    R.O = 0;
+    R.range = range;
+    R.element = -1;
+    // static test
+    if (tgt&rqtStatic)
+    {
+        xrc.ray_options(CDB::OPT_ONLYNEAREST | CDB::OPT_CULL);
+        xrc.ray_query(&Static, start, dir, range);
+        if (xrc.r_count()) R.set_if_less(xrc.r_begin());
+    }
+    // dynamic test
+    if (tgt&rqtDyn)
+    {
+        collide::ray_defs Q(start, dir, R.range, CDB::OPT_ONLYNEAREST | CDB::OPT_CULL, tgt);
+        // traverse object database
+        u32 d_flags = STYPE_COLLIDEABLE | ((tgt&rqtObstacle) ? STYPE_OBSTACLE : 0) | ((tgt&rqtShape) ? STYPE_SHAPE : 0);
+        g_SpatialSpace->q_ray(r_spatial, 0, d_flags, start, dir, range);
+        // Determine visibility for dynamic part of scene
+        for (u32 o_it = 0; o_it < r_spatial.size(); o_it++)
+        {
+            ISpatial* spatial = r_spatial[o_it];
+            CObject* collidable = spatial->dcast_CObject();
+            if (0 == collidable) continue;
+            if (collidable == ignore_object) continue;
+            ECollisionFormType tp = collidable->collidable.model->Type();
+            if (((tgt&(rqtObject | rqtObstacle)) && (tp == cftObject)) || ((tgt&rqtShape) && (tp == cftShape)))
+            {
+                u32 C = D3DCOLOR_XRGB(64, 64, 64);
+                Q.range = R.range;
+                if (collidable->collidable.model->_RayQuery(Q, r_temp))
+                {
+                    C = D3DCOLOR_XRGB(128, 128, 196);
+                    R.set_if_less(r_temp.r_begin());
+                }
 #ifdef DEBUG
-				if (bDebug){
-					Fsphere	S;		S.P = spatial->spatial.sphere.P; S.R = spatial->spatial.sphere.R;
-					m_pRender->dbgAddSphere(S,C);
-					//dbg_S.push_back	(mk_pair(S,C));
-				}
+                if (bDebug)
+                {
+                    Fsphere S;
+                    S.P = spatial->spatial.sphere.P;
+                    S.R = spatial->spatial.sphere.R;
+                    m_pRender->dbgAddSphere(S, C);
+                    //dbg_S.push_back (mk_pair(S,C));
+                }
 #endif
-			}
-		}
-	}
-	return (R.element>=0);
+            }
+        }
+    }
+    return (R.element >= 0);
 }
 
 //--------------------------------------------------------------------------------
 // RayQuery
 //--------------------------------------------------------------------------------
-BOOL CObjectSpace::RayQuery		(collide::rq_results& dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
+BOOL CObjectSpace::RayQuery(collide::rq_results& dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
 {
-	Lock.Enter					();
-	BOOL						_res = _RayQuery2(dest,R,CB,user_data,tb,ignore_object);
-	r_spatial.clear_not_free	();
-	Lock.Leave					();
-	return						(_res);
+    Lock.Enter();
+    BOOL _res = _RayQuery2(dest, R, CB, user_data, tb, ignore_object);
+    r_spatial.clear_not_free();
+    Lock.Leave();
+    return (_res);
 }
-BOOL CObjectSpace::_RayQuery2	(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
+BOOL CObjectSpace::_RayQuery2(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
 {
-	// initialize query
-	r_dest.r_clear		();
-	r_temp.r_clear		();
+    // initialize query
+    r_dest.r_clear();
+    r_temp.r_clear();
 
-	rq_target	s_mask	=	rqtStatic;
-	rq_target	d_mask	=	rq_target(	((R.tgt&rqtObject)	?rqtObject:rqtNone		)|
-										((R.tgt&rqtObstacle)?rqtObstacle:rqtNone	)|
-										((R.tgt&rqtShape)	?rqtShape:rqtNone)		);
-	u32			d_flags =	STYPE_COLLIDEABLE|((R.tgt&rqtObstacle)?STYPE_OBSTACLE:0)|((R.tgt&rqtShape)?STYPE_SHAPE:0);
+    rq_target s_mask = rqtStatic;
+    rq_target d_mask = rq_target(((R.tgt&rqtObject) ? rqtObject : rqtNone) |
+                                 ((R.tgt&rqtObstacle) ? rqtObstacle : rqtNone) |
+                                 ((R.tgt&rqtShape) ? rqtShape : rqtNone));
+    u32 d_flags = STYPE_COLLIDEABLE | ((R.tgt&rqtObstacle) ? STYPE_OBSTACLE : 0) | ((R.tgt&rqtShape) ? STYPE_SHAPE : 0);
 
-	// Test static
-	if (R.tgt&s_mask){ 
-		xrc.ray_options	(R.flags);
-		xrc.ray_query	(&Static,R.start,R.dir,R.range);
-		if (xrc.r_count()){	
-			CDB::RESULT* _I	= xrc.r_begin();
-			CDB::RESULT* _E = xrc.r_end	();
-			for (; _I!=_E; _I++)
-				r_temp.append_result(rq_result().set(0,_I->range,_I->id));
-		}
-	}
-	// Test dynamic
-	if (R.tgt&d_mask){ 
-		// Traverse object database
-		g_SpatialSpace->q_ray	(r_spatial,0,d_flags,R.start,R.dir,R.range);
-		for (u32 o_it=0; o_it<r_spatial.size(); o_it++){
-			CObject*	collidable		= r_spatial[o_it]->dcast_CObject();
-			if			(0==collidable)				continue;
-			if			(collidable==ignore_object)	continue;
-			ICollisionForm*	cform		= collidable->collidable.model;
-			ECollisionFormType tp		= collidable->collidable.model->Type();
-			if (((R.tgt&(rqtObject|rqtObstacle))&&(tp==cftObject))||((R.tgt&rqtShape)&&(tp==cftShape))){
-				if (tb&&!tb(R,collidable,user_data))continue;
-				cform->_RayQuery(R,r_temp);
-			}
-		}
-	}
-	if (r_temp.r_count()){
-		r_temp.r_sort		();
-		collide::rq_result* _I = r_temp.r_begin	();
-		collide::rq_result* _E = r_temp.r_end	();
-		for (; _I!=_E; _I++){
-			r_dest.append_result(*_I);
-			if (!(CB?CB(*_I,user_data):TRUE))						return r_dest.r_count();
-			if (R.flags&(CDB::OPT_ONLYNEAREST|CDB::OPT_ONLYFIRST))	return r_dest.r_count();
-		}
-	}
-	return r_dest.r_count();
+    // Test static
+    if (R.tgt&s_mask)
+    {
+        xrc.ray_options(R.flags);
+        xrc.ray_query(&Static, R.start, R.dir, R.range);
+        if (xrc.r_count())
+        {
+            CDB::RESULT* _I = xrc.r_begin();
+            CDB::RESULT* _E = xrc.r_end();
+            for (; _I != _E; _I++)
+                r_temp.append_result(rq_result().set(0, _I->range, _I->id));
+        }
+    }
+    // Test dynamic
+    if (R.tgt&d_mask)
+    {
+        // Traverse object database
+        g_SpatialSpace->q_ray(r_spatial, 0, d_flags, R.start, R.dir, R.range);
+        for (u32 o_it = 0; o_it < r_spatial.size(); o_it++)
+        {
+            CObject* collidable = r_spatial[o_it]->dcast_CObject();
+            if (0 == collidable) continue;
+            if (collidable == ignore_object) continue;
+            ICollisionForm* cform = collidable->collidable.model;
+            ECollisionFormType tp = collidable->collidable.model->Type();
+            if (((R.tgt&(rqtObject | rqtObstacle)) && (tp == cftObject)) || ((R.tgt&rqtShape) && (tp == cftShape)))
+            {
+                if (tb&&!tb(R, collidable, user_data))continue;
+                cform->_RayQuery(R, r_temp);
+            }
+        }
+    }
+    if (r_temp.r_count())
+    {
+        r_temp.r_sort();
+        collide::rq_result* _I = r_temp.r_begin();
+        collide::rq_result* _E = r_temp.r_end();
+        for (; _I != _E; _I++)
+        {
+            r_dest.append_result(*_I);
+            if (!(CB ? CB(*_I, user_data) : TRUE)) return r_dest.r_count();
+            if (R.flags&(CDB::OPT_ONLYNEAREST | CDB::OPT_ONLYFIRST)) return r_dest.r_count();
+        }
+    }
+    return r_dest.r_count();
 }
 
-BOOL CObjectSpace::_RayQuery3	(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
+BOOL CObjectSpace::_RayQuery3(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
 {
-	// initialize query
-	r_dest.r_clear			();
+    // initialize query
+    r_dest.r_clear();
 
-	ray_defs	d_rd		(R);
-	ray_defs	s_rd		(R.start,R.dir,R.range,CDB::OPT_ONLYNEAREST|R.flags,R.tgt);
-	rq_target	s_mask		=	rqtStatic;
-	rq_target	d_mask		=	rq_target(	((R.tgt&rqtObject)	?rqtObject:rqtNone		)|
-											((R.tgt&rqtObstacle)?rqtObstacle:rqtNone	)|
-											((R.tgt&rqtShape)	?rqtShape:rqtNone)		);
-	u32			d_flags		=	STYPE_COLLIDEABLE|((R.tgt&rqtObstacle)?STYPE_OBSTACLE:0)|((R.tgt&rqtShape)?STYPE_SHAPE:0);
-	float		d_range		= 0.f;
+    ray_defs d_rd(R);
+    ray_defs s_rd(R.start, R.dir, R.range, CDB::OPT_ONLYNEAREST | R.flags, R.tgt);
+    rq_target s_mask = rqtStatic;
+    rq_target d_mask = rq_target(((R.tgt&rqtObject) ? rqtObject : rqtNone) |
+                                 ((R.tgt&rqtObstacle) ? rqtObstacle : rqtNone) |
+                                 ((R.tgt&rqtShape) ? rqtShape : rqtNone));
+    u32 d_flags = STYPE_COLLIDEABLE | ((R.tgt&rqtObstacle) ? STYPE_OBSTACLE : 0) | ((R.tgt&rqtShape) ? STYPE_SHAPE : 0);
+    float d_range = 0.f;
 
-	do{
-		r_temp.r_clear		();
-		if (R.tgt&s_mask){
-			// static test allowed
+    do
+    {
+        r_temp.r_clear();
+        if (R.tgt&s_mask)
+        {
+            // static test allowed
 
-			// test static
-			xrc.ray_options		(s_rd.flags);
-			xrc.ray_query		(&Static,s_rd.start,s_rd.dir,s_rd.range);
+            // test static
+            xrc.ray_options(s_rd.flags);
+            xrc.ray_query(&Static, s_rd.start, s_rd.dir, s_rd.range);
 
-			if (xrc.r_count())	{	
-				VERIFY			(xrc.r_count()==1);
-				rq_result		s_res;
-				s_res.set		(0,xrc.r_begin()->range,xrc.r_begin()->id);
-				// update dynamic test range
-				d_rd.range		= s_res.range;
-				// set next static start & range
-				s_rd.range		-= (s_res.range+EPS_L);
-				s_rd.start.mad	(s_rd.dir,s_res.range+EPS_L);
-				s_res.range		= R.range-s_rd.range-EPS_L;
-				r_temp.append_result(s_res);
-			}else{
-				d_rd.range		= s_rd.range;
-			}
-		}
-		// test dynamic
-		if (R.tgt&d_mask)		{ 
-			// Traverse object database
-			g_SpatialSpace->q_ray	(r_spatial,0,d_flags,d_rd.start,d_rd.dir,d_rd.range);
-			for (u32 o_it=0; o_it<r_spatial.size(); o_it++){
-				CObject*	collidable		= r_spatial[o_it]->dcast_CObject();
-				if			(0==collidable)				continue;
-				if			(collidable==ignore_object)	continue;
-				ICollisionForm*	cform		= collidable->collidable.model;
-				ECollisionFormType tp		= collidable->collidable.model->Type();
-				if (((R.tgt&(rqtObject|rqtObstacle))&&(tp==cftObject))||((R.tgt&rqtShape)&&(tp==cftShape))){
-					if (tb&&!tb(d_rd,collidable,user_data))continue;
-					u32 r_cnt				= r_temp.r_count();
-					cform->_RayQuery		(d_rd,r_temp);
-					for (int k=r_cnt; k<r_temp.r_count(); k++){
-						rq_result& d_res	= *(r_temp.r_begin()+k);
-						d_res.range			+= d_range;
-					}
-				}
-			}
-		}
-		// set dynamic ray def
-		d_rd.start			= s_rd.start;
-		d_range				= R.range-s_rd.range;
-		if (r_temp.r_count()){
-			r_temp.r_sort		();
-			collide::rq_result* _I = r_temp.r_begin	();
-			collide::rq_result* _E = r_temp.r_end	();
-			for (; _I!=_E; _I++){
-				r_dest.append_result(*_I);
-				if (!(CB?CB(*_I,user_data):TRUE))	return r_dest.r_count();
-				if (R.flags&CDB::OPT_ONLYFIRST)		return r_dest.r_count();
-			}
-		}
-		if ((R.flags&(CDB::OPT_ONLYNEAREST|CDB::OPT_ONLYFIRST)) && r_dest.r_count()) return r_dest.r_count();
-	}while(r_temp.r_count());
-	return r_dest.r_count()	;
+            if (xrc.r_count())
+            {
+                VERIFY(xrc.r_count() == 1);
+                rq_result s_res;
+                s_res.set(0, xrc.r_begin()->range, xrc.r_begin()->id);
+                // update dynamic test range
+                d_rd.range = s_res.range;
+                // set next static start & range
+                s_rd.range -= (s_res.range + EPS_L);
+                s_rd.start.mad(s_rd.dir, s_res.range + EPS_L);
+                s_res.range = R.range - s_rd.range - EPS_L;
+                r_temp.append_result(s_res);
+            }
+            else
+            {
+                d_rd.range = s_rd.range;
+            }
+        }
+        // test dynamic
+        if (R.tgt&d_mask)
+        {
+            // Traverse object database
+            g_SpatialSpace->q_ray(r_spatial, 0, d_flags, d_rd.start, d_rd.dir, d_rd.range);
+            for (u32 o_it = 0; o_it < r_spatial.size(); o_it++)
+            {
+                CObject* collidable = r_spatial[o_it]->dcast_CObject();
+                if (0 == collidable) continue;
+                if (collidable == ignore_object) continue;
+                ICollisionForm* cform = collidable->collidable.model;
+                ECollisionFormType tp = collidable->collidable.model->Type();
+                if (((R.tgt&(rqtObject | rqtObstacle)) && (tp == cftObject)) || ((R.tgt&rqtShape) && (tp == cftShape)))
+                {
+                    if (tb&&!tb(d_rd, collidable, user_data))continue;
+                    u32 r_cnt = r_temp.r_count();
+                    cform->_RayQuery(d_rd, r_temp);
+                    for (int k = r_cnt; k < r_temp.r_count(); k++)
+                    {
+                        rq_result& d_res = *(r_temp.r_begin() + k);
+                        d_res.range += d_range;
+                    }
+                }
+            }
+        }
+        // set dynamic ray def
+        d_rd.start = s_rd.start;
+        d_range = R.range - s_rd.range;
+        if (r_temp.r_count())
+        {
+            r_temp.r_sort();
+            collide::rq_result* _I = r_temp.r_begin();
+            collide::rq_result* _E = r_temp.r_end();
+            for (; _I != _E; _I++)
+            {
+                r_dest.append_result(*_I);
+                if (!(CB ? CB(*_I, user_data) : TRUE)) return r_dest.r_count();
+                if (R.flags&CDB::OPT_ONLYFIRST) return r_dest.r_count();
+            }
+        }
+        if ((R.flags&(CDB::OPT_ONLYNEAREST | CDB::OPT_ONLYFIRST)) && r_dest.r_count()) return r_dest.r_count();
+    }
+    while (r_temp.r_count());
+    return r_dest.r_count();
 }
 
-BOOL CObjectSpace::_RayQuery	(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
+BOOL CObjectSpace::_RayQuery(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, CObject* ignore_object)
 {
 #ifdef DEBUG
-	if (R.range<EPS || !_valid(R.range))
-		Debug.fatal			(DEBUG_INFO,"Invalid RayQuery range passed: %f.",R.range);
+    if (R.range < EPS || !_valid(R.range))
+        Debug.fatal(DEBUG_INFO, "Invalid RayQuery range passed: %f.", R.range);
 #endif
-	// initialize query
-	r_dest.r_clear			();
-	r_temp.r_clear			();
+    // initialize query
+    r_dest.r_clear();
+    r_temp.r_clear();
 
-	Flags32		sd_test;	sd_test.assign	(R.tgt);
-	rq_target	next_test	= R.tgt;
+    Flags32 sd_test;
+    sd_test.assign(R.tgt);
+    rq_target next_test = R.tgt;
 
-	rq_result	s_res;
-	ray_defs	s_rd		(R.start,R.dir,R.range,CDB::OPT_ONLYNEAREST|R.flags,R.tgt);
-	ray_defs	d_rd		(R.start,R.dir,R.range,CDB::OPT_ONLYNEAREST|R.flags,R.tgt);
-	rq_target	s_mask	=	rqtStatic;
-	rq_target	d_mask	=	rq_target(	((R.tgt&rqtObject)	?rqtObject:rqtNone		)|
-										((R.tgt&rqtObstacle)?rqtObstacle:rqtNone	)|
-										((R.tgt&rqtShape)	?rqtShape:rqtNone)		);
-	u32			d_flags =	STYPE_COLLIDEABLE|((R.tgt&rqtObstacle)?STYPE_OBSTACLE:0)|((R.tgt&rqtShape)?STYPE_SHAPE:0);
+    rq_result s_res;
+    ray_defs s_rd(R.start, R.dir, R.range, CDB::OPT_ONLYNEAREST | R.flags, R.tgt);
+    ray_defs d_rd(R.start, R.dir, R.range, CDB::OPT_ONLYNEAREST | R.flags, R.tgt);
+    rq_target s_mask = rqtStatic;
+    rq_target d_mask = rq_target(((R.tgt&rqtObject) ? rqtObject : rqtNone) |
+                                 ((R.tgt&rqtObstacle) ? rqtObstacle : rqtNone) |
+                                 ((R.tgt&rqtShape) ? rqtShape : rqtNone));
+    u32 d_flags = STYPE_COLLIDEABLE | ((R.tgt&rqtObstacle) ? STYPE_OBSTACLE : 0) | ((R.tgt&rqtShape) ? STYPE_SHAPE : 0);
 
-	s_res.set				(0,s_rd.range,-1);
-	do{
-		if ((R.tgt&s_mask)&&sd_test.is(s_mask)&&(next_test&s_mask)){ 
-			s_res.set		(0,s_rd.range,-1);
-			// Test static model
-			if (s_rd.range>EPS){
-				xrc.ray_options	(s_rd.flags);
-				xrc.ray_query	(&Static,s_rd.start,s_rd.dir,s_rd.range);
-				if (xrc.r_count()){	
-					if (s_res.set_if_less(xrc.r_begin())){
-						// set new static start & range
-						s_rd.range	-=	(s_res.range+EPS_L);
-						s_rd.start.mad	(s_rd.dir,s_res.range+EPS_L);
-						s_res.range	= R.range-s_rd.range-EPS_L;
+    s_res.set(0, s_rd.range, -1);
+    do
+    {
+        if ((R.tgt&s_mask) && sd_test.is(s_mask) && (next_test&s_mask))
+        {
+            s_res.set(0, s_rd.range, -1);
+            // Test static model
+            if (s_rd.range > EPS)
+            {
+                xrc.ray_options(s_rd.flags);
+                xrc.ray_query(&Static, s_rd.start, s_rd.dir, s_rd.range);
+                if (xrc.r_count())
+                {
+                    if (s_res.set_if_less(xrc.r_begin()))
+                    {
+                        // set new static start & range
+                        s_rd.range -= (s_res.range + EPS_L);
+                        s_rd.start.mad(s_rd.dir, s_res.range + EPS_L);
+                        s_res.range = R.range - s_rd.range - EPS_L;
 #ifdef DEBUG
-						if (!(fis_zero(s_res.range,EPS) || s_res.range>=0.f))
-							Debug.fatal(DEBUG_INFO,"Invalid RayQuery static range: %f (%f). /#1/",s_res.range,s_rd.range);
+                        if (!(fis_zero(s_res.range, EPS) || s_res.range >= 0.f))
+                            Debug.fatal(DEBUG_INFO, "Invalid RayQuery static range: %f (%f). /#1/", s_res.range, s_rd.range);
 #endif
-					}
-				}
-			}
-			if (!s_res.valid())	sd_test.set(s_mask,FALSE);
-		}
-		if ((R.tgt&d_mask)&&sd_test.is_any(d_mask)&&(next_test&d_mask)){ 
-			r_temp.r_clear	();
+                    }
+                }
+            }
+            if (!s_res.valid()) sd_test.set(s_mask, FALSE);
+        }
+        if ((R.tgt&d_mask) && sd_test.is_any(d_mask) && (next_test&d_mask))
+        {
+            r_temp.r_clear();
 
-			if (d_rd.range>EPS){
-				// Traverse object database
-				g_SpatialSpace->q_ray		(r_spatial,0,d_flags,d_rd.start,d_rd.dir,d_rd.range);
-				// Determine visibility for dynamic part of scene
-				for (u32 o_it=0; o_it<r_spatial.size(); o_it++){
-					CObject*	collidable		= r_spatial[o_it]->dcast_CObject();
-					if			(0==collidable)				continue;
-					if			(collidable==ignore_object)	continue;
-					ICollisionForm*	cform		= collidable->collidable.model;
-					ECollisionFormType tp		= collidable->collidable.model->Type();
-					if (((R.tgt&(rqtObject|rqtObstacle))&&(tp==cftObject))||((R.tgt&rqtShape)&&(tp==cftShape))){
-						if (tb&&!tb(d_rd,collidable,user_data))continue;
-						cform->_RayQuery(d_rd,r_temp);
-					}
+            if (d_rd.range > EPS)
+            {
+                // Traverse object database
+                g_SpatialSpace->q_ray(r_spatial, 0, d_flags, d_rd.start, d_rd.dir, d_rd.range);
+                // Determine visibility for dynamic part of scene
+                for (u32 o_it = 0; o_it < r_spatial.size(); o_it++)
+                {
+                    CObject* collidable = r_spatial[o_it]->dcast_CObject();
+                    if (0 == collidable) continue;
+                    if (collidable == ignore_object) continue;
+                    ICollisionForm* cform = collidable->collidable.model;
+                    ECollisionFormType tp = collidable->collidable.model->Type();
+                    if (((R.tgt&(rqtObject | rqtObstacle)) && (tp == cftObject)) || ((R.tgt&rqtShape) && (tp == cftShape)))
+                    {
+                        if (tb&&!tb(d_rd, collidable, user_data))continue;
+                        cform->_RayQuery(d_rd, r_temp);
+                    }
 #ifdef DEBUG
-					if (!((0==r_temp.r_count()) || (r_temp.r_count()&&(fis_zero(r_temp.r_begin()->range, EPS)||(r_temp.r_begin()->range>=0.f)))))
-						Debug.fatal(DEBUG_INFO,"Invalid RayQuery dynamic range: %f (%f). /#2/",r_temp.r_begin()->range,d_rd.range);
+                    if (!((0 == r_temp.r_count()) || (r_temp.r_count() && (fis_zero(r_temp.r_begin()->range, EPS) || (r_temp.r_begin()->range >= 0.f)))))
+                        Debug.fatal(DEBUG_INFO, "Invalid RayQuery dynamic range: %f (%f). /#2/", r_temp.r_begin()->range, d_rd.range);
 #endif
-				}
-			}
-			if (r_temp.r_count()){
-				// set new dynamic start & range
-				rq_result& d_res = *r_temp.r_begin();
-				d_rd.range	-= (d_res.range+EPS_L);
-				d_rd.start.mad(d_rd.dir,d_res.range+EPS_L);
-				d_res.range	= R.range-d_rd.range-EPS_L;
+                }
+            }
+            if (r_temp.r_count())
+            {
+                // set new dynamic start & range
+                rq_result& d_res = *r_temp.r_begin();
+                d_rd.range -= (d_res.range + EPS_L);
+                d_rd.start.mad(d_rd.dir, d_res.range + EPS_L);
+                d_res.range = R.range - d_rd.range - EPS_L;
 #ifdef DEBUG
-				if (!(fis_zero(d_res.range,EPS) || d_res.range>=0.f))
-					Debug.fatal(DEBUG_INFO,"Invalid RayQuery dynamic range: %f (%f). /#3/",d_res.range,d_rd.range);
+                if (!(fis_zero(d_res.range, EPS) || d_res.range >= 0.f))
+                    Debug.fatal(DEBUG_INFO, "Invalid RayQuery dynamic range: %f (%f). /#3/", d_res.range, d_rd.range);
 #endif
-			}else{
-				sd_test.set(d_mask,FALSE);
-			}
-		}
-		if (s_res.valid()&&r_temp.r_count()){
-			// all test return result
-			if	(s_res.range<r_temp.r_begin()->range){
-				// static nearer
-				BOOL need_calc			= CB?CB(s_res,user_data):TRUE;
-				next_test				= need_calc?s_mask:rqtNone; 
-				r_dest.append_result	(s_res);
-			}else{
-				// dynamic nearer
-				BOOL need_calc			= CB?CB(*r_temp.r_begin(),user_data):TRUE;
-				next_test				= need_calc?d_mask:rqtNone;	
-				r_dest.append_result	(*r_temp.r_begin());
-			}
-		}else if (s_res.valid())	{
-			// only static return result
-			BOOL need_calc				= CB?CB(s_res,user_data):TRUE;
-			next_test					= need_calc?s_mask:rqtNone;
-			r_dest.append_result		(s_res);
-		}else if (r_temp.r_count())	{
-			// only dynamic return result
-			BOOL need_calc				= CB?CB(*r_temp.r_begin(),user_data):TRUE;
-			next_test					= need_calc?d_mask:rqtNone;
-			r_dest.append_result		(*r_temp.r_begin());
-		}else{
-			// nothing selected
-			next_test			= rqtNone;
-		}
-		if ((R.flags&CDB::OPT_ONLYFIRST)||(R.flags&CDB::OPT_ONLYNEAREST)) break;
-	} while (next_test!=rqtNone)		;
-	return r_dest.r_count	()	;
+            }
+            else
+            {
+                sd_test.set(d_mask, FALSE);
+            }
+        }
+        if (s_res.valid() && r_temp.r_count())
+        {
+            // all test return result
+            if (s_res.range < r_temp.r_begin()->range)
+            {
+                // static nearer
+                BOOL need_calc = CB ? CB(s_res, user_data) : TRUE;
+                next_test = need_calc ? s_mask : rqtNone;
+                r_dest.append_result(s_res);
+            }
+            else
+            {
+                // dynamic nearer
+                BOOL need_calc = CB ? CB(*r_temp.r_begin(), user_data) : TRUE;
+                next_test = need_calc ? d_mask : rqtNone;
+                r_dest.append_result(*r_temp.r_begin());
+            }
+        }
+        else if (s_res.valid())
+        {
+            // only static return result
+            BOOL need_calc = CB ? CB(s_res, user_data) : TRUE;
+            next_test = need_calc ? s_mask : rqtNone;
+            r_dest.append_result(s_res);
+        }
+        else if (r_temp.r_count())
+        {
+            // only dynamic return result
+            BOOL need_calc = CB ? CB(*r_temp.r_begin(), user_data) : TRUE;
+            next_test = need_calc ? d_mask : rqtNone;
+            r_dest.append_result(*r_temp.r_begin());
+        }
+        else
+        {
+            // nothing selected
+            next_test = rqtNone;
+        }
+        if ((R.flags&CDB::OPT_ONLYFIRST) || (R.flags&CDB::OPT_ONLYNEAREST)) break;
+    }
+    while (next_test != rqtNone);
+    return r_dest.r_count();
 }
 
-BOOL CObjectSpace::RayQuery	(collide::rq_results& r_dest, ICollisionForm* target, const collide::ray_defs& R)
+BOOL CObjectSpace::RayQuery(collide::rq_results& r_dest, ICollisionForm* target, const collide::ray_defs& R)
 {
-	VERIFY					(target);
-	r_dest.r_clear			();
-	return target->_RayQuery(R,r_dest);
+    VERIFY(target);
+    r_dest.r_clear();
+    return target->_RayQuery(R, r_dest);
 }
diff --git a/src/xrEngine/xr_collide_defs.h b/src/xrEngine/xr_collide_defs.h
index 59477e40b73..19dfebb64b1 100644
--- a/src/xrEngine/xr_collide_defs.h
+++ b/src/xrEngine/xr_collide_defs.h
@@ -3,138 +3,146 @@
 #pragma once
 
 class ENGINE_API CObject;
-namespace collide 
+namespace collide
 {
-	struct			tri {
-		Fvector	e10; float e10s;
-		Fvector	e21; float e21s;
-		Fvector	e02; float e02s;
-		Fvector p[3];
-		Fvector N;
-		float	d;
-	};
-	struct			elipsoid {
-		Fmatrix	mL2W;		// convertion from sphere(000,1) to real space
-		Fmatrix	mW2L;		// convertion from real space to sphere(000,1)
-	};
-	struct			ray_cache
-	{
-		// previous state
-		Fvector				start;
-		Fvector				dir;
-		float				range;
-		BOOL				result;
+struct tri
+{
+    Fvector e10;
+    float e10s;
+    Fvector e21;
+    float e21s;
+    Fvector e02;
+    float e02s;
+    Fvector p[3];
+    Fvector N;
+    float d;
+};
+struct elipsoid
+{
+    Fmatrix mL2W; // convertion from sphere(000,1) to real space
+    Fmatrix mW2L; // convertion from real space to sphere(000,1)
+};
+struct ray_cache
+{
+    // previous state
+    Fvector start;
+    Fvector dir;
+    float range;
+    BOOL result;
 
-		// cached vertices
-		Fvector				verts[3];
-		ray_cache() 
-		{
-			start.set	(0,0,0);
-			dir.set		(0,0,0);
-			range		= 0;
-			result		= FALSE;
-			verts[0].set(0,0,0);
-			verts[1].set(0,0,0);
-			verts[2].set(0,0,0);
-		}
-		void				set		(const Fvector& _start, const Fvector& _dir, const float _range,const BOOL _result)
-		{
-			start	= _start;
-			dir		= _dir;
-			range	= _range;
-			result	= _result;
-		}
-		BOOL				similar	(const Fvector& _start, const Fvector& _dir, const float _range)
-		{
-			if (!_start.similar(start))					return FALSE;
-			if (!fsimilar(1.f,dir.dotproduct(_dir)))	return FALSE;
-			if (!fsimilar(_range,range))				return FALSE;
-			return			TRUE;
-		}
-	};
-	enum rq_target	{
-		rqtNone		= (0),
-		rqtObject	= (1<<0),
-		rqtStatic	= (1<<1),
-		rqtShape	= (1<<2),
-		rqtObstacle	= (1<<3),
-		rqtBoth		= (rqtObject|rqtStatic),
-		rqtDyn		= (rqtObject|rqtShape|rqtObstacle)
-	};
-	struct			ray_defs
-	{
-		Fvector		start;
-		Fvector		dir;
-		float		range;
-		u32			flags;
-		rq_target	tgt;
-		ray_defs	(const Fvector& _start, const Fvector& _dir, float _range, u32 _flags, rq_target _tgt)
-		{
-			start	= _start;
-			dir		= _dir;
-			range	= _range;
-			flags	= _flags;
-			tgt		= _tgt;
-		}
-	};
-	struct			rq_result 
-	{
-		CObject*	O;				// if NULL - static
-		float		range;			// range to intersection
-		int			element;		// íîìåð êîñòè/íîìåð òðåóãîëüíèêà
-		IC rq_result& set		(CObject* _O, float _range, int _element)
-		{
-			O		= _O;
-			range	= _range;
-			element	= _element;
-			return	*this;
-		}
-		IC BOOL		set_if_less	(CDB::RESULT*	I){if (I->range<range){ set(0,I->range,I->id);			return TRUE;}else return FALSE;}
-		IC BOOL		set_if_less	(rq_result*		R){if (R->range<range){ set(R->O,R->range,R->element);	return TRUE;}else return FALSE;}
-		IC BOOL		set_if_less	(CObject* _who, float _range, int _element)	{ if (_range<range) { set(_who,_range,_element); return TRUE;}else return FALSE;}
-		IC BOOL		valid		() {return (element>=0);}
-	};
-	DEFINE_VECTOR	(rq_result,rqVec,rqIt);
-	
-	class			rq_results
-	{
-	protected:
-		rqVec		results;
-		static bool	r_sort_pred		(const rq_result& a, const rq_result& b)	{	return a.range<b.range;}
-	public:
-		IC BOOL		append_result	(CObject* _who, float _range, int _element, BOOL bNearest)
-		{
-			if (bNearest&&!results.empty()){
-				rq_result& R		= results.back();
-				if (_range<R.range){
-					R.O				=_who;
-					R.range			=_range;
-					R.element		=_element;
-					return			TRUE;
-				}
-				return				FALSE;
-			}
-			results.push_back		(rq_result());
-			rq_result& rq			= results.back();
-			rq.range	=_range;
-			rq.element	=_element;
-			rq.O		=_who;
-			return TRUE	;
-		}
-		IC void		append_result	(rq_result& res)
-		{
-			if (0==results.capacity())	results.reserve(8);
-			results.push_back			(res);
-		}
-		IC int			r_count			()	{ return results.size();	}
-		IC rq_result*	r_begin			()	{ return &*results.begin();	}
-		IC rq_result*	r_end			()	{ return &*results.end();	}
-		IC void			r_clear			()	{ results.clear_not_free();	}
-		IC void			r_sort			()	{ std::sort(results.begin(),results.end(),r_sort_pred);}
-		IC rqVec		&r_results		()	{ return results; }
+    // cached vertices
+    Fvector verts[3];
+    ray_cache()
+    {
+        start.set(0, 0, 0);
+        dir.set(0, 0, 0);
+        range = 0;
+        result = FALSE;
+        verts[0].set(0, 0, 0);
+        verts[1].set(0, 0, 0);
+        verts[2].set(0, 0, 0);
+    }
+    void set(const Fvector& _start, const Fvector& _dir, const float _range, const BOOL _result)
+    {
+        start = _start;
+        dir = _dir;
+        range = _range;
+        result = _result;
+    }
+    BOOL similar(const Fvector& _start, const Fvector& _dir, const float _range)
+    {
+        if (!_start.similar(start)) return FALSE;
+        if (!fsimilar(1.f, dir.dotproduct(_dir))) return FALSE;
+        if (!fsimilar(_range, range)) return FALSE;
+        return TRUE;
+    }
+};
+enum rq_target
+{
+    rqtNone = (0),
+    rqtObject = (1 << 0),
+    rqtStatic = (1 << 1),
+    rqtShape = (1 << 2),
+    rqtObstacle = (1 << 3),
+    rqtBoth = (rqtObject | rqtStatic),
+    rqtDyn = (rqtObject | rqtShape | rqtObstacle)
+};
+struct ray_defs
+{
+    Fvector start;
+    Fvector dir;
+    float range;
+    u32 flags;
+    rq_target tgt;
+    ray_defs(const Fvector& _start, const Fvector& _dir, float _range, u32 _flags, rq_target _tgt)
+    {
+        start = _start;
+        dir = _dir;
+        range = _range;
+        flags = _flags;
+        tgt = _tgt;
+    }
+};
+struct rq_result
+{
+    CObject* O; // if NULL - static
+    float range; // range to intersection
+    int element; // íîìåð êîñòè/íîìåð òðåóãîëüíèêà
+    IC rq_result& set(CObject* _O, float _range, int _element)
+    {
+        O = _O;
+        range = _range;
+        element = _element;
+        return *this;
+    }
+    IC BOOL set_if_less(CDB::RESULT* I) { if (I->range < range) { set(0, I->range, I->id); return TRUE; } else return FALSE; }
+    IC BOOL set_if_less(rq_result* R) { if (R->range < range) { set(R->O, R->range, R->element); return TRUE; } else return FALSE; }
+    IC BOOL set_if_less(CObject* _who, float _range, int _element) { if (_range < range) { set(_who, _range, _element); return TRUE; } else return FALSE; }
+    IC BOOL valid() { return (element >= 0); }
+};
+DEFINE_VECTOR(rq_result, rqVec, rqIt);
 
-	};
-	typedef  BOOL		rq_callback 	(rq_result& result, LPVOID user_data);
-	typedef  BOOL		test_callback 	(const ray_defs& rd, CObject* object, LPVOID user_data);
+class rq_results
+{
+protected:
+    rqVec results;
+    static bool r_sort_pred(const rq_result& a, const rq_result& b) { return a.range < b.range; }
+public:
+    IC BOOL append_result(CObject* _who, float _range, int _element, BOOL bNearest)
+    {
+        if (bNearest&&!results.empty())
+        {
+            rq_result& R = results.back();
+            if (_range < R.range)
+            {
+                R.O = _who;
+                R.range = _range;
+                R.element = _element;
+                return TRUE;
+            }
+            return FALSE;
+        }
+        results.push_back(rq_result());
+        rq_result& rq = results.back();
+        rq.range = _range;
+        rq.element = _element;
+        rq.O = _who;
+        return TRUE;
+    }
+    IC void append_result(rq_result& res)
+    {
+        if (0 == results.capacity()) results.reserve(8);
+        results.push_back(res);
+    }
+    IC int r_count() { return results.size(); }
+    IC rq_result* r_begin() { return &*results.begin(); }
+    IC rq_result* r_end() { return &*results.end(); }
+    IC void r_clear() { results.clear_not_free(); }
+    IC void r_sort() { std::sort(results.begin(), results.end(), r_sort_pred); }
+    IC rqVec& r_results() { return results; }
+
+};
+typedef BOOL rq_callback(rq_result& result, LPVOID user_data);
+typedef BOOL test_callback(const ray_defs& rd, CObject* object, LPVOID user_data);
 };
 #endif
diff --git a/src/xrEngine/xr_collide_form.cpp b/src/xrEngine/xr_collide_form.cpp
index ea76be50563..e3df58ad5f4 100644
--- a/src/xrEngine/xr_collide_form.cpp
+++ b/src/xrEngine/xr_collide_form.cpp
@@ -11,478 +11,548 @@
 //#include "skeletoncustom.h"
 #include "../Include/xrRender/Kinematics.h"
 #include "bone.h"
-#ifdef	DEBUG
-IC float DET(const Fmatrix &a){
-	return
-		(( a._11 * ( a._22 * a._33 - a._23 * a._32 ) -
-		a._12 * ( a._21 * a._33 - a._23 * a._31 ) +
-		a._13 * ( a._21 * a._32 - a._22 * a._31 ) ));
+#ifdef DEBUG
+IC float DET(const Fmatrix& a)
+{
+    return
+        ((a._11 * (a._22 * a._33 - a._23 * a._32) -
+          a._12 * (a._21 * a._33 - a._23 * a._31) +
+          a._13 * (a._21 * a._32 - a._22 * a._31)));
 }
 #include "objectdump.h"
 #endif
-using namespace	collide;
+using namespace collide;
 //----------------------------------------------------------------------
-// Class	: CXR_CFObject
-// Purpose	: stores collision form
+// Class : CXR_CFObject
+// Purpose : stores collision form
 //----------------------------------------------------------------------
-ICollisionForm::ICollisionForm( CObject* _owner, ECollisionFormType tp )
+ICollisionForm::ICollisionForm(CObject* _owner, ECollisionFormType tp)
 {
-	owner				= _owner;
-	m_type				= tp;
-	bv_sphere.identity	( );
+    owner = _owner;
+    m_type = tp;
+    bv_sphere.identity();
 }
 
-ICollisionForm::~ICollisionForm( )
+ICollisionForm::~ICollisionForm()
 {
 }
 
 //----------------------------------------------------------------------------------
 void CCF_Skeleton::SElement::center(Fvector& center) const
 {
-	switch (type){
-	case SBoneShape::stBox:
-		center.set(	-b_IM.c.dotproduct(b_IM.i),
-					-b_IM.c.dotproduct(b_IM.j),
-					-b_IM.c.dotproduct(b_IM.k));
-	break;
-	case SBoneShape::stSphere: 
-		center.set(s_sphere.P);
-	break;
-	case SBoneShape::stCylinder: 
-		center.set(c_cylinder.m_center);
-	break;
-	default:
-		NODEFAULT;
-	}
+    switch (type)
+    {
+    case SBoneShape::stBox:
+        center.set(-b_IM.c.dotproduct(b_IM.i),
+                   -b_IM.c.dotproduct(b_IM.j),
+                   -b_IM.c.dotproduct(b_IM.k));
+        break;
+    case SBoneShape::stSphere:
+        center.set(s_sphere.P);
+        break;
+    case SBoneShape::stCylinder:
+        center.set(c_cylinder.m_center);
+        break;
+    default:
+        NODEFAULT;
+    }
 }
-bool	pred_find_elem(const CCF_Skeleton::SElement& E, u16 elem){
-	return E.elem_id<elem;
+bool pred_find_elem(const CCF_Skeleton::SElement& E, u16 elem)
+{
+    return E.elem_id < elem;
 }
 bool CCF_Skeleton::_ElementCenter(u16 elem_id, Fvector& e_center)
 {
-	ElementVecIt it = std::lower_bound(elements.begin(),elements.end(),elem_id,pred_find_elem);
-	if (it->elem_id==elem_id){
-		it->center(e_center);
-		return true;
-	}
-	return false;
+    ElementVecIt it = std::lower_bound(elements.begin(), elements.end(), elem_id, pred_find_elem);
+    if (it->elem_id == elem_id)
+    {
+        it->center(e_center);
+        return true;
+    }
+    return false;
 }
 
-IC bool RAYvsOBB(const Fmatrix& IM, const Fvector& b_hsize, const Fvector &S, const Fvector &D, float &R, BOOL bCull)
+IC bool RAYvsOBB(const Fmatrix& IM, const Fvector& b_hsize, const Fvector& S, const Fvector& D, float& R, BOOL bCull)
 {
-	Fbox E	= {-b_hsize.x, -b_hsize.y, -b_hsize.z,	b_hsize.x,	b_hsize.y,	b_hsize.z};
-	// XForm world-2-local
-	Fvector	SL,DL,PL;
-	IM.transform_tiny	(SL,S);
-	IM.transform_dir	(DL,D);
-
-	// Actual test
-	Fbox::ERP_Result rp_res = E.Pick2(SL,DL,PL);
-	if ((rp_res==Fbox::rpOriginOutside)||(!bCull&&(rp_res==Fbox::rpOriginInside))){
-		float d = PL.distance_to_sqr(SL);
-		if (d<R*R) {
-			R		= _sqrt(d);
-			VERIFY	(R>=0.f);
-			return true;
-		}
-	}
-	return false;
+    Fbox E = {-b_hsize.x, -b_hsize.y, -b_hsize.z, b_hsize.x, b_hsize.y, b_hsize.z};
+    // XForm world-2-local
+    Fvector SL, DL, PL;
+    IM.transform_tiny(SL, S);
+    IM.transform_dir(DL, D);
+
+    // Actual test
+    Fbox::ERP_Result rp_res = E.Pick2(SL, DL, PL);
+    if ((rp_res == Fbox::rpOriginOutside) || (!bCull && (rp_res == Fbox::rpOriginInside)))
+    {
+        float d = PL.distance_to_sqr(SL);
+        if (d < R*R)
+        {
+            R = _sqrt(d);
+            VERIFY(R >= 0.f);
+            return true;
+        }
+    }
+    return false;
 }
-IC bool RAYvsSPHERE(const Fsphere& s_sphere, const Fvector &S, const Fvector &D, float &R, BOOL bCull)
+IC bool RAYvsSPHERE(const Fsphere& s_sphere, const Fvector& S, const Fvector& D, float& R, BOOL bCull)
 {
-	Fsphere::ERP_Result rp_res = s_sphere.intersect(S,D,R);
-	VERIFY				(R>=0.f);
-	return				((rp_res==Fsphere::rpOriginOutside)||(!bCull&&(rp_res==Fsphere::rpOriginInside)));
+    Fsphere::ERP_Result rp_res = s_sphere.intersect(S, D, R);
+    VERIFY(R >= 0.f);
+    return ((rp_res == Fsphere::rpOriginOutside) || (!bCull && (rp_res == Fsphere::rpOriginInside)));
 }
-IC bool RAYvsCYLINDER(const Fcylinder& c_cylinder, const Fvector &S, const Fvector &D, float &R, BOOL bCull)
+IC bool RAYvsCYLINDER(const Fcylinder& c_cylinder, const Fvector& S, const Fvector& D, float& R, BOOL bCull)
 {
-	// Actual test
-	Fcylinder::ERP_Result rp_res = c_cylinder.intersect(S,D,R);
-	VERIFY				(R>=0.f);
-	return				((rp_res==Fcylinder::rpOriginOutside)||(!bCull&&(rp_res==Fcylinder::rpOriginInside)));
+    // Actual test
+    Fcylinder::ERP_Result rp_res = c_cylinder.intersect(S, D, R);
+    VERIFY(R >= 0.f);
+    return ((rp_res == Fcylinder::rpOriginOutside) || (!bCull && (rp_res == Fcylinder::rpOriginInside)));
 }
 
-CCF_Skeleton::CCF_Skeleton(CObject* O) : ICollisionForm(O,cftObject)
+CCF_Skeleton::CCF_Skeleton(CObject* O) : ICollisionForm(O, cftObject)
 {
-	//getVisData
-	IRenderVisual	*pVisual = O->Visual();
-	//IKinematics* K	= PKinematics(pVisual); VERIFY3(K,"Can't create skeleton without Kinematics.",*O->cNameVisual());
-	IKinematics* K	= PKinematics(pVisual); VERIFY3(K,"Can't create skeleton without Kinematics.",*O->cNameVisual());
-	//bv_box.set		(K->vis.box);
-	bv_box.set		(pVisual->getVisData().box);
-	bv_box.getsphere(bv_sphere.P,bv_sphere.R);
-	vis_mask		= 0;
+    //getVisData
+    IRenderVisual* pVisual = O->Visual();
+    //IKinematics* K = PKinematics(pVisual); VERIFY3(K,"Can't create skeleton without Kinematics.",*O->cNameVisual());
+    IKinematics* K = PKinematics(pVisual);
+    VERIFY3(K, "Can't create skeleton without Kinematics.", *O->cNameVisual());
+    //bv_box.set (K->vis.box);
+    bv_box.set(pVisual->getVisData().box);
+    bv_box.getsphere(bv_sphere.P, bv_sphere.R);
+    vis_mask = 0;
 }
 
 void CCF_Skeleton::BuildState()
 {
-	dwFrame				= Device.dwFrame;
-	IRenderVisual* pVisual = owner->Visual();
-	IKinematics* K		= PKinematics(pVisual);
-	K->CalculateBones();
-	const Fmatrix& L2W	= owner->XFORM();
-	
-	if (vis_mask!=K->LL_GetBonesVisible()){
-		vis_mask		= K->LL_GetBonesVisible();
-		elements.clear_not_free();
-		bv_box.set		(pVisual->getVisData().box);
-		bv_box.getsphere(bv_sphere.P,bv_sphere.R);
-		for (u16 i=0; i<K->LL_BoneCount(); i++){
-			if (!K->LL_GetBoneVisible(i))					continue;
-			SBoneShape&	shape	= K->LL_GetData(i).shape;
-			if (SBoneShape::stNone==shape.type)				continue;
-			if (shape.flags.is(SBoneShape::sfNoPickable))	continue;
-			elements.push_back	(SElement(i,shape.type));
-		}
-	}
-
-	for (ElementVecIt I=elements.begin(); I!=elements.end(); I++){
-		if (!I->valid())		continue;
-		SBoneShape&	shape		= K->LL_GetData(I->elem_id).shape;
-		Fmatrix					ME,T,TW;
-		const Fmatrix& Mbone	= K->LL_GetTransform(I->elem_id);
-
-		VERIFY2( DET(Mbone)>EPS, ( make_string("0 scale bone matrix, %d \n", I->elem_id ) + dbg_object_full_dump_string( owner ) ).c_str()  );
-
-		switch (I->type){
-			case SBoneShape::stBox:{
-				const Fobb& B		= shape.box;
-				B.xform_get			(ME			);
-
-				//VERIFY2( DET(ME)>EPS, ( make_string("0 scale bone matrix, %d \n", I->elem_id ) + dbg_object_full_dump_string( owner ) ).c_str()  );
-
-				I->b_hsize.set		(B.m_halfsize);
-				// prepare matrix World to Element
-				T.mul_43					(Mbone,ME	);		// model space
-				TW.mul_43					(L2W,T		);		// world space
-				bool b						= I->b_IM.invert_b	(TW);
-				// check matrix validity
-				if (!b)	{
-					Msg						("! ERROR: invalid bone xform . Bone disabled.");
-					Msg						("! ERROR: bone_id=[%d], world_pos[%f,%f,%f]",I->elem_id,VPUSH(TW.c));
-					Msg						("visual name %s",owner->cNameVisual().c_str());
-					Msg						("object name %s",owner->cName().c_str());
+    dwFrame = Device.dwFrame;
+    IRenderVisual* pVisual = owner->Visual();
+    IKinematics* K = PKinematics(pVisual);
+    K->CalculateBones();
+    const Fmatrix& L2W = owner->XFORM();
+
+    if (vis_mask != K->LL_GetBonesVisible())
+    {
+        vis_mask = K->LL_GetBonesVisible();
+        elements.clear_not_free();
+        bv_box.set(pVisual->getVisData().box);
+        bv_box.getsphere(bv_sphere.P, bv_sphere.R);
+        for (u16 i = 0; i<K->LL_BoneCount(); i++)
+        {
+            if (!K->LL_GetBoneVisible(i)) continue;
+            SBoneShape& shape = K->LL_GetData(i).shape;
+            if (SBoneShape::stNone == shape.type) continue;
+            if (shape.flags.is(SBoneShape::sfNoPickable)) continue;
+            elements.push_back(SElement(i, shape.type));
+        }
+    }
+
+    for (ElementVecIt I = elements.begin(); I != elements.end(); I++)
+    {
+        if (!I->valid()) continue;
+        SBoneShape& shape = K->LL_GetData(I->elem_id).shape;
+        Fmatrix ME, T, TW;
+        const Fmatrix& Mbone = K->LL_GetTransform(I->elem_id);
+
+        VERIFY2(DET(Mbone)>EPS, (make_string("0 scale bone matrix, %d \n", I->elem_id) + dbg_object_full_dump_string(owner)).c_str());
+
+        switch (I->type)
+        {
+        case SBoneShape::stBox:
+        {
+            const Fobb& B = shape.box;
+            B.xform_get(ME);
+
+            //VERIFY2( DET(ME)>EPS, ( make_string("0 scale bone matrix, %d \n", I->elem_id ) + dbg_object_full_dump_string( owner ) ).c_str() );
+
+            I->b_hsize.set(B.m_halfsize);
+            // prepare matrix World to Element
+            T.mul_43(Mbone, ME); // model space
+            TW.mul_43(L2W, T); // world space
+            bool b = I->b_IM.invert_b(TW);
+            // check matrix validity
+            if (!b)
+            {
+                Msg("! ERROR: invalid bone xform . Bone disabled.");
+                Msg("! ERROR: bone_id=[%d], world_pos[%f,%f,%f]", I->elem_id, VPUSH(TW.c));
+                Msg("visual name %s", owner->cNameVisual().c_str());
+                Msg("object name %s", owner->cName().c_str());
 #ifdef DEBUG
-					Msg						( dbg_object_full_dump_string( owner ).c_str() );
+                Msg(dbg_object_full_dump_string(owner).c_str());
 #endif //#ifdef DEBUG
-					I->elem_id				= u16(-1);				//. hack - disable invalid bone
-				}
-								   }break;
-			case SBoneShape::stSphere:{
-				const Fsphere& S	= shape.sphere;
-				Mbone.transform_tiny(I->s_sphere.P,S.P);
-				L2W.transform_tiny	(I->s_sphere.P);
-				I->s_sphere.R		= S.R;
-			}break;
-			case SBoneShape::stCylinder:{
-				const Fcylinder& C	= shape.cylinder;
-				Mbone.transform_tiny(I->c_cylinder.m_center,C.m_center);
-				L2W.transform_tiny	(I->c_cylinder.m_center);
-				Mbone.transform_dir	(I->c_cylinder.m_direction,C.m_direction);
-				L2W.transform_dir	(I->c_cylinder.m_direction);
-				I->c_cylinder.m_height	= C.m_height;
-				I->c_cylinder.m_radius	= C.m_radius;
-			}break;
-		}
-	}
+                I->elem_id = u16(-1); //. hack - disable invalid bone
+            }
+        }
+        break;
+        case SBoneShape::stSphere:
+        {
+            const Fsphere& S = shape.sphere;
+            Mbone.transform_tiny(I->s_sphere.P, S.P);
+            L2W.transform_tiny(I->s_sphere.P);
+            I->s_sphere.R = S.R;
+        }
+        break;
+        case SBoneShape::stCylinder:
+        {
+            const Fcylinder& C = shape.cylinder;
+            Mbone.transform_tiny(I->c_cylinder.m_center, C.m_center);
+            L2W.transform_tiny(I->c_cylinder.m_center);
+            Mbone.transform_dir(I->c_cylinder.m_direction, C.m_direction);
+            L2W.transform_dir(I->c_cylinder.m_direction);
+            I->c_cylinder.m_height = C.m_height;
+            I->c_cylinder.m_radius = C.m_radius;
+        }
+        break;
+        }
+    }
 }
 
 void CCF_Skeleton::BuildTopLevel()
 {
-	dwFrameTL			= Device.dwFrame;
-	IRenderVisual* K	= owner->Visual();
-	vis_data &vis = K->getVisData();
-	Fbox& B				= vis.box;
-	bv_box.min.average	(B.min);
-	bv_box.max.average	(B.max);
-	bv_box.grow			(0.05f);
-	bv_sphere.P.average	(vis.sphere.P);
-	bv_sphere.R			+= vis.sphere.R;
-	bv_sphere.R			*= 0.5f;
-	VERIFY(_valid(bv_sphere));
+    dwFrameTL = Device.dwFrame;
+    IRenderVisual* K = owner->Visual();
+    vis_data& vis = K->getVisData();
+    Fbox& B = vis.box;
+    bv_box.min.average(B.min);
+    bv_box.max.average(B.max);
+    bv_box.grow(0.05f);
+    bv_sphere.P.average(vis.sphere.P);
+    bv_sphere.R += vis.sphere.R;
+    bv_sphere.R *= 0.5f;
+    VERIFY(_valid(bv_sphere));
 }
 
-BOOL CCF_Skeleton::_RayQuery( const collide::ray_defs& Q, collide::rq_results& R)
+BOOL CCF_Skeleton::_RayQuery(const collide::ray_defs& Q, collide::rq_results& R)
 {
-	if (dwFrameTL!=Device.dwFrame)			BuildTopLevel();
-
-
-	Fsphere w_bv_sphere;
-	owner->XFORM().transform_tiny		(w_bv_sphere.P,bv_sphere.P);
-	w_bv_sphere.R						= bv_sphere.R;
-
-	// 
-	float tgt_dist						= Q.range;
-	float aft[2];
-	int quant;
-	Fsphere::ERP_Result res				= w_bv_sphere.intersect(Q.start,Q.dir,tgt_dist,quant,aft);
-	if ((Fsphere::rpNone==res)||((Fsphere::rpOriginOutside==res)&&(aft[0]>tgt_dist)) ) return FALSE;
-
-	if (dwFrame != Device.dwFrame)		BuildState	();
-	else{
-		IKinematics* K	= PKinematics	(owner->Visual());
-		if (K->LL_GetBonesVisible()!=vis_mask)	{
-			// Model changed between ray-picks
-			dwFrame		= Device.dwFrame-1	;
-			BuildState	();
-		}
-	}
-
-	BOOL bHIT			= FALSE;
-	for (ElementVecIt I=elements.begin(); I!=elements.end(); I++){
-		if (!I->valid())continue;
-		bool res		= false;
-		float range		= Q.range;
-		switch (I->type){
-		case SBoneShape::stBox:
-			res			= RAYvsOBB		(I->b_IM,I->b_hsize,Q.start,Q.dir,range,Q.flags&CDB::OPT_CULL);
-		break;
-		case SBoneShape::stSphere: 
-			res			= RAYvsSPHERE	(I->s_sphere,Q.start,Q.dir,range,Q.flags&CDB::OPT_CULL);
-
-		break;
-		case SBoneShape::stCylinder: 
-			res			= RAYvsCYLINDER	(I->c_cylinder,Q.start,Q.dir,range,Q.flags&CDB::OPT_CULL);
-		break;
-		}
-		if (res){
-			bHIT		= TRUE;
-			R.append_result				(owner,range,I->elem_id,Q.flags&CDB::OPT_ONLYNEAREST);
-			if (Q.flags&CDB::OPT_ONLYFIRST) break;
-		}
-	}
-	return bHIT;
+    if (dwFrameTL != Device.dwFrame) BuildTopLevel();
+
+
+    Fsphere w_bv_sphere;
+    owner->XFORM().transform_tiny(w_bv_sphere.P, bv_sphere.P);
+    w_bv_sphere.R = bv_sphere.R;
+
+    //
+    float tgt_dist = Q.range;
+    float aft[2];
+    int quant;
+    Fsphere::ERP_Result res = w_bv_sphere.intersect(Q.start, Q.dir, tgt_dist, quant, aft);
+    if ((Fsphere::rpNone == res) || ((Fsphere::rpOriginOutside == res) && (aft[0] > tgt_dist))) return FALSE;
+
+    if (dwFrame != Device.dwFrame) BuildState();
+    else
+    {
+        IKinematics* K = PKinematics(owner->Visual());
+        if (K->LL_GetBonesVisible() != vis_mask)
+        {
+            // Model changed between ray-picks
+            dwFrame = Device.dwFrame - 1;
+            BuildState();
+        }
+    }
+
+    BOOL bHIT = FALSE;
+    for (ElementVecIt I = elements.begin(); I != elements.end(); I++)
+    {
+        if (!I->valid())continue;
+        bool res = false;
+        float range = Q.range;
+        switch (I->type)
+        {
+        case SBoneShape::stBox:
+            res = RAYvsOBB(I->b_IM, I->b_hsize, Q.start, Q.dir, range, Q.flags&CDB::OPT_CULL);
+            break;
+        case SBoneShape::stSphere:
+            res = RAYvsSPHERE(I->s_sphere, Q.start, Q.dir, range, Q.flags&CDB::OPT_CULL);
+
+            break;
+        case SBoneShape::stCylinder:
+            res = RAYvsCYLINDER(I->c_cylinder, Q.start, Q.dir, range, Q.flags&CDB::OPT_CULL);
+            break;
+        }
+        if (res)
+        {
+            bHIT = TRUE;
+            R.append_result(owner, range, I->elem_id, Q.flags&CDB::OPT_ONLYNEAREST);
+            if (Q.flags&CDB::OPT_ONLYFIRST) break;
+        }
+    }
+    return bHIT;
 }
 
 //----------------------------------------------------------------------------------
-CCF_EventBox::CCF_EventBox( CObject* O ) : ICollisionForm(O,cftShape)
+CCF_EventBox::CCF_EventBox(CObject* O) : ICollisionForm(O, cftShape)
 {
-	Fvector A[8],B[8];
-	A[0].set( -1, -1, -1);
-	A[1].set( -1, -1, +1);
-	A[2].set( -1, +1, +1);
-	A[3].set( -1, +1, -1);
-	A[4].set( +1, +1, +1);
-	A[5].set( +1, +1, -1);
-	A[6].set( +1, -1, +1);
-	A[7].set( +1, -1, -1);
-
-	const Fmatrix& T = O->XFORM();
-	for (int i=0; i<8; i++) {
-		A[i].mul(.5f);
-		T.transform_tiny(B[i],A[i]);
-	}
-	bv_box.set		(-.5f,-.5f,-.5f,+.5f,+.5f,+.5f);
-	Fvector R; R.set(bv_box.min);
-	T.transform_dir	(R);
-	bv_sphere.R		= R.magnitude();
-
-	Planes[0].build(B[0],B[3],B[5]);
-	Planes[1].build(B[1],B[2],B[3]);
-	Planes[2].build(B[6],B[5],B[4]);
-	Planes[3].build(B[4],B[2],B[1]);
-	Planes[4].build(B[3],B[2],B[4]);
-	Planes[5].build(B[1],B[0],B[6]);
+    Fvector A[8], B[8];
+    A[0].set(-1, -1, -1);
+    A[1].set(-1, -1, +1);
+    A[2].set(-1, +1, +1);
+    A[3].set(-1, +1, -1);
+    A[4].set(+1, +1, +1);
+    A[5].set(+1, +1, -1);
+    A[6].set(+1, -1, +1);
+    A[7].set(+1, -1, -1);
+
+    const Fmatrix& T = O->XFORM();
+    for (int i = 0; i < 8; i++)
+    {
+        A[i].mul(.5f);
+        T.transform_tiny(B[i], A[i]);
+    }
+    bv_box.set(-.5f, -.5f, -.5f, +.5f, +.5f, +.5f);
+    Fvector R;
+    R.set(bv_box.min);
+    T.transform_dir(R);
+    bv_sphere.R = R.magnitude();
+
+    Planes[0].build(B[0], B[3], B[5]);
+    Planes[1].build(B[1], B[2], B[3]);
+    Planes[2].build(B[6], B[5], B[4]);
+    Planes[3].build(B[4], B[2], B[1]);
+    Planes[4].build(B[3], B[2], B[4]);
+    Planes[5].build(B[1], B[0], B[6]);
 }
 
 BOOL CCF_EventBox::Contact(CObject* O)
 {
-	IRenderVisual*	V		= O->Visual();
-	vis_data & vis = V->getVisData();
-	Fvector&		P	= vis.sphere.P;
-	float			R	= vis.sphere.R;
-	
-	Fvector			PT;
-	O->XFORM().transform_tiny(PT,P);
-	
-	for (int i=0; i<6; i++) {
-		if (Planes[i].classify(PT)>R) return FALSE;
-	}
-	return TRUE;
+    IRenderVisual* V = O->Visual();
+    vis_data& vis = V->getVisData();
+    Fvector& P = vis.sphere.P;
+    float R = vis.sphere.R;
+
+    Fvector PT;
+    O->XFORM().transform_tiny(PT, P);
+
+    for (int i = 0; i < 6; i++)
+    {
+        if (Planes[i].classify(PT) > R) return FALSE;
+    }
+    return TRUE;
 }
 BOOL CCF_EventBox::_RayQuery(const collide::ray_defs& Q, collide::rq_results& R)
-{	return FALSE; }
+{
+    return FALSE;
+}
 /*
 void CCF_EventBox::_BoxQuery(const Fbox& B, const Fmatrix& M, u32 flags)
-{   return; }
+{ return; }
 */
 
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
-CCF_Shape::CCF_Shape(CObject* _owner) : ICollisionForm(_owner,cftShape)
+CCF_Shape::CCF_Shape(CObject* _owner) : ICollisionForm(_owner, cftShape)
 {
 }
 BOOL CCF_Shape::_RayQuery(const collide::ray_defs& Q, collide::rq_results& R)
-{	
-	// Convert ray into local model space
-	Fvector dS, dD;
-	Fmatrix temp; 
-	temp.invert			(owner->XFORM());
-	temp.transform_tiny	(dS,Q.start);
-	temp.transform_dir	(dD,Q.dir);
-
-	// 
-	if (!bv_sphere.intersect(dS,dD))	return FALSE;
-
-	BOOL bHIT = FALSE;
-	for (u32 el=0; el<shapes.size(); el++)
-	{
-		shape_def& shape= shapes[el];
-		float range		= Q.range;
-		switch (shape.type)
-		{
-		case 0:
-			{ // sphere
-				Fsphere::ERP_Result	rp_res 	= shape.data.sphere.intersect(dS,dD,range);
-				if ((rp_res==Fsphere::rpOriginOutside)||(!(Q.flags&CDB::OPT_CULL)&&(rp_res==Fsphere::rpOriginInside))){
-					bHIT	= TRUE;
-					R.append_result(owner,range,el,Q.flags&CDB::OPT_ONLYNEAREST);
-					if (Q.flags&CDB::OPT_ONLYFIRST) return TRUE;
-				}
-			}
-			break;
-		case 1: // box
-			{
-				Fbox				box;
-				box.identity		();
-				Fmatrix& B			= shape.data.ibox;
-				Fvector				S1,D1,P;
-				B.transform_tiny	(S1,dS);
-				B.transform_dir		(D1,dD);
-				Fbox::ERP_Result	rp_res 	= box.Pick2(S1,D1,P);
-				if ((rp_res==Fbox::rpOriginOutside)||(!(Q.flags&CDB::OPT_CULL)&&(rp_res==Fbox::rpOriginInside))){
-					float d			= P.distance_to_sqr(dS);
-					if (d<range*range) {
-						range		= _sqrt(d);
-						bHIT		= TRUE;
-						R.append_result(owner,range,el,Q.flags&CDB::OPT_ONLYNEAREST);
-						if (Q.flags&CDB::OPT_ONLYFIRST) return TRUE;
-					}
-				}
-			}
-			break;
-		}
-	}
-	return bHIT;
+{
+    // Convert ray into local model space
+    Fvector dS, dD;
+    Fmatrix temp;
+    temp.invert(owner->XFORM());
+    temp.transform_tiny(dS, Q.start);
+    temp.transform_dir(dD, Q.dir);
+
+    //
+    if (!bv_sphere.intersect(dS, dD)) return FALSE;
+
+    BOOL bHIT = FALSE;
+    for (u32 el = 0; el < shapes.size(); el++)
+    {
+        shape_def& shape = shapes[el];
+        float range = Q.range;
+        switch (shape.type)
+        {
+        case 0:
+        {
+            // sphere
+            Fsphere::ERP_Result rp_res = shape.data.sphere.intersect(dS, dD, range);
+            if ((rp_res == Fsphere::rpOriginOutside) || (!(Q.flags&CDB::OPT_CULL) && (rp_res == Fsphere::rpOriginInside)))
+            {
+                bHIT = TRUE;
+                R.append_result(owner, range, el, Q.flags&CDB::OPT_ONLYNEAREST);
+                if (Q.flags&CDB::OPT_ONLYFIRST) return TRUE;
+            }
+        }
+        break;
+        case 1: // box
+        {
+            Fbox box;
+            box.identity();
+            Fmatrix& B = shape.data.ibox;
+            Fvector S1, D1, P;
+            B.transform_tiny(S1, dS);
+            B.transform_dir(D1, dD);
+            Fbox::ERP_Result rp_res = box.Pick2(S1, D1, P);
+            if ((rp_res == Fbox::rpOriginOutside) || (!(Q.flags&CDB::OPT_CULL) && (rp_res == Fbox::rpOriginInside)))
+            {
+                float d = P.distance_to_sqr(dS);
+                if (d < range*range)
+                {
+                    range = _sqrt(d);
+                    bHIT = TRUE;
+                    R.append_result(owner, range, el, Q.flags&CDB::OPT_ONLYNEAREST);
+                    if (Q.flags&CDB::OPT_ONLYFIRST) return TRUE;
+                }
+            }
+        }
+        break;
+        }
+    }
+    return bHIT;
 }
 /*
 void CCF_Shape::_BoxQuery(const Fbox& B, const Fmatrix& M, u32 flags)
-{   return; }
+{ return; }
 */
-void CCF_Shape::add_sphere	(Fsphere& S )
+void CCF_Shape::add_sphere(Fsphere& S)
 {
-	shapes.push_back(shape_def());
-	shapes.back().type	= 0;
-	shapes.back().data.sphere.set(S);
+    shapes.push_back(shape_def());
+    shapes.back().type = 0;
+    shapes.back().data.sphere.set(S);
 }
 
-void CCF_Shape::add_box		(Fmatrix& B )
+void CCF_Shape::add_box(Fmatrix& B)
 {
-	shapes.push_back(shape_def());
-	shapes.back().type	= 1;
-	shapes.back().data.box.set(B);
-	shapes.back().data.ibox.invert(B);
+    shapes.push_back(shape_def());
+    shapes.back().type = 1;
+    shapes.back().data.box.set(B);
+    shapes.back().data.ibox.invert(B);
 }
 
 void CCF_Shape::ComputeBounds()
 {
-	bv_box.invalidate	();
-
-	BOOL bCalcSphere	= (shapes.size()>1);
-	for (u32 el=0; el<shapes.size(); el++)
-	{
-		switch (shapes[el].type)
-		{
-		case 0: // sphere
-			{
-				Fsphere		T		= shapes[el].data.sphere;
-				Fvector		P;
-				P.set		(T.P);	P.sub(T.R);	bv_box.modify(P);
-				P.set		(T.P);	P.add(T.R);	bv_box.modify(P);
-				bv_sphere	= T;
-			}
-			break;
-		case 1:	// box
-			{
-				Fvector		A,B;
-				Fmatrix&	T		= shapes[el].data.box;
-				
-				// Build points
-				A.set( -.5f, -.5f, -.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-				A.set( -.5f, -.5f, +.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-				A.set( -.5f, +.5f, +.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-				A.set( -.5f, +.5f, -.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-				A.set( +.5f, +.5f, +.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-				A.set( +.5f, +.5f, -.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-				A.set( +.5f, -.5f, +.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-				A.set( +.5f, -.5f, -.5f); T.transform_tiny	(B,A); bv_box.modify(B);
-
-				bCalcSphere	= TRUE;
-			}
-			break;
-		}
-	}
-	if (bCalcSphere) bv_box.getsphere(bv_sphere.P,bv_sphere.R);
+    bv_box.invalidate();
+
+    BOOL bCalcSphere = (shapes.size() > 1);
+    for (u32 el = 0; el < shapes.size(); el++)
+    {
+        switch (shapes[el].type)
+        {
+        case 0: // sphere
+        {
+            Fsphere T = shapes[el].data.sphere;
+            Fvector P;
+            P.set(T.P);
+            P.sub(T.R);
+            bv_box.modify(P);
+            P.set(T.P);
+            P.add(T.R);
+            bv_box.modify(P);
+            bv_sphere = T;
+        }
+        break;
+        case 1: // box
+        {
+            Fvector A, B;
+            Fmatrix& T = shapes[el].data.box;
+
+            // Build points
+            A.set(-.5f, -.5f, -.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+            A.set(-.5f, -.5f, +.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+            A.set(-.5f, +.5f, +.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+            A.set(-.5f, +.5f, -.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+            A.set(+.5f, +.5f, +.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+            A.set(+.5f, +.5f, -.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+            A.set(+.5f, -.5f, +.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+            A.set(+.5f, -.5f, -.5f);
+            T.transform_tiny(B, A);
+            bv_box.modify(B);
+
+            bCalcSphere = TRUE;
+        }
+        break;
+        }
+    }
+    if (bCalcSphere) bv_box.getsphere(bv_sphere.P, bv_sphere.R);
 }
 
-BOOL CCF_Shape::Contact		( CObject* O )
+BOOL CCF_Shape::Contact(CObject* O)
 {
-	// Build object-sphere in World-Space
-	Fsphere			S;
-	if (O->Visual()){
-		O->Center		(S.P);
-		S.R				= O->Radius();
-	}else if (O->CFORM()){
-		S = O->CFORM()->getSphere();
-		O->XFORM().transform_tiny(S.P);
-	}else return FALSE;
-	
-	// Get our matrix
-	const Fmatrix& XF	= Owner()->XFORM();
-	
-	// Iterate
-	for (u32 el=0; el<shapes.size(); el++)
-	{
-		switch (shapes[el].type)
-		{
-		case 0: // sphere
-			{
-				Fsphere		Q;
-				Fsphere&	T		= shapes[el].data.sphere;
-				XF.transform_tiny	(Q.P,T.P);
-				Q.R					= T.R;
-				if (S.intersect(Q))	return TRUE;
-			}
-			break;
-		case 1:	// box
-			{
-				Fmatrix		Q;
-				Fmatrix&	T		= shapes[el].data.box;
-				Q.mul_43			( XF,T);
-
-				// Build points
-				Fvector A,B[8];
-				Fplane  P;
-				A.set(-.5f, -.5f, -.5f);	Q.transform_tiny(B[0],A);
-				A.set(-.5f, -.5f, +.5f);	Q.transform_tiny(B[1],A);
-				A.set(-.5f, +.5f, +.5f);	Q.transform_tiny(B[2],A);
-				A.set(-.5f, +.5f, -.5f);	Q.transform_tiny(B[3],A);
-				A.set(+.5f, +.5f, +.5f);	Q.transform_tiny(B[4],A);
-				A.set(+.5f, +.5f, -.5f);	Q.transform_tiny(B[5],A);
-				A.set(+.5f, -.5f, +.5f);	Q.transform_tiny(B[6],A);
-				A.set(+.5f, -.5f, -.5f);	Q.transform_tiny(B[7],A);
-
-				P.build(B[0],B[3],B[5]);	if (P.classify(S.P)>S.R) break;
-				P.build(B[1],B[2],B[3]);	if (P.classify(S.P)>S.R) break;
-				P.build(B[6],B[5],B[4]);	if (P.classify(S.P)>S.R) break;
-				P.build(B[4],B[2],B[1]);	if (P.classify(S.P)>S.R) break;
-				P.build(B[3],B[2],B[4]);	if (P.classify(S.P)>S.R) break;
-				P.build(B[1],B[0],B[6]);	if (P.classify(S.P)>S.R) break;
-				return TRUE;
-			}
-			break;
-		}
-	}
-	return FALSE;
+    // Build object-sphere in World-Space
+    Fsphere S;
+    if (O->Visual())
+    {
+        O->Center(S.P);
+        S.R = O->Radius();
+    }
+    else if (O->CFORM())
+    {
+        S = O->CFORM()->getSphere();
+        O->XFORM().transform_tiny(S.P);
+    }
+    else return FALSE;
+
+    // Get our matrix
+    const Fmatrix& XF = Owner()->XFORM();
+
+    // Iterate
+    for (u32 el = 0; el < shapes.size(); el++)
+    {
+        switch (shapes[el].type)
+        {
+        case 0: // sphere
+        {
+            Fsphere Q;
+            Fsphere& T = shapes[el].data.sphere;
+            XF.transform_tiny(Q.P, T.P);
+            Q.R = T.R;
+            if (S.intersect(Q)) return TRUE;
+        }
+        break;
+        case 1: // box
+        {
+            Fmatrix Q;
+            Fmatrix& T = shapes[el].data.box;
+            Q.mul_43(XF, T);
+
+            // Build points
+            Fvector A, B[8];
+            Fplane P;
+            A.set(-.5f, -.5f, -.5f);
+            Q.transform_tiny(B[0], A);
+            A.set(-.5f, -.5f, +.5f);
+            Q.transform_tiny(B[1], A);
+            A.set(-.5f, +.5f, +.5f);
+            Q.transform_tiny(B[2], A);
+            A.set(-.5f, +.5f, -.5f);
+            Q.transform_tiny(B[3], A);
+            A.set(+.5f, +.5f, +.5f);
+            Q.transform_tiny(B[4], A);
+            A.set(+.5f, +.5f, -.5f);
+            Q.transform_tiny(B[5], A);
+            A.set(+.5f, -.5f, +.5f);
+            Q.transform_tiny(B[6], A);
+            A.set(+.5f, -.5f, -.5f);
+            Q.transform_tiny(B[7], A);
+
+            P.build(B[0], B[3], B[5]);
+            if (P.classify(S.P) > S.R) break;
+            P.build(B[1], B[2], B[3]);
+            if (P.classify(S.P) > S.R) break;
+            P.build(B[6], B[5], B[4]);
+            if (P.classify(S.P) > S.R) break;
+            P.build(B[4], B[2], B[1]);
+            if (P.classify(S.P) > S.R) break;
+            P.build(B[3], B[2], B[4]);
+            if (P.classify(S.P) > S.R) break;
+            P.build(B[1], B[0], B[6]);
+            if (P.classify(S.P) > S.R) break;
+            return TRUE;
+        }
+        break;
+        }
+    }
+    return FALSE;
 }
diff --git a/src/xrEngine/xr_collide_form.h b/src/xrEngine/xr_collide_form.h
index a241eeec58c..dd9dd6f9a4c 100644
--- a/src/xrEngine/xr_collide_form.h
+++ b/src/xrEngine/xr_collide_form.h
@@ -4,193 +4,200 @@
 #include "../xrcdb/xr_collide_defs.h"
 
 // refs
-class ENGINE_API	CObject;
-class ENGINE_API	CInifile;
+class ENGINE_API CObject;
+class ENGINE_API CInifile;
 
 // t-defs
-const u32	clGET_TRIS			= (1<<0);
-const u32	clGET_BOXES			= (1<<1);
-const u32	clGET_SPHERES		= (1<<2);
-const u32	clQUERY_ONLYFIRST	= (1<<3);	// stop if was any collision
-const u32	clQUERY_TOPLEVEL	= (1<<4);	// get only top level of model box/sphere
-const u32	clQUERY_STATIC		= (1<<5);	// static
-const u32	clQUERY_DYNAMIC		= (1<<6);	// dynamic
-const u32	clCOARSE			= (1<<7);	// coarse test (triangles vs obb)
+const u32 clGET_TRIS = (1 << 0);
+const u32 clGET_BOXES = (1 << 1);
+const u32 clGET_SPHERES = (1 << 2);
+const u32 clQUERY_ONLYFIRST = (1 << 3); // stop if was any collision
+const u32 clQUERY_TOPLEVEL = (1 << 4); // get only top level of model box/sphere
+const u32 clQUERY_STATIC = (1 << 5); // static
+const u32 clQUERY_DYNAMIC = (1 << 6); // dynamic
+const u32 clCOARSE = (1 << 7); // coarse test (triangles vs obb)
 
 struct clQueryTri
 {
-	Fvector				p[3];
-	const CDB::TRI		*T;
+    Fvector p[3];
+    const CDB::TRI* T;
 };
 
 struct clQueryCollision
 {
-	xr_vector<CObject*>		objects;		// affected objects
-	xr_vector<clQueryTri>	tris;			// triangles		(if queried)
-	xr_vector<Fobb>			boxes;			// boxes/ellipsoids	(if queried)
-	xr_vector<Fvector4>		spheres;		// spheres			(if queried)
-	
-	IC void				Clear	()
-	{
-		objects.clear	();
-		tris.clear		();
-		boxes.clear		();
-		spheres.clear	();
-	}
-	IC void				AddTri( const Fmatrix& m, const CDB::TRI* one, const Fvector* verts ) 
-	{
-		clQueryTri	T;
-		m.transform_tiny	(T.p[0],verts[one->verts[0]]);
-		m.transform_tiny	(T.p[1],verts[one->verts[1]]);
-		m.transform_tiny	(T.p[2],verts[one->verts[2]]);
-		T.T					= one;
-		tris.push_back		(T);
-	}
-	IC void				AddTri(const CDB::TRI* one, const Fvector* verts ) 
-	{
-		clQueryTri			T;
-		T.p[0]				= verts[one->verts[0]];
-		T.p[1]				= verts[one->verts[1]];
-		T.p[2]				= verts[one->verts[2]];
-		T.T					= one;
-		tris.push_back		(T);
-	}
-	IC void				AddBox(const Fmatrix& M, const Fbox& B)
-	{
-		Fobb			box;
-		Fvector			c;
-		B.getcenter		(c);
-		B.getradius		(box.m_halfsize);
-		
-		Fmatrix			T,R;
-		T.translate		(c);
-		R.mul_43		(M,T);
-
-		box.xform_set	(R);
-		boxes.push_back	(box);
-	}
-	IC void				AddBox(const Fobb& B)
-	{
-		boxes.push_back	(B);
-	}
+    xr_vector<CObject*> objects; // affected objects
+    xr_vector<clQueryTri> tris; // triangles (if queried)
+    xr_vector<Fobb> boxes; // boxes/ellipsoids (if queried)
+    xr_vector<Fvector4> spheres; // spheres (if queried)
+
+    IC void Clear()
+    {
+        objects.clear();
+        tris.clear();
+        boxes.clear();
+        spheres.clear();
+    }
+    IC void AddTri(const Fmatrix& m, const CDB::TRI* one, const Fvector* verts)
+    {
+        clQueryTri T;
+        m.transform_tiny(T.p[0], verts[one->verts[0]]);
+        m.transform_tiny(T.p[1], verts[one->verts[1]]);
+        m.transform_tiny(T.p[2], verts[one->verts[2]]);
+        T.T = one;
+        tris.push_back(T);
+    }
+    IC void AddTri(const CDB::TRI* one, const Fvector* verts)
+    {
+        clQueryTri T;
+        T.p[0] = verts[one->verts[0]];
+        T.p[1] = verts[one->verts[1]];
+        T.p[2] = verts[one->verts[2]];
+        T.T = one;
+        tris.push_back(T);
+    }
+    IC void AddBox(const Fmatrix& M, const Fbox& B)
+    {
+        Fobb box;
+        Fvector c;
+        B.getcenter(c);
+        B.getradius(box.m_halfsize);
+
+        Fmatrix T, R;
+        T.translate(c);
+        R.mul_43(M, T);
+
+        box.xform_set(R);
+        boxes.push_back(box);
+    }
+    IC void AddBox(const Fobb& B)
+    {
+        boxes.push_back(B);
+    }
 };
 
-enum /*ENGINE_API*/	ECollisionFormType{
-	cftObject,
-	cftShape
+enum /*ENGINE_API*/ ECollisionFormType
+{
+    cftObject,
+    cftShape
 };
 
-class ENGINE_API	ICollisionForm
+class ENGINE_API ICollisionForm
 {
-	friend class	CObjectSpace;
+    friend class CObjectSpace;
 protected:
-	CObject*		owner;			// âëàäåëåö
-	u32				dwQueryID;
+    CObject* owner; // âëàäåëåö
+    u32 dwQueryID;
 protected:
-	Fbox			bv_box;			// (Local) BBox îáúåêòà
-	Fsphere			bv_sphere;		// (Local) Sphere 
+    Fbox bv_box; // (Local) BBox îáúåêòà
+    Fsphere bv_sphere; // (Local) Sphere
 private:
-	ECollisionFormType	m_type;
+    ECollisionFormType m_type;
 public:
-					ICollisionForm	( CObject* _owner, ECollisionFormType tp );
-	virtual			~ICollisionForm	( );
+    ICollisionForm(CObject* _owner, ECollisionFormType tp);
+    virtual ~ICollisionForm();
 
-	virtual BOOL	_RayQuery		( const collide::ray_defs& Q, collide::rq_results& R) = 0;
-	//virtual void	_BoxQuery		( const Fbox& B, const Fmatrix& M, u32 flags)	= 0;
+    virtual BOOL _RayQuery(const collide::ray_defs& Q, collide::rq_results& R) = 0;
+    //virtual void _BoxQuery ( const Fbox& B, const Fmatrix& M, u32 flags) = 0;
 
-	IC CObject*		Owner			( )	const				{ return owner;			}
-	const Fbox&		getBBox			( )	const				{ return bv_box;		}
-	float			getRadius		( )	const				{ return bv_sphere.R;	}
-	const Fsphere&	getSphere		( )	const				{ return bv_sphere;		}
-	const ECollisionFormType Type	( ) const				{ return m_type;		}
+    IC CObject* Owner() const { return owner; }
+    const Fbox& getBBox() const { return bv_box; }
+    float getRadius() const { return bv_sphere.R; }
+    const Fsphere& getSphere() const { return bv_sphere; }
+    const ECollisionFormType Type() const { return m_type; }
 };
 
-class ENGINE_API	CCF_Skeleton : public ICollisionForm
+class ENGINE_API CCF_Skeleton : public ICollisionForm
 {
 public:
-	struct ENGINE_API SElement {
-		union{
-			struct{
-				Fmatrix	b_IM;		// world 2 bone xform
-				Fvector	b_hsize;
-			};
-			struct{
-				Fsphere	s_sphere;
-			};
-			struct{
-				Fcylinder c_cylinder;
-			};
-		};
-		u16				type;
-		u16				elem_id;
-	public:
-						SElement	()				:elem_id(u16(-1)),type(0)	{}
-						SElement	(u16 id, u16 t)	:elem_id(id),type(t)		{}
-		BOOL			valid		() const									{return (elem_id!=(u16(-1)))&&(type!=0);}
-		void			center		(Fvector& center) const;
-	};
-	DEFINE_VECTOR		(SElement,ElementVec,ElementVecIt);
+    struct ENGINE_API SElement
+    {
+        union
+        {
+            struct
+            {
+                Fmatrix b_IM; // world 2 bone xform
+                Fvector b_hsize;
+            };
+            struct
+            {
+                Fsphere s_sphere;
+            };
+            struct
+            {
+                Fcylinder c_cylinder;
+            };
+        };
+        u16 type;
+        u16 elem_id;
+    public:
+        SElement() :elem_id(u16(-1)), type(0) {}
+        SElement(u16 id, u16 t) :elem_id(id), type(t) {}
+        BOOL valid() const { return (elem_id != (u16(-1))) && (type != 0); }
+        void center(Fvector& center) const;
+    };
+    DEFINE_VECTOR(SElement, ElementVec, ElementVecIt);
 private:
-	u64					vis_mask;
-	ElementVec			elements;
+    u64 vis_mask;
+    ElementVec elements;
 
-	u32					dwFrame;		// The model itself
-	u32					dwFrameTL;		// Top level
+    u32 dwFrame; // The model itself
+    u32 dwFrameTL; // Top level
 
-	void				BuildState		();
-	void				BuildTopLevel	();
+    void BuildState();
+    void BuildTopLevel();
 public:
-						CCF_Skeleton	( CObject* _owner );
+    CCF_Skeleton(CObject* _owner);
 
-	virtual BOOL		_RayQuery		( const collide::ray_defs& Q, collide::rq_results& R);
-	bool				_ElementCenter	(u16 elem_id, Fvector& e_center);
-	const ElementVec&	_GetElements	() {return elements;}
+    virtual BOOL _RayQuery(const collide::ray_defs& Q, collide::rq_results& R);
+    bool _ElementCenter(u16 elem_id, Fvector& e_center);
+    const ElementVec& _GetElements() { return elements; }
 #ifdef DEBUG
-	void				_dbg_refresh	(){BuildTopLevel();BuildState();}
+    void _dbg_refresh() { BuildTopLevel(); BuildState(); }
 #endif
 };
 
-class ENGINE_API	CCF_EventBox : public ICollisionForm
+class ENGINE_API CCF_EventBox : public ICollisionForm
 {
 private:
-	Fplane			Planes[6];
+    Fplane Planes[6];
 public:
-					CCF_EventBox	( CObject* _owner );
+    CCF_EventBox(CObject* _owner);
 
-	virtual BOOL	_RayQuery		( const collide::ray_defs& Q, collide::rq_results& R);
-	//virtual void	_BoxQuery		( const Fbox& B, const Fmatrix& M, u32 flags);
+    virtual BOOL _RayQuery(const collide::ray_defs& Q, collide::rq_results& R);
+    //virtual void _BoxQuery ( const Fbox& B, const Fmatrix& M, u32 flags);
 
-	BOOL			Contact			( CObject* O );
+    BOOL Contact(CObject* O);
 };
 
-class ENGINE_API	CCF_Shape	: public ICollisionForm
+class ENGINE_API CCF_Shape : public ICollisionForm
 {
 public:
-	union shape_data
-	{
-		Fsphere		sphere;
-		struct{
-			Fmatrix	box;
-			Fmatrix	ibox;
-		};
-	};
-	struct shape_def
-	{
-		int			type;
-		shape_data	data;
-	};
-	xr_vector<shape_def>	shapes;
+    union shape_data
+    {
+        Fsphere sphere;
+        struct
+        {
+            Fmatrix box;
+            Fmatrix ibox;
+        };
+    };
+    struct shape_def
+    {
+        int type;
+        shape_data data;
+    };
+    xr_vector<shape_def> shapes;
 public:
-					CCF_Shape		( CObject* _owner );
+    CCF_Shape(CObject* _owner);
 
-	virtual BOOL	_RayQuery		( const collide::ray_defs& Q, collide::rq_results& R);
-	//virtual void	_BoxQuery		( const Fbox& B, const Fmatrix& M, u32 flags);
+    virtual BOOL _RayQuery(const collide::ray_defs& Q, collide::rq_results& R);
+    //virtual void _BoxQuery ( const Fbox& B, const Fmatrix& M, u32 flags);
 
-	void			add_sphere		( Fsphere& S	);
-	void			add_box			( Fmatrix& B	);
-	void			ComputeBounds	( );
-	BOOL			Contact			( CObject* O	);
-	xr_vector<shape_def>& Shapes	(){return shapes;}
+    void add_sphere(Fsphere& S);
+    void add_box(Fmatrix& B);
+    void ComputeBounds();
+    BOOL Contact(CObject* O);
+    xr_vector<shape_def>& Shapes() { return shapes; }
 };
 
 #endif //__XR_COLLIDE_FORM_H__
diff --git a/src/xrEngine/xr_efflensflare.cpp b/src/xrEngine/xr_efflensflare.cpp
index 9add79afde1..dbec546c4b9 100644
--- a/src/xrEngine/xr_efflensflare.cpp
+++ b/src/xrEngine/xr_efflensflare.cpp
@@ -6,7 +6,7 @@
 #include "igame_persistent.h"
 #include "Environment.h"
 //#include "SkeletonCustom.h"
-//	Instead of SkeletonCustom:
+// Instead of SkeletonCustom:
 #include "bone.h"
 #include "../Include/xrRender/Kinematics.h"
 #include "cl_intersect.h"
@@ -14,16 +14,16 @@
 #include "../xrServerEntities/object_broker.h"
 
 #ifdef _EDITOR
-    #include "ui_toolscustom.h"
-    #include "ui_main.h"
+#include "ui_toolscustom.h"
+#include "ui_main.h"
 #else
-	#include "xr_object.h"
-	#include "igame_level.h"
+#include "xr_object.h"
+#include "igame_level.h"
 #endif
 
 #define FAR_DIST g_pGamePersistent->Environment().CurrentEnv->far_plane
 
-//#define MAX_Flares	24
+//#define MAX_Flares 24
 //////////////////////////////////////////////////////////////////////////////
 // Globals ///////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -33,556 +33,590 @@
 //------------------------------------------------------------------------------
 void CLensFlareDescriptor::SetSource(float fRadius, BOOL ign_color, LPCSTR tex_name, LPCSTR sh_name)
 {
-	m_Source.fRadius	= fRadius;
-    m_Source.shader		= sh_name;
-    m_Source.texture	= tex_name;
-    m_Source.ignore_color=ign_color;
+    m_Source.fRadius = fRadius;
+    m_Source.shader = sh_name;
+    m_Source.texture = tex_name;
+    m_Source.ignore_color = ign_color;
 }
 
 void CLensFlareDescriptor::SetGradient(float fMaxRadius, float fOpacity, LPCSTR tex_name, LPCSTR sh_name)
 {
-	m_Gradient.fRadius	= fMaxRadius;
-	m_Gradient.fOpacity	= fOpacity;
-    m_Gradient.shader	= sh_name;
-    m_Gradient.texture	= tex_name;
+    m_Gradient.fRadius = fMaxRadius;
+    m_Gradient.fOpacity = fOpacity;
+    m_Gradient.shader = sh_name;
+    m_Gradient.texture = tex_name;
 }
 
 void CLensFlareDescriptor::AddFlare(float fRadius, float fOpacity, float fPosition, LPCSTR tex_name, LPCSTR sh_name)
 {
-	SFlare F;
-	F.fRadius	= fRadius;
-	F.fOpacity	= fOpacity;
-    F.fPosition	= fPosition;
-    F.shader	= sh_name;
-    F.texture	= tex_name;
-	m_Flares.push_back	(F);
+    SFlare F;
+    F.fRadius = fRadius;
+    F.fOpacity = fOpacity;
+    F.fPosition = fPosition;
+    F.shader = sh_name;
+    F.texture = tex_name;
+    m_Flares.push_back(F);
 }
 
 /*
 ref_shader CLensFlareDescriptor::CreateShader(LPCSTR tex_name, LPCSTR sh_name)
 {
-	ref_shader	R;
-	if			(tex_name&&tex_name[0])	R.create(sh_name,tex_name);
-	return		R;
+ref_shader R;
+if (tex_name&&tex_name[0]) R.create(sh_name,tex_name);
+return R;
 }
 */
 
 void CLensFlareDescriptor::load(CInifile* pIni, LPCSTR sect)
 {
-	section		= sect;
-	m_Flags.set	(flSource,pIni->r_bool(sect,"sun" ));
-	if (m_Flags.is(flSource)){
-		LPCSTR S= pIni->r_string 	( sect,"sun_shader" );
-		LPCSTR T= pIni->r_string 	( sect,"sun_texture" );
-		float r = pIni->r_float		( sect,"sun_radius" );
-		BOOL i 	= pIni->r_bool		( sect,"sun_ignore_color" );
-		SetSource(r,i,T,S);
-	}
-	m_Flags.set	(flFlare,pIni->r_bool ( sect,"flares" ));
-	if (m_Flags.is(flFlare)){
-	    LPCSTR S= pIni->r_string 	( sect,"flare_shader" );
-		LPCSTR T= pIni->r_string 	( sect,"flare_textures" );
-		LPCSTR R= pIni->r_string 	( sect,"flare_radius" );
-		LPCSTR O= pIni->r_string 	( sect,"flare_opacity");
-		LPCSTR P= pIni->r_string 	( sect,"flare_position");
-		u32 tcnt= _GetItemCount(T);
+    section = sect;
+    m_Flags.set(flSource, pIni->r_bool(sect, "sun"));
+    if (m_Flags.is(flSource))
+    {
+        LPCSTR S = pIni->r_string(sect, "sun_shader");
+        LPCSTR T = pIni->r_string(sect, "sun_texture");
+        float r = pIni->r_float(sect, "sun_radius");
+        BOOL i = pIni->r_bool(sect, "sun_ignore_color");
+        SetSource(r, i, T, S);
+    }
+    m_Flags.set(flFlare, pIni->r_bool(sect, "flares"));
+    if (m_Flags.is(flFlare))
+    {
+        LPCSTR S = pIni->r_string(sect, "flare_shader");
+        LPCSTR T = pIni->r_string(sect, "flare_textures");
+        LPCSTR R = pIni->r_string(sect, "flare_radius");
+        LPCSTR O = pIni->r_string(sect, "flare_opacity");
+        LPCSTR P = pIni->r_string(sect, "flare_position");
+        u32 tcnt = _GetItemCount(T);
         string256 name;
-		for (u32 i=0; i<tcnt; i++){
-			_GetItem(R,i,name); float r=(float)atof(name);
-			_GetItem(O,i,name); float o=(float)atof(name);
-			_GetItem(P,i,name); float p=(float)atof(name);
-			_GetItem(T,i,name);
-			AddFlare(r,o,p,name,S);
-		}
-	}
-	m_Flags.set	(flGradient,CInifile::IsBOOL(pIni->r_string( sect, "gradient")));
-	if (m_Flags.is(flGradient)){
-		LPCSTR S= pIni->r_string 	( sect,"gradient_shader" );
-		LPCSTR T= pIni->r_string	( sect,"gradient_texture" );
-		float r	= pIni->r_float		( sect,"gradient_radius"  );
-		float o = pIni->r_float		( sect,"gradient_opacity" );
-		SetGradient(r,o,T,S);
-	}
-    m_StateBlendUpSpeed	= 1.f/(_max(pIni->r_float( sect,"blend_rise_time" ),0.f)+EPS_S);
-    m_StateBlendDnSpeed	= 1.f/(_max(pIni->r_float( sect,"blend_down_time" ),0.f)+EPS_S);
-
-	OnDeviceCreate();
+        for (u32 i = 0; i < tcnt; i++)
+        {
+            _GetItem(R, i, name);
+            float r = (float)atof(name);
+            _GetItem(O, i, name);
+            float o = (float)atof(name);
+            _GetItem(P, i, name);
+            float p = (float)atof(name);
+            _GetItem(T, i, name);
+            AddFlare(r, o, p, name, S);
+        }
+    }
+    m_Flags.set(flGradient, CInifile::IsBOOL(pIni->r_string(sect, "gradient")));
+    if (m_Flags.is(flGradient))
+    {
+        LPCSTR S = pIni->r_string(sect, "gradient_shader");
+        LPCSTR T = pIni->r_string(sect, "gradient_texture");
+        float r = pIni->r_float(sect, "gradient_radius");
+        float o = pIni->r_float(sect, "gradient_opacity");
+        SetGradient(r, o, T, S);
+    }
+    m_StateBlendUpSpeed = 1.f / (_max(pIni->r_float(sect, "blend_rise_time"), 0.f) + EPS_S);
+    m_StateBlendDnSpeed = 1.f / (_max(pIni->r_float(sect, "blend_down_time"), 0.f) + EPS_S);
+
+    OnDeviceCreate();
 }
 
 void CLensFlareDescriptor::OnDeviceCreate()
 {
-	// shaders
-	m_Gradient.m_pRender->CreateShader(*m_Gradient.shader,*m_Gradient.texture);
-	m_Source.m_pRender->CreateShader(*m_Source.shader,*m_Source.texture);
-	for (FlareIt it=m_Flares.begin(); it!=m_Flares.end(); it++) 
-		it->m_pRender->CreateShader(*it->shader,*it->texture);
-	/*
-	m_Gradient.hShader	= CreateShader	(*m_Gradient.texture,*m_Gradient.shader);
-	m_Source.hShader	= CreateShader	(*m_Source.texture,*m_Source.shader);
+    // shaders
+    m_Gradient.m_pRender->CreateShader(*m_Gradient.shader, *m_Gradient.texture);
+    m_Source.m_pRender->CreateShader(*m_Source.shader, *m_Source.texture);
+    for (FlareIt it = m_Flares.begin(); it != m_Flares.end(); it++)
+        it->m_pRender->CreateShader(*it->shader, *it->texture);
+    /*
+    m_Gradient.hShader = CreateShader (*m_Gradient.texture,*m_Gradient.shader);
+    m_Source.hShader = CreateShader (*m_Source.texture,*m_Source.shader);
     for (FlareIt it=m_Flares.begin(); it!=m_Flares.end(); it++) it->hShader = CreateShader(*it->texture,*it->shader);
-	*/
+    */
 }
 
 void CLensFlareDescriptor::OnDeviceDestroy()
 {
-	// shaders
-	m_Gradient.m_pRender->DestroyShader();
-	m_Source.m_pRender->DestroyShader();
-	for (FlareIt it=m_Flares.begin(); it!=m_Flares.end(); it++)
-		it->m_pRender->DestroyShader();
-	/*
-    m_Gradient.hShader.destroy	();
-    m_Source.hShader.destroy	();
+    // shaders
+    m_Gradient.m_pRender->DestroyShader();
+    m_Source.m_pRender->DestroyShader();
+    for (FlareIt it = m_Flares.begin(); it != m_Flares.end(); it++)
+        it->m_pRender->DestroyShader();
+    /*
+    m_Gradient.hShader.destroy ();
+    m_Source.hShader.destroy ();
     for (FlareIt it=m_Flares.begin(); it!=m_Flares.end(); it++) it->hShader.destroy();
-	*/
+    */
 }
 
 //------------------------------------------------------------------------------
 CLensFlare::CLensFlare()
 {
-	// Device
-	dwFrame						= 0xfffffffe;
+    // Device
+    dwFrame = 0xfffffffe;
 
-	fBlend						= 0.f;
+    fBlend = 0.f;
 
-    LightColor.set				( 0xFFFFFFFF );
-	fGradientValue				= 0.f;
+    LightColor.set(0xFFFFFFFF);
+    fGradientValue = 0.f;
 
-    //hGeom						= 0;
-	m_Current					= 0;
+    //hGeom = 0;
+    m_Current = 0;
 
-    m_State						= lfsNone;
-    m_StateBlend				= 0.f;
+    m_State = lfsNone;
+    m_StateBlend = 0.f;
 
 #ifndef _EDITOR
-	for( int i=0; i<MAX_RAYS; ++i)
-	{
-		m_ray_cache[i].verts[0].set	(0,0,0);
-		m_ray_cache[i].verts[1].set	(0,0,0);
-		m_ray_cache[i].verts[2].set	(0,0,0);
-	}
+    for (int i = 0; i < MAX_RAYS; ++i)
+    {
+        m_ray_cache[i].verts[0].set(0, 0, 0);
+        m_ray_cache[i].verts[1].set(0, 0, 0);
+        m_ray_cache[i].verts[2].set(0, 0, 0);
+    }
 #endif
 
-	OnDeviceCreate				();	
+    OnDeviceCreate();
 }
 
 CLensFlare::~CLensFlare()
 {
-	OnDeviceDestroy				();
-	delete_data(m_Palette);	
+    OnDeviceDestroy();
+    delete_data(m_Palette);
 }
 
 #ifndef _EDITOR
-struct STranspParam		{
-	Fvector				P;
-	Fvector				D;
-	float				f;
-	//CLensFlare*			parent;
-	collide::ray_cache*	pray_cache;
-	float				vis;
-	float				vis_threshold;
-	STranspParam		(collide::ray_cache	*p, const Fvector& _P, const Fvector& _D, float _f, float _vis_threshold):P(_P),D(_D),f(_f),pray_cache(p),vis(1.f),vis_threshold(_vis_threshold){}
+struct STranspParam
+{
+    Fvector P;
+    Fvector D;
+    float f;
+    //CLensFlare* parent;
+    collide::ray_cache* pray_cache;
+    float vis;
+    float vis_threshold;
+    STranspParam(collide::ray_cache* p, const Fvector& _P, const Fvector& _D, float _f, float _vis_threshold) :P(_P), D(_D), f(_f), pray_cache(p), vis(1.f), vis_threshold(_vis_threshold) {}
 };
 IC BOOL material_callback(collide::rq_result& result, LPVOID params)
 {
-	STranspParam* fp= (STranspParam*)params;
-	float vis		= 1.f;
-	if (result.O){
-		vis			= 0.f;
-		//CKinematics*K=PKinematics(result.O->renderable.visual);
-		IKinematics*K=PKinematics(result.O->renderable.visual);
-		if (K&&(result.element>0))
-			vis		= g_pGamePersistent->MtlTransparent(K->LL_GetData(u16(result.element)).game_mtl_idx);
-	}else{
-		CDB::TRI* T	= g_pGameLevel->ObjectSpace.GetStaticTris()+result.element;
-		vis			= g_pGamePersistent->MtlTransparent(T->material);
-		if (fis_zero(vis)){
-			Fvector* V	= g_pGameLevel->ObjectSpace.GetStaticVerts();
-			fp->pray_cache->set				(fp->P,fp->D,fp->f,TRUE);
-			fp->pray_cache->verts[0].set	(V[T->verts[0]]);
-			fp->pray_cache->verts[1].set	(V[T->verts[1]]);
-			fp->pray_cache->verts[2].set	(V[T->verts[2]]);
-		}
-	}
-	fp->vis			*=vis;
-	return (fp->vis>fp->vis_threshold); 
+    STranspParam* fp = (STranspParam*)params;
+    float vis = 1.f;
+    if (result.O)
+    {
+        vis = 0.f;
+        //CKinematics*K=PKinematics(result.O->renderable.visual);
+        IKinematics* K = PKinematics(result.O->renderable.visual);
+        if (K && (result.element > 0))
+            vis = g_pGamePersistent->MtlTransparent(K->LL_GetData(u16(result.element)).game_mtl_idx);
+    }
+    else
+    {
+        CDB::TRI* T = g_pGameLevel->ObjectSpace.GetStaticTris() + result.element;
+        vis = g_pGamePersistent->MtlTransparent(T->material);
+        if (fis_zero(vis))
+        {
+            Fvector* V = g_pGameLevel->ObjectSpace.GetStaticVerts();
+            fp->pray_cache->set(fp->P, fp->D, fp->f, TRUE);
+            fp->pray_cache->verts[0].set(V[T->verts[0]]);
+            fp->pray_cache->verts[1].set(V[T->verts[1]]);
+            fp->pray_cache->verts[2].set(V[T->verts[2]]);
+        }
+    }
+    fp->vis *= vis;
+    return (fp->vis > fp->vis_threshold);
 }
 #endif
 
-IC void	blend_lerp	(float& cur, float tgt, float speed, float dt)
+IC void blend_lerp(float& cur, float tgt, float speed, float dt)
 {
-	float diff		= tgt - cur;
-	float diff_a	= _abs(diff);
-	if (diff_a<EPS_S)	return;
-	float mot		= speed*dt;
-	if (mot>diff_a) mot=diff_a;
-	cur				+= (diff/diff_a)*mot;
+    float diff = tgt - cur;
+    float diff_a = _abs(diff);
+    if (diff_a < EPS_S) return;
+    float mot = speed*dt;
+    if (mot > diff_a) mot = diff_a;
+    cur += (diff / diff_a)*mot;
 }
 
 #if 0
-static LPCSTR state_to_string (const CLensFlare::LFState &state)
+static LPCSTR state_to_string(const CLensFlare::LFState& state)
 {
-	switch (state) {
-		case CLensFlare::lfsNone : return("none");
-		case CLensFlare::lfsIdle : return("idle");
-		case CLensFlare::lfsHide : return("hide");
-		case CLensFlare::lfsShow : return("show");
-		default : NODEFAULT;
-	}
+    switch (state)
+    {
+    case CLensFlare::lfsNone:
+        return("none");
+    case CLensFlare::lfsIdle:
+        return("idle");
+    case CLensFlare::lfsHide:
+        return("hide");
+    case CLensFlare::lfsShow:
+        return("show");
+    default:
+        NODEFAULT;
+    }
 #ifdef DEBUG
-	return			(0);
+    return (0);
 #endif // DEBUG
 }
 #endif
 
-static Fvector2 RayDeltas[CLensFlare::MAX_RAYS] = 
+static Fvector2 RayDeltas[CLensFlare::MAX_RAYS] =
 {
-	{ 0,		0 },
-	{ 1,		0 },
-	{ -1,		0 },
-	{ 0,		-1 },
-	{ 0,		1 },
+    {0, 0},
+    {1, 0},
+    {-1, 0},
+    {0, -1},
+    {0, 1},
 };
 void CLensFlare::OnFrame(shared_str id)
 {
-	if (dwFrame==Device.dwFrame)return;
+    if (dwFrame == Device.dwFrame)return;
 #ifndef _EDITOR
-	if (!g_pGameLevel)			return;
+    if (!g_pGameLevel) return;
 #endif
-	dwFrame			= Device.dwFrame;
-
-	R_ASSERT		( _valid(g_pGamePersistent->Environment().CurrentEnv->sun_dir) );
-	vSunDir.mul		(g_pGamePersistent->Environment().CurrentEnv->sun_dir,-1);
-	R_ASSERT		( _valid(vSunDir) );
-
-	// color
-    float tf		= g_pGamePersistent->Environment().fTimeFactor;
-    Fvector& c		= g_pGamePersistent->Environment().CurrentEnv->sun_color;
-	LightColor.set	(c.x,c.y,c.z,1.f); 
-
-	CLensFlareDescriptor* desc = id.size() ? g_pGamePersistent->Environment().add_flare(m_Palette, id) : 0;
-
-//	LFState			previous_state = m_State;
-    switch(m_State){
-    case lfsNone: m_State=lfsShow; m_Current=desc; break;
-    case lfsIdle: if (desc!=m_Current) m_State=lfsHide; 	break;
-    case lfsShow: 
-        m_StateBlend 	= m_Current?(m_StateBlend + m_Current->m_StateBlendUpSpeed * Device.fTimeDelta * tf):1.f+EPS;
-        if (m_StateBlend>=1.f) m_State=lfsIdle;
-    break;
-    case lfsHide: 
-        m_StateBlend 	= m_Current?(m_StateBlend - m_Current->m_StateBlendDnSpeed * Device.fTimeDelta * tf):0.f-EPS;
-        if (m_StateBlend<=0.f){ 	
-            m_State		= lfsShow;
-            m_Current	= desc;
-	        m_StateBlend= m_Current?m_Current->m_StateBlendUpSpeed * Device.fTimeDelta * tf:0;
+    dwFrame = Device.dwFrame;
+
+    R_ASSERT(_valid(g_pGamePersistent->Environment().CurrentEnv->sun_dir));
+    vSunDir.mul(g_pGamePersistent->Environment().CurrentEnv->sun_dir, -1);
+    R_ASSERT(_valid(vSunDir));
+
+    // color
+    float tf = g_pGamePersistent->Environment().fTimeFactor;
+    Fvector& c = g_pGamePersistent->Environment().CurrentEnv->sun_color;
+    LightColor.set(c.x, c.y, c.z, 1.f);
+
+    CLensFlareDescriptor* desc = id.size() ? g_pGamePersistent->Environment().add_flare(m_Palette, id) : 0;
+
+    // LFState previous_state = m_State;
+    switch (m_State)
+    {
+    case lfsNone:
+        m_State = lfsShow;
+        m_Current = desc;
+        break;
+    case lfsIdle:
+        if (desc != m_Current) m_State = lfsHide;
+        break;
+    case lfsShow:
+        m_StateBlend = m_Current ? (m_StateBlend + m_Current->m_StateBlendUpSpeed * Device.fTimeDelta * tf) : 1.f + EPS;
+        if (m_StateBlend >= 1.f) m_State = lfsIdle;
+        break;
+    case lfsHide:
+        m_StateBlend = m_Current ? (m_StateBlend - m_Current->m_StateBlendDnSpeed * Device.fTimeDelta * tf) : 0.f - EPS;
+        if (m_StateBlend <= 0.f)
+        {
+            m_State = lfsShow;
+            m_Current = desc;
+            m_StateBlend = m_Current ? m_Current->m_StateBlendUpSpeed * Device.fTimeDelta * tf : 0;
         }
-    break;
+        break;
     }
-//	Msg				("%6d : [%s] -> [%s]", Device.dwFrame, state_to_string(previous_state), state_to_string(m_State));
-    clamp(m_StateBlend,0.f,1.f);
+    // Msg ("%6d : [%s] -> [%s]", Device.dwFrame, state_to_string(previous_state), state_to_string(m_State));
+    clamp(m_StateBlend, 0.f, 1.f);
 
-    if ((m_Current==0)||(LightColor.magnitude_rgb()==0.f)){bRender=false; return;}
+    if ((m_Current == 0) || (LightColor.magnitude_rgb() == 0.f)) { bRender = false; return; }
 
-	//
-	// Compute center and axis of flares
-	//
-	float fDot;
+    //
+    // Compute center and axis of flares
+    //
+    float fDot;
 
-	Fvector vecPos;
+    Fvector vecPos;
 
-	Fmatrix	matEffCamPos;
-	matEffCamPos.identity();
-	// Calculate our position and direction
+    Fmatrix matEffCamPos;
+    matEffCamPos.identity();
+    // Calculate our position and direction
 
-	matEffCamPos.i.set(Device.vCameraRight);
-	matEffCamPos.j.set(Device.vCameraTop);
-	matEffCamPos.k.set(Device.vCameraDirection);
-	vecPos.set(Device.vCameraPosition);
+    matEffCamPos.i.set(Device.vCameraRight);
+    matEffCamPos.j.set(Device.vCameraTop);
+    matEffCamPos.k.set(Device.vCameraDirection);
+    vecPos.set(Device.vCameraPosition);
 
-	vecDir.set(0.0f, 0.0f, 1.0f);
-	matEffCamPos.transform_dir(vecDir);
-	vecDir.normalize();
+    vecDir.set(0.0f, 0.0f, 1.0f);
+    matEffCamPos.transform_dir(vecDir);
+    vecDir.normalize();
 
-	// Figure out of light (or flare) might be visible
-	vecLight.set(vSunDir);
-	vecLight.normalize();
+    // Figure out of light (or flare) might be visible
+    vecLight.set(vSunDir);
+    vecLight.normalize();
 
-	fDot = vecLight.dotproduct(vecDir);
+    fDot = vecLight.dotproduct(vecDir);
 
-	if(fDot <= 0.01f){	bRender = false; return;} else bRender = true;
+    if (fDot <= 0.01f) { bRender = false; return; }
+    else bRender = true;
 
-	// Calculate the point directly in front of us, on the far clip plane
-	float 	fDistance	= FAR_DIST*0.75f;
-	vecCenter.mul(vecDir, fDistance);
-	vecCenter.add(vecPos);
-	// Calculate position of light on the far clip plane
-	vecLight.mul(fDistance / fDot);
-	vecLight.add(vecPos);
-	// Compute axis which goes from light through the center of the screen
-	vecAxis.sub(vecLight, vecCenter);
+    // Calculate the point directly in front of us, on the far clip plane
+    float fDistance = FAR_DIST*0.75f;
+    vecCenter.mul(vecDir, fDistance);
+    vecCenter.add(vecPos);
+    // Calculate position of light on the far clip plane
+    vecLight.mul(fDistance / fDot);
+    vecLight.add(vecPos);
+    // Compute axis which goes from light through the center of the screen
+    vecAxis.sub(vecLight, vecCenter);
 
-	//
-	// Figure out if light is behind something else
-	vecX.set(1.0f, 0.0f, 0.0f);
-	matEffCamPos.transform_dir(vecX);
-	vecX.normalize();
-	R_ASSERT( _valid(vecX) );
+    //
+    // Figure out if light is behind something else
+    vecX.set(1.0f, 0.0f, 0.0f);
+    matEffCamPos.transform_dir(vecX);
+    vecX.normalize();
+    R_ASSERT(_valid(vecX));
 
-	vecY.crossproduct(vecX, vecDir);
-	R_ASSERT( _valid(vecY) );
+    vecY.crossproduct(vecX, vecDir);
+    R_ASSERT(_valid(vecY));
 
 #ifdef _EDITOR
-	float dist = UI->ZFar();
-    if (Tools->RayPick(Device.m_Camera.GetPosition(),vSunDir,dist))
-		fBlend = fBlend - BLEND_DEC_SPEED * Device.fTimeDelta;
-	else
-		fBlend = fBlend + BLEND_INC_SPEED * Device.fTimeDelta;
+    float dist = UI->ZFar();
+    if (Tools->RayPick(Device.m_Camera.GetPosition(), vSunDir, dist))
+        fBlend = fBlend - BLEND_DEC_SPEED * Device.fTimeDelta;
+    else
+        fBlend = fBlend + BLEND_INC_SPEED * Device.fTimeDelta;
 #else
 
-	//	Side vectors to bend normal.
-	Fvector vecSx;
-	Fvector vecSy;
-
-	//float fScale = m_Current->m_Source.fRadius * vSunDir.magnitude();
-	//float fScale = m_Current->m_Source.fRadius;
-	//	HACK: it must be read from the weather!
-	float fScale = 0.02f;
-
-	vecSx.mul(vecX, fScale);
-	vecSy.mul(vecY, fScale);
-
-	CObject*	o_main		= g_pGameLevel->CurrentViewEntity();
-	R_ASSERT				( _valid(vSunDir) );
-	STranspParam TP			(&m_ray_cache[0],Device.vCameraPosition,vSunDir,1000.f,EPS_L);
-
-	R_ASSERT				( _valid(TP.P) );
-	R_ASSERT				( _valid(TP.D) );
-	collide::ray_defs RD	(TP.P,TP.D,TP.f,CDB::OPT_CULL,collide::rqtBoth);
-	float	fVisResult = 0.0f;
-
-	for ( int i=0; i<MAX_RAYS; ++i)
-	{
-		TP.D = vSunDir;
-		TP.D.add(Fvector().mul( vecSx, RayDeltas[i].x));
-		TP.D.add(Fvector().mul( vecSy, RayDeltas[i].y));
-		R_ASSERT		( _valid(TP.D) );
-		TP.pray_cache	= &(m_ray_cache[i]);
-		TP.vis			= 1.0f;
-		RD.dir			= TP.D;
-
-		if (m_ray_cache[i].result&&m_ray_cache[i].similar(TP.P,TP.D,TP.f)){
-			// similar with previous query == 0
-			TP.vis				= 0.f;
-		}else{
-			float _u,_v,_range;
-			if (CDB::TestRayTri(TP.P,TP.D,m_ray_cache[i].verts,_u,_v,_range,false)&&(_range>0 && _range<TP.f)){
-				TP.vis			= 0.f;
-			}else{
-				// cache outdated. real query.
-				r_dest.r_clear	();
-				if (g_pGameLevel->ObjectSpace.RayQuery	(r_dest,RD,material_callback,&TP,NULL,o_main))
-					m_ray_cache[i].result = FALSE			;
-			}
-		}
-
-		fVisResult += TP.vis;
-	}
-
-	fVisResult *= (1.0f/MAX_RAYS);
-
-	//blend_lerp(fBlend,TP.vis,BLEND_DEC_SPEED,Device.fTimeDelta);
-	blend_lerp(fBlend,fVisResult,BLEND_DEC_SPEED,Device.fTimeDelta);
-
-	/*
-	CObject*	o_main		= g_pGameLevel->CurrentViewEntity();
-	STranspParam TP			(&m_ray_cache,Device.vCameraPosition,vSunDir,1000.f,EPS_L);
-	collide::ray_defs RD	(TP.P,TP.D,TP.f,CDB::OPT_CULL,collide::rqtBoth);
-	if (m_ray_cache.result&&m_ray_cache.similar(TP.P,TP.D,TP.f)){
-		// similar with previous query == 0
-		TP.vis				= 0.f;
-	}else{
-		float _u,_v,_range;
-		if (CDB::TestRayTri(TP.P,TP.D,m_ray_cache.verts,_u,_v,_range,false)&&(_range>0 && _range<TP.f)){
-			TP.vis			= 0.f;
-		}else{
-			// cache outdated. real query.
-			r_dest.r_clear	();
-			if (g_pGameLevel->ObjectSpace.RayQuery	(r_dest,RD,material_callback,&TP,NULL,o_main))
-				m_ray_cache.result = FALSE			;
-		}
-	}
-
-	blend_lerp(fBlend,TP.vis,BLEND_DEC_SPEED,Device.fTimeDelta);
-	*/
-/*
-	CObject*	o_main		= g_pGameLevel->CurrentViewEntity();
-	STranspParam TP			(this,Device.vCameraPosition,vSunDir,1000.f,EPS_L);
-	collide::ray_defs RD	(TP.P,TP.D,TP.f,CDB::OPT_CULL,collide::rqtBoth);
-	if (m_ray_cache.result&&m_ray_cache.similar(TP.P,TP.D,TP.f)){
-		// similar with previous query == 0
-		TP.vis				= 0.f;
-	}else{
-		float _u,_v,_range;
-		if (CDB::TestRayTri(TP.P,TP.D,m_ray_cache.verts,_u,_v,_range,false)&&(_range>0 && _range<TP.f)){
-			TP.vis			= 0.f;
-		}else{
-			// cache outdated. real query.
-			r_dest.r_clear	();
-			if (g_pGameLevel->ObjectSpace.RayQuery	(r_dest,RD,material_callback,&TP,NULL,o_main))
-				m_ray_cache.result = FALSE			;
-		}
-	}
-	blend_lerp(fBlend,TP.vis,BLEND_DEC_SPEED,Device.fTimeDelta);
-*/
+    // Side vectors to bend normal.
+    Fvector vecSx;
+    Fvector vecSy;
+
+    //float fScale = m_Current->m_Source.fRadius * vSunDir.magnitude();
+    //float fScale = m_Current->m_Source.fRadius;
+    // HACK: it must be read from the weather!
+    float fScale = 0.02f;
+
+    vecSx.mul(vecX, fScale);
+    vecSy.mul(vecY, fScale);
+
+    CObject* o_main = g_pGameLevel->CurrentViewEntity();
+    R_ASSERT(_valid(vSunDir));
+    STranspParam TP(&m_ray_cache[0], Device.vCameraPosition, vSunDir, 1000.f, EPS_L);
+
+    R_ASSERT(_valid(TP.P));
+    R_ASSERT(_valid(TP.D));
+    collide::ray_defs RD(TP.P, TP.D, TP.f, CDB::OPT_CULL, collide::rqtBoth);
+    float fVisResult = 0.0f;
+
+    for (int i = 0; i < MAX_RAYS; ++i)
+    {
+        TP.D = vSunDir;
+        TP.D.add(Fvector().mul(vecSx, RayDeltas[i].x));
+        TP.D.add(Fvector().mul(vecSy, RayDeltas[i].y));
+        R_ASSERT(_valid(TP.D));
+        TP.pray_cache = &(m_ray_cache[i]);
+        TP.vis = 1.0f;
+        RD.dir = TP.D;
+
+        if (m_ray_cache[i].result&&m_ray_cache[i].similar(TP.P, TP.D, TP.f))
+        {
+            // similar with previous query == 0
+            TP.vis = 0.f;
+        }
+        else
+        {
+            float _u, _v, _range;
+            if (CDB::TestRayTri(TP.P, TP.D, m_ray_cache[i].verts, _u, _v, _range, false) && (_range > 0 && _range < TP.f))
+            {
+                TP.vis = 0.f;
+            }
+            else
+            {
+                // cache outdated. real query.
+                r_dest.r_clear();
+                if (g_pGameLevel->ObjectSpace.RayQuery(r_dest, RD, material_callback, &TP, NULL, o_main))
+                    m_ray_cache[i].result = FALSE;
+            }
+        }
+
+        fVisResult += TP.vis;
+    }
+
+    fVisResult *= (1.0f / MAX_RAYS);
+
+    //blend_lerp(fBlend,TP.vis,BLEND_DEC_SPEED,Device.fTimeDelta);
+    blend_lerp(fBlend, fVisResult, BLEND_DEC_SPEED, Device.fTimeDelta);
+
+    /*
+    CObject* o_main = g_pGameLevel->CurrentViewEntity();
+    STranspParam TP (&m_ray_cache,Device.vCameraPosition,vSunDir,1000.f,EPS_L);
+    collide::ray_defs RD (TP.P,TP.D,TP.f,CDB::OPT_CULL,collide::rqtBoth);
+    if (m_ray_cache.result&&m_ray_cache.similar(TP.P,TP.D,TP.f)){
+    // similar with previous query == 0
+    TP.vis = 0.f;
+    }else{
+    float _u,_v,_range;
+    if (CDB::TestRayTri(TP.P,TP.D,m_ray_cache.verts,_u,_v,_range,false)&&(_range>0 && _range<TP.f)){
+    TP.vis = 0.f;
+    }else{
+    // cache outdated. real query.
+    r_dest.r_clear ();
+    if (g_pGameLevel->ObjectSpace.RayQuery (r_dest,RD,material_callback,&TP,NULL,o_main))
+    m_ray_cache.result = FALSE ;
+    }
+    }
+
+    blend_lerp(fBlend,TP.vis,BLEND_DEC_SPEED,Device.fTimeDelta);
+    */
+    /*
+     CObject* o_main = g_pGameLevel->CurrentViewEntity();
+     STranspParam TP (this,Device.vCameraPosition,vSunDir,1000.f,EPS_L);
+     collide::ray_defs RD (TP.P,TP.D,TP.f,CDB::OPT_CULL,collide::rqtBoth);
+     if (m_ray_cache.result&&m_ray_cache.similar(TP.P,TP.D,TP.f)){
+     // similar with previous query == 0
+     TP.vis = 0.f;
+     }else{
+     float _u,_v,_range;
+     if (CDB::TestRayTri(TP.P,TP.D,m_ray_cache.verts,_u,_v,_range,false)&&(_range>0 && _range<TP.f)){
+     TP.vis = 0.f;
+     }else{
+     // cache outdated. real query.
+     r_dest.r_clear ();
+     if (g_pGameLevel->ObjectSpace.RayQuery (r_dest,RD,material_callback,&TP,NULL,o_main))
+     m_ray_cache.result = FALSE ;
+     }
+     }
+     blend_lerp(fBlend,TP.vis,BLEND_DEC_SPEED,Device.fTimeDelta);
+     */
 #endif
-	clamp( fBlend, 0.0f, 1.0f );
+    clamp(fBlend, 0.0f, 1.0f);
 
-	// gradient
-	if (m_Current->m_Flags.is(CLensFlareDescriptor::flGradient))
+    // gradient
+    if (m_Current->m_Flags.is(CLensFlareDescriptor::flGradient))
     {
-		Fvector				scr_pos;
-		Device.mFullTransform.transform	( scr_pos, vecLight );
-		float kx = 1, ky = 1;
-		float sun_blend		= 0.5f;
-		float sun_max		= 2.5f;
-		scr_pos.y			*= -1;
-
-		if (_abs(scr_pos.x) > sun_blend)	kx = ((sun_max - (float)_abs(scr_pos.x))) / (sun_max - sun_blend);
-		if (_abs(scr_pos.y) > sun_blend)	ky = ((sun_max - (float)_abs(scr_pos.y))) / (sun_max - sun_blend);
-
-		if (!((_abs(scr_pos.x) > sun_max) || (_abs(scr_pos.y) > sun_max))){
-        	float op		= m_StateBlend*m_Current->m_Gradient.fOpacity;
-			fGradientValue	= kx * ky *  op * fBlend;
-		}else
-			fGradientValue	= 0;
-	}
+        Fvector scr_pos;
+        Device.mFullTransform.transform(scr_pos, vecLight);
+        float kx = 1, ky = 1;
+        float sun_blend = 0.5f;
+        float sun_max = 2.5f;
+        scr_pos.y *= -1;
+
+        if (_abs(scr_pos.x) > sun_blend) kx = ((sun_max - (float)_abs(scr_pos.x))) / (sun_max - sun_blend);
+        if (_abs(scr_pos.y) > sun_blend) ky = ((sun_max - (float)_abs(scr_pos.y))) / (sun_max - sun_blend);
+
+        if (!((_abs(scr_pos.x) > sun_max) || (_abs(scr_pos.y) > sun_max)))
+        {
+            float op = m_StateBlend*m_Current->m_Gradient.fOpacity;
+            fGradientValue = kx * ky * op * fBlend;
+        }
+        else
+            fGradientValue = 0;
+    }
 }
 
 void CLensFlare::Render(BOOL bSun, BOOL bFlares, BOOL bGradient)
 {
-	if (!bRender)		return;
-	if(!m_Current)		return;
-	VERIFY				(m_Current);
-
-	m_pRender->Render(*this, bSun, bFlares, bGradient);
-
-	/*
-	Fcolor				dwLight;
-	Fcolor				color;
-	Fvector				vec, vecSx, vecSy;
-	Fvector				vecDx, vecDy;
-
-	dwLight.set							( LightColor );
-	svector<ref_shader,MAX_Flares>		_2render;
-
-	u32									VS_Offset;
-	FVF::LIT *pv						= (FVF::LIT*) RCache.Vertex.Lock(MAX_Flares*4,hGeom.stride(),VS_Offset);
-
-	float 	fDistance		= FAR_DIST*0.75f;
-
-	if (bSun){
-    	if (m_Current->m_Flags.is(CLensFlareDescriptor::flSource)){
-            vecSx.mul			(vecX, m_Current->m_Source.fRadius*fDistance);
-            vecSy.mul			(vecY, m_Current->m_Source.fRadius*fDistance);
-            if (m_Current->m_Source.ignore_color) 	color.set(1.f,1.f,1.f,1.f);
-            else									color.set(dwLight);
-	        color.a				*= m_StateBlend;
-            u32 c				= color.get();
-            pv->set				(vecLight.x+vecSx.x-vecSy.x, vecLight.y+vecSx.y-vecSy.y, vecLight.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
-            pv->set				(vecLight.x+vecSx.x+vecSy.x, vecLight.y+vecSx.y+vecSy.y, vecLight.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
-            pv->set				(vecLight.x-vecSx.x-vecSy.x, vecLight.y-vecSx.y-vecSy.y, vecLight.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
-            pv->set				(vecLight.x-vecSx.x+vecSy.x, vecLight.y-vecSx.y+vecSy.y, vecLight.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
-            _2render.push_back	(m_Current->m_Source.hShader);
-        }
-	}
-	if (fBlend>=EPS_L)
-	{
-		if(bFlares){
-			vecDx.normalize		(vecAxis);
-			vecDy.crossproduct	(vecDx, vecDir);
-	    	if (m_Current->m_Flags.is(CLensFlareDescriptor::flFlare)){
-                for (CLensFlareDescriptor::FlareIt it=m_Current->m_Flares.begin(); it!=m_Current->m_Flares.end(); it++){
-                    CLensFlareDescriptor::SFlare&	F = *it;
-                    vec.mul				(vecAxis, F.fPosition);
-                    vec.add				(vecCenter);
-                    vecSx.mul			(vecDx, F.fRadius*fDistance);
-                    vecSy.mul			(vecDy, F.fRadius*fDistance);
-                    float    cl			= F.fOpacity * fBlend * m_StateBlend;
-                    color.set			( dwLight );
-                    color.mul_rgba		( cl );
-                    u32 c				= color.get();
-                    pv->set				(vec.x+vecSx.x-vecSy.x, vec.y+vecSx.y-vecSy.y, vec.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
-                    pv->set				(vec.x+vecSx.x+vecSy.x, vec.y+vecSx.y+vecSy.y, vec.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
-                    pv->set				(vec.x-vecSx.x-vecSy.x, vec.y-vecSx.y-vecSy.y, vec.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
-                    pv->set				(vec.x-vecSx.x+vecSy.x, vec.y-vecSx.y+vecSy.y, vec.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
-                    _2render.push_back	(it->hShader);
-                }
-            }
-		}
-		// gradient
-		if (bGradient&&(fGradientValue>=EPS_L)){
-            if (m_Current->m_Flags.is(CLensFlareDescriptor::flGradient)){
-                vecSx.mul			(vecX, m_Current->m_Gradient.fRadius*fGradientValue*fDistance);
-                vecSy.mul			(vecY, m_Current->m_Gradient.fRadius*fGradientValue*fDistance);
-
-                color.set			( dwLight );
-                color.mul_rgba		( fGradientValue*m_StateBlend );
-
-                u32 c				= color.get	();
-                pv->set				(vecLight.x+vecSx.x-vecSy.x, vecLight.y+vecSx.y-vecSy.y, vecLight.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
-                pv->set				(vecLight.x+vecSx.x+vecSy.x, vecLight.y+vecSx.y+vecSy.y, vecLight.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
-                pv->set				(vecLight.x-vecSx.x-vecSy.x, vecLight.y-vecSx.y-vecSy.y, vecLight.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
-                pv->set				(vecLight.x-vecSx.x+vecSy.x, vecLight.y-vecSx.y+vecSy.y, vecLight.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
-                _2render.push_back	(m_Current->m_Gradient.hShader);
-            }
-		}
-	}
-	RCache.Vertex.Unlock	(_2render.size()*4,hGeom.stride());
-
-	RCache.set_xform_world	(Fidentity);
-	RCache.set_Geometry		(hGeom);
-	for (u32 i=0; i<_2render.size(); i++)
-	{
-    	if (_2render[i])
-		{
-			u32						vBase	= i*4+VS_Offset;
-			RCache.set_Shader		(_2render[i]);
-			RCache.Render			(D3DPT_TRIANGLELIST,vBase, 0,4,0,2);
-	    }
-	}
-	*/
+    if (!bRender) return;
+    if (!m_Current) return;
+    VERIFY(m_Current);
+
+    m_pRender->Render(*this, bSun, bFlares, bGradient);
+
+    /*
+    Fcolor dwLight;
+    Fcolor color;
+    Fvector vec, vecSx, vecSy;
+    Fvector vecDx, vecDy;
+
+    dwLight.set ( LightColor );
+    svector<ref_shader,MAX_Flares> _2render;
+
+    u32 VS_Offset;
+    FVF::LIT *pv = (FVF::LIT*) RCache.Vertex.Lock(MAX_Flares*4,hGeom.stride(),VS_Offset);
+
+    float fDistance = FAR_DIST*0.75f;
+
+    if (bSun){
+    if (m_Current->m_Flags.is(CLensFlareDescriptor::flSource)){
+    vecSx.mul (vecX, m_Current->m_Source.fRadius*fDistance);
+    vecSy.mul (vecY, m_Current->m_Source.fRadius*fDistance);
+    if (m_Current->m_Source.ignore_color) color.set(1.f,1.f,1.f,1.f);
+    else color.set(dwLight);
+    color.a *= m_StateBlend;
+    u32 c = color.get();
+    pv->set (vecLight.x+vecSx.x-vecSy.x, vecLight.y+vecSx.y-vecSy.y, vecLight.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
+    pv->set (vecLight.x+vecSx.x+vecSy.x, vecLight.y+vecSx.y+vecSy.y, vecLight.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
+    pv->set (vecLight.x-vecSx.x-vecSy.x, vecLight.y-vecSx.y-vecSy.y, vecLight.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
+    pv->set (vecLight.x-vecSx.x+vecSy.x, vecLight.y-vecSx.y+vecSy.y, vecLight.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
+    _2render.push_back (m_Current->m_Source.hShader);
+    }
+    }
+    if (fBlend>=EPS_L)
+    {
+    if(bFlares){
+    vecDx.normalize (vecAxis);
+    vecDy.crossproduct (vecDx, vecDir);
+    if (m_Current->m_Flags.is(CLensFlareDescriptor::flFlare)){
+    for (CLensFlareDescriptor::FlareIt it=m_Current->m_Flares.begin(); it!=m_Current->m_Flares.end(); it++){
+    CLensFlareDescriptor::SFlare& F = *it;
+    vec.mul (vecAxis, F.fPosition);
+    vec.add (vecCenter);
+    vecSx.mul (vecDx, F.fRadius*fDistance);
+    vecSy.mul (vecDy, F.fRadius*fDistance);
+    float cl = F.fOpacity * fBlend * m_StateBlend;
+    color.set ( dwLight );
+    color.mul_rgba ( cl );
+    u32 c = color.get();
+    pv->set (vec.x+vecSx.x-vecSy.x, vec.y+vecSx.y-vecSy.y, vec.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
+    pv->set (vec.x+vecSx.x+vecSy.x, vec.y+vecSx.y+vecSy.y, vec.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
+    pv->set (vec.x-vecSx.x-vecSy.x, vec.y-vecSx.y-vecSy.y, vec.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
+    pv->set (vec.x-vecSx.x+vecSy.x, vec.y-vecSx.y+vecSy.y, vec.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
+    _2render.push_back (it->hShader);
+    }
+    }
+    }
+    // gradient
+    if (bGradient&&(fGradientValue>=EPS_L)){
+    if (m_Current->m_Flags.is(CLensFlareDescriptor::flGradient)){
+    vecSx.mul (vecX, m_Current->m_Gradient.fRadius*fGradientValue*fDistance);
+    vecSy.mul (vecY, m_Current->m_Gradient.fRadius*fGradientValue*fDistance);
+
+    color.set ( dwLight );
+    color.mul_rgba ( fGradientValue*m_StateBlend );
+
+    u32 c = color.get ();
+    pv->set (vecLight.x+vecSx.x-vecSy.x, vecLight.y+vecSx.y-vecSy.y, vecLight.z+vecSx.z-vecSy.z, c, 0, 0); pv++;
+    pv->set (vecLight.x+vecSx.x+vecSy.x, vecLight.y+vecSx.y+vecSy.y, vecLight.z+vecSx.z+vecSy.z, c, 0, 1); pv++;
+    pv->set (vecLight.x-vecSx.x-vecSy.x, vecLight.y-vecSx.y-vecSy.y, vecLight.z-vecSx.z-vecSy.z, c, 1, 0); pv++;
+    pv->set (vecLight.x-vecSx.x+vecSy.x, vecLight.y-vecSx.y+vecSy.y, vecLight.z-vecSx.z+vecSy.z, c, 1, 1); pv++;
+    _2render.push_back (m_Current->m_Gradient.hShader);
+    }
+    }
+    }
+    RCache.Vertex.Unlock (_2render.size()*4,hGeom.stride());
+
+    RCache.set_xform_world (Fidentity);
+    RCache.set_Geometry (hGeom);
+    for (u32 i=0; i<_2render.size(); i++)
+    {
+    if (_2render[i])
+    {
+    u32 vBase = i*4+VS_Offset;
+    RCache.set_Shader (_2render[i]);
+    RCache.Render (D3DPT_TRIANGLELIST,vBase, 0,4,0,2);
+    }
+    }
+    */
 }
 
 shared_str CLensFlare::AppendDef(CEnvironment& environment, CInifile* pIni, LPCSTR sect)
 {
-	if (!sect||(0==sect[0])) return "";
-    for (LensFlareDescIt it=m_Palette.begin(); it!=m_Palette.end(); it++)
-    	if (0==xr_strcmp(*(*it)->section,sect)) return sect;
+    if (!sect || (0 == sect[0])) return "";
+    for (LensFlareDescIt it = m_Palette.begin(); it != m_Palette.end(); it++)
+        if (0 == xr_strcmp(*(*it)->section, sect)) return sect;
 
-	environment.add_flare(m_Palette, sect); 
+    environment.add_flare(m_Palette, sect);
     return sect;
 }
 
 void CLensFlare::OnDeviceCreate()
 {
-	// VS
-	//hGeom.create		(FVF::F_LIT,RCache.Vertex.Buffer(),RCache.QuadIB);
-	m_pRender->OnDeviceCreate();
+    // VS
+    //hGeom.create (FVF::F_LIT,RCache.Vertex.Buffer(),RCache.QuadIB);
+    m_pRender->OnDeviceCreate();
 
-	// palette
-    for (LensFlareDescIt it=m_Palette.begin(); it!=m_Palette.end(); it++)
+    // palette
+    for (LensFlareDescIt it = m_Palette.begin(); it != m_Palette.end(); it++)
         (*it)->OnDeviceCreate();
 }
 
 void CLensFlare::OnDeviceDestroy()
 {
-	// palette
-    for (LensFlareDescIt it=m_Palette.begin(); it!=m_Palette.end(); it++)
+    // palette
+    for (LensFlareDescIt it = m_Palette.begin(); it != m_Palette.end(); it++)
         (*it)->OnDeviceDestroy();
 
-	// VS
-	//hGeom.destroy();
-	m_pRender->OnDeviceDestroy();
+    // VS
+    //hGeom.destroy();
+    m_pRender->OnDeviceDestroy();
 }
 
diff --git a/src/xrEngine/xr_efflensflare.h b/src/xrEngine/xr_efflensflare.h
index 3444340308a..8c027c6bc63 100644
--- a/src/xrEngine/xr_efflensflare.h
+++ b/src/xrEngine/xr_efflensflare.h
@@ -12,115 +12,117 @@ class ENGINE_API CEnvironment;
 class ENGINE_API CLensFlareDescriptor
 {
 public:
-	struct SFlare
-	{
-    	float			fOpacity;
-	    float			fRadius;
-    	float			fPosition;
-        shared_str			texture;
-        shared_str			shader;
-		FactoryPtr<IFlareRender>	m_pRender;
-        //ref_shader		hShader;
-    	SFlare()		{ fOpacity = fRadius = fPosition = 0; }
-	};
-    struct SSource: public SFlare
+    struct SFlare
     {
-    	BOOL			ignore_color;
+        float fOpacity;
+        float fRadius;
+        float fPosition;
+        shared_str texture;
+        shared_str shader;
+        FactoryPtr<IFlareRender> m_pRender;
+        //ref_shader hShader;
+        SFlare() { fOpacity = fRadius = fPosition = 0; }
     };
-    DEFINE_VECTOR		(SFlare,FlareVec,FlareIt);
-    FlareVec			m_Flares;
+    struct SSource : public SFlare
+    {
+        BOOL ignore_color;
+    };
+    DEFINE_VECTOR(SFlare, FlareVec, FlareIt);
+    FlareVec m_Flares;
 
-	enum {
-    	flFlare 		= (1<<0),
-    	flSource		= (1<<1),
-    	flGradient 		= (1<<2)
+    enum
+    {
+        flFlare = (1 << 0),
+        flSource = (1 << 1),
+        flGradient = (1 << 2)
     };
-	Flags32				m_Flags;
-    
-	// source
-    SSource				m_Source;
-    
-	// gradient
-    SFlare				m_Gradient;
-
-    float				m_StateBlendUpSpeed;
-    float				m_StateBlendDnSpeed;
-    
-	void				SetGradient		(float fMaxRadius, float fOpacity, LPCSTR tex_name, LPCSTR sh_name);
-    void				SetSource		(float fRadius, BOOL ign_color, LPCSTR tex_name, LPCSTR sh_name);
-    void				AddFlare		(float fRadius, float fOpacity, float fPosition, LPCSTR tex_name, LPCSTR sh_name);
-    //ref_shader			CreateShader	(LPCSTR tex_name, LPCSTR sh_name);
-
-	shared_str			section;
+    Flags32 m_Flags;
+
+    // source
+    SSource m_Source;
+
+    // gradient
+    SFlare m_Gradient;
+
+    float m_StateBlendUpSpeed;
+    float m_StateBlendDnSpeed;
+
+    void SetGradient(float fMaxRadius, float fOpacity, LPCSTR tex_name, LPCSTR sh_name);
+    void SetSource(float fRadius, BOOL ign_color, LPCSTR tex_name, LPCSTR sh_name);
+    void AddFlare(float fRadius, float fOpacity, float fPosition, LPCSTR tex_name, LPCSTR sh_name);
+    //ref_shader CreateShader (LPCSTR tex_name, LPCSTR sh_name);
+
+    shared_str section;
 public:
-    					CLensFlareDescriptor(){m_Flags.zero();section=0;m_StateBlendUpSpeed=m_StateBlendDnSpeed=0.1f;}
-    void				load				(CInifile* pIni, LPCSTR section);
-	void 				OnDeviceCreate	();
-	void 				OnDeviceDestroy	();
+    CLensFlareDescriptor() { m_Flags.zero(); section = 0; m_StateBlendUpSpeed = m_StateBlendDnSpeed = 0.1f; }
+    void load(CInifile* pIni, LPCSTR section);
+    void OnDeviceCreate();
+    void OnDeviceDestroy();
 };
-DEFINE_VECTOR(CLensFlareDescriptor*,LensFlareDescVec,LensFlareDescIt); 
+DEFINE_VECTOR(CLensFlareDescriptor*, LensFlareDescVec, LensFlareDescIt);
 
 
 class ENGINE_API CLensFlare
 {
-	friend class dxLensFlareRender;
+    friend class dxLensFlareRender;
 public:
-	enum
-	{
-		MAX_RAYS	= 5
-	};
+    enum
+    {
+        MAX_RAYS = 5
+    };
 
 private:
-	collide::rq_results	r_dest;
+    collide::rq_results r_dest;
 #ifndef _EDITOR
-	collide::ray_cache	m_ray_cache[MAX_RAYS];
+    collide::ray_cache m_ray_cache[MAX_RAYS];
 #endif
 
 protected:
-	float				fBlend;
-	u32					dwFrame;
+    float fBlend;
+    u32 dwFrame;
 
-	Fvector				vSunDir;
-	Fvector				vecLight;
-	Fvector				vecX, vecY, vecDir, vecAxis, vecCenter;
-	BOOL				bRender;
+    Fvector vSunDir;
+    Fvector vecLight;
+    Fvector vecX, vecY, vecDir, vecAxis, vecCenter;
+    BOOL bRender;
 
-	// variable
-    Fcolor				LightColor;
-	float				fGradientValue;
+    // variable
+    Fcolor LightColor;
+    float fGradientValue;
 
-	FactoryPtr<ILensFlareRender>	m_pRender;
-	//ref_geom			hGeom;
+    FactoryPtr<ILensFlareRender> m_pRender;
+    //ref_geom hGeom;
 
-    LensFlareDescVec	m_Palette;
-	CLensFlareDescriptor* m_Current;
+    LensFlareDescVec m_Palette;
+    CLensFlareDescriptor* m_Current;
 
-//. #ifdef DEBUG
+    //. #ifdef DEBUG
 public:
-    enum LFState{
+    enum LFState
+    {
         lfsNone,
         lfsIdle,
-    	lfsHide,
+        lfsHide,
         lfsShow,
     };
-//. #endif // DEBUG
+    //. #endif // DEBUG
 
 protected:
-    LFState				m_State;
-    float				m_StateBlend;
+    LFState m_State;
+    float m_StateBlend;
 
 public:
-						CLensFlare		();
-	virtual				~CLensFlare		();
+    CLensFlare();
+    virtual ~CLensFlare();
 
-	void				OnFrame			(shared_str id);
-    void __fastcall		Render			(BOOL bSun, BOOL bFlares, BOOL bGradient);
-	void 				OnDeviceCreate	();         
-	void 				OnDeviceDestroy	();
+    void OnFrame(shared_str id);
+    void __fastcall Render(BOOL bSun, BOOL bFlares, BOOL bGradient);
+    void OnDeviceCreate();
+    void OnDeviceDestroy();
 
-    shared_str			AppendDef		(CEnvironment& environment, CInifile* pIni, LPCSTR sect);
+    shared_str AppendDef(CEnvironment& environment, CInifile* pIni, LPCSTR sect);
 
-	void				Invalidate		(){m_State=lfsNone;}
+    void Invalidate() { m_State = lfsNone; }
 };
 
 #endif // xr_efflensflareH
diff --git a/src/xrEngine/xr_input.h b/src/xrEngine/xr_input.h
index 64bdc5db633..1d6678647fc 100644
--- a/src/xrEngine/xr_input.h
+++ b/src/xrEngine/xr_input.h
@@ -4,100 +4,101 @@
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
 
-class	ENGINE_API				IInputReceiver;
+class ENGINE_API IInputReceiver;
 
 //\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 //îïèñàíèå êëàññà
-const int mouse_device_key		= 1;
-const int keyboard_device_key	= 2;
-const int all_device_key		= mouse_device_key | keyboard_device_key;
-const int default_key			= mouse_device_key | keyboard_device_key ;
+const int mouse_device_key = 1;
+const int keyboard_device_key = 2;
+const int all_device_key = mouse_device_key | keyboard_device_key;
+const int default_key = mouse_device_key | keyboard_device_key;
 
 class ENGINE_API CInput
 #ifndef M_BORLAND
-	:
-	public pureFrame,
-	public pureAppActivate,
-	public pureAppDeactivate
+    :
+    public pureFrame,
+    public pureAppActivate,
+    public pureAppDeactivate
 #endif
 {
 public:
-	enum {
-		COUNT_MOUSE_BUTTONS			= 8,
-		COUNT_MOUSE_AXIS			= 3,
-		COUNT_KB_BUTTONS			= 256
-	};
-	struct sxr_mouse
-	{
-		DIDEVCAPS					capabilities;
-		DIDEVICEINSTANCE			deviceInfo;
-		DIDEVICEOBJECTINSTANCE		objectInfo;
-		u32							mouse_dt;
-	};
-	struct sxr_key
-	{
-		DIDEVCAPS					capabilities;
-		DIDEVICEINSTANCE			deviceInfo;
-		DIDEVICEOBJECTINSTANCE		objectInfo;
-	};
+    enum
+    {
+        COUNT_MOUSE_BUTTONS = 8,
+        COUNT_MOUSE_AXIS = 3,
+        COUNT_KB_BUTTONS = 256
+    };
+    struct sxr_mouse
+    {
+        DIDEVCAPS capabilities;
+        DIDEVICEINSTANCE deviceInfo;
+        DIDEVICEOBJECTINSTANCE objectInfo;
+        u32 mouse_dt;
+    };
+    struct sxr_key
+    {
+        DIDEVCAPS capabilities;
+        DIDEVICEINSTANCE deviceInfo;
+        DIDEVICEOBJECTINSTANCE objectInfo;
+    };
 private:
-	BENCH_SEC_SCRAMBLEMEMBER1
-	LPDIRECTINPUT8				pDI;			// The DInput object
-	LPDIRECTINPUTDEVICE8		pMouse;			// The DIDevice7 interface
-	LPDIRECTINPUTDEVICE8		pKeyboard;		// The DIDevice7 interface
-	//----------------------
-	u32							timeStamp	[COUNT_MOUSE_AXIS];
-	u32							timeSave	[COUNT_MOUSE_AXIS];
-	int 						offs		[COUNT_MOUSE_AXIS];
-	BOOL						mouseState	[COUNT_MOUSE_BUTTONS];
+    BENCH_SEC_SCRAMBLEMEMBER1
+    LPDIRECTINPUT8 pDI; // The DInput object
+    LPDIRECTINPUTDEVICE8 pMouse; // The DIDevice7 interface
+    LPDIRECTINPUTDEVICE8 pKeyboard; // The DIDevice7 interface
+    //----------------------
+    u32 timeStamp[COUNT_MOUSE_AXIS];
+    u32 timeSave[COUNT_MOUSE_AXIS];
+    int offs[COUNT_MOUSE_AXIS];
+    BOOL mouseState[COUNT_MOUSE_BUTTONS];
 
-	//----------------------
-	BOOL						KBState		[COUNT_KB_BUTTONS];
+    //----------------------
+    BOOL KBState[COUNT_KB_BUTTONS];
 
-	HRESULT						CreateInputDevice(	LPDIRECTINPUTDEVICE8* device, GUID guidDevice,
-													const DIDATAFORMAT* pdidDataFormat, u32 dwFlags,
-													u32 buf_size );
+    HRESULT CreateInputDevice(LPDIRECTINPUTDEVICE8* device, GUID guidDevice,
+                              const DIDATAFORMAT* pdidDataFormat, u32 dwFlags,
+                              u32 buf_size);
 
-//	xr_stack<IInputReceiver*>	cbStack;
-	xr_vector<IInputReceiver*>	cbStack;
+    // xr_stack<IInputReceiver*> cbStack;
+    xr_vector<IInputReceiver*> cbStack;
 
-	void						MouseUpdate					( );
-	void						KeyUpdate					( );
+    void MouseUpdate();
+    void KeyUpdate();
 
 public:
-	sxr_mouse					mouse_property;
-	sxr_key						key_property;
-	u32							dwCurTime;
-	
-	void						SetAllAcquire				( BOOL bAcquire = TRUE );
-	void						SetMouseAcquire				( BOOL bAcquire );
-	void						SetKBDAcquire				( BOOL bAcquire );
+    sxr_mouse mouse_property;
+    sxr_key key_property;
+    u32 dwCurTime;
 
-	void						iCapture					( IInputReceiver *pc );
-	void						iRelease					( IInputReceiver *pc );
-	BOOL						iGetAsyncKeyState			( int dik );
-	BOOL						iGetAsyncBtnState			( int btn );
-	void						iGetLastMouseDelta			( Ivector2& p )	{ p.set(offs[0],offs[1]); }
+    void SetAllAcquire(BOOL bAcquire = TRUE);
+    void SetMouseAcquire(BOOL bAcquire);
+    void SetKBDAcquire(BOOL bAcquire);
 
-	CInput						( BOOL bExclusive = true, int deviceForInit = default_key);
-	~CInput						( );
+    void iCapture(IInputReceiver* pc);
+    void iRelease(IInputReceiver* pc);
+    BOOL iGetAsyncKeyState(int dik);
+    BOOL iGetAsyncBtnState(int btn);
+    void iGetLastMouseDelta(Ivector2& p) { p.set(offs[0], offs[1]); }
 
-	virtual void	_BCL		OnFrame						(void);
-	virtual void				OnAppActivate				(void);
-	virtual void				OnAppDeactivate				(void);
+    CInput(BOOL bExclusive = true, int deviceForInit = default_key);
+    ~CInput();
 
-	IInputReceiver*				CurrentIR					();
+    virtual void _BCL OnFrame(void);
+    virtual void OnAppActivate(void);
+    virtual void OnAppDeactivate(void);
+
+    IInputReceiver* CurrentIR();
 
 public:
-			void				exclusive_mode				(const bool &exclusive);
-	IC		bool				get_exclusive_mode			();
-			void				unacquire					();
-			void				acquire						(const bool &exclusive);
-			bool				get_dik_name				(int dik, LPSTR dest, int dest_sz);
+    void exclusive_mode(const bool& exclusive);
+    IC bool get_exclusive_mode();
+    void unacquire();
+    void acquire(const bool& exclusive);
+    bool get_dik_name(int dik, LPSTR dest, int dest_sz);
 
-			void				feedback					(u16 s1, u16 s2, float time);
+    void feedback(u16 s1, u16 s2, float time);
 };
 
-extern ENGINE_API CInput *		pInput;
+extern ENGINE_API CInput* pInput;
 
 #endif //__XR_INPUT__
diff --git a/src/xrEngine/xr_input_xinput.cpp b/src/xrEngine/xr_input_xinput.cpp
index ef8be366fd2..d2ca227ad0b 100644
--- a/src/xrEngine/xr_input_xinput.cpp
+++ b/src/xrEngine/xr_input_xinput.cpp
@@ -4,125 +4,125 @@
 #include <xinput.h>
 
 
-DXUT_GAMEPAD  g_GamePads[DXUT_MAX_CONTROLLERS];
+DXUT_GAMEPAD g_GamePads[DXUT_MAX_CONTROLLERS];
 
 typedef DWORD (WINAPI* LPXINPUTGETSTATE)(DWORD dwUserIndex, XINPUT_STATE* pState );
 typedef DWORD (WINAPI* LPXINPUTSETSTATE)(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration );
 typedef DWORD (WINAPI* LPXINPUTGETCAPABILITIES)( DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities );
-typedef void  (WINAPI* LPXINPUTENABLE)(BOOL bEnable);
+typedef void (WINAPI* LPXINPUTENABLE)(BOOL bEnable);
 
 HRESULT DXUTGetGamepadState( DWORD dwPort, DXUT_GAMEPAD* pGamePad, bool bThumbstickDeadZone, bool bSnapThumbstickToCardinals )
 {
-    if( dwPort >= DXUT_MAX_CONTROLLERS || pGamePad == NULL )
-        return E_FAIL;
-
-    static LPXINPUTGETSTATE s_pXInputGetState = NULL;
-    static LPXINPUTGETCAPABILITIES s_pXInputGetCapabilities = NULL;
-    if( NULL == s_pXInputGetState || NULL == s_pXInputGetCapabilities )
-    {
-        HINSTANCE hInst = LoadLibrary( XINPUT_DLL );
-        if( hInst ) 
-        {
-            s_pXInputGetState = (LPXINPUTGETSTATE)GetProcAddress( hInst, "XInputGetState" );
-            s_pXInputGetCapabilities = (LPXINPUTGETCAPABILITIES)GetProcAddress( hInst, "XInputGetCapabilities" );
-        }
-    }
-    if( s_pXInputGetState == NULL )
-        return E_FAIL;
-
-    XINPUT_STATE InputState;
-    DWORD dwResult = s_pXInputGetState( dwPort, &InputState );
-
-    // Track insertion and removals
-    BOOL bWasConnected = pGamePad->bConnected;
-    pGamePad->bConnected = (dwResult == ERROR_SUCCESS);
-    pGamePad->bRemoved  = (  bWasConnected && !pGamePad->bConnected );
-    pGamePad->bInserted = ( !bWasConnected &&  pGamePad->bConnected );
-
-    // Don't update rest of the state if not connected
-    if( !pGamePad->bConnected )
-        return S_OK;
-
-    // Store the capabilities of the device
-    if( pGamePad->bInserted )
-    {
-        ZeroMemory( pGamePad, sizeof(DXUT_GAMEPAD) );
-        pGamePad->bConnected = true;
-        pGamePad->bInserted  = true;
-        if( s_pXInputGetCapabilities )
-            s_pXInputGetCapabilities( dwPort, XINPUT_DEVTYPE_GAMEPAD, &pGamePad->caps );
-    }
-
-    // Copy gamepad to local structure (assumes that XINPUT_GAMEPAD at the front in CONTROLER_STATE)
-    memcpy( pGamePad, &InputState.Gamepad, sizeof(XINPUT_GAMEPAD) );
-
-    if( bSnapThumbstickToCardinals )
-    {
-        // Apply deadzone to each axis independantly to slightly snap to up/down/left/right
-        if( pGamePad->sThumbLX < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLX > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE )
-            pGamePad->sThumbLX = 0;
-        if( pGamePad->sThumbLY < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLY > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE ) 
-            pGamePad->sThumbLY = 0;
-        if( pGamePad->sThumbRX < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRX > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE )
-            pGamePad->sThumbRX = 0;
-        if( pGamePad->sThumbRY < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRY > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE ) 
-            pGamePad->sThumbRY = 0;
-    }
-    else if( bThumbstickDeadZone )
-    {
-        // Apply deadzone if centered
-        if( (pGamePad->sThumbLX < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLX > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE) && 
-            (pGamePad->sThumbLY < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLY > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE) ) 
-        {   
-            pGamePad->sThumbLX = 0;
-            pGamePad->sThumbLY = 0;
-        }
-        if( (pGamePad->sThumbRX < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRX > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE) && 
-            (pGamePad->sThumbRY < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRY > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE) ) 
-        {
-            pGamePad->sThumbRX = 0;
-            pGamePad->sThumbRY = 0;
-        }
-    }
-
-    // Convert [-1,+1] range
-    pGamePad->fThumbLX = pGamePad->sThumbLX / 32767.0f;
-    pGamePad->fThumbLY = pGamePad->sThumbLY / 32767.0f;
-    pGamePad->fThumbRX = pGamePad->sThumbRX / 32767.0f;
-    pGamePad->fThumbRY = pGamePad->sThumbRY / 32767.0f;
-
-    // Get the boolean buttons that have been pressed since the last call. 
-    // Each button is represented by one bit.
-    pGamePad->wPressedButtons = ( pGamePad->wLastButtons ^ pGamePad->wButtons ) & pGamePad->wButtons;
-    pGamePad->wLastButtons    = pGamePad->wButtons;
-
-    // Figure out if the left trigger has been pressed or released
-    bool bPressed = ( pGamePad->bLeftTrigger > DXUT_GAMEPAD_TRIGGER_THRESHOLD );
-    pGamePad->bPressedLeftTrigger = ( bPressed ) ? !pGamePad->bLastLeftTrigger : false;
-    pGamePad->bLastLeftTrigger = bPressed;
-
-    // Figure out if the right trigger has been pressed or released
-    bPressed = ( pGamePad->bRightTrigger > DXUT_GAMEPAD_TRIGGER_THRESHOLD );
-    pGamePad->bPressedRightTrigger = ( bPressed ) ? !pGamePad->bLastRightTrigger : false;
-    pGamePad->bLastRightTrigger = bPressed;
-
-    return S_OK;
+if( dwPort >= DXUT_MAX_CONTROLLERS || pGamePad == NULL )
+return E_FAIL;
+
+static LPXINPUTGETSTATE s_pXInputGetState = NULL;
+static LPXINPUTGETCAPABILITIES s_pXInputGetCapabilities = NULL;
+if( NULL == s_pXInputGetState || NULL == s_pXInputGetCapabilities )
+{
+HINSTANCE hInst = LoadLibrary( XINPUT_DLL );
+if( hInst )
+{
+s_pXInputGetState = (LPXINPUTGETSTATE)GetProcAddress( hInst, "XInputGetState" );
+s_pXInputGetCapabilities = (LPXINPUTGETCAPABILITIES)GetProcAddress( hInst, "XInputGetCapabilities" );
+}
+}
+if( s_pXInputGetState == NULL )
+return E_FAIL;
+
+XINPUT_STATE InputState;
+DWORD dwResult = s_pXInputGetState( dwPort, &InputState );
+
+// Track insertion and removals
+BOOL bWasConnected = pGamePad->bConnected;
+pGamePad->bConnected = (dwResult == ERROR_SUCCESS);
+pGamePad->bRemoved = ( bWasConnected && !pGamePad->bConnected );
+pGamePad->bInserted = ( !bWasConnected && pGamePad->bConnected );
+
+// Don't update rest of the state if not connected
+if( !pGamePad->bConnected )
+return S_OK;
+
+// Store the capabilities of the device
+if( pGamePad->bInserted )
+{
+ZeroMemory( pGamePad, sizeof(DXUT_GAMEPAD) );
+pGamePad->bConnected = true;
+pGamePad->bInserted = true;
+if( s_pXInputGetCapabilities )
+s_pXInputGetCapabilities( dwPort, XINPUT_DEVTYPE_GAMEPAD, &pGamePad->caps );
+}
+
+// Copy gamepad to local structure (assumes that XINPUT_GAMEPAD at the front in CONTROLER_STATE)
+memcpy( pGamePad, &InputState.Gamepad, sizeof(XINPUT_GAMEPAD) );
+
+if( bSnapThumbstickToCardinals )
+{
+// Apply deadzone to each axis independantly to slightly snap to up/down/left/right
+if( pGamePad->sThumbLX < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLX > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE )
+pGamePad->sThumbLX = 0;
+if( pGamePad->sThumbLY < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLY > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE )
+pGamePad->sThumbLY = 0;
+if( pGamePad->sThumbRX < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRX > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE )
+pGamePad->sThumbRX = 0;
+if( pGamePad->sThumbRY < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRY > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE )
+pGamePad->sThumbRY = 0;
+}
+else if( bThumbstickDeadZone )
+{
+// Apply deadzone if centered
+if( (pGamePad->sThumbLX < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLX > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE) &&
+(pGamePad->sThumbLY < XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE && pGamePad->sThumbLY > -XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE) )
+{
+pGamePad->sThumbLX = 0;
+pGamePad->sThumbLY = 0;
+}
+if( (pGamePad->sThumbRX < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRX > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE) &&
+(pGamePad->sThumbRY < XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE && pGamePad->sThumbRY > -XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE) )
+{
+pGamePad->sThumbRX = 0;
+pGamePad->sThumbRY = 0;
+}
+}
+
+// Convert [-1,+1] range
+pGamePad->fThumbLX = pGamePad->sThumbLX / 32767.0f;
+pGamePad->fThumbLY = pGamePad->sThumbLY / 32767.0f;
+pGamePad->fThumbRX = pGamePad->sThumbRX / 32767.0f;
+pGamePad->fThumbRY = pGamePad->sThumbRY / 32767.0f;
+
+// Get the boolean buttons that have been pressed since the last call.
+// Each button is represented by one bit.
+pGamePad->wPressedButtons = ( pGamePad->wLastButtons ^ pGamePad->wButtons ) & pGamePad->wButtons;
+pGamePad->wLastButtons = pGamePad->wButtons;
+
+// Figure out if the left trigger has been pressed or released
+bool bPressed = ( pGamePad->bLeftTrigger > DXUT_GAMEPAD_TRIGGER_THRESHOLD );
+pGamePad->bPressedLeftTrigger = ( bPressed ) ? !pGamePad->bLastLeftTrigger : false;
+pGamePad->bLastLeftTrigger = bPressed;
+
+// Figure out if the right trigger has been pressed or released
+bPressed = ( pGamePad->bRightTrigger > DXUT_GAMEPAD_TRIGGER_THRESHOLD );
+pGamePad->bPressedRightTrigger = ( bPressed ) ? !pGamePad->bLastRightTrigger : false;
+pGamePad->bLastRightTrigger = bPressed;
+
+return S_OK;
 }
 
 void set_vibration (u16 s1, u16 s2)
 {
-    static LPXINPUTSETSTATE s_pXInputSetState = NULL;
-    if( NULL == s_pXInputSetState )
-    {
-        HINSTANCE hInst = LoadLibrary( XINPUT_DLL );
-        if( hInst ) 
-            s_pXInputSetState = (LPXINPUTSETSTATE)GetProcAddress( hInst, "XInputSetState" );
-    }
-
-
-	XINPUT_VIBRATION			vibration;
-    vibration.wLeftMotorSpeed	= s1;
-    vibration.wRightMotorSpeed	= s2;
-    s_pXInputSetState			( 0, &vibration );
+static LPXINPUTSETSTATE s_pXInputSetState = NULL;
+if( NULL == s_pXInputSetState )
+{
+HINSTANCE hInst = LoadLibrary( XINPUT_DLL );
+if( hInst )
+s_pXInputSetState = (LPXINPUTSETSTATE)GetProcAddress( hInst, "XInputSetState" );
+}
+
+
+XINPUT_VIBRATION vibration;
+vibration.wLeftMotorSpeed = s1;
+vibration.wRightMotorSpeed = s2;
+s_pXInputSetState ( 0, &vibration );
 }
 */
\ No newline at end of file
diff --git a/src/xrEngine/xr_input_xinput.h b/src/xrEngine/xr_input_xinput.h
index a7e6c03e07e..62a338d138e 100644
--- a/src/xrEngine/xr_input_xinput.h
+++ b/src/xrEngine/xr_input_xinput.h
@@ -4,49 +4,49 @@
 
 struct DXUT_GAMEPAD;
 
-#define DXUT_GAMEPAD_TRIGGER_THRESHOLD      30
-#define DXUT_MAX_CONTROLLERS				4  // XInput handles up to 4 controllers 
+#define DXUT_GAMEPAD_TRIGGER_THRESHOLD 30
+#define DXUT_MAX_CONTROLLERS 4 // XInput handles up to 4 controllers
 
-HRESULT DXUTGetGamepadState(	DWORD dwPort, 
-								DXUT_GAMEPAD* pGamePad, 
-								bool bThumbstickDeadZone, 
-								bool bSnapThumbstickToCardinals );
-void set_vibration			(u16 s1, u16 s2);
+HRESULT DXUTGetGamepadState( DWORD dwPort,
+DXUT_GAMEPAD* pGamePad,
+bool bThumbstickDeadZone,
+bool bSnapThumbstickToCardinals );
+void set_vibration (u16 s1, u16 s2);
 
 struct DXUT_GAMEPAD
 {
-    // From XINPUT_GAMEPAD
-    WORD    wButtons;
-    BYTE    bLeftTrigger;
-    BYTE    bRightTrigger;
-    SHORT   sThumbLX;
-    SHORT   sThumbLY;
-    SHORT   sThumbRX;
-    SHORT   sThumbRY;
-
-    // Device properties
-    XINPUT_CAPABILITIES caps;
-    bool    bConnected; // If the controller is currently connected
-    bool    bInserted;  // If the controller was inserted this frame
-    bool    bRemoved;   // If the controller was removed this frame
-
-    // Thumb stick values converted to range [-1,+1]
-    float   fThumbRX;
-    float   fThumbRY;
-    float   fThumbLX;
-    float   fThumbLY;
-
-    // Records which buttons were pressed this frame.
-    // These are only set on the first frame that the button is pressed
-    WORD    wPressedButtons;
-    bool    bPressedLeftTrigger;
-    bool    bPressedRightTrigger;
-
-    // Last state of the buttons
-    WORD    wLastButtons;
-    bool    bLastLeftTrigger;
-    bool    bLastRightTrigger;
+// From XINPUT_GAMEPAD
+WORD wButtons;
+BYTE bLeftTrigger;
+BYTE bRightTrigger;
+SHORT sThumbLX;
+SHORT sThumbLY;
+SHORT sThumbRX;
+SHORT sThumbRY;
+
+// Device properties
+XINPUT_CAPABILITIES caps;
+bool bConnected; // If the controller is currently connected
+bool bInserted; // If the controller was inserted this frame
+bool bRemoved; // If the controller was removed this frame
+
+// Thumb stick values converted to range [-1,+1]
+float fThumbRX;
+float fThumbRY;
+float fThumbLX;
+float fThumbLY;
+
+// Records which buttons were pressed this frame.
+// These are only set on the first frame that the button is pressed
+WORD wPressedButtons;
+bool bPressedLeftTrigger;
+bool bPressedRightTrigger;
+
+// Last state of the buttons
+WORD wLastButtons;
+bool bLastLeftTrigger;
+bool bLastRightTrigger;
 };
 
-extern DXUT_GAMEPAD          g_GamePads[DXUT_MAX_CONTROLLERS];
+extern DXUT_GAMEPAD g_GamePads[DXUT_MAX_CONTROLLERS];
 */
\ No newline at end of file
diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp
index 6de12835396..0902fb47ff7 100644
--- a/src/xrEngine/xr_ioc_cmd.cpp
+++ b/src/xrEngine/xr_ioc_cmd.cpp
@@ -15,41 +15,42 @@
 
 #include "xr_object.h"
 
-xr_token*							vid_quality_token = NULL;
+xr_token* vid_quality_token = NULL;
 
-xr_token							vid_bpp_token							[ ]={
-	{ "16",							16											},
-	{ "32",							32											},
-	{ 0,							0											}
+xr_token vid_bpp_token[] =
+{
+    {"16", 16},
+    {"32", 32},
+    {0, 0}
 };
 //-----------------------------------------------------------------------
 
-void IConsole_Command::add_to_LRU( shared_str const& arg )
-{
-	if ( arg.size() == 0 || bEmptyArgsHandled )
-	{
-		return;
-	}
-	
-	bool dup = ( std::find( m_LRU.begin(), m_LRU.end(), arg ) != m_LRU.end() );
-	if ( !dup )
-	{
-		m_LRU.push_back( arg );
-		if ( m_LRU.size() > LRU_MAX_COUNT )
-		{
-			m_LRU.erase( m_LRU.begin() );
-		}
-	}
+void IConsole_Command::add_to_LRU(shared_str const& arg)
+{
+    if (arg.size() == 0 || bEmptyArgsHandled)
+    {
+        return;
+    }
+
+    bool dup = (std::find(m_LRU.begin(), m_LRU.end(), arg) != m_LRU.end());
+    if (!dup)
+    {
+        m_LRU.push_back(arg);
+        if (m_LRU.size() > LRU_MAX_COUNT)
+        {
+            m_LRU.erase(m_LRU.begin());
+        }
+    }
 }
 
-void  IConsole_Command::add_LRU_to_tips( vecTips& tips )
+void IConsole_Command::add_LRU_to_tips(vecTips& tips)
 {
-	vecLRU::reverse_iterator	it_rb = m_LRU.rbegin();
-	vecLRU::reverse_iterator	it_re = m_LRU.rend();
-	for ( ; it_rb != it_re; ++it_rb )
-	{
-		tips.push_back( (*it_rb) );
-	}
+    vecLRU::reverse_iterator it_rb = m_LRU.rbegin();
+    vecLRU::reverse_iterator it_re = m_LRU.rend();
+    for (; it_rb != it_re; ++it_rb)
+    {
+        tips.push_back((*it_rb));
+    }
 }
 
 // =======================================================
@@ -57,28 +58,30 @@ void  IConsole_Command::add_LRU_to_tips( vecTips& tips )
 class CCC_Quit : public IConsole_Command
 {
 public:
-	CCC_Quit(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-//		TerminateProcess(GetCurrentProcess(),0);
-		Console->Hide();
-		Engine.Event.Defer("KERNEL:disconnect");
-		Engine.Event.Defer("KERNEL:quit");
-	}
+    CCC_Quit(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        // TerminateProcess(GetCurrentProcess(),0);
+        Console->Hide();
+        Engine.Event.Defer("KERNEL:disconnect");
+        Engine.Event.Defer("KERNEL:quit");
+    }
 };
 //-----------------------------------------------------------------------
 #ifdef DEBUG_MEMORY_MANAGER
 class CCC_MemStat : public IConsole_Command
 {
 public:
-	CCC_MemStat(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		string_path fn;
-		if (args&&args[0])	xr_sprintf	(fn,sizeof(fn),"%s.dump",args);
-		else				strcpy_s_s	(fn,sizeof(fn),"x:\\$memory$.dump");
-		Memory.mem_statistic				(fn);
-//		g_pStringContainer->dump			();
-//		g_pSharedMemoryContainer->dump		();
-	}
+    CCC_MemStat(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        string_path fn;
+        if (args&&args[0]) xr_sprintf(fn, sizeof(fn), "%s.dump", args);
+        else strcpy_s_s(fn, sizeof(fn), "x:\\$memory$.dump");
+        Memory.mem_statistic(fn);
+        // g_pStringContainer->dump ();
+        // g_pSharedMemoryContainer->dump ();
+    }
 };
 #endif // DEBUG_MEMORY_MANAGER
 
@@ -86,66 +89,71 @@ class CCC_MemStat : public IConsole_Command
 class CCC_DbgMemCheck : public IConsole_Command
 {
 public:
-	CCC_DbgMemCheck(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) { if (Memory.debug_mode){ Memory.dbg_check();}else{Msg("~ Run with -mem_debug options.");} }
+    CCC_DbgMemCheck(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args) { if (Memory.debug_mode) { Memory.dbg_check(); } else { Msg("~ Run with -mem_debug options."); } }
 };
 #endif // DEBUG_MEMORY_MANAGER
 
 class CCC_DbgStrCheck : public IConsole_Command
 {
 public:
-	CCC_DbgStrCheck(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) { g_pStringContainer->verify(); }
+    CCC_DbgStrCheck(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args) { g_pStringContainer->verify(); }
 };
 
 class CCC_DbgStrDump : public IConsole_Command
 {
 public:
-	CCC_DbgStrDump(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) { g_pStringContainer->dump();}
+    CCC_DbgStrDump(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args) { g_pStringContainer->dump(); }
 };
 
 //-----------------------------------------------------------------------
 class CCC_MotionsStat : public IConsole_Command
 {
 public:
-	CCC_MotionsStat(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		//g_pMotionsContainer->dump();
-		//	TODO: move this console commant into renderer
-		VERIFY(0);
-	}
+    CCC_MotionsStat(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        //g_pMotionsContainer->dump();
+        // TODO: move this console commant into renderer
+        VERIFY(0);
+    }
 };
 class CCC_TexturesStat : public IConsole_Command
 {
 public:
-	CCC_TexturesStat(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		Device.DumpResourcesMemoryUsage();
-		//Device.Resources->_DumpMemoryUsage();
-		//	TODO: move this console commant into renderer
-		//VERIFY(0);
-	}
+    CCC_TexturesStat(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        Device.DumpResourcesMemoryUsage();
+        //Device.Resources->_DumpMemoryUsage();
+        // TODO: move this console commant into renderer
+        //VERIFY(0);
+    }
 };
 //-----------------------------------------------------------------------
 class CCC_E_Dump : public IConsole_Command
 {
 public:
-	CCC_E_Dump(LPCSTR N) : IConsole_Command(N)  { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		Engine.Event.Dump();
-	}
+    CCC_E_Dump(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        Engine.Event.Dump();
+    }
 };
 class CCC_E_Signal : public IConsole_Command
 {
 public:
-	CCC_E_Signal(LPCSTR N) : IConsole_Command(N)  { };
-	virtual void Execute(LPCSTR args) {
-		char	Event[128],Param[128];
-		Event[0]=0; Param[0]=0;
-		sscanf	(args,"%[^,],%s",Event,Param);
-		Engine.Event.Signal	(Event,(u64)Param);
-	}
+    CCC_E_Signal(LPCSTR N) : IConsole_Command(N) { };
+    virtual void Execute(LPCSTR args)
+    {
+        char Event[128], Param[128];
+        Event[0] = 0;
+        Param[0] = 0;
+        sscanf(args, "%[^,],%s", Event, Param);
+        Engine.Event.Signal(Event, (u64)Param);
+    }
 };
 
 
@@ -154,38 +162,41 @@ class CCC_E_Signal : public IConsole_Command
 class CCC_Help : public IConsole_Command
 {
 public:
-	CCC_Help(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		Log("- --- Command listing: start ---");
-		CConsole::vecCMD_IT it;
-		for (it=Console->Commands.begin(); it!=Console->Commands.end(); it++)
-		{
-			IConsole_Command &C = *(it->second);
-			TStatus _S; C.Status(_S);
-			TInfo	_I;	C.Info	(_I);
-			
-			Msg("%-20s (%-10s) --- %s",	C.Name(), _S, _I);
-		}
-		Log("Key: Ctrl + A         === Select all ");
-		Log("Key: Ctrl + C         === Copy to clipboard ");
-		Log("Key: Ctrl + V         === Paste from clipboard ");
-		Log("Key: Ctrl + X         === Cut to clipboard ");
-		Log("Key: Ctrl + Z         === Undo ");
-		Log("Key: Ctrl + Insert    === Copy to clipboard ");
-		Log("Key: Shift + Insert   === Paste from clipboard ");
-		Log("Key: Shift + Delete   === Cut to clipboard ");
-		Log("Key: Insert           === Toggle mode <Insert> ");
-		Log("Key: Back / Delete          === Delete symbol left / right ");
-
-		Log("Key: Up   / Down            === Prev / Next command in tips list ");
-		Log("Key: Ctrl + Up / Ctrl + Down === Prev / Next executing command ");
-		Log("Key: Left, Right, Home, End {+Shift/+Ctrl}       === Navigation in text ");
-		Log("Key: PageUp / PageDown      === Scrolling history ");
-		Log("Key: Tab  / Shift + Tab     === Next / Prev possible command from list");
-		Log("Key: Enter  / NumEnter      === Execute current command ");
-		
-		Log("- --- Command listing: end ----");
-	}
+    CCC_Help(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        Log("- --- Command listing: start ---");
+        CConsole::vecCMD_IT it;
+        for (it = Console->Commands.begin(); it != Console->Commands.end(); it++)
+        {
+            IConsole_Command& C = *(it->second);
+            TStatus _S;
+            C.Status(_S);
+            TInfo _I;
+            C.Info(_I);
+
+            Msg("%-20s (%-10s) --- %s", C.Name(), _S, _I);
+        }
+        Log("Key: Ctrl + A         === Select all ");
+        Log("Key: Ctrl + C         === Copy to clipboard ");
+        Log("Key: Ctrl + V         === Paste from clipboard ");
+        Log("Key: Ctrl + X         === Cut to clipboard ");
+        Log("Key: Ctrl + Z         === Undo ");
+        Log("Key: Ctrl + Insert    === Copy to clipboard ");
+        Log("Key: Shift + Insert   === Paste from clipboard ");
+        Log("Key: Shift + Delete   === Cut to clipboard ");
+        Log("Key: Insert           === Toggle mode <Insert> ");
+        Log("Key: Back / Delete          === Delete symbol left / right ");
+
+        Log("Key: Up   / Down            === Prev / Next command in tips list ");
+        Log("Key: Ctrl + Up / Ctrl + Down === Prev / Next executing command ");
+        Log("Key: Left, Right, Home, End {+Shift/+Ctrl}       === Navigation in text ");
+        Log("Key: PageUp / PageDown      === Scrolling history ");
+        Log("Key: Tab  / Shift + Tab     === Next / Prev possible command from list");
+        Log("Key: Enter  / NumEnter      === Execute current command ");
+
+        Log("- --- Command listing: end ----");
+    }
 };
 
 
@@ -193,636 +204,654 @@ XRCORE_API void _dump_open_files(int mode);
 class CCC_DumpOpenFiles : public IConsole_Command
 {
 public:
-	CCC_DumpOpenFiles(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = FALSE; };
-	virtual void Execute(LPCSTR args) {
-		int _mode			= atoi(args);
-		_dump_open_files	(_mode);
-	}
+    CCC_DumpOpenFiles(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = FALSE; };
+    virtual void Execute(LPCSTR args)
+    {
+        int _mode = atoi(args);
+        _dump_open_files(_mode);
+    }
 };
 
 //-----------------------------------------------------------------------
 class CCC_SaveCFG : public IConsole_Command
 {
 public:
-	CCC_SaveCFG(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) 
-	{
-		string_path			cfg_full_name;
-		xr_strcpy			(cfg_full_name, (xr_strlen(args)>0)?args:Console->ConfigFile);
-
-		bool b_abs_name = xr_strlen(cfg_full_name)>2 && cfg_full_name[1]==':';
-
-		if(!b_abs_name)
-			FS.update_path	(cfg_full_name, "$app_data_root$", cfg_full_name);
-
-		if (strext(cfg_full_name))	
-			*strext(cfg_full_name) = 0;
-		xr_strcat			(cfg_full_name,".ltx");
-		
-		BOOL b_allow = TRUE;
-		if ( FS.exist(cfg_full_name) )
-			b_allow = SetFileAttributes(cfg_full_name,FILE_ATTRIBUTE_NORMAL);
-
-		if ( b_allow ){
-			IWriter* F			= FS.w_open(cfg_full_name);
-				CConsole::vecCMD_IT it;
-				for (it=Console->Commands.begin(); it!=Console->Commands.end(); it++)
-					it->second->Save(F);
-				FS.w_close			(F);
-				Msg("Config-file [%s] saved successfully",cfg_full_name);
-		}else
-			Msg("!Cannot store config file [%s]", cfg_full_name);
-	}
+    CCC_SaveCFG(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        string_path cfg_full_name;
+        xr_strcpy(cfg_full_name, (xr_strlen(args) > 0) ? args : Console->ConfigFile);
+
+        bool b_abs_name = xr_strlen(cfg_full_name) > 2 && cfg_full_name[1] == ':';
+
+        if (!b_abs_name)
+            FS.update_path(cfg_full_name, "$app_data_root$", cfg_full_name);
+
+        if (strext(cfg_full_name))
+            *strext(cfg_full_name) = 0;
+        xr_strcat(cfg_full_name, ".ltx");
+
+        BOOL b_allow = TRUE;
+        if (FS.exist(cfg_full_name))
+            b_allow = SetFileAttributes(cfg_full_name, FILE_ATTRIBUTE_NORMAL);
+
+        if (b_allow)
+        {
+            IWriter* F = FS.w_open(cfg_full_name);
+            CConsole::vecCMD_IT it;
+            for (it = Console->Commands.begin(); it != Console->Commands.end(); it++)
+                it->second->Save(F);
+            FS.w_close(F);
+            Msg("Config-file [%s] saved successfully", cfg_full_name);
+        }
+        else
+            Msg("!Cannot store config file [%s]", cfg_full_name);
+    }
 };
-CCC_LoadCFG::CCC_LoadCFG(LPCSTR N) : IConsole_Command(N) 
+CCC_LoadCFG::CCC_LoadCFG(LPCSTR N) : IConsole_Command(N)
 {};
 
-void CCC_LoadCFG::Execute(LPCSTR args) 
-{
-		Msg("Executing config-script \"%s\"...",args);
-		string_path						cfg_name;
-
-		xr_strcpy							(cfg_name, args);
-		if (strext(cfg_name))			*strext(cfg_name) = 0;
-		xr_strcat							(cfg_name,".ltx");
-
-		string_path						cfg_full_name;
-
-		FS.update_path					(cfg_full_name, "$app_data_root$", cfg_name);
-		
-		if( NULL == FS.exist(cfg_full_name) )
-			FS.update_path					(cfg_full_name, "$fs_root$", cfg_name);
-			
-		if( NULL == FS.exist(cfg_full_name) )
-			xr_strcpy						(cfg_full_name, cfg_name);
-		
-		IReader* F						= FS.r_open(cfg_full_name);
-		
-		string1024						str;
-		if (F!=NULL) {
-			while (!F->eof()) {
-				F->r_string				(str,sizeof(str));
-				if(allow(str))
-					Console->Execute	(str);
-			}
-			FS.r_close(F);
-			Msg("[%s] successfully loaded.",cfg_full_name);
-		} else {
-			Msg("! Cannot open script file [%s]",cfg_full_name);
-		}
+void CCC_LoadCFG::Execute(LPCSTR args)
+{
+    Msg("Executing config-script \"%s\"...", args);
+    string_path cfg_name;
+
+    xr_strcpy(cfg_name, args);
+    if (strext(cfg_name)) *strext(cfg_name) = 0;
+    xr_strcat(cfg_name, ".ltx");
+
+    string_path cfg_full_name;
+
+    FS.update_path(cfg_full_name, "$app_data_root$", cfg_name);
+
+    if (NULL == FS.exist(cfg_full_name))
+        FS.update_path(cfg_full_name, "$fs_root$", cfg_name);
+
+    if (NULL == FS.exist(cfg_full_name))
+        xr_strcpy(cfg_full_name, cfg_name);
+
+    IReader* F = FS.r_open(cfg_full_name);
+
+    string1024 str;
+    if (F != NULL)
+    {
+        while (!F->eof())
+        {
+            F->r_string(str, sizeof(str));
+            if (allow(str))
+                Console->Execute(str);
+        }
+        FS.r_close(F);
+        Msg("[%s] successfully loaded.", cfg_full_name);
+    }
+    else
+    {
+        Msg("! Cannot open script file [%s]", cfg_full_name);
+    }
 }
 
 CCC_LoadCFG_custom::CCC_LoadCFG_custom(LPCSTR cmd)
-:CCC_LoadCFG(cmd)
+    :CCC_LoadCFG(cmd)
 {
-	xr_strcpy(m_cmd, cmd);
+    xr_strcpy(m_cmd, cmd);
 };
 bool CCC_LoadCFG_custom::allow(LPCSTR cmd)
 {
-	return (cmd == strstr(cmd, m_cmd) );
+    return (cmd == strstr(cmd, m_cmd));
 };
 
 //-----------------------------------------------------------------------
 class CCC_Start : public IConsole_Command
 {
-	void	parse		(LPSTR dest, LPCSTR args, LPCSTR name)
-	{
-		dest[0]	= 0;
-		if (strstr(args,name))
-			sscanf(strstr(args,name)+xr_strlen(name),"(%[^)])",dest);
-	}
-
-	void	protect_Name_strlwr( LPSTR str )
-	{
- 		string4096	out;
-		xr_strcpy( out, sizeof(out), str );
-		strlwr( str );
-
-		LPCSTR name_str = "name=";
-		LPCSTR name1 = strstr( str, name_str );
-		if ( !name1 || !xr_strlen( name1 ) )
-		{
-			return;
-		}
-		int begin_p = xr_strlen( str ) - xr_strlen( name1 ) + xr_strlen( name_str );
-		if ( begin_p < 1 )
-		{
-			return;
-		}
-
-		LPCSTR name2 = strchr( name1, '/' );
-		int end_p = xr_strlen( str ) - ((name2)? xr_strlen(name2) : 0);
-		if ( begin_p >= end_p )
-		{
-			return;
-		}
-		for ( int i = begin_p; i < end_p;++i )
-		{
-			str[i] = out[i];
-		}
-	}
+    void parse(LPSTR dest, LPCSTR args, LPCSTR name)
+    {
+        dest[0] = 0;
+        if (strstr(args, name))
+            sscanf(strstr(args, name) + xr_strlen(name), "(%[^)])", dest);
+    }
+
+    void protect_Name_strlwr(LPSTR str)
+    {
+        string4096 out;
+        xr_strcpy(out, sizeof(out), str);
+        strlwr(str);
+
+        LPCSTR name_str = "name=";
+        LPCSTR name1 = strstr(str, name_str);
+        if (!name1 || !xr_strlen(name1))
+        {
+            return;
+        }
+        int begin_p = xr_strlen(str) - xr_strlen(name1) + xr_strlen(name_str);
+        if (begin_p < 1)
+        {
+            return;
+        }
+
+        LPCSTR name2 = strchr(name1, '/');
+        int end_p = xr_strlen(str) - ((name2) ? xr_strlen(name2) : 0);
+        if (begin_p >= end_p)
+        {
+            return;
+        }
+        for (int i = begin_p; i < end_p; ++i)
+        {
+            str[i] = out[i];
+        }
+    }
 public:
-	CCC_Start(LPCSTR N) : IConsole_Command(N)	{ 	  bLowerCaseArgs = false; };
-	virtual void Execute(LPCSTR args)
-	{
-/*		if (g_pGameLevel)	{
-			Log		("! Please disconnect/unload first");
-			return;
-		}
-*/
-		string4096	op_server,op_client,op_demo;
-		op_server[0] = 0;
-		op_client[0] = 0;
-		
-		parse		(op_server,args,"server");	// 1. server
-		parse		(op_client,args,"client");	// 2. client
-		parse		(op_demo, args,	"demo");	// 3. demo
-		
-		strlwr( op_server );
-		protect_Name_strlwr( op_client );
-
-		if(!op_client[0] && strstr(op_server,"single"))
-			xr_strcpy(op_client, "localhost");
-
-		if ((0==xr_strlen(op_client)) && (0 == xr_strlen(op_demo)))
-		{
-			Log("! Can't start game without client. Arguments: '%s'.",args);
-			return;
-		}
-		if (g_pGameLevel)
-			Engine.Event.Defer("KERNEL:disconnect");
-		
-		if (xr_strlen(op_demo))
-		{
-			Engine.Event.Defer	("KERNEL:start_mp_demo",u64(xr_strdup(op_demo)),0);
-		} else
-		{
-			Engine.Event.Defer	("KERNEL:start",u64(xr_strlen(op_server)?xr_strdup(op_server):0),u64(xr_strdup(op_client)));
-		}
-	}
+    CCC_Start(LPCSTR N) : IConsole_Command(N) { bLowerCaseArgs = false; };
+    virtual void Execute(LPCSTR args)
+    {
+        /* if (g_pGameLevel) {
+         Log ("! Please disconnect/unload first");
+         return;
+         }
+         */
+        string4096 op_server, op_client, op_demo;
+        op_server[0] = 0;
+        op_client[0] = 0;
+
+        parse(op_server, args, "server"); // 1. server
+        parse(op_client, args, "client"); // 2. client
+        parse(op_demo, args, "demo"); // 3. demo
+
+        strlwr(op_server);
+        protect_Name_strlwr(op_client);
+
+        if (!op_client[0] && strstr(op_server, "single"))
+            xr_strcpy(op_client, "localhost");
+
+        if ((0 == xr_strlen(op_client)) && (0 == xr_strlen(op_demo)))
+        {
+            Log("! Can't start game without client. Arguments: '%s'.", args);
+            return;
+        }
+        if (g_pGameLevel)
+            Engine.Event.Defer("KERNEL:disconnect");
+
+        if (xr_strlen(op_demo))
+        {
+            Engine.Event.Defer("KERNEL:start_mp_demo", u64(xr_strdup(op_demo)), 0);
+        }
+        else
+        {
+            Engine.Event.Defer("KERNEL:start", u64(xr_strlen(op_server) ? xr_strdup(op_server) : 0), u64(xr_strdup(op_client)));
+        }
+    }
 };
 
 class CCC_Disconnect : public IConsole_Command
 {
 public:
-	CCC_Disconnect(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		Engine.Event.Defer("KERNEL:disconnect");
-	}
+    CCC_Disconnect(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        Engine.Event.Defer("KERNEL:disconnect");
+    }
 };
 //-----------------------------------------------------------------------
 class CCC_VID_Reset : public IConsole_Command
 {
 public:
-	CCC_VID_Reset(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		if (Device.b_is_Ready) {
-			Device.Reset	();
-		}
-	}
+    CCC_VID_Reset(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        if (Device.b_is_Ready)
+        {
+            Device.Reset();
+        }
+    }
 };
 class CCC_VidMode : public CCC_Token
 {
-	u32		_dummy;
-public :
-					CCC_VidMode(LPCSTR N) : CCC_Token(N, &_dummy, NULL) { bEmptyArgsHandled = FALSE; };
-	virtual void	Execute(LPCSTR args){
-		u32 _w, _h;
-		int cnt = sscanf		(args,"%dx%d",&_w,&_h);
-		if(cnt==2){
-			psCurrentVidMode[0] = _w;
-			psCurrentVidMode[1] = _h;
-		}else{
-			Msg("! Wrong video mode [%s]", args);
-			return;
-		}
-	}
-	virtual void	Status	(TStatus& S)	
-	{ 
-		xr_sprintf(S,sizeof(S),"%dx%d",psCurrentVidMode[0],psCurrentVidMode[1]); 
-	}
-	virtual xr_token* GetToken()				{return vid_mode_token;}
-	virtual void	Info	(TInfo& I)
-	{	
-		xr_strcpy(I,sizeof(I),"change screen resolution WxH");
-	}
-
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		TStatus  str, cur;
-		Status( cur );
-
-		bool res = false;
-		xr_token* tok = GetToken();
-		while ( tok->name && !res )
-		{
-			if ( !xr_strcmp( tok->name, cur ) )
-			{
-				xr_sprintf( str, sizeof(str), "%s  (current)", tok->name );
-				tips.push_back( str );
-				res = true;
-			}
-			tok++;
-		}
-		if ( !res )
-		{
-			tips.push_back( "---  (current)" );
-		}
-		tok = GetToken();
-		while ( tok->name )
-		{
-			tips.push_back( tok->name );
-			tok++;
-		}
-	}
+    u32 _dummy;
+public:
+    CCC_VidMode(LPCSTR N) : CCC_Token(N, &_dummy, NULL) { bEmptyArgsHandled = FALSE; };
+    virtual void Execute(LPCSTR args)
+    {
+        u32 _w, _h;
+        int cnt = sscanf(args, "%dx%d", &_w, &_h);
+        if (cnt == 2)
+        {
+            psCurrentVidMode[0] = _w;
+            psCurrentVidMode[1] = _h;
+        }
+        else
+        {
+            Msg("! Wrong video mode [%s]", args);
+            return;
+        }
+    }
+    virtual void Status(TStatus& S)
+    {
+        xr_sprintf(S, sizeof(S), "%dx%d", psCurrentVidMode[0], psCurrentVidMode[1]);
+    }
+    virtual xr_token* GetToken() { return vid_mode_token; }
+    virtual void Info(TInfo& I)
+    {
+        xr_strcpy(I, sizeof(I), "change screen resolution WxH");
+    }
+
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        TStatus str, cur;
+        Status(cur);
+
+        bool res = false;
+        xr_token* tok = GetToken();
+        while (tok->name && !res)
+        {
+            if (!xr_strcmp(tok->name, cur))
+            {
+                xr_sprintf(str, sizeof(str), "%s (current)", tok->name);
+                tips.push_back(str);
+                res = true;
+            }
+            tok++;
+        }
+        if (!res)
+        {
+            tips.push_back("--- (current)");
+        }
+        tok = GetToken();
+        while (tok->name)
+        {
+            tips.push_back(tok->name);
+            tok++;
+        }
+    }
 
 };
 //-----------------------------------------------------------------------
 class CCC_SND_Restart : public IConsole_Command
 {
 public:
-	CCC_SND_Restart(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		Sound->_restart();
-	}
+    CCC_SND_Restart(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+    virtual void Execute(LPCSTR args)
+    {
+        Sound->_restart();
+    }
 };
 
 //-----------------------------------------------------------------------
-float	ps_gamma=1.f,ps_brightness=1.f,ps_contrast=1.f;
+float ps_gamma = 1.f, ps_brightness = 1.f, ps_contrast = 1.f;
 class CCC_Gamma : public CCC_Float
 {
 public:
-	CCC_Gamma	(LPCSTR N, float* V) : CCC_Float(N,V,0.5f,1.5f)	{}
-
-	virtual void Execute(LPCSTR args)
-	{
-		CCC_Float::Execute		(args);
-		//Device.Gamma.Gamma		(ps_gamma);
-		Device.m_pRender->setGamma(ps_gamma);
-		//Device.Gamma.Brightness	(ps_brightness);
-		Device.m_pRender->setBrightness(ps_brightness);
-		//Device.Gamma.Contrast	(ps_contrast);
-		Device.m_pRender->setContrast(ps_contrast);
-		//Device.Gamma.Update		();
-		Device.m_pRender->updateGamma();
-	}
+    CCC_Gamma(LPCSTR N, float* V) : CCC_Float(N, V, 0.5f, 1.5f) {}
+
+    virtual void Execute(LPCSTR args)
+    {
+        CCC_Float::Execute(args);
+        //Device.Gamma.Gamma (ps_gamma);
+        Device.m_pRender->setGamma(ps_gamma);
+        //Device.Gamma.Brightness (ps_brightness);
+        Device.m_pRender->setBrightness(ps_brightness);
+        //Device.Gamma.Contrast (ps_contrast);
+        Device.m_pRender->setContrast(ps_contrast);
+        //Device.Gamma.Update ();
+        Device.m_pRender->updateGamma();
+    }
 };
 
 //-----------------------------------------------------------------------
 /*
-#ifdef	DEBUG
-extern  INT	g_bDR_LM_UsePointsBBox;
-extern	INT	g_bDR_LM_4Steps;
-extern	INT g_iDR_LM_Step;
-extern	Fvector	g_DR_LM_Min, g_DR_LM_Max;
+#ifdef DEBUG
+extern INT g_bDR_LM_UsePointsBBox;
+extern INT g_bDR_LM_4Steps;
+extern INT g_iDR_LM_Step;
+extern Fvector g_DR_LM_Min, g_DR_LM_Max;
 
 class CCC_DR_ClearPoint : public IConsole_Command
 {
 public:
-	CCC_DR_ClearPoint(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		g_DR_LM_Min.x = 1000000.0f;
-		g_DR_LM_Min.z = 1000000.0f;
+CCC_DR_ClearPoint(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+virtual void Execute(LPCSTR args) {
+g_DR_LM_Min.x = 1000000.0f;
+g_DR_LM_Min.z = 1000000.0f;
 
-		g_DR_LM_Max.x = -1000000.0f;
-		g_DR_LM_Max.z = -1000000.0f;
+g_DR_LM_Max.x = -1000000.0f;
+g_DR_LM_Max.z = -1000000.0f;
 
-		Msg("Local BBox (%f, %f) - (%f, %f)", g_DR_LM_Min.x, g_DR_LM_Min.z, g_DR_LM_Max.x, g_DR_LM_Max.z);
-	}
+Msg("Local BBox (%f, %f) - (%f, %f)", g_DR_LM_Min.x, g_DR_LM_Min.z, g_DR_LM_Max.x, g_DR_LM_Max.z);
+}
 };
 
 class CCC_DR_TakePoint : public IConsole_Command
 {
 public:
-	CCC_DR_TakePoint(LPCSTR N) : IConsole_Command(N)	{ bEmptyArgsHandled = TRUE; };
-	virtual void Execute(LPCSTR args) {
-		Fvector CamPos =  Device.vCameraPosition;
+CCC_DR_TakePoint(LPCSTR N) : IConsole_Command(N) { bEmptyArgsHandled = TRUE; };
+virtual void Execute(LPCSTR args) {
+Fvector CamPos = Device.vCameraPosition;
 
-		if (g_DR_LM_Min.x > CamPos.x)	g_DR_LM_Min.x = CamPos.x;
-		if (g_DR_LM_Min.z > CamPos.z)	g_DR_LM_Min.z = CamPos.z;
+if (g_DR_LM_Min.x > CamPos.x) g_DR_LM_Min.x = CamPos.x;
+if (g_DR_LM_Min.z > CamPos.z) g_DR_LM_Min.z = CamPos.z;
 
-		if (g_DR_LM_Max.x < CamPos.x)	g_DR_LM_Max.x = CamPos.x;
-		if (g_DR_LM_Max.z < CamPos.z)	g_DR_LM_Max.z = CamPos.z;
+if (g_DR_LM_Max.x < CamPos.x) g_DR_LM_Max.x = CamPos.x;
+if (g_DR_LM_Max.z < CamPos.z) g_DR_LM_Max.z = CamPos.z;
 
-		Msg("Local BBox (%f, %f) - (%f, %f)", g_DR_LM_Min.x, g_DR_LM_Min.z, g_DR_LM_Max.x, g_DR_LM_Max.z);
-	}
+Msg("Local BBox (%f, %f) - (%f, %f)", g_DR_LM_Min.x, g_DR_LM_Min.z, g_DR_LM_Max.x, g_DR_LM_Max.z);
+}
 };
 
 class CCC_DR_UsePoints : public CCC_Integer
 {
 public:
-	CCC_DR_UsePoints(LPCSTR N, int* V, int _min=0, int _max=999) : CCC_Integer(N, V, _min, _max)	{};
-	virtual void	Save	(IWriter *F)	{};
+CCC_DR_UsePoints(LPCSTR N, int* V, int _min=0, int _max=999) : CCC_Integer(N, V, _min, _max) {};
+virtual void Save (IWriter *F) {};
 };
 #endif
 */
 
 ENGINE_API BOOL r2_sun_static = TRUE;
-ENGINE_API BOOL r2_advanced_pp = FALSE;	//	advanced post process and effects
+ENGINE_API BOOL r2_advanced_pp = FALSE; // advanced post process and effects
 
-u32	renderer_value	= 3;
+u32 renderer_value = 3;
 //void fill_render_mode_list();
 //void free_render_mode_list();
 
 class CCC_r2 : public CCC_Token
 {
-	typedef CCC_Token inherited;
+    typedef CCC_Token inherited;
 public:
-	CCC_r2(LPCSTR N) :inherited(N, &renderer_value, NULL){renderer_value=3;};
-	virtual			~CCC_r2	()
-	{
-		//free_render_mode_list();
-	}
-	virtual void	Execute	(LPCSTR args)
-	{
-		//fill_render_mode_list	();
-		//	vid_quality_token must be already created!
-		tokens					= vid_quality_token;
-
-		inherited::Execute		(args);
-		//	0 - r1
-		//	1..3 - r2
-		//	4 - r3
-		psDeviceFlags.set		(rsR2, ((renderer_value>0) && renderer_value<4) );
-		psDeviceFlags.set		(rsR3, (renderer_value==4) );
-		psDeviceFlags.set		(rsR4, (renderer_value>=5) );
-
-		r2_sun_static	= (renderer_value<2);
-
-		r2_advanced_pp  = (renderer_value>=3);
-	}
-
-	virtual void	Save	(IWriter *F)	
-	{
-		//fill_render_mode_list	();
-		tokens					= vid_quality_token;
-		if( !strstr(Core.Params, "-r2") )
-		{
-			inherited::Save(F);
-		}
-	}
-	virtual xr_token* GetToken()
-	{
-		tokens					= vid_quality_token;
-		return					inherited::GetToken();
-	}
+    CCC_r2(LPCSTR N) :inherited(N, &renderer_value, NULL) { renderer_value = 3; };
+    virtual ~CCC_r2()
+    {
+        //free_render_mode_list();
+    }
+    virtual void Execute(LPCSTR args)
+    {
+        //fill_render_mode_list ();
+        // vid_quality_token must be already created!
+        tokens = vid_quality_token;
+
+        inherited::Execute(args);
+        // 0 - r1
+        // 1..3 - r2
+        // 4 - r3
+        psDeviceFlags.set(rsR2, ((renderer_value > 0) && renderer_value < 4));
+        psDeviceFlags.set(rsR3, (renderer_value == 4));
+        psDeviceFlags.set(rsR4, (renderer_value >= 5));
+
+        r2_sun_static = (renderer_value < 2);
+
+        r2_advanced_pp = (renderer_value >= 3);
+    }
+
+    virtual void Save(IWriter* F)
+    {
+        //fill_render_mode_list ();
+        tokens = vid_quality_token;
+        if (!strstr(Core.Params, "-r2"))
+        {
+            inherited::Save(F);
+        }
+    }
+    virtual xr_token* GetToken()
+    {
+        tokens = vid_quality_token;
+        return inherited::GetToken();
+    }
 
 };
 #ifndef DEDICATED_SERVER
 class CCC_soundDevice : public CCC_Token
 {
-	typedef CCC_Token inherited;
+    typedef CCC_Token inherited;
 public:
-	CCC_soundDevice(LPCSTR N) :inherited(N, &snd_device_id, NULL){};
-	virtual			~CCC_soundDevice	()
-	{}
-
-	virtual void Execute(LPCSTR args)
-	{
-		GetToken				();
-		if(!tokens)				return;
-		inherited::Execute		(args);
-	}
-
-	virtual void	Status	(TStatus& S)
-	{
-		GetToken				();
-		if(!tokens)				return;
-		inherited::Status		(S);
-	}
-
-	virtual xr_token* GetToken()
-	{
-		tokens					= snd_devices_token;
-		return inherited::GetToken();
-	}
-
-	virtual void Save(IWriter *F)	
-	{
-		GetToken				();
-		if(!tokens)				return;
-		inherited::Save			(F);
-	}
+    CCC_soundDevice(LPCSTR N) :inherited(N, &snd_device_id, NULL) {};
+    virtual ~CCC_soundDevice()
+    {}
+
+    virtual void Execute(LPCSTR args)
+    {
+        GetToken();
+        if (!tokens) return;
+        inherited::Execute(args);
+    }
+
+    virtual void Status(TStatus& S)
+    {
+        GetToken();
+        if (!tokens) return;
+        inherited::Status(S);
+    }
+
+    virtual xr_token* GetToken()
+    {
+        tokens = snd_devices_token;
+        return inherited::GetToken();
+    }
+
+    virtual void Save(IWriter* F)
+    {
+        GetToken();
+        if (!tokens) return;
+        inherited::Save(F);
+    }
 };
 #endif
 //-----------------------------------------------------------------------
-class CCC_ExclusiveMode : public IConsole_Command {
+class CCC_ExclusiveMode : public IConsole_Command
+{
 private:
-	typedef IConsole_Command inherited;
+    typedef IConsole_Command inherited;
 
 public:
-					CCC_ExclusiveMode	(LPCSTR N) :
-		inherited	(N)
-	{
-	}
-
-	virtual void	Execute				(LPCSTR args)
-	{
-		bool		value = false;
-		if (!xr_strcmp(args,"on"))
-			value	= true;
-		else if (!xr_strcmp(args,"off"))
-			value	= false;
-		else if (!xr_strcmp(args,"true"))
-			value	= true;
-		else if (!xr_strcmp(args,"false"))
-			value	= false;
-		else if (!xr_strcmp(args,"1"))
-			value	= true;
-		else if (!xr_strcmp(args,"0"))
-			value	= false;
-		else InvalidSyntax();
-		
-		pInput->exclusive_mode	(value);
-	}
-
-	virtual void	Save	(IWriter *F)	
-	{
-	}
+    CCC_ExclusiveMode(LPCSTR N) :
+        inherited(N)
+    {
+    }
+
+    virtual void Execute(LPCSTR args)
+    {
+        bool value = false;
+        if (!xr_strcmp(args, "on"))
+            value = true;
+        else if (!xr_strcmp(args, "off"))
+            value = false;
+        else if (!xr_strcmp(args, "true"))
+            value = true;
+        else if (!xr_strcmp(args, "false"))
+            value = false;
+        else if (!xr_strcmp(args, "1"))
+            value = true;
+        else if (!xr_strcmp(args, "0"))
+            value = false;
+        else InvalidSyntax();
+
+        pInput->exclusive_mode(value);
+    }
+
+    virtual void Save(IWriter* F)
+    {
+    }
 };
 
 class ENGINE_API CCC_HideConsole : public IConsole_Command
 {
-public		:
-	CCC_HideConsole(LPCSTR N) : IConsole_Command(N)
-	{
-		bEmptyArgsHandled	= true;
-	}
-
-	virtual void	Execute	(LPCSTR args)
-	{
-		Console->Hide	();
-	}
-	virtual void	Status	(TStatus& S)
-	{
-		S[0]			= 0;
-	}
-	virtual void	Info	(TInfo& I)
-	{	
-		xr_sprintf		(I,sizeof(I),"hide console");
-	}
+public:
+    CCC_HideConsole(LPCSTR N) : IConsole_Command(N)
+    {
+        bEmptyArgsHandled = true;
+    }
+
+    virtual void Execute(LPCSTR args)
+    {
+        Console->Hide();
+    }
+    virtual void Status(TStatus& S)
+    {
+        S[0] = 0;
+    }
+    virtual void Info(TInfo& I)
+    {
+        xr_sprintf(I, sizeof(I), "hide console");
+    }
 };
 
 
-ENGINE_API float	psHUD_FOV=0.45f;
+ENGINE_API float psHUD_FOV = 0.45f;
 
-//extern int			psSkeletonUpdate;
-extern int			rsDVB_Size;
-extern int			rsDIB_Size;
-extern int			psNET_ClientUpdate;
-extern int			psNET_ClientPending;
-extern int			psNET_ServerUpdate;
-extern int			psNET_ServerPending;
-extern int			psNET_DedicatedSleep;
-extern char			psNET_Name[32];
-extern Flags32		psEnvFlags;
-//extern float		r__dtex_range;
+//extern int psSkeletonUpdate;
+extern int rsDVB_Size;
+extern int rsDIB_Size;
+extern int psNET_ClientUpdate;
+extern int psNET_ClientPending;
+extern int psNET_ServerUpdate;
+extern int psNET_ServerPending;
+extern int psNET_DedicatedSleep;
+extern char psNET_Name[32];
+extern Flags32 psEnvFlags;
+//extern float r__dtex_range;
 
-extern int			g_ErrorLineCount;
+extern int g_ErrorLineCount;
 
-ENGINE_API int			ps_r__Supersample			= 1;
+ENGINE_API int ps_r__Supersample = 1;
 void CCC_Register()
 {
-	// General
-	CMD1(CCC_Help,		"help"					);
-	CMD1(CCC_Quit,		"quit"					);
-	CMD1(CCC_Start,		"start"					);
-	CMD1(CCC_Disconnect,"disconnect"			);
-	CMD1(CCC_SaveCFG,	"cfg_save"				);
-	CMD1(CCC_LoadCFG,	"cfg_load"				);
+    // General
+    CMD1(CCC_Help, "help");
+    CMD1(CCC_Quit, "quit");
+    CMD1(CCC_Start, "start");
+    CMD1(CCC_Disconnect, "disconnect");
+    CMD1(CCC_SaveCFG, "cfg_save");
+    CMD1(CCC_LoadCFG, "cfg_load");
 
 #ifdef DEBUG
-	CMD1(CCC_MotionsStat,	"stat_motions"		);
-	CMD1(CCC_TexturesStat,	"stat_textures"		);
+    CMD1(CCC_MotionsStat, "stat_motions");
+    CMD1(CCC_TexturesStat, "stat_textures");
 #endif // DEBUG
 
 #ifdef DEBUG_MEMORY_MANAGER
-	CMD1(CCC_MemStat,		"dbg_mem_dump"		);
-	CMD1(CCC_DbgMemCheck,	"dbg_mem_check"		);
+    CMD1(CCC_MemStat, "dbg_mem_dump");
+    CMD1(CCC_DbgMemCheck, "dbg_mem_check");
 #endif // DEBUG_MEMORY_MANAGER
 
 #ifdef DEBUG
-	CMD3(CCC_Mask,		"mt_particles",			&psDeviceFlags,			mtParticles);
+    CMD3(CCC_Mask, "mt_particles", &psDeviceFlags, mtParticles);
 
-	CMD1(CCC_DbgStrCheck,	"dbg_str_check"		);
-	CMD1(CCC_DbgStrDump,	"dbg_str_dump"		);
+    CMD1(CCC_DbgStrCheck, "dbg_str_check");
+    CMD1(CCC_DbgStrDump, "dbg_str_dump");
 
-	CMD3(CCC_Mask,		"mt_sound",				&psDeviceFlags,			mtSound);
-	CMD3(CCC_Mask,		"mt_physics",			&psDeviceFlags,			mtPhysics);
-	CMD3(CCC_Mask,		"mt_network",			&psDeviceFlags,			mtNetwork);
-	
-	// Events
-	CMD1(CCC_E_Dump,	"e_list"				);
-	CMD1(CCC_E_Signal,	"e_signal"				);
+    CMD3(CCC_Mask, "mt_sound", &psDeviceFlags, mtSound);
+    CMD3(CCC_Mask, "mt_physics", &psDeviceFlags, mtPhysics);
+    CMD3(CCC_Mask, "mt_network", &psDeviceFlags, mtNetwork);
 
-	CMD3(CCC_Mask,		"rs_wireframe",			&psDeviceFlags,		rsWireframe);
-	CMD3(CCC_Mask,		"rs_clear_bb",			&psDeviceFlags,		rsClearBB);
-	CMD3(CCC_Mask,		"rs_occlusion",			&psDeviceFlags,		rsOcclusion);
+    // Events
+    CMD1(CCC_E_Dump, "e_list");
+    CMD1(CCC_E_Signal, "e_signal");
 
-	CMD3(CCC_Mask,		"rs_detail",			&psDeviceFlags,		rsDetails	);
-	//CMD4(CCC_Float,		"r__dtex_range",		&r__dtex_range,		5,		175	);
+    CMD3(CCC_Mask, "rs_wireframe", &psDeviceFlags, rsWireframe);
+    CMD3(CCC_Mask, "rs_clear_bb", &psDeviceFlags, rsClearBB);
+    CMD3(CCC_Mask, "rs_occlusion", &psDeviceFlags, rsOcclusion);
 
-//	CMD3(CCC_Mask,		"rs_constant_fps",		&psDeviceFlags,		rsConstantFPS			);
-	CMD3(CCC_Mask,		"rs_render_statics",	&psDeviceFlags,		rsDrawStatic			);
-	CMD3(CCC_Mask,		"rs_render_dynamics",	&psDeviceFlags,		rsDrawDynamic			);
+    CMD3(CCC_Mask, "rs_detail", &psDeviceFlags, rsDetails);
+    //CMD4(CCC_Float, "r__dtex_range", &r__dtex_range, 5, 175 );
+
+    // CMD3(CCC_Mask, "rs_constant_fps", &psDeviceFlags, rsConstantFPS );
+    CMD3(CCC_Mask, "rs_render_statics", &psDeviceFlags, rsDrawStatic);
+    CMD3(CCC_Mask, "rs_render_dynamics", &psDeviceFlags, rsDrawDynamic);
 #endif
 
-	// Render device states
-	CMD4(CCC_Integer,	"r__supersample",		&ps_r__Supersample,			1,		4		);
+    // Render device states
+    CMD4(CCC_Integer, "r__supersample", &ps_r__Supersample, 1, 4);
 
 
-	CMD3(CCC_Mask,		"rs_v_sync",			&psDeviceFlags,		rsVSync				);
-//	CMD3(CCC_Mask,		"rs_disable_objects_as_crows",&psDeviceFlags,	rsDisableObjectsAsCrows	);
-	CMD3(CCC_Mask,		"rs_fullscreen",		&psDeviceFlags,		rsFullscreen			);
-	CMD3(CCC_Mask,		"rs_refresh_60hz",		&psDeviceFlags,		rsRefresh60hz			);
-	CMD3(CCC_Mask,		"rs_stats",				&psDeviceFlags,		rsStatistic				);
-	CMD4(CCC_Float,		"rs_vis_distance",		&psVisDistance,		0.4f,	1.5f			);
+    CMD3(CCC_Mask, "rs_v_sync", &psDeviceFlags, rsVSync);
+    // CMD3(CCC_Mask, "rs_disable_objects_as_crows",&psDeviceFlags, rsDisableObjectsAsCrows );
+    CMD3(CCC_Mask, "rs_fullscreen", &psDeviceFlags, rsFullscreen);
+    CMD3(CCC_Mask, "rs_refresh_60hz", &psDeviceFlags, rsRefresh60hz);
+    CMD3(CCC_Mask, "rs_stats", &psDeviceFlags, rsStatistic);
+    CMD4(CCC_Float, "rs_vis_distance", &psVisDistance, 0.4f, 1.5f);
 
-	CMD3(CCC_Mask,		"rs_cam_pos",			&psDeviceFlags,		rsCameraPos				);
+    CMD3(CCC_Mask, "rs_cam_pos", &psDeviceFlags, rsCameraPos);
 #ifdef DEBUG
-	CMD3(CCC_Mask,		"rs_occ_draw",			&psDeviceFlags,		rsOcclusionDraw			);
-	CMD3(CCC_Mask,		"rs_occ_stats",			&psDeviceFlags,		rsOcclusionStats		);
-	//CMD4(CCC_Integer,	"rs_skeleton_update",	&psSkeletonUpdate,	2,		128	);
+    CMD3(CCC_Mask, "rs_occ_draw", &psDeviceFlags, rsOcclusionDraw);
+    CMD3(CCC_Mask, "rs_occ_stats", &psDeviceFlags, rsOcclusionStats);
+    //CMD4(CCC_Integer, "rs_skeleton_update", &psSkeletonUpdate, 2, 128 );
 #endif // DEBUG
 
-	CMD2(CCC_Gamma,		"rs_c_gamma"			,&ps_gamma			);
-	CMD2(CCC_Gamma,		"rs_c_brightness"		,&ps_brightness		);
-	CMD2(CCC_Gamma,		"rs_c_contrast"			,&ps_contrast		);
-//	CMD4(CCC_Integer,	"rs_vb_size",			&rsDVB_Size,		32,		4096);
-//	CMD4(CCC_Integer,	"rs_ib_size",			&rsDIB_Size,		32,		4096);
+    CMD2(CCC_Gamma, "rs_c_gamma", &ps_gamma);
+    CMD2(CCC_Gamma, "rs_c_brightness", &ps_brightness);
+    CMD2(CCC_Gamma, "rs_c_contrast", &ps_contrast);
+    // CMD4(CCC_Integer, "rs_vb_size", &rsDVB_Size, 32, 4096);
+    // CMD4(CCC_Integer, "rs_ib_size", &rsDIB_Size, 32, 4096);
 
-	// Texture manager	
-	CMD4(CCC_Integer,	"texture_lod",			&psTextureLOD,				0,	4	);
-	CMD4(CCC_Integer,	"net_dedicated_sleep",	&psNET_DedicatedSleep,		0,	64	);
+    // Texture manager
+    CMD4(CCC_Integer, "texture_lod", &psTextureLOD, 0, 4);
+    CMD4(CCC_Integer, "net_dedicated_sleep", &psNET_DedicatedSleep, 0, 64);
 
-	// General video control
-	CMD1(CCC_VidMode,	"vid_mode"				);
+    // General video control
+    CMD1(CCC_VidMode, "vid_mode");
 
 #ifdef DEBUG
-	CMD3(CCC_Token,		"vid_bpp",				&psCurrentBPP,	vid_bpp_token );
+    CMD3(CCC_Token, "vid_bpp", &psCurrentBPP, vid_bpp_token);
 #endif // DEBUG
 
-	CMD1(CCC_VID_Reset, "vid_restart"			);
-	
-	// Sound
-	CMD2(CCC_Float,		"snd_volume_eff",		&psSoundVEffects);
-	CMD2(CCC_Float,		"snd_volume_music",		&psSoundVMusic);
-	CMD1(CCC_SND_Restart,"snd_restart"			);
-	CMD3(CCC_Mask,		"snd_acceleration",		&psSoundFlags,		ss_Hardware	);
-	CMD3(CCC_Mask,		"snd_efx",				&psSoundFlags,		ss_EAX		);
-	CMD4(CCC_Integer,	"snd_targets",			&psSoundTargets,	4,32		);
-	CMD4(CCC_Integer,	"snd_cache_size",		&psSoundCacheSizeMB,4,32		);
+    CMD1(CCC_VID_Reset, "vid_restart");
+
+    // Sound
+    CMD2(CCC_Float, "snd_volume_eff", &psSoundVEffects);
+    CMD2(CCC_Float, "snd_volume_music", &psSoundVMusic);
+    CMD1(CCC_SND_Restart, "snd_restart");
+    CMD3(CCC_Mask, "snd_acceleration", &psSoundFlags, ss_Hardware);
+    CMD3(CCC_Mask, "snd_efx", &psSoundFlags, ss_EAX);
+    CMD4(CCC_Integer, "snd_targets", &psSoundTargets, 4, 32);
+    CMD4(CCC_Integer, "snd_cache_size", &psSoundCacheSizeMB, 4, 32);
 
 #ifdef DEBUG
-	CMD3(CCC_Mask,		"snd_stats",			&g_stats_flags,		st_sound	);
-	CMD3(CCC_Mask,		"snd_stats_min_dist",	&g_stats_flags,		st_sound_min_dist );
-	CMD3(CCC_Mask,		"snd_stats_max_dist",	&g_stats_flags,		st_sound_max_dist );
-	CMD3(CCC_Mask,		"snd_stats_ai_dist",	&g_stats_flags,		st_sound_ai_dist );
-	CMD3(CCC_Mask,		"snd_stats_info_name",	&g_stats_flags,		st_sound_info_name );
-	CMD3(CCC_Mask,		"snd_stats_info_object",&g_stats_flags,		st_sound_info_object );
-
-	CMD4(CCC_Integer,	"error_line_count",		&g_ErrorLineCount,	6,	1024	);
+    CMD3(CCC_Mask, "snd_stats", &g_stats_flags, st_sound);
+    CMD3(CCC_Mask, "snd_stats_min_dist", &g_stats_flags, st_sound_min_dist);
+    CMD3(CCC_Mask, "snd_stats_max_dist", &g_stats_flags, st_sound_max_dist);
+    CMD3(CCC_Mask, "snd_stats_ai_dist", &g_stats_flags, st_sound_ai_dist);
+    CMD3(CCC_Mask, "snd_stats_info_name", &g_stats_flags, st_sound_info_name);
+    CMD3(CCC_Mask, "snd_stats_info_object", &g_stats_flags, st_sound_info_object);
+
+    CMD4(CCC_Integer, "error_line_count", &g_ErrorLineCount, 6, 1024);
 #endif // DEBUG
 
-	// Mouse
-	CMD3(CCC_Mask,		"mouse_invert",			&psMouseInvert,1);
-	psMouseSens			= 0.12f;
-	CMD4(CCC_Float,		"mouse_sens",			&psMouseSens,		0.001f, 0.6f);
+    // Mouse
+    CMD3(CCC_Mask, "mouse_invert", &psMouseInvert, 1);
+    psMouseSens = 0.12f;
+    CMD4(CCC_Float, "mouse_sens", &psMouseSens, 0.001f, 0.6f);
 
-	// Camera
-	CMD2(CCC_Float,		"cam_inert",			&psCamInert);
-	CMD2(CCC_Float,		"cam_slide_inert",		&psCamSlideInert);
+    // Camera
+    CMD2(CCC_Float, "cam_inert", &psCamInert);
+    CMD2(CCC_Float, "cam_slide_inert", &psCamSlideInert);
 
-	CMD1(CCC_r2,		"renderer"				);
+    CMD1(CCC_r2, "renderer");
 
 #ifndef DEDICATED_SERVER
-	CMD1(CCC_soundDevice, "snd_device"			);
+    CMD1(CCC_soundDevice, "snd_device");
 #endif
-	//psSoundRolloff	= pSettings->r_float	("sound","rolloff");		clamp(psSoundRolloff,			EPS_S,	2.f);
-	psSoundOcclusionScale	= pSettings->r_float	("sound","occlusion_scale");clamp(psSoundOcclusionScale,	0.1f,	.5f);
+    //psSoundRolloff = pSettings->r_float ("sound","rolloff"); clamp(psSoundRolloff, EPS_S, 2.f);
+    psSoundOcclusionScale = pSettings->r_float("sound", "occlusion_scale");
+    clamp(psSoundOcclusionScale, 0.1f, .5f);
 
-	extern	int	g_Dump_Export_Obj;
-	extern	int	g_Dump_Import_Obj;
-	CMD4(CCC_Integer,	"net_dbg_dump_export_obj",	&g_Dump_Export_Obj, 0, 1);
-	CMD4(CCC_Integer,	"net_dbg_dump_import_obj",	&g_Dump_Import_Obj, 0, 1);
+    extern int g_Dump_Export_Obj;
+    extern int g_Dump_Import_Obj;
+    CMD4(CCC_Integer, "net_dbg_dump_export_obj", &g_Dump_Export_Obj, 0, 1);
+    CMD4(CCC_Integer, "net_dbg_dump_import_obj", &g_Dump_Import_Obj, 0, 1);
 
-#ifdef DEBUG	
-	CMD1(CCC_DumpOpenFiles,		"dump_open_files");
+#ifdef DEBUG
+    CMD1(CCC_DumpOpenFiles, "dump_open_files");
 #endif
 
-	CMD1(CCC_ExclusiveMode,		"input_exclusive_mode");
+    CMD1(CCC_ExclusiveMode, "input_exclusive_mode");
 
-	extern int g_svTextConsoleUpdateRate;
-	CMD4(CCC_Integer, "sv_console_update_rate", &g_svTextConsoleUpdateRate, 1, 100);
+    extern int g_svTextConsoleUpdateRate;
+    CMD4(CCC_Integer, "sv_console_update_rate", &g_svTextConsoleUpdateRate, 1, 100);
 
-	extern int g_svDedicateServerUpdateReate;
-	CMD4(CCC_Integer, "sv_dedicated_server_update_rate", &g_svDedicateServerUpdateReate, 1, 1000);
+    extern int g_svDedicateServerUpdateReate;
+    CMD4(CCC_Integer, "sv_dedicated_server_update_rate", &g_svDedicateServerUpdateReate, 1, 1000);
 
-	CMD1(CCC_HideConsole,		"hide");
+    CMD1(CCC_HideConsole, "hide");
 
-#ifdef	DEBUG
-	extern BOOL debug_destroy;
-	CMD4(CCC_Integer, "debug_destroy", &debug_destroy, FALSE, TRUE );
+#ifdef DEBUG
+    extern BOOL debug_destroy;
+    CMD4(CCC_Integer, "debug_destroy", &debug_destroy, FALSE, TRUE);
 #endif
 };
- 
+
diff --git a/src/xrEngine/xr_ioc_cmd.h b/src/xrEngine/xr_ioc_cmd.h
index c27cf99eb2b..6cf93ea4cdf 100644
--- a/src/xrEngine/xr_ioc_cmd.h
+++ b/src/xrEngine/xr_ioc_cmd.h
@@ -1,395 +1,414 @@
 #pragma once
 
-#define CMD0(cls)					{ static cls x##cls();				Console->AddCommand(&x##cls);}
-#define CMD1(cls,p1)				{ static cls x##cls(p1);			Console->AddCommand(&x##cls);}
-#define CMD2(cls,p1,p2)				{ static cls x##cls(p1,p2);			Console->AddCommand(&x##cls);}
-#define CMD3(cls,p1,p2,p3)			{ static cls x##cls(p1,p2,p3);		Console->AddCommand(&x##cls);}
-#define CMD4(cls,p1,p2,p3,p4)		{ static cls x##cls(p1,p2,p3,p4);	Console->AddCommand(&x##cls);}
+#define CMD0(cls) { static cls x##cls(); Console->AddCommand(&x##cls);}
+#define CMD1(cls,p1) { static cls x##cls(p1); Console->AddCommand(&x##cls);}
+#define CMD2(cls,p1,p2) { static cls x##cls(p1,p2); Console->AddCommand(&x##cls);}
+#define CMD3(cls,p1,p2,p3) { static cls x##cls(p1,p2,p3); Console->AddCommand(&x##cls);}
+#define CMD4(cls,p1,p2,p3,p4) { static cls x##cls(p1,p2,p3,p4); Console->AddCommand(&x##cls);}
 
 #include "xrSASH.h"
 
-class ENGINE_API	IConsole_Command
+class ENGINE_API IConsole_Command
 {
-public		:
-	friend class	CConsole;
-	typedef char	TInfo	[256];
-	typedef char	TStatus	[256];
-	typedef xr_vector<shared_str>	vecTips;
-	typedef xr_vector<shared_str>	vecLRU;
-
-protected	:
-	LPCSTR			cName;
-	bool			bEnabled;
-	bool			bLowerCaseArgs;
-	bool			bEmptyArgsHandled;
-	
-	vecLRU			m_LRU;
-
-	enum			{ LRU_MAX_COUNT = 10 };
-
-	IC	bool		EQ(LPCSTR S1, LPCSTR S2) { return xr_strcmp(S1,S2)==0; }
-public		:
-	IConsole_Command		(LPCSTR N	BENCH_SEC_SIGN) : 
-	  cName				(N),
-	  bEnabled			(TRUE),
-	  bLowerCaseArgs	(TRUE),
-	  bEmptyArgsHandled	(FALSE)
-	  {
-		  m_LRU.reserve(LRU_MAX_COUNT + 1);
-		  m_LRU.clear_not_free();
-	  }
-	virtual ~IConsole_Command()
-	{
-		if(Console)
-			Console->RemoveCommand(this);
-	};
-
-	BENCH_SEC_SCRAMBLEVTBL3
-
-	LPCSTR			Name()			{ return cName;	}
-	void			InvalidSyntax() {
-		TInfo I; Info(I);
-		Msg("~ Invalid syntax in call to '%s'",cName);
-		Msg("~ Valid arguments: %s", I);
+public:
+    friend class CConsole;
+    typedef char TInfo[256];
+    typedef char TStatus[256];
+    typedef xr_vector<shared_str> vecTips;
+    typedef xr_vector<shared_str> vecLRU;
+
+protected:
+    LPCSTR cName;
+    bool bEnabled;
+    bool bLowerCaseArgs;
+    bool bEmptyArgsHandled;
+
+    vecLRU m_LRU;
+
+    enum { LRU_MAX_COUNT = 10 };
+
+    IC bool EQ(LPCSTR S1, LPCSTR S2) { return xr_strcmp(S1, S2) == 0; }
+public:
+    IConsole_Command(LPCSTR N BENCH_SEC_SIGN) :
+        cName(N),
+        bEnabled(TRUE),
+        bLowerCaseArgs(TRUE),
+        bEmptyArgsHandled(FALSE)
+    {
+        m_LRU.reserve(LRU_MAX_COUNT + 1);
+        m_LRU.clear_not_free();
+    }
+    virtual ~IConsole_Command()
+    {
+        if (Console)
+            Console->RemoveCommand(this);
+    };
+
+    BENCH_SEC_SCRAMBLEVTBL3
+
+    LPCSTR Name() { return cName; }
+    void InvalidSyntax()
+    {
+        TInfo I;
+        Info(I);
+        Msg("~ Invalid syntax in call to '%s'", cName);
+        Msg("~ Valid arguments: %s", I);
 
         g_SASH.OnConsoleInvalidSyntax(false, "~ Invalid syntax in call to '%s'", cName);
-		g_SASH.OnConsoleInvalidSyntax(true, "~ Valid arguments: %s", I);
-	}
-	virtual void	Execute	(LPCSTR args)	= 0;
-	virtual void	Status	(TStatus& S)	{ S[0]=0; }
-	virtual void	Info	(TInfo& I)		{ xr_strcpy(I,"(no arguments)"); }
-	virtual void	Save	(IWriter *F)	{
-		TStatus		S;	Status(S);
-		if (S[0])	F->w_printf("%s %s\r\n",cName,S); 
-	}
-
-	BENCH_SEC_SCRAMBLEVTBL2
-
-	virtual void	fill_tips		(vecTips& tips, u32 mode)
-	{
-		add_LRU_to_tips( tips );
-	}
-//			vecLRU&	LRU				() { return m_LRU; }
-	virtual void	add_to_LRU		(shared_str const& arg);
-			void	add_LRU_to_tips	(vecTips& tips);
+        g_SASH.OnConsoleInvalidSyntax(true, "~ Valid arguments: %s", I);
+    }
+    virtual void Execute(LPCSTR args) = 0;
+    virtual void Status(TStatus& S) { S[0] = 0; }
+    virtual void Info(TInfo& I) { xr_strcpy(I, "(no arguments)"); }
+    virtual void Save(IWriter* F)
+    {
+        TStatus S;
+        Status(S);
+        if (S[0]) F->w_printf("%s %s\r\n", cName, S);
+    }
+
+    BENCH_SEC_SCRAMBLEVTBL2
+
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        add_LRU_to_tips(tips);
+    }
+    // vecLRU& LRU () { return m_LRU; }
+    virtual void add_to_LRU(shared_str const& arg);
+    void add_LRU_to_tips(vecTips& tips);
 
 }; // class IConsole_Command
 
-class ENGINE_API	CCC_Mask : public IConsole_Command
+class ENGINE_API CCC_Mask : public IConsole_Command
 {
-protected	:
-	Flags32*	value;
-	u32			mask;
-public		:
-	CCC_Mask(LPCSTR N, Flags32* V, u32 M) :
-	  IConsole_Command(N),
-	  value(V),
-	  mask(M)
-	{};
-	  const BOOL GetValue()const{ return value->test(mask); }
-	virtual void	Execute	(LPCSTR args)
-	{
-		if (EQ(args,"on"))			value->set(mask,TRUE);
-		else if (EQ(args,"off"))	value->set(mask,FALSE);
-		else if (EQ(args,"1"))		value->set(mask,TRUE);
-		else if (EQ(args,"0"))		value->set(mask,FALSE);
-		else InvalidSyntax();
-	}
-	virtual void	Status	(TStatus& S)
-	{	xr_strcpy(S,value->test(mask)?"on":"off"); }
-	virtual void	Info	(TInfo& I)
-	{	xr_strcpy(I,"'on/off' or '1/0'"); }
-
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		TStatus  str;
-		xr_sprintf( str, sizeof(str), "%s  (current)  [on/off]", value->test(mask)?"on":"off" );
-		tips.push_back( str );
-	}
+protected:
+    Flags32* value;
+    u32 mask;
+public:
+    CCC_Mask(LPCSTR N, Flags32* V, u32 M) :
+        IConsole_Command(N),
+        value(V),
+        mask(M)
+    {};
+    const BOOL GetValue()const { return value->test(mask); }
+    virtual void Execute(LPCSTR args)
+    {
+        if (EQ(args, "on")) value->set(mask, TRUE);
+        else if (EQ(args, "off")) value->set(mask, FALSE);
+        else if (EQ(args, "1")) value->set(mask, TRUE);
+        else if (EQ(args, "0")) value->set(mask, FALSE);
+        else InvalidSyntax();
+    }
+    virtual void Status(TStatus& S)
+    {
+        xr_strcpy(S, value->test(mask) ? "on" : "off");
+    }
+    virtual void Info(TInfo& I)
+    {
+        xr_strcpy(I, "'on/off' or '1/0'");
+    }
+
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        TStatus str;
+        xr_sprintf(str, sizeof(str), "%s (current) [on/off]", value->test(mask) ? "on" : "off");
+        tips.push_back(str);
+    }
 
 };
 
-class ENGINE_API	CCC_ToggleMask : public IConsole_Command
+class ENGINE_API CCC_ToggleMask : public IConsole_Command
 {
-protected	:
-	Flags32*	value;
-	u32			mask;
-public		:
-	CCC_ToggleMask(LPCSTR N, Flags32* V, u32 M) :
-	  IConsole_Command(N),
-	  value(V),
-	  mask(M)
-	{bEmptyArgsHandled=TRUE;};
-	  const BOOL GetValue()const{ return value->test(mask); }
-	virtual void	Execute	(LPCSTR args)
-	{
-		value->set(mask,!GetValue());
-		TStatus S;
-		strconcat(sizeof(S),S,cName," is ", value->test(mask)?"on":"off");
-		Log(S);
-	}
-	virtual void	Status	(TStatus& S)
-	{	xr_strcpy(S,value->test(mask)?"on":"off"); }
-	virtual void	Info	(TInfo& I)
-	{	xr_strcpy(I,"'on/off' or '1/0'"); }
-
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		TStatus  str;
-		xr_sprintf( str, sizeof(str), "%s  (current)  [on/off]", value->test(mask)?"on":"off" );
-		tips.push_back( str );
-	}
+protected:
+    Flags32* value;
+    u32 mask;
+public:
+    CCC_ToggleMask(LPCSTR N, Flags32* V, u32 M) :
+        IConsole_Command(N),
+        value(V),
+        mask(M)
+    {
+        bEmptyArgsHandled = TRUE;
+    };
+    const BOOL GetValue()const { return value->test(mask); }
+    virtual void Execute(LPCSTR args)
+    {
+        value->set(mask, !GetValue());
+        TStatus S;
+        strconcat(sizeof(S), S, cName, " is ", value->test(mask) ? "on" : "off");
+        Log(S);
+    }
+    virtual void Status(TStatus& S)
+    {
+        xr_strcpy(S, value->test(mask) ? "on" : "off");
+    }
+    virtual void Info(TInfo& I)
+    {
+        xr_strcpy(I, "'on/off' or '1/0'");
+    }
+
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        TStatus str;
+        xr_sprintf(str, sizeof(str), "%s (current) [on/off]", value->test(mask) ? "on" : "off");
+        tips.push_back(str);
+    }
 
 };
 
-class ENGINE_API	CCC_Token : public IConsole_Command
+class ENGINE_API CCC_Token : public IConsole_Command
 {
-protected	:
-	u32*			value;
-	xr_token*		tokens;
-public		:
-	CCC_Token(LPCSTR N, u32* V, xr_token* T) :
-	  IConsole_Command(N),
-	  value(V),
-	  tokens(T)
-	{};
-
-	virtual void	Execute	(LPCSTR args)
-	{
-		xr_token* tok = tokens;
-		while (tok->name) {
-			if (stricmp(tok->name,args)==0) {
-				*value=tok->id;
-				break;
-			}
-			tok++;
-		}
-		if (!tok->name) InvalidSyntax();
-	}
-	virtual void	Status	(TStatus& S)
-	{
-		xr_token *tok = tokens;
-		while (tok->name) {
-			if (tok->id==(int)(*value)) {
-				xr_strcpy(S,tok->name);
-				return;
-			}
-			tok++;
-		}
-		xr_strcpy(S,"?");
-		return;
-	}
-	virtual void	Info	(TInfo& I)
-	{	
-		I[0]=0;
-		xr_token *tok = tokens;
-		while (tok->name) {
-			if (I[0]) xr_strcat(I,"/");
-			xr_strcat(I,tok->name);
-			tok++;
-		}
-	}
-	virtual xr_token* GetToken(){return tokens;}
-	
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		TStatus  str;
-		bool res = false;
-		xr_token* tok = GetToken();
-		while ( tok->name && !res )
-		{
-			if ( tok->id == (int)(*value) )
-			{
-				xr_sprintf( str, sizeof(str), "%s  (current)", tok->name );
-				tips.push_back( str );
-				res = true;
-			}
-			tok++;
-		}
-		if ( !res )
-		{
-			tips.push_back( "---  (current)" );
-		}
-		tok = GetToken();
-		while ( tok->name )
-		{
-			tips.push_back( tok->name );
-			tok++;
-		}
-	}
+protected:
+    u32* value;
+    xr_token* tokens;
+public:
+    CCC_Token(LPCSTR N, u32* V, xr_token* T) :
+        IConsole_Command(N),
+        value(V),
+        tokens(T)
+    {};
+
+    virtual void Execute(LPCSTR args)
+    {
+        xr_token* tok = tokens;
+        while (tok->name)
+        {
+            if (stricmp(tok->name, args) == 0)
+            {
+                *value = tok->id;
+                break;
+            }
+            tok++;
+        }
+        if (!tok->name) InvalidSyntax();
+    }
+    virtual void Status(TStatus& S)
+    {
+        xr_token* tok = tokens;
+        while (tok->name)
+        {
+            if (tok->id == (int)(*value))
+            {
+                xr_strcpy(S, tok->name);
+                return;
+            }
+            tok++;
+        }
+        xr_strcpy(S, "?");
+        return;
+    }
+    virtual void Info(TInfo& I)
+    {
+        I[0] = 0;
+        xr_token* tok = tokens;
+        while (tok->name)
+        {
+            if (I[0]) xr_strcat(I, "/");
+            xr_strcat(I, tok->name);
+            tok++;
+        }
+    }
+    virtual xr_token* GetToken() { return tokens; }
+
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        TStatus str;
+        bool res = false;
+        xr_token* tok = GetToken();
+        while (tok->name && !res)
+        {
+            if (tok->id == (int)(*value))
+            {
+                xr_sprintf(str, sizeof(str), "%s (current)", tok->name);
+                tips.push_back(str);
+                res = true;
+            }
+            tok++;
+        }
+        if (!res)
+        {
+            tips.push_back("--- (current)");
+        }
+        tok = GetToken();
+        while (tok->name)
+        {
+            tips.push_back(tok->name);
+            tok++;
+        }
+    }
 
 };
 
-class ENGINE_API	CCC_Float : public IConsole_Command
+class ENGINE_API CCC_Float : public IConsole_Command
 {
-protected	:
-	float*			value;
-	float			min,max;
-public		:
-	CCC_Float(LPCSTR N, float* V, float _min=0, float _max=1) :
-	  IConsole_Command(N),
-	  value(V),
-	  min(_min),
-	  max(_max)
-	{};
-	  const float	GetValue	() const {return *value;};
-			void	GetBounds	(float& fmin, float& fmax) const {fmin=min; fmax=max;}
-
-	virtual void	Execute	(LPCSTR args)
-	{
-		float v = float(atof(args));
-		if (v<(min-EPS) || v>(max+EPS) ) InvalidSyntax();
-		else	*value = v;
-	}
-	virtual void	Status	(TStatus& S)
-	{	
-		xr_sprintf	(S,sizeof(S),"%3.5f",*value);
-		while	(xr_strlen(S) && ('0'==S[xr_strlen(S)-1]))	S[xr_strlen(S)-1] = 0;
-	}
-	virtual void	Info	(TInfo& I)
-	{	
-		xr_sprintf(I,sizeof(I),"float value in range [%3.3f,%3.3f]",min,max);
-	}
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		TStatus  str;
-		xr_sprintf( str, sizeof(str), "%3.5f  (current)  [%3.3f,%3.3f]", *value, min, max );
-		tips.push_back( str );
-		IConsole_Command::fill_tips( tips, mode );
-	}
+protected:
+    float* value;
+    float min, max;
+public:
+    CCC_Float(LPCSTR N, float* V, float _min = 0, float _max = 1) :
+        IConsole_Command(N),
+        value(V),
+        min(_min),
+        max(_max)
+    {};
+    const float GetValue() const { return *value; };
+    void GetBounds(float& fmin, float& fmax) const { fmin = min; fmax = max; }
+
+    virtual void Execute(LPCSTR args)
+    {
+        float v = float(atof(args));
+        if (v<(min - EPS) || v>(max + EPS)) InvalidSyntax();
+        else *value = v;
+    }
+    virtual void Status(TStatus& S)
+    {
+        xr_sprintf(S, sizeof(S), "%3.5f", *value);
+        while (xr_strlen(S) && ('0' == S[xr_strlen(S) - 1])) S[xr_strlen(S) - 1] = 0;
+    }
+    virtual void Info(TInfo& I)
+    {
+        xr_sprintf(I, sizeof(I), "float value in range [%3.3f,%3.3f]", min, max);
+    }
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        TStatus str;
+        xr_sprintf(str, sizeof(str), "%3.5f (current) [%3.3f,%3.3f]", *value, min, max);
+        tips.push_back(str);
+        IConsole_Command::fill_tips(tips, mode);
+    }
 
 };
 
-class ENGINE_API	CCC_Vector3 : public IConsole_Command
+class ENGINE_API CCC_Vector3 : public IConsole_Command
 {
-protected	:
-	Fvector*		value;
-	Fvector			min,max;
-public		
+protected:
+    Fvector* value;
+    Fvector min, max;
+    public
 :
-	CCC_Vector3(LPCSTR N, Fvector* V, const Fvector _min, const Fvector _max) :
-	  IConsole_Command(N),
-	  value(V)
-	{
-		min.set(_min);
-		max.set(_max);
-	};
-	const Fvector	GetValue	() const {return *value;};
-	Fvector*		GetValuePtr	() const {return value;};
-
-	virtual void	Execute	(LPCSTR args)
-	{
-		Fvector v;
-		if (3!=sscanf(args,"%f,%f,%f",&v.x,&v.y,&v.z))	{ InvalidSyntax(); return; }
-		if (v.x<min.x || v.y<min.y || v.z<min.z)		{ InvalidSyntax(); return; }
-		if (v.x>max.x || v.y>max.y || v.z>max.z)		{ InvalidSyntax(); return; }
-		value->set(v);
-	}
-	virtual void	Status	(TStatus& S)
-	{	
-		xr_sprintf	(S,sizeof(S),"(%f, %f, %f)",value->x,value->y,value->z);
-	}
-	virtual void	Info	(TInfo& I)
-	{	
-		xr_sprintf(I,sizeof(I),"vector3 in range [%e,%e,%e]-[%e,%e,%e]",min.x,min.y,min.z,max.x,max.y,max.z);
-	}
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		TStatus  str;
-		xr_sprintf( str, sizeof(str), "(%e, %e, %e)  (current)  [(%e,%e,%e)-(%e,%e,%e)]", value->x, value->y, value->z, min.x, min.y, min.z, max.x, max.y, max.z );
-		tips.push_back( str );
-		IConsole_Command::fill_tips( tips, mode );
-	}
+    CCC_Vector3(LPCSTR N, Fvector* V, const Fvector _min, const Fvector _max) :
+        IConsole_Command(N),
+        value(V)
+    {
+        min.set(_min);
+        max.set(_max);
+    };
+    const Fvector GetValue() const { return *value; };
+    Fvector* GetValuePtr() const { return value; };
+
+    virtual void Execute(LPCSTR args)
+    {
+        Fvector v;
+        if (3 != sscanf(args, "%f,%f,%f", &v.x, &v.y, &v.z)) { InvalidSyntax(); return; }
+        if (v.x < min.x || v.y < min.y || v.z<min.z) { InvalidSyntax(); return; }
+        if (v.x>max.x || v.y > max.y || v.z > max.z) { InvalidSyntax(); return; }
+        value->set(v);
+    }
+    virtual void Status(TStatus& S)
+    {
+        xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z);
+    }
+    virtual void Info(TInfo& I)
+    {
+        xr_sprintf(I, sizeof(I), "vector3 in range [%e,%e,%e]-[%e,%e,%e]", min.x, min.y, min.z, max.x, max.y, max.z);
+    }
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        TStatus str;
+        xr_sprintf(str, sizeof(str), "(%e, %e, %e) (current) [(%e,%e,%e)-(%e,%e,%e)]", value->x, value->y, value->z, min.x, min.y, min.z, max.x, max.y, max.z);
+        tips.push_back(str);
+        IConsole_Command::fill_tips(tips, mode);
+    }
 
 };
 
-class ENGINE_API	CCC_Integer : public IConsole_Command
+class ENGINE_API CCC_Integer : public IConsole_Command
 {
-protected	:
-	int*			value;
-	int				min,max;
-public		:
-	  const int GetValue	() const {return *value;};
-	  void		GetBounds	(int& imin, int& imax) const {imin = min; imax = max;}
-
-	CCC_Integer(LPCSTR N, int* V, int _min=0, int _max=999) :
-	  IConsole_Command(N),
-	  value(V),
-	  min(_min),
-	  max(_max)
-	{};
-
-	virtual void	Execute	(LPCSTR args)
-	{
-		int v = atoi(args);
-		if (v<min || v>max) InvalidSyntax();
-		else	*value = v;
-	}
-	virtual void	Status	(TStatus& S)
-	{	
-		itoa(*value,S,10);
-	}
-	virtual void	Info	(TInfo& I)
-	{	
-		xr_sprintf(I,sizeof(I),"integer value in range [%d,%d]",min,max);
-	}
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		TStatus  str;
-		xr_sprintf( str, sizeof(str), "%d  (current)  [%d,%d]", *value, min, max );
-		tips.push_back( str );
- 		IConsole_Command::fill_tips( tips, mode );
-	}
+protected:
+    int* value;
+    int min, max;
+public:
+    const int GetValue() const { return *value; };
+    void GetBounds(int& imin, int& imax) const { imin = min; imax = max; }
+
+    CCC_Integer(LPCSTR N, int* V, int _min = 0, int _max = 999) :
+        IConsole_Command(N),
+        value(V),
+        min(_min),
+        max(_max)
+    {};
+
+    virtual void Execute(LPCSTR args)
+    {
+        int v = atoi(args);
+        if (v<min || v>max) InvalidSyntax();
+        else *value = v;
+    }
+    virtual void Status(TStatus& S)
+    {
+        itoa(*value, S, 10);
+    }
+    virtual void Info(TInfo& I)
+    {
+        xr_sprintf(I, sizeof(I), "integer value in range [%d,%d]", min, max);
+    }
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        TStatus str;
+        xr_sprintf(str, sizeof(str), "%d (current) [%d,%d]", *value, min, max);
+        tips.push_back(str);
+        IConsole_Command::fill_tips(tips, mode);
+    }
 };
 
-class ENGINE_API	CCC_String : public IConsole_Command
+class ENGINE_API CCC_String : public IConsole_Command
 {
 protected:
-	LPSTR			value;
-	int				size;
+    LPSTR value;
+    int size;
 public:
-	CCC_String(LPCSTR N, LPSTR V, int _size=2) :
-		IConsole_Command(N),
-		value	(V),
-		size	(_size)
-	{
-		bLowerCaseArgs	=	FALSE;
-		R_ASSERT(V);
-		R_ASSERT(size>1);
-	};
-
-	virtual void	Execute	(LPCSTR args)
-	{
-		strncpy_s	(value, size, args, size-1);
-	}
-	virtual void	Status	(TStatus& S)
-	{	
-		xr_strcpy	(S,value);
-	}
-	virtual void	Info	(TInfo& I)
-	{	
-		xr_sprintf(I,sizeof(I),"string with up to %d characters",size);
-	}
-	virtual void	fill_tips(vecTips& tips, u32 mode)
-	{
-		tips.push_back( (LPCSTR)value );
-		IConsole_Command::fill_tips( tips, mode );
-	}
+    CCC_String(LPCSTR N, LPSTR V, int _size = 2) :
+        IConsole_Command(N),
+        value(V),
+        size(_size)
+    {
+        bLowerCaseArgs = FALSE;
+        R_ASSERT(V);
+        R_ASSERT(size > 1);
+    };
+
+    virtual void Execute(LPCSTR args)
+    {
+        strncpy_s(value, size, args, size - 1);
+    }
+    virtual void Status(TStatus& S)
+    {
+        xr_strcpy(S, value);
+    }
+    virtual void Info(TInfo& I)
+    {
+        xr_sprintf(I, sizeof(I), "string with up to %d characters", size);
+    }
+    virtual void fill_tips(vecTips& tips, u32 mode)
+    {
+        tips.push_back((LPCSTR)value);
+        IConsole_Command::fill_tips(tips, mode);
+    }
 
 };
 
 class ENGINE_API CCC_LoadCFG : public IConsole_Command
 {
 public:
-	virtual bool	allow			(LPCSTR cmd)	{return true;};
-					CCC_LoadCFG		(LPCSTR N);
-	virtual void	Execute			(LPCSTR args);
+    virtual bool allow(LPCSTR cmd) { return true; };
+    CCC_LoadCFG(LPCSTR N);
+    virtual void Execute(LPCSTR args);
 };
 
 class ENGINE_API CCC_LoadCFG_custom : public CCC_LoadCFG
 {
-	string64		m_cmd;
+    string64 m_cmd;
 public:
-					CCC_LoadCFG_custom(LPCSTR cmd);
-	virtual bool	allow			(LPCSTR cmd);
+    CCC_LoadCFG_custom(LPCSTR cmd);
+    virtual bool allow(LPCSTR cmd);
 };
\ No newline at end of file
diff --git a/src/xrEngine/xr_object.cpp b/src/xrEngine/xr_object.cpp
index ca796a10c07..a0152f081e9 100644
--- a/src/xrEngine/xr_object.cpp
+++ b/src/xrEngine/xr_object.cpp
@@ -22,437 +22,459 @@
 
 #pragma intrinsic(_InterlockedCompareExchange)
 
-inline void CObjectList::o_crow		(CObject*	O)
+inline void CObjectList::o_crow(CObject* O)
 {
-	Objects& crows				= get_crows();
-	VERIFY						( std::find(crows.begin(),crows.end(),O) == crows.end() );
-	crows.push_back				( O );
+    Objects& crows = get_crows();
+    VERIFY(std::find(crows.begin(), crows.end(), O) == crows.end());
+    crows.push_back(O);
 
-	O->dwFrame_AsCrow			= Device.dwFrame;
+    O->dwFrame_AsCrow = Device.dwFrame;
 }
 
-void CObject::MakeMeCrow			()
+void CObject::MakeMeCrow()
 {
-	if ( Props.crow )
-		return;
-
-	if ( !processing_enabled() )
-		return;
-
-	u32 const device_frame_id		= Device.dwFrame;
-	u32 const object_frame_id		= dwFrame_AsCrow;
-	if (
-			(u32)_InterlockedCompareExchange(
-				(long*)&dwFrame_AsCrow,
-				device_frame_id,
-				object_frame_id
-			) == device_frame_id
-		)
-		return;
-
-	VERIFY							( dwFrame_AsCrow == device_frame_id );
-
-	Props.crow						= 1;
-	g_pGameLevel->Objects.o_crow	(this);
+    if (Props.crow)
+        return;
+
+    if (!processing_enabled())
+        return;
+
+    u32 const device_frame_id = Device.dwFrame;
+    u32 const object_frame_id = dwFrame_AsCrow;
+    if (
+        (u32)_InterlockedCompareExchange(
+            (long*)&dwFrame_AsCrow,
+            device_frame_id,
+            object_frame_id
+        ) == device_frame_id
+    )
+        return;
+
+    VERIFY(dwFrame_AsCrow == device_frame_id);
+
+    Props.crow = 1;
+    g_pGameLevel->Objects.o_crow(this);
 }
 
-void CObject::cName_set			(shared_str N)
-{ 
-	NameObject	=	N; 
+void CObject::cName_set(shared_str N)
+{
+    NameObject = N;
 }
-void CObject::cNameSect_set		(shared_str N)
-{ 
-	NameSection	=	N; 
+void CObject::cNameSect_set(shared_str N)
+{
+    NameSection = N;
 }
 //#include "SkeletonCustom.h"
-void CObject::cNameVisual_set	(shared_str N)
-{ 
-	// check if equal
-	if (*N && *NameVisual)
-		if (N==NameVisual)		return;
-
-	// replace model
-	if (*N && N[0]) 
-	{
-		IRenderVisual			*old_v = renderable.visual;
-		
-		NameVisual				= N;
-		renderable.visual		= Render->model_Create	(*N);
-		
-		IKinematics* old_k	= old_v?old_v->dcast_PKinematics():NULL;
-		IKinematics* new_k	= renderable.visual->dcast_PKinematics();
-
-		/*
-		if(old_k && new_k){
-			new_k->Update_Callback			= old_k->Update_Callback;
-			new_k->Update_Callback_Param	= old_k->Update_Callback_Param;
-		}
-		*/
-		if(old_k && new_k)
-		{
-			new_k->SetUpdateCallback(old_k->GetUpdateCallback());
-			new_k->SetUpdateCallbackParam(old_k->GetUpdateCallbackParam());
-		}
-
-		::Render->model_Delete	(old_v);
-	} 
-	else 
-	{
-		::Render->model_Delete	(renderable.visual);
-		NameVisual				= 0;
-	}
-	OnChangeVisual				();
+void CObject::cNameVisual_set(shared_str N)
+{
+    // check if equal
+    if (*N && *NameVisual)
+        if (N == NameVisual) return;
+
+    // replace model
+    if (*N && N[0])
+    {
+        IRenderVisual* old_v = renderable.visual;
+
+        NameVisual = N;
+        renderable.visual = Render->model_Create(*N);
+
+        IKinematics* old_k = old_v ? old_v->dcast_PKinematics() : NULL;
+        IKinematics* new_k = renderable.visual->dcast_PKinematics();
+
+        /*
+        if(old_k && new_k){
+        new_k->Update_Callback = old_k->Update_Callback;
+        new_k->Update_Callback_Param = old_k->Update_Callback_Param;
+        }
+        */
+        if (old_k && new_k)
+        {
+            new_k->SetUpdateCallback(old_k->GetUpdateCallback());
+            new_k->SetUpdateCallbackParam(old_k->GetUpdateCallbackParam());
+        }
+
+        ::Render->model_Delete(old_v);
+    }
+    else
+    {
+        ::Render->model_Delete(renderable.visual);
+        NameVisual = 0;
+    }
+    OnChangeVisual();
 }
 
 // flagging
-void CObject::processing_activate	()
+void CObject::processing_activate()
 {
-	VERIFY3	(255!= Props.bActiveCounter, "Invalid sequence of processing enable/disable calls: overflow",*cName());
-	Props.bActiveCounter			++;
-	if (0==(Props.bActiveCounter-1))	g_pGameLevel->Objects.o_activate	(this);
+    VERIFY3(255 != Props.bActiveCounter, "Invalid sequence of processing enable/disable calls: overflow", *cName());
+    Props.bActiveCounter++;
+    if (0 == (Props.bActiveCounter - 1)) g_pGameLevel->Objects.o_activate(this);
 }
-void CObject::processing_deactivate	()
+void CObject::processing_deactivate()
 {
-	VERIFY3	(0	!= Props.bActiveCounter, "Invalid sequence of processing enable/disable calls: underflow",*cName());
-	Props.bActiveCounter			--;
-	if (0==Props.bActiveCounter)		g_pGameLevel->Objects.o_sleep		(this);
+    VERIFY3(0 != Props.bActiveCounter, "Invalid sequence of processing enable/disable calls: underflow", *cName());
+    Props.bActiveCounter--;
+    if (0 == Props.bActiveCounter) g_pGameLevel->Objects.o_sleep(this);
 }
 
-void CObject::setEnabled			(BOOL _enabled)
+void CObject::setEnabled(BOOL _enabled)
 {
-	if (_enabled){
-		Props.bEnabled							=	1;	
-		if (collidable.model)	spatial.type	|=	STYPE_COLLIDEABLE;
-	}else{
-		Props.bEnabled							=	0;
-		spatial.type							&=	~STYPE_COLLIDEABLE;
-	}
+    if (_enabled)
+    {
+        Props.bEnabled = 1;
+        if (collidable.model) spatial.type |= STYPE_COLLIDEABLE;
+    }
+    else
+    {
+        Props.bEnabled = 0;
+        spatial.type &= ~STYPE_COLLIDEABLE;
+    }
 }
-void CObject::setVisible			(BOOL _visible)
+void CObject::setVisible(BOOL _visible)
 {
-	if (_visible){				// Parent should control object visibility itself (??????)
-		Props.bVisible							= 1;
-		if (renderable.visual)	spatial.type	|=	STYPE_RENDERABLE;
-	}else{
-		Props.bVisible							= 0;
-		spatial.type							&=	~STYPE_RENDERABLE;
-	}
+    if (_visible)
+    {
+        // Parent should control object visibility itself (??????)
+        Props.bVisible = 1;
+        if (renderable.visual) spatial.type |= STYPE_RENDERABLE;
+    }
+    else
+    {
+        Props.bVisible = 0;
+        spatial.type &= ~STYPE_RENDERABLE;
+    }
 }
 
-//void	CObject::Center					(Fvector& C)	const	{ VERIFY2(renderable.visual,*cName()); renderable.xform.transform_tiny(C,renderable.visual->vis.sphere.P);	}
-void	CObject::Center					(Fvector& C)	const	{ VERIFY2(renderable.visual,*cName()); renderable.xform.transform_tiny(C,renderable.visual->getVisData().sphere.P);	}
-//float	CObject::Radius					()				const	{ VERIFY2(renderable.visual,*cName()); return renderable.visual->vis.sphere.R;								}
-float	CObject::Radius					()				const	{ VERIFY2(renderable.visual,*cName()); return renderable.visual->getVisData().sphere.R;								}
-//const	Fbox&	CObject::BoundingBox	()				const	{ VERIFY2(renderable.visual,*cName()); return renderable.visual->vis.box;									}
-const	Fbox&	CObject::BoundingBox	()				const	{ VERIFY2(renderable.visual,*cName()); return renderable.visual->getVisData().box;									}
+//void CObject::Center (Fvector& C) const { VERIFY2(renderable.visual,*cName()); renderable.xform.transform_tiny(C,renderable.visual->vis.sphere.P); }
+void CObject::Center(Fvector& C) const { VERIFY2(renderable.visual, *cName()); renderable.xform.transform_tiny(C, renderable.visual->getVisData().sphere.P); }
+//float CObject::Radius () const { VERIFY2(renderable.visual,*cName()); return renderable.visual->vis.sphere.R; }
+float CObject::Radius() const { VERIFY2(renderable.visual, *cName()); return renderable.visual->getVisData().sphere.R; }
+//const Fbox& CObject::BoundingBox () const { VERIFY2(renderable.visual,*cName()); return renderable.visual->vis.box; }
+const Fbox& CObject::BoundingBox() const { VERIFY2(renderable.visual, *cName()); return renderable.visual->getVisData().box; }
 
 //----------------------------------------------------------------------
-// Class	: CXR_Object
-// Purpose	:
+// Class : CXR_Object
+// Purpose :
 //----------------------------------------------------------------------
-CObject::CObject		( )		:
-	ISpatial					(g_SpatialSpace),
-	dwFrame_AsCrow				(u32(-1))
+CObject::CObject() :
+    ISpatial(g_SpatialSpace),
+    dwFrame_AsCrow(u32(-1))
 {
-	// Transform
-	Props.storage				= 0;
+    // Transform
+    Props.storage = 0;
 
-	Parent						= NULL;
+    Parent = NULL;
 
-	NameObject					= NULL;
-	NameSection					= NULL;
-	NameVisual					= NULL;
+    NameObject = NULL;
+    NameSection = NULL;
+    NameVisual = NULL;
 
 #ifdef DEBUG
-	dbg_update_shedule			= u32(-1)/2;
-	dbg_update_cl				= u32(-1)/2;
+    dbg_update_shedule = u32(-1) / 2;
+    dbg_update_cl = u32(-1) / 2;
 #endif
 }
 
-CObject::~CObject				( )
+CObject::~CObject()
 {
-	cNameVisual_set				( 0 );
-	cName_set					( 0 );
-	cNameSect_set				( 0 );
+    cNameVisual_set(0);
+    cName_set(0);
+    cNameSect_set(0);
 }
 
-void CObject::Load				(LPCSTR section )
+void CObject::Load(LPCSTR section)
 {
-	// Name
-	R_ASSERT					(section);
-	cName_set					(section);
-	cNameSect_set				(section);
-	
-	// Visual and light-track
-	if (pSettings->line_exist(section,"visual")){
-		string_path					tmp;
-		xr_strcpy					(tmp, pSettings->r_string(section,"visual"));
-		if(strext(tmp)) 
-			*strext(tmp)			=0;
-		xr_strlwr					(tmp);
-
-		cNameVisual_set				(tmp);
-	}
-	setVisible					(false);
+    // Name
+    R_ASSERT(section);
+    cName_set(section);
+    cNameSect_set(section);
+
+    // Visual and light-track
+    if (pSettings->line_exist(section, "visual"))
+    {
+        string_path tmp;
+        xr_strcpy(tmp, pSettings->r_string(section, "visual"));
+        if (strext(tmp))
+            *strext(tmp) = 0;
+        xr_strlwr(tmp);
+
+        cNameVisual_set(tmp);
+    }
+    setVisible(false);
 }
 
-BOOL CObject::net_Spawn			(CSE_Abstract* data)
+BOOL CObject::net_Spawn(CSE_Abstract* data)
 {
-	PositionStack.clear			();
+    PositionStack.clear();
 
-	VERIFY						(_valid(renderable.xform));
+    VERIFY(_valid(renderable.xform));
 
-	if (0==Visual() && pSettings->line_exist( cNameSect(), "visual" ) )
-		cNameVisual_set			(pSettings->r_string( cNameSect(), "visual" ) );
+    if (0 == Visual() && pSettings->line_exist(cNameSect(), "visual"))
+        cNameVisual_set(pSettings->r_string(cNameSect(), "visual"));
 
-	if (0==collidable.model) 	{
-		if (pSettings->line_exist(cNameSect(),"cform")) {
-			VERIFY3				(*NameVisual, "Model isn't assigned for object, but cform requisted",*cName());
-			collidable.model	= xr_new<CCF_Skeleton>	(this);
-		}
-	}
+    if (0 == collidable.model)
+    {
+        if (pSettings->line_exist(cNameSect(), "cform"))
+        {
+            VERIFY3(*NameVisual, "Model isn't assigned for object, but cform requisted", *cName());
+            collidable.model = xr_new<CCF_Skeleton>(this);
+        }
+    }
 
-	R_ASSERT					(spatial.space);
-	spatial_register			();
+    R_ASSERT(spatial.space);
+    spatial_register();
 
-	if (register_schedule())
-		shedule_register		();
+    if (register_schedule())
+        shedule_register();
 
-	// reinitialize flags
-	processing_activate			();
-	setDestroy					(false);
+    // reinitialize flags
+    processing_activate();
+    setDestroy(false);
 
-	MakeMeCrow					();
+    MakeMeCrow();
 
-	return TRUE					;
+    return TRUE;
 }
 
-void CObject::net_Destroy		()
+void CObject::net_Destroy()
 {
-	VERIFY						(getDestroy());
-	xr_delete					(collidable.model);
-	if (register_schedule())
-		shedule_unregister		();
-
-	spatial_unregister			();
-//	setDestroy					(true);
-	// remove visual
-	cNameVisual_set				( 0 );
+    VERIFY(getDestroy());
+    xr_delete(collidable.model);
+    if (register_schedule())
+        shedule_unregister();
+
+    spatial_unregister();
+    // setDestroy (true);
+    // remove visual
+    cNameVisual_set(0);
 }
 
 //////////////////////////////////////////////////////////////////////////
-const	float	base_spu_epsP		= 0.05f;
-const	float	base_spu_epsR		= 0.05f;
-void	CObject::spatial_update		(float eps_P, float eps_R)
+const float base_spu_epsP = 0.05f;
+const float base_spu_epsR = 0.05f;
+void CObject::spatial_update(float eps_P, float eps_R)
 {
-	//
-	BOOL	bUpdate=FALSE;
-	if (PositionStack.empty())
-	{
-		// Empty
-		bUpdate							= TRUE;
-		PositionStack.push_back			(SavedPosition());
-		PositionStack.back().dwTime		= Device.dwTimeGlobal;
-		PositionStack.back().vPosition	= Position();
-	} else {
-		if (PositionStack.back().vPosition.similar(Position(),eps_P))
-		{
-			// Just update time
-			PositionStack.back().dwTime		= Device.dwTimeGlobal;
-		} else {
-			// Register _new_ record
-			bUpdate							= TRUE;
-			if (PositionStack.size()<4)		{
-				PositionStack.push_back			(SavedPosition());
-			} else {
-				PositionStack[0]				= PositionStack[1];
-				PositionStack[1]				= PositionStack[2];
-				PositionStack[2]				= PositionStack[3];
-			}
-			PositionStack.back().dwTime		= Device.dwTimeGlobal;
-			PositionStack.back().vPosition	= Position();
-		}
-	}
-
-	if (bUpdate)		{
-		spatial_move	();
-	} else {
-		if (spatial.node_ptr)	
-		{	// Object registered!
-			if (!fsimilar(Radius(),spatial.sphere.R,eps_R))	spatial_move();
-			else			{
-				Fvector			C;
-				Center			(C);
-				if (!C.similar(spatial.sphere.P,eps_P))	spatial_move();
-			}
-			// else nothing to do :_)
-		}
-	}
+    //
+    BOOL bUpdate = FALSE;
+    if (PositionStack.empty())
+    {
+        // Empty
+        bUpdate = TRUE;
+        PositionStack.push_back(SavedPosition());
+        PositionStack.back().dwTime = Device.dwTimeGlobal;
+        PositionStack.back().vPosition = Position();
+    }
+    else
+    {
+        if (PositionStack.back().vPosition.similar(Position(), eps_P))
+        {
+            // Just update time
+            PositionStack.back().dwTime = Device.dwTimeGlobal;
+        }
+        else
+        {
+            // Register _new_ record
+            bUpdate = TRUE;
+            if (PositionStack.size() < 4)
+            {
+                PositionStack.push_back(SavedPosition());
+            }
+            else
+            {
+                PositionStack[0] = PositionStack[1];
+                PositionStack[1] = PositionStack[2];
+                PositionStack[2] = PositionStack[3];
+            }
+            PositionStack.back().dwTime = Device.dwTimeGlobal;
+            PositionStack.back().vPosition = Position();
+        }
+    }
+
+    if (bUpdate)
+    {
+        spatial_move();
+    }
+    else
+    {
+        if (spatial.node_ptr)
+        {
+            // Object registered!
+            if (!fsimilar(Radius(), spatial.sphere.R, eps_R)) spatial_move();
+            else
+            {
+                Fvector C;
+                Center(C);
+                if (!C.similar(spatial.sphere.P, eps_P)) spatial_move();
+            }
+            // else nothing to do :_)
+        }
+    }
 }
 
 // Updates
-void CObject::UpdateCL			()
+void CObject::UpdateCL()
 {
-	// consistency check
+    // consistency check
 #ifdef DEBUG
-	VERIFY2								(_valid(renderable.xform),*cName());
+    VERIFY2(_valid(renderable.xform), *cName());
 
-	if (Device.dwFrame==dbg_update_cl)								Debug.fatal	(DEBUG_INFO,"'UpdateCL' called twice per frame for %s",*cName());
-	dbg_update_cl	= Device.dwFrame;
+    if (Device.dwFrame == dbg_update_cl) Debug.fatal(DEBUG_INFO, "'UpdateCL' called twice per frame for %s", *cName());
+    dbg_update_cl = Device.dwFrame;
 
-	if (Parent && spatial.node_ptr)									Debug.fatal	(DEBUG_INFO,"Object %s has parent but is still registered inside spatial DB",*cName());
+    if (Parent && spatial.node_ptr) Debug.fatal(DEBUG_INFO, "Object %s has parent but is still registered inside spatial DB", *cName());
 
-	if ((0==collidable.model)&&(spatial.type&STYPE_COLLIDEABLE))	Debug.fatal	(DEBUG_INFO,"Object %s registered as 'collidable' but has no collidable model",*cName());
+    if ((0 == collidable.model) && (spatial.type&STYPE_COLLIDEABLE)) Debug.fatal(DEBUG_INFO, "Object %s registered as 'collidable' but has no collidable model", *cName());
 #endif
 
-	spatial_update				(base_spu_epsP*5,base_spu_epsR*5);
-
-	// crow
-	if (Parent == g_pGameLevel->CurrentViewEntity())										
-		MakeMeCrow	();
-	else if (AlwaysTheCrow())																
-		MakeMeCrow	();
-	else
-	{
-		float dist = Device.vCameraPosition.distance_to_sqr(Position());
-		if (dist < CROW_RADIUS*CROW_RADIUS)	
-			MakeMeCrow	();
-		else 
-		if( (Visual() && Visual()->getVisData().hom_frame+2 > Device.dwFrame) && (dist < CROW_RADIUS2*CROW_RADIUS2) )
-			MakeMeCrow	();
-	}
+    spatial_update(base_spu_epsP * 5, base_spu_epsR * 5);
+
+    // crow
+    if (Parent == g_pGameLevel->CurrentViewEntity())
+        MakeMeCrow();
+    else if (AlwaysTheCrow())
+        MakeMeCrow();
+    else
+    {
+        float dist = Device.vCameraPosition.distance_to_sqr(Position());
+        if (dist < CROW_RADIUS*CROW_RADIUS)
+            MakeMeCrow();
+        else if ((Visual() && Visual()->getVisData().hom_frame + 2 > Device.dwFrame) && (dist < CROW_RADIUS2*CROW_RADIUS2))
+            MakeMeCrow();
+    }
 }
 
-void CObject::shedule_Update	( u32 T )
+void CObject::shedule_Update(u32 T)
 {
-	// consistency check
-	// Msg						("-SUB-:[%x][%s] CObject::shedule_Update",dynamic_cast<void*>(this),*cName());
-	ISheduled::shedule_Update	(T);
-	spatial_update				(base_spu_epsP*1,base_spu_epsR*1);
-
-	// Always make me crow on shedule-update 
-	// Makes sure that update-cl called at least with freq of shedule-update
-	MakeMeCrow					();	
-	/*
-	if (AlwaysTheCrow())																	MakeMeCrow	();
-	else if (Device.vCameraPosition.distance_to_sqr(Position()) < CROW_RADIUS*CROW_RADIUS)	MakeMeCrow	();
-	*/
+    // consistency check
+    // Msg ("-SUB-:[%x][%s] CObject::shedule_Update",dynamic_cast<void*>(this),*cName());
+    ISheduled::shedule_Update(T);
+    spatial_update(base_spu_epsP * 1, base_spu_epsR * 1);
+
+    // Always make me crow on shedule-update
+    // Makes sure that update-cl called at least with freq of shedule-update
+    MakeMeCrow();
+    /*
+    if (AlwaysTheCrow()) MakeMeCrow ();
+    else if (Device.vCameraPosition.distance_to_sqr(Position()) < CROW_RADIUS*CROW_RADIUS) MakeMeCrow ();
+    */
 }
 
-void	CObject::spatial_register	()
+void CObject::spatial_register()
 {
-	Center						(spatial.sphere.P);
-	spatial.sphere.R			= Radius();
-	ISpatial::spatial_register	();
+    Center(spatial.sphere.P);
+    spatial.sphere.R = Radius();
+    ISpatial::spatial_register();
 }
 
-void	CObject::spatial_unregister()
+void CObject::spatial_unregister()
 {
-	ISpatial::spatial_unregister();
+    ISpatial::spatial_unregister();
 }
 
-void	CObject::spatial_move()
+void CObject::spatial_move()
 {
-	Center						(spatial.sphere.P);
-	spatial.sphere.R			= Radius();
-	ISpatial::spatial_move		();
+    Center(spatial.sphere.P);
+    spatial.sphere.R = Radius();
+    ISpatial::spatial_move();
 }
 
 CObject::SavedPosition CObject::ps_Element(u32 ID) const
 {
-	VERIFY(ID<ps_Size());
-	return PositionStack[ID];
+    VERIFY(ID < ps_Size());
+    return PositionStack[ID];
 }
 
-void CObject::renderable_Render	()
+void CObject::renderable_Render()
 {
-	MakeMeCrow	();
+    MakeMeCrow();
 }
 
-CObject* CObject::H_SetParent	(CObject* new_parent, bool just_before_destroy)
+CObject* CObject::H_SetParent(CObject* new_parent, bool just_before_destroy)
 {
-	if (new_parent==Parent)	return new_parent;
-
-	CObject* old_parent	= Parent; 
-	
-	VERIFY2((new_parent==0)||(old_parent==0),"Before set parent - execute H_SetParent(0)");
-
-	// if (Parent) Parent->H_ChildRemove	(this);
-	if (0==old_parent)	OnH_B_Chield		();	// before attach
-	else				OnH_B_Independent	(just_before_destroy); // before detach
-	if (new_parent)		spatial_unregister	();
-	else				spatial_register	();
-	Parent				= new_parent;
-	if (0==old_parent)	OnH_A_Chield		();	// after attach
-	else				OnH_A_Independent	(); // after detach
-	// if (Parent)	Parent->H_ChildAdd		(this);
-	MakeMeCrow			();
-	return				old_parent;
+    if (new_parent == Parent) return new_parent;
+
+    CObject* old_parent = Parent;
+
+    VERIFY2((new_parent == 0) || (old_parent == 0), "Before set parent - execute H_SetParent(0)");
+
+    // if (Parent) Parent->H_ChildRemove (this);
+    if (0 == old_parent) OnH_B_Chield(); // before attach
+    else OnH_B_Independent(just_before_destroy); // before detach
+    if (new_parent) spatial_unregister();
+    else spatial_register();
+    Parent = new_parent;
+    if (0 == old_parent) OnH_A_Chield(); // after attach
+    else OnH_A_Independent(); // after detach
+    // if (Parent) Parent->H_ChildAdd (this);
+    MakeMeCrow();
+    return old_parent;
 }
 
-void CObject::OnH_A_Chield		()
+void CObject::OnH_A_Chield()
 {
 }
-void CObject::OnH_B_Chield		()
+void CObject::OnH_B_Chield()
 {
-	setVisible	(false);
+    setVisible(false);
 }
-void CObject::OnH_A_Independent	()
+void CObject::OnH_A_Independent()
 {
-	setVisible	(true);
+    setVisible(true);
 }
 
-void CObject::OnH_B_Independent	(bool just_before_destroy)
+void CObject::OnH_B_Independent(bool just_before_destroy)
 {
 }
 
-void CObject::setDestroy			(BOOL _destroy)
+void CObject::setDestroy(BOOL _destroy)
 {
-	if (_destroy == (BOOL)Props.bDestroy)
-		return;
+    if (_destroy == (BOOL)Props.bDestroy)
+        return;
 
-	Props.bDestroy	= _destroy?1:0;
-	if (_destroy)
-	{
-		g_pGameLevel->Objects.register_object_to_destroy	(this);
+    Props.bDestroy = _destroy ? 1 : 0;
+    if (_destroy)
+    {
+        g_pGameLevel->Objects.register_object_to_destroy(this);
 #ifdef DEBUG
-		extern BOOL debug_destroy;
-		if(debug_destroy)
-			Msg("cl setDestroy [%d][%d]",ID(),Device.dwFrame);
+        extern BOOL debug_destroy;
+        if (debug_destroy)
+            Msg("cl setDestroy [%d][%d]", ID(), Device.dwFrame);
 #endif
 #ifdef MP_LOGGING
-		Msg("cl setDestroy [%d][%d]",ID(),Device.dwFrame);
+        Msg("cl setDestroy [%d][%d]", ID(), Device.dwFrame);
 #endif //#ifdef MP_LOGGING
-	}else
-		VERIFY		(!g_pGameLevel->Objects.registered_object_to_destroy(this));
+    }
+    else
+        VERIFY(!g_pGameLevel->Objects.registered_object_to_destroy(this));
 }
 
-Fvector CObject::get_new_local_point_on_mesh	( u16& bone_id ) const
+Fvector CObject::get_new_local_point_on_mesh(u16& bone_id) const
 {
-	bone_id				= u16(-1);
-	return				Fvector().random_dir().mul(.7f);
+    bone_id = u16(-1);
+    return Fvector().random_dir().mul(.7f);
 }
 
-Fvector CObject::get_last_local_point_on_mesh	( Fvector const& local_point, u16 const bone_id ) const
+Fvector CObject::get_last_local_point_on_mesh(Fvector const& local_point, u16 const bone_id) const
 {
-	VERIFY				( bone_id == u16(-1) );
-
-	Fvector				result;
-	// Fetch data
-	Fmatrix				mE;
-	const Fmatrix&		M = XFORM();
-	const Fbox&			B = CFORM()->getBBox();
-
-	// Build OBB + Ellipse and X-form point
-	Fvector				c,r;
-	Fmatrix				T,mR,mS;
-	B.getcenter			(c);
-	B.getradius			(r);
-	T.translate			(c);
-	mR.mul_43			(M,T);
-	mS.scale			(r);
-	mE.mul_43			(mR,mS); 
-	mE.transform_tiny	(result,local_point);
-
-	return				result;
+    VERIFY(bone_id == u16(-1));
+
+    Fvector result;
+    // Fetch data
+    Fmatrix mE;
+    const Fmatrix& M = XFORM();
+    const Fbox& B = CFORM()->getBBox();
+
+    // Build OBB + Ellipse and X-form point
+    Fvector c, r;
+    Fmatrix T, mR, mS;
+    B.getcenter(c);
+    B.getradius(r);
+    T.translate(c);
+    mR.mul_43(M, T);
+    mS.scale(r);
+    mE.mul_43(mR, mS);
+    mE.transform_tiny(result, local_point);
+
+    return result;
 }
\ No newline at end of file
diff --git a/src/xrEngine/xr_object.h b/src/xrEngine/xr_object.h
index 932c7004c77..a72d3284de5 100644
--- a/src/xrEngine/xr_object.h
+++ b/src/xrEngine/xr_object.h
@@ -9,206 +9,206 @@
 #include "engineapi.h"
 #include "device.h"
 // refs
-//class	ENGINE_API	IRender_Visual;
-class	ENGINE_API	IRender_Sector;
-class	ENGINE_API	IRender_ObjectSpecific;
-class	ENGINE_API	CCustomHUD;
-class	NET_Packet	;
-class	CSE_Abstract;
+//class ENGINE_API IRender_Visual;
+class ENGINE_API IRender_Sector;
+class ENGINE_API IRender_ObjectSpecific;
+class ENGINE_API CCustomHUD;
+class NET_Packet;
+class CSE_Abstract;
 
 //-----------------------------------------------------------------------------------------------------------
-#define CROW_RADIUS		(30.f)
-#define CROW_RADIUS2	(60.f)
+#define CROW_RADIUS (30.f)
+#define CROW_RADIUS2 (60.f)
 //-----------------------------------------------------------------------------------------------------------
-//	CObject
+// CObject
 //-----------------------------------------------------------------------------------------------------------
-class	IPhysicsShell;
-xr_pure_interface	IObjectPhysicsCollision;
+class IPhysicsShell;
+xr_pure_interface IObjectPhysicsCollision;
 #pragma pack(push,4)
-class	ENGINE_API						CObject :	
-	public DLL_Pure,
-	public ISpatial,
-	public ISheduled,
-	public IRenderable,
-	public ICollidable
+class ENGINE_API CObject :
+    public DLL_Pure,
+    public ISpatial,
+    public ISheduled,
+    public IRenderable,
+    public ICollidable
 {
 public:
-	struct	SavedPosition
-	{
-		u32			dwTime;
-		Fvector		vPosition;
-	};
-	union	ObjectProperties
-	{
-		struct 
-		{
-			u32	net_ID			:	16;
-			u32	bActiveCounter	:	8;
-			u32	bEnabled		:	1;
-			u32	bVisible		:	1;
-			u32	bDestroy		:	1;
-			u32	net_Local		:	1;
-			u32	net_Ready		:	1;
-			u32 net_SV_Update	:	1;
-			u32 crow			:	1;
-			u32	bPreDestroy		:	1;
-		};
-		u32	storage;
-	};
+    struct SavedPosition
+    {
+        u32 dwTime;
+        Fvector vPosition;
+    };
+    union ObjectProperties
+    {
+        struct
+        {
+            u32 net_ID : 16;
+            u32 bActiveCounter : 8;
+            u32 bEnabled : 1;
+            u32 bVisible : 1;
+            u32 bDestroy : 1;
+            u32 net_Local : 1;
+            u32 net_Ready : 1;
+            u32 net_SV_Update : 1;
+            u32 crow : 1;
+            u32 bPreDestroy : 1;
+        };
+        u32 storage;
+    };
 private:
-	BENCH_SEC_SCRAMBLEMEMBER1
-	BENCH_SEC_SCRAMBLEVTBL2
-	// Some property variables
-	ObjectProperties					Props;
-	shared_str							NameObject;
-	shared_str							NameSection;
-	shared_str							NameVisual;
+    BENCH_SEC_SCRAMBLEMEMBER1
+    BENCH_SEC_SCRAMBLEVTBL2
+    // Some property variables
+    ObjectProperties Props;
+    shared_str NameObject;
+    shared_str NameSection;
+    shared_str NameVisual;
 protected:
-	// Parentness
-	CObject*							Parent;
+    // Parentness
+    CObject* Parent;
 
-	// Geometric (transformation)
-	svector<SavedPosition,4>			PositionStack;
+    // Geometric (transformation)
+    svector<SavedPosition, 4> PositionStack;
 public:
 #ifdef DEBUG
-	u32									dbg_update_cl;
+    u32 dbg_update_cl;
 #endif
-	u32									dwFrame_UpdateCL;
-	u32									dwFrame_AsCrow;
-
-	// Crow-MODE
-	// if (object_is_visible)
-	// if (object_is_near)
-	// if (object_is_crow_always)
-#ifdef	DEBUG
-		void							DBGGetProps			(ObjectProperties &p ) const { p = Props; }
+    u32 dwFrame_UpdateCL;
+    u32 dwFrame_AsCrow;
+
+    // Crow-MODE
+    // if (object_is_visible)
+    // if (object_is_near)
+    // if (object_is_crow_always)
+#ifdef DEBUG
+    void DBGGetProps(ObjectProperties& p) const { p = Props; }
 #endif
-		void							MakeMeCrow			();
-
-	ICF	void							IAmNotACrowAnyMore	()					{ Props.crow = false;		}
-	virtual BOOL						AlwaysTheCrow		()					{ return FALSE;				}
-	ICF	bool							AmICrow				() const			{ return !!Props.crow;		}
-
-	// Network
-	ICF BOOL							Local				()			const	{ return Props.net_Local;	}
-	ICF BOOL							Remote				()			const	{ return !Props.net_Local;	}
-	ICF u16								ID					()			const	{ return Props.net_ID;		}
-	ICF void							setID				(u16 _ID)			{ Props.net_ID = _ID;		}
-	virtual BOOL						Ready				()					{ return Props.net_Ready;	}
-	BOOL								GetTmpPreDestroy		()		const	{ return Props.bPreDestroy;	}
-	void								SetTmpPreDestroy	(BOOL b)			{ Props.bPreDestroy = b;}
-	virtual float						shedule_Scale		()					{ return Device.vCameraPosition.distance_to(Position())/200.f; }
-	virtual bool						shedule_Needed		()					{return processing_enabled();};
-
-	// Parentness
-	IC CObject*							H_Parent			()					{ return Parent;						}
-	IC const CObject*					H_Parent			()			const	{ return Parent;						}
-	CObject*							H_Root				()					{ return Parent?Parent->H_Root():this;	}
-	const CObject*						H_Root				()			const	{ return Parent?Parent->H_Root():this;	}
-	CObject*							H_SetParent			(CObject* O, bool just_before_destroy = false);
-
-	// Geometry xform
-	virtual void						Center				(Fvector& C) const;
-	IC const Fmatrix&					XFORM				()			 const	{ VERIFY(_valid(renderable.xform));	return renderable.xform;	}
-	ICF Fmatrix&						XFORM				()					{ return renderable.xform;			}
-	virtual void						spatial_register	();
-	virtual void						spatial_unregister	();
-	virtual void						spatial_move		();
-	void								spatial_update		(float eps_P, float eps_R);
-
-	ICF Fvector&						Direction			() 					{ return renderable.xform.k;		}
-	ICF const Fvector&					Direction			() 			const	{ return renderable.xform.k;		}
-	ICF Fvector&						Position			() 					{ return renderable.xform.c;		}
-	ICF const Fvector&					Position			() 			const	{ return renderable.xform.c;		}
-	virtual float						Radius				()			const;
-	virtual const Fbox&					BoundingBox			()			const;
-	
-	IC IRender_Sector*					Sector				()					{ return H_Root()->spatial.sector;	}
-	IC IRender_ObjectSpecific*			ROS					()					{ return renderable_ROS();			}
-	virtual BOOL						renderable_ShadowGenerate	()			{ return TRUE;						}
-	virtual BOOL						renderable_ShadowReceive	()			{ return TRUE;						}
-
-	// Accessors and converters
-	ICF IRenderVisual*					Visual				() const			{ return renderable.visual;			}
-	ICF ICollisionForm*					CFORM				() const			{ return collidable.model;			}
-	virtual		CObject*				dcast_CObject		()					{ return this;						}
-	virtual		IRenderable*			dcast_Renderable	()					{ return this;						}
-	virtual void						OnChangeVisual		()					{ }
-	virtual		IPhysicsShell			*physics_shell		()					{ return  0; }
-
-virtual	const IObjectPhysicsCollision	*physics_collision	()					{ return  0; }
-	// Name management
-	ICF shared_str						cName				()			const	{ return NameObject;				}
-	void								cName_set			(shared_str N);
-	ICF shared_str						cNameSect			()			const	{ return NameSection;				}
-	ICF LPCSTR							cNameSect_str		()			const	{ return NameSection.c_str();		}
-	void								cNameSect_set		(shared_str N);
-	ICF shared_str						cNameVisual			()			const	{ return NameVisual;				}
-	void								cNameVisual_set		(shared_str N);
-	virtual	shared_str					shedule_Name		() const			{ return cName(); };
-	
-	// Properties
-	void								processing_activate		();				// request	to enable	UpdateCL
-	void								processing_deactivate	();				// request	to disable	UpdateCL
-	bool								processing_enabled		()				{ return 0!=Props.bActiveCounter;	}
-
-	void								setVisible			(BOOL _visible);
-	ICF BOOL							getVisible			()			const	{ return Props.bVisible;			}
-	void								setEnabled			(BOOL _enabled);
-	ICF BOOL							getEnabled			()			const	{ return Props.bEnabled;			}
-		void							setDestroy			(BOOL _destroy);
-	ICF BOOL							getDestroy			()			const	{ return Props.bDestroy;			}
-	ICF void							setLocal			(BOOL _local)		{ Props.net_Local = _local?1:0;		}
-	ICF BOOL							getLocal			()			const	{ return Props.net_Local;			}
-	ICF void							setSVU				(BOOL _svu)			{ Props.net_SV_Update	= _svu?1:0;	}
-	ICF BOOL							getSVU				()			const	{ return Props.net_SV_Update;		}
-	ICF void							setReady			(BOOL _ready)		{ Props.net_Ready = _ready?1:0;		}
-	ICF BOOL							getReady			()			const	{ return Props.net_Ready;			}
-
-	//---------------------------------------------------------------------
-										CObject				();
-	virtual								~CObject			();
-
-	virtual void						Load				(LPCSTR section);
-	
-	// Update
-	virtual void						shedule_Update		(u32 dt);							// Called by sheduler
-	virtual void						renderable_Render	();
-
-	virtual void						UpdateCL			();									// Called each frame, so no need for dt
-	virtual BOOL						net_Spawn			(CSE_Abstract* data);
-	virtual void						net_Destroy			();
-	virtual void						net_Export			(NET_Packet& P) {};					// export to server
-	virtual void						net_Import			(NET_Packet& P) {};					// import from server
-	virtual	void						net_ImportInput		(NET_Packet& P)	{};
-	virtual BOOL						net_Relevant		()				{ return FALSE; };	// relevant for export to server
-	virtual void						net_MigrateInactive	(NET_Packet& P)	{ Props.net_Local = FALSE;		};
-	virtual void						net_MigrateActive	(NET_Packet& P)	{ Props.net_Local = TRUE;		};
-	virtual void						net_Relcase			(CObject*	 O) { };				// destroy all links to another objects
-
-	// Position stack
-	IC u32								ps_Size				()			const	{ return PositionStack.size(); }
-	virtual	SavedPosition				ps_Element			(u32 ID)	const;
-	virtual void						ForceTransform		(const Fmatrix& m)	{};
-
-	// HUD
-	virtual void						OnHUDDraw			(CCustomHUD* hud)	{};
-
-	// Active/non active
-	virtual void						OnH_B_Chield		();		// before
-	virtual void						OnH_B_Independent	(bool just_before_destroy);
-	virtual void						OnH_A_Chield		();		// after
-	virtual void						OnH_A_Independent	();
-
-	virtual void						On_SetEntity		()	{};
-	virtual void						On_LostEntity		()	{};
+    void MakeMeCrow();
+
+    ICF void IAmNotACrowAnyMore() { Props.crow = false; }
+    virtual BOOL AlwaysTheCrow() { return FALSE; }
+    ICF bool AmICrow() const { return !!Props.crow; }
+
+    // Network
+    ICF BOOL Local() const { return Props.net_Local; }
+    ICF BOOL Remote() const { return !Props.net_Local; }
+    ICF u16 ID() const { return Props.net_ID; }
+    ICF void setID(u16 _ID) { Props.net_ID = _ID; }
+    virtual BOOL Ready() { return Props.net_Ready; }
+    BOOL GetTmpPreDestroy() const { return Props.bPreDestroy; }
+    void SetTmpPreDestroy(BOOL b) { Props.bPreDestroy = b; }
+    virtual float shedule_Scale() { return Device.vCameraPosition.distance_to(Position()) / 200.f; }
+    virtual bool shedule_Needed() { return processing_enabled(); };
+
+    // Parentness
+    IC CObject* H_Parent() { return Parent; }
+    IC const CObject* H_Parent() const { return Parent; }
+    CObject* H_Root() { return Parent ? Parent->H_Root() : this; }
+    const CObject* H_Root() const { return Parent ? Parent->H_Root() : this; }
+    CObject* H_SetParent(CObject* O, bool just_before_destroy = false);
+
+    // Geometry xform
+    virtual void Center(Fvector& C) const;
+    IC const Fmatrix& XFORM() const { VERIFY(_valid(renderable.xform)); return renderable.xform; }
+    ICF Fmatrix& XFORM() { return renderable.xform; }
+    virtual void spatial_register();
+    virtual void spatial_unregister();
+    virtual void spatial_move();
+    void spatial_update(float eps_P, float eps_R);
+
+    ICF Fvector& Direction() { return renderable.xform.k; }
+    ICF const Fvector& Direction() const { return renderable.xform.k; }
+    ICF Fvector& Position() { return renderable.xform.c; }
+    ICF const Fvector& Position() const { return renderable.xform.c; }
+    virtual float Radius() const;
+    virtual const Fbox& BoundingBox() const;
+
+    IC IRender_Sector* Sector() { return H_Root()->spatial.sector; }
+    IC IRender_ObjectSpecific* ROS() { return renderable_ROS(); }
+    virtual BOOL renderable_ShadowGenerate() { return TRUE; }
+    virtual BOOL renderable_ShadowReceive() { return TRUE; }
+
+    // Accessors and converters
+    ICF IRenderVisual* Visual() const { return renderable.visual; }
+    ICF ICollisionForm* CFORM() const { return collidable.model; }
+    virtual CObject* dcast_CObject() { return this; }
+    virtual IRenderable* dcast_Renderable() { return this; }
+    virtual void OnChangeVisual() { }
+    virtual IPhysicsShell* physics_shell() { return 0; }
+
+    virtual const IObjectPhysicsCollision* physics_collision() { return 0; }
+    // Name management
+    ICF shared_str cName() const { return NameObject; }
+    void cName_set(shared_str N);
+    ICF shared_str cNameSect() const { return NameSection; }
+    ICF LPCSTR cNameSect_str() const { return NameSection.c_str(); }
+    void cNameSect_set(shared_str N);
+    ICF shared_str cNameVisual() const { return NameVisual; }
+    void cNameVisual_set(shared_str N);
+    virtual shared_str shedule_Name() const { return cName(); };
+
+    // Properties
+    void processing_activate(); // request to enable UpdateCL
+    void processing_deactivate(); // request to disable UpdateCL
+    bool processing_enabled() { return 0 != Props.bActiveCounter; }
+
+    void setVisible(BOOL _visible);
+    ICF BOOL getVisible() const { return Props.bVisible; }
+    void setEnabled(BOOL _enabled);
+    ICF BOOL getEnabled() const { return Props.bEnabled; }
+    void setDestroy(BOOL _destroy);
+    ICF BOOL getDestroy() const { return Props.bDestroy; }
+    ICF void setLocal(BOOL _local) { Props.net_Local = _local ? 1 : 0; }
+    ICF BOOL getLocal() const { return Props.net_Local; }
+    ICF void setSVU(BOOL _svu) { Props.net_SV_Update = _svu ? 1 : 0; }
+    ICF BOOL getSVU() const { return Props.net_SV_Update; }
+    ICF void setReady(BOOL _ready) { Props.net_Ready = _ready ? 1 : 0; }
+    ICF BOOL getReady() const { return Props.net_Ready; }
+
+    //---------------------------------------------------------------------
+    CObject();
+    virtual ~CObject();
+
+    virtual void Load(LPCSTR section);
+
+    // Update
+    virtual void shedule_Update(u32 dt); // Called by sheduler
+    virtual void renderable_Render();
+
+    virtual void UpdateCL(); // Called each frame, so no need for dt
+    virtual BOOL net_Spawn(CSE_Abstract* data);
+    virtual void net_Destroy();
+    virtual void net_Export(NET_Packet& P) {}; // export to server
+    virtual void net_Import(NET_Packet& P) {}; // import from server
+    virtual void net_ImportInput(NET_Packet& P) {};
+    virtual BOOL net_Relevant() { return FALSE; }; // relevant for export to server
+    virtual void net_MigrateInactive(NET_Packet& P) { Props.net_Local = FALSE; };
+    virtual void net_MigrateActive(NET_Packet& P) { Props.net_Local = TRUE; };
+    virtual void net_Relcase(CObject* O) { }; // destroy all links to another objects
+
+    // Position stack
+    IC u32 ps_Size() const { return PositionStack.size(); }
+    virtual SavedPosition ps_Element(u32 ID) const;
+    virtual void ForceTransform(const Fmatrix& m) {};
+
+    // HUD
+    virtual void OnHUDDraw(CCustomHUD* hud) {};
+
+    // Active/non active
+    virtual void OnH_B_Chield(); // before
+    virtual void OnH_B_Independent(bool just_before_destroy);
+    virtual void OnH_A_Chield(); // after
+    virtual void OnH_A_Independent();
+
+    virtual void On_SetEntity() {};
+    virtual void On_LostEntity() {};
 
 public:
-	virtual bool						register_schedule	() const {return true;}
+    virtual bool register_schedule() const { return true; }
 
 public:
-	virtual	Fvector				get_new_local_point_on_mesh	( u16& bone_id ) const;
-	virtual	Fvector				get_last_local_point_on_mesh( Fvector const& last_point, u16 bone_id ) const;
+    virtual Fvector get_new_local_point_on_mesh(u16& bone_id) const;
+    virtual Fvector get_last_local_point_on_mesh(Fvector const& last_point, u16 bone_id) const;
 };
 
 #pragma pack(pop)
diff --git a/src/xrEngine/xr_object_list.cpp b/src/xrEngine/xr_object_list.cpp
index 8ea5597f512..6bc901b7749 100644
--- a/src/xrEngine/xr_object_list.cpp
+++ b/src/xrEngine/xr_object_list.cpp
@@ -11,587 +11,609 @@
 
 #include "CustomHUD.h"
 
-class fClassEQ {
-	CLASS_ID cls;
+class fClassEQ
+{
+    CLASS_ID cls;
 public:
-	fClassEQ(CLASS_ID C) : cls(C) {};
-	IC bool operator() (CObject* O) { return cls==O->CLS_ID; }
+    fClassEQ(CLASS_ID C) : cls(C) {};
+    IC bool operator() (CObject* O) { return cls == O->CLS_ID; }
 };
-#ifdef	DEBUG
-	BOOL debug_destroy = TRUE;
+#ifdef DEBUG
+BOOL debug_destroy = TRUE;
 #endif
 
-CObjectList::CObjectList	( ) :
-	m_owner_thread_id		(GetCurrentThreadId())
+CObjectList::CObjectList() :
+    m_owner_thread_id(GetCurrentThreadId())
 {
-	ZeroMemory				(map_NETID, 0xffff*sizeof(CObject*));
+    ZeroMemory(map_NETID, 0xffff * sizeof(CObject*));
 }
 
-CObjectList::~CObjectList	( )
+CObjectList::~CObjectList()
 {
-	R_ASSERT				( objects_active.empty()	);
-	R_ASSERT				( objects_sleeping.empty()	);
-	R_ASSERT				( destroy_queue.empty()		);
-//.	R_ASSERT				( map_NETID.empty()			);
+    R_ASSERT(objects_active.empty());
+    R_ASSERT(objects_sleeping.empty());
+    R_ASSERT(destroy_queue.empty());
+    //. R_ASSERT ( map_NETID.empty() );
 }
 
-CObject*	CObjectList::FindObjectByName	( shared_str name )
+CObject* CObjectList::FindObjectByName(shared_str name)
 {
-	for (Objects::iterator I=objects_active.begin(); I!=objects_active.end(); I++)
-		if ((*I)->cName().equal(name))	return (*I);
-	for (Objects::iterator I=objects_sleeping.begin(); I!=objects_sleeping.end(); I++)
-		if ((*I)->cName().equal(name))	return (*I);
-	return	NULL;
+    for (Objects::iterator I = objects_active.begin(); I != objects_active.end(); I++)
+        if ((*I)->cName().equal(name)) return (*I);
+    for (Objects::iterator I = objects_sleeping.begin(); I != objects_sleeping.end(); I++)
+        if ((*I)->cName().equal(name)) return (*I);
+    return NULL;
 }
-CObject*	CObjectList::FindObjectByName	( LPCSTR name )
+CObject* CObjectList::FindObjectByName(LPCSTR name)
 {
-	return	FindObjectByName				(shared_str(name));
+    return FindObjectByName(shared_str(name));
 }
 
-CObject*	CObjectList::FindObjectByCLS_ID	( CLASS_ID cls )
+CObject* CObjectList::FindObjectByCLS_ID(CLASS_ID cls)
 {
-	{
-		Objects::iterator O	= std::find_if(objects_active.begin(),objects_active.end(),fClassEQ(cls));
-		if (O!=objects_active.end())	return *O;
-	}
-	{
-		Objects::iterator O	= std::find_if(objects_sleeping.begin(),objects_sleeping.end(),fClassEQ(cls));
-		if (O!=objects_sleeping.end())	return *O;
-	}
-
-	return	NULL;
+    {
+        Objects::iterator O = std::find_if(objects_active.begin(), objects_active.end(), fClassEQ(cls));
+        if (O != objects_active.end()) return *O;
+    }
+    {
+        Objects::iterator O = std::find_if(objects_sleeping.begin(), objects_sleeping.end(), fClassEQ(cls));
+        if (O != objects_sleeping.end()) return *O;
+    }
+
+    return NULL;
 }
 
 
-void	CObjectList::o_remove		( Objects&	v,  CObject* O)
+void CObjectList::o_remove(Objects& v, CObject* O)
 {
-//.	if(O->ID()==1026)
-//.	{
-//.		Log("ahtung");
-//.	}
-	Objects::iterator _i	= std::find(v.begin(),v.end(),O);
-	VERIFY					(_i!=v.end());
-	v.erase					(_i);
-//.	Msg("---o_remove[%s][%d]", O->cName().c_str(), O->ID() );
+    //. if(O->ID()==1026)
+    //. {
+    //. Log("ahtung");
+    //. }
+    Objects::iterator _i = std::find(v.begin(), v.end(), O);
+    VERIFY(_i != v.end());
+    v.erase(_i);
+    //. Msg("---o_remove[%s][%d]", O->cName().c_str(), O->ID() );
 }
 
-void	CObjectList::o_activate		( CObject*		O		)
+void CObjectList::o_activate(CObject* O)
 {
-	VERIFY						(O && O->processing_enabled());
-	o_remove					(objects_sleeping,O);
-	objects_active.push_back	(O);
-	O->MakeMeCrow				();
+    VERIFY(O && O->processing_enabled());
+    o_remove(objects_sleeping, O);
+    objects_active.push_back(O);
+    O->MakeMeCrow();
 }
-void	CObjectList::o_sleep		( CObject*		O		)
+void CObjectList::o_sleep(CObject* O)
 {
-	VERIFY	(O && !O->processing_enabled());
-	o_remove					(objects_active,O);
-	objects_sleeping.push_back	(O);
-	O->MakeMeCrow				();
+    VERIFY(O && !O->processing_enabled());
+    o_remove(objects_active, O);
+    objects_sleeping.push_back(O);
+    O->MakeMeCrow();
 }
 
-void	CObjectList::SingleUpdate	(CObject* O)
+void CObjectList::SingleUpdate(CObject* O)
 {
-	if ( Device.dwFrame == O->dwFrame_UpdateCL ) {
+    if (Device.dwFrame == O->dwFrame_UpdateCL)
+    {
 #ifdef DEBUG
-//		if (O->getDestroy())
-//			Msg					("- !!!processing_enabled ->destroy_queue.push_back %s[%d] frame [%d]",O->cName().c_str(), O->ID(), Device.dwFrame);
+        // if (O->getDestroy())
+        // Msg ("- !!!processing_enabled ->destroy_queue.push_back %s[%d] frame [%d]",O->cName().c_str(), O->ID(), Device.dwFrame);
 #endif // #ifdef DEBUG
 
-		return;
-	}
+        return;
+    }
 
-	if ( !O->processing_enabled() ) {
+    if (!O->processing_enabled())
+    {
 #ifdef DEBUG
-//		if (O->getDestroy())
-//			Msg					("- !!!processing_enabled ->destroy_queue.push_back %s[%d] frame [%d]",O->cName().c_str(), O->ID(), Device.dwFrame);
+        // if (O->getDestroy())
+        // Msg ("- !!!processing_enabled ->destroy_queue.push_back %s[%d] frame [%d]",O->cName().c_str(), O->ID(), Device.dwFrame);
 #endif // #ifdef DEBUG
 
-		return;
-	}
+        return;
+    }
 
-	if (O->H_Parent())
-		SingleUpdate			(O->H_Parent());
+    if (O->H_Parent())
+        SingleUpdate(O->H_Parent());
 
-	Device.Statistic->UpdateClient_updated	++;
-	O->dwFrame_UpdateCL			= Device.dwFrame;
+    Device.Statistic->UpdateClient_updated++;
+    O->dwFrame_UpdateCL = Device.dwFrame;
 
-//	Msg							("[%d][0x%08x]IAmNotACrowAnyMore (CObjectList::SingleUpdate)", Device.dwFrame, dynamic_cast<void*>(O));
+    // Msg ("[%d][0x%08x]IAmNotACrowAnyMore (CObjectList::SingleUpdate)", Device.dwFrame, dynamic_cast<void*>(O));
 
-	O->UpdateCL					();
+    O->UpdateCL();
 
-	VERIFY3						(O->dbg_update_cl == Device.dwFrame, "Broken sequence of calls to 'UpdateCL'",*O->cName());
+    VERIFY3(O->dbg_update_cl == Device.dwFrame, "Broken sequence of calls to 'UpdateCL'", *O->cName());
 #if 0//ndef DEBUG
-	__try
-	{
+    __try
+    {
 #endif
-		if (O->H_Parent() && (O->H_Parent()->getDestroy() || O->H_Root()->getDestroy()) )	
-		{
-			// Push to destroy-queue if it isn't here already
-			Msg	("! ERROR: incorrect destroy sequence for object[%d:%s], section[%s], parent[%d:%s]",O->ID(),*O->cName(),*O->cNameSect(),O->H_Parent()->ID(),*O->H_Parent()->cName());
-		}
+        if (O->H_Parent() && (O->H_Parent()->getDestroy() || O->H_Root()->getDestroy()))
+        {
+            // Push to destroy-queue if it isn't here already
+            Msg("! ERROR: incorrect destroy sequence for object[%d:%s], section[%s], parent[%d:%s]", O->ID(), *O->cName(), *O->cNameSect(), O->H_Parent()->ID(), *O->H_Parent()->cName());
+        }
 #if 0//ndef DEBUG
-	}
-	__except (EXCEPTION_EXECUTE_HANDLER)
-	{
-		CObject* parent_obj = O->H_Parent();
-		CObject* root_obj	= O->H_Root();
-		Msg	("! ERROR: going to crush: [%d:%s], section[%s], parent_obj_addr[0x%08x], root_obj_addr[0x%08x]",O->ID(),*O->cName(),*O->cNameSect(), *((u32*)&parent_obj), *((u32*)&root_obj));
-		if (parent_obj)
-		{
-			__try
-			{
-				Msg("! Parent object: [%d:%s], section[%s]", 
-					parent_obj->ID(), 
-					parent_obj->cName().c_str(),
-					parent_obj->cNameSect().c_str());
-
-			}
-			__except (EXCEPTION_EXECUTE_HANDLER)
-			{
-				Msg("! Failed to get parent object info.");
-			}
-		}
-		if (root_obj)
-		{
-			__try
-			{
-				Msg("! Root object: [%d:%s], section[%s]", 
-					root_obj->ID(), 
-					root_obj->cName().c_str(),
-					root_obj->cNameSect().c_str());
-			}
-			__except (EXCEPTION_EXECUTE_HANDLER)
-			{
-				Msg("! Failed to get root object info.");
-			}
-		}
-		R_ASSERT(false);
-	} //end of __except
+    }
+    __except (EXCEPTION_EXECUTE_HANDLER)
+    {
+        CObject* parent_obj = O->H_Parent();
+        CObject* root_obj = O->H_Root();
+        Msg ("! ERROR: going to crush: [%d:%s], section[%s], parent_obj_addr[0x%08x], root_obj_addr[0x%08x]",O->ID(),*O->cName(),*O->cNameSect(), *((u32*)&parent_obj), *((u32*)&root_obj));
+        if (parent_obj)
+        {
+            __try
+            {
+                Msg("! Parent object: [%d:%s], section[%s]",
+                    parent_obj->ID(),
+                    parent_obj->cName().c_str(),
+                    parent_obj->cNameSect().c_str());
+
+            }
+            __except (EXCEPTION_EXECUTE_HANDLER)
+            {
+                Msg("! Failed to get parent object info.");
+            }
+        }
+        if (root_obj)
+        {
+            __try
+            {
+                Msg("! Root object: [%d:%s], section[%s]",
+                    root_obj->ID(),
+                    root_obj->cName().c_str(),
+                    root_obj->cNameSect().c_str());
+            }
+            __except (EXCEPTION_EXECUTE_HANDLER)
+            {
+                Msg("! Failed to get root object info.");
+            }
+        }
+        R_ASSERT(false);
+    } //end of __except
 #endif
 
 #ifdef DEBUG
-//	if (O->getDestroy())
-//		Msg						("- !!!processing_enabled ->destroy_queue.push_back %s[%d] frame [%d]",O->cName().c_str(), O->ID(), Device.dwFrame);
+    // if (O->getDestroy())
+    // Msg ("- !!!processing_enabled ->destroy_queue.push_back %s[%d] frame [%d]",O->cName().c_str(), O->ID(), Device.dwFrame);
 #endif // #ifdef DEBUG
 }
 
 void CObjectList::clear_crow_vec(Objects& o)
 {
-	for (u32 _it=0; _it<o.size(); _it++) {
-//		Msg				("[%d][0x%08x]IAmNotACrowAnyMore (clear_crow_vec)", Device.dwFrame, dynamic_cast<void*>(o[_it]));
-		o[_it]->IAmNotACrowAnyMore();
-	}
-	o.clear_not_free();
+    for (u32 _it = 0; _it<o.size(); _it++)
+    {
+        // Msg ("[%d][0x%08x]IAmNotACrowAnyMore (clear_crow_vec)", Device.dwFrame, dynamic_cast<void*>(o[_it]));
+        o[_it]->IAmNotACrowAnyMore();
+    }
+    o.clear_not_free();
 }
 
-void CObjectList::Update		(bool bForce)
+void CObjectList::Update(bool bForce)
 {
-	if ( !Device.Paused() || bForce )
-	{
-		// Clients
-		if (Device.fTimeDelta>EPS_S || bForce)			
-		{
-			// Select Crow-Mode
-			Device.Statistic->UpdateClient_updated	= 0;
-
-			Objects& crows				= m_crows[0];
-
-			{
-				Objects& crows1			= m_crows[1];
-				crows.insert			(crows.end(), crows1.begin(), crows1.end());
-				crows1.clear_not_free	();
-			}
+    if (!Device.Paused() || bForce)
+    {
+        // Clients
+        if (Device.fTimeDelta>EPS_S || bForce)
+        {
+            // Select Crow-Mode
+            Device.Statistic->UpdateClient_updated = 0;
+
+            Objects& crows = m_crows[0];
+
+            {
+                Objects& crows1 = m_crows[1];
+                crows.insert(crows.end(), crows1.begin(), crows1.end());
+                crows1.clear_not_free();
+            }
 
 #if 0
-			std::sort					(crows.begin(), crows.end());
-			crows.erase					(
-				std::unique(
-					crows.begin(),
-					crows.end()
-				),
-				crows.end()
-			);
+            std::sort (crows.begin(), crows.end());
+            crows.erase (
+                std::unique(
+                    crows.begin(),
+                    crows.end()
+                ),
+                crows.end()
+            );
 #else
-#	ifdef DEBUG
-			std::sort					(crows.begin(), crows.end());
-			VERIFY						(
-				std::unique(
-					crows.begin(),
-					crows.end()
-				) == crows.end()
-			);
-#	endif // ifdef DEBUG
+# ifdef DEBUG
+            std::sort(crows.begin(), crows.end());
+            VERIFY(
+                std::unique(
+                    crows.begin(),
+                    crows.end()
+                ) == crows.end()
+            );
+# endif // ifdef DEBUG
 #endif
 
-			Device.Statistic->UpdateClient_crows	= crows.size	();
-			Objects* workload			= 0;
-			if (!psDeviceFlags.test(rsDisableObjectsAsCrows))	
-				workload				= &crows;
-			else {
-				workload				= &objects_active;
-				clear_crow_vec			(crows);
-			}
-
-			Device.Statistic->UpdateClient.Begin	();
-			Device.Statistic->UpdateClient_active	= objects_active.size();
-			Device.Statistic->UpdateClient_total	= objects_active.size() + objects_sleeping.size();
-
-			u32 const objects_count		= workload->size();
-			CObject** objects			= (CObject**)_alloca(objects_count*sizeof(CObject*));
-			std::copy					( workload->begin(), workload->end(), objects );
-
-			crows.clear_not_free		();
-
-			CObject** b					= objects;
-			CObject** e					= objects + objects_count;
-			for (CObject** i = b; i != e; ++i) {
-				(*i)->IAmNotACrowAnyMore();
-				(*i)->dwFrame_AsCrow	= u32(-1);
-			}
-
-			for (CObject** i = b; i != e; ++i)
-				SingleUpdate			(*i);
-
-			Device.Statistic->UpdateClient.End		();
-		}
-	}
-
-	// Destroy
-	if (!destroy_queue.empty()) 
-	{
-		// Info
-		for (Objects::iterator oit=objects_active.begin(); oit!=objects_active.end(); oit++)
-			for (int it = destroy_queue.size()-1; it>=0; it--){	
-				(*oit)->net_Relcase		(destroy_queue[it]);
-			}
-		for (Objects::iterator oit=objects_sleeping.begin(); oit!=objects_sleeping.end(); oit++)
-			for (int it = destroy_queue.size()-1; it>=0; it--)	(*oit)->net_Relcase	(destroy_queue[it]);
-
-		for (int it = destroy_queue.size()-1; it>=0; it--)	Sound->object_relcase	(destroy_queue[it]);
-		
-		RELCASE_CALLBACK_VEC::iterator It	= m_relcase_callbacks.begin();
-		RELCASE_CALLBACK_VEC::iterator Ite	= m_relcase_callbacks.end();
-		for(;It!=Ite; ++It)	{
-			VERIFY			(*(*It).m_ID==(It-m_relcase_callbacks.begin()));
-			Objects::iterator dIt	= destroy_queue.begin();
-			Objects::iterator dIte	= destroy_queue.end();
-			for (;dIt!=dIte; ++dIt) {
-				(*It).m_Callback(*dIt);
-				g_hud->net_Relcase	(*dIt);
-			}
-		}
-
-		// Destroy
-		for (int it = destroy_queue.size()-1; it>=0; it--)
-		{
-			CObject*		O	= destroy_queue[it];
-//			Msg				("Object [%x]", O);
+            Device.Statistic->UpdateClient_crows = crows.size();
+            Objects* workload = 0;
+            if (!psDeviceFlags.test(rsDisableObjectsAsCrows))
+                workload = &crows;
+            else
+            {
+                workload = &objects_active;
+                clear_crow_vec(crows);
+            }
+
+            Device.Statistic->UpdateClient.Begin();
+            Device.Statistic->UpdateClient_active = objects_active.size();
+            Device.Statistic->UpdateClient_total = objects_active.size() + objects_sleeping.size();
+
+            u32 const objects_count = workload->size();
+            CObject** objects = (CObject**)_alloca(objects_count*sizeof(CObject*));
+            std::copy(workload->begin(), workload->end(), objects);
+
+            crows.clear_not_free();
+
+            CObject** b = objects;
+            CObject** e = objects + objects_count;
+            for (CObject** i = b; i != e; ++i)
+            {
+                (*i)->IAmNotACrowAnyMore();
+                (*i)->dwFrame_AsCrow = u32(-1);
+            }
+
+            for (CObject** i = b; i != e; ++i)
+                SingleUpdate(*i);
+
+            Device.Statistic->UpdateClient.End();
+        }
+    }
+
+    // Destroy
+    if (!destroy_queue.empty())
+    {
+        // Info
+        for (Objects::iterator oit = objects_active.begin(); oit != objects_active.end(); oit++)
+            for (int it = destroy_queue.size() - 1; it >= 0; it--)
+            {
+                (*oit)->net_Relcase(destroy_queue[it]);
+            }
+        for (Objects::iterator oit = objects_sleeping.begin(); oit != objects_sleeping.end(); oit++)
+            for (int it = destroy_queue.size() - 1; it >= 0; it--) (*oit)->net_Relcase(destroy_queue[it]);
+
+        for (int it = destroy_queue.size() - 1; it >= 0; it--) Sound->object_relcase(destroy_queue[it]);
+
+        RELCASE_CALLBACK_VEC::iterator It = m_relcase_callbacks.begin();
+        RELCASE_CALLBACK_VEC::iterator Ite = m_relcase_callbacks.end();
+        for (; It != Ite; ++It)
+        {
+            VERIFY(*(*It).m_ID == (It - m_relcase_callbacks.begin()));
+            Objects::iterator dIt = destroy_queue.begin();
+            Objects::iterator dIte = destroy_queue.end();
+            for (; dIt != dIte; ++dIt)
+            {
+                (*It).m_Callback(*dIt);
+                g_hud->net_Relcase(*dIt);
+            }
+        }
+
+        // Destroy
+        for (int it = destroy_queue.size() - 1; it >= 0; it--)
+        {
+            CObject* O = destroy_queue[it];
+            // Msg ("Object [%x]", O);
 #ifdef DEBUG
-			if( debug_destroy )
-				Msg			("Destroying object[%x][%x] [%d][%s] frame[%d]",dynamic_cast<void*>(O), O, O->ID(),*O->cName(), Device.dwFrame);
+            if (debug_destroy)
+                Msg("Destroying object[%x][%x] [%d][%s] frame[%d]", dynamic_cast<void*>(O), O, O->ID(), *O->cName(), Device.dwFrame);
 #endif // DEBUG
-			O->net_Destroy	( );
-			Destroy			(O);
-		}
-		destroy_queue.clear	();
-	}
+            O->net_Destroy();
+            Destroy(O);
+        }
+        destroy_queue.clear();
+    }
 }
 
-void CObjectList::net_Register		(CObject* O)
+void CObjectList::net_Register(CObject* O)
 {
-	R_ASSERT		(O);
-	R_ASSERT		(O->ID() < 0xffff);
+    R_ASSERT(O);
+    R_ASSERT(O->ID() < 0xffff);
+
+    map_NETID[O->ID()] = O;
 
-	map_NETID[O->ID()] = O;
-	
-	
 
-//.	map_NETID.insert(mk_pair(O->ID(),O));
-	//Msg			("-------------------------------- Register: %s",O->cName());
+
+    //. map_NETID.insert(mk_pair(O->ID(),O));
+    //Msg ("-------------------------------- Register: %s",O->cName());
 }
 
-void CObjectList::net_Unregister	(CObject* O)
+void CObjectList::net_Unregister(CObject* O)
 {
-	//R_ASSERT		(O->ID() < 0xffff);
-	if (O->ID() < 0xffff)				//demo_spectator can have 0xffff
-		map_NETID[O->ID()] = NULL;
-/*
-	xr_map<u32,CObject*>::iterator	it = map_NETID.find(O->ID());
-	if ((it!=map_NETID.end()) && (it->second == O))	{
-		// Msg			("-------------------------------- Unregster: %s",O->cName());
-		map_NETID.erase(it);
-	}
-*/
+    //R_ASSERT (O->ID() < 0xffff);
+    if (O->ID() < 0xffff) //demo_spectator can have 0xffff
+        map_NETID[O->ID()] = NULL;
+    /*
+     xr_map<u32,CObject*>::iterator it = map_NETID.find(O->ID());
+     if ((it!=map_NETID.end()) && (it->second == O)) {
+     // Msg ("-------------------------------- Unregster: %s",O->cName());
+     map_NETID.erase(it);
+     }
+     */
 }
 
-int	g_Dump_Export_Obj = 0;
+int g_Dump_Export_Obj = 0;
 
-u32	CObjectList::net_Export			(NET_Packet* _Packet,	u32 start, u32 max_object_size	)
+u32 CObjectList::net_Export(NET_Packet* _Packet, u32 start, u32 max_object_size)
 {
-	if (g_Dump_Export_Obj) Msg("---- net_export --- ");
-
-	NET_Packet& Packet	= *_Packet;
-	u32			position;
-	for (; start<objects_active.size() + objects_sleeping.size(); start++)			{
-		CObject* P = (start<objects_active.size()) ? objects_active[start] : objects_sleeping[start-objects_active.size()];
-		if (P->net_Relevant() && !P->getDestroy())	{			
-			Packet.w_u16			(u16(P->ID())	);
-			Packet.w_chunk_open8	(position);
-			//Msg						("cl_export: %d '%s'",P->ID(),*P->cName());
-			P->net_Export			(Packet);
+    if (g_Dump_Export_Obj) Msg("---- net_export --- ");
+
+    NET_Packet& Packet = *_Packet;
+    u32 position;
+    for (; start < objects_active.size() + objects_sleeping.size(); start++)
+    {
+        CObject* P = (start < objects_active.size()) ? objects_active[start] : objects_sleeping[start - objects_active.size()];
+        if (P->net_Relevant() && !P->getDestroy())
+        {
+            Packet.w_u16(u16(P->ID()));
+            Packet.w_chunk_open8(position);
+            //Msg ("cl_export: %d '%s'",P->ID(),*P->cName());
+            P->net_Export(Packet);
 
 #ifdef DEBUG
-			u32 size				= u32		(Packet.w_tell()-position)-sizeof(u8);
-			if				(size>=256)			{
-				Debug.fatal	(DEBUG_INFO,"Object [%s][%d] exceed network-data limit\n size=%d, Pend=%d, Pstart=%d",
-					*P->cName(), P->ID(), size, Packet.w_tell(), position);
-			}
+            u32 size = u32(Packet.w_tell() - position) - sizeof(u8);
+            if (size >= 256)
+            {
+                Debug.fatal(DEBUG_INFO, "Object [%s][%d] exceed network-data limit\n size=%d, Pend=%d, Pstart=%d",
+                            *P->cName(), P->ID(), size, Packet.w_tell(), position);
+            }
 #endif
-			if (g_Dump_Export_Obj)
-			{
-				u32 size				= u32		(Packet.w_tell()-position)-sizeof(u8);
-				Msg("* %s : %d", *(P->cNameSect()), size);
-			}
-			Packet.w_chunk_close8	(position);
-//			if (0==(--count))		
-//				break;
-			if (max_object_size >= (NET_PacketSizeLimit - Packet.w_tell()))
-				break;
-		}
-	}
-	if (g_Dump_Export_Obj) Msg("------------------- ");
-	return	start+1;
+            if (g_Dump_Export_Obj)
+            {
+                u32 size = u32(Packet.w_tell() - position) - sizeof(u8);
+                Msg("* %s : %d", *(P->cNameSect()), size);
+            }
+            Packet.w_chunk_close8(position);
+            // if (0==(--count))
+            // break;
+            if (max_object_size >= (NET_PacketSizeLimit - Packet.w_tell()))
+                break;
+        }
+    }
+    if (g_Dump_Export_Obj) Msg("------------------- ");
+    return start + 1;
 }
 
-int	g_Dump_Import_Obj = 0;
+int g_Dump_Import_Obj = 0;
 
-void CObjectList::net_Import		(NET_Packet* Packet)
+void CObjectList::net_Import(NET_Packet* Packet)
 {
-	if (g_Dump_Import_Obj) Msg("---- net_import --- ");
+    if (g_Dump_Import_Obj) Msg("---- net_import --- ");
+
+    while (!Packet->r_eof())
+    {
+        u16 ID;
+        Packet->r_u16(ID);
+        u8 size;
+        Packet->r_u8(size);
+        CObject* P = net_Find(ID);
+        if (P)
+        {
 
-	while (!Packet->r_eof())
-	{
-		u16 ID;		Packet->r_u16	(ID);
-		u8  size;	Packet->r_u8	(size);
-		CObject* P  = net_Find		(ID);
-		if (P)		
-		{
+            u32 rsize = Packet->r_tell();
 
-			u32 rsize = Packet->r_tell();			
-			
-			P->net_Import	(*Packet);
+            P->net_Import(*Packet);
 
-			if (g_Dump_Import_Obj) Msg("* %s : %d - %d", *(P->cNameSect()), size, Packet->r_tell() - rsize);
+            if (g_Dump_Import_Obj) Msg("* %s : %d - %d", *(P->cNameSect()), size, Packet->r_tell() - rsize);
 
-		}
-		else		Packet->r_advance(size);
-	}
+        }
+        else Packet->r_advance(size);
+    }
 
-	if (g_Dump_Import_Obj) Msg("------------------- ");
+    if (g_Dump_Import_Obj) Msg("------------------- ");
 }
 
 /*
 CObject* CObjectList::net_Find(u16 ID)
 {
 
-	xr_map<u32,CObject*>::iterator	it = map_NETID.find(ID);
-	return (it==map_NETID.end())?0:it->second;
+xr_map<u32,CObject*>::iterator it = map_NETID.find(ID);
+return (it==map_NETID.end())?0:it->second;
 }
 */
-void CObjectList::Load		()
+void CObjectList::Load()
 {
-	R_ASSERT				(/*map_NETID.empty() &&*/ objects_active.empty() && destroy_queue.empty() && objects_sleeping.empty());
+    R_ASSERT(/*map_NETID.empty() &&*/ objects_active.empty() && destroy_queue.empty() && objects_sleeping.empty());
 }
 
-void CObjectList::Unload	( )
+void CObjectList::Unload()
 {
-	if (objects_sleeping.size() || objects_active.size())
-		Msg			("! objects-leaked: %d",objects_sleeping.size() + objects_active.size());
-
-	// Destroy objects
-	while (objects_sleeping.size())
-	{
-		CObject*	O	= objects_sleeping.back	();
-		Msg				("! [%x] s[%4d]-[%s]-[%s]", O, O->ID(), *O->cNameSect(), *O->cName());
-		O->setDestroy	( true );
-		
+    if (objects_sleeping.size() || objects_active.size())
+        Msg("! objects-leaked: %d", objects_sleeping.size() + objects_active.size());
+
+    // Destroy objects
+    while (objects_sleeping.size())
+    {
+        CObject* O = objects_sleeping.back();
+        Msg("! [%x] s[%4d]-[%s]-[%s]", O, O->ID(), *O->cNameSect(), *O->cName());
+        O->setDestroy(true);
+
 #ifdef DEBUG
-		if( debug_destroy )
-			Msg				("Destroying object [%d][%s]",O->ID(),*O->cName());
+        if (debug_destroy)
+            Msg("Destroying object [%d][%s]", O->ID(), *O->cName());
 #endif
-		O->net_Destroy	(   );
-		Destroy			( O );
-	}
-	while (objects_active.size())
-	{
-		CObject*	O	= objects_active.back	();
-		Msg				("! [%x] a[%4d]-[%s]-[%s]", O, O->ID(), *O->cNameSect(), *O->cName());
-		O->setDestroy	( true );
+        O->net_Destroy();
+        Destroy(O);
+    }
+    while (objects_active.size())
+    {
+        CObject* O = objects_active.back();
+        Msg("! [%x] a[%4d]-[%s]-[%s]", O, O->ID(), *O->cNameSect(), *O->cName());
+        O->setDestroy(true);
 
 #ifdef DEBUG
-		if( debug_destroy )
-			Msg				("Destroying object [%d][%s]",O->ID(),*O->cName());
+        if (debug_destroy)
+            Msg("Destroying object [%d][%s]", O->ID(), *O->cName());
 #endif
-		O->net_Destroy	(   );
-		Destroy			( O );
-	}
+        O->net_Destroy();
+        Destroy(O);
+    }
 }
 
-CObject*	CObjectList::Create				( LPCSTR	name	)
+CObject* CObjectList::Create(LPCSTR name)
 {
-	CObject*	O				= g_pGamePersistent->ObjectPool.create(name);
-//	Msg("CObjectList::Create [%x]%s", O, name);
-	objects_sleeping.push_back	(O);
-	return						O;
+    CObject* O = g_pGamePersistent->ObjectPool.create(name);
+    // Msg("CObjectList::Create [%x]%s", O, name);
+    objects_sleeping.push_back(O);
+    return O;
 }
 
-void		CObjectList::Destroy			( CObject*	O		)
+void CObjectList::Destroy(CObject* O)
 {
-	if (0==O)								return;
-	net_Unregister							(O);
-
-	if ( !Device.Paused() ) {
-		if ( !m_crows[1].empty() ) {
-			Msg								( "assertion !m_crows[1].empty() failed: %d", m_crows[1].size() );
-
-			Objects::const_iterator i		= m_crows[1].begin( );
-			Objects::const_iterator	const e	= m_crows[1].end( );
-			for (u32 j=0; i != e; ++i, ++j )
-				Msg							( "%d %s", j, (*i)->cName().c_str() );
-			VERIFY							( Device.Paused() || m_crows[1].empty() );
-			m_crows[1].clear_not_free		();
-		}
-	}
-	else {
-		Objects& crows				= m_crows[1];
-		Objects::iterator const i	= std::find(crows.begin(),crows.end(),O);
-		if	( i != crows.end() ) {
-			crows.erase				( i);
-			VERIFY					( std::find(crows.begin(), crows.end(),O) == crows.end() );
-		}
-	}
-
-	Objects& crows				= m_crows[0];
-	Objects::iterator _i0		= std::find(crows.begin(),crows.end(),O);
-	if	(_i0!=crows.end()) {
-		crows.erase				(_i0);
-		VERIFY					( std::find(crows.begin(), crows.end(),O) == crows.end() );
-	}
-
-	// active/inactive
-	Objects::iterator _i		= std::find(objects_active.begin(),objects_active.end(),O);
-	if	(_i!=objects_active.end()) {
-		objects_active.erase				(_i);
-		VERIFY								( std::find(objects_active.begin(),objects_active.end(),O) == objects_active.end() );
-		VERIFY								(
-			std::find(
-				objects_sleeping.begin(),
-				objects_sleeping.end(),
-				O
-			) == objects_sleeping.end()
-		);
-	}
-	else {
-		Objects::iterator _ii	= std::find(objects_sleeping.begin(),objects_sleeping.end(),O);
-		if	(_ii!=objects_sleeping.end()) {
-			objects_sleeping.erase			(_ii);
-			VERIFY							( std::find(objects_sleeping.begin(),objects_sleeping.end(),O) == objects_sleeping.end() );
-		}
-		else
-			FATAL							("! Unregistered object being destroyed");
-	}
-
-	g_pGamePersistent->ObjectPool.destroy	(O);
+    if (0 == O) return;
+    net_Unregister(O);
+
+    if (!Device.Paused())
+    {
+        if (!m_crows[1].empty())
+        {
+            Msg("assertion !m_crows[1].empty() failed: %d", m_crows[1].size());
+
+            Objects::const_iterator i = m_crows[1].begin();
+            Objects::const_iterator const e = m_crows[1].end();
+            for (u32 j = 0; i != e; ++i, ++j)
+                Msg("%d %s", j, (*i)->cName().c_str());
+            VERIFY(Device.Paused() || m_crows[1].empty());
+            m_crows[1].clear_not_free();
+        }
+    }
+    else
+    {
+        Objects& crows = m_crows[1];
+        Objects::iterator const i = std::find(crows.begin(), crows.end(), O);
+        if (i != crows.end())
+        {
+            crows.erase(i);
+            VERIFY(std::find(crows.begin(), crows.end(), O) == crows.end());
+        }
+    }
+
+    Objects& crows = m_crows[0];
+    Objects::iterator _i0 = std::find(crows.begin(), crows.end(), O);
+    if (_i0 != crows.end())
+    {
+        crows.erase(_i0);
+        VERIFY(std::find(crows.begin(), crows.end(), O) == crows.end());
+    }
+
+    // active/inactive
+    Objects::iterator _i = std::find(objects_active.begin(), objects_active.end(), O);
+    if (_i != objects_active.end())
+    {
+        objects_active.erase(_i);
+        VERIFY(std::find(objects_active.begin(), objects_active.end(), O) == objects_active.end());
+        VERIFY(
+            std::find(
+                objects_sleeping.begin(),
+                objects_sleeping.end(),
+                O
+            ) == objects_sleeping.end()
+        );
+    }
+    else
+    {
+        Objects::iterator _ii = std::find(objects_sleeping.begin(), objects_sleeping.end(), O);
+        if (_ii != objects_sleeping.end())
+        {
+            objects_sleeping.erase(_ii);
+            VERIFY(std::find(objects_sleeping.begin(), objects_sleeping.end(), O) == objects_sleeping.end());
+        }
+        else
+            FATAL("! Unregistered object being destroyed");
+    }
+
+    g_pGamePersistent->ObjectPool.destroy(O);
 }
 
-void CObjectList::relcase_register		(RELCASE_CALLBACK cb, int *ID)
+void CObjectList::relcase_register(RELCASE_CALLBACK cb, int* ID)
 {
 #ifdef DEBUG
-	RELCASE_CALLBACK_VEC::iterator It = std::find(	m_relcase_callbacks.begin(),
-													m_relcase_callbacks.end(),
-													cb);
-	VERIFY(It==m_relcase_callbacks.end());
+    RELCASE_CALLBACK_VEC::iterator It = std::find(m_relcase_callbacks.begin(),
+                                        m_relcase_callbacks.end(),
+                                        cb);
+    VERIFY(It == m_relcase_callbacks.end());
 #endif
-	*ID								= m_relcase_callbacks.size();
-	m_relcase_callbacks.push_back	(SRelcasePair(ID,cb));
+    *ID = m_relcase_callbacks.size();
+    m_relcase_callbacks.push_back(SRelcasePair(ID, cb));
 }
 
-void CObjectList::relcase_unregister	(int* ID)
+void CObjectList::relcase_unregister(int* ID)
 {
-	VERIFY							(m_relcase_callbacks[*ID].m_ID==ID);
-	m_relcase_callbacks[*ID]		= m_relcase_callbacks.back();
-	*m_relcase_callbacks.back().m_ID= *ID;
-	m_relcase_callbacks.pop_back	();
+    VERIFY(m_relcase_callbacks[*ID].m_ID == ID);
+    m_relcase_callbacks[*ID] = m_relcase_callbacks.back();
+    *m_relcase_callbacks.back().m_ID = *ID;
+    m_relcase_callbacks.pop_back();
 }
 
 void CObjectList::dump_list(Objects& v, LPCSTR reason)
 {
-	Objects::iterator it = v.begin();
-	Objects::iterator it_e = v.end();
+    Objects::iterator it = v.begin();
+    Objects::iterator it_e = v.end();
 #ifdef DEBUG
-	Msg("----------------dump_list [%s]",reason);
-	for(;it!=it_e;++it)
-		Msg("%x - name [%s] ID[%d] parent[%s] getDestroy()=[%s]", 
-			(*it),
-			(*it)->cName().c_str(), 
-			(*it)->ID(), 
-			((*it)->H_Parent())?(*it)->H_Parent()->cName().c_str():"", 
-			((*it)->getDestroy())?"yes":"no" );
+    Msg("----------------dump_list [%s]", reason);
+    for (; it != it_e; ++it)
+        Msg("%x - name [%s] ID[%d] parent[%s] getDestroy()=[%s]",
+            (*it),
+            (*it)->cName().c_str(),
+            (*it)->ID(),
+            ((*it)->H_Parent()) ? (*it)->H_Parent()->cName().c_str() : "",
+            ((*it)->getDestroy()) ? "yes" : "no");
 #endif // #ifdef DEBUG
 }
 
 bool CObjectList::dump_all_objects()
 {
-	dump_list(destroy_queue,"destroy_queue");
-	dump_list(objects_active,"objects_active");
-	dump_list(objects_sleeping,"objects_sleeping");
-	dump_list(m_crows[0],"m_crows[0]");
-	dump_list(m_crows[1],"m_crows[1]");
-	return false;
+    dump_list(destroy_queue, "destroy_queue");
+    dump_list(objects_active, "objects_active");
+    dump_list(objects_sleeping, "objects_sleeping");
+    dump_list(m_crows[0], "m_crows[0]");
+    dump_list(m_crows[1], "m_crows[1]");
+    return false;
 }
 
-void CObjectList::register_object_to_destroy(CObject *object_to_destroy)
+void CObjectList::register_object_to_destroy(CObject* object_to_destroy)
 {
-	VERIFY					(!registered_object_to_destroy(object_to_destroy));
-//	Msg("CObjectList::register_object_to_destroy [%x]", object_to_destroy);
-	destroy_queue.push_back	(object_to_destroy);
-
-	Objects::iterator it	= objects_active.begin();
-	Objects::iterator it_e	= objects_active.end();
-	for(;it!=it_e;++it)
-	{
-		CObject* O = *it;
-		if(!O->getDestroy() && O->H_Parent()==object_to_destroy)
-		{
-			Msg("setDestroy called, but not-destroyed child found parent[%d] child[%d]",object_to_destroy->ID(), O->ID(), Device.dwFrame);
-			O->setDestroy(TRUE);
-		}
-	}
-
-	it		= objects_sleeping.begin();
-	it_e	= objects_sleeping.end();
-	for(;it!=it_e;++it)
-	{
-		CObject* O = *it;
-		if(!O->getDestroy() && O->H_Parent()==object_to_destroy)
-		{
-			Msg("setDestroy called, but not-destroyed child found parent[%d] child[%d]",object_to_destroy->ID(), O->ID(), Device.dwFrame);
-			O->setDestroy(TRUE);
-		}
-	}
+    VERIFY(!registered_object_to_destroy(object_to_destroy));
+    // Msg("CObjectList::register_object_to_destroy [%x]", object_to_destroy);
+    destroy_queue.push_back(object_to_destroy);
+
+    Objects::iterator it = objects_active.begin();
+    Objects::iterator it_e = objects_active.end();
+    for (; it != it_e; ++it)
+    {
+        CObject* O = *it;
+        if (!O->getDestroy() && O->H_Parent() == object_to_destroy)
+        {
+            Msg("setDestroy called, but not-destroyed child found parent[%d] child[%d]", object_to_destroy->ID(), O->ID(), Device.dwFrame);
+            O->setDestroy(TRUE);
+        }
+    }
+
+    it = objects_sleeping.begin();
+    it_e = objects_sleeping.end();
+    for (; it != it_e; ++it)
+    {
+        CObject* O = *it;
+        if (!O->getDestroy() && O->H_Parent() == object_to_destroy)
+        {
+            Msg("setDestroy called, but not-destroyed child found parent[%d] child[%d]", object_to_destroy->ID(), O->ID(), Device.dwFrame);
+            O->setDestroy(TRUE);
+        }
+    }
 }
 
 #ifdef DEBUG
-bool CObjectList::registered_object_to_destroy	(const CObject *object_to_destroy) const
+bool CObjectList::registered_object_to_destroy(const CObject* object_to_destroy) const
 {
-	return					(
-		std::find(
-			destroy_queue.begin(),
-			destroy_queue.end(),
-			object_to_destroy
-		) != 
-		destroy_queue.end()
-	);
+    return (
+               std::find(
+                   destroy_queue.begin(),
+                   destroy_queue.end(),
+                   object_to_destroy
+               ) !=
+               destroy_queue.end()
+           );
 }
 #endif // DEBUG
\ No newline at end of file
diff --git a/src/xrEngine/xr_object_list.h b/src/xrEngine/xr_object_list.h
index 37f4a47a2a4..6acbc4a231a 100644
--- a/src/xrEngine/xr_object_list.h
+++ b/src/xrEngine/xr_object_list.h
@@ -2,100 +2,102 @@
 #define __XR_OBJECT_LIST_H__
 
 // refs
-class	ENGINE_API	CObject;
-class	NET_Packet	;
+class ENGINE_API CObject;
+class NET_Packet;
 
-class	ENGINE_API 				CObjectList
+class ENGINE_API CObjectList
 {
 private:
-	// data
-//.	xr_map<u32,CObject*>		map_NETID;
-	CObject*					map_NETID[0xffff];
+    // data
+    //. xr_map<u32,CObject*> map_NETID;
+    CObject* map_NETID[0xffff];
 
 private:
-	typedef xr_vector<CObject*>	Objects;
+    typedef xr_vector<CObject*> Objects;
 
 private:
-	Objects						destroy_queue;
-	Objects						objects_active;
-	Objects						objects_sleeping;
-	Objects						m_crows[2];
-	u32							m_owner_thread_id;
+    Objects destroy_queue;
+    Objects objects_active;
+    Objects objects_sleeping;
+    Objects m_crows[2];
+    u32 m_owner_thread_id;
 
 public:
-	typedef fastdelegate::FastDelegate1<CObject*>	RELCASE_CALLBACK;
-	struct SRelcasePair{
-		int*					m_ID;
-		RELCASE_CALLBACK		m_Callback;
-								SRelcasePair		(int* id, RELCASE_CALLBACK cb):m_ID(id),m_Callback(cb){}
-						bool	operator==			(RELCASE_CALLBACK cb) {return m_Callback == cb;}
-	};
-	typedef xr_vector<SRelcasePair>					RELCASE_CALLBACK_VEC;
-	RELCASE_CALLBACK_VEC							m_relcase_callbacks;
-
-	void						relcase_register	(RELCASE_CALLBACK,int*);
-	void						relcase_unregister	(int*);
+    typedef fastdelegate::FastDelegate1<CObject*> RELCASE_CALLBACK;
+    struct SRelcasePair
+    {
+        int* m_ID;
+        RELCASE_CALLBACK m_Callback;
+        SRelcasePair(int* id, RELCASE_CALLBACK cb) :m_ID(id), m_Callback(cb) {}
+        bool operator== (RELCASE_CALLBACK cb) { return m_Callback == cb; }
+    };
+    typedef xr_vector<SRelcasePair> RELCASE_CALLBACK_VEC;
+    RELCASE_CALLBACK_VEC m_relcase_callbacks;
+
+    void relcase_register(RELCASE_CALLBACK, int*);
+    void relcase_unregister(int*);
 
 public:
-	// methods
-								CObjectList			( );
-								~CObjectList		( );
-
-	CObject*					FindObjectByName	( shared_str	name	);
-	CObject*					FindObjectByName	( LPCSTR		name	);
-	CObject*					FindObjectByCLS_ID	( CLASS_ID		cls		);
-
-	void						Load				( );
-	void						Unload				( );
-
-	CObject*					Create				( LPCSTR		name	);
-	void						Destroy				( CObject*		O		);
-
-	void						SingleUpdate		( CObject*		O		);
-	void						Update				( bool bForce );
-
-	void						net_Register		( CObject*		O		);
-	void						net_Unregister		( CObject*		O		);
-
-	u32							net_Export			( NET_Packet*	P,		u32 _start, u32 _count	);	// return next start
-	void						net_Import			( NET_Packet*	P		);
-
-	ICF CObject*				net_Find			( u16 ID				) const
-	{
-		if ( ID == u16(-1) )
-			return				( 0 );
-		
-		return					( map_NETID[ID] );
-	}
-
-			void				o_crow				(CObject*	O);
-	void						o_remove			( Objects&	v,  CObject*	O);
-	void						o_activate			( CObject*		O		);
-	void						o_sleep				( CObject*		O		);
-	IC u32						o_count				()	{ return objects_active.size()+objects_sleeping.size(); };
-	IC CObject*					o_get_by_iterator	(u32 _it)	{
-		if (_it<objects_active.size())	return objects_active	[_it];
-		else							return objects_sleeping	[_it-objects_active.size()];
-	}
-	bool						dump_all_objects	();
+    // methods
+    CObjectList();
+    ~CObjectList();
+
+    CObject* FindObjectByName(shared_str name);
+    CObject* FindObjectByName(LPCSTR name);
+    CObject* FindObjectByCLS_ID(CLASS_ID cls);
+
+    void Load();
+    void Unload();
+
+    CObject* Create(LPCSTR name);
+    void Destroy(CObject* O);
+
+    void SingleUpdate(CObject* O);
+    void Update(bool bForce);
+
+    void net_Register(CObject* O);
+    void net_Unregister(CObject* O);
+
+    u32 net_Export(NET_Packet* P, u32 _start, u32 _count); // return next start
+    void net_Import(NET_Packet* P);
+
+    ICF CObject* net_Find(u16 ID) const
+    {
+        if (ID == u16(-1))
+            return (0);
+
+        return (map_NETID[ID]);
+    }
+
+    void o_crow(CObject* O);
+    void o_remove(Objects& v, CObject* O);
+    void o_activate(CObject* O);
+    void o_sleep(CObject* O);
+    IC u32 o_count() { return objects_active.size() + objects_sleeping.size(); };
+    IC CObject* o_get_by_iterator(u32 _it)
+    {
+        if (_it < objects_active.size()) return objects_active[_it];
+        else return objects_sleeping[_it - objects_active.size()];
+    }
+    bool dump_all_objects();
 
 public:
-			void				register_object_to_destroy	(CObject *object_to_destroy);
+    void register_object_to_destroy(CObject* object_to_destroy);
 #ifdef DEBUG
-			bool				registered_object_to_destroy(const CObject *object_to_destroy) const;
+    bool registered_object_to_destroy(const CObject* object_to_destroy) const;
 #endif // #ifdef DEBUG
 
 private:
-	IC		Objects&			get_crows			()
-	{
-		if (GetCurrentThreadId() == m_owner_thread_id)
-			return				(m_crows[0]);
+    IC Objects& get_crows()
+    {
+        if (GetCurrentThreadId() == m_owner_thread_id)
+            return (m_crows[0]);
 
-		return					(m_crows[1]);
-	}
+        return (m_crows[1]);
+    }
 
-	static	void				clear_crow_vec		(Objects& o);
-	static	void				dump_list			(Objects& v, LPCSTR reason);
+    static void clear_crow_vec(Objects& o);
+    static void dump_list(Objects& v, LPCSTR reason);
 };
 
 #endif //__XR_OBJECT_LIST_H__