From 1f246d9dcbc32e1049f4a8a6ac1777b313d9e547 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sat, 29 Mar 2008 11:55:42 +0000 Subject: fixed protection so that the fonts doesn't get resampled --- src/game/editor/ed_editor.cpp | 12 ++++++------ src/game/editor/ed_io.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/game/editor') diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 7ae46f0b..a7ef9576 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -1478,7 +1478,7 @@ static void replace_image(const char *filename) gfx_unload_texture(img->tex_id); *img = imginfo; extract_name(filename, img->name); - img->tex_id = gfx_load_texture_raw(imginfo.width, imginfo.height, imginfo.format, imginfo.data, IMG_AUTO); + img->tex_id = gfx_load_texture_raw(imginfo.width, imginfo.height, imginfo.format, imginfo.data, IMG_AUTO, 0); } static void add_image(const char *filename) @@ -1489,7 +1489,7 @@ static void add_image(const char *filename) IMAGE *img = new IMAGE; *img = imginfo; - img->tex_id = gfx_load_texture_raw(imginfo.width, imginfo.height, imginfo.format, imginfo.data, IMG_AUTO); + img->tex_id = gfx_load_texture_raw(imginfo.width, imginfo.height, imginfo.format, imginfo.data, IMG_AUTO, 0); img->external = 1; // external by default extract_name(filename, img->name); editor.map.images.add(img); @@ -2369,10 +2369,10 @@ void MAP::create_default(int entities_texture) extern "C" void editor_init() { - checker_texture = gfx_load_texture("data/editor/checker.png", IMG_AUTO); - background_texture = gfx_load_texture("data/editor/background.png", IMG_AUTO); - cursor_texture = gfx_load_texture("data/editor/cursor.png", IMG_AUTO); - entities_texture = gfx_load_texture("data/editor/entities.png", IMG_AUTO); + checker_texture = gfx_load_texture("data/editor/checker.png", IMG_AUTO, 0); + background_texture = gfx_load_texture("data/editor/background.png", IMG_AUTO, 0); + cursor_texture = gfx_load_texture("data/editor/cursor.png", IMG_AUTO, 0); + entities_texture = gfx_load_texture("data/editor/entities.png", IMG_AUTO, 0); tileset_picker.make_palette(); tileset_picker.readonly = true; diff --git a/src/game/editor/ed_io.cpp b/src/game/editor/ed_io.cpp index 3fd4fcac..9e0cd4a3 100644 --- a/src/game/editor/ed_io.cpp +++ b/src/game/editor/ed_io.cpp @@ -141,7 +141,7 @@ void editor_load_old(DATAFILE *df, MAP *map) // copy image data img->data = mem_alloc(img->width*img->height*4, 1); mem_copy(img->data, data, img->width*img->height*4); - img->tex_id = gfx_load_texture_raw(img->width, img->height, img->format, img->data, IMG_AUTO); + img->tex_id = gfx_load_texture_raw(img->width, img->height, img->format, img->data, IMG_AUTO, 0); map->images.add(img); // unload image @@ -405,7 +405,7 @@ int MAP::load(const char *filename) if(gfx_load_png(&imginfo, buf)) { *img = imginfo; - img->tex_id = gfx_load_texture_raw(imginfo.width, imginfo.height, imginfo.format, imginfo.data, IMG_AUTO); + img->tex_id = gfx_load_texture_raw(imginfo.width, imginfo.height, imginfo.format, imginfo.data, IMG_AUTO, 0); img->external = 1; } } @@ -419,7 +419,7 @@ int MAP::load(const char *filename) void *data = datafile_get_data(df, item->image_data); img->data = mem_alloc(img->width*img->height*4, 1); mem_copy(img->data, data, img->width*img->height*4); - img->tex_id = gfx_load_texture_raw(img->width, img->height, img->format, img->data, IMG_AUTO); + img->tex_id = gfx_load_texture_raw(img->width, img->height, img->format, img->data, IMG_AUTO, 0); } // copy image name -- cgit 1.4.1