edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed so that the client can handle external images

Browse source
This commit is contained in:
Magnus Auvinen 2008-01-19 16:23:05 +00:00
parent f9782f628f
commit 3b0941b190
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/maps/dm1.map Normal file
View file

Binary file not shown.

19
src/game/client/gc_map_image.cpp
View file

@ -1,4 +1,5 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
#include <stdio.h>
#include <engine/e_system.h>
#include <engine/e_client_interface.h>
#include <game/g_mapitems.h>
@ -97,7 +98,7 @@ int img_init()
if(map_textures[i])
{
gfx_unload_texture(map_textures[i]);
map_textures[i] = 0;
map_textures[i] = -1;
}
}
@ -105,9 +106,19 @@ int img_init()
for(int i = 0; i < count; i++)
{
MAPITEM_IMAGE *img = (MAPITEM_IMAGE *)map_get_item(start+i, 0, 0);
void *data = map_get_data(img->image_data);
map_textures[i] = gfx_load_texture_raw(img->width, img->height, IMG_RGBA, data, IMG_RGBA);
map_unload_data(img->image_data);
if(img->external)
{
char buf[256];
char *name = (char *)map_get_data(img->image_name);
sprintf(buf, "data/mapres/%s.png", name);
map_textures[i] = gfx_load_texture(buf, IMG_AUTO);
}
else
{
void *data = map_get_data(img->image_data);
map_textures[i] = gfx_load_texture_raw(img->width, img->height, IMG_RGBA, data, IMG_RGBA);
map_unload_data(img->image_data);
}
}
return count;