diff options
| author | Joel de Vahl <joel@stalverk80.se> | 2007-07-21 20:28:57 +0000 |
|---|---|---|
| committer | Joel de Vahl <joel@stalverk80.se> | 2007-07-21 20:28:57 +0000 |
| commit | 6ea62845b975cfa4b0838718aa79342f7f4aad39 (patch) | |
| tree | 0bbf9bda786a210c9e7bebd5e4599f4b9bcf408a /src | |
| parent | f205a2c65f9f3fffe55750e3c8319dd8659fa4fd (diff) | |
| download | zcatch-6ea62845b975cfa4b0838718aa79342f7f4aad39.tar.gz zcatch-6ea62845b975cfa4b0838718aa79342f7f4aad39.zip | |
Working editor.
Diffstat (limited to 'src')
| -rw-r--r-- | src/editor/editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp index 2ad77423..b76dd714 100644 --- a/src/editor/editor.cpp +++ b/src/editor/editor.cpp @@ -293,7 +293,7 @@ static int tilesets_set_img(int index, int w, int h, void *data) if(tilesets[index].img.data) mem_free(tilesets[index].img.data); tilesets[index].img.data = data; - tilesets[index].tex_id = gfx_load_texture_raw(w, h, IMG_BGRA, data); + tilesets[index].tex_id = gfx_load_texture_raw(w, h, IMG_RGBA, data); return index; } @@ -636,7 +636,7 @@ static void editor_listdir_callback(const char *name, int is_dir, void *user) sprintf(buf, "tilesets/%s", name); image_info img; - if(!gfx_load_tga(&img, buf)) + if(!gfx_load_png(&img, buf)) return; tilesets_set_img(editor_loadimage, img.width, img.height, img.data); |