about summary refs log tree commit diff
path: root/src/game/editor
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-20 23:59:41 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-20 23:59:41 +0000
commitc984efd3a9be662b0bae687cb637558dfe1b50d7 (patch)
tree119e24656da29c2c11a22098c878a25a0d4300a1 /src/game/editor
parent959a028e09e863f5608b72a960f78d7a46569145 (diff)
downloadzcatch-c984efd3a9be662b0bae687cb637558dfe1b50d7.tar.gz
zcatch-c984efd3a9be662b0bae687cb637558dfe1b50d7.zip
fixed some bugs in the editor
Diffstat (limited to 'src/game/editor')
-rw-r--r--src/game/editor/ed_layer_tiles.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game/editor/ed_layer_tiles.cpp b/src/game/editor/ed_layer_tiles.cpp
index e12b2c63..7b3b89a9 100644
--- a/src/game/editor/ed_layer_tiles.cpp
+++ b/src/game/editor/ed_layer_tiles.cpp
@@ -120,6 +120,9 @@ int LAYER_TILES::brush_grab(LAYERGROUP *brush, RECT rect)
 
 void LAYER_TILES::brush_draw(LAYER *brush, float wx, float wy)
 {
+	if(readonly)
+		return;
+	
 	//
 	LAYER_TILES *l = (LAYER_TILES *)brush;
 	int sx = convert_x(wx);
@@ -214,12 +217,15 @@ int LAYER_TILES::render_properties(RECT *toolbox)
 	};
 	
 	PROPERTY props[] = {
-		{"Image", image, PROPTYPE_IMAGE, 0, 0},
 		{"Width", width, PROPTYPE_INT_STEP, 1, 1000000000},
 		{"Height", height, PROPTYPE_INT_STEP, 1, 1000000000},
+		{"Image", image, PROPTYPE_IMAGE, 0, 0},
 		{0},
 	};
 	
+	if(editor.map.game_layer == this)
+		props[2].name = 0;
+	
 	static int ids[NUM_PROPS] = {0};
 	int new_val = 0;
 	int prop = editor.do_properties(toolbox, props, ids, &new_val);