added "Whitespace and line Endings cleanup" by GreYFoX

1 files changed, 173 insertions, 173 deletions

diff --git a/src/game/client/ui.cpp b/src/game/client/ui.cpp
index 23643e2a..2161bc77 100644
--- a/src/game/client/ui.cpp
+++ b/src/game/client/ui.cpp
@@ -8,7 +8,7 @@
 #include "ui.h"
 
 /********************************************************
- UI                                                      
+ UI
 *********************************************************/
 
 CUI::CUI()
@@ -17,14 +17,14 @@ CUI::CUI()
 	m_pActiveItem = 0;
 	m_pLastActiveItem = 0;
 	m_pBecommingHotItem = 0;
-	
+
 	m_MouseX = 0;
 	m_MouseY = 0;
 	m_MouseWorldX = 0;
 	m_MouseWorldY = 0;
 	m_MouseButtons = 0;
-	m_LastMouseButtons = 0;	
-	
+	m_LastMouseButtons = 0;
+
 	m_Screen.x = 0;
 	m_Screen.y = 0;
 	m_Screen.w = 848.0f;
@@ -33,53 +33,53 @@ CUI::CUI()
 
 int CUI::Update(float Mx, float My, float Mwx, float Mwy, int Buttons)
 {
-    m_MouseX = Mx;
-    m_MouseY = My;
-    m_MouseWorldX = Mwx;
-    m_MouseWorldY = Mwy;
-    m_LastMouseButtons = m_MouseButtons;
-    m_MouseButtons = Buttons;
-    m_pHotItem = m_pBecommingHotItem;
-    if(m_pActiveItem)
-    	m_pHotItem = m_pActiveItem;
-    m_pBecommingHotItem = 0;
-    return 0;
+	m_MouseX = Mx;
+	m_MouseY = My;
+	m_MouseWorldX = Mwx;
+	m_MouseWorldY = Mwy;
+	m_LastMouseButtons = m_MouseButtons;
+	m_MouseButtons = Buttons;
+	m_pHotItem = m_pBecommingHotItem;
+	if(m_pActiveItem)
+		m_pHotItem = m_pActiveItem;
+	m_pBecommingHotItem = 0;
+	return 0;
 }
 
 int CUI::MouseInside(const CUIRect *r)
 {
-    if(m_MouseX >= r->x && m_MouseX <= r->x+r->w && m_MouseY >= r->y && m_MouseY <= r->y+r->h)
-        return 1;
-    return 0;
+	if(m_MouseX >= r->x && m_MouseX <= r->x+r->w && m_MouseY >= r->y && m_MouseY <= r->y+r->h)
+		return 1;
+	return 0;
 }
 
 CUIRect *CUI::Screen()
 {
-    float Aspect = Graphics()->ScreenAspect();
-    float w, h;
+	float Aspect = Graphics()->ScreenAspect();
+	float w, h;
 
-    h = 600;
-    w = Aspect*h;
+	h = 600;
+	w = Aspect*h;
 
-    m_Screen.w = w;
-    m_Screen.h = h;
+	m_Screen.w = w;
+	m_Screen.h = h;
 
-    return &m_Screen;
+	return &m_Screen;
 }
 
 void CUI::SetScale(float s)
 {
-    g_Config.m_UiScale = (int)(s*100.0f);
+	g_Config.m_UiScale = (int)(s*100.0f);
 }
 
 float CUI::Scale()
 {
-	return g_Config.m_UiScale/100.0f; 
+	return g_Config.m_UiScale/100.0f;
 }
 
 float CUIRect::Scale() const
 {
-	return g_Config.m_UiScale/100.0f; 
+	return g_Config.m_UiScale/100.0f;
 }
 
 void CUI::ClipEnable(const CUIRect *r)
