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-23 12:51:14 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-23 12:51:14 +0000
commit119bb8a5f87b41b095fd139bc206ba48b0f6ee90 (patch)
tree29320ac52892c4c421de16318ef6f7f52009b118 /src/game/editor
parent72446f49e94ee013712373e4dadf6c58f9625529 (diff)
downloadzcatch-119bb8a5f87b41b095fd139bc206ba48b0f6ee90.tar.gz
zcatch-119bb8a5f87b41b095fd139bc206ba48b0f6ee90.zip
fixed so that maps are downloaded to maps/. fixed so that you can't select non-existing envelopes in the editor
Diffstat (limited to 'src/game/editor')
-rw-r--r--src/game/editor/ed_popups.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/editor/ed_popups.cpp b/src/game/editor/ed_popups.cpp
index 81192521..bcd26092 100644
--- a/src/game/editor/ed_popups.cpp
+++ b/src/game/editor/ed_popups.cpp
@@ -284,9 +284,9 @@ int popup_quad(RECT view)
 	int new_val = 0;
 	int prop = editor.do_properties(&view, props, ids, &new_val);		
 	
-	if(prop == PROP_POS_ENV) quad->pos_env = new_val;
+	if(prop == PROP_POS_ENV) quad->pos_env = clamp(new_val, -1, editor.map.envelopes.len()-1);
 	if(prop == PROP_POS_ENV_OFFSET) quad->pos_env_offset = new_val;
-	if(prop == PROP_COLOR_ENV) quad->color_env = new_val;
+	if(prop == PROP_COLOR_ENV) quad->color_env = clamp(new_val, -1, editor.map.envelopes.len()-1);
 	if(prop == PROP_COLOR_ENV_OFFSET) quad->color_env_offset = new_val;
 	
 	return 0;