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_popups.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game/editor/ed_popups.cpp') diff --git a/src/game/editor/ed_popups.cpp b/src/game/editor/ed_popups.cpp index 4a1248b4..a03e4e9e 100644 --- a/src/game/editor/ed_popups.cpp +++ b/src/game/editor/ed_popups.cpp @@ -77,7 +77,7 @@ int popup_group(RECT view) static int delete_button = 0; // don't allow deletion of game group - if(editor.game_group != editor.get_selected_group() && + if(editor.map.game_group != editor.get_selected_group() && do_editor_button(&delete_button, "Delete Group", 0, &button, draw_editor_button, 0, "Delete group")) { editor.map.delete_group(editor.selected_group); @@ -162,7 +162,7 @@ int popup_layer(RECT view) static int delete_button = 0; // don't allow deletion of game layer - if(editor.game_layer != editor.get_selected_layer(0) && + if(editor.map.game_layer != editor.get_selected_layer(0) && do_editor_button(&delete_button, "Delete Layer", 0, &button, draw_editor_button, 0, "Deletes the layer")) { editor.map.groups[editor.selected_group]->delete_layer(editor.selected_layer); -- cgit 1.4.1