level changes

diff --git a/fishladder.c b/fishladder.c
index bcbc37428b6335433bd2ff7306feb337aeab982d..e7cd191add03093edde65cec9982454be901e139 100644 (file)
--- a/fishladder.c
+++ b/fishladder.c
@@ -12,7 +12,8 @@ const char *level_pack_1[] = {
        "level4",
        "level5",
        "level6",
-       "level7_combine"
+       "level7_combine",
+       "xor_small"
 };
 
 #pragma pack(push,1)
@@ -753,17 +754,17 @@ static int console_changelevel( int argc, char const *argv[] )
 void vg_start(void)
 {
        vg_function_push( (struct vg_cmd){
-               .name = "map_write",
+               .name = "_map_write",
                .function = console_save_map
        });
        
        vg_function_push( (struct vg_cmd){
-               .name = "map_load",
+               .name = "_map_load",
                .function = console_load_map
        });
        
        vg_function_push( (struct vg_cmd){
-               .name = "changelevel",
+               .name = "map",
                .function = console_changelevel
        });
 
@@ -1023,11 +1024,14 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer )
        }
 }
 
+
 v2f const curve_3[] = {{0.5f,1.0f},{0.5f,0.625f},{0.625f,0.5f},{1.0f,0.5f}};
 v2f const curve_6[] = {{0.5f,1.0f},{0.5f,0.625f},{0.375f,0.5f},{0.0f,0.5f}};
 v2f const curve_9[] = {{1.0f,0.5f},{0.625f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
 v2f const curve_12[]= {{0.0f,0.5f},{0.375f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
 
+v2f const curve_1[] = {{1.0f,0.5f},{0.8f,0.5f},{0.3f,0.5f},{0.2f,0.5f}};
+v2f const curve_4[] = {{0.0f,0.5f},{0.3f,0.5f},{0.5f,0.5f},{0.8f,0.5f}};
 v2f const curve_2[] = {{0.5f,1.0f},{0.5f,0.8f},{0.5f,0.3f},{0.5f,0.2f}};
 v2f const curve_8[] = {{0.5f,0.8f},{0.5f,0.5f},{0.5f,0.3f},{0.5f,0.0f}};
 
@@ -1535,6 +1539,8 @@ void vg_update(void)
                                                else
                                                        curve = curve_9;
                                        break;
+                                       case 1: curve = curve_1; break;
+                                       case 4: curve = curve_4; break;
                                        case 2: curve = curve_2; break;
                                        case 8: curve = curve_8; break;
                                        case 3: curve = curve_3; break;

diff --git a/maps/level5.map b/maps/level5.map
index 0614be6b5465f325d79b83e5310ade39e1bad17c..7e2c727e3a733597b8ac58f1b8ef6daa4b44ce83 100644 (file)
--- a/maps/level5.map
+++ b/maps/level5.map
@@ -1,5 +1,5 @@
 ###############;
-####-##########;abcb
+####-##########;abcb:ccaa
 ##           ##;
 ##           ##;
 ##           ##;
@@ -9,5 +9,5 @@
 ##           ##;
 ##           ##;
 ##           ##;
-##########+####;bcba
+##########+####;bcba:aacc
 ###############;

diff --git a/maps/level7_combine.map b/maps/level7_combine.map
index 4e06beb7aabc5ee9e43de21b70d80860b49187c2..72333e1e047348983e535601288742f4d9d9fff2 100644 (file)
--- a/maps/level7_combine.map
+++ b/maps/level7_combine.map
@@ -1,15 +1,10 @@
-#################;
-##-###########-##;aaa,bbb
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-##             ##;
-####+###+###+####;ab,ab,ab
-#################;
+#############;
+##-#######-##;aaa,bbb
+##         ##;
+##         ##;
+##         ##;
+##         ##;
+##         ##;
+##         ##;
+###+###+##+##;ab,ab,ab
+#############;