diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-06-12 10:51:48 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-06-12 10:51:48 +0000 |
| commit | f6c67c29cd10d41b877ee1319801edc01b625e72 (patch) | |
| tree | 6ca26c44ac0218a57d078a6f72034f2924b44104 /src/game/editor/ed_editor.cpp | |
| parent | 0d3b988c1aed8f6b91879a801253db81a251a532 (diff) | |
| download | zcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.tar.gz zcatch-f6c67c29cd10d41b877ee1319801edc01b625e72.zip | |
large commit with loads of clean up. more is comming
Diffstat (limited to 'src/game/editor/ed_editor.cpp')
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 8b514c88..3632a034 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -139,7 +139,7 @@ int LAYERGROUP::swap_layers(int index0, int index1) return index1; } -void IMAGE::analyse_tileflags() +void EDITOR_IMAGE::analyse_tileflags() { mem_zero(tileflags, sizeof(tileflags)); @@ -1470,11 +1470,11 @@ static void extract_name(const char *filename, char *name) static void replace_image(const char *filename) { - IMAGE imginfo; + EDITOR_IMAGE imginfo; if(!gfx_load_png(&imginfo, filename)) return; - IMAGE *img = editor.map.images[editor.selected_image]; + EDITOR_IMAGE *img = editor.map.images[editor.selected_image]; gfx_unload_texture(img->tex_id); *img = imginfo; extract_name(filename, img->name); @@ -1483,11 +1483,11 @@ static void replace_image(const char *filename) static void add_image(const char *filename) { - IMAGE imginfo; + EDITOR_IMAGE imginfo; if(!gfx_load_png(&imginfo, filename)) return; - IMAGE *img = new IMAGE; + EDITOR_IMAGE *img = new EDITOR_IMAGE; *img = imginfo; img->tex_id = gfx_load_texture_raw(imginfo.width, imginfo.height, imginfo.format, imginfo.data, IMG_AUTO, 0); img->external = 1; // external by default @@ -1513,7 +1513,7 @@ static int popup_image(RECT view) RECT slot; ui_hsplit_t(&view, 2.0f, &slot, &view); ui_hsplit_t(&view, 12.0f, &slot, &view); - IMAGE *img = editor.map.images[editor.selected_image]; + EDITOR_IMAGE *img = editor.map.images[editor.selected_image]; static int external_button = 0; if(img->external) |