save/load

[fishladder.git] / fishladder.c

diff --git a/fishladder.c b/fishladder.c
index c4d575d4642e73f3caf0a35d3c5937936b9c36c5..09bcf43e605f77f8ec421d7087c300aaaec073ee 100644 (file)
--- a/fishladder.c
+++ b/fishladder.c
@@ -336,22 +336,20 @@ static int map_load( const char *str )
                        
                        // Tile initialization
                        // row[ cx ] .. etc
+                       struct cell *cell = &row[ cx ];
                        
                        if( *c == '+' || *c == '-' )
                        {
                                struct cell_terminal term = { .id = cx + world.h*world.w };
                                arrpush( world.io, term );
-                               row[ cx ++ ].state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT;
+                               cell->state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT;
                                reg_end ++;
                        }
-                       else if( *c == '#' )
-                       {
-                               row[ cx ++ ].state = FLAG_WALL;
-                       }
-                       else
-                       {
-                               row[ cx ++ ].state = 0x00;
-                       }
+                       else if( *c == '#' ) cell->state = FLAG_WALL;
+                       else if( *c == '*' ) cell->state = FLAG_CANAL;
+                       else cell->state = 0x00;
+                       
+                       cx ++;
                }
        
                c ++;
@@ -383,13 +381,90 @@ static struct cell *pcell( v2i pos )
        return &world.data[ pos[1]*world.w + pos[0] ];
 }
 
+static void map_serialize( FILE *stream )
+{
+       for( int y = 0; y < world.h; y ++ )
+       {
+               for( int x = 0; x < world.w; x ++ )
+               {
+                       struct cell *cell = pcell( (v2i){ x, y } );
+                       
+                       if( cell->state & FLAG_WALL ) fputc( '#', stream );
+                       else if( cell->state & FLAG_INPUT ) fputc( '+', stream );
+                       else if( cell->state & FLAG_OUTPUT ) fputc( '-', stream );
+                       else if( cell->state & FLAG_CANAL ) fputc( '*', stream );
+                       else fputc( ' ', stream );
+               }
+               
+               fputc( ';', stream );
+               
+               int terminal_write_count = 0;
+               
+               for( int x = 0; x < world.w; x ++ )
+               {
+                       for( int i = 0; i < arrlen( world.io ); i ++ )
+                       {
+                               struct cell_terminal *term = &world.io[i];
+                               if( term->id == y*world.w+x )
+                               {
+                                       if( terminal_write_count )
+                                               fputc( ',', stream );
+                                       terminal_write_count ++;
+                               
+                                       for( int j = 0; j < arrlen( term->conditions ); j ++ )
+                                               fputc( term->conditions[j], stream );
+                               }
+                       }
+               }
+               
+               fputc( '\n', stream );
+       }
+}
+
 int main( int argc, char *argv[] )
 {
        vg_init( argc, argv, "Fish (Marbles Computer) Ladder Simulator 2022 | N,M: change level | SPACE: Test | LeftClick: Toggle tile" );
 }
 
+static void console_save_map( int argc, char *argv[] )
+{
+       if( argc >= 1 )
+       {
+               FILE *test_writer = fopen( argv[0], "wb" );
+               if( test_writer )
+               {
+                       map_serialize( test_writer );
+                       
+                       fclose( test_writer );
+               }
+       }
+}
+
+static void console_load_map( int argc, char *argv[] )
+{
+       if( argc >= 1 )
+       {
+               char *text_source = vg_textasset_read( argv[0] );
+               
+               if( text_source )
+                       map_load( text_source );
+                       
+               free( text_source );
+       }
+}
+
 void vg_start(void)
 {
+       vg_function_push( (struct vg_cmd){
+               .name = "map_write",
+               .function = console_save_map
+       });
+       
+       vg_function_push( (struct vg_cmd){
+               .name = "map_load",
+               .function = console_load_map
+       });
+
        // Quad mesh
        {
                float quad_mesh[] =
@@ -635,6 +710,9 @@ 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_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}};
+
 v2f const curve_7[] = {{0.5f,0.8438f},{0.875f,0.8438f},{0.625f,0.5f},{1.0f,0.5f}};
 v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},{0.0f,0.5f}};
 
@@ -964,6 +1042,8 @@ void vg_update(void)
                                                else
                                                        curve = curve_9;
                                        break;
+                                       case 2: curve = curve_2; break;
+                                       case 8: curve = curve_8; break;
                                        case 3: curve = curve_3; break;
                                        case 6: curve = curve_6; break;
                                        case 9: curve = curve_9; break;