Merge branch 'master' of harrygodden.com:/home/fishladder

[fishladder.git] / fishladder.c

diff --git a/fishladder.c b/fishladder.c
index bcbc37428b6335433bd2ff7306feb337aeab982d..68f04febd75e54bd42da4c043bf3d956d0503caf 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)
@@ -313,15 +314,21 @@ static int map_load( const char *str, const char *name )
                if( !*c )
                        break;
        
+               if( *c == '\r' ) { c ++; continue; } // fuck off windows
+       
                if( *c == ';' )
                {
                        c ++;
-
+                       
+                       if( *c == '\r' ) c ++;
+                       
                        // Parse attribs
                        if( *c != '\n' )
                        {
                                while( *c )
                                {
+                                       if( *c == '\r' ) { c ++; continue; }
+                                       
                                        if( reg_start < reg_end )
                                        {
                                                struct cell_terminal *terminal = &world.io[ reg_start ];
@@ -735,12 +742,12 @@ static int console_changelevel( int argc, char const *argv[] )
        if( argc >= 1 )
        {
                // Save current level
-               if( console_save_map( 0, NULL ) )
-                       if( console_load_map( argc, argv ) )
-                       {                               
-                               simulation_stop();
-                               return 1;
-                       }
+               console_save_map( 0, NULL );
+               if( console_load_map( argc, argv ) )
+               {                               
+                       simulation_stop();
+                       return 1;
+               }
        }
        else
        {
@@ -753,17 +760,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 +1030,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 +1545,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;