From 878ede3080ab2cfb627aca505c397d9765052996 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Tue, 27 Oct 2009 14:38:53 +0000 Subject: major update with stuff --- src/game/client/components/skins.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/game/client/components/skins.cpp') diff --git a/src/game/client/components/skins.cpp b/src/game/client/components/skins.cpp index 451a77f3..ad3607a1 100644 --- a/src/game/client/components/skins.cpp +++ b/src/game/client/components/skins.cpp @@ -6,12 +6,10 @@ #include #include +#include #include -extern "C" -{ - #include -} +#include #include "skins.hpp" @@ -32,13 +30,13 @@ void SKINS::skinscan(const char *name, int is_dir, void *user) char buf[512]; str_format(buf, sizeof(buf), "skins/%s", name); IMAGE_INFO info; - if(!gfx_load_png(&info, buf)) + if(!self->Graphics()->LoadPNG(&info, buf)) { dbg_msg("game", "failed to load skin from %s", name); return; } - self->skins[self->num_skins].org_texture = gfx_load_texture_raw(info.width, info.height, info.format, info.data, info.format, 0); + self->skins[self->num_skins].org_texture = self->Graphics()->LoadTextureRaw(info.width, info.height, info.format, info.data, info.format, 0); int body_size = 96; // body size unsigned char *d = (unsigned char *)info.data; @@ -111,7 +109,7 @@ void SKINS::skinscan(const char *name, int is_dir, void *user) } } - self->skins[self->num_skins].color_texture = gfx_load_texture_raw(info.width, info.height, info.format, info.data, info.format, 0); + self->skins[self->num_skins].color_texture = self->Graphics()->LoadTextureRaw(info.width, info.height, info.format, info.data, info.format, 0); mem_free(info.data); // set skin data -- cgit 1.4.1