From 78155fa6d766d4529e8f602cb36457bce55cb17d Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sun, 9 Mar 2008 23:29:14 +0000 Subject: fixed so you can append maps in the editor. broken the loading of old maps however :D --- src/game/editor/ed_layer_tiles.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game/editor/ed_layer_tiles.cpp') diff --git a/src/game/editor/ed_layer_tiles.cpp b/src/game/editor/ed_layer_tiles.cpp index f6a5dfe9..e12b2c63 100644 --- a/src/game/editor/ed_layer_tiles.cpp +++ b/src/game/editor/ed_layer_tiles.cpp @@ -188,11 +188,11 @@ int LAYER_TILES::render_properties(RECT *toolbox) { RECT button; ui_hsplit_b(toolbox, 12.0f, toolbox, &button); - bool in_gamegroup = editor.game_group->layers.find(this) != -1; + bool in_gamegroup = editor.map.game_group->layers.find(this) != -1; static int col_button = 0; if(do_editor_button(&col_button, "Make Collision", in_gamegroup?0:-1, &button, draw_editor_button, 0, "Constructs collision from the this layer")) { - LAYER_TILES *gl = editor.game_layer; + LAYER_TILES *gl = editor.map.game_layer; int w = min(gl->width, width); int h = min(gl->height, height); for(int y = 0; y < h; y++) @@ -235,11 +235,11 @@ int LAYER_TILES::render_properties(RECT *toolbox) } -void LAYER_TILES::modify_image_index(index_modify_func func) +void LAYER_TILES::modify_image_index(INDEX_MODIFY_FUNC func) { func(&image); } -void LAYER_TILES::modify_envelope_index(index_modify_func func) +void LAYER_TILES::modify_envelope_index(INDEX_MODIFY_FUNC func) { } -- cgit 1.4.1