1 files changed, 24 insertions, 23 deletions

diff --git a/src/game/client/components/killmessages.cpp b/src/game/client/components/killmessages.cpp
index 410f2c3d..e6232b7d 100644
--- a/src/game/client/components/killmessages.cpp
+++ b/src/game/client/components/killmessages.cpp
@@ -1,4 +1,5 @@
 #include <engine/e_client_interface.h>
+#include <engine/client/graphics.h>
 #include <game/generated/g_protocol.hpp>
 #include <game/generated/gc_data.hpp>
 
@@ -35,10 +36,10 @@ void KILLMESSAGES::on_message(int msgtype, void *rawmsg)
 
 void KILLMESSAGES::on_render()
 {
-	float width = 400*3.0f*gfx_screenaspect();
+	float width = 400*3.0f*Graphics()->ScreenAspect();
 	float height = 400*3.0f;
 
-	gfx_mapscreen(0, 0, width*1.5f, height*1.5f);
+	Graphics()->MapScreen(0, 0, width*1.5f, height*1.5f);
 	float startx = width*1.5f-10.0f;
 	float y = 20.0f;
 
@@ -66,31 +67,31 @@ void KILLMESSAGES::on_render()
 		{
 			if(killmsgs[r].mode_special&1)
 			{
-				gfx_blend_normal();
-				gfx_texture_set(data->images[IMAGE_GAME].id);
-				gfx_quads_begin();
+				Graphics()->BlendNormal();
+				Graphics()->TextureSet(data->images[IMAGE_GAME].id);
+				Graphics()->QuadsBegin();
 
-				if(gameclient.clients[killmsgs[r].victim].team == 0) select_sprite(SPRITE_FLAG_BLUE);
-				else select_sprite(SPRITE_FLAG_RED);
+				if(gameclient.clients[killmsgs[r].victim].team == 0) RenderTools()->select_sprite(SPRITE_FLAG_BLUE);
+				else RenderTools()->select_sprite(SPRITE_FLAG_RED);
 				
 				float size = 56.0f;
-				gfx_quads_drawTL(x, y-16, size/2, size);
-				gfx_quads_end();					
+				Graphics()->QuadsDrawTL(x, y-16, size/2, size);
+				Graphics()->QuadsEnd();					
 			}
 		}
 		
-		render_tee(ANIMSTATE::get_idle(), &gameclient.clients[killmsgs[r].victim].render_info, EMOTE_PAIN, vec2(-1,0), vec2(x, y+28));
+		RenderTools()->RenderTee(ANIMSTATE::get_idle(), &gameclient.clients[killmsgs[r].victim].render_info, EMOTE_PAIN, vec2(-1,0), vec2(x, y+28));
 		x -= 32.0f;
 		
 		// render weapon
 		x -= 44.0f;
 		if (killmsgs[r].weapon >= 0)
 		{
-			gfx_texture_set(data->images[IMAGE_GAME].id);
-			gfx_quads_begin();
-			select_sprite(data->weapons.id[killmsgs[r].weapon].sprite_body);
-			draw_sprite(x, y+28, 96);
-			gfx_quads_end();
+			Graphics()->TextureSet(data->images[IMAGE_GAME].id);
+			Graphics()->QuadsBegin();
+			RenderTools()->select_sprite(data->weapons.id[killmsgs[r].weapon].sprite_body);
+			RenderTools()->draw_sprite(x, y+28, 96);
+			Graphics()->QuadsEnd();
 		}
 		x -= 52.0f;
 
@@ -100,22 +101,22 @@ void KILLMESSAGES::on_render()
 			{
 				if(killmsgs[r].mode_special&2)
 				{
-					gfx_blend_normal();
-					gfx_texture_set(data->images[IMAGE_GAME].id);
-					gfx_quads_begin();
+					Graphics()->BlendNormal();
+					Graphics()->TextureSet(data->images[IMAGE_GAME].id);
+					Graphics()->QuadsBegin();
 
-					if(gameclient.clients[killmsgs[r].killer].team == 0) select_sprite(SPRITE_FLAG_BLUE, SPRITE_FLAG_FLIP_X);
-					else select_sprite(SPRITE_FLAG_RED, SPRITE_FLAG_FLIP_X);
+					if(gameclient.clients[killmsgs[r].killer].team == 0) RenderTools()->select_sprite(SPRITE_FLAG_BLUE, SPRITE_FLAG_FLIP_X);
+					else RenderTools()->select_sprite(SPRITE_FLAG_RED, SPRITE_FLAG_FLIP_X);
 					
 					float size = 56.0f;
-					gfx_quads_drawTL(x-56, y-16, size/2, size);
-					gfx_quads_end();				
+					Graphics()->QuadsDrawTL(x-56, y-16, size/2, size);
+					Graphics()->QuadsEnd();				
 				}
 			}				
 			
 			// render killer tee
 			x -= 24.0f;
-			render_tee(ANIMSTATE::get_idle(), &gameclient.clients[killmsgs[r].killer].render_info, EMOTE_ANGRY, vec2(1,0), vec2(x, y+28));
+			RenderTools()->RenderTee(ANIMSTATE::get_idle(), &gameclient.clients[killmsgs[r].killer].render_info, EMOTE_ANGRY, vec2(1,0), vec2(x, y+28));
 			x -= 32.0f;
 
 			// render killer name