[Scummvm-cvs-logs] SF.net SVN: scummvm:[38952] scummvm/trunk
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Sat Feb 28 11:05:08 CET 2009
Revision: 38952
http://scummvm.svn.sourceforge.net/scummvm/?rev=38952&view=rev
Author: wjpalenstijn
Date: 2009-02-28 10:05:07 +0000 (Sat, 28 Feb 2009)
Log Message:
-----------
Make CFSML writers take const arguments
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/savegame.cfsml
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/tools/cfsml.pl
Modified: scummvm/trunk/engines/sci/engine/savegame.cfsml
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-28 10:04:40 UTC (rev 38951)
+++ scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-28 10:05:07 UTC (rev 38952)
@@ -106,7 +106,7 @@
#define FILE_VERSION _global_save_state->savegame_version
-void write_reg_t(Common::WriteStream *fh, reg_t *foo) {
+void write_reg_t(Common::WriteStream *fh, reg_t const *foo) {
WSprintf(fh, PREG, PRINT_REG(*foo));
}
@@ -122,7 +122,7 @@
return 0;
}
-void write_sci_version(Common::WriteStream *fh, sci_version_t *foo) {
+void write_sci_version(Common::WriteStream *fh, sci_version_t const *foo) {
WSprintf(fh, "%d.%03d.%03d", SCI_VERSION_MAJOR(*foo), SCI_VERSION_MINOR(*foo), SCI_VERSION_PATCHLEVEL(*foo));
}
@@ -130,7 +130,7 @@
return version_parse(lastval, foo);
}
-void write_PTN(Common::WriteStream *fh, parse_tree_node_t *foo) {
+void write_PTN(Common::WriteStream *fh, parse_tree_node_t const *foo) {
if (foo->type == PARSE_TREE_NODE_LEAF)
WSprintf(fh, "L%d", foo->content.value);
else
@@ -190,25 +190,24 @@
} else return 1; // failure to parse anything
}
-
-void write_menubar_tp(Common::WriteStream *fh, menubar_t **foo);
+void write_menubar_tp(Common::WriteStream *fh, const menubar_t * const *foo);
int read_menubar_tp(Common::SeekableReadStream *fh, menubar_t **foo, const char *lastval, int *line, int *hiteof);
-void write_mem_obj_tp(Common::WriteStream *fh, mem_obj_t **foo);
+void write_mem_obj_tp(Common::WriteStream *fh, const mem_obj_t * const *foo);
int read_mem_obj_tp(Common::SeekableReadStream *fh, mem_obj_t **foo, const char *lastval, int *line, int *hiteof);
-void write_songlib_t(Common::WriteStream *fh, songlib_t *foo);
+void write_songlib_t(Common::WriteStream *fh, songlib_t const *foo);
int read_songlib_t(Common::SeekableReadStream *fh, songlib_t *foo, const char *lastval, int *line, int *hiteof);
int read_song_tp(Common::SeekableReadStream *fh, song_t **foo, const char *lastval, int *line, int *hiteof);
-void write_IntMapperPtr(Common::WriteStream *fh, IntMapper **foo);
+void write_IntMapperPtr(Common::WriteStream *fh, const IntMapper * const *foo);
int read_IntMapperPtr(Common::SeekableReadStream *fh, IntMapper **foo, const char *lastval, int *line, int *hiteof);
-void write_IntMapperNodePtr(Common::WriteStream *fh, IntMapper::Node **foo);
+void write_IntMapperNodePtr(Common::WriteStream *fh, const IntMapper::Node * const *foo);
int read_IntMapperNodePtr(Common::SeekableReadStream *fh, IntMapper::Node **foo, const char *lastval, int *line, int *hiteof);
-void write_SegManagerPtr(Common::WriteStream *fh, SegManager **foo);
+void write_SegManagerPtr(Common::WriteStream *fh, const SegManager * const *foo);
int read_SegManagerPtr(Common::SeekableReadStream *fh, SegManager **foo, const char *lastval, int *line, int *hiteof);
typedef mem_obj_t *mem_obj_ptr;
@@ -446,7 +445,7 @@
%END CFSML
-void write_songlib_t(Common::WriteStream *fh, songlib_t *songlib) {
+void write_songlib_t(Common::WriteStream *fh, songlib_t const *songlib) {
song_t *seeker = *(songlib->lib);
int songcount = song_lib_count(*songlib);
@@ -489,7 +488,7 @@
return 0;
}
-void write_song_tp(Common::WriteStream *fh, song_t **foo) {
+void write_song_tp(Common::WriteStream *fh, const song_t * const *foo) {
%CFSMLWRITE song_t *foo INTO fh;
}
@@ -507,7 +506,7 @@
return 0;
}
-void write_IntMapperPtr(Common::WriteStream *fh, IntMapper **foo) {
+void write_IntMapperPtr(Common::WriteStream *fh, const IntMapper * const *foo) {
%CFSMLWRITE IntMapper *foo INTO fh;
}
@@ -518,7 +517,7 @@
return 0;
}
-void write_IntMapperNodePtr(Common::WriteStream *fh, IntMapper::Node **foo) {
+void write_IntMapperNodePtr(Common::WriteStream *fh, const IntMapper::Node * const *foo) {
if (!(*foo)) {
WSprintf(fh, "\\null");
} else {
@@ -565,7 +564,7 @@
return 0;
}
-void write_menubar_tp(Common::WriteStream *fh, menubar_t **foo) {
+void write_menubar_tp(Common::WriteStream *fh, const menubar_t * const *foo) {
if (*foo) {
%CFSMLWRITE menubar_t (*foo) INTO fh;
} else { // Nothing to write
@@ -610,7 +609,7 @@
return -1;
}
-void write_mem_obj_t(Common::WriteStream *fh, mem_obj_t *foo) {
+void write_mem_obj_t(Common::WriteStream *fh, mem_obj_t const *foo) {
WSprintf(fh, "%s\n", mem_obj_string_names[foo->type].name);
%CFSMLWRITE int &foo->segmgr_id INTO fh;
switch (foo->type) {
@@ -689,7 +688,7 @@
return *hiteof;
}
-void write_mem_obj_tp(Common::WriteStream *fh, mem_obj_t **foo) {
+void write_mem_obj_tp(Common::WriteStream *fh, const mem_obj_t * const *foo) {
if (*foo) {
%CFSMLWRITE mem_obj_t (*foo) INTO fh;
} else { // Nothing to write
@@ -708,7 +707,7 @@
return 0;
}
-void write_SegManagerPtr(Common::WriteStream *fh, SegManager **foo) {
+void write_SegManagerPtr(Common::WriteStream *fh, const SegManager * const *foo) {
%CFSMLWRITE bool &((*foo)->isSci1_1) INTO fh;
%CFSMLWRITE SegManager *foo INTO fh;
}
@@ -724,7 +723,6 @@
return 0;
}
-
// This function is called to undo some strange stuff done in preparation
// to writing a gamestate to disk
void _gamestate_unfrob(EngineState *s) {
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-28 10:04:40 UTC (rev 38951)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-28 10:05:07 UTC (rev 38952)
@@ -106,7 +106,7 @@
#define FILE_VERSION _global_save_state->savegame_version
-void write_reg_t(Common::WriteStream *fh, reg_t *foo) {
+void write_reg_t(Common::WriteStream *fh, reg_t const *foo) {
WSprintf(fh, PREG, PRINT_REG(*foo));
}
@@ -122,7 +122,7 @@
return 0;
}
-void write_sci_version(Common::WriteStream *fh, sci_version_t *foo) {
+void write_sci_version(Common::WriteStream *fh, sci_version_t const *foo) {
WSprintf(fh, "%d.%03d.%03d", SCI_VERSION_MAJOR(*foo), SCI_VERSION_MINOR(*foo), SCI_VERSION_PATCHLEVEL(*foo));
}
@@ -130,7 +130,7 @@
return version_parse(lastval, foo);
}
-void write_PTN(Common::WriteStream *fh, parse_tree_node_t *foo) {
+void write_PTN(Common::WriteStream *fh, parse_tree_node_t const *foo) {
if (foo->type == PARSE_TREE_NODE_LEAF)
WSprintf(fh, "L%d", foo->content.value);
else
@@ -190,25 +190,24 @@
} else return 1; // failure to parse anything
}
-
-void write_menubar_tp(Common::WriteStream *fh, menubar_t **foo);
+void write_menubar_tp(Common::WriteStream *fh, const menubar_t * const *foo);
int read_menubar_tp(Common::SeekableReadStream *fh, menubar_t **foo, const char *lastval, int *line, int *hiteof);
-void write_mem_obj_tp(Common::WriteStream *fh, mem_obj_t **foo);
+void write_mem_obj_tp(Common::WriteStream *fh, const mem_obj_t * const *foo);
int read_mem_obj_tp(Common::SeekableReadStream *fh, mem_obj_t **foo, const char *lastval, int *line, int *hiteof);
-void write_songlib_t(Common::WriteStream *fh, songlib_t *foo);
+void write_songlib_t(Common::WriteStream *fh, songlib_t const *foo);
int read_songlib_t(Common::SeekableReadStream *fh, songlib_t *foo, const char *lastval, int *line, int *hiteof);
int read_song_tp(Common::SeekableReadStream *fh, song_t **foo, const char *lastval, int *line, int *hiteof);
-void write_IntMapperPtr(Common::WriteStream *fh, IntMapper **foo);
+void write_IntMapperPtr(Common::WriteStream *fh, const IntMapper * const *foo);
int read_IntMapperPtr(Common::SeekableReadStream *fh, IntMapper **foo, const char *lastval, int *line, int *hiteof);
-void write_IntMapperNodePtr(Common::WriteStream *fh, IntMapper::Node **foo);
+void write_IntMapperNodePtr(Common::WriteStream *fh, const IntMapper::Node * const *foo);
int read_IntMapperNodePtr(Common::SeekableReadStream *fh, IntMapper::Node **foo, const char *lastval, int *line, int *hiteof);
-void write_SegManagerPtr(Common::WriteStream *fh, SegManager **foo);
+void write_SegManagerPtr(Common::WriteStream *fh, const SegManager * const *foo);
int read_SegManagerPtr(Common::SeekableReadStream *fh, SegManager **foo, const char *lastval, int *line, int *hiteof);
typedef mem_obj_t *mem_obj_ptr;
@@ -227,7 +226,7 @@
// Auto-generated CFSML declaration and function block
-#line 735 "engines/sci/engine/savegame.cfsml"
+#line 739 "engines/sci/engine/savegame.cfsml"
#define CFSML_SUCCESS 0
#define CFSML_FAILURE 1
@@ -447,151 +446,151 @@
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 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_sfx_state_t(Common::WriteStream *fh, sfx_state_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_sfx_state_t(Common::WriteStream *fh, sfx_state_t const * save_struc);
static int _cfsml_read_sfx_state_t(Common::SeekableReadStream *fh, sfx_state_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_clone_entry_t(Common::WriteStream *fh, clone_entry_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_clone_entry_t(Common::WriteStream *fh, clone_entry_t const * save_struc);
static int _cfsml_read_clone_entry_t(Common::SeekableReadStream *fh, clone_entry_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_object_t(Common::WriteStream *fh, object_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_object_t(Common::WriteStream *fh, object_t const * save_struc);
static int _cfsml_read_object_t(Common::SeekableReadStream *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_string(Common::WriteStream *fh, char ** save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_string(Common::WriteStream *fh, const char * const * save_struc);
static int _cfsml_read_string(Common::SeekableReadStream *fh, char ** save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_menubar_t(Common::WriteStream *fh, menubar_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_menubar_t(Common::WriteStream *fh, menubar_t const * save_struc);
static int _cfsml_read_menubar_t(Common::SeekableReadStream *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_size_t(Common::WriteStream *fh, size_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_size_t(Common::WriteStream *fh, size_t const * save_struc);
static int _cfsml_read_size_t(Common::SeekableReadStream *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_list_entry_t(Common::WriteStream *fh, list_entry_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_list_entry_t(Common::WriteStream *fh, list_entry_t const * save_struc);
static int _cfsml_read_list_entry_t(Common::SeekableReadStream *fh, list_entry_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_SegManager(Common::WriteStream *fh, SegManager* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_SegManager(Common::WriteStream *fh, SegManager const * save_struc);
static int _cfsml_read_SegManager(Common::SeekableReadStream *fh, SegManager* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_song_t(Common::WriteStream *fh, song_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_song_t(Common::WriteStream *fh, song_t const * save_struc);
static int _cfsml_read_song_t(Common::SeekableReadStream *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_menu_item_t(Common::WriteStream *fh, menu_item_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_menu_item_t(Common::WriteStream *fh, menu_item_t const * save_struc);
static int _cfsml_read_menu_item_t(Common::SeekableReadStream *fh, menu_item_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_node_entry_t(Common::WriteStream *fh, node_entry_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_node_entry_t(Common::WriteStream *fh, node_entry_t const * save_struc);
static int _cfsml_read_node_entry_t(Common::SeekableReadStream *fh, node_entry_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_seg_id_t(Common::WriteStream *fh, seg_id_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_seg_id_t(Common::WriteStream *fh, seg_id_t const * save_struc);
static int _cfsml_read_seg_id_t(Common::SeekableReadStream *fh, seg_id_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_dynmem_t(Common::WriteStream *fh, dynmem_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_dynmem_t(Common::WriteStream *fh, dynmem_t const * save_struc);
static int _cfsml_read_dynmem_t(Common::SeekableReadStream *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_local_variables_t(Common::WriteStream *fh, local_variables_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_local_variables_t(Common::WriteStream *fh, local_variables_t const * save_struc);
static int _cfsml_read_local_variables_t(Common::SeekableReadStream *fh, local_variables_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_bool(Common::WriteStream *fh, bool* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_bool(Common::WriteStream *fh, bool const * save_struc);
static int _cfsml_read_bool(Common::SeekableReadStream *fh, bool* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_node_table_t(Common::WriteStream *fh, node_table_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_node_table_t(Common::WriteStream *fh, node_table_t const * save_struc);
static int _cfsml_read_node_table_t(Common::SeekableReadStream *fh, node_table_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_SystemString(Common::WriteStream *fh, SystemString* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_SystemString(Common::WriteStream *fh, SystemString const * save_struc);
static int _cfsml_read_SystemString(Common::SeekableReadStream *fh, SystemString* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_byte(Common::WriteStream *fh, byte* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_byte(Common::WriteStream *fh, byte const * save_struc);
static int _cfsml_read_byte(Common::SeekableReadStream *fh, byte* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_node_t(Common::WriteStream *fh, node_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_node_t(Common::WriteStream *fh, node_t const * save_struc);
static int _cfsml_read_node_t(Common::SeekableReadStream *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_SystemStrings(Common::WriteStream *fh, SystemStrings* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_SystemStrings(Common::WriteStream *fh, SystemStrings const * save_struc);
static int _cfsml_read_SystemStrings(Common::SeekableReadStream *fh, SystemStrings* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_list_table_t(Common::WriteStream *fh, list_table_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_list_table_t(Common::WriteStream *fh, list_table_t const * save_struc);
static int _cfsml_read_list_table_t(Common::SeekableReadStream *fh, list_table_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_class_t(Common::WriteStream *fh, class_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_class_t(Common::WriteStream *fh, class_t const * save_struc);
static int _cfsml_read_class_t(Common::SeekableReadStream *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_song_handle_t(Common::WriteStream *fh, song_handle_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_song_handle_t(Common::WriteStream *fh, song_handle_t const * save_struc);
static int _cfsml_read_song_handle_t(Common::SeekableReadStream *fh, song_handle_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_int(Common::WriteStream *fh, int* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_int(Common::WriteStream *fh, int const * save_struc);
static int _cfsml_read_int(Common::SeekableReadStream *fh, int* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_EngineState(Common::WriteStream *fh, EngineState* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_EngineState(Common::WriteStream *fh, EngineState const * save_struc);
static int _cfsml_read_EngineState(Common::SeekableReadStream *fh, EngineState* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_SavegameMetadata(Common::WriteStream *fh, SavegameMetadata* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_SavegameMetadata(Common::WriteStream *fh, SavegameMetadata const * save_struc);
static int _cfsml_read_SavegameMetadata(Common::SeekableReadStream *fh, SavegameMetadata* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_IntMapper(Common::WriteStream *fh, IntMapper* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_IntMapper(Common::WriteStream *fh, IntMapper const * save_struc);
static int _cfsml_read_IntMapper(Common::SeekableReadStream *fh, IntMapper* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_menu_t(Common::WriteStream *fh, menu_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_menu_t(Common::WriteStream *fh, menu_t const * save_struc);
static int _cfsml_read_menu_t(Common::SeekableReadStream *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_clone_table_t(Common::WriteStream *fh, clone_table_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_clone_table_t(Common::WriteStream *fh, clone_table_t const * save_struc);
static int _cfsml_read_clone_table_t(Common::SeekableReadStream *fh, clone_table_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_clone_t(Common::WriteStream *fh, clone_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_clone_t(Common::WriteStream *fh, clone_t const * save_struc);
static int _cfsml_read_clone_t(Common::SeekableReadStream *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_list_t(Common::WriteStream *fh, list_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_list_t(Common::WriteStream *fh, list_t const * save_struc);
static int _cfsml_read_list_t(Common::SeekableReadStream *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 382 "engines/sci/engine/savegame.cfsml"
-static void _cfsml_write_script_t(Common::WriteStream *fh, script_t* save_struc);
+#line 383 "engines/sci/engine/savegame.cfsml"
+static void _cfsml_write_script_t(Common::WriteStream *fh, script_t const * save_struc);
static int _cfsml_read_script_t(Common::SeekableReadStream *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_sfx_state_t(Common::WriteStream *fh, sfx_state_t* save_struc)
+_cfsml_write_sfx_state_t(Common::WriteStream *fh, sfx_state_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "songlib = ");
- write_songlib_t(fh, (songlib_t*) &(save_struc->songlib));
+ write_songlib_t(fh, (songlib_t const *) &(save_struc->songlib));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_sfx_state_t(Common::SeekableReadStream *fh, sfx_state_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -624,13 +623,13 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "songlib")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("sfx_state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -640,26 +639,26 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_clone_entry_t(Common::WriteStream *fh, clone_entry_t* save_struc)
+_cfsml_write_clone_entry_t(Common::WriteStream *fh, clone_entry_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "next_free = ");
- _cfsml_write_int(fh, (int*) &(save_struc->next_free));
+ _cfsml_write_int(fh, (int const *) &(save_struc->next_free));
WSprintf(fh, "\n");
WSprintf(fh, "entry = ");
- _cfsml_write_clone_t(fh, (clone_t*) &(save_struc->entry));
+ _cfsml_write_clone_t(fh, (clone_t const *) &(save_struc->entry));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_clone_entry_t(Common::SeekableReadStream *fh, clone_entry_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -692,20 +691,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("clone_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -715,33 +714,33 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_object_t(Common::WriteStream *fh, object_t* save_struc)
+_cfsml_write_object_t(Common::WriteStream *fh, object_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "flags = ");
- _cfsml_write_int(fh, (int*) &(save_struc->flags));
+ _cfsml_write_int(fh, (int const *) &(save_struc->flags));
WSprintf(fh, "\n");
WSprintf(fh, "pos = ");
- write_reg_t(fh, (reg_t*) &(save_struc->pos));
+ write_reg_t(fh, (reg_t const *) &(save_struc->pos));
WSprintf(fh, "\n");
WSprintf(fh, "variables_nr = ");
- _cfsml_write_int(fh, (int*) &(save_struc->variables_nr));
+ _cfsml_write_int(fh, (int const *) &(save_struc->variables_nr));
WSprintf(fh, "\n");
WSprintf(fh, "variable_names_nr = ");
- _cfsml_write_int(fh, (int*) &(save_struc->variable_names_nr));
+ _cfsml_write_int(fh, (int const *) &(save_struc->variable_names_nr));
WSprintf(fh, "\n");
WSprintf(fh, "methods_nr = ");
- _cfsml_write_int(fh, (int*) &(save_struc->methods_nr));
+ _cfsml_write_int(fh, (int const *) &(save_struc->methods_nr));
WSprintf(fh, "\n");
WSprintf(fh, "variables = ");
int min, max;
min = max = save_struc->variables_nr;
if (!save_struc->variables)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->variables[i]));
@@ -752,11 +751,11 @@
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_object_t(Common::SeekableReadStream *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -789,48 +788,48 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "flags")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -846,11 +845,11 @@
_cfsml_register_pointer(save_struc->variables);
} else
save_struc->variables = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -868,7 +867,7 @@
} while (!done);
save_struc->variables_nr = max ; // Set array size accordingly
} else
-#line 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("object_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -878,11 +877,11 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_string(Common::WriteStream *fh, char ** save_struc)
+_cfsml_write_string(Common::WriteStream *fh, const char * const * save_struc)
{
-#line 401 "engines/sci/engine/savegame.cfsml"
+#line 403 "engines/sci/engine/savegame.cfsml"
if (!(*save_struc))
WSprintf(fh, "\\null\\");
else {
@@ -892,11 +891,11 @@
}
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_string(Common::SeekableReadStream *fh, char ** save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 518 "engines/sci/engine/savegame.cfsml"
+#line 520 "engines/sci/engine/savegame.cfsml"
if (strcmp(lastval, "\\null\\")) { // null pointer?
unsigned int length = strlen(lastval);
@@ -921,18 +920,18 @@
}
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_menubar_t(Common::WriteStream *fh, menubar_t* save_struc)
+_cfsml_write_menubar_t(Common::WriteStream *fh, menubar_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "menus = ");
int min, max;
min = max = save_struc->menus_nr;
if (!save_struc->menus)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
_cfsml_write_menu_t(fh, &(save_struc->menus[i]));
@@ -943,11 +942,11 @@
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_menubar_t(Common::SeekableReadStream *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -980,13 +979,13 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "menus")) {
-#line 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1002,11 +1001,11 @@
_cfsml_register_pointer(save_struc->menus);
} else
save_struc->menus = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1024,7 +1023,7 @@
} while (!done);
save_struc->menus_nr = max ; // Set array size accordingly
} else
-#line 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("menubar_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1034,18 +1033,18 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_size_t(Common::WriteStream *fh, size_t* save_struc)
+_cfsml_write_size_t(Common::WriteStream *fh, size_t const * save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_size_t(Common::SeekableReadStream *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 505 "engines/sci/engine/savegame.cfsml"
+#line 507 "engines/sci/engine/savegame.cfsml"
char *token;
*save_struc = strtol(lastval, &token, 0);
@@ -1060,26 +1059,26 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_list_entry_t(Common::WriteStream *fh, list_entry_t* save_struc)
+_cfsml_write_list_entry_t(Common::WriteStream *fh, list_entry_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "next_free = ");
- _cfsml_write_int(fh, (int*) &(save_struc->next_free));
+ _cfsml_write_int(fh, (int const *) &(save_struc->next_free));
WSprintf(fh, "\n");
WSprintf(fh, "entry = ");
- _cfsml_write_list_t(fh, (list_t*) &(save_struc->entry));
+ _cfsml_write_list_t(fh, (list_t const *) &(save_struc->entry));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_list_entry_t(Common::SeekableReadStream *fh, list_entry_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -1112,20 +1111,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("list_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1135,21 +1134,21 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_SegManager(Common::WriteStream *fh, SegManager* save_struc)
+_cfsml_write_SegManager(Common::WriteStream *fh, SegManager const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "id_seg_map = ");
- write_IntMapperPtr(fh, (IntMapper **) &(save_struc->id_seg_map));
+ write_IntMapperPtr(fh, (IntMapper * const *) &(save_struc->id_seg_map));
WSprintf(fh, "\n");
WSprintf(fh, "heap = ");
int min, max;
min = max = save_struc->heap_size;
if (!save_struc->heap)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
write_mem_obj_tp(fh, &(save_struc->heap[i]));
@@ -1158,37 +1157,37 @@
WSprintf(fh, "]");
WSprintf(fh, "\n");
WSprintf(fh, "heap_size = ");
- _cfsml_write_int(fh, (int*) &(save_struc->heap_size));
+ _cfsml_write_int(fh, (int const *) &(save_struc->heap_size));
WSprintf(fh, "\n");
WSprintf(fh, "reserved_id = ");
- _cfsml_write_int(fh, (int*) &(save_struc->reserved_id));
+ _cfsml_write_int(fh, (int const *) &(save_struc->reserved_id));
WSprintf(fh, "\n");
WSprintf(fh, "exports_wide = ");
- _cfsml_write_int(fh, (int*) &(save_struc->exports_wide));
+ _cfsml_write_int(fh, (int const *) &(save_struc->exports_wide));
WSprintf(fh, "\n");
WSprintf(fh, "gc_mark_bits = ");
- _cfsml_write_int(fh, (int*) &(save_struc->gc_mark_bits));
+ _cfsml_write_int(fh, (int const *) &(save_struc->gc_mark_bits));
WSprintf(fh, "\n");
WSprintf(fh, "mem_allocated = ");
- _cfsml_write_size_t(fh, (size_t*) &(save_struc->mem_allocated));
+ _cfsml_write_size_t(fh, (size_t const *) &(save_struc->mem_allocated));
WSprintf(fh, "\n");
WSprintf(fh, "clones_seg_id = ");
- _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->clones_seg_id));
+ _cfsml_write_seg_id_t(fh, (seg_id_t const *) &(save_struc->clones_seg_id));
WSprintf(fh, "\n");
WSprintf(fh, "lists_seg_id = ");
- _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->lists_seg_id));
+ _cfsml_write_seg_id_t(fh, (seg_id_t const *) &(save_struc->lists_seg_id));
WSprintf(fh, "\n");
WSprintf(fh, "nodes_seg_id = ");
- _cfsml_write_seg_id_t(fh, (seg_id_t*) &(save_struc->nodes_seg_id));
+ _cfsml_write_seg_id_t(fh, (seg_id_t const *) &(save_struc->nodes_seg_id));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_SegManager(Common::SeekableReadStream *fh, SegManager* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -1221,20 +1220,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "id_seg_map")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/savegame.cfsml"
if (read_IntMapperPtr(fh, (IntMapper **) &(save_struc->id_seg_map), value, line, hiteof)) {
_cfsml_error("Token expected by read_IntMapperPtr() for id_seg_map at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "heap")) {
-#line 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1250,11 +1249,11 @@
_cfsml_register_pointer(save_struc->heap);
} else
save_struc->heap = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1273,62 +1272,62 @@
save_struc->heap_size = max ; // Set array size accordingly
} else
if (!strcmp(token, "heap_size")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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, "gc_mark_bits")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("SegManager: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1338,44 +1337,44 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_song_t(Common::WriteStream *fh, song_t* save_struc)
+_cfsml_write_song_t(Common::WriteStream *fh, song_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "handle = ");
- _cfsml_write_song_handle_t(fh, (song_handle_t*) &(save_struc->handle));
+ _cfsml_write_song_handle_t(fh, (song_handle_t const *) &(save_struc->handle));
WSprintf(fh, "\n");
WSprintf(fh, "resource_num = ");
- _cfsml_write_int(fh, (int*) &(save_struc->resource_num));
+ _cfsml_write_int(fh, (int const *) &(save_struc->resource_num));
WSprintf(fh, "\n");
WSprintf(fh, "priority = ");
- _cfsml_write_int(fh, (int*) &(save_struc->priority));
+ _cfsml_write_int(fh, (int const *) &(save_struc->priority));
WSprintf(fh, "\n");
WSprintf(fh, "status = ");
- _cfsml_write_int(fh, (int*) &(save_struc->status));
+ _cfsml_write_int(fh, (int const *) &(save_struc->status));
WSprintf(fh, "\n");
WSprintf(fh, "restore_behavior = ");
- _cfsml_write_int(fh, (int*) &(save_struc->restore_behavior));
+ _cfsml_write_int(fh, (int const *) &(save_struc->restore_behavior));
WSprintf(fh, "\n");
WSprintf(fh, "restore_time = ");
- _cfsml_write_int(fh, (int*) &(save_struc->restore_time));
+ _cfsml_write_int(fh, (int const *) &(save_struc->restore_time));
WSprintf(fh, "\n");
WSprintf(fh, "loops = ");
- _cfsml_write_int(fh, (int*) &(save_struc->loops));
+ _cfsml_write_int(fh, (int const *) &(save_struc->loops));
WSprintf(fh, "\n");
WSprintf(fh, "hold = ");
- _cfsml_write_int(fh, (int*) &(save_struc->hold));
+ _cfsml_write_int(fh, (int const *) &(save_struc->hold));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_song_t(Common::SeekableReadStream *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -1408,62 +1407,62 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "handle")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("song_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1473,28 +1472,28 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_menu_item_t(Common::WriteStream *fh, menu_item_t* save_struc)
+_cfsml_write_menu_item_t(Common::WriteStream *fh, menu_item_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "type = ");
- _cfsml_write_int(fh, (int*) &(save_struc->type));
+ _cfsml_write_int(fh, (int const *) &(save_struc->type));
WSprintf(fh, "\n");
WSprintf(fh, "keytext = ");
- _cfsml_write_string(fh, (char **) &(save_struc->keytext));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->keytext));
WSprintf(fh, "\n");
WSprintf(fh, "keytext_size = ");
- _cfsml_write_int(fh, (int*) &(save_struc->keytext_size));
+ _cfsml_write_int(fh, (int const *) &(save_struc->keytext_size));
WSprintf(fh, "\n");
WSprintf(fh, "flags = ");
- _cfsml_write_int(fh, (int*) &(save_struc->flags));
+ _cfsml_write_int(fh, (int const *) &(save_struc->flags));
WSprintf(fh, "\n");
WSprintf(fh, "said = ");
int min, max;
min = max = MENU_SAID_SPEC_SIZE;
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
_cfsml_write_byte(fh, &(save_struc->said[i]));
@@ -1503,34 +1502,34 @@
WSprintf(fh, "]");
WSprintf(fh, "\n");
WSprintf(fh, "said_pos = ");
- write_reg_t(fh, (reg_t*) &(save_struc->said_pos));
+ write_reg_t(fh, (reg_t const *) &(save_struc->said_pos));
WSprintf(fh, "\n");
WSprintf(fh, "text = ");
- _cfsml_write_string(fh, (char **) &(save_struc->text));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->text));
WSprintf(fh, "\n");
WSprintf(fh, "text_pos = ");
- write_reg_t(fh, (reg_t*) &(save_struc->text_pos));
+ write_reg_t(fh, (reg_t const *) &(save_struc->text_pos));
WSprintf(fh, "\n");
WSprintf(fh, "modifiers = ");
- _cfsml_write_int(fh, (int*) &(save_struc->modifiers));
+ _cfsml_write_int(fh, (int const *) &(save_struc->modifiers));
WSprintf(fh, "\n");
WSprintf(fh, "key = ");
- _cfsml_write_int(fh, (int*) &(save_struc->key));
+ _cfsml_write_int(fh, (int const *) &(save_struc->key));
WSprintf(fh, "\n");
WSprintf(fh, "enabled = ");
- _cfsml_write_int(fh, (int*) &(save_struc->enabled));
+ _cfsml_write_int(fh, (int const *) &(save_struc->enabled));
WSprintf(fh, "\n");
WSprintf(fh, "tag = ");
- _cfsml_write_int(fh, (int*) &(save_struc->tag));
+ _cfsml_write_int(fh, (int const *) &(save_struc->tag));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_menu_item_t(Common::SeekableReadStream *fh, menu_item_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -1563,35 +1562,35 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "type")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
@@ -1599,11 +1598,11 @@
int max,done,i;
// Prepare to restore static array
max = MENU_SAID_SPEC_SIZE;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1621,55 +1620,55 @@
} while (!done);
} else
if (!strcmp(token, "said_pos")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("menu_item_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1679,26 +1678,26 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_node_entry_t(Common::WriteStream *fh, node_entry_t* save_struc)
+_cfsml_write_node_entry_t(Common::WriteStream *fh, node_entry_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "next_free = ");
- _cfsml_write_int(fh, (int*) &(save_struc->next_free));
+ _cfsml_write_int(fh, (int const *) &(save_struc->next_free));
WSprintf(fh, "\n");
WSprintf(fh, "entry = ");
- _cfsml_write_node_t(fh, (node_t*) &(save_struc->entry));
+ _cfsml_write_node_t(fh, (node_t const *) &(save_struc->entry));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_node_entry_t(Common::SeekableReadStream *fh, node_entry_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -1731,20 +1730,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("node_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1754,18 +1753,18 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_seg_id_t(Common::WriteStream *fh, seg_id_t* save_struc)
+_cfsml_write_seg_id_t(Common::WriteStream *fh, seg_id_t const * save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_seg_id_t(Common::SeekableReadStream *fh, seg_id_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 505 "engines/sci/engine/savegame.cfsml"
+#line 507 "engines/sci/engine/savegame.cfsml"
char *token;
*save_struc = strtol(lastval, &token, 0);
@@ -1780,24 +1779,24 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_dynmem_t(Common::WriteStream *fh, dynmem_t* save_struc)
+_cfsml_write_dynmem_t(Common::WriteStream *fh, dynmem_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "size = ");
- _cfsml_write_int(fh, (int*) &(save_struc->size));
+ _cfsml_write_int(fh, (int const *) &(save_struc->size));
WSprintf(fh, "\n");
WSprintf(fh, "description = ");
- _cfsml_write_string(fh, (char **) &(save_struc->description));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->description));
WSprintf(fh, "\n");
WSprintf(fh, "buf = ");
int min, max;
min = max = save_struc->size;
if (!save_struc->buf)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
_cfsml_write_byte(fh, &(save_struc->buf[i]));
@@ -1808,11 +1807,11 @@
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_dynmem_t(Common::SeekableReadStream *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -1845,27 +1844,27 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "size")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1881,11 +1880,11 @@
_cfsml_register_pointer(save_struc->buf);
} else
save_struc->buf = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1903,7 +1902,7 @@
} while (!done);
save_struc->size = max ; // Set array size accordingly
} else
-#line 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("dynmem_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1913,24 +1912,24 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_local_variables_t(Common::WriteStream *fh, local_variables_t* save_struc)
+_cfsml_write_local_variables_t(Common::WriteStream *fh, local_variables_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "script_id = ");
- _cfsml_write_int(fh, (int*) &(save_struc->script_id));
+ _cfsml_write_int(fh, (int const *) &(save_struc->script_id));
WSprintf(fh, "\n");
WSprintf(fh, "nr = ");
- _cfsml_write_int(fh, (int*) &(save_struc->nr));
+ _cfsml_write_int(fh, (int const *) &(save_struc->nr));
WSprintf(fh, "\n");
WSprintf(fh, "locals = ");
int min, max;
min = max = save_struc->nr;
if (!save_struc->locals)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->locals[i]));
@@ -1941,11 +1940,11 @@
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_local_variables_t(Common::SeekableReadStream *fh, local_variables_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -1978,27 +1977,27 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "script_id")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2014,11 +2013,11 @@
_cfsml_register_pointer(save_struc->locals);
} else
save_struc->locals = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2036,7 +2035,7 @@
} while (!done);
save_struc->nr = max ; // Set array size accordingly
} else
-#line 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("local_variables_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2046,18 +2045,18 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_bool(Common::WriteStream *fh, bool* save_struc)
+_cfsml_write_bool(Common::WriteStream *fh, bool const * save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_bool(Common::SeekableReadStream *fh, bool* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 505 "engines/sci/engine/savegame.cfsml"
+#line 507 "engines/sci/engine/savegame.cfsml"
char *token;
*save_struc = strtol(lastval, &token, 0);
@@ -2072,30 +2071,30 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_node_table_t(Common::WriteStream *fh, node_table_t* save_struc)
+_cfsml_write_node_table_t(Common::WriteStream *fh, node_table_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "entries_nr = ");
- _cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
+ _cfsml_write_int(fh, (int const *) &(save_struc->entries_nr));
WSprintf(fh, "\n");
WSprintf(fh, "first_free = ");
- _cfsml_write_int(fh, (int*) &(save_struc->first_free));
+ _cfsml_write_int(fh, (int const *) &(save_struc->first_free));
WSprintf(fh, "\n");
WSprintf(fh, "entries_used = ");
- _cfsml_write_int(fh, (int*) &(save_struc->entries_used));
+ _cfsml_write_int(fh, (int const *) &(save_struc->entries_used));
WSprintf(fh, "\n");
WSprintf(fh, "max_entry = ");
- _cfsml_write_int(fh, (int*) &(save_struc->max_entry));
+ _cfsml_write_int(fh, (int const *) &(save_struc->max_entry));
WSprintf(fh, "\n");
WSprintf(fh, "table = ");
int min, max;
min = max = save_struc->entries_nr;
if (!save_struc->table)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
_cfsml_write_node_entry_t(fh, &(save_struc->table[i]));
@@ -2106,11 +2105,11 @@
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_node_table_t(Common::SeekableReadStream *fh, node_table_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -2143,41 +2142,41 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2193,11 +2192,11 @@
_cfsml_register_pointer(save_struc->table);
} else
save_struc->table = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2215,7 +2214,7 @@
} while (!done);
save_struc->entries_nr = max ; // Set array size accordingly
} else
-#line 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("node_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2225,29 +2224,29 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_SystemString(Common::WriteStream *fh, SystemString* save_struc)
+_cfsml_write_SystemString(Common::WriteStream *fh, SystemString const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "name = ");
- _cfsml_write_string(fh, (char **) &(save_struc->name));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->name));
WSprintf(fh, "\n");
WSprintf(fh, "max_size = ");
- _cfsml_write_int(fh, (int*) &(save_struc->max_size));
+ _cfsml_write_int(fh, (int const *) &(save_struc->max_size));
WSprintf(fh, "\n");
WSprintf(fh, "value = ");
- _cfsml_write_string(fh, (char **) &(save_struc->value));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->value));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_SystemString(Common::SeekableReadStream *fh, SystemString* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -2280,27 +2279,27 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "name")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("SystemString: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2310,18 +2309,18 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_byte(Common::WriteStream *fh, byte* save_struc)
+_cfsml_write_byte(Common::WriteStream *fh, byte const * save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_byte(Common::SeekableReadStream *fh, byte* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 505 "engines/sci/engine/savegame.cfsml"
+#line 507 "engines/sci/engine/savegame.cfsml"
char *token;
*save_struc = strtol(lastval, &token, 0);
@@ -2336,32 +2335,32 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_node_t(Common::WriteStream *fh, node_t* save_struc)
+_cfsml_write_node_t(Common::WriteStream *fh, node_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "pred = ");
- write_reg_t(fh, (reg_t*) &(save_struc->pred));
+ write_reg_t(fh, (reg_t const *) &(save_struc->pred));
WSprintf(fh, "\n");
WSprintf(fh, "succ = ");
- write_reg_t(fh, (reg_t*) &(save_struc->succ));
+ write_reg_t(fh, (reg_t const *) &(save_struc->succ));
WSprintf(fh, "\n");
WSprintf(fh, "key = ");
- write_reg_t(fh, (reg_t*) &(save_struc->key));
+ write_reg_t(fh, (reg_t const *) &(save_struc->key));
WSprintf(fh, "\n");
WSprintf(fh, "value = ");
- write_reg_t(fh, (reg_t*) &(save_struc->value));
+ write_reg_t(fh, (reg_t const *) &(save_struc->value));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_node_t(Common::SeekableReadStream *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -2394,34 +2393,34 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "pred")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("node_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2431,16 +2430,16 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_SystemStrings(Common::WriteStream *fh, SystemStrings* save_struc)
+_cfsml_write_SystemStrings(Common::WriteStream *fh, SystemStrings const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "strings = ");
int min, max;
min = max = SYS_STRINGS_MAX;
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
_cfsml_write_SystemString(fh, &(save_struc->strings[i]));
@@ -2451,11 +2450,11 @@
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_SystemStrings(Common::SeekableReadStream *fh, SystemStrings* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -2488,7 +2487,7 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "strings")) {
-#line 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
@@ -2496,11 +2495,11 @@
int max,done,i;
// Prepare to restore static array
max = SYS_STRINGS_MAX;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2517,7 +2516,7 @@
done = 1;
} while (!done);
} else
-#line 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("SystemStrings: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2527,30 +2526,30 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_list_table_t(Common::WriteStream *fh, list_table_t* save_struc)
+_cfsml_write_list_table_t(Common::WriteStream *fh, list_table_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "entries_nr = ");
- _cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
+ _cfsml_write_int(fh, (int const *) &(save_struc->entries_nr));
WSprintf(fh, "\n");
WSprintf(fh, "first_free = ");
- _cfsml_write_int(fh, (int*) &(save_struc->first_free));
+ _cfsml_write_int(fh, (int const *) &(save_struc->first_free));
WSprintf(fh, "\n");
WSprintf(fh, "entries_used = ");
- _cfsml_write_int(fh, (int*) &(save_struc->entries_used));
+ _cfsml_write_int(fh, (int const *) &(save_struc->entries_used));
WSprintf(fh, "\n");
WSprintf(fh, "max_entry = ");
- _cfsml_write_int(fh, (int*) &(save_struc->max_entry));
+ _cfsml_write_int(fh, (int const *) &(save_struc->max_entry));
WSprintf(fh, "\n");
WSprintf(fh, "table = ");
int min, max;
min = max = save_struc->entries_nr;
if (!save_struc->table)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
_cfsml_write_list_entry_t(fh, &(save_struc->table[i]));
@@ -2561,11 +2560,11 @@
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_list_table_t(Common::SeekableReadStream *fh, list_table_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -2598,41 +2597,41 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2648,11 +2647,11 @@
_cfsml_register_pointer(save_struc->table);
} else
save_struc->table = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2670,7 +2669,7 @@
} while (!done);
save_struc->entries_nr = max ; // Set array size accordingly
} else
-#line 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("list_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2680,26 +2679,26 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_class_t(Common::WriteStream *fh, class_t* save_struc)
+_cfsml_write_class_t(Common::WriteStream *fh, class_t const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "script = ");
- _cfsml_write_int(fh, (int*) &(save_struc->script));
+ _cfsml_write_int(fh, (int const *) &(save_struc->script));
WSprintf(fh, "\n");
WSprintf(fh, "reg = ");
- write_reg_t(fh, (reg_t*) &(save_struc->reg));
+ write_reg_t(fh, (reg_t const *) &(save_struc->reg));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_class_t(Common::SeekableReadStream *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -2732,20 +2731,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "script")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("class_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2755,18 +2754,18 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_song_handle_t(Common::WriteStream *fh, song_handle_t* save_struc)
+_cfsml_write_song_handle_t(Common::WriteStream *fh, song_handle_t const * save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_song_handle_t(Common::SeekableReadStream *fh, song_handle_t* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 505 "engines/sci/engine/savegame.cfsml"
+#line 507 "engines/sci/engine/savegame.cfsml"
char *token;
*save_struc = strtol(lastval, &token, 0);
@@ -2781,18 +2780,18 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_int(Common::WriteStream *fh, int* save_struc)
+_cfsml_write_int(Common::WriteStream *fh, int const * save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_int(Common::SeekableReadStream *fh, int* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 505 "engines/sci/engine/savegame.cfsml"
+#line 507 "engines/sci/engine/savegame.cfsml"
char *token;
*save_struc = strtol(lastval, &token, 0);
@@ -2807,42 +2806,42 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_EngineState(Common::WriteStream *fh, EngineState* save_struc)
+_cfsml_write_EngineState(Common::WriteStream *fh, EngineState const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "savegame_version = ");
- _cfsml_write_int(fh, (int*) &(save_struc->savegame_version));
+ _cfsml_write_int(fh, (int const *) &(save_struc->savegame_version));
WSprintf(fh, "\n");
WSprintf(fh, "game_version = ");
- _cfsml_write_string(fh, (char **) &(save_struc->game_version));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->game_version));
WSprintf(fh, "\n");
WSprintf(fh, "version = ");
- write_sci_version(fh, (sci_version_t*) &(save_struc->version));
+ write_sci_version(fh, (sci_version_t const *) &(save_struc->version));
WSprintf(fh, "\n");
WSprintf(fh, "menubar = ");
- write_menubar_tp(fh, (menubar_t **) &(save_struc->menubar));
+ write_menubar_tp(fh, (menubar_t * const *) &(save_struc->menubar));
WSprintf(fh, "\n");
WSprintf(fh, "status_bar_foreground = ");
- _cfsml_write_int(fh, (int*) &(save_struc->status_bar_foreground));
+ _cfsml_write_int(fh, (int const *) &(save_struc->status_bar_foreground));
WSprintf(fh, "\n");
WSprintf(fh, "status_bar_background = ");
- _cfsml_write_int(fh, (int*) &(save_struc->status_bar_background));
+ _cfsml_write_int(fh, (int const *) &(save_struc->status_bar_background));
WSprintf(fh, "\n");
WSprintf(fh, "seg_manager = ");
- write_SegManagerPtr(fh, (SegManager **) &(save_struc->seg_manager));
+ write_SegManagerPtr(fh, (SegManager * const *) &(save_struc->seg_manager));
WSprintf(fh, "\n");
WSprintf(fh, "classtable_size = ");
- _cfsml_write_int(fh, (int*) &(save_struc->classtable_size));
+ _cfsml_write_int(fh, (int const *) &(save_struc->classtable_size));
WSprintf(fh, "\n");
WSprintf(fh, "classtable = ");
int min, max;
min = max = save_struc->classtable_size;
if (!save_struc->classtable)
min = max = 0; /* Don't write if it points to NULL */
-#line 438 "engines/sci/engine/savegame.cfsml"
+#line 440 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
for (int i = 0; i < min; i++) {
_cfsml_write_class_t(fh, &(save_struc->classtable[i]));
@@ -2851,16 +2850,16 @@
WSprintf(fh, "]");
WSprintf(fh, "\n");
WSprintf(fh, "sound = ");
- _cfsml_write_sfx_state_t(fh, (sfx_state_t*) &(save_struc->sound));
+ _cfsml_write_sfx_state_t(fh, (sfx_state_t const *) &(save_struc->sound));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_EngineState(Common::SeekableReadStream *fh, EngineState* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -2893,69 +2892,69 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "savegame_version")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/savegame.cfsml"
if (read_SegManagerPtr(fh, (SegManager **) &(save_struc->seg_manager), value, line, hiteof)) {
_cfsml_error("Token expected by read_SegManagerPtr() for seg_manager at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "classtable_size")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 603 "engines/sci/engine/savegame.cfsml"
+#line 605 "engines/sci/engine/savegame.cfsml"
if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
return CFSML_FAILURE;
}
int max,done,i;
-#line 614 "engines/sci/engine/savegame.cfsml"
+#line 616 "engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2971,11 +2970,11 @@
_cfsml_register_pointer(save_struc->classtable);
} else
save_struc->classtable = NULL;
-#line 638 "engines/sci/engine/savegame.cfsml"
+#line 640 "engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 646 "engines/sci/engine/savegame.cfsml"
+#line 648 "engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2994,13 +2993,13 @@
save_struc->classtable_size = max ; // Set array size accordingly
} else
if (!strcmp(token, "sound")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 698 "engines/sci/engine/savegame.cfsml"
+#line 700 "engines/sci/engine/savegame.cfsml"
{
_cfsml_error("EngineState: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3010,38 +3009,38 @@
return CFSML_SUCCESS;
}
-#line 394 "engines/sci/engine/savegame.cfsml"
+#line 396 "engines/sci/engine/savegame.cfsml"
static void
-_cfsml_write_SavegameMetadata(Common::WriteStream *fh, SavegameMetadata* save_struc)
+_cfsml_write_SavegameMetadata(Common::WriteStream *fh, SavegameMetadata const * save_struc)
{
-#line 411 "engines/sci/engine/savegame.cfsml"
+#line 413 "engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "savegame_name = ");
- _cfsml_write_string(fh, (char **) &(save_struc->savegame_name));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->savegame_name));
WSprintf(fh, "\n");
WSprintf(fh, "savegame_version = ");
- _cfsml_write_int(fh, (int*) &(save_struc->savegame_version));
+ _cfsml_write_int(fh, (int const *) &(save_struc->savegame_version));
WSprintf(fh, "\n");
WSprintf(fh, "game_version = ");
- _cfsml_write_string(fh, (char **) &(save_struc->game_version));
+ _cfsml_write_string(fh, (const char * const *) &(save_struc->game_version));
WSprintf(fh, "\n");
WSprintf(fh, "version = ");
- write_sci_version(fh, (sci_version_t*) &(save_struc->version));
+ write_sci_version(fh, (sci_version_t const *) &(save_struc->version));
WSprintf(fh, "\n");
WSprintf(fh, "savegame_date = ");
- _cfsml_write_int(fh, (int*) &(save_struc->savegame_date));
+ _cfsml_write_int(fh, (int const *) &(save_struc->savegame_date));
WSprintf(fh, "\n");
WSprintf(fh, "savegame_time = ");
- _cfsml_write_int(fh, (int*) &(save_struc->savegame_time));
+ _cfsml_write_int(fh, (int const *) &(save_struc->savegame_time));
WSprintf(fh, "\n");
WSprintf(fh, "}");
}
-#line 485 "engines/sci/engine/savegame.cfsml"
+#line 487 "engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_SavegameMetadata(Common::SeekableReadStream *fh, SavegameMetadata* save_struc, const char *lastval, int *line, int *hiteof)
{
-#line 540 "engines/sci/engine/savegame.cfsml"
+#line 542 "engines/sci/engine/savegame.cfsml"
char *token;
int assignment, closed;
@@ -3074,48 +3073,48 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "savegame_name")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/savegame.cfsml"
if (_cfsml_read_string(fh, (char **) &(save_struc->savegame_name), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_string() for savegame_name at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "savegame_version")) {
-#line 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/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 689 "engines/sci/engine/savegame.cfsml"
+#line 691 "engines/sci/engine/savegame.cfsml"
if (_cfsml_read_string(fh, (char **) &(save_struc->game_version), value, line, hiteof)) {
@@ 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