[Scummvm-cvs-logs] SF.net SVN: scummvm:[38657] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Feb 21 04:59:57 CET 2009
Revision: 38657
http://scummvm.svn.sourceforge.net/scummvm/?rev=38657&view=rev
Author: fingolfin
Date: 2009-02-21 03:59:57 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
SCI: Fixed warnings in engine/savegame.cpp, by improving cfsml.pl; also improved the build rule which is responsible for creating engine/savegame.cpp from engine/savegame.cfsml
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/savegame.cfsml
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/module.mk
scummvm/trunk/tools/cfsml.pl
Modified: scummvm/trunk/engines/sci/engine/savegame.cfsml
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-21 03:32:13 UTC (rev 38656)
+++ scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-21 03:59:57 UTC (rev 38657)
@@ -111,7 +111,7 @@
}
int read_reg_t(Common::SeekableReadStream *fh, reg_t *foo, const char *lastval, int *line, int *hiteof) {
- int segment, offset;
+ unsigned int segment, offset;
if (sscanf(lastval, PREG, &segment, &offset) < 2) {
sciprintf("Error parsing reg_t on line %d\n", *line);
@@ -463,7 +463,6 @@
int songcount;
int i;
song_t *newsong;
- int oldstatus;
if (strcmp(lastval, "{")) {
_cfsml_error("Opening brackets expected at line %d\n", *line);
@@ -486,7 +485,7 @@
return 0;
}
-struct {
+static struct {
int type;
const char *name;
} mem_obj_string_names[] = {
@@ -512,8 +511,6 @@
return -1;
}
-static int bucket_length;
-
void write_int_hash_map_tp(Common::WriteStream *fh, int_hash_map_t **foo) {
%CFSMLWRITE int_hash_map_t *foo INTO fh;
}
@@ -645,7 +642,6 @@
}
int read_mem_obj_t(Common::SeekableReadStream *fh, mem_obj_t *foo, const char *lastval, int *line, int *hiteof) {
- char buffer[80];
foo->type = mem_obj_string_to_enum(lastval);
if (foo->type < 0) {
sciprintf("Unknown mem_obj_t type %s on line %d\n", lastval, *line);
@@ -714,10 +710,6 @@
int gamestate_save(state_t *s, Common::WriteStream *fh, const char* savename) {
- sci_dir_t dir;
- char *filename;
- int fd;
-
tm curTime;
g_system->getTimeAndDate(curTime);
@@ -840,8 +832,6 @@
static void reconstruct_scripts(state_t *s, seg_manager_t *self) {
int i;
mem_obj_t *mobj;
- object_t **objects;
- int *objects_nr;
for (i = 0; i < self->heap_size; i++) {
if (self->heap[i]) {
mobj = self->heap[i];
@@ -1006,8 +996,6 @@
}
state_t *gamestate_restore(state_t *s, Common::SeekableReadStream *fh) {
- int fd;
- int i;
int read_eof = 0;
state_t *retval;
songlib_t temp;
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-21 03:32:13 UTC (rev 38656)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-21 03:59:57 UTC (rev 38657)
@@ -111,7 +111,7 @@
}
int read_reg_t(Common::SeekableReadStream *fh, reg_t *foo, const char *lastval, int *line, int *hiteof) {
- int segment, offset;
+ unsigned int segment, offset;
if (sscanf(lastval, PREG, &segment, &offset) < 2) {
sciprintf("Error parsing reg_t on line %d\n", *line);
@@ -224,11 +224,11 @@
// Auto-generated CFSML declaration and function block
-#line 739 "savegame.cfsml"
+#line 736 "../../engines/sci/engine/savegame.cfsml"
#define CFSML_SUCCESS 0
#define CFSML_FAILURE 1
-#line 102 "savegame.cfsml"
+#line 102 "../../engines/sci/engine/savegame.cfsml"
#include <stdarg.h> // We need va_lists
#include "sci/include/sci_memory.h"
@@ -398,7 +398,7 @@
retval = (char *)sci_realloc(retval, mem += 1);
retval[pos] = 0; // Terminate string
-#line 281 "savegame.cfsml"
+#line 281 "../../engines/sci/engine/savegame.cfsml"
return _cfsml_last_identifier_retrieved = retval;
}
@@ -441,141 +441,139 @@
retval = (char *)sci_realloc(retval, mem += 1);
retval[pos] = 0; // Terminate string
-#line 333 "savegame.cfsml"
+#line 333 "../../engines/sci/engine/savegame.cfsml"
return (_cfsml_last_value_retrieved = (char *)sci_realloc(retval, strlen(retval) + 1));
// Re-allocate; this value might be used for quite some while (if we are restoring a string)
}
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_sfx_state_t(Common::WriteStream *fh, sfx_state_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_clone_entry_t(Common::WriteStream *fh, clone_entry_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_object_t(Common::WriteStream *fh, object_t* save_struc);
static int _cfsml_read_object_t(Common::SeekableReadStream *fh, object_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_string(Common::WriteStream *fh, char ** save_struc);
static int _cfsml_read_string(Common::SeekableReadStream *fh, char ** save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_menubar_t(Common::WriteStream *fh, menubar_t* save_struc);
static int _cfsml_read_menubar_t(Common::SeekableReadStream *fh, menubar_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_size_t(Common::WriteStream *fh, size_t* save_struc);
static int _cfsml_read_size_t(Common::SeekableReadStream *fh, size_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_list_entry_t(Common::WriteStream *fh, list_entry_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_int_hash_map_t(Common::WriteStream *fh, int_hash_map_t* save_struc);
static int _cfsml_read_int_hash_map_t(Common::SeekableReadStream *fh, int_hash_map_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_song_t(Common::WriteStream *fh, song_t* save_struc);
static int _cfsml_read_song_t(Common::SeekableReadStream *fh, song_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_menu_item_t(Common::WriteStream *fh, menu_item_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_node_entry_t(Common::WriteStream *fh, node_entry_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_seg_id_t(Common::WriteStream *fh, seg_id_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_dynmem_t(Common::WriteStream *fh, dynmem_t* save_struc);
static int _cfsml_read_dynmem_t(Common::SeekableReadStream *fh, dynmem_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_local_variables_t(Common::WriteStream *fh, local_variables_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_state_t(Common::WriteStream *fh, state_t* save_struc);
static int _cfsml_read_state_t(Common::SeekableReadStream *fh, state_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_node_table_t(Common::WriteStream *fh, node_table_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_sys_strings_t(Common::WriteStream *fh, sys_strings_t* save_struc);
static int _cfsml_read_sys_strings_t(Common::SeekableReadStream *fh, sys_strings_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_byte(Common::WriteStream *fh, byte* save_struc);
static int _cfsml_read_byte(Common::SeekableReadStream *fh, byte* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_node_t(Common::WriteStream *fh, node_t* save_struc);
static int _cfsml_read_node_t(Common::SeekableReadStream *fh, node_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_list_table_t(Common::WriteStream *fh, list_table_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_class_t(Common::WriteStream *fh, class_t* save_struc);
static int _cfsml_read_class_t(Common::SeekableReadStream *fh, class_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_song_handle_t(Common::WriteStream *fh, song_handle_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_int(Common::WriteStream *fh, int* save_struc);
static int _cfsml_read_int(Common::SeekableReadStream *fh, int* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_SavegameMetadata(Common::WriteStream *fh, SavegameMetadata* save_struc);
static int _cfsml_read_SavegameMetadata(Common::SeekableReadStream *fh, SavegameMetadata* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_menu_t(Common::WriteStream *fh, menu_t* save_struc);
static int _cfsml_read_menu_t(Common::SeekableReadStream *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_clone_table_t(Common::WriteStream *fh, clone_table_t* 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 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_clone_t(Common::WriteStream *fh, clone_t* save_struc);
static int _cfsml_read_clone_t(Common::SeekableReadStream *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_list_t(Common::WriteStream *fh, list_t* save_struc);
static int _cfsml_read_list_t(Common::SeekableReadStream *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_sys_string_t(Common::WriteStream *fh, sys_string_t* save_struc);
static int _cfsml_read_sys_string_t(Common::SeekableReadStream *fh, sys_string_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_script_t(Common::WriteStream *fh, script_t* save_struc);
static int _cfsml_read_script_t(Common::SeekableReadStream *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 383 "savegame.cfsml"
+#line 383 "../../engines/sci/engine/savegame.cfsml"
static void _cfsml_write_seg_manager_t(Common::WriteStream *fh, seg_manager_t* save_struc);
static int _cfsml_read_seg_manager_t(Common::SeekableReadStream *fh, seg_manager_t* save_struc, const char *lastval, int *line, int *hiteof);
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_sfx_state_t(Common::WriteStream *fh, sfx_state_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "songlib = ");
write_songlib_t(fh, (songlib_t*) &(save_struc->songlib));
@@ -583,14 +581,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record sfx_state_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -621,13 +618,13 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "songlib")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("sfx_state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -637,13 +634,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_clone_entry_t(Common::WriteStream *fh, clone_entry_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "next_free = ");
_cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -654,14 +649,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record clone_entry_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -692,20 +686,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../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,13 +709,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_object_t(Common::WriteStream *fh, object_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "flags = ");
_cfsml_write_int(fh, (int*) &(save_struc->flags));
@@ -739,12 +731,13 @@
_cfsml_write_int(fh, (int*) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->variables[i]));
WSprintf(fh, "\n");
}
@@ -753,14 +746,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record object_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -791,47 +783,48 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "flags")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -847,11 +840,11 @@
_cfsml_register_pointer(save_struc->variables);
} else
save_struc->variables = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -869,7 +862,7 @@
} while (!done);
save_struc->variables_nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("object_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -879,11 +872,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_string(Common::WriteStream *fh, char ** save_struc)
{
-#line 405 "savegame.cfsml"
+#line 402 "../../engines/sci/engine/savegame.cfsml"
if (!(*save_struc))
WSprintf(fh, "\\null\\");
else {
@@ -893,12 +886,11 @@
}
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_string(Common::SeekableReadStream *fh, char ** save_struc, const char *lastval, int *line, int *hiteof)
{
- char *token;
-#line 524 "savegame.cfsml"
+#line 519 "../../engines/sci/engine/savegame.cfsml"
if (strcmp(lastval, "\\null\\")) { // null pointer?
unsigned int length = strlen(lastval);
@@ -923,21 +915,20 @@
}
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_menubar_t(Common::WriteStream *fh, menubar_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_menu_t(fh, &(save_struc->menus[i]));
WSprintf(fh, "\n");
}
@@ -946,14 +937,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record menubar_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -984,12 +974,13 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "menus")) {
-#line 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1005,11 +996,11 @@
_cfsml_register_pointer(save_struc->menus);
} else
save_struc->menus = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1027,7 +1018,7 @@
} while (!done);
save_struc->menus_nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("menubar_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1037,19 +1028,19 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_size_t(Common::WriteStream *fh, size_t* save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 506 "../../engines/sci/engine/savegame.cfsml"
char *token;
-#line 512 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ((*save_struc == 0) && (token == lastval)) {
@@ -1063,13 +1054,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_list_entry_t(Common::WriteStream *fh, list_entry_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "next_free = ");
_cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -1080,14 +1069,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record list_entry_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -1118,20 +1106,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("list_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1141,22 +1129,21 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_int_hash_map_t(Common::WriteStream *fh, int_hash_map_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "base_value = ");
_cfsml_write_int(fh, (int*) &(save_struc->base_value));
WSprintf(fh, "\n");
WSprintf(fh, "nodes = ");
+ int min, max;
min = max = DCS_INT_HASH_MAX+1;
-#line 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
write_int_hash_map_node_tp(fh, &(save_struc->nodes[i]));
WSprintf(fh, "\n");
}
@@ -1165,14 +1152,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_int_hash_map_t(Common::SeekableReadStream *fh, int_hash_map_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record int_hash_map_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -1203,25 +1189,26 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "base_value")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->base_value), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for base_value at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "nodes")) {
-#line 608 "savegame.cfsml"
+#line 604 "../../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;
// Prepare to restore static array
max = DCS_INT_HASH_MAX+1;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1238,7 +1225,7 @@
done = 1;
} while (!done);
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("int_hash_map_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1248,13 +1235,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_song_t(Common::WriteStream *fh, song_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "handle = ");
_cfsml_write_song_handle_t(fh, (song_handle_t*) &(save_struc->handle));
@@ -1283,14 +1268,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record song_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -1321,62 +1305,62 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "handle")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("song_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1386,13 +1370,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_menu_item_t(Common::WriteStream *fh, menu_item_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "type = ");
_cfsml_write_int(fh, (int*) &(save_struc->type));
@@ -1407,10 +1389,11 @@
_cfsml_write_int(fh, (int*) &(save_struc->flags));
WSprintf(fh, "\n");
WSprintf(fh, "said = ");
+ int min, max;
min = max = MENU_SAID_SPEC_SIZE;
-#line 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_byte(fh, &(save_struc->said[i]));
WSprintf(fh, "\n");
}
@@ -1440,14 +1423,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record menu_item_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -1478,46 +1460,47 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "type")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
// Prepare to restore static array
max = MENU_SAID_SPEC_SIZE;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1535,55 +1518,55 @@
} while (!done);
} else
if (!strcmp(token, "said_pos")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("menu_item_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1593,13 +1576,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_node_entry_t(Common::WriteStream *fh, node_entry_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "next_free = ");
_cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -1610,14 +1591,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record node_entry_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -1648,20 +1628,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "next_free")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("node_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1671,19 +1651,19 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_seg_id_t(Common::WriteStream *fh, seg_id_t* save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 506 "../../engines/sci/engine/savegame.cfsml"
char *token;
-#line 512 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ((*save_struc == 0) && (token == lastval)) {
@@ -1697,13 +1677,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_dynmem_t(Common::WriteStream *fh, dynmem_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "size = ");
_cfsml_write_int(fh, (int*) &(save_struc->size));
@@ -1712,12 +1690,13 @@
_cfsml_write_string(fh, (char **) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_byte(fh, &(save_struc->buf[i]));
WSprintf(fh, "\n");
}
@@ -1726,14 +1705,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record dynmem_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -1764,26 +1742,27 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "size")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1799,11 +1778,11 @@
_cfsml_register_pointer(save_struc->buf);
} else
save_struc->buf = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1821,7 +1800,7 @@
} while (!done);
save_struc->size = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("dynmem_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1831,13 +1810,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_local_variables_t(Common::WriteStream *fh, local_variables_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "script_id = ");
_cfsml_write_int(fh, (int*) &(save_struc->script_id));
@@ -1846,12 +1823,13 @@
_cfsml_write_int(fh, (int*) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->locals[i]));
WSprintf(fh, "\n");
}
@@ -1860,14 +1838,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record local_variables_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -1898,26 +1875,27 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "script_id")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -1933,11 +1911,11 @@
_cfsml_register_pointer(save_struc->locals);
} else
save_struc->locals = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -1955,7 +1933,7 @@
} while (!done);
save_struc->nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("local_variables_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -1965,13 +1943,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_state_t(Common::WriteStream *fh, state_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "savegame_version = ");
_cfsml_write_int(fh, (int*) &(save_struc->savegame_version));
@@ -1998,12 +1974,13 @@
_cfsml_write_int(fh, (int*) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_class_t(fh, &(save_struc->classtable[i]));
WSprintf(fh, "\n");
}
@@ -2015,14 +1992,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_state_t(Common::SeekableReadStream *fh, state_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record state_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -2053,68 +2029,69 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "savegame_version")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_seg_manager_t(fh, (seg_manager_t*) &(save_struc->seg_manager), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_seg_manager_t() for seg_manager at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "classtable_size")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2130,11 +2107,11 @@
_cfsml_register_pointer(save_struc->classtable);
} else
save_struc->classtable = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2153,13 +2130,13 @@
save_struc->classtable_size = max ; // Set array size accordingly
} else
if (!strcmp(token, "sound")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2169,13 +2146,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_node_table_t(Common::WriteStream *fh, node_table_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "entries_nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -2190,12 +2165,13 @@
_cfsml_write_int(fh, (int*) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_node_entry_t(fh, &(save_struc->table[i]));
WSprintf(fh, "\n");
}
@@ -2204,14 +2180,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record node_table_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -2242,40 +2217,41 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2291,11 +2267,11 @@
_cfsml_register_pointer(save_struc->table);
} else
save_struc->table = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2313,7 +2289,7 @@
} while (!done);
save_struc->entries_nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("node_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2323,19 +2299,18 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_sys_strings_t(Common::WriteStream *fh, sys_strings_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "strings = ");
+ int min, max;
min = max = SYS_STRINGS_MAX;
-#line 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_sys_string_t(fh, &(save_struc->strings[i]));
WSprintf(fh, "\n");
}
@@ -2344,14 +2319,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_sys_strings_t(Common::SeekableReadStream *fh, sys_strings_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record sys_strings_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -2382,18 +2356,19 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "strings")) {
-#line 608 "savegame.cfsml"
+#line 604 "../../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;
// Prepare to restore static array
max = SYS_STRINGS_MAX;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2410,7 +2385,7 @@
done = 1;
} while (!done);
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("sys_strings_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2420,19 +2395,19 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_byte(Common::WriteStream *fh, byte* save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_byte(Common::SeekableReadStream *fh, byte* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 506 "../../engines/sci/engine/savegame.cfsml"
char *token;
-#line 512 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ((*save_struc == 0) && (token == lastval)) {
@@ -2446,13 +2421,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_node_t(Common::WriteStream *fh, node_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "pred = ");
write_reg_t(fh, (reg_t*) &(save_struc->pred));
@@ -2469,14 +2442,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record node_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -2507,34 +2479,34 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "pred")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("node_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2544,13 +2516,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_list_table_t(Common::WriteStream *fh, list_table_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "entries_nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -2565,12 +2535,13 @@
_cfsml_write_int(fh, (int*) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_list_entry_t(fh, &(save_struc->table[i]));
WSprintf(fh, "\n");
}
@@ -2579,14 +2550,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record list_table_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -2617,40 +2587,41 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -2666,11 +2637,11 @@
_cfsml_register_pointer(save_struc->table);
} else
save_struc->table = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -2688,7 +2659,7 @@
} while (!done);
save_struc->entries_nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("list_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2698,13 +2669,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_class_t(Common::WriteStream *fh, class_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "script = ");
_cfsml_write_int(fh, (int*) &(save_struc->script));
@@ -2715,14 +2684,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record class_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -2753,20 +2721,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "script")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("class_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2776,19 +2744,19 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_song_handle_t(Common::WriteStream *fh, song_handle_t* save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 488 "savegame.cfsml"
+#line 486 "../../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 506 "../../engines/sci/engine/savegame.cfsml"
char *token;
-#line 512 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ((*save_struc == 0) && (token == lastval)) {
@@ -2802,19 +2770,19 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_int(Common::WriteStream *fh, int* save_struc)
{
WSprintf(fh, "%li", (long)*save_struc);
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_int(Common::SeekableReadStream *fh, int* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 506 "../../engines/sci/engine/savegame.cfsml"
char *token;
-#line 512 "savegame.cfsml"
*save_struc = strtol(lastval, &token, 0);
if ((*save_struc == 0) && (token == lastval)) {
@@ -2828,13 +2796,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_SavegameMetadata(Common::WriteStream *fh, SavegameMetadata* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "savegame_name = ");
_cfsml_write_string(fh, (char **) &(save_struc->savegame_name));
@@ -2857,14 +2823,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_SavegameMetadata(Common::SeekableReadStream *fh, SavegameMetadata* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record SavegameMetadata; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -2895,48 +2860,48 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "savegame_name")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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, "savegame_date")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->savegame_date), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for savegame_date at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "savegame_time")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->savegame_time), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for savegame_time at line %d\n", *line);
return CFSML_FAILURE;
}
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("SavegameMetadata: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -2946,13 +2911,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_menu_t(Common::WriteStream *fh, menu_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "title = ");
_cfsml_write_string(fh, (char **) &(save_struc->title));
@@ -2964,12 +2927,13 @@
_cfsml_write_int(fh, (int*) &(save_struc->width));
WSprintf(fh, "\n");
WSprintf(fh, "items = ");
+ int min, max;
min = max = save_struc->items_nr;
if (!save_struc->items)
min = max = 0; /* Don't write if it points to NULL */
-#line 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_menu_item_t(fh, &(save_struc->items[i]));
WSprintf(fh, "\n");
}
@@ -2978,14 +2942,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_menu_t(Common::SeekableReadStream *fh, menu_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record menu_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -3016,33 +2979,34 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "title")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_string(fh, (char **) &(save_struc->title), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_string() for title at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "title_width")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->title_width), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for title_width at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "width")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->width), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for width at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "items")) {
-#line 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -3058,11 +3022,11 @@
_cfsml_register_pointer(save_struc->items);
} else
save_struc->items = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -3080,7 +3044,7 @@
} while (!done);
save_struc->items_nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("menu_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3090,13 +3054,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_clone_table_t(Common::WriteStream *fh, clone_table_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "entries_nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -3111,12 +3073,13 @@
_cfsml_write_int(fh, (int*) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_clone_entry_t(fh, &(save_struc->table[i]));
WSprintf(fh, "\n");
}
@@ -3125,14 +3088,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_clone_table_t(Common::SeekableReadStream *fh, clone_table_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record clone_table_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -3163,40 +3125,41 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "entries_nr")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -3212,11 +3175,11 @@
_cfsml_register_pointer(save_struc->table);
} else
save_struc->table = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -3234,7 +3197,7 @@
} while (!done);
save_struc->entries_nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("clone_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3244,13 +3207,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_clone_t(Common::WriteStream *fh, clone_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "flags = ");
_cfsml_write_int(fh, (int*) &(save_struc->flags));
@@ -3268,12 +3229,13 @@
_cfsml_write_int(fh, (int*) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
write_reg_t(fh, &(save_struc->variables[i]));
WSprintf(fh, "\n");
}
@@ -3282,14 +3244,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_clone_t(Common::SeekableReadStream *fh, clone_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record clone_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -3320,47 +3281,48 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "flags")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -3376,11 +3338,11 @@
_cfsml_register_pointer(save_struc->variables);
} else
save_struc->variables = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -3398,7 +3360,7 @@
} while (!done);
save_struc->variables_nr = max ; // Set array size accordingly
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("clone_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3408,13 +3370,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_list_t(Common::WriteStream *fh, list_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "first = ");
write_reg_t(fh, (reg_t*) &(save_struc->first));
@@ -3425,14 +3385,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_list_t(Common::SeekableReadStream *fh, list_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record list_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -3463,20 +3422,20 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "first")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (read_reg_t(fh, (reg_t*) &(save_struc->first), value, line, hiteof)) {
_cfsml_error("Token expected by read_reg_t() for first at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "last")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (read_reg_t(fh, (reg_t*) &(save_struc->last), value, line, hiteof)) {
_cfsml_error("Token expected by read_reg_t() for last at line %d\n", *line);
return CFSML_FAILURE;
}
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("list_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3486,13 +3445,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_sys_string_t(Common::WriteStream *fh, sys_string_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "name = ");
_cfsml_write_string(fh, (char **) &(save_struc->name));
@@ -3506,14 +3463,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_sys_string_t(Common::SeekableReadStream *fh, sys_string_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record sys_string_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -3544,27 +3500,27 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "name")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 693 "savegame.cfsml"
+#line 690 "../../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 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("sys_string_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3574,13 +3530,11 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_script_t(Common::WriteStream *fh, script_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "nr = ");
_cfsml_write_int(fh, (int*) &(save_struc->nr));
@@ -3613,12 +3567,13 @@
_cfsml_write_int(fh, (int*) &(save_struc->objects_nr));
WSprintf(fh, "\n");
WSprintf(fh, "objects = ");
+ int min, max;
min = max = save_struc->objects_allocated;
if (!save_struc->objects)
min = max = 0; /* Don't write if it points to NULL */
-#line 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
_cfsml_write_object_t(fh, &(save_struc->objects[i]));
WSprintf(fh, "\n");
}
@@ -3636,14 +3591,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
+#line 486 "../../engines/sci/engine/savegame.cfsml"
static int
_cfsml_read_script_t(Common::SeekableReadStream *fh, script_t* save_struc, const char *lastval, int *line, int *hiteof)
{
+#line 541 "../../engines/sci/engine/savegame.cfsml"
char *token;
- int min, max, i;
-#line 546 "savegame.cfsml"
- int assignment, closed, done;
+ int assignment, closed;
if (strcmp(lastval, "{")) {
_cfsml_error("Reading record script_t; expected opening braces in line %d, got \"%s\"\n", *line, lastval);
@@ -3674,82 +3628,83 @@
return CFSML_FAILURE;
}
if (!strcmp(token, "nr")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../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, "buf_size")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->buf_size), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_size_t() for buf_size at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "script_size")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->script_size), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_size_t() for script_size at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "heap_size")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->heap_size), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_size_t() for heap_size at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "obj_indices")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (read_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->obj_indices), value, line, hiteof)) {
_cfsml_error("Token expected by read_int_hash_map_tp() for obj_indices at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "exports_nr")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->exports_nr), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for exports_nr at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "synonyms_nr")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->synonyms_nr), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for synonyms_nr at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "lockers")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->lockers), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for lockers at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "objects_allocated")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->objects_allocated), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for objects_allocated at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "objects_nr")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->objects_nr), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for objects_nr at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "objects")) {
-#line 608 "savegame.cfsml"
+#line 604 "../../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;
}
-#line 618 "savegame.cfsml"
+ int max,done,i;
+#line 615 "../../engines/sci/engine/savegame.cfsml"
// Prepare to restore dynamic array
max = strtol(value + 1, NULL, 0);
if (max < 0) {
@@ -3765,11 +3720,11 @@
_cfsml_register_pointer(save_struc->objects);
} else
save_struc->objects = NULL;
-#line 642 "savegame.cfsml"
+#line 639 "../../engines/sci/engine/savegame.cfsml"
done = i = 0;
do {
if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
-#line 650 "savegame.cfsml"
+#line 647 "../../engines/sci/engine/savegame.cfsml"
_cfsml_error("Token expected at line %d\n", *line);
return 1;
}
@@ -3788,27 +3743,27 @@
save_struc->objects_allocated = max ; // Set array size accordingly
} else
if (!strcmp(token, "locals_offset")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->locals_offset), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for locals_offset at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "locals_segment")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->locals_segment), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for locals_segment at line %d\n", *line);
return CFSML_FAILURE;
}
} else
if (!strcmp(token, "marked_as_deleted")) {
-#line 693 "savegame.cfsml"
+#line 690 "../../engines/sci/engine/savegame.cfsml"
if (_cfsml_read_int(fh, (int*) &(save_struc->marked_as_deleted), value, line, hiteof)) {
_cfsml_error("Token expected by _cfsml_read_int() for marked_as_deleted at line %d\n", *line);
return CFSML_FAILURE;
}
} else
-#line 702 "savegame.cfsml"
+#line 699 "../../engines/sci/engine/savegame.cfsml"
{
_cfsml_error("script_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
return CFSML_FAILURE;
@@ -3818,24 +3773,23 @@
return CFSML_SUCCESS;
}
-#line 395 "savegame.cfsml"
+#line 395 "../../engines/sci/engine/savegame.cfsml"
static void
_cfsml_write_seg_manager_t(Common::WriteStream *fh, seg_manager_t* save_struc)
{
- int min, max, i;
-
-#line 415 "savegame.cfsml"
+#line 412 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "{\n");
WSprintf(fh, "id_seg_map = ");
write_int_hash_map_tp(fh, (int_hash_map_t **) &(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 441 "savegame.cfsml"
+#line 439 "../../engines/sci/engine/savegame.cfsml"
WSprintf(fh, "[%d][\n", max);
- for (i = 0; i < min; i++) {
+ for (int i = 0; i < min; i++) {
write_mem_obj_tp(fh, &(save_struc->heap[i]));
WSprintf(fh, "\n");
}
@@ -3871,14 +3825,13 @@
WSprintf(fh, "}");
}
-#line 488 "savegame.cfsml"
@@ 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