[Scummvm-cvs-logs] SF.net SVN: scummvm:[38271] scummvm/trunk/engines/sci
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sun Feb 15 18:20:31 CET 2009
Revision: 38271
http://scummvm.svn.sourceforge.net/scummvm/?rev=38271&view=rev
Author: aquadran
Date: 2009-02-15 17:20:31 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
fix compilation
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/savegame.cfsml
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/module.mk
Modified: scummvm/trunk/engines/sci/engine/savegame.cfsml
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-15 16:59:48 UTC (rev 38270)
+++ scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-15 17:20:31 UTC (rev 38271)
@@ -88,7 +88,7 @@
int
read_sci_version(FILE *fh, sci_version_t *foo, const char *lastval, int *line, int *hiteof)
{
- return version_parse(lastval, foo);
+ return version_parse((char *)lastval, foo);
}
void
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-15 16:59:48 UTC (rev 38270)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-15 17:20:31 UTC (rev 38271)
@@ -64,7 +64,7 @@
}
int
-read_reg_t(FILE *fh, reg_t *foo, char *lastval, int *line, int *hiteof)
+read_reg_t(FILE *fh, reg_t *foo, const char *lastval, int *line, int *hiteof)
{
int segment, offset;
@@ -86,9 +86,9 @@
}
int
-read_sci_version(FILE *fh, sci_version_t *foo, char *lastval, int *line, int *hiteof)
+read_sci_version(FILE *fh, sci_version_t *foo, const char *lastval, int *line, int *hiteof)
{
- return version_parse(lastval, foo);
+ return version_parse((char *)lastval, foo);
}
void
@@ -101,10 +101,10 @@
}
int
-read_PTN(FILE *fh, parse_tree_node_t *foo, char *lastval, int *line, int *hiteof)
+read_PTN(FILE *fh, parse_tree_node_t *foo, const char *lastval, int *line, int *hiteof)
{
if (lastval[0] == 'L') {
- char *c = lastval + 1;
+ const char *c = lastval + 1;
char *strend;
while (*c && isspace(*c))
@@ -119,7 +119,7 @@
return 0;
} else if (lastval[0] == 'B') {
- char *c = lastval + 1;
+ const char *c = lastval + 1;
char *strend;
while (*c && isspace(*c)) ++c;
@@ -153,37 +153,37 @@
void
write_menubar_tp(FILE *fh, menubar_t **foo);
int
-read_menubar_tp(FILE *fh, menubar_t **foo, char *lastval, int *line, int *hiteof);
+read_menubar_tp(FILE *fh, menubar_t **foo, const char *lastval, int *line, int *hiteof);
void
write_mem_obj_tp(FILE *fh, mem_obj_t **foo);
int
-read_mem_obj_tp(FILE *fh, mem_obj_t **foo, char *lastval, int *line, int *hiteof);
+read_mem_obj_tp(FILE *fh, mem_obj_t **foo, const char *lastval, int *line, int *hiteof);
void
write_int_hash_map_tp(FILE *fh, int_hash_map_t **foo);
int
-read_int_hash_map_tp(FILE *fh, int_hash_map_t **foo, char *lastval, int *line, int *hiteof);
+read_int_hash_map_tp(FILE *fh, int_hash_map_t **foo, const char *lastval, int *line, int *hiteof);
void
write_songlib_t(FILE *fh, songlib_t *foo);
int
-read_songlib_t(FILE *fh, songlib_t *foo, char *lastval, int *line, int *hiteof);
+read_songlib_t(FILE *fh, songlib_t *foo, const char *lastval, int *line, int *hiteof);
void
write_int_hash_map_node_tp(FILE *fh, int_hash_map_node_t **foo);
int
-read_int_hash_map_node_tp(FILE *fh, int_hash_map_node_t **foo, char *lastval, int *line, int *hiteof);
+read_int_hash_map_node_tp(FILE *fh, int_hash_map_node_t **foo, const char *lastval, int *line, int *hiteof);
int
-read_song_tp(FILE *fh, song_t **foo, char *lastval, int *line, int *hiteof);
+read_song_tp(FILE *fh, song_t **foo, const char *lastval, int *line, int *hiteof);
typedef mem_obj_t *mem_obj_ptr;
/* Auto-generated CFSML declaration and function block */
-#line 796 "savegame.cfsml"
+#line 797 "savegame.cfsml"
#define CFSML_SUCCESS 0
#define CFSML_FAILURE 1
@@ -206,7 +206,7 @@
#endif
static void
-_cfsml_error(char *fmt, ...)
+_cfsml_error(const char *fmt, ...)
{
va_list argp;
@@ -225,8 +225,8 @@
static struct _cfsml_pointer_refstruct **_cfsml_pointer_references_current = &_cfsml_pointer_references;
-static char *_cfsml_last_value_retreived = NULL;
-static char *_cfsml_last_identifier_retreived = NULL;
+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)
@@ -285,9 +285,9 @@
static char *
-_cfsml_mangle_string(char *s)
+_cfsml_mangle_string(const char *s)
{
- char *source = 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;
@@ -309,14 +309,15 @@
static char *
-_cfsml_unmangle_string(char *s)
+_cfsml_unmangle_string(const char *s, unsigned int length)
{
char *target = (char *) sci_malloc(1 + strlen(s));
char *writer = target;
- char *source = s;
+ const char *source = s;
+ const char *end = s + length;
char c;
- while ((c = *source++) && (c > 31)) {
+ while ((source != end) && (c = *source++) && (c > 31)) {
if (c == '\\') { /* Escaped character? */
c = *source++;
if ((c != '\\') && (c != '"')) /* Un-escape 0-31 only */
@@ -339,9 +340,9 @@
int done = 0;
char *retval = (char *) sci_malloc(mem);
- if (_cfsml_last_identifier_retreived) {
- free(_cfsml_last_identifier_retreived);
- _cfsml_last_identifier_retreived = NULL;
+ if (_cfsml_last_identifier_retrieved) {
+ free(_cfsml_last_identifier_retrieved);
+ _cfsml_last_identifier_retrieved = NULL;
}
while (isspace(c = fgetc(fd)) && (c != EOF));
@@ -398,9 +399,9 @@
retval = (char *) sci_realloc(retval, mem += 1);
retval[pos] = 0; /* Terminate string */
-#line 322 "savegame.cfsml"
+#line 323 "savegame.cfsml"
- return _cfsml_last_identifier_retreived = retval;
+ return _cfsml_last_identifier_retrieved = retval;
}
@@ -412,9 +413,9 @@
int pos = 0;
char *retval = (char *) sci_malloc(mem);
- if (_cfsml_last_value_retreived) {
- free(_cfsml_last_value_retreived);
- _cfsml_last_value_retreived = NULL;
+ if (_cfsml_last_value_retrieved) {
+ free(_cfsml_last_value_retrieved);
+ _cfsml_last_value_retrieved = NULL;
}
while (((c = fgetc(fd)) != EOF) && (c != '\n')) {
@@ -446,217 +447,217 @@
retval = (char *) sci_realloc(retval, mem += 1);
retval[pos] = 0; /* Terminate string */
-#line 379 "savegame.cfsml"
- return (_cfsml_last_value_retreived = (char *) sci_realloc(retval, strlen(retval) + 1));
+#line 380 "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 431 "savegame.cfsml"
+#line 432 "savegame.cfsml"
static void
_cfsml_write_synonym_t(FILE *fh, synonym_t* save_struc);
static int
-_cfsml_read_synonym_t(FILE *fh, synonym_t* save_struc, char *lastval, int *line, int *hiteof);
+_cfsml_read_synonym_t(FILE *fh, synonym_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_sfx_state_t(FILE *fh, sfx_state_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_clone_entry_t(FILE *fh, clone_entry_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_object_t(FILE *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "savegame.cfsml"
static void
_cfsml_write_string(FILE *fh, char ** save_struc);
static int
-_cfsml_read_string(FILE *fh, char ** save_struc, char *lastval, int *line, int *hiteof);
+_cfsml_read_string(FILE *fh, char ** save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_size_t(FILE *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_list_entry_t(FILE *fh, list_entry_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "savegame.cfsml"
static void
_cfsml_write_gint16(FILE *fh, gint16* save_struc);
static int
-_cfsml_read_gint16(FILE *fh, gint16* save_struc, char *lastval, int *line, int *hiteof);
+_cfsml_read_gint16(FILE *fh, gint16* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_song_t(FILE *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_menu_item_t(FILE *fh, menu_item_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_node_entry_t(FILE *fh, node_entry_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_local_variables_t(FILE *fh, local_variables_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_state_t(FILE *fh, state_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_node_table_t(FILE *fh, node_table_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_sys_strings_t(FILE *fh, sys_strings_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "savegame.cfsml"
static void
_cfsml_write_byte(FILE *fh, byte* save_struc);
static int
-_cfsml_read_byte(FILE *fh, byte* save_struc, char *lastval, int *line, int *hiteof);
+_cfsml_read_byte(FILE *fh, byte* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_node_t(FILE *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_list_table_t(FILE *fh, list_table_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_class_t(FILE *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "savegame.cfsml"
static void
_cfsml_write_int(FILE *fh, int* save_struc);
static int
-_cfsml_read_int(FILE *fh, int* save_struc, char *lastval, int *line, int *hiteof);
+_cfsml_read_int(FILE *fh, int* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_menu_t(FILE *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "savegame.cfsml"
static void
_cfsml_write_long(FILE *fh, long* save_struc);
static int
-_cfsml_read_long(FILE *fh, long* save_struc, char *lastval, int *line, int *hiteof);
+_cfsml_read_long(FILE *fh, long* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_clone_table_t(FILE *fh, clone_table_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_clone_t(FILE *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_list_t(FILE *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_sys_string_t(FILE *fh, sys_string_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_script_t(FILE *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 431 "savegame.cfsml"
+#line 432 "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, char *lastval, int *line, int *hiteof);
+_cfsml_read_seg_manager_t(FILE *fh, seg_manager_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_synonym_t(FILE *fh, synonym_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "replaceant = ");
_cfsml_write_int(fh, (int*) &(save_struc->replaceant));
@@ -667,13 +668,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_synonym_t(FILE *fh, synonym_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_synonym_t(FILE *fh, synonym_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -682,7 +683,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -705,20 +706,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "replaceant")) {
-#line 749 "savegame.cfsml"
+#line 750 "savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->replaceant), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for replaceant at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "replacement")) {
-#line 749 "savegame.cfsml"
+#line 750 "savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->replacement), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for replacement at line %d\n", *line);
return CFSML_FAILURE;
}
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("synonym_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -728,13 +729,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_sfx_state_t(FILE *fh, sfx_state_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "songlib = ");
write_songlib_t(fh, (songlib_t*) &(save_struc->songlib));
@@ -742,13 +743,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_sfx_state_t(FILE *fh, sfx_state_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -757,7 +758,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -780,13 +781,13 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "songlib")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("sfx_state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -796,13 +797,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_clone_entry_t(FILE *fh, clone_entry_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "next_free = ");
_cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -813,13 +814,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_clone_entry_t(FILE *fh, clone_entry_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -828,7 +829,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -851,20 +852,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("clone_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -874,13 +875,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_object_t(FILE *fh, object_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "flags = ");
_cfsml_write_int(fh, (int*) &(save_struc->flags));
@@ -901,7 +902,7 @@
min = max = save_struc->variables_nr;
if (!save_struc->variables)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->variables[i]));
@@ -912,13 +913,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_object_t(FILE *fh, object_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_object_t(FILE *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -927,7 +928,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -950,47 +951,47 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "flags")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1007,11 +1008,11 @@
}
else
save_struc->variables = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1028,7 +1029,7 @@
} while (!done);
save_struc->variables_nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("object_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1038,43 +1039,42 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_string(FILE *fh, char ** save_struc)
{
-#line 454 "savegame.cfsml"
+#line 455 "savegame.cfsml"
if (!(*save_struc))
fprintf(fh, "\\null\\");
else {
- char *token = _cfsml_mangle_string((char *) *save_struc);
+ char *token = _cfsml_mangle_string((const char *) *save_struc);
fprintf(fh, "\"%s\"", token);
free(token);
}
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_string(FILE *fh, char ** save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_string(FILE *fh, char ** save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 577 "savegame.cfsml"
+#line 578 "savegame.cfsml"
if (strcmp(lastval, "\\null\\")) { /* null pointer? */
+ unsigned int length = strlen(lastval);
if (*lastval == '"') { /* Quoted string? */
- int seeker = strlen(lastval);
+ while (lastval[length] != '"')
+ --length;
- while (lastval[seeker] != '"')
- --seeker;
-
- if (!seeker) { /* No matching double-quotes? */
+ if (!length) { /* No matching double-quotes? */
_cfsml_error("Unbalanced quotes at line %d\n", *line);
return CFSML_FAILURE;
}
- lastval[seeker] = 0; /* Terminate string at closing quotes... */
lastval++; /* ...and skip the opening quotes locally */
+ length--;
}
- *save_struc = _cfsml_unmangle_string(lastval);
+ *save_struc = _cfsml_unmangle_string(lastval, length);
_cfsml_register_pointer(*save_struc);
return CFSML_SUCCESS;
} else {
@@ -1083,19 +1083,19 @@
}
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_menubar_t(FILE *fh, menubar_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "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 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_menu_t(fh, &(save_struc->menus[i]));
@@ -1106,13 +1106,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -1121,7 +1121,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -1144,12 +1144,12 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "menus")) {
-#line 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1166,11 +1166,11 @@
}
else
save_struc->menus = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1187,7 +1187,7 @@
} while (!done);
save_struc->menus_nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("menubar_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1197,19 +1197,19 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_size_t(FILE *fh, size_t* save_struc)
{
fprintf(fh, "%li", (long) *save_struc);
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_size_t(FILE *fh, size_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_size_t(FILE *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 564 "savegame.cfsml"
+#line 565 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ( (*save_struc == 0) && (token == lastval) ) {
@@ -1223,13 +1223,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_list_entry_t(FILE *fh, list_entry_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "next_free = ");
_cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -1240,13 +1240,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_list_entry_t(FILE *fh, list_entry_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -1255,7 +1255,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -1278,20 +1278,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("list_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1301,20 +1301,20 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "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 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
write_int_hash_map_node_tp(fh, &(save_struc->nodes[i]));
@@ -1325,13 +1325,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -1340,7 +1340,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -1363,25 +1363,25 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "base_value")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "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 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1397,7 +1397,7 @@
} else done = 1;
} while (!done);
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("int_hash_map_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1407,19 +1407,19 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_gint16(FILE *fh, gint16* save_struc)
{
fprintf(fh, "%li", (long) *save_struc);
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_gint16(FILE *fh, gint16* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_gint16(FILE *fh, gint16* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 564 "savegame.cfsml"
+#line 565 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ( (*save_struc == 0) && (token == lastval) ) {
@@ -1433,13 +1433,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_song_t(FILE *fh, song_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "handle = ");
_cfsml_write_song_handle_t(fh, (song_handle_t*) &(save_struc->handle));
@@ -1468,13 +1468,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_song_t(FILE *fh, song_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_song_t(FILE *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -1483,7 +1483,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -1506,62 +1506,62 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "handle")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("song_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1571,13 +1571,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_menu_item_t(FILE *fh, menu_item_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "type = ");
_cfsml_write_int(fh, (int*) &(save_struc->type));
@@ -1593,7 +1593,7 @@
fprintf(fh, "\n");
fprintf(fh, "said = ");
min = max = MENU_SAID_SPEC_SIZE;
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_byte(fh, &(save_struc->said[i]));
@@ -1625,13 +1625,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_menu_item_t(FILE *fh, menu_item_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -1640,7 +1640,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -1663,46 +1663,46 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "type")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "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 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1719,55 +1719,55 @@
} while (!done);
} else
if (!strcmp(token, "said_pos")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("menu_item_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1777,13 +1777,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_node_entry_t(FILE *fh, node_entry_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "next_free = ");
_cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -1794,13 +1794,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_node_entry_t(FILE *fh, node_entry_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -1809,7 +1809,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -1832,20 +1832,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("node_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1855,19 +1855,19 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_seg_id_t(FILE *fh, seg_id_t* save_struc)
{
fprintf(fh, "%li", (long) *save_struc);
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 564 "savegame.cfsml"
+#line 565 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ( (*save_struc == 0) && (token == lastval) ) {
@@ -1881,13 +1881,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_dynmem_t(FILE *fh, dynmem_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "size = ");
_cfsml_write_int(fh, (int*) &(save_struc->size));
@@ -1899,7 +1899,7 @@
min = max = save_struc->size;
if (!save_struc->buf)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_byte(fh, &(save_struc->buf[i]));
@@ -1910,13 +1910,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -1925,7 +1925,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -1948,26 +1948,26 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "size")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1984,11 +1984,11 @@
}
else
save_struc->buf = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2005,7 +2005,7 @@
} while (!done);
save_struc->size = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("dynmem_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2015,13 +2015,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_local_variables_t(FILE *fh, local_variables_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "script_id = ");
_cfsml_write_int(fh, (int*) &(save_struc->script_id));
@@ -2033,7 +2033,7 @@
min = max = save_struc->nr;
if (!save_struc->locals)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->locals[i]));
@@ -2044,13 +2044,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_local_variables_t(FILE *fh, local_variables_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -2059,7 +2059,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -2082,26 +2082,26 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "script_id")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2118,11 +2118,11 @@
}
else
save_struc->locals = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2139,7 +2139,7 @@
} while (!done);
save_struc->nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("local_variables_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2149,13 +2149,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_state_t(FILE *fh, state_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "savegame_version = ");
_cfsml_write_int(fh, (int*) &(save_struc->savegame_version));
@@ -2185,7 +2185,7 @@
min = max = save_struc->classtable_size;
if (!save_struc->classtable)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_class_t(fh, &(save_struc->classtable[i]));
@@ -2199,13 +2199,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_state_t(FILE *fh, state_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_state_t(FILE *fh, state_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -2214,7 +2214,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -2237,68 +2237,68 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "savegame_version")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2315,11 +2315,11 @@
}
else
save_struc->classtable = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2337,13 +2337,13 @@
save_struc->classtable_size = max ; /* Set array size accordingly */
} else
if (!strcmp(token, "sound")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2353,13 +2353,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_node_table_t(FILE *fh, node_table_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "entries_nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -2377,7 +2377,7 @@
min = max = save_struc->entries_nr;
if (!save_struc->table)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_node_entry_t(fh, &(save_struc->table[i]));
@@ -2388,13 +2388,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_node_table_t(FILE *fh, node_table_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -2403,7 +2403,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -2426,40 +2426,40 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2476,11 +2476,11 @@
}
else
save_struc->table = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2497,7 +2497,7 @@
} while (!done);
save_struc->entries_nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("node_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2507,17 +2507,17 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_sys_strings_t(FILE *fh, sys_strings_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "strings = ");
min = max = SYS_STRINGS_MAX;
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_sys_string_t(fh, &(save_struc->strings[i]));
@@ -2528,13 +2528,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_sys_strings_t(FILE *fh, sys_strings_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -2543,7 +2543,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -2566,18 +2566,18 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "strings")) {
-#line 663 "savegame.cfsml"
+#line 664 "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 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2593,7 +2593,7 @@
} else done = 1;
} while (!done);
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("sys_strings_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2603,19 +2603,19 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_byte(FILE *fh, byte* save_struc)
{
fprintf(fh, "%li", (long) *save_struc);
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_byte(FILE *fh, byte* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_byte(FILE *fh, byte* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 564 "savegame.cfsml"
+#line 565 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ( (*save_struc == 0) && (token == lastval) ) {
@@ -2629,13 +2629,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_node_t(FILE *fh, node_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "pred = ");
write_reg_t(fh, (reg_t*) &(save_struc->pred));
@@ -2652,13 +2652,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_node_t(FILE *fh, node_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_node_t(FILE *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -2667,7 +2667,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -2690,34 +2690,34 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "pred")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("node_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2727,13 +2727,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_list_table_t(FILE *fh, list_table_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "entries_nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -2751,7 +2751,7 @@
min = max = save_struc->entries_nr;
if (!save_struc->table)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_list_entry_t(fh, &(save_struc->table[i]));
@@ -2762,13 +2762,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_list_table_t(FILE *fh, list_table_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -2777,7 +2777,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -2800,40 +2800,40 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2850,11 +2850,11 @@
}
else
save_struc->table = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2871,7 +2871,7 @@
} while (!done);
save_struc->entries_nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("list_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2881,13 +2881,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_class_t(FILE *fh, class_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "script = ");
_cfsml_write_int(fh, (int*) &(save_struc->script));
@@ -2898,13 +2898,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_class_t(FILE *fh, class_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_class_t(FILE *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -2913,7 +2913,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -2936,20 +2936,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "script")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("class_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2959,19 +2959,19 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_song_handle_t(FILE *fh, song_handle_t* save_struc)
{
fprintf(fh, "%li", (long) *save_struc);
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 564 "savegame.cfsml"
+#line 565 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ( (*save_struc == 0) && (token == lastval) ) {
@@ -2985,19 +2985,19 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_int(FILE *fh, int* save_struc)
{
fprintf(fh, "%li", (long) *save_struc);
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_int(FILE *fh, int* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_int(FILE *fh, int* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 564 "savegame.cfsml"
+#line 565 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ( (*save_struc == 0) && (token == lastval) ) {
@@ -3011,13 +3011,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_menu_t(FILE *fh, menu_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "title = ");
_cfsml_write_string(fh, (char **) &(save_struc->title));
@@ -3032,7 +3032,7 @@
min = max = save_struc->items_nr;
if (!save_struc->items)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_menu_item_t(fh, &(save_struc->items[i]));
@@ -3043,13 +3043,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_menu_t(FILE *fh, menu_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_menu_t(FILE *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -3058,7 +3058,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -3081,33 +3081,33 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "title")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -3124,11 +3124,11 @@
}
else
save_struc->items = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -3145,7 +3145,7 @@
} while (!done);
save_struc->items_nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("menu_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3155,19 +3155,19 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_long(FILE *fh, long* save_struc)
{
fprintf(fh, "%li", (long) *save_struc);
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_long(FILE *fh, long* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_long(FILE *fh, long* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
-#line 564 "savegame.cfsml"
+#line 565 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ( (*save_struc == 0) && (token == lastval) ) {
@@ -3181,13 +3181,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_clone_table_t(FILE *fh, clone_table_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "entries_nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -3205,7 +3205,7 @@
min = max = save_struc->entries_nr;
if (!save_struc->table)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_clone_entry_t(fh, &(save_struc->table[i]));
@@ -3216,13 +3216,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_clone_table_t(FILE *fh, clone_table_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -3231,7 +3231,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -3254,40 +3254,40 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -3304,11 +3304,11 @@
}
else
save_struc->table = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -3325,7 +3325,7 @@
} while (!done);
save_struc->entries_nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("clone_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3335,13 +3335,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_clone_t(FILE *fh, clone_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "flags = ");
_cfsml_write_int(fh, (int*) &(save_struc->flags));
@@ -3362,7 +3362,7 @@
min = max = save_struc->variables_nr;
if (!save_struc->variables)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->variables[i]));
@@ -3373,13 +3373,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_clone_t(FILE *fh, clone_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_clone_t(FILE *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -3388,7 +3388,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -3411,47 +3411,47 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "flags")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -3468,11 +3468,11 @@
}
else
save_struc->variables = NULL;
-#line 699 "savegame.cfsml"
+#line 700 "savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 707 "savegame.cfsml"
+#line 708 "savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -3489,7 +3489,7 @@
} while (!done);
save_struc->variables_nr = max ; /* Set array size accordingly */
} else
-#line 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("clone_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3499,13 +3499,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_list_t(FILE *fh, list_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "first = ");
write_reg_t(fh, (reg_t*) &(save_struc->first));
@@ -3516,13 +3516,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_list_t(FILE *fh, list_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_list_t(FILE *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -3531,7 +3531,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -3554,20 +3554,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "first")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("list_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3577,13 +3577,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_sys_string_t(FILE *fh, sys_string_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "name = ");
_cfsml_write_string(fh, (char **) &(save_struc->name));
@@ -3597,13 +3597,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_sys_string_t(FILE *fh, sys_string_t* save_struc, char *lastval, int *line, int *hiteof)
+_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 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -3612,7 +3612,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -3635,27 +3635,27 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "name")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 758 "savegame.cfsml"
+#line 759 "savegame.cfsml"
{
_cfsml_error("sys_string_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3665,13 +3665,13 @@
return CFSML_SUCCESS;
}
-#line 444 "savegame.cfsml"
+#line 445 "savegame.cfsml"
static void
_cfsml_write_script_t(FILE *fh, script_t* save_struc)
{
int min, max, i;
-#line 464 "savegame.cfsml"
+#line 465 "savegame.cfsml"
fprintf(fh, "{\n");
fprintf(fh, "nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->nr));
@@ -3707,7 +3707,7 @@
min = max = save_struc->objects_allocated;
if (!save_struc->objects)
min = max = 0; /* Don't write if it points to NULL */
-#line 490 "savegame.cfsml"
+#line 491 "savegame.cfsml"
fprintf(fh, "[%d][\n", max);
for (i = 0; i < min; i++) {
_cfsml_write_object_t(fh, &(save_struc->objects[i]));
@@ -3727,13 +3727,13 @@
fprintf(fh, "}");
}
-#line 538 "savegame.cfsml"
+#line 539 "savegame.cfsml"
static int
-_cfsml_read_script_t(FILE *fh, script_t* save_struc, char *lastval, int *line, int *hiteof)
+_cfsml_read_script_t(FILE *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof)
{
char *token;
int min, max, i;
-#line 599 "savegame.cfsml"
+#line 600 "savegame.cfsml"
int assignment, closed, done;
if (strcmp(lastval, "{")) {
@@ -3742,7 +3742,7 @@
};
closed = 0;
do {
- char *value;
+ const char *value;
token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
if (!token) {
@@ -3765,82 +3765,82 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "nr")) {
-#line 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 749 "savegame.cfsml"
+#line 750 "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 663 "savegame.cfsml"
+#line 664 "savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
-#line 673 "savegame.cfsml"
+#line 674 "savegame.cfsml"
/* Prepare to restore dynamic array */
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list