@@ -97,175 +97,175 @@ void CUI::ClipDisable()
 void CUIRect::HSplitMid(CUIRect *pTop, CUIRect *pBottom) const
 {
 	CUIRect r = *this;
-    float Cut = r.h/2;
-
-    if(pTop)
-    {
-        pTop->x = r.x;
-        pTop->y = r.y;
-        pTop->w = r.w;
-        pTop->h = Cut;
-    }
-
-    if(pBottom)
-    {
-        pBottom->x = r.x;
-        pBottom->y = r.y + Cut;
-        pBottom->w = r.w;
-        pBottom->h = r.h - Cut;
-    }
+	float Cut = r.h/2;
+
+	if(pTop)
+	{
+		pTop->x = r.x;
+		pTop->y = r.y;
+		pTop->w = r.w;
+		pTop->h = Cut;
+	}
+
+	if(pBottom)
+	{
+		pBottom->x = r.x;
+		pBottom->y = r.y + Cut;
+		pBottom->w = r.w;
+		pBottom->h = r.h - Cut;
+	}
 }
 
 void CUIRect::HSplitTop(float Cut, CUIRect *pTop, CUIRect *pBottom) const
 {
-    CUIRect r = *this;
-    Cut *= Scale();
-
-    if (pTop)
-    {
-        pTop->x = r.x;
-        pTop->y = r.y;
-        pTop->w = r.w;
-        pTop->h = Cut;
-    }
-
-    if (pBottom)
-    {
-        pBottom->x = r.x;
-        pBottom->y = r.y + Cut;
-        pBottom->w = r.w;
-        pBottom->h = r.h - Cut;
-    }
+	CUIRect r = *this;
+	Cut *= Scale();
+
+	if (pTop)
+	{
+		pTop->x = r.x;
+		pTop->y = r.y;
+		pTop->w = r.w;
+		pTop->h = Cut;
+	}
+
+	if (pBottom)
+	{
+		pBottom->x = r.x;
+		pBottom->y = r.y + Cut;
+		pBottom->w = r.w;
+		pBottom->h = r.h - Cut;
+	}
 }
 
 void CUIRect::HSplitBottom(float Cut, CUIRect *pTop, CUIRect *pBottom) const
 {
-    CUIRect r = *this;
-    Cut *= Scale();
-
-    if (pTop)
-    {
-        pTop->x = r.x;
-        pTop->y = r.y;
-        pTop->w = r.w;
-        pTop->h = r.h - Cut;
-    }
-
-    if (pBottom)
-    {
-        pBottom->x = r.x;
-        pBottom->y = r.y + r.h - Cut;
-        pBottom->w = r.w;
-        pBottom->h = Cut;
-    }
+	CUIRect r = *this;
+	Cut *= Scale();
+
+	if (pTop)
+	{
+		pTop->x = r.x;
+		pTop->y = r.y;
+		pTop->w = r.w;
+		pTop->h = r.h - Cut;
+	}
+
+	if (pBottom)
+	{
+		pBottom->x = r.x;
+		pBottom->y = r.y + r.h - Cut;
+		pBottom->w = r.w;
+		pBottom->h = Cut;
+	}
 }
 
 
 void CUIRect::VSplitMid(CUIRect *pLeft, CUIRect *pRight) const
 {
-    CUIRect r = *this;
-    float Cut = r.w/2;
-//    Cut *= Scale();
-
-    if (pLeft)
-    {
-        pLeft->x = r.x;
-        pLeft->y = r.y;
-        pLeft->w = Cut;
-        pLeft->h = r.h;
-    }
-
-    if (pRight)
-    {
-        pRight->x = r.x + Cut;
-        pRight->y = r.y;
-        pRight->w = r.w - Cut;
-        pRight->h = r.h;
-    }
+	CUIRect r = *this;
+	float Cut = r.w/2;
+//	Cut *= Scale();
+
+	if (pLeft)
+	{
+		pLeft->x = r.x;
+		pLeft->y = r.y;
+		pLeft->w = Cut;
+		pLeft->h = r.h;
+	}
+
+	if (pRight)
+	{
+		pRight->x = r.x + Cut;
+		pRight->y = r.y;
+		pRight->w = r.w - Cut;
+		pRight->h = r.h;
+	}
 }
 
 void CUIRect::VSplitLeft(float Cut, CUIRect *pLeft, CUIRect *pRight) const
 {
-    CUIRect r = *this;
-    Cut *= Scale();
-
-    if (pLeft)
-    {
-        pLeft->x = r.x;
-        pLeft->y = r.y;
-        pLeft->w = Cut;
-        pLeft->h = r.h;
-    }
-
-    if (pRight)
-    {
-        pRight->x = r.x + Cut;
-        pRight->y = r.y;
-        pRight->w = r.w - Cut;
-        pRight->h = r.h;
-    }
+	CUIRect r = *this;
+	Cut *= Scale();
+
+	if (pLeft)
+	{
+		pLeft->x = r.x;
+		pLeft->y = r.y;
+		pLeft->w = Cut;
+		pLeft->h = r.h;
+	}
+
+	if (pRight)
+	{
+		pRight->x = r.x + Cut;
+		pRight->y = r.y;
+		pRight->w = r.w - Cut;
+		pRight->h = r.h;
+	}
 }
 
 void CUIRect::VSplitRight(float Cut, CUIRect *pLeft, CUIRect *pRight) const
 {
-    CUIRect r = *this;
-    Cut *= Scale();
-
-    if (pLeft)
-    {
-        pLeft->x = r.x;
-        pLeft->y = r.y;
-        pLeft->w = r.w - Cut;
-        pLeft->h = r.h;
-    }
-
-    if (pRight)
-    {
-        pRight->x = r.x + r.w - Cut;
-        pRight->y = r.y;
-        pRight->w = Cut;
-        pRight->h = r.h;
-    }
+	CUIRect r = *this;
+	Cut *= Scale();
+
+	if (pLeft)
+	{
+		pLeft->x = r.x;
+		pLeft->y = r.y;
+		pLeft->w = r.w - Cut;
+		pLeft->h = r.h;
+	}
+
+	if (pRight)
+	{
+		pRight->x = r.x + r.w - Cut;
+		pRight->y = r.y;
+		pRight->w = Cut;
+		pRight->h = r.h;
+	}
 }
 
 void CUIRect::Margin(float Cut, CUIRect *pOtherRect) const
 {
-    CUIRect r = *this;
+	CUIRect r = *this;
 	Cut *= Scale();
 
-    pOtherRect->x = r.x + Cut;
-    pOtherRect->y = r.y + Cut;
-    pOtherRect->w = r.w - 2*Cut;
-    pOtherRect->h = r.h - 2*Cut;
+	pOtherRect->x = r.x + Cut;
+	pOtherRect->y = r.y + Cut;
+	pOtherRect->w = r.w - 2*Cut;
+	pOtherRect->h = r.h - 2*Cut;
 }
 
 void CUIRect::VMargin(float Cut, CUIRect *pOtherRect) const
 {
-    CUIRect r = *this;
+	CUIRect r = *this;
 	Cut *= Scale();
 
-    pOtherRect->x = r.x + Cut;
-    pOtherRect->y = r.y;
-    pOtherRect->w = r.w - 2*Cut;
-    pOtherRect->h = r.h;
+	pOtherRect->x = r.x + Cut;
+	pOtherRect->y = r.y;
+	pOtherRect->w = r.w - 2*Cut;
+	pOtherRect->h = r.h;
 }
 
 void CUIRect::HMargin(float Cut, CUIRect *pOtherRect) const
 {
-    CUIRect r = *this;
+	CUIRect r = *this;
 	Cut *= Scale();
 
-    pOtherRect->x = r.x;
-    pOtherRect->y = r.y + Cut;
-    pOtherRect->w = r.w;
-    pOtherRect->h = r.h - 2*Cut;
+	pOtherRect->x = r.x;
+	pOtherRect->y = r.y + Cut;
+	pOtherRect->w = r.w;
+	pOtherRect->h = r.h - 2*Cut;
 }
 
 int CUI::DoButtonLogic(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
 {
-    // logic
-    int ReturnValue = 0;
-    int Inside = MouseInside(pRect);
+	// logic
+	int ReturnValue = 0;
+	int Inside = MouseInside(pRect);
 	static int ButtonUsed = 0;
 
 	if(ActiveItem() == pID)
@@ -284,25 +284,25 @@ int CUI::DoButtonLogic(const void *pID, const char *pText, int Checked, const CU
 			SetActiveItem(pID);
 			ButtonUsed = 0;
 		}
-		
+
 		if(MouseButton(1))
 		{
 			SetActiveItem(pID);
 			ButtonUsed = 1;
 		}
 	}
-	
+
 	if(Inside)
 		SetHotItem(pID);
 
-    return ReturnValue;
+	return ReturnValue;
 }
 /*
 int CUI::DoButton(const void *id, const char *text, int checked, const CUIRect *r, ui_draw_button_func draw_func, const void *extra)
 {
-    // logic
-    int ret = 0;
-    int inside = ui_MouseInside(r);
+	// logic
+	int ret = 0;
+	int inside = ui_MouseInside(r);
 	static int button_used = 0;
 
 	if(ui_ActiveItem() == id)
@@ -321,41 +321,41 @@ int CUI::DoButton(const void *id, const char *text, int checked, const CUIRect *
 			ui_SetActiveItem(id);
 			button_used = 0;
 		}
-		
+
 		if(ui_MouseButton(1))
 		{
 			ui_SetActiveItem(id);
 			button_used = 1;
 		}
 	}
-	
+
 	if(inside)
 		ui_SetHotItem(id);
 
 	if(draw_func)
-    	draw_func(id, text, checked, r, extra);
-    return ret;
+		draw_func(id, text, checked, r, extra);
+	return ret;
 }*/
 
 void CUI::DoLabel(const CUIRect *r, const char *pText, float Size, int Align, int MaxWidth)
 {
 	// TODO: FIX ME!!!!
-    //Graphics()->BlendNormal();
-    if(Align == 0)
-    {
-    	float tw = TextRender()->TextWidth(0, Size, pText, MaxWidth);
-    	TextRender()->Text(0, r->x + r->w/2-tw/2, r->y - Size/10, Size, pText, MaxWidth);
+	//Graphics()->BlendNormal();
+	if(Align == 0)
+	{
+		float tw = TextRender()->TextWidth(0, Size, pText, MaxWidth);
+		TextRender()->Text(0, r->x + r->w/2-tw/2, r->y - Size/10, Size, pText, MaxWidth);
 	}
 	else if(Align < 0)
-    	TextRender()->Text(0, r->x, r->y - Size/10, Size, pText, MaxWidth);
+		TextRender()->Text(0, r->x, r->y - Size/10, Size, pText, MaxWidth);
 	else if(Align > 0)
 	{
-    	float tw = TextRender()->TextWidth(0, Size, pText, MaxWidth);
-    	TextRender()->Text(0, r->x + r->w-tw, r->y - Size/10, Size, pText, MaxWidth);
+		float tw = TextRender()->TextWidth(0, Size, pText, MaxWidth);
+		TextRender()->Text(0, r->x + r->w-tw, r->y - Size/10, Size, pText, MaxWidth);
 	}
 }
 
 void CUI::DoLabelScaled(const CUIRect *r, const char *pText, float Size, int Align, int MaxWidth)
 {
-  DoLabel(r, pText, Size*Scale(), Align, MaxWidth);
+	DoLabel(r, pText, Size*Scale(), Align, MaxWidth);
 }
\ No newline at end of file