diff options
| -rw-r--r-- | engines/sci/engine/savegame.cfsml | 2 | ||||
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 7510 |
2 files changed, 3799 insertions, 3713 deletions
diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml index 9a7c3dcd2c..bc36a5f53d 100644 --- a/engines/sci/engine/savegame.cfsml +++ b/engines/sci/engine/savegame.cfsml @@ -472,7 +472,7 @@ int read_song_tp(FILE *fh, song_t **foo, const char *lastval, int *line, int *hi } int read_int_hash_map_tp(FILE *fh, int_hash_map_t **foo, const char *lastval, int *line, int *hiteof) { - *foo = (int_hash_map_t*)malloc(sizeof(int_hash_map_t)); + *foo = new int_hash_map_t; %CFSMLREAD int_hash_map_t (*foo) FROM fh ERRVAR *hiteof FIRSTTOKEN lastval LINECOUNTER *line; (*foo)->holes = NULL; return 0; diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index e60633e148..4eee102dd7 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -171,15 +171,15 @@ RECORD synonym_t "synonym_t" { */ -// Auto-generated CFSML declaration and function block +/* Auto-generated CFSML declaration and function block */ -#line 740 "savegame.cfsml" +#line 778 "savegame.cfsml" #define CFSML_SUCCESS 0 #define CFSML_FAILURE 1 #line 102 "savegame.cfsml" -#include <stdarg.h> // We need va_lists +#include <stdarg.h> /* We need va_lists */ #include "sci/include/sci_memory.h" #ifdef CFSML_DEBUG_MALLOC @@ -195,19 +195,22 @@ RECORD synonym_t "synonym_t" { #define realloc dbg_sci_realloc #endif -static void _cfsml_error(const char *fmt, ...) { - va_list argp; +static void +_cfsml_error(const char *fmt, ...) +{ + va_list argp; + + fprintf(stderr, "Error: "); + va_start(argp, fmt); + vfprintf(stderr, fmt, argp); + va_end(argp); - fprintf(stderr, "Error: "); - va_start(argp, fmt); - vfprintf(stderr, fmt, argp); - va_end(argp); } static struct _cfsml_pointer_refstruct { - struct _cfsml_pointer_refstruct *next; - void *ptr; + struct _cfsml_pointer_refstruct *next; + void *ptr; } *_cfsml_pointer_references = NULL; static struct _cfsml_pointer_refstruct **_cfsml_pointer_references_current = &_cfsml_pointer_references; @@ -215,3654 +218,3737 @@ static struct _cfsml_pointer_refstruct **_cfsml_pointer_references_current = &_c static char *_cfsml_last_value_retrieved = NULL; static char *_cfsml_last_identifier_retrieved = NULL; -static void _cfsml_free_pointer_references_recursively(struct _cfsml_pointer_refstruct *refs, int free_pointers) { - if (!refs) - return; - - _cfsml_free_pointer_references_recursively(refs->next, free_pointers); +static void +_cfsml_free_pointer_references_recursively(struct _cfsml_pointer_refstruct *refs, int free_pointers) +{ + if (!refs) + return; - if (free_pointers) - free(refs->ptr); + _cfsml_free_pointer_references_recursively(refs->next, free_pointers); - free(refs); -} + if (free_pointers) + free(refs->ptr); -static void _cfsml_free_pointer_references(struct _cfsml_pointer_refstruct **meta_ref, int free_pointers) { - _cfsml_free_pointer_references_recursively(*meta_ref, free_pointers); - *meta_ref = NULL; - _cfsml_pointer_references_current = meta_ref; + free(refs); } -static struct _cfsml_pointer_refstruct **_cfsml_get_current_refpointer() { - return _cfsml_pointer_references_current; +static void +_cfsml_free_pointer_references(struct _cfsml_pointer_refstruct **meta_ref, int free_pointers) +{ + _cfsml_free_pointer_references_recursively(*meta_ref, free_pointers); + *meta_ref = NULL; + _cfsml_pointer_references_current = meta_ref; } -static void _cfsml_register_pointer(void *ptr) { - struct _cfsml_pointer_refstruct *newref = (struct _cfsml_pointer_refstruct*)sci_malloc(sizeof (struct _cfsml_pointer_refstruct)); - newref->next = *_cfsml_pointer_references_current; - newref->ptr = ptr; - *_cfsml_pointer_references_current = newref; +static struct _cfsml_pointer_refstruct ** +_cfsml_get_current_refpointer() +{ + return _cfsml_pointer_references_current; } -static char *_cfsml_mangle_string(const char *s) { - const char *source = s; - char c; - char *target = (char *)sci_malloc(1 + strlen(s) * 2); // We will probably need less than that - char *writer = target; - - while ((c = *source++)) { - if (c < 32) { // Special character? - *writer++ = '\\'; // Escape... - c += ('a' - 1); - } else if (c == '\\' || c == '"') - *writer++ = '\\'; // Escape, but do not change - *writer++ = c; - } - *writer = 0; // Terminate string - - return (char *)sci_realloc(target, strlen(target) + 1); +static void _cfsml_register_pointer(void *ptr) +{ + struct _cfsml_pointer_refstruct *newref = (struct _cfsml_pointer_refstruct*)sci_malloc(sizeof (struct _cfsml_pointer_refstruct)); + newref->next = *_cfsml_pointer_references_current; + newref->ptr = ptr; + *_cfsml_pointer_references_current = newref; } -static char *_cfsml_unmangle_string(const char *s, unsigned int length) { - char *target = (char *)sci_malloc(1 + strlen(s)); - char *writer = target; - const char *source = s; - const char *end = s + length; - char c; - - while ((source != end) && (c = *source++) && (c > 31)) { - if (c == '\\') { // Escaped character? - c = *source++; - if ((c != '\\') && (c != '"')) // Un-escape 0-31 only - c -= ('a' - 1); - } - *writer++ = c; - } - *writer = 0; // Terminate string - return (char *)sci_realloc(target, strlen(target) + 1); -} +static char * +_cfsml_mangle_string(const char *s) +{ + const char *source = s; + char c; + char *target = (char *) sci_malloc(1 + strlen(s) * 2); /* We will probably need less than that */ + char *writer = target; -static char *_cfsml_get_identifier(FILE *fd, int *line, int *hiteof, int *assignment) { - int c; - int mem = 32; - int pos = 0; - int done = 0; - char *retval = (char *)sci_malloc(mem); + while ((c = *source++)) { - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } + if (c < 32) { /* Special character? */ + *writer++ = '\\'; /* Escape... */ + c += ('a' - 1); + } else if (c == '\\' || c == '"') + *writer++ = '\\'; /* Escape, but do not change */ + *writer++ = c; - while (isspace(c = fgetc(fd)) && (c != EOF)); - if (c == EOF) { - _cfsml_error("Unexpected end of file at line %d\n", *line); - free(retval); - *hiteof = 1; - return NULL; - } + } + *writer = 0; /* Terminate string */ - ungetc(c, fd); + return (char *) sci_realloc(target, strlen(target) + 1); +} - while (((c = fgetc(fd)) != EOF) && ((pos == 0) || (c != '\n')) && (c != '=')) { - if (pos == mem - 1) // Need more memory? - retval = (char *)sci_realloc(retval, mem *= 2); - if (!isspace(c)) { - if (done) { - _cfsml_error("Single word identifier expected at line %d\n", *line); - free(retval); - return NULL; - } - retval[pos++] = c; - } else - if (pos != 0) - done = 1; // Finished the variable name - else if (c == '\n') - ++(*line); - } - - if (c == EOF) { - _cfsml_error("Unexpected end of file at line %d\n", *line); - free(retval); - *hiteof = 1; - return NULL; - } +static char * +_cfsml_unmangle_string(const char *s, unsigned int length) +{ + char *target = (char *) sci_malloc(1 + strlen(s)); + char *writer = target; + const char *source = s; + const char *end = s + length; + char c; + + while ((source != end) && (c = *source++) && (c > 31)) { + if (c == '\\') { /* Escaped character? */ + c = *source++; + if ((c != '\\') && (c != '"')) /* Un-escape 0-31 only */ + c -= ('a' - 1); + } + *writer++ = c; + } + *writer = 0; /* Terminate string */ + + return (char *) sci_realloc(target, strlen(target) + 1); +} - if (c == '\n') { - ++(*line); - if (assignment) - *assignment = 0; - } else - if (assignment) - *assignment = 1; - if (pos == 0) { - _cfsml_error("Missing identifier in assignment at line %d\n", *line); - free(retval); - return NULL; - } +static char * +_cfsml_get_identifier(FILE *fd, int *line, int *hiteof, int *assignment) +{ + int c; + int mem = 32; + int pos = 0; + int done = 0; + char *retval = (char *) sci_malloc(mem); + + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + + while (isspace(c = fgetc(fd)) && (c != EOF)); + if (c == EOF) { + _cfsml_error("Unexpected end of file at line %d\n", *line); + free(retval); + *hiteof = 1; + return NULL; + } + + ungetc(c, fd); + + while (((c = fgetc(fd)) != EOF) && ((pos == 0) || (c != '\n')) && (c != '=')) { + + if (pos == mem - 1) /* Need more memory? */ + retval = (char *) sci_realloc(retval, mem *= 2); + + if (!isspace(c)) { + if (done) { + _cfsml_error("Single word identifier expected at line %d\n", *line); + free(retval); + return NULL; + } + retval[pos++] = c; + } else + if (pos != 0) + done = 1; /* Finished the variable name */ + else if (c == '\n') + ++(*line); + } + + if (c == EOF) { + _cfsml_error("Unexpected end of file at line %d\n", *line); + free(retval); + *hiteof = 1; + return NULL; + } + + if (c == '\n') { + ++(*line); + if (assignment) + *assignment = 0; + } else + if (assignment) + *assignment = 1; + + if (pos == 0) { + _cfsml_error("Missing identifier in assignment at line %d\n", *line); + free(retval); + return NULL; + } + + if (pos == mem - 1) /* Need more memory? */ + retval = (char *) sci_realloc(retval, mem += 1); + + retval[pos] = 0; /* Terminate string */ +#line 304 "savegame.cfsml" + + return _cfsml_last_identifier_retrieved = retval; +} - if (pos == mem - 1) // Need more memory? - retval = (char *)sci_realloc(retval, mem += 1); - retval[pos] = 0; // Terminate string -#line 282 "savegame.cfsml" +static char * +_cfsml_get_value(FILE *fd, int *line, int *hiteof) +{ + int c; + int mem = 64; + int pos = 0; + char *retval = (char *) sci_malloc(mem); - return _cfsml_last_identifier_retrieved = retval; -} + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } -static char *_cfsml_get_value(FILE *fd, int *line, int *hiteof) { - int c; - int mem = 64; - int pos = 0; - char *retval = (char *)sci_malloc(mem); + while (((c = fgetc(fd)) != EOF) && (c != '\n')) { - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } + if (pos == mem - 1) /* Need more memory? */ + retval = (char *) sci_realloc(retval, mem *= 2); - while (((c = fgetc(fd)) != EOF) && (c != '\n')) { - if (pos == mem - 1) // Need more memory? - retval = (char *)sci_realloc(retval, mem *= 2); + if (pos || (!isspace(c))) + retval[pos++] = c; - if (pos || (!isspace(c))) - retval[pos++] = c; - } + } - while ((pos > 0) && (isspace(retval[pos - 1]))) - --pos; // Strip trailing whitespace + while ((pos > 0) && (isspace(retval[pos - 1]))) + --pos; /* Strip trailing whitespace */ - if (c == EOF) - *hiteof = 1; + if (c == EOF) + *hiteof = 1; - if (pos == 0) { - _cfsml_error("Missing value in assignment at line %d\n", *line); - free(retval); - return NULL; - } + if (pos == 0) { + _cfsml_error("Missing value in assignment at line %d\n", *line); + free(retval); + return NULL; + } - if (c == '\n') - ++(*line); + if (c == '\n') + ++(*line); - if (pos == mem - 1) // Need more memory? - retval = (char *)sci_realloc(retval, mem += 1); + if (pos == mem - 1) /* Need more memory? */ + retval = (char *) sci_realloc(retval, mem += 1); - retval[pos] = 0; // Terminate string -#line 334 "savegame.cfsml" - return (_cfsml_last_value_retrieved = (char *)sci_realloc(retval, strlen(retval) + 1)); - // Re-allocate; this value might be used for quite some while (if we are restoring a string) + retval[pos] = 0; /* Terminate string */ +#line 361 "savegame.cfsml" + return (_cfsml_last_value_retrieved = (char *) sci_realloc(retval, strlen(retval) + 1)); + /* Re-allocate; this value might be used for quite some while (if we are + ** restoring a string) + */ } -#line 384 "savegame.cfsml" -static void _cfsml_write_sfx_state_t(FILE *fh, sfx_state_t* save_struc); -static int _cfsml_read_sfx_state_t(FILE *fh, sfx_state_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_sfx_state_t(FILE *fh, sfx_state_t* save_struc); +static int +_cfsml_read_sfx_state_t(FILE *fh, sfx_state_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_clone_entry_t(FILE *fh, clone_entry_t* save_struc); -static int _cfsml_read_clone_entry_t(FILE *fh, clone_entry_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_clone_entry_t(FILE *fh, clone_entry_t* save_struc); +static int +_cfsml_read_clone_entry_t(FILE *fh, clone_entry_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_object_t(FILE *fh, object_t* save_struc); -static int _cfsml_read_object_t(FILE *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_object_t(FILE *fh, object_t* save_struc); +static int +_cfsml_read_object_t(FILE *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_string(FILE *fh, char ** save_struc); -static int _cfsml_read_string(FILE *fh, char ** save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_string(FILE *fh, char ** save_struc); +static int +_cfsml_read_string(FILE *fh, char ** save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_menubar_t(FILE *fh, menubar_t* save_struc); -static int _cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_menubar_t(FILE *fh, menubar_t* save_struc); +static int +_cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_size_t(FILE *fh, size_t* save_struc); -static int _cfsml_read_size_t(FILE *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_size_t(FILE *fh, size_t* save_struc); +static int +_cfsml_read_size_t(FILE *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_list_entry_t(FILE *fh, list_entry_t* save_struc); -static int _cfsml_read_list_entry_t(FILE *fh, list_entry_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_list_entry_t(FILE *fh, list_entry_t* save_struc); +static int +_cfsml_read_list_entry_t(FILE *fh, list_entry_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc); -static int _cfsml_read_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc); +static int +_cfsml_read_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_song_t(FILE *fh, song_t* save_struc); -static int _cfsml_read_song_t(FILE *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_song_t(FILE *fh, song_t* save_struc); +static int +_cfsml_read_song_t(FILE *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_menu_item_t(FILE *fh, menu_item_t* save_struc); -static int _cfsml_read_menu_item_t(FILE *fh, menu_item_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_menu_item_t(FILE *fh, menu_item_t* save_struc); +static int +_cfsml_read_menu_item_t(FILE *fh, menu_item_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_node_entry_t(FILE *fh, node_entry_t* save_struc); -static int _cfsml_read_node_entry_t(FILE *fh, node_entry_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_node_entry_t(FILE *fh, node_entry_t* save_struc); +static int +_cfsml_read_node_entry_t(FILE *fh, node_entry_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_seg_id_t(FILE *fh, seg_id_t* save_struc); -static int _cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_seg_id_t(FILE *fh, seg_id_t* save_struc); +static int +_cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_dynmem_t(FILE *fh, dynmem_t* save_struc); -static int _cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_dynmem_t(FILE *fh, dynmem_t* save_struc); +static int +_cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_local_variables_t(FILE *fh, local_variables_t* save_struc); -static int _cfsml_read_local_variables_t(FILE *fh, local_variables_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_local_variables_t(FILE *fh, local_variables_t* save_struc); +static int +_cfsml_read_local_variables_t(FILE *fh, local_variables_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_state_t(FILE *fh, state_t* save_struc); -static int _cfsml_read_state_t(FILE *fh, state_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_state_t(FILE *fh, state_t* save_struc); +static int +_cfsml_read_state_t(FILE *fh, state_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_node_table_t(FILE *fh, node_table_t* save_struc); -static int _cfsml_read_node_table_t(FILE *fh, node_table_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_node_table_t(FILE *fh, node_table_t* save_struc); +static int +_cfsml_read_node_table_t(FILE *fh, node_table_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_sys_strings_t(FILE *fh, sys_strings_t* save_struc); -static int _cfsml_read_sys_strings_t(FILE *fh, sys_strings_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_sys_strings_t(FILE *fh, sys_strings_t* save_struc); +static int +_cfsml_read_sys_strings_t(FILE *fh, sys_strings_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_byte(FILE *fh, byte* save_struc); -static int _cfsml_read_byte(FILE *fh, byte* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_byte(FILE *fh, byte* save_struc); +static int +_cfsml_read_byte(FILE *fh, byte* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_node_t(FILE *fh, node_t* save_struc); -static int _cfsml_read_node_t(FILE *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_node_t(FILE *fh, node_t* save_struc); +static int +_cfsml_read_node_t(FILE *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_list_table_t(FILE *fh, list_table_t* save_struc); -static int _cfsml_read_list_table_t(FILE *fh, list_table_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_list_table_t(FILE *fh, list_table_t* save_struc); +static int +_cfsml_read_list_table_t(FILE *fh, list_table_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_class_t(FILE *fh, class_t* save_struc); -static int _cfsml_read_class_t(FILE *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_class_t(FILE *fh, class_t* save_struc); +static int +_cfsml_read_class_t(FILE *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_song_handle_t(FILE *fh, song_handle_t* save_struc); -static int _cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_song_handle_t(FILE *fh, song_handle_t* save_struc); +static int +_cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_int(FILE *fh, int* save_struc); -static int _cfsml_read_int(FILE *fh, int* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_int(FILE *fh, int* save_struc); +static int +_cfsml_read_int(FILE *fh, int* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_menu_t(FILE *fh, menu_t* save_struc); -static int _cfsml_read_menu_t(FILE *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_menu_t(FILE *fh, menu_t* save_struc); +static int +_cfsml_read_menu_t(FILE *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_clone_table_t(FILE *fh, clone_table_t* save_struc); -static int _cfsml_read_clone_table_t(FILE *fh, clone_table_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_clone_table_t(FILE *fh, clone_table_t* save_struc); +static int +_cfsml_read_clone_table_t(FILE *fh, clone_table_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_clone_t(FILE *fh, clone_t* save_struc); -static int _cfsml_read_clone_t(FILE *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_clone_t(FILE *fh, clone_t* save_struc); +static int +_cfsml_read_clone_t(FILE *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_list_t(FILE *fh, list_t* save_struc); -static int _cfsml_read_list_t(FILE *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_list_t(FILE *fh, list_t* save_struc); +static int +_cfsml_read_list_t(FILE *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_sys_string_t(FILE *fh, sys_string_t* save_struc); -static int _cfsml_read_sys_string_t(FILE *fh, sys_string_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_sys_string_t(FILE *fh, sys_string_t* save_struc); +static int +_cfsml_read_sys_string_t(FILE *fh, sys_string_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_script_t(FILE *fh, script_t* save_struc); -static int _cfsml_read_script_t(FILE *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_script_t(FILE *fh, script_t* save_struc); +static int +_cfsml_read_script_t(FILE *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 384 "savegame.cfsml" -static void _cfsml_write_seg_manager_t(FILE *fh, seg_manager_t* save_struc); -static int _cfsml_read_seg_manager_t(FILE *fh, seg_manager_t* save_struc, const char *lastval, int *line, int *hiteof); +#line 413 "savegame.cfsml" +static void +_cfsml_write_seg_manager_t(FILE *fh, seg_manager_t* save_struc); +static int +_cfsml_read_seg_manager_t(FILE *fh, seg_manager_t* save_struc, const char *lastval, int *line, int *hiteof); -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_sfx_state_t(FILE *fh, sfx_state_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "songlib = "); - write_songlib_t(fh, (songlib_t*) &(save_struc->songlib)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "songlib = "); + write_songlib_t(fh, (songlib_t*) &(save_struc->songlib)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_sfx_state_t(FILE *fh, sfx_state_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record sfx_state_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "songlib")) { -#line 694 "savegame.cfsml" - if (read_songlib_t(fh, (songlib_t*) &(save_struc->songlib), value, line, hiteof)) { - _cfsml_error("Token expected by read_songlib_t() for songlib at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("sfx_state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record sfx_state_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "songlib")) { +#line 731 "savegame.cfsml" + if (read_songlib_t(fh, (songlib_t*) &(save_struc->songlib), value, line, hiteof)) { + _cfsml_error("Token expected by read_songlib_t() for songlib at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("sfx_state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_clone_entry_t(FILE *fh, clone_entry_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "next_free = "); - _cfsml_write_int(fh, (int*) &(save_struc->next_free)); - fprintf(fh, "\n"); - fprintf(fh, "entry = "); - _cfsml_write_clone_t(fh, (clone_t*) &(save_struc->entry)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "next_free = "); + _cfsml_write_int(fh, (int*) &(save_struc->next_free)); + fprintf(fh, "\n"); + fprintf(fh, "entry = "); + _cfsml_write_clone_t(fh, (clone_t*) &(save_struc->entry)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_clone_entry_t(FILE *fh, clone_entry_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record clone_entry_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "next_free")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "entry")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_clone_t(fh, (clone_t*) &(save_struc->entry), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_clone_t() for entry at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("clone_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record clone_entry_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "next_free")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "entry")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_clone_t(fh, (clone_t*) &(save_struc->entry), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_clone_t() for entry at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("clone_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_object_t(FILE *fh, object_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "flags = "); - _cfsml_write_int(fh, (int*) &(save_struc->flags)); - fprintf(fh, "\n"); - fprintf(fh, "pos = "); - write_reg_t(fh, (reg_t*) &(save_struc->pos)); - fprintf(fh, "\n"); - fprintf(fh, "variables_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->variables_nr)); - fprintf(fh, "\n"); - fprintf(fh, "variable_names_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->variable_names_nr)); - fprintf(fh, "\n"); - fprintf(fh, "methods_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->methods_nr)); - fprintf(fh, "\n"); - fprintf(fh, "variables = "); - min = max = save_struc->variables_nr; - if (!save_struc->variables) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - write_reg_t(fh, &(save_struc->variables[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "flags = "); + _cfsml_write_int(fh, (int*) &(save_struc->flags)); + fprintf(fh, "\n"); + fprintf(fh, "pos = "); + write_reg_t(fh, (reg_t*) &(save_struc->pos)); + fprintf(fh, "\n"); + fprintf(fh, "variables_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->variables_nr)); + fprintf(fh, "\n"); + fprintf(fh, "variable_names_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->variable_names_nr)); + fprintf(fh, "\n"); + fprintf(fh, "methods_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->methods_nr)); + fprintf(fh, "\n"); + fprintf(fh, "variables = "); + min = max = save_struc->variables_nr; + if (!save_struc->variables) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + write_reg_t(fh, &(save_struc->variables[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_object_t(FILE *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record object_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "flags")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "pos")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->pos), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for pos at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "variables_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->variables_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for variables_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "variable_names_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->variable_names_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for variable_names_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "methods_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->methods_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for methods_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "variables")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->variables = (reg_t *)sci_malloc(max * sizeof(reg_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record object_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "flags")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "pos")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->pos), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for pos at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "variables_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->variables_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for variables_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "variable_names_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->variable_names_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for variable_names_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "methods_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->methods_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for methods_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "variables")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->variables = (reg_t *) sci_malloc(max * sizeof(reg_t)); #ifdef SATISFY_PURIFY - memset(save_struc->variables, 0, max * sizeof(reg_t)); + memset(save_struc->variables, 0, max * sizeof(reg_t)); #endif - _cfsml_register_pointer(save_struc->variables); - } else - save_struc->variables = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (read_reg_t(fh, &(save_struc->variables[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for variables[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->variables_nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("object_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->variables); + } + else + save_struc->variables = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (read_reg_t(fh, &(save_struc->variables[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for variables[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->variables_nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("object_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_string(FILE *fh, char ** save_struc) { -#line 406 "savegame.cfsml" - if (!(*save_struc)) - fprintf(fh, "\\null\\"); - else { - char *token = _cfsml_mangle_string((const char *) *save_struc); - fprintf(fh, "\"%s\"", token); - free(token); - } +#line 436 "savegame.cfsml" + if (!(*save_struc)) + fprintf(fh, "\\null\\"); + else { + char *token = _cfsml_mangle_string((const char *) *save_struc); + fprintf(fh, "\"%s\"", token); + free(token); + } } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_string(FILE *fh, char ** save_struc, const char *lastval, int *line, int *hiteof) { - char *token; -#line 525 "savegame.cfsml" - - if (strcmp(lastval, "\\null\\")) { // null pointer? - unsigned int length = strlen(lastval); - if (*lastval == '"') { // Quoted string? - while (lastval[length] != '"') - --length; - - if (!length) { // No matching double-quotes? - _cfsml_error("Unbalanced quotes at line %d\n", *line); - return CFSML_FAILURE; - } - - lastval++; // ...and skip the opening quotes locally - length--; - } - *save_struc = _cfsml_unmangle_string(lastval, length); - _cfsml_register_pointer(*save_struc); - return CFSML_SUCCESS; - } else { - *save_struc = NULL; - return CFSML_SUCCESS; - } + char *token; +#line 559 "savegame.cfsml" + + if (strcmp(lastval, "\\null\\")) { /* null pointer? */ + unsigned int length = strlen(lastval); + if (*lastval == '"') { /* Quoted string? */ + while (lastval[length] != '"') + --length; + + if (!length) { /* No matching double-quotes? */ + _cfsml_error("Unbalanced quotes at line %d\n", *line); + return CFSML_FAILURE; + } + + lastval++; /* ...and skip the opening quotes locally */ + length--; + } + *save_struc = _cfsml_unmangle_string(lastval, length); + _cfsml_register_pointer(*save_struc); + return CFSML_SUCCESS; + } else { + *save_struc = NULL; + return CFSML_SUCCESS; + } } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_menubar_t(FILE *fh, menubar_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "menus = "); - min = max = save_struc->menus_nr; - if (!save_struc->menus) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_menu_t(fh, &(save_struc->menus[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "menus = "); + min = max = save_struc->menus_nr; + if (!save_struc->menus) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_menu_t(fh, &(save_struc->menus[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record menubar_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "menus")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->menus = (menu_t *)sci_malloc(max * sizeof(menu_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record menubar_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "menus")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->menus = (menu_t *) sci_malloc(max * sizeof(menu_t)); #ifdef SATISFY_PURIFY - memset(save_struc->menus, 0, max * sizeof(menu_t)); + memset(save_struc->menus, 0, max * sizeof(menu_t)); #endif - _cfsml_register_pointer(save_struc->menus); - } else - save_struc->menus = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_menu_t(fh, &(save_struc->menus[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_menu_t() for menus[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->menus_nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("menubar_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->menus); + } + else + save_struc->menus = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_menu_t(fh, &(save_struc->menus[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_menu_t() for menus[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->menus_nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("menubar_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_size_t(FILE *fh, size_t* save_struc) { - fprintf(fh, "%li", (long)*save_struc); + fprintf(fh, "%li", (long) *save_struc); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_size_t(FILE *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; -#line 513 "savegame.cfsml" - - *save_struc = strtol(lastval, &token, 0); - if ((*save_struc == 0) && (token == lastval)) { - _cfsml_error("strtol failed at line %d\n", *line); - return CFSML_FAILURE; - } - if (*token != 0) { - _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); - return CFSML_FAILURE; - } - return CFSML_SUCCESS; + char *token; +#line 546 "savegame.cfsml" + + *save_struc = strtol(lastval, &token, 0); + if ( (*save_struc == 0) && (token == lastval) ) { + _cfsml_error("strtol failed at line %d\n", *line); + return CFSML_FAILURE; + } + if (*token != 0) { + _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); + return CFSML_FAILURE; + } + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_list_entry_t(FILE *fh, list_entry_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "next_free = "); - _cfsml_write_int(fh, (int*) &(save_struc->next_free)); - fprintf(fh, "\n"); - fprintf(fh, "entry = "); - _cfsml_write_list_t(fh, (list_t*) &(save_struc->entry)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "next_free = "); + _cfsml_write_int(fh, (int*) &(save_struc->next_free)); + fprintf(fh, "\n"); + fprintf(fh, "entry = "); + _cfsml_write_list_t(fh, (list_t*) &(save_struc->entry)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_list_entry_t(FILE *fh, list_entry_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record list_entry_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "next_free")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "entry")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_list_t(fh, (list_t*) &(save_struc->entry), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_list_t() for entry at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("list_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record list_entry_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "next_free")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "entry")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_list_t(fh, (list_t*) &(save_struc->entry), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_list_t() for entry at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("list_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "base_value = "); - _cfsml_write_int(fh, (int*) &(save_struc->base_value)); - fprintf(fh, "\n"); - fprintf(fh, "nodes = "); - min = max = DCS_INT_HASH_MAX+1; -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - write_int_hash_map_node_tp(fh, &(save_struc->nodes[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "base_value = "); + _cfsml_write_int(fh, (int*) &(save_struc->base_value)); + fprintf(fh, "\n"); + fprintf(fh, "nodes = "); + min = max = DCS_INT_HASH_MAX+1; +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + write_int_hash_map_node_tp(fh, &(save_struc->nodes[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record int_hash_map_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "base_value")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->base_value), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for base_value at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "nodes")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } - // Prepare to restore static array - max = DCS_INT_HASH_MAX+1; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (read_int_hash_map_node_tp(fh, &(save_struc->nodes[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by read_int_hash_map_node_tp() for nodes[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("int_hash_map_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record int_hash_map_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "base_value")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->base_value), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for base_value at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "nodes")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } + /* Prepare to restore static array */ + max = DCS_INT_HASH_MAX+1; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (read_int_hash_map_node_tp(fh, &(save_struc->nodes[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by read_int_hash_map_node_tp() for nodes[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("int_hash_map_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_song_t(FILE *fh, song_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "handle = "); - _cfsml_write_song_handle_t(fh, (song_handle_t*) &(save_struc->handle)); - fprintf(fh, "\n"); - fprintf(fh, "resource_num = "); - _cfsml_write_int(fh, (int*) &(save_struc->resource_num)); - fprintf(fh, "\n"); - fprintf(fh, "priority = "); - _cfsml_write_int(fh, (int*) &(save_struc->priority)); - fprintf(fh, "\n"); - fprintf(fh, "status = "); - _cfsml_write_int(fh, (int*) &(save_struc->status)); - fprintf(fh, "\n"); - fprintf(fh, "restore_behavior = "); - _cfsml_write_int(fh, (int*) &(save_struc->restore_behavior)); - fprintf(fh, "\n"); - fprintf(fh, "restore_time = "); - _cfsml_write_int(fh, (int*) &(save_struc->restore_time)); - fprintf(fh, "\n"); - fprintf(fh, "loops = "); - _cfsml_write_int(fh, (int*) &(save_struc->loops)); - fprintf(fh, "\n"); - fprintf(fh, "hold = "); - _cfsml_write_int(fh, (int*) &(save_struc->hold)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "handle = "); + _cfsml_write_song_handle_t(fh, (song_handle_t*) &(save_struc->handle)); + fprintf(fh, "\n"); + fprintf(fh, "resource_num = "); + _cfsml_write_int(fh, (int*) &(save_struc->resource_num)); + fprintf(fh, "\n"); + fprintf(fh, "priority = "); + _cfsml_write_int(fh, (int*) &(save_struc->priority)); + fprintf(fh, "\n"); + fprintf(fh, "status = "); + _cfsml_write_int(fh, (int*) &(save_struc->status)); + fprintf(fh, "\n"); + fprintf(fh, "restore_behavior = "); + _cfsml_write_int(fh, (int*) &(save_struc->restore_behavior)); + fprintf(fh, "\n"); + fprintf(fh, "restore_time = "); + _cfsml_write_int(fh, (int*) &(save_struc->restore_time)); + fprintf(fh, "\n"); + fprintf(fh, "loops = "); + _cfsml_write_int(fh, (int*) &(save_struc->loops)); + fprintf(fh, "\n"); + fprintf(fh, "hold = "); + _cfsml_write_int(fh, (int*) &(save_struc->hold)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_song_t(FILE *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record song_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "handle")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_song_handle_t(fh, (song_handle_t*) &(save_struc->handle), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_song_handle_t() for handle at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "resource_num")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->resource_num), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for resource_num at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "priority")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->priority), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for priority at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "status")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->status), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for status at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "restore_behavior")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->restore_behavior), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for restore_behavior at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "restore_time")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->restore_time), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for restore_time at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "loops")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->loops), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for loops at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "hold")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->hold), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for hold at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("song_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record song_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "handle")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_song_handle_t(fh, (song_handle_t*) &(save_struc->handle), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_song_handle_t() for handle at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "resource_num")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->resource_num), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for resource_num at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "priority")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->priority), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for priority at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "status")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->status), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for status at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "restore_behavior")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->restore_behavior), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for restore_behavior at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "restore_time")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->restore_time), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for restore_time at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "loops")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->loops), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for loops at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "hold")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->hold), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for hold at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("song_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_menu_item_t(FILE *fh, menu_item_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "type = "); - _cfsml_write_int(fh, (int*) &(save_struc->type)); - fprintf(fh, "\n"); - fprintf(fh, "keytext = "); - _cfsml_write_string(fh, (char **) &(save_struc->keytext)); - fprintf(fh, "\n"); - fprintf(fh, "keytext_size = "); - _cfsml_write_int(fh, (int*) &(save_struc->keytext_size)); - fprintf(fh, "\n"); - fprintf(fh, "flags = "); - _cfsml_write_int(fh, (int*) &(save_struc->flags)); - fprintf(fh, "\n"); - fprintf(fh, "said = "); - min = max = MENU_SAID_SPEC_SIZE; -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_byte(fh, &(save_struc->said[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "said_pos = "); - write_reg_t(fh, (reg_t*) &(save_struc->said_pos)); - fprintf(fh, "\n"); - fprintf(fh, "text = "); - _cfsml_write_string(fh, (char **) &(save_struc->text)); - fprintf(fh, "\n"); - fprintf(fh, "text_pos = "); - write_reg_t(fh, (reg_t*) &(save_struc->text_pos)); - fprintf(fh, "\n"); - fprintf(fh, "modifiers = "); - _cfsml_write_int(fh, (int*) &(save_struc->modifiers)); - fprintf(fh, "\n"); - fprintf(fh, "key = "); - _cfsml_write_int(fh, (int*) &(save_struc->key)); - fprintf(fh, "\n"); - fprintf(fh, "enabled = "); - _cfsml_write_int(fh, (int*) &(save_struc->enabled)); - fprintf(fh, "\n"); - fprintf(fh, "tag = "); - _cfsml_write_int(fh, (int*) &(save_struc->tag)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "type = "); + _cfsml_write_int(fh, (int*) &(save_struc->type)); + fprintf(fh, "\n"); + fprintf(fh, "keytext = "); + _cfsml_write_string(fh, (char **) &(save_struc->keytext)); + fprintf(fh, "\n"); + fprintf(fh, "keytext_size = "); + _cfsml_write_int(fh, (int*) &(save_struc->keytext_size)); + fprintf(fh, "\n"); + fprintf(fh, "flags = "); + _cfsml_write_int(fh, (int*) &(save_struc->flags)); + fprintf(fh, "\n"); + fprintf(fh, "said = "); + min = max = MENU_SAID_SPEC_SIZE; +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_byte(fh, &(save_struc->said[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "said_pos = "); + write_reg_t(fh, (reg_t*) &(save_struc->said_pos)); + fprintf(fh, "\n"); + fprintf(fh, "text = "); + _cfsml_write_string(fh, (char **) &(save_struc->text)); + fprintf(fh, "\n"); + fprintf(fh, "text_pos = "); + write_reg_t(fh, (reg_t*) &(save_struc->text_pos)); + fprintf(fh, "\n"); + fprintf(fh, "modifiers = "); + _cfsml_write_int(fh, (int*) &(save_struc->modifiers)); + fprintf(fh, "\n"); + fprintf(fh, "key = "); + _cfsml_write_int(fh, (int*) &(save_struc->key)); + fprintf(fh, "\n"); + fprintf(fh, "enabled = "); + _cfsml_write_int(fh, (int*) &(save_struc->enabled)); + fprintf(fh, "\n"); + fprintf(fh, "tag = "); + _cfsml_write_int(fh, (int*) &(save_struc->tag)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_menu_item_t(FILE *fh, menu_item_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record menu_item_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "type")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->type), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for type at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "keytext")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_string(fh, (char **) &(save_struc->keytext), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_string() for keytext at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "keytext_size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->keytext_size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for keytext_size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "flags")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "said")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } - // Prepare to restore static array - max = MENU_SAID_SPEC_SIZE; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_byte(fh, &(save_struc->said[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_byte() for said[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - } else - if (!strcmp(token, "said_pos")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->said_pos), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for said_pos at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "text")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_string(fh, (char **) &(save_struc->text), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_string() for text at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "text_pos")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->text_pos), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for text_pos at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "modifiers")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->modifiers), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for modifiers at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "key")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->key), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for key at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "enabled")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->enabled), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for enabled at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "tag")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->tag), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for tag at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("menu_item_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record menu_item_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "type")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->type), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for type at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "keytext")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_string(fh, (char **) &(save_struc->keytext), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_string() for keytext at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "keytext_size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->keytext_size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for keytext_size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "flags")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "said")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } + /* Prepare to restore static array */ + max = MENU_SAID_SPEC_SIZE; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_byte(fh, &(save_struc->said[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_byte() for said[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + } else + if (!strcmp(token, "said_pos")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->said_pos), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for said_pos at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "text")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_string(fh, (char **) &(save_struc->text), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_string() for text at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "text_pos")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->text_pos), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for text_pos at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "modifiers")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->modifiers), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for modifiers at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "key")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->key), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for key at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "enabled")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->enabled), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for enabled at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "tag")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->tag), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for tag at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("menu_item_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_node_entry_t(FILE *fh, node_entry_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "next_free = "); - _cfsml_write_int(fh, (int*) &(save_struc->next_free)); - fprintf(fh, "\n"); - fprintf(fh, "entry = "); - _cfsml_write_node_t(fh, (node_t*) &(save_struc->entry)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "next_free = "); + _cfsml_write_int(fh, (int*) &(save_struc->next_free)); + fprintf(fh, "\n"); + fprintf(fh, "entry = "); + _cfsml_write_node_t(fh, (node_t*) &(save_struc->entry)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_node_entry_t(FILE *fh, node_entry_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record node_entry_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "next_free")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "entry")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_node_t(fh, (node_t*) &(save_struc->entry), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_node_t() for entry at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("node_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record node_entry_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "next_free")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "entry")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_node_t(fh, (node_t*) &(save_struc->entry), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_node_t() for entry at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("node_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_seg_id_t(FILE *fh, seg_id_t* save_struc) { - fprintf(fh, "%li", (long)*save_struc); + fprintf(fh, "%li", (long) *save_struc); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; -#line 513 "savegame.cfsml" - - *save_struc = strtol(lastval, &token, 0); - if ((*save_struc == 0) && (token == lastval)) { - _cfsml_error("strtol failed at line %d\n", *line); - return CFSML_FAILURE; - } - if (*token != 0) { - _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); - return CFSML_FAILURE; - } - return CFSML_SUCCESS; + char *token; +#line 546 "savegame.cfsml" + + *save_struc = strtol(lastval, &token, 0); + if ( (*save_struc == 0) && (token == lastval) ) { + _cfsml_error("strtol failed at line %d\n", *line); + return CFSML_FAILURE; + } + if (*token != 0) { + _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); + return CFSML_FAILURE; + } + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_dynmem_t(FILE *fh, dynmem_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "size = "); - _cfsml_write_int(fh, (int*) &(save_struc->size)); - fprintf(fh, "\n"); - fprintf(fh, "description = "); - _cfsml_write_string(fh, (char **) &(save_struc->description)); - fprintf(fh, "\n"); - fprintf(fh, "buf = "); - min = max = save_struc->size; - if (!save_struc->buf) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_byte(fh, &(save_struc->buf[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "size = "); + _cfsml_write_int(fh, (int*) &(save_struc->size)); + fprintf(fh, "\n"); + fprintf(fh, "description = "); + _cfsml_write_string(fh, (char **) &(save_struc->description)); + fprintf(fh, "\n"); + fprintf(fh, "buf = "); + min = max = save_struc->size; + if (!save_struc->buf) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_byte(fh, &(save_struc->buf[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record dynmem_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "description")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_string(fh, (char **) &(save_struc->description), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_string() for description at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "buf")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->buf = (byte *)sci_malloc(max * sizeof(byte)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record dynmem_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "description")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_string(fh, (char **) &(save_struc->description), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_string() for description at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "buf")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->buf = (byte *) sci_malloc(max * sizeof(byte)); #ifdef SATISFY_PURIFY - memset(save_struc->buf, 0, max * sizeof(byte)); + memset(save_struc->buf, 0, max * sizeof(byte)); #endif - _cfsml_register_pointer(save_struc->buf); - } else - save_struc->buf = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_byte(fh, &(save_struc->buf[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_byte() for buf[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->size = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("dynmem_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->buf); + } + else + save_struc->buf = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_byte(fh, &(save_struc->buf[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_byte() for buf[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->size = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("dynmem_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_local_variables_t(FILE *fh, local_variables_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "script_id = "); - _cfsml_write_int(fh, (int*) &(save_struc->script_id)); - fprintf(fh, "\n"); - fprintf(fh, "nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->nr)); - fprintf(fh, "\n"); - fprintf(fh, "locals = "); - min = max = save_struc->nr; - if (!save_struc->locals) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - write_reg_t(fh, &(save_struc->locals[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "script_id = "); + _cfsml_write_int(fh, (int*) &(save_struc->script_id)); + fprintf(fh, "\n"); + fprintf(fh, "nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->nr)); + fprintf(fh, "\n"); + fprintf(fh, "locals = "); + min = max = save_struc->nr; + if (!save_struc->locals) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + write_reg_t(fh, &(save_struc->locals[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_local_variables_t(FILE *fh, local_variables_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record local_variables_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "script_id")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->script_id), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for script_id at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "locals")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->locals = (reg_t *)sci_malloc(max * sizeof(reg_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record local_variables_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "script_id")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->script_id), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for script_id at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "locals")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->locals = (reg_t *) sci_malloc(max * sizeof(reg_t)); #ifdef SATISFY_PURIFY - memset(save_struc->locals, 0, max * sizeof(reg_t)); + memset(save_struc->locals, 0, max * sizeof(reg_t)); #endif - _cfsml_register_pointer(save_struc->locals); - } else - save_struc->locals = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (read_reg_t(fh, &(save_struc->locals[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for locals[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("local_variables_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->locals); + } + else + save_struc->locals = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (read_reg_t(fh, &(save_struc->locals[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for locals[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("local_variables_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_state_t(FILE *fh, state_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "savegame_version = "); - _cfsml_write_int(fh, (int*) &(save_struc->savegame_version)); - fprintf(fh, "\n"); - fprintf(fh, "game_version = "); - _cfsml_write_string(fh, (char **) &(save_struc->game_version)); - fprintf(fh, "\n"); - fprintf(fh, "version = "); - write_sci_version(fh, (sci_version_t*) &(save_struc->version)); - fprintf(fh, "\n"); - fprintf(fh, "menubar = "); - write_menubar_tp(fh, (menubar_t **) &(save_struc->menubar)); - fprintf(fh, "\n"); - fprintf(fh, "status_bar_foreground = "); - _cfsml_write_int(fh, (int*) &(save_struc->status_bar_foreground)); - fprintf(fh, "\n"); - fprintf(fh, "status_bar_background = "); - _cfsml_write_int(fh, (int*) &(save_struc->status_bar_background)); - fprintf(fh, "\n"); - fprintf(fh, "seg_manager = "); - _cfsml_write_seg_manager_t(fh, (seg_manager_t*) &(save_struc->seg_manager)); - fprintf(fh, "\n"); - fprintf(fh, "classtable_size = "); - _cfsml_write_int(fh, (int*) &(save_struc->classtable_size)); - fprintf(fh, "\n"); - fprintf(fh, "classtable = "); - min = max = save_struc->classtable_size; - if (!save_struc->classtable) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_class_t(fh, &(save_struc->classtable[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "sound = "); - _cfsml_write_sfx_state_t(fh, (sfx_state_t*) &(save_struc->sound)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "savegame_version = "); + _cfsml_write_int(fh, (int*) &(save_struc->savegame_version)); + fprintf(fh, "\n"); + fprintf(fh, "game_version = "); + _cfsml_write_string(fh, (char **) &(save_struc->game_version)); + fprintf(fh, "\n"); + fprintf(fh, "version = "); + write_sci_version(fh, (sci_version_t*) &(save_struc->version)); + fprintf(fh, "\n"); + fprintf(fh, "menubar = "); + write_menubar_tp(fh, (menubar_t **) &(save_struc->menubar)); + fprintf(fh, "\n"); + fprintf(fh, "status_bar_foreground = "); + _cfsml_write_int(fh, (int*) &(save_struc->status_bar_foreground)); + fprintf(fh, "\n"); + fprintf(fh, "status_bar_background = "); + _cfsml_write_int(fh, (int*) &(save_struc->status_bar_background)); + fprintf(fh, "\n"); + fprintf(fh, "seg_manager = "); + _cfsml_write_seg_manager_t(fh, (seg_manager_t*) &(save_struc->seg_manager)); + fprintf(fh, "\n"); + fprintf(fh, "classtable_size = "); + _cfsml_write_int(fh, (int*) &(save_struc->classtable_size)); + fprintf(fh, "\n"); + fprintf(fh, "classtable = "); + min = max = save_struc->classtable_size; + if (!save_struc->classtable) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_class_t(fh, &(save_struc->classtable[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "sound = "); + _cfsml_write_sfx_state_t(fh, (sfx_state_t*) &(save_struc->sound)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_state_t(FILE *fh, state_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record state_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "savegame_version")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->savegame_version), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for savegame_version at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "game_version")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_string(fh, (char **) &(save_struc->game_version), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_string() for game_version at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "version")) { -#line 694 "savegame.cfsml" - if (read_sci_version(fh, (sci_version_t*) &(save_struc->version), value, line, hiteof)) { - _cfsml_error("Token expected by read_sci_version() for version at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "menubar")) { -#line 694 "savegame.cfsml" - if (read_menubar_tp(fh, (menubar_t **) &(save_struc->menubar), value, line, hiteof)) { - _cfsml_error("Token expected by read_menubar_tp() for menubar at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "status_bar_foreground")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->status_bar_foreground), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for status_bar_foreground at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "status_bar_background")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->status_bar_background), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for status_bar_background at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "seg_manager")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_seg_manager_t(fh, (seg_manager_t*) &(save_struc->seg_manager), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_seg_manager_t() for seg_manager at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "classtable_size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->classtable_size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for classtable_size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "classtable")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->classtable = (class_t *)sci_malloc(max * sizeof(class_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record state_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "savegame_version")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->savegame_version), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for savegame_version at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "game_version")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_string(fh, (char **) &(save_struc->game_version), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_string() for game_version at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "version")) { +#line 731 "savegame.cfsml" + if (read_sci_version(fh, (sci_version_t*) &(save_struc->version), value, line, hiteof)) { + _cfsml_error("Token expected by read_sci_version() for version at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "menubar")) { +#line 731 "savegame.cfsml" + if (read_menubar_tp(fh, (menubar_t **) &(save_struc->menubar), value, line, hiteof)) { + _cfsml_error("Token expected by read_menubar_tp() for menubar at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "status_bar_foreground")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->status_bar_foreground), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for status_bar_foreground at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "status_bar_background")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->status_bar_background), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for status_bar_background at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "seg_manager")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_seg_manager_t(fh, (seg_manager_t*) &(save_struc->seg_manager), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_seg_manager_t() for seg_manager at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "classtable_size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->classtable_size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for classtable_size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "classtable")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->classtable = (class_t *) sci_malloc(max * sizeof(class_t)); #ifdef SATISFY_PURIFY - memset(save_struc->classtable, 0, max * sizeof(class_t)); + memset(save_struc->classtable, 0, max * sizeof(class_t)); #endif - _cfsml_register_pointer(save_struc->classtable); - } else - save_struc->classtable = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_class_t(fh, &(save_struc->classtable[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_class_t() for classtable[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->classtable_size = max ; // Set array size accordingly - } else - if (!strcmp(token, "sound")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_sfx_state_t(fh, (sfx_state_t*) &(save_struc->sound), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_sfx_state_t() for sound at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->classtable); + } + else + save_struc->classtable = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_class_t(fh, &(save_struc->classtable[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_class_t() for classtable[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->classtable_size = max ; /* Set array size accordingly */ + } else + if (!strcmp(token, "sound")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_sfx_state_t(fh, (sfx_state_t*) &(save_struc->sound), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_sfx_state_t() for sound at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_node_table_t(FILE *fh, node_table_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "entries_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->entries_nr)); - fprintf(fh, "\n"); - fprintf(fh, "first_free = "); - _cfsml_write_int(fh, (int*) &(save_struc->first_free)); - fprintf(fh, "\n"); - fprintf(fh, "entries_used = "); - _cfsml_write_int(fh, (int*) &(save_struc->entries_used)); - fprintf(fh, "\n"); - fprintf(fh, "max_entry = "); - _cfsml_write_int(fh, (int*) &(save_struc->max_entry)); - fprintf(fh, "\n"); - fprintf(fh, "table = "); - min = max = save_struc->entries_nr; - if (!save_struc->table) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_node_entry_t(fh, &(save_struc->table[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "entries_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->entries_nr)); + fprintf(fh, "\n"); + fprintf(fh, "first_free = "); + _cfsml_write_int(fh, (int*) &(save_struc->first_free)); + fprintf(fh, "\n"); + fprintf(fh, "entries_used = "); + _cfsml_write_int(fh, (int*) &(save_struc->entries_used)); + fprintf(fh, "\n"); + fprintf(fh, "max_entry = "); + _cfsml_write_int(fh, (int*) &(save_struc->max_entry)); + fprintf(fh, "\n"); + fprintf(fh, "table = "); + min = max = save_struc->entries_nr; + if (!save_struc->table) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_node_entry_t(fh, &(save_struc->table[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_node_table_t(FILE *fh, node_table_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record node_table_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "entries_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "first_free")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "entries_used")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "max_entry")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "table")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->table = (node_entry_t *)sci_malloc(max * sizeof(node_entry_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record node_table_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "entries_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "first_free")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "entries_used")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "max_entry")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "table")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->table = (node_entry_t *) sci_malloc(max * sizeof(node_entry_t)); #ifdef SATISFY_PURIFY - memset(save_struc->table, 0, max * sizeof(node_entry_t)); + memset(save_struc->table, 0, max * sizeof(node_entry_t)); #endif - _cfsml_register_pointer(save_struc->table); - } else - save_struc->table = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_node_entry_t(fh, &(save_struc->table[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_node_entry_t() for table[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->entries_nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("node_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->table); + } + else + save_struc->table = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_node_entry_t(fh, &(save_struc->table[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_node_entry_t() for table[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->entries_nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("node_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_sys_strings_t(FILE *fh, sys_strings_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "strings = "); - min = max = SYS_STRINGS_MAX; -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_sys_string_t(fh, &(save_struc->strings[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "strings = "); + min = max = SYS_STRINGS_MAX; +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_sys_string_t(fh, &(save_struc->strings[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_sys_strings_t(FILE *fh, sys_strings_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record sys_strings_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "strings")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } - // Prepare to restore static array - max = SYS_STRINGS_MAX; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_sys_string_t(fh, &(save_struc->strings[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_sys_string_t() for strings[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("sys_strings_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record sys_strings_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "strings")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } + /* Prepare to restore static array */ + max = SYS_STRINGS_MAX; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_sys_string_t(fh, &(save_struc->strings[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_sys_string_t() for strings[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("sys_strings_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_byte(FILE *fh, byte* save_struc) { - fprintf(fh, "%li", (long)*save_struc); + fprintf(fh, "%li", (long) *save_struc); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_byte(FILE *fh, byte* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; -#line 513 "savegame.cfsml" - - *save_struc = strtol(lastval, &token, 0); - if ((*save_struc == 0) && (token == lastval)) { - _cfsml_error("strtol failed at line %d\n", *line); - return CFSML_FAILURE; - } - if (*token != 0) { - _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); - return CFSML_FAILURE; - } - return CFSML_SUCCESS; + char *token; +#line 546 "savegame.cfsml" + + *save_struc = strtol(lastval, &token, 0); + if ( (*save_struc == 0) && (token == lastval) ) { + _cfsml_error("strtol failed at line %d\n", *line); + return CFSML_FAILURE; + } + if (*token != 0) { + _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); + return CFSML_FAILURE; + } + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_node_t(FILE *fh, node_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "pred = "); - write_reg_t(fh, (reg_t*) &(save_struc->pred)); - fprintf(fh, "\n"); - fprintf(fh, "succ = "); - write_reg_t(fh, (reg_t*) &(save_struc->succ)); - fprintf(fh, "\n"); - fprintf(fh, "key = "); - write_reg_t(fh, (reg_t*) &(save_struc->key)); - fprintf(fh, "\n"); - fprintf(fh, "value = "); - write_reg_t(fh, (reg_t*) &(save_struc->value)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "pred = "); + write_reg_t(fh, (reg_t*) &(save_struc->pred)); + fprintf(fh, "\n"); + fprintf(fh, "succ = "); + write_reg_t(fh, (reg_t*) &(save_struc->succ)); + fprintf(fh, "\n"); + fprintf(fh, "key = "); + write_reg_t(fh, (reg_t*) &(save_struc->key)); + fprintf(fh, "\n"); + fprintf(fh, "value = "); + write_reg_t(fh, (reg_t*) &(save_struc->value)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_node_t(FILE *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record node_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "pred")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->pred), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for pred at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "succ")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->succ), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for succ at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "key")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->key), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for key at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "value")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->value), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for value at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("node_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record node_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "pred")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->pred), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for pred at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "succ")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->succ), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for succ at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "key")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->key), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for key at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "value")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->value), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for value at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("node_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_list_table_t(FILE *fh, list_table_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "entries_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->entries_nr)); - fprintf(fh, "\n"); - fprintf(fh, "first_free = "); - _cfsml_write_int(fh, (int*) &(save_struc->first_free)); - fprintf(fh, "\n"); - fprintf(fh, "entries_used = "); - _cfsml_write_int(fh, (int*) &(save_struc->entries_used)); - fprintf(fh, "\n"); - fprintf(fh, "max_entry = "); - _cfsml_write_int(fh, (int*) &(save_struc->max_entry)); - fprintf(fh, "\n"); - fprintf(fh, "table = "); - min = max = save_struc->entries_nr; - if (!save_struc->table) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_list_entry_t(fh, &(save_struc->table[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "entries_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->entries_nr)); + fprintf(fh, "\n"); + fprintf(fh, "first_free = "); + _cfsml_write_int(fh, (int*) &(save_struc->first_free)); + fprintf(fh, "\n"); + fprintf(fh, "entries_used = "); + _cfsml_write_int(fh, (int*) &(save_struc->entries_used)); + fprintf(fh, "\n"); + fprintf(fh, "max_entry = "); + _cfsml_write_int(fh, (int*) &(save_struc->max_entry)); + fprintf(fh, "\n"); + fprintf(fh, "table = "); + min = max = save_struc->entries_nr; + if (!save_struc->table) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_list_entry_t(fh, &(save_struc->table[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_list_table_t(FILE *fh, list_table_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record list_table_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "entries_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "first_free")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "entries_used")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "max_entry")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "table")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->table = (list_entry_t *)sci_malloc(max * sizeof(list_entry_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record list_table_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "entries_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "first_free")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "entries_used")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "max_entry")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "table")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->table = (list_entry_t *) sci_malloc(max * sizeof(list_entry_t)); #ifdef SATISFY_PURIFY - memset(save_struc->table, 0, max * sizeof(list_entry_t)); + memset(save_struc->table, 0, max * sizeof(list_entry_t)); #endif - _cfsml_register_pointer(save_struc->table); - } else - save_struc->table = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_list_entry_t(fh, &(save_struc->table[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_list_entry_t() for table[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->entries_nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("list_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->table); + } + else + save_struc->table = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_list_entry_t(fh, &(save_struc->table[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_list_entry_t() for table[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->entries_nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("list_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_class_t(FILE *fh, class_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "script = "); - _cfsml_write_int(fh, (int*) &(save_struc->script)); - fprintf(fh, "\n"); - fprintf(fh, "reg = "); - write_reg_t(fh, (reg_t*) &(save_struc->reg)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "script = "); + _cfsml_write_int(fh, (int*) &(save_struc->script)); + fprintf(fh, "\n"); + fprintf(fh, "reg = "); + write_reg_t(fh, (reg_t*) &(save_struc->reg)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_class_t(FILE *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record class_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "script")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->script), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for script at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "reg")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->reg), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for reg at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("class_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record class_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "script")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->script), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for script at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "reg")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->reg), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for reg at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("class_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_song_handle_t(FILE *fh, song_handle_t* save_struc) { - fprintf(fh, "%li", (long)*save_struc); + fprintf(fh, "%li", (long) *save_struc); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; -#line 513 "savegame.cfsml" - - *save_struc = strtol(lastval, &token, 0); - if ((*save_struc == 0) && (token == lastval)) { - _cfsml_error("strtol failed at line %d\n", *line); - return CFSML_FAILURE; - } - if (*token != 0) { - _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); - return CFSML_FAILURE; - } - return CFSML_SUCCESS; + char *token; +#line 546 "savegame.cfsml" + + *save_struc = strtol(lastval, &token, 0); + if ( (*save_struc == 0) && (token == lastval) ) { + _cfsml_error("strtol failed at line %d\n", *line); + return CFSML_FAILURE; + } + if (*token != 0) { + _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); + return CFSML_FAILURE; + } + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_int(FILE *fh, int* save_struc) { - fprintf(fh, "%li", (long)*save_struc); + fprintf(fh, "%li", (long) *save_struc); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_int(FILE *fh, int* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; -#line 513 "savegame.cfsml" - - *save_struc = strtol(lastval, &token, 0); - if ((*save_struc == 0) && (token == lastval)) { - _cfsml_error("strtol failed at line %d\n", *line); - return CFSML_FAILURE; - } - if (*token != 0) { - _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); - return CFSML_FAILURE; - } - return CFSML_SUCCESS; + char *token; +#line 546 "savegame.cfsml" + + *save_struc = strtol(lastval, &token, 0); + if ( (*save_struc == 0) && (token == lastval) ) { + _cfsml_error("strtol failed at line %d\n", *line); + return CFSML_FAILURE; + } + if (*token != 0) { + _cfsml_error("Non-integer encountered while parsing int value at line %d\n", *line); + return CFSML_FAILURE; + } + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_menu_t(FILE *fh, menu_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "title = "); - _cfsml_write_string(fh, (char **) &(save_struc->title)); - fprintf(fh, "\n"); - fprintf(fh, "title_width = "); - _cfsml_write_int(fh, (int*) &(save_struc->title_width)); - fprintf(fh, "\n"); - fprintf(fh, "width = "); - _cfsml_write_int(fh, (int*) &(save_struc->width)); - fprintf(fh, "\n"); - fprintf(fh, "items = "); - min = max = save_struc->items_nr; - if (!save_struc->items) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_menu_item_t(fh, &(save_struc->items[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "title = "); + _cfsml_write_string(fh, (char **) &(save_struc->title)); + fprintf(fh, "\n"); + fprintf(fh, "title_width = "); + _cfsml_write_int(fh, (int*) &(save_struc->title_width)); + fprintf(fh, "\n"); + fprintf(fh, "width = "); + _cfsml_write_int(fh, (int*) &(save_struc->width)); + fprintf(fh, "\n"); + fprintf(fh, "items = "); + min = max = save_struc->items_nr; + if (!save_struc->items) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_menu_item_t(fh, &(save_struc->items[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_menu_t(FILE *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record menu_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "title")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_string(fh, (char **) &(save_struc->title), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_string() for title at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "title_width")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->title_width), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for title_width at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "width")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->width), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for width at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "items")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->items = (menu_item_t *)sci_malloc(max * sizeof(menu_item_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record menu_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "title")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_string(fh, (char **) &(save_struc->title), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_string() for title at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "title_width")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->title_width), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for title_width at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "width")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->width), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for width at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "items")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->items = (menu_item_t *) sci_malloc(max * sizeof(menu_item_t)); #ifdef SATISFY_PURIFY - memset(save_struc->items, 0, max * sizeof(menu_item_t)); + memset(save_struc->items, 0, max * sizeof(menu_item_t)); #endif - _cfsml_register_pointer(save_struc->items); - } else - save_struc->items = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_menu_item_t(fh, &(save_struc->items[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_menu_item_t() for items[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->items_nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("menu_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->items); + } + else + save_struc->items = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_menu_item_t(fh, &(save_struc->items[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_menu_item_t() for items[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->items_nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("menu_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_clone_table_t(FILE *fh, clone_table_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "entries_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->entries_nr)); - fprintf(fh, "\n"); - fprintf(fh, "first_free = "); - _cfsml_write_int(fh, (int*) &(save_struc->first_free)); - fprintf(fh, "\n"); - fprintf(fh, "entries_used = "); - _cfsml_write_int(fh, (int*) &(save_struc->entries_used)); - fprintf(fh, "\n"); - fprintf(fh, "max_entry = "); - _cfsml_write_int(fh, (int*) &(save_struc->max_entry)); - fprintf(fh, "\n"); - fprintf(fh, "table = "); - min = max = save_struc->entries_nr; - if (!save_struc->table) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_clone_entry_t(fh, &(save_struc->table[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "entries_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->entries_nr)); + fprintf(fh, "\n"); + fprintf(fh, "first_free = "); + _cfsml_write_int(fh, (int*) &(save_struc->first_free)); + fprintf(fh, "\n"); + fprintf(fh, "entries_used = "); + _cfsml_write_int(fh, (int*) &(save_struc->entries_used)); + fprintf(fh, "\n"); + fprintf(fh, "max_entry = "); + _cfsml_write_int(fh, (int*) &(save_struc->max_entry)); + fprintf(fh, "\n"); + fprintf(fh, "table = "); + min = max = save_struc->entries_nr; + if (!save_struc->table) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_clone_entry_t(fh, &(save_struc->table[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_clone_table_t(FILE *fh, clone_table_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record clone_table_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "entries_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "first_free")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "entries_used")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "max_entry")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "table")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->table = (clone_entry_t *)sci_malloc(max * sizeof(clone_entry_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record clone_table_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "entries_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "first_free")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "entries_used")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "max_entry")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "table")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->table = (clone_entry_t *) sci_malloc(max * sizeof(clone_entry_t)); #ifdef SATISFY_PURIFY - memset(save_struc->table, 0, max * sizeof(clone_entry_t)); + memset(save_struc->table, 0, max * sizeof(clone_entry_t)); #endif - _cfsml_register_pointer(save_struc->table); - } else - save_struc->table = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_clone_entry_t(fh, &(save_struc->table[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_clone_entry_t() for table[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->entries_nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("clone_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->table); + } + else + save_struc->table = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_clone_entry_t(fh, &(save_struc->table[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_clone_entry_t() for table[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->entries_nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("clone_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_clone_t(FILE *fh, clone_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "flags = "); - _cfsml_write_int(fh, (int*) &(save_struc->flags)); - fprintf(fh, "\n"); - fprintf(fh, "pos = "); - write_reg_t(fh, (reg_t*) &(save_struc->pos)); - fprintf(fh, "\n"); - fprintf(fh, "variables_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->variables_nr)); - fprintf(fh, "\n"); - fprintf(fh, "variable_names_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->variable_names_nr)); - fprintf(fh, "\n"); - fprintf(fh, "methods_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->methods_nr)); - fprintf(fh, "\n"); - fprintf(fh, "variables = "); - min = max = save_struc->variables_nr; - if (!save_struc->variables) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - write_reg_t(fh, &(save_struc->variables[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "flags = "); + _cfsml_write_int(fh, (int*) &(save_struc->flags)); + fprintf(fh, "\n"); + fprintf(fh, "pos = "); + write_reg_t(fh, (reg_t*) &(save_struc->pos)); + fprintf(fh, "\n"); + fprintf(fh, "variables_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->variables_nr)); + fprintf(fh, "\n"); + fprintf(fh, "variable_names_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->variable_names_nr)); + fprintf(fh, "\n"); + fprintf(fh, "methods_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->methods_nr)); + fprintf(fh, "\n"); + fprintf(fh, "variables = "); + min = max = save_struc->variables_nr; + if (!save_struc->variables) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + write_reg_t(fh, &(save_struc->variables[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_clone_t(FILE *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record clone_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "flags")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "pos")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->pos), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for pos at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "variables_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->variables_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for variables_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "variable_names_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->variable_names_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for variable_names_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "methods_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->methods_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for methods_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "variables")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->variables = (reg_t *)sci_malloc(max * sizeof(reg_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record clone_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "flags")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "pos")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->pos), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for pos at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "variables_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->variables_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for variables_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "variable_names_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->variable_names_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for variable_names_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "methods_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->methods_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for methods_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "variables")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->variables = (reg_t *) sci_malloc(max * sizeof(reg_t)); #ifdef SATISFY_PURIFY - memset(save_struc->variables, 0, max * sizeof(reg_t)); + memset(save_struc->variables, 0, max * sizeof(reg_t)); #endif - _cfsml_register_pointer(save_struc->variables); - } else - save_struc->variables = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (read_reg_t(fh, &(save_struc->variables[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for variables[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->variables_nr = max ; // Set array size accordingly - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("clone_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->variables); + } + else + save_struc->variables = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (read_reg_t(fh, &(save_struc->variables[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for variables[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->variables_nr = max ; /* Set array size accordingly */ + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("clone_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_list_t(FILE *fh, list_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "first = "); - write_reg_t(fh, (reg_t*) &(save_struc->first)); - fprintf(fh, "\n"); - fprintf(fh, "last = "); - write_reg_t(fh, (reg_t*) &(save_struc->last)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "first = "); + write_reg_t(fh, (reg_t*) &(save_struc->first)); + fprintf(fh, "\n"); + fprintf(fh, "last = "); + write_reg_t(fh, (reg_t*) &(save_struc->last)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_list_t(FILE *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record list_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "first")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->first), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for first at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "last")) { -#line 694 "savegame.cfsml" - if (read_reg_t(fh, (reg_t*) &(save_struc->last), value, line, hiteof)) { - _cfsml_error("Token expected by read_reg_t() for last at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("list_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record list_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "first")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->first), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for first at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "last")) { +#line 731 "savegame.cfsml" + if (read_reg_t(fh, (reg_t*) &(save_struc->last), value, line, hiteof)) { + _cfsml_error("Token expected by read_reg_t() for last at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("list_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_sys_string_t(FILE *fh, sys_string_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "name = "); - _cfsml_write_string(fh, (char **) &(save_struc->name)); - fprintf(fh, "\n"); - fprintf(fh, "max_size = "); - _cfsml_write_int(fh, (int*) &(save_struc->max_size)); - fprintf(fh, "\n"); - fprintf(fh, "value = "); - _cfsml_write_string(fh, (char **) &(save_struc->value)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "name = "); + _cfsml_write_string(fh, (char **) &(save_struc->name)); + fprintf(fh, "\n"); + fprintf(fh, "max_size = "); + _cfsml_write_int(fh, (int*) &(save_struc->max_size)); + fprintf(fh, "\n"); + fprintf(fh, "value = "); + _cfsml_write_string(fh, (char **) &(save_struc->value)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_sys_string_t(FILE *fh, sys_string_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record sys_string_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "name")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_string(fh, (char **) &(save_struc->name), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_string() for name at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "max_size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->max_size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for max_size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "value")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_string(fh, (char **) &(save_struc->value), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_string() for value at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("sys_string_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record sys_string_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "name")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_string(fh, (char **) &(save_struc->name), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_string() for name at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "max_size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->max_size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for max_size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "value")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_string(fh, (char **) &(save_struc->value), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_string() for value at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("sys_string_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_script_t(FILE *fh, script_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->nr)); - fprintf(fh, "\n"); - fprintf(fh, "buf_size = "); - _cfsml_write_size_t(fh, (size_t*) &(save_struc->buf_size)); - fprintf(fh, "\n"); - fprintf(fh, "script_size = "); - _cfsml_write_size_t(fh, (size_t*) &(save_struc->script_size)); - fprintf(fh, "\n"); - fprintf(fh, "heap_size = "); - _cfsml_write_size_t(fh, (size_t*) &(save_struc->heap_size)); - fprintf(fh, "\n"); - fprintf(fh, "obj_indices = "); - write_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->obj_indices)); - fprintf(fh, "\n"); - fprintf(fh, "exports_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->exports_nr)); - fprintf(fh, "\n"); - fprintf(fh, "synonyms_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->synonyms_nr)); - fprintf(fh, "\n"); - fprintf(fh, "lockers = "); - _cfsml_write_int(fh, (int*) &(save_struc->lockers)); - fprintf(fh, "\n"); - fprintf(fh, "objects_allocated = "); - _cfsml_write_int(fh, (int*) &(save_struc->objects_allocated)); - fprintf(fh, "\n"); - fprintf(fh, "objects_nr = "); - _cfsml_write_int(fh, (int*) &(save_struc->objects_nr)); - fprintf(fh, "\n"); - fprintf(fh, "objects = "); - min = max = save_struc->objects_allocated; - if (!save_struc->objects) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - _cfsml_write_object_t(fh, &(save_struc->objects[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "locals_offset = "); - _cfsml_write_int(fh, (int*) &(save_struc->locals_offset)); - fprintf(fh, "\n"); - fprintf(fh, "locals_segment = "); - _cfsml_write_int(fh, (int*) &(save_struc->locals_segment)); - fprintf(fh, "\n"); - fprintf(fh, "marked_as_deleted = "); - _cfsml_write_int(fh, (int*) &(save_struc->marked_as_deleted)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->nr)); + fprintf(fh, "\n"); + fprintf(fh, "buf_size = "); + _cfsml_write_size_t(fh, (size_t*) &(save_struc->buf_size)); + fprintf(fh, "\n"); + fprintf(fh, "script_size = "); + _cfsml_write_size_t(fh, (size_t*) &(save_struc->script_size)); + fprintf(fh, "\n"); + fprintf(fh, "heap_size = "); + _cfsml_write_size_t(fh, (size_t*) &(save_struc->heap_size)); + fprintf(fh, "\n"); + fprintf(fh, "obj_indices = "); + write_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->obj_indices)); + fprintf(fh, "\n"); + fprintf(fh, "exports_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->exports_nr)); + fprintf(fh, "\n"); + fprintf(fh, "synonyms_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->synonyms_nr)); + fprintf(fh, "\n"); + fprintf(fh, "lockers = "); + _cfsml_write_int(fh, (int*) &(save_struc->lockers)); + fprintf(fh, "\n"); + fprintf(fh, "objects_allocated = "); + _cfsml_write_int(fh, (int*) &(save_struc->objects_allocated)); + fprintf(fh, "\n"); + fprintf(fh, "objects_nr = "); + _cfsml_write_int(fh, (int*) &(save_struc->objects_nr)); + fprintf(fh, "\n"); + fprintf(fh, "objects = "); + min = max = save_struc->objects_allocated; + if (!save_struc->objects) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + _cfsml_write_object_t(fh, &(save_struc->objects[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "locals_offset = "); + _cfsml_write_int(fh, (int*) &(save_struc->locals_offset)); + fprintf(fh, "\n"); + fprintf(fh, "locals_segment = "); + _cfsml_write_int(fh, (int*) &(save_struc->locals_segment)); + fprintf(fh, "\n"); + fprintf(fh, "marked_as_deleted = "); + _cfsml_write_int(fh, (int*) &(save_struc->marked_as_deleted)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_script_t(FILE *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record script_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "buf_size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->buf_size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_size_t() for buf_size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "script_size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->script_size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_size_t() for script_size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "heap_size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->heap_size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_size_t() for heap_size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "obj_indices")) { -#line 694 "savegame.cfsml" - if (read_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->obj_indices), value, line, hiteof)) { - _cfsml_error("Token expected by read_int_hash_map_tp() for obj_indices at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "exports_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->exports_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for exports_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "synonyms_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->synonyms_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for synonyms_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "lockers")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->lockers), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for lockers at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "objects_allocated")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->objects_allocated), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for objects_allocated at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "objects_nr")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->objects_nr), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for objects_nr at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "objects")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->objects = (object_t *)sci_malloc(max * sizeof(object_t)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record script_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "buf_size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->buf_size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_size_t() for buf_size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "script_size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->script_size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_size_t() for script_size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "heap_size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->heap_size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_size_t() for heap_size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "obj_indices")) { +#line 731 "savegame.cfsml" + if (read_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->obj_indices), value, line, hiteof)) { + _cfsml_error("Token expected by read_int_hash_map_tp() for obj_indices at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "exports_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->exports_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for exports_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "synonyms_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->synonyms_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for synonyms_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "lockers")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->lockers), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for lockers at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "objects_allocated")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->objects_allocated), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for objects_allocated at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "objects_nr")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->objects_nr), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for objects_nr at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "objects")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->objects = (object_t *) sci_malloc(max * sizeof(object_t)); #ifdef SATISFY_PURIFY - memset(save_struc->objects, 0, max * sizeof(object_t)); + memset(save_struc->objects, 0, max * sizeof(object_t)); #endif - _cfsml_register_pointer(save_struc->objects); - } else - save_struc->objects = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (_cfsml_read_object_t(fh, &(save_struc->objects[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_object_t() for objects[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->objects_allocated = max ; // Set array size accordingly - } else - if (!strcmp(token, "locals_offset")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->locals_offset), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for locals_offset at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "locals_segment")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->locals_segment), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for locals_segment at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "marked_as_deleted")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->marked_as_deleted), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for marked_as_deleted at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("script_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->objects); + } + else + save_struc->objects = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (_cfsml_read_object_t(fh, &(save_struc->objects[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_object_t() for objects[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->objects_allocated = max ; /* Set array size accordingly */ + } else + if (!strcmp(token, "locals_offset")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->locals_offset), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for locals_offset at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "locals_segment")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->locals_segment), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for locals_segment at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "marked_as_deleted")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->marked_as_deleted), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for marked_as_deleted at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("script_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -#line 396 "savegame.cfsml" +#line 426 "savegame.cfsml" static void _cfsml_write_seg_manager_t(FILE *fh, seg_manager_t* save_struc) { - int min, max, i; - -#line 416 "savegame.cfsml" - fprintf(fh, "{\n"); - fprintf(fh, "id_seg_map = "); - write_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->id_seg_map)); - fprintf(fh, "\n"); - fprintf(fh, "heap = "); - min = max = save_struc->heap_size; - if (!save_struc->heap) - min = max = 0; /* Don't write if it points to NULL */ -#line 442 "savegame.cfsml" - fprintf(fh, "[%d][\n", max); - for (i = 0; i < min; i++) { - write_mem_obj_tp(fh, &(save_struc->heap[i])); - fprintf(fh, "\n"); - } - fprintf(fh, "]"); - fprintf(fh, "\n"); - fprintf(fh, "heap_size = "); - _cfsml_write_int(fh, (int*) &(save_struc->heap_size)); - fprintf(fh, "\n"); - fprintf(fh, "reserved_id = "); - _cfsml_write_int(fh, (int*) &(save_struc->reserved_id)); - fprintf(fh, "\n"); - fprintf(fh, "exports_wide = "); - _cfsml_write_int(fh, (int*) &(save_struc->exports_wide)); - fprintf(fh, "\n"); - fprintf(fh, "sci1_1 = "); - _cfsml_write_int(fh, (int*) &(save_struc->sci1_1)); - fprintf(fh, "\n"); - fprintf(fh, "gc_mark_bits = "); - _cfsml_write_int(fh, (int*) &(save_struc->gc_mark_bits)); - fprintf(fh, "\n"); - fprintf(fh, "mem_allocated = "); - _cfsml_write_size_t(fh, (size_t*) &(save_struc->mem_allocated)); - fprintf(fh, "\n"); - fprintf(fh, "clones_seg_id = "); - _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->clones_seg_id)); - fprintf(fh, "\n"); - fprintf(fh, "lists_seg_id = "); - _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->lists_seg_id)); - fprintf(fh, "\n"); - fprintf(fh, "nodes_seg_id = "); - _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->nodes_seg_id)); - fprintf(fh, "\n"); - fprintf(fh, "}"); + int min, max, i; + +#line 446 "savegame.cfsml" + fprintf(fh, "{\n"); + fprintf(fh, "id_seg_map = "); + write_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->id_seg_map)); + fprintf(fh, "\n"); + fprintf(fh, "heap = "); + min = max = save_struc->heap_size; + if (!save_struc->heap) + min = max = 0; /* Don't write if it points to NULL */ +#line 472 "savegame.cfsml" + fprintf(fh, "[%d][\n", max); + for (i = 0; i < min; i++) { + write_mem_obj_tp(fh, &(save_struc->heap[i])); + fprintf(fh, "\n"); + } + fprintf(fh, "]"); + fprintf(fh, "\n"); + fprintf(fh, "heap_size = "); + _cfsml_write_int(fh, (int*) &(save_struc->heap_size)); + fprintf(fh, "\n"); + fprintf(fh, "reserved_id = "); + _cfsml_write_int(fh, (int*) &(save_struc->reserved_id)); + fprintf(fh, "\n"); + fprintf(fh, "exports_wide = "); + _cfsml_write_int(fh, (int*) &(save_struc->exports_wide)); + fprintf(fh, "\n"); + fprintf(fh, "sci1_1 = "); + _cfsml_write_int(fh, (int*) &(save_struc->sci1_1)); + fprintf(fh, "\n"); + fprintf(fh, "gc_mark_bits = "); + _cfsml_write_int(fh, (int*) &(save_struc->gc_mark_bits)); + fprintf(fh, "\n"); + fprintf(fh, "mem_allocated = "); + _cfsml_write_size_t(fh, (size_t*) &(save_struc->mem_allocated)); + fprintf(fh, "\n"); + fprintf(fh, "clones_seg_id = "); + _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->clones_seg_id)); + fprintf(fh, "\n"); + fprintf(fh, "lists_seg_id = "); + _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->lists_seg_id)); + fprintf(fh, "\n"); + fprintf(fh, "nodes_seg_id = "); + _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->nodes_seg_id)); + fprintf(fh, "\n"); + fprintf(fh, "}"); } -#line 489 "savegame.cfsml" +#line 520 "savegame.cfsml" static int _cfsml_read_seg_manager_t(FILE *fh, seg_manager_t* save_struc, const char *lastval, int *line, int *hiteof) { - char *token; - int min, max, i; -#line 547 "savegame.cfsml" - int assignment, closed, done; - - if (strcmp(lastval, "{")) { - _cfsml_error("Reading record seg_manager_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval); - return CFSML_FAILURE; - }; - closed = 0; - do { - const char *value; - token = _cfsml_get_identifier(fh, line, hiteof, &assignment); - - if (!token) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!assignment) { - if (!strcmp(token, "}")) - closed = 1; - else { - _cfsml_error("Expected assignment or closing braces in line %d\n", *line); - return CFSML_FAILURE; - } - } else { - value = ""; - while (!value || !strcmp(value, "")) - value = _cfsml_get_value(fh, line, hiteof); - if (!value) { - _cfsml_error("Expected token at line %d\n", *line); - return CFSML_FAILURE; - } - if (!strcmp(token, "id_seg_map")) { -#line 694 "savegame.cfsml" - if (read_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->id_seg_map), value, line, hiteof)) { - _cfsml_error("Token expected by read_int_hash_map_tp() for id_seg_map at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "heap")) { -#line 609 "savegame.cfsml" - if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { - _cfsml_error("Opening brackets expected at line %d\n", *line); - return CFSML_FAILURE; - } -#line 619 "savegame.cfsml" - // Prepare to restore dynamic array - max = strtol(value + 1, NULL, 0); - if (max < 0) { - _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); - return CFSML_FAILURE; - } - - if (max) { - save_struc->heap = (mem_obj_ptr *)sci_malloc(max * sizeof(mem_obj_ptr)); + char *token; +int min, max, i; +#line 581 "savegame.cfsml" + int assignment, closed, done; + + if (strcmp(lastval, "{")) { + _cfsml_error("Reading record seg_manager_t; expected opening braces in line %d, got \"%s\"\n",*line, lastval); + return CFSML_FAILURE; + }; + closed = 0; + do { + const char *value; + token = _cfsml_get_identifier(fh, line, hiteof, &assignment); + + if (!token) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!assignment) { + if (!strcmp(token, "}")) + closed = 1; + else { + _cfsml_error("Expected assignment or closing braces in line %d\n", *line); + return CFSML_FAILURE; + } + } else { + value = ""; + while (!value || !strcmp(value, "")) + value = _cfsml_get_value(fh, line, hiteof); + if (!value) { + _cfsml_error("Expected token at line %d\n", *line); + return CFSML_FAILURE; + } + if (!strcmp(token, "id_seg_map")) { +#line 731 "savegame.cfsml" + if (read_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->id_seg_map), value, line, hiteof)) { + _cfsml_error("Token expected by read_int_hash_map_tp() for id_seg_map at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "heap")) { +#line 645 "savegame.cfsml" + if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) { + _cfsml_error("Opening brackets expected at line %d\n", *line); + return CFSML_FAILURE; + } +#line 655 "savegame.cfsml" + /* Prepare to restore dynamic array */ + max = strtol(value + 1, NULL, 0); + if (max < 0) { + _cfsml_error("Invalid number of elements to allocate for dynamic array '%s' at line %d\n", token, *line); + return CFSML_FAILURE; + } + + if (max) { + save_struc->heap = (mem_obj_ptr *) sci_malloc(max * sizeof(mem_obj_ptr)); #ifdef SATISFY_PURIFY - memset(save_struc->heap, 0, max * sizeof(mem_obj_ptr)); + memset(save_struc->heap, 0, max * sizeof(mem_obj_ptr)); #endif - _cfsml_register_pointer(save_struc->heap); - } else - save_struc->heap = NULL; -#line 643 "savegame.cfsml" - done = i = 0; - do { - if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { -#line 651 "savegame.cfsml" - _cfsml_error("Token expected at line %d\n", *line); - return 1; - } - if (strcmp(value, "]")) { - if (i == max) { - _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); - return CFSML_FAILURE; - } - if (read_mem_obj_tp(fh, &(save_struc->heap[i++]), value, line, hiteof)) { - _cfsml_error("Token expected by read_mem_obj_tp() for heap[i++] at line %d\n", *line); - return CFSML_FAILURE; - } - } else - done = 1; - } while (!done); - save_struc->heap_size = max ; // Set array size accordingly - } else - if (!strcmp(token, "heap_size")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->heap_size), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for heap_size at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "reserved_id")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->reserved_id), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for reserved_id at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "exports_wide")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->exports_wide), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for exports_wide at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "sci1_1")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->sci1_1), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for sci1_1 at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "gc_mark_bits")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_int(fh, (int*) &(save_struc->gc_mark_bits), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_int() for gc_mark_bits at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "mem_allocated")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->mem_allocated), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_size_t() for mem_allocated at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "clones_seg_id")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_seg_id_t(fh, (seg_id_t*) &(save_struc->clones_seg_id), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_seg_id_t() for clones_seg_id at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "lists_seg_id")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_seg_id_t(fh, (seg_id_t*) &(save_struc->lists_seg_id), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_seg_id_t() for lists_seg_id at line %d\n", *line); - return CFSML_FAILURE; - } - } else - if (!strcmp(token, "nodes_seg_id")) { -#line 694 "savegame.cfsml" - if (_cfsml_read_seg_id_t(fh, (seg_id_t*) &(save_struc->nodes_seg_id), value, line, hiteof)) { - _cfsml_error("Token expected by _cfsml_read_seg_id_t() for nodes_seg_id at line %d\n", *line); - return CFSML_FAILURE; - } - } else -#line 703 "savegame.cfsml" - { - _cfsml_error("seg_manager_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); - return CFSML_FAILURE; - } - } - } while (!closed); // Until closing braces are hit - return CFSML_SUCCESS; + _cfsml_register_pointer(save_struc->heap); + } + else + save_struc->heap = NULL; +#line 681 "savegame.cfsml" + done = i = 0; + do { + if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) { +#line 689 "savegame.cfsml" + _cfsml_error("Token expected at line %d\n", *line); + return 1; + } + if (strcmp(value, "]")) { + if (i == max) { + _cfsml_error("More elements than space available (%d) in '%s' at line %d\n", max, token, *line); + return CFSML_FAILURE; + } + if (read_mem_obj_tp(fh, &(save_struc->heap[i++]), value, line, hiteof)) { + _cfsml_error("Token expected by read_mem_obj_tp() for heap[i++] at line %d\n", *line); + return CFSML_FAILURE; + } + } else done = 1; + } while (!done); + save_struc->heap_size = max ; /* Set array size accordingly */ + } else + if (!strcmp(token, "heap_size")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->heap_size), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for heap_size at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "reserved_id")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->reserved_id), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for reserved_id at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "exports_wide")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->exports_wide), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for exports_wide at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "sci1_1")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->sci1_1), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for sci1_1 at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "gc_mark_bits")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_int(fh, (int*) &(save_struc->gc_mark_bits), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_int() for gc_mark_bits at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "mem_allocated")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->mem_allocated), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_size_t() for mem_allocated at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "clones_seg_id")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_seg_id_t(fh, (seg_id_t*) &(save_struc->clones_seg_id), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_seg_id_t() for clones_seg_id at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "lists_seg_id")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_seg_id_t(fh, (seg_id_t*) &(save_struc->lists_seg_id), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_seg_id_t() for lists_seg_id at line %d\n", *line); + return CFSML_FAILURE; + } + } else + if (!strcmp(token, "nodes_seg_id")) { +#line 731 "savegame.cfsml" + if (_cfsml_read_seg_id_t(fh, (seg_id_t*) &(save_struc->nodes_seg_id), value, line, hiteof)) { + _cfsml_error("Token expected by _cfsml_read_seg_id_t() for nodes_seg_id at line %d\n", *line); + return CFSML_FAILURE; + } + } else +#line 740 "savegame.cfsml" + { + _cfsml_error("seg_manager_t: Assignment to invalid identifier '%s' in line %d\n", token, *line); + return CFSML_FAILURE; + } + } + } while (!closed); /* Until closing braces are hit */ + return CFSML_SUCCESS; } -// Auto-generated CFSML declaration and function block ends here -// Auto-generation performed by cfsml.pl 0.8.2 +/* Auto-generated CFSML declaration and function block ends here */ +/* Auto-generation performed by cfsml.pl 0.8.2 */ #line 384 "savegame.cfsml" void write_songlib_t(FILE *fh, songlib_t *songlib) { @@ -3875,11 +3961,11 @@ void write_songlib_t(FILE *fh, songlib_t *songlib) { fprintf(fh, "[\n"); while (seeker) { seeker->restore_time = seeker->it->get_timepos(seeker->it); -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_song_t(fh, seeker); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_song_t(fh, seeker); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 396 "savegame.cfsml" seeker = seeker->next; } @@ -3900,29 +3986,29 @@ int read_songlib_t(FILE *fh, songlib_t *songlib, const char *lastval, int *line, *line += 4; song_lib_init(songlib); for (i = 0; i < songcount; i++) { -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 783 "savegame.cfsml" - const char *_cfsml_inp = lastval; -#line 790 "savegame.cfsml" - _cfsml_error = read_song_tp(fh, &newsong, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 821 "savegame.cfsml" + const char *_cfsml_inp = lastval; +#line 829 "savegame.cfsml" + _cfsml_error = read_song_tp(fh, &newsong, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 416 "savegame.cfsml" song_lib_add(*songlib, newsong); } @@ -3961,20 +4047,20 @@ int mem_obj_string_to_enum(const char *str) { static int bucket_length; void write_int_hash_map_tp(FILE *fh, int_hash_map_t **foo) { -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_int_hash_map_t(fh, *foo); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_int_hash_map_t(fh, *foo); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 454 "savegame.cfsml" } void write_song_tp(FILE *fh, song_t **foo) { -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_song_t(fh, *foo); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_song_t(fh, *foo); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 458 "savegame.cfsml" } @@ -3985,29 +4071,29 @@ int read_song_tp(FILE *fh, song_t **foo, const char *lastval, int *line, int *hi int assignment; *foo = (song_t*) malloc(sizeof(song_t)); token = _cfsml_get_identifier(fh, line, hiteof, &assignment); -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 783 "savegame.cfsml" - const char *_cfsml_inp = token; -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_song_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 821 "savegame.cfsml" + const char *_cfsml_inp = token; +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_song_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 468 "savegame.cfsml" (*foo)->delay = 0; (*foo)->it = NULL; @@ -4016,30 +4102,30 @@ int read_song_tp(FILE *fh, song_t **foo, const char *lastval, int *line, int *hi } int read_int_hash_map_tp(FILE *fh, int_hash_map_t **foo, const char *lastval, int *line, int *hiteof) { - *foo = (int_hash_map_t*)malloc(sizeof(int_hash_map_t)); -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 783 "savegame.cfsml" - const char *_cfsml_inp = lastval; -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_int_hash_map_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code + *foo = new int_hash_map_t; +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 821 "savegame.cfsml" + const char *_cfsml_inp = lastval; +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_int_hash_map_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 477 "savegame.cfsml" (*foo)->holes = NULL; return 0; @@ -4051,11 +4137,11 @@ void write_int_hash_map_node_tp(FILE *fh, int_hash_map_t::node_t **foo) { } else { fprintf(fh,"[\n%d=>%d\n", (*foo)->name, (*foo)->value); if ((*foo)->next) { -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - write_int_hash_map_node_tp(fh, &((*foo)->next)); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + write_int_hash_map_node_tp(fh, &((*foo)->next)); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 488 "savegame.cfsml" } else fputc('L', fh); @@ -4101,11 +4187,11 @@ int read_int_hash_map_node_tp(FILE *fh, int_hash_map_t::node_t **foo, const char void write_menubar_tp(FILE *fh, menubar_t **foo) { if (*foo) { -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_menubar_t(fh, (*foo)); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_menubar_t(fh, (*foo)); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 533 "savegame.cfsml" } else { // Nothing to write fputs("\\null\\", fh); @@ -4118,29 +4204,29 @@ int read_menubar_tp(FILE *fh, menubar_t **foo, const char *lastval, int *line, i *foo = NULL; // No menu bar } else { *foo = (menubar_t *) sci_malloc(sizeof(menubar_t)); -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 783 "savegame.cfsml" - const char *_cfsml_inp = lastval; -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_menubar_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 821 "savegame.cfsml" + const char *_cfsml_inp = lastval; +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_menubar_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 545 "savegame.cfsml" } return *hiteof; @@ -4148,77 +4234,77 @@ int read_menubar_tp(FILE *fh, menubar_t **foo, const char *lastval, int *line, i void write_mem_obj_t(FILE *fh, mem_obj_t *foo) { fprintf(fh, "%s\n", mem_obj_string_names[foo->type].name); -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_int(fh, &foo->segmgr_id); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_int(fh, &foo->segmgr_id); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 552 "savegame.cfsml" switch (foo->type) { case MEM_OBJ_SCRIPT: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_script_t(fh, &foo->data.script); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_script_t(fh, &foo->data.script); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 555 "savegame.cfsml" break; case MEM_OBJ_CLONES: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_clone_table_t(fh, &foo->data.clones); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_clone_table_t(fh, &foo->data.clones); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 558 "savegame.cfsml" break; case MEM_OBJ_LOCALS: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_local_variables_t(fh, &foo->data.locals); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_local_variables_t(fh, &foo->data.locals); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 561 "savegame.cfsml" break; case MEM_OBJ_SYS_STRINGS: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_sys_strings_t(fh, &foo->data.sys_strings); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_sys_strings_t(fh, &foo->data.sys_strings); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 564 "savegame.cfsml" break; case MEM_OBJ_STACK: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_int(fh, &foo->data.stack.nr); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_int(fh, &foo->data.stack.nr); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 567 "savegame.cfsml" break; case MEM_OBJ_HUNK: break; case MEM_OBJ_LISTS: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_list_table_t(fh, &foo->data.lists); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_list_table_t(fh, &foo->data.lists); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 572 "savegame.cfsml" break; case MEM_OBJ_NODES: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_node_table_t(fh, &foo->data.nodes); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_node_table_t(fh, &foo->data.nodes); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 575 "savegame.cfsml" break; case MEM_OBJ_DYNMEM: -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_dynmem_t(fh, &foo->data.dynmem); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_dynmem_t(fh, &foo->data.dynmem); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 578 "savegame.cfsml" break; } @@ -4232,219 +4318,219 @@ int read_mem_obj_t(FILE *fh, mem_obj_t *foo, const char *lastval, int *line, int return 1; } -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_int(fh, &foo->segmgr_id, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_int(fh, &foo->segmgr_id, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 591 "savegame.cfsml" switch (foo->type) { case MEM_OBJ_SCRIPT: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_script_t(fh, &foo->data.script, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_script_t(fh, &foo->data.script, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 594 "savegame.cfsml" break; case MEM_OBJ_CLONES: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_clone_table_t(fh, &foo->data.clones, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_clone_table_t(fh, &foo->data.clones, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 597 "savegame.cfsml" break; case MEM_OBJ_LOCALS: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_local_variables_t(fh, &foo->data.locals, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_local_variables_t(fh, &foo->data.locals, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 600 "savegame.cfsml" break; case MEM_OBJ_SYS_STRINGS: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_sys_strings_t(fh, &foo->data.sys_strings, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_sys_strings_t(fh, &foo->data.sys_strings, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 603 "savegame.cfsml" break; case MEM_OBJ_LISTS: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_list_table_t(fh, &foo->data.lists, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_list_table_t(fh, &foo->data.lists, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 606 "savegame.cfsml" break; case MEM_OBJ_NODES: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_node_table_t(fh, &foo->data.nodes, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_node_table_t(fh, &foo->data.nodes, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 609 "savegame.cfsml" break; case MEM_OBJ_STACK: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_int(fh, &foo->data.stack.nr, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_int(fh, &foo->data.stack.nr, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 612 "savegame.cfsml" foo->data.stack.entries = (reg_t *)sci_calloc(foo->data.stack.nr, sizeof(reg_t)); break; @@ -4452,30 +4538,30 @@ int read_mem_obj_t(FILE *fh, mem_obj_t *foo, const char *lastval, int *line, int init_hunk_table(&foo->data.hunks); break; case MEM_OBJ_DYNMEM: -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_dynmem_t(fh, &foo->data.dynmem, _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(*line), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_dynmem_t(fh, &foo->data.dynmem, _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 619 "savegame.cfsml" break; } @@ -4485,11 +4571,11 @@ int read_mem_obj_t(FILE *fh, mem_obj_t *foo, const char *lastval, int *line, int void write_mem_obj_tp(FILE *fh, mem_obj_t **foo) { if (*foo) { -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - write_mem_obj_t(fh, (*foo)); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + write_mem_obj_t(fh, (*foo)); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 628 "savegame.cfsml" } else { // Nothing to write fputs("\\null\\", fh); @@ -4501,29 +4587,29 @@ int read_mem_obj_tp(FILE *fh, mem_obj_t **foo, const char *lastval, int *line, i *foo = NULL; // No menu bar } else { *foo = (mem_obj_t *)sci_malloc(sizeof(mem_obj_t)); -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 783 "savegame.cfsml" - const char *_cfsml_inp = lastval; -#line 790 "savegame.cfsml" - _cfsml_error = read_mem_obj_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); -#line 794 "savegame.cfsml" - *hiteof = _cfsml_error; -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 821 "savegame.cfsml" + const char *_cfsml_inp = lastval; +#line 829 "savegame.cfsml" + _cfsml_error = read_mem_obj_t(fh, (*foo), _cfsml_inp, &(*line), &_cfsml_eof); +#line 834 "savegame.cfsml" + *hiteof = _cfsml_error; +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 639 "savegame.cfsml" return *hiteof; } @@ -4584,11 +4670,11 @@ int gamestate_save(state_t *s, char *dirname) { // Calculate the time spent with this game s->game_time = time(NULL) - s->game_start_time.tv_sec; -#line 819 "savegame.cfsml" -// Auto-generated CFSML data writer code - _cfsml_write_state_t(fh, s); - fprintf(fh, "\n"); -// End of auto-generated CFSML data writer code +#line 859 "savegame.cfsml" +/* Auto-generated CFSML data writer code */ + _cfsml_write_state_t(fh, s); + fprintf(fh, "\n"); +/* End of auto-generated CFSML data writer code */ #line 699 "savegame.cfsml" fclose(fh); @@ -4887,36 +4973,36 @@ state_t *gamestate_restore(state_t *s, char *dirname) { retval->sound_mute = s->sound_mute; retval->sound_volume = s->sound_volume; -// Auto-generated CFSML data reader code -#line 767 "savegame.cfsml" - { -#line 770 "savegame.cfsml" - int _cfsml_line_ctr = 0; -#line 775 "savegame.cfsml" - struct _cfsml_pointer_refstruct **_cfsml_myptrrefptr = _cfsml_get_current_refpointer(); -#line 778 "savegame.cfsml" - int _cfsml_eof = 0, _cfsml_error; - int dummy; -#line 786 "savegame.cfsml" - const char *_cfsml_inp = _cfsml_get_identifier(fh, &(_cfsml_line_ctr), &_cfsml_eof, &dummy); - -#line 790 "savegame.cfsml" - _cfsml_error = _cfsml_read_state_t(fh, retval, _cfsml_inp, &(_cfsml_line_ctr), &_cfsml_eof); -#line 794 "savegame.cfsml" - read_eof = _cfsml_error; -#line 798 "savegame.cfsml" - _cfsml_free_pointer_references(_cfsml_myptrrefptr, _cfsml_error); -#line 801 "savegame.cfsml" - if (_cfsml_last_value_retrieved) { - free(_cfsml_last_value_retrieved); - _cfsml_last_value_retrieved = NULL; - } - if (_cfsml_last_identifier_retrieved) { - free(_cfsml_last_identifier_retrieved); - _cfsml_last_identifier_retrieved = NULL; - } - } -// End of auto-generated CFSML data reader code +/* Auto-generated CFSML data reader code */ +#line 805 "savegame.cfsml" + { +#line 808 "savegame.cfsml" + int _cfsml_line_ctr = 0; +#line 813 "savegame.cfsml" + struct _cfsml_pointer_refstruct **_cfsml_myptrrefptr = _cfsml_get_current_refpointer(); +#line 816 "savegame.cfsml" + int _cfsml_eof = 0, _cfsml_error; + int dummy; +#line 824 "savegame.cfsml" + const char *_cfsml_inp = _cfsml_get_identifier(fh, &(_cfsml_line_ctr), &_cfsml_eof, &dummy); + +#line 829 "savegame.cfsml" + _cfsml_error = _cfsml_read_state_t(fh, retval, _cfsml_inp, &(_cfsml_line_ctr), &_cfsml_eof); +#line 834 "savegame.cfsml" + read_eof = _cfsml_error; +#line 838 "savegame.cfsml" + _cfsml_free_pointer_references(_cfsml_myptrrefptr, _cfsml_error); +#line 841 "savegame.cfsml" + if (_cfsml_last_value_retrieved) { + free(_cfsml_last_value_retrieved); + _cfsml_last_value_retrieved = NULL; + } + if (_cfsml_last_identifier_retrieved) { + free(_cfsml_last_identifier_retrieved); + _cfsml_last_identifier_retrieved = NULL; + } + } +/* End of auto-generated CFSML data reader code */ #line 997 "savegame.cfsml" fclose(fh); |