copied refactor to trunk

1 files changed, 34 insertions, 35 deletions

diff --git a/src/game/client/components/damageind.cpp b/src/game/client/components/damageind.cpp
index 7f1991dc..8dfbf022 100644
--- a/src/game/client/components/damageind.cpp
+++ b/src/game/client/components/damageind.cpp
@@ -1,65 +1,64 @@
-#include <engine/e_client_interface.h>
-#include <engine/client/graphics.h>
-#include <game/generated/g_protocol.hpp>
-#include <game/generated/gc_data.hpp>
+#include <engine/graphics.h>
+#include <game/generated/protocol.h>
+#include <game/generated/client_data.h>
 
-#include <game/gamecore.hpp> // get_angle
-#include <game/client/ui.hpp>
-#include <game/client/render.hpp>
-#include "damageind.hpp"
+#include <game/gamecore.h> // get_angle
+#include <game/client/ui.h>
+#include <game/client/render.h>
+#include "damageind.h"
 
-DAMAGEIND::DAMAGEIND()
+CDamageInd::CDamageInd()
 {
-	lastupdate = 0;
-	num_items = 0;
+	m_Lastupdate = 0;
+	m_NumItems = 0;
 }
 
-DAMAGEIND::ITEM *DAMAGEIND::create_i()
+CDamageInd::CItem *CDamageInd::CreateI()
 {
-	if (num_items < MAX_ITEMS)
+	if (m_NumItems < MAX_ITEMS)
 	{
-		ITEM *p = &items[num_items];
-		num_items++;
+		CItem *p = &m_aItems[m_NumItems];
+		m_NumItems++;
 		return p;
 	}
 	return 0;
 }
 
-void DAMAGEIND::destroy_i(DAMAGEIND::ITEM *i)
+void CDamageInd::DestroyI(CDamageInd::CItem *i)
 {
-	num_items--;
-	*i = items[num_items];
+	m_NumItems--;
+	*i = m_aItems[m_NumItems];
 }
 
-void DAMAGEIND::create(vec2 pos, vec2 dir)
+void CDamageInd::Create(vec2 Pos, vec2 Dir)
 {
-	ITEM *i = create_i();
+	CItem *i = CreateI();
 	if (i)
 	{
-		i->pos = pos;
-		i->life = 0.75f;
-		i->dir = dir*-1;
-		i->startangle = (( (float)rand()/(float)RAND_MAX) - 1.0f) * 2.0f * pi;
+		i->m_Pos = Pos;
+		i->m_Life = 0.75f;
+		i->m_Dir = Dir*-1;
+		i->m_StartAngle = (( (float)rand()/(float)RAND_MAX) - 1.0f) * 2.0f * pi;
 	}
 }
 
-void DAMAGEIND::on_render()
+void CDamageInd::OnRender()
 {
-	Graphics()->TextureSet(data->images[IMAGE_GAME].id);
+	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_GAME].m_Id);
 	Graphics()->QuadsBegin();
-	for(int i = 0; i < num_items;)
+	for(int i = 0; i < m_NumItems;)
 	{
-		vec2 pos = mix(items[i].pos+items[i].dir*75.0f, items[i].pos, clamp((items[i].life-0.60f)/0.15f, 0.0f, 1.0f));
+		vec2 Pos = mix(m_aItems[i].m_Pos+m_aItems[i].m_Dir*75.0f, m_aItems[i].m_Pos, clamp((m_aItems[i].m_Life-0.60f)/0.15f, 0.0f, 1.0f));
 
-		items[i].life -= client_frametime();
-		if(items[i].life < 0.0f)
-			destroy_i(&items[i]);
+		m_aItems[i].m_Life -= Client()->FrameTime();
+		if(m_aItems[i].m_Life < 0.0f)
+			DestroyI(&m_aItems[i]);
 		else
 		{
-			Graphics()->SetColor(1.0f,1.0f,1.0f, items[i].life/0.1f);
-			Graphics()->QuadsSetRotation(items[i].startangle + items[i].life * 2.0f);
-			RenderTools()->select_sprite(SPRITE_STAR1);
-			RenderTools()->draw_sprite(pos.x, pos.y, 48.0f);
+			Graphics()->SetColor(1.0f,1.0f,1.0f, m_aItems[i].m_Life/0.1f);
+			Graphics()->QuadsSetRotation(m_aItems[i].m_StartAngle + m_aItems[i].m_Life * 2.0f);
+			RenderTools()->SelectSprite(SPRITE_STAR1);
+			RenderTools()->DrawSprite(Pos.x, Pos.y, 48.0f);
 			i++;
 		}
 	}