[Scummvm-cvs-logs] SF.net SVN: scummvm:[38201] scummvm/trunk/engines/sci

Sun Feb 15 09:34:14 CET 2009

Revision: 38201
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38201&view=rev
Author:   jvprat
Date:     2009-02-15 08:34:13 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
SCI: Get rid of the include directory hack (it compiles but it doesn't link yet)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.c
    scummvm/trunk/engines/sci/engine/gc.c
    scummvm/trunk/engines/sci/engine/gc.h
    scummvm/trunk/engines/sci/engine/grammar.c
    scummvm/trunk/engines/sci/engine/heap.c
    scummvm/trunk/engines/sci/engine/heap.h
    scummvm/trunk/engines/sci/engine/kernel.c
    scummvm/trunk/engines/sci/engine/kernel_types.h
    scummvm/trunk/engines/sci/engine/kevent.c
    scummvm/trunk/engines/sci/engine/kfile.c
    scummvm/trunk/engines/sci/engine/kgraphics.c
    scummvm/trunk/engines/sci/engine/klists.c
    scummvm/trunk/engines/sci/engine/kmath.c
    scummvm/trunk/engines/sci/engine/kmenu.c
    scummvm/trunk/engines/sci/engine/kmovement.c
    scummvm/trunk/engines/sci/engine/kpathing.c
    scummvm/trunk/engines/sci/engine/kscripts.c
    scummvm/trunk/engines/sci/engine/ksound.c
    scummvm/trunk/engines/sci/engine/kstring.c
    scummvm/trunk/engines/sci/engine/message.c
    scummvm/trunk/engines/sci/engine/message.h
    scummvm/trunk/engines/sci/engine/said.c
    scummvm/trunk/engines/sci/engine/said.y
    scummvm/trunk/engines/sci/engine/savegame.c
    scummvm/trunk/engines/sci/engine/savegame.cfsml
    scummvm/trunk/engines/sci/engine/scriptdebug.c
    scummvm/trunk/engines/sci/engine/seg_manager.c
    scummvm/trunk/engines/sci/engine/sys_strings.c
    scummvm/trunk/engines/sci/engine/vm.c
    scummvm/trunk/engines/sci/gfx/antialias.c
    scummvm/trunk/engines/sci/gfx/drivers/scummvm_driver.cpp
    scummvm/trunk/engines/sci/gfx/font-5x8.c
    scummvm/trunk/engines/sci/gfx/font-6x10.c
    scummvm/trunk/engines/sci/gfx/font.c
    scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.c
    scummvm/trunk/engines/sci/gfx/gfx_res_options.c
    scummvm/trunk/engines/sci/gfx/gfx_resource.c
    scummvm/trunk/engines/sci/gfx/gfx_support.c
    scummvm/trunk/engines/sci/gfx/gfx_tools.c
    scummvm/trunk/engines/sci/gfx/menubar.c
    scummvm/trunk/engines/sci/gfx/operations.c
    scummvm/trunk/engines/sci/gfx/resmgr.c
    scummvm/trunk/engines/sci/gfx/resource/sci_cursor_0.c
    scummvm/trunk/engines/sci/gfx/resource/sci_font.c
    scummvm/trunk/engines/sci/gfx/resource/sci_pal_1.c
    scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.c
    scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.c
    scummvm/trunk/engines/sci/gfx/resource/sci_view_0.c
    scummvm/trunk/engines/sci/gfx/resource/sci_view_1.c
    scummvm/trunk/engines/sci/gfx/sbtree.c
    scummvm/trunk/engines/sci/gfx/sci_widgets.c
    scummvm/trunk/engines/sci/gfx/widgets.c
    scummvm/trunk/engines/sci/include/conf_parse.h
    scummvm/trunk/engines/sci/include/console.h
    scummvm/trunk/engines/sci/include/engine.h
    scummvm/trunk/engines/sci/include/event.h
    scummvm/trunk/engines/sci/include/gfx_driver.h
    scummvm/trunk/engines/sci/include/gfx_operations.h
    scummvm/trunk/engines/sci/include/gfx_options.h
    scummvm/trunk/engines/sci/include/gfx_res_options.h
    scummvm/trunk/engines/sci/include/gfx_resmgr.h
    scummvm/trunk/engines/sci/include/gfx_resource.h
    scummvm/trunk/engines/sci/include/gfx_state_internal.h
    scummvm/trunk/engines/sci/include/gfx_system.h
    scummvm/trunk/engines/sci/include/gfx_tools.h
    scummvm/trunk/engines/sci/include/gfx_widgets.h
    scummvm/trunk/engines/sci/include/heapmgr.h
    scummvm/trunk/engines/sci/include/kernel.h
    scummvm/trunk/engines/sci/include/menubar.h
    scummvm/trunk/engines/sci/include/resource.h
    scummvm/trunk/engines/sci/include/sci_memory.h
    scummvm/trunk/engines/sci/include/sci_widgets.h
    scummvm/trunk/engines/sci/include/sciresource.h
    scummvm/trunk/engines/sci/include/script.h
    scummvm/trunk/engines/sci/include/seg_manager.h
    scummvm/trunk/engines/sci/include/sfx_engine.h
    scummvm/trunk/engines/sci/include/sfx_iterator.h
    scummvm/trunk/engines/sci/include/sfx_iterator_internal.h
    scummvm/trunk/engines/sci/include/sfx_pcm.h
    scummvm/trunk/engines/sci/include/sfx_player.h
    scummvm/trunk/engines/sci/include/sfx_songlib.h
    scummvm/trunk/engines/sci/include/sfx_timer.h
    scummvm/trunk/engines/sci/include/versions.h
    scummvm/trunk/engines/sci/include/vm.h
    scummvm/trunk/engines/sci/include/vm_types.h
    scummvm/trunk/engines/sci/include/vocabulary.h
    scummvm/trunk/engines/sci/module.mk
    scummvm/trunk/engines/sci/scicore/aatree.c
    scummvm/trunk/engines/sci/scicore/decompress0.c
    scummvm/trunk/engines/sci/scicore/decompress01.c
    scummvm/trunk/engines/sci/scicore/decompress1.c
    scummvm/trunk/engines/sci/scicore/decompress11.c
    scummvm/trunk/engines/sci/scicore/exe.c
    scummvm/trunk/engines/sci/scicore/exe_lzexe.c
    scummvm/trunk/engines/sci/scicore/exe_raw.c
    scummvm/trunk/engines/sci/scicore/int_hashmap.c
    scummvm/trunk/engines/sci/scicore/reg_t_hashmap.c
    scummvm/trunk/engines/sci/scicore/resource.c
    scummvm/trunk/engines/sci/scicore/resource_map.c
    scummvm/trunk/engines/sci/scicore/resource_patch.c
    scummvm/trunk/engines/sci/scicore/sci_memory.c
    scummvm/trunk/engines/sci/scicore/script.c
    scummvm/trunk/engines/sci/scicore/tools.c
    scummvm/trunk/engines/sci/scicore/versions.c
    scummvm/trunk/engines/sci/scicore/vocab.c
    scummvm/trunk/engines/sci/scicore/vocab_debug.c
    scummvm/trunk/engines/sci/sfx/adlib.c
    scummvm/trunk/engines/sci/sfx/adlib.h
    scummvm/trunk/engines/sci/sfx/core.c
    scummvm/trunk/engines/sci/sfx/device/devices.c
    scummvm/trunk/engines/sci/sfx/iterator.c
    scummvm/trunk/engines/sci/sfx/mixer/mixers.c
    scummvm/trunk/engines/sci/sfx/mixer/soft.c
    scummvm/trunk/engines/sci/sfx/mixer.h
    scummvm/trunk/engines/sci/sfx/pcm-iterator.c
    scummvm/trunk/engines/sci/sfx/pcm_device/pcm_devices.c
    scummvm/trunk/engines/sci/sfx/pcm_device/scummvm.cpp
    scummvm/trunk/engines/sci/sfx/player/players.c
    scummvm/trunk/engines/sci/sfx/player/polled.c
    scummvm/trunk/engines/sci/sfx/player/realtime.c
    scummvm/trunk/engines/sci/sfx/sequencer.h
    scummvm/trunk/engines/sci/sfx/softseq/SN76496.c
    scummvm/trunk/engines/sci/sfx/softseq/amiga.c
    scummvm/trunk/engines/sci/sfx/softseq/fmopl.h
    scummvm/trunk/engines/sci/sfx/softseq/pcspeaker.c
    scummvm/trunk/engines/sci/sfx/softseq.h
    scummvm/trunk/engines/sci/sfx/songlib.c
    scummvm/trunk/engines/sci/sfx/time.c
    scummvm/trunk/engines/sci/sfx/timer/scummvm.cpp
    scummvm/trunk/engines/sci/sfx/timer/timers.c

Modified: scummvm/trunk/engines/sci/engine/game.c
===================================================================

--- scummvm/trunk/engines/sci/engine/game.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/game.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -39,11 +39,11 @@
 #	endif
 #endif
 
-#include <sciresource.h>
-#include <engine.h>
-#include <versions.h>
-#include <kernel.h>
-#include "kernel_types.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/include/versions.h"
+#include "sci/include/kernel.h"
+#include "sci/engine/kernel_types.h"
 
 /* Structures and data from vm.c: */
 extern calls_struct_t *send_calls;

Modified: scummvm/trunk/engines/sci/engine/gc.c
===================================================================
--- scummvm/trunk/engines/sci/engine/gc.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/gc.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -18,7 +18,7 @@
 
 ***************************************************************************/
 
-#include "gc.h"
+#include "sci/engine/gc.h"
 
 #define WORKLIST_CHUNK_SIZE 32
 

Modified: scummvm/trunk/engines/sci/engine/gc.h
===================================================================
--- scummvm/trunk/engines/sci/engine/gc.h	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/gc.h	2009-02-15 08:34:13 UTC (rev 38201)
@@ -22,8 +22,8 @@
 #ifndef GC_H_
 #define GC_H_
 
-#include <reg_t_hashmap.h>
-#include <engine.h>
+#include "sci/include/reg_t_hashmap.h"
+#include "sci/include/engine.h"
 
 reg_t_hash_map_ptr
 find_all_used_references(state_t *s);

Modified: scummvm/trunk/engines/sci/engine/grammar.c
===================================================================
--- scummvm/trunk/engines/sci/engine/grammar.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/grammar.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -23,9 +23,9 @@
 ** that grammar, writing an appropriate node tree if successful.
 */
 
-#include <resource.h>
-#include <vocabulary.h>
-#include <console.h>
+#include "sci/include/resource.h"
+#include "sci/include/vocabulary.h"
+#include "sci/include/console.h"
 #include <stdarg.h>
 #include <string.h>
 

Modified: scummvm/trunk/engines/sci/engine/heap.c
===================================================================
--- scummvm/trunk/engines/sci/engine/heap.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/heap.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -2,9 +2,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <engine.h>
-#include <console.h>
-#include "heap.h"
+#include "sci/include/engine.h"
+#include "sci/include/console.h"
+#include "sci/engine/heap.h"
 
 #define assert_in_range(pos) assert(pos>=1000 && pos<=0xffff)
 

Modified: scummvm/trunk/engines/sci/engine/heap.h
===================================================================
--- scummvm/trunk/engines/sci/engine/heap.h	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/heap.h	2009-02-15 08:34:13 UTC (rev 38201)
@@ -28,7 +28,7 @@
 #ifndef _SCI_HEAP_H
 #define _SCI_HEAP_H
 
-#include <resource.h>
+#include "sci/include/resource.h"
 
 #define SCI_HEAP_SIZE 0x10000
 

Modified: scummvm/trunk/engines/sci/engine/kernel.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kernel.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,15 +25,15 @@
 
 ***************************************************************************/
 
-#include "gc.h"
-#include <sciresource.h>
-#include <engine.h>
+#include "sci/engine/gc.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
 #ifdef _WIN32
 #	include <windows.h>
 #endif /* _WIN32 */
 
-#include <gfx_operations.h>
-#include "kernel_types.h"
+#include "sci/include/gfx_operations.h"
+#include "sci/engine/kernel_types.h"
 
 
 /* New kernel functions */

Modified: scummvm/trunk/engines/sci/engine/kernel_types.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_types.h	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kernel_types.h	2009-02-15 08:34:13 UTC (rev 38201)
@@ -28,7 +28,7 @@
 #ifndef _FREESCI_KERNEL_TYPES_H_
 #define _FREESCI_KERNEL_TYPES_H_
 
-#include "vm_types.h"
+#include "sci/include/vm_types.h"
 
 #define KSIG_TERMINATOR 0
 

Modified: scummvm/trunk/engines/sci/engine/kevent.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kevent.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kevent.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <engine.h>
+#include "sci/include/engine.h"
 
 int stop_on_event;
 

Modified: scummvm/trunk/engines/sci/engine/kfile.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kfile.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <engine.h>
+#include "sci/include/engine.h"
 
 #ifdef _WIN32
 #  ifndef PATH_MAX

Modified: scummvm/trunk/engines/sci/engine/kgraphics.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kgraphics.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,11 +25,11 @@
 
 ***************************************************************************/
 
-#include <sciresource.h>
-#include <engine.h>
-#include <gfx_widgets.h>
-#include "sci_graphics.h"
-#include <sci_widgets.h>
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/include/gfx_widgets.h"
+#include "sci/engine/sci_graphics.h"
+#include "sci/include/sci_widgets.h"
 
 #undef DEBUG_LSRECT
 

Modified: scummvm/trunk/engines/sci/engine/klists.c
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/klists.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <engine.h>
+#include "sci/include/engine.h"
 
 #ifdef LOOKUP_NODE
 #  undef LOOKUP_NODE

Modified: scummvm/trunk/engines/sci/engine/kmath.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kmath.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kmath.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <engine.h>
+#include "sci/include/engine.h"
 
 
 reg_t

Modified: scummvm/trunk/engines/sci/engine/kmenu.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kmenu.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,9 +25,9 @@
 
 ***************************************************************************/
 
-#include <sciresource.h>
-#include <engine.h>
-#include <sci_widgets.h>
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/include/sci_widgets.h"
 
 
 reg_t

Modified: scummvm/trunk/engines/sci/engine/kmovement.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kmovement.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,8 +25,8 @@
 
 ***************************************************************************/
 
-#include <sciresource.h>
-#include <engine.h>
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
 
 /*
 Compute "velocity" vector (xStep,yStep)=(vx,vy) for a jump from (0,0) to (dx,dy), with gravity gy. 

Modified: scummvm/trunk/engines/sci/engine/kpathing.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kpathing.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -31,9 +31,9 @@
 
 #include <math.h>
 
-#include <engine.h>
-#include <aatree.h>
-#include <list.h>
+#include "sci/include/engine.h"
+#include "sci/include/aatree.h"
+#include "sci/include/list.h"
 
 #define POLY_LAST_POINT 0x7777
 #define POLY_POINT_SIZE 4

Modified: scummvm/trunk/engines/sci/engine/kscripts.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kscripts.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,9 +25,9 @@
 
 ***************************************************************************/
 
-#include <sciresource.h>
-#include <engine.h>
-#include "kernel_types.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/engine/kernel_types.h"
 
 reg_t
 read_selector(state_t *s, reg_t object, selector_t selector_id, const char *file, int line)

Modified: scummvm/trunk/engines/sci/engine/ksound.c
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/ksound.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,8 +25,8 @@
 
 ***************************************************************************/
 
-#include <engine.h>
-#include <sfx_player.h>
+#include "sci/include/engine.h"
+#include "sci/include/sfx_player.h"
 
 #define _K_SCI0_SOUND_INIT_HANDLE 0
 #define _K_SCI0_SOUND_PLAY_HANDLE 1

Modified: scummvm/trunk/engines/sci/engine/kstring.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/kstring.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -26,9 +26,9 @@
 ***************************************************************************/
 /* String and parser handling */
 
-#include <sciresource.h>
-#include <engine.h>
-#include "message.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/engine/message.h"
 
 #define CHECK_OVERFLOW1(pt, size, rv) \
 	if (((pt) - (str_base)) + (size) > maxsize) { \

Modified: scummvm/trunk/engines/sci/engine/message.c
===================================================================
--- scummvm/trunk/engines/sci/engine/message.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/message.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include "message.h"
+#include "sci/engine/message.h"
 
 static
 int get_talker_trivial(index_record_cursor_t *cursor)

Modified: scummvm/trunk/engines/sci/engine/message.h
===================================================================
--- scummvm/trunk/engines/sci/engine/message.h	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/message.h	2009-02-15 08:34:13 UTC (rev 38201)
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <sciresource.h>
+#include "sci/include/sciresource.h"
 
 typedef struct
 {

Modified: scummvm/trunk/engines/sci/engine/said.c
===================================================================
--- scummvm/trunk/engines/sci/engine/said.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/said.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -104,10 +104,10 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 28 "said.y"
+#line 28 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
 
 
-#include <engine.h>
+#include "sci/include/engine.h"
 
 #define SAID_BRANCH_NULL 0
 
@@ -228,7 +228,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 232 "said.c"
+#line 232 "y.tab.c"
 
 #ifdef short
 # undef short
@@ -1472,178 +1472,178 @@
   switch (yyn)
     {
         case 2:
-#line 139 "said.y"
+#line 139 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]))); }
     break;
 
   case 3:
-#line 141 "said.y"
+#line 141 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (3)]), said_attach_branch((yyvsp[(2) - (3)]), (yyvsp[(3) - (3)])))); }
     break;
 
   case 4:
-#line 143 "said.y"
+#line 143 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_top_branch(said_attach_branch((yyvsp[(1) - (4)]), said_attach_branch((yyvsp[(2) - (4)]), said_attach_branch((yyvsp[(3) - (4)]), (yyvsp[(4) - (4)]))))); }
     break;
 
   case 5:
-#line 148 "said.y"
+#line 148 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = SAID_BRANCH_NULL; }
     break;
 
   case 6:
-#line 150 "said.y"
+#line 150 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_paren(said_value(0x14b, said_value(0xf900, said_terminal(0xf900))), SAID_BRANCH_NULL); }
     break;
 
   case 7:
-#line 156 "said.y"
+#line 156 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = SAID_BRANCH_NULL; }
     break;
 
   case 8:
-#line 158 "said.y"
+#line 158 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_paren(said_value(0x141, said_value(0x149, (yyvsp[(1) - (1)]))), SAID_BRANCH_NULL); }
     break;
 
   case 9:
-#line 164 "said.y"
+#line 164 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x142, 0x14a, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); }
     break;
 
   case 10:
-#line 166 "said.y"
+#line 166 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x152, 0x142, said_aug_branch(0x142, 0x14a, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
     break;
 
   case 11:
-#line 168 "said.y"
+#line 168 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = SAID_BRANCH_NULL; }
     break;
 
   case 12:
-#line 174 "said.y"
+#line 174 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x143, 0x14a, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); }
     break;
 
   case 13:
-#line 176 "said.y"
+#line 176 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x152, 0x143, said_aug_branch(0x143, 0x14a, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
     break;
 
   case 14:
-#line 178 "said.y"
+#line 178 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = SAID_BRANCH_NULL; }
     break;
 
   case 15:
-#line 184 "said.y"
+#line 184 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_paren(said_value(0x141, said_value(0x153, said_terminal((yyvsp[(1) - (1)])))), SAID_BRANCH_NULL); }
     break;
 
   case 16:
-#line 189 "said.y"
+#line 189 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x141, 0x14f, (yyvsp[(1) - (1)]), SAID_BRANCH_NULL); }
     break;
 
   case 17:
-#line 191 "said.y"
+#line 191 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x141, 0x14f, said_aug_branch(0x152, 0x14c, said_aug_branch(0x141, 0x14f, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
     break;
 
   case 18:
-#line 196 "said.y"
+#line 196 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 19:
-#line 198 "said.y"
+#line 198 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = (yyvsp[(1) - (3)]); }
     break;
 
   case 20:
-#line 200 "said.y"
+#line 200 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_attach_branch((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)])); }
     break;
 
   case 21:
-#line 202 "said.y"
+#line 202 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_attach_branch((yyvsp[(1) - (4)]), (yyvsp[(3) - (4)])); }
     break;
 
   case 22:
-#line 204 "said.y"
+#line 204 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_attach_branch((yyvsp[(1) - (5)]), (yyvsp[(3) - (5)])); }
     break;
 
   case 23:
-#line 210 "said.y"
+#line 210 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_attach_branch((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)])); }
     break;
 
   case 24:
-#line 212 "said.y"
+#line 212 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 25:
-#line 214 "said.y"
+#line 214 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 26:
-#line 220 "said.y"
+#line 220 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 27:
-#line 222 "said.y"
+#line 222 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x152, 0x144, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL); }
     break;
 
   case 28:
-#line 224 "said.y"
+#line 224 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_attach_branch((yyvsp[(1) - (4)]), said_aug_branch(0x152, 0x144, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL)); }
     break;
 
   case 29:
-#line 230 "said.y"
+#line 230 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (3)]), (yyvsp[(3) - (3)])); }
     break;
 
   case 30:
-#line 232 "said.y"
+#line 232 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x144, 0x14f, said_aug_branch(0x141, 0x144, (yyvsp[(2) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
     break;
 
   case 31:
-#line 234 "said.y"
+#line 234 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL); }
     break;
 
   case 32:
-#line 236 "said.y"
+#line 236 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x152, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(3) - (4)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
     break;
 
   case 33:
-#line 242 "said.y"
+#line 242 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x141, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (3)]), SAID_BRANCH_NULL), (yyvsp[(3) - (3)])); }
     break;
 
   case 34:
-#line 244 "said.y"
+#line 244 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x141, 0x144, said_aug_branch(0x144, 0x14f, (yyvsp[(2) - (2)]), SAID_BRANCH_NULL), SAID_BRANCH_NULL); }
     break;
 
   case 35:
-#line 246 "said.y"
+#line 246 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
     { (yyval) = said_aug_branch(0x141, 0x14c, (yyvsp[(2) - (4)]), SAID_BRANCH_NULL); }
     break;
 
 
 /* Line 1267 of yacc.c.  */
-#line 1647 "said.c"
+#line 1647 "y.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1857,7 +1857,7 @@
 }
 
 
-#line 251 "said.y"
+#line 251 "../../full-svn/scummvm/trunk/engines/sci/engine/said.y"
 
 
 

Modified: scummvm/trunk/engines/sci/engine/said.y
===================================================================
--- scummvm/trunk/engines/sci/engine/said.y	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/said.y	2009-02-15 08:34:13 UTC (rev 38201)
@@ -27,7 +27,7 @@
 
 %{
 
-#include <engine.h>
+#include "sci/include/engine.h"
 
 #define SAID_BRANCH_NULL 0
 

Modified: scummvm/trunk/engines/sci/engine/savegame.c
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.c	2009-02-15 08:31:38 UTC (rev 38200)
+++ scummvm/trunk/engines/sci/engine/savegame.c	2009-02-15 08:34:13 UTC (rev 38201)
@@ -30,12 +30,12 @@
 ** savegame.cfsml. If this doesn't solve your problem, contact the maintainer.
 */
 
-#include <sci_memory.h>
-#include <gfx_operations.h>
-#include <sfx_engine.h>
-#include <engine.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/gfx_operations.h"
+#include "sci/include/sfx_engine.h"
+#include "sci/include/engine.h"
 #include <assert.h>
-#include "heap.h"
+#include "sci/engine/heap.h"
 
 #ifdef _MSC_VER
 #include <direct.h>
@@ -183,9 +183,11 @@
 
 /* Auto-generated CFSML declaration and function block */
 
+#line 796 "savegame.cfsml"
 #define CFSML_SUCCESS 0
 #define CFSML_FAILURE 1
 
+#line 102 "savegame.cfsml"
 
 #include <stdarg.h> /* We need va_lists */
 #include <sci_memory.h>
@@ -396,6 +398,7 @@
      retval = (char *) sci_realloc(retval, mem += 1);
 
   retval[pos] = 0; /* Terminate string */
+#line 322 "savegame.cfsml"
 
   return _cfsml_last_identifier_retreived = retval;
 }
@@ -443,181 +446,217 @@
     retval = (char *) sci_realloc(retval, mem += 1);
 
   retval[pos] = 0; /* Terminate string */
+#line 379 "savegame.cfsml"
   return (_cfsml_last_value_retreived = (char *) sci_realloc(retval, strlen(retval) + 1));
   /* Re-allocate; this value might be used for quite some while (if we are
   ** restoring a string)
   */
 }
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_synonym_t(FILE *fh, synonym_t* save_struc);
 static int
 _cfsml_read_synonym_t(FILE *fh, synonym_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_sfx_state_t(FILE *fh, sfx_state_t* save_struc);
 static int
 _cfsml_read_sfx_state_t(FILE *fh, sfx_state_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_clone_entry_t(FILE *fh, clone_entry_t* save_struc);
 static int
 _cfsml_read_clone_entry_t(FILE *fh, clone_entry_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_object_t(FILE *fh, object_t* save_struc);
 static int
 _cfsml_read_object_t(FILE *fh, object_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_string(FILE *fh, char ** save_struc);
 static int
 _cfsml_read_string(FILE *fh, char ** save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_menubar_t(FILE *fh, menubar_t* save_struc);
 static int
 _cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_size_t(FILE *fh, size_t* save_struc);
 static int
 _cfsml_read_size_t(FILE *fh, size_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_list_entry_t(FILE *fh, list_entry_t* save_struc);
 static int
 _cfsml_read_list_entry_t(FILE *fh, list_entry_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc);
 static int
 _cfsml_read_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_gint16(FILE *fh, gint16* save_struc);
 static int
 _cfsml_read_gint16(FILE *fh, gint16* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_song_t(FILE *fh, song_t* save_struc);
 static int
 _cfsml_read_song_t(FILE *fh, song_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_menu_item_t(FILE *fh, menu_item_t* save_struc);
 static int
 _cfsml_read_menu_item_t(FILE *fh, menu_item_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_node_entry_t(FILE *fh, node_entry_t* save_struc);
 static int
 _cfsml_read_node_entry_t(FILE *fh, node_entry_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_seg_id_t(FILE *fh, seg_id_t* save_struc);
 static int
 _cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_dynmem_t(FILE *fh, dynmem_t* save_struc);
 static int
 _cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_local_variables_t(FILE *fh, local_variables_t* save_struc);
 static int
 _cfsml_read_local_variables_t(FILE *fh, local_variables_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_state_t(FILE *fh, state_t* save_struc);
 static int
 _cfsml_read_state_t(FILE *fh, state_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_node_table_t(FILE *fh, node_table_t* save_struc);
 static int
 _cfsml_read_node_table_t(FILE *fh, node_table_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_sys_strings_t(FILE *fh, sys_strings_t* save_struc);
 static int
 _cfsml_read_sys_strings_t(FILE *fh, sys_strings_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_byte(FILE *fh, byte* save_struc);
 static int
 _cfsml_read_byte(FILE *fh, byte* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_node_t(FILE *fh, node_t* save_struc);
 static int
 _cfsml_read_node_t(FILE *fh, node_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_list_table_t(FILE *fh, list_table_t* save_struc);
 static int
 _cfsml_read_list_table_t(FILE *fh, list_table_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_class_t(FILE *fh, class_t* save_struc);
 static int
 _cfsml_read_class_t(FILE *fh, class_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_song_handle_t(FILE *fh, song_handle_t* save_struc);
 static int
 _cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_int(FILE *fh, int* save_struc);
 static int
 _cfsml_read_int(FILE *fh, int* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_menu_t(FILE *fh, menu_t* save_struc);
 static int
 _cfsml_read_menu_t(FILE *fh, menu_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_long(FILE *fh, long* save_struc);
 static int
 _cfsml_read_long(FILE *fh, long* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_clone_table_t(FILE *fh, clone_table_t* save_struc);
 static int
 _cfsml_read_clone_table_t(FILE *fh, clone_table_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_clone_t(FILE *fh, clone_t* save_struc);
 static int
 _cfsml_read_clone_t(FILE *fh, clone_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_list_t(FILE *fh, list_t* save_struc);
 static int
 _cfsml_read_list_t(FILE *fh, list_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_sys_string_t(FILE *fh, sys_string_t* save_struc);
 static int
 _cfsml_read_sys_string_t(FILE *fh, sys_string_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_script_t(FILE *fh, script_t* save_struc);
 static int
 _cfsml_read_script_t(FILE *fh, script_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 431 "savegame.cfsml"
 static void
 _cfsml_write_seg_manager_t(FILE *fh, seg_manager_t* save_struc);
 static int
 _cfsml_read_seg_manager_t(FILE *fh, seg_manager_t* save_struc, char *lastval, int *line, int *hiteof);
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_synonym_t(FILE *fh, synonym_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "replaceant = ");
     _cfsml_write_int(fh, (int*) &(save_struc->replaceant));
@@ -628,11 +667,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_synonym_t(FILE *fh, synonym_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -664,17 +705,20 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "replaceant")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->replaceant), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for replaceant at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "replacement")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->replacement), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for replacement at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("synonym_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -684,11 +728,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_sfx_state_t(FILE *fh, sfx_state_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "songlib = ");
     write_songlib_t(fh, (songlib_t*) &(save_struc->songlib));
@@ -696,11 +742,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_sfx_state_t(FILE *fh, sfx_state_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -732,11 +780,13 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "songlib")) {
+#line 749 "savegame.cfsml"
          if (read_songlib_t(fh, (songlib_t*) &(save_struc->songlib), value, line, hiteof)) {
             _cfsml_error("Token expected by read_songlib_t() for songlib at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("sfx_state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -746,11 +796,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_clone_entry_t(FILE *fh, clone_entry_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "next_free = ");
     _cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -761,11 +813,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_clone_entry_t(FILE *fh, clone_entry_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -797,17 +851,20 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "next_free")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "entry")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_clone_t(fh, (clone_t*) &(save_struc->entry), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_clone_t() for entry at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("clone_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -817,11 +874,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_object_t(FILE *fh, object_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "flags = ");
     _cfsml_write_int(fh, (int*) &(save_struc->flags));
@@ -842,6 +901,7 @@
     min = max = save_struc->variables_nr;
     if (!save_struc->variables)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       write_reg_t(fh, &(save_struc->variables[i]));
@@ -852,11 +912,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_object_t(FILE *fh, object_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -888,40 +950,47 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "flags")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "pos")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->pos), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for pos at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "variables_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->variables_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for variables_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "variable_names_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->variable_names_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for variable_names_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "methods_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->methods_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for methods_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "variables")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -938,9 +1007,11 @@
          }
          else
            save_struc->variables = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -957,6 +1028,7 @@
          } while (!done);
          save_struc->variables_nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("object_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -966,9 +1038,11 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_string(FILE *fh, char ** save_struc)
 {
+#line 454 "savegame.cfsml"
   if (!(*save_struc))
     fprintf(fh, "\\null\\");
   else {
@@ -978,10 +1052,12 @@
   }
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_string(FILE *fh, char ** save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 577 "savegame.cfsml"
 
   if (strcmp(lastval, "\\null\\")) { /* null pointer? */
     if (*lastval == '"') { /* Quoted string? */
@@ -1007,16 +1083,19 @@
   }
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_menubar_t(FILE *fh, menubar_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "menus = ");
     min = max = save_struc->menus_nr;
     if (!save_struc->menus)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_menu_t(fh, &(save_struc->menus[i]));
@@ -1027,11 +1106,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_menubar_t(FILE *fh, menubar_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1063,10 +1144,12 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "menus")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -1083,9 +1166,11 @@
          }
          else
            save_struc->menus = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -1102,6 +1187,7 @@
          } while (!done);
          save_struc->menus_nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("menubar_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1111,16 +1197,19 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_size_t(FILE *fh, size_t* save_struc)
 {
   fprintf(fh, "%li", (long) *save_struc);
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_size_t(FILE *fh, size_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 564 "savegame.cfsml"
 
   *save_struc = strtol(lastval, &token, 0);
   if ( (*save_struc == 0) && (token == lastval) ) {
@@ -1134,11 +1223,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_list_entry_t(FILE *fh, list_entry_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "next_free = ");
     _cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -1149,11 +1240,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_list_entry_t(FILE *fh, list_entry_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1185,17 +1278,20 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "next_free")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "entry")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_list_t(fh, (list_t*) &(save_struc->entry), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_list_t() for entry at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("list_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1205,17 +1301,20 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "base_value = ");
     _cfsml_write_int(fh, (int*) &(save_struc->base_value));
     fprintf(fh, "\n");
   fprintf(fh, "nodes = ");
     min = max = DCS_INT_HASH_MAX+1;
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       write_int_hash_map_node_tp(fh, &(save_struc->nodes[i]));
@@ -1226,11 +1325,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_int_hash_map_t(FILE *fh, int_hash_map_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1262,21 +1363,25 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "base_value")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->base_value), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for base_value at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "nodes")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
          /* Prepare to restore static array */
          max = DCS_INT_HASH_MAX+1;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -1292,6 +1397,7 @@
            } else done = 1;
          } while (!done);
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("int_hash_map_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1301,16 +1407,19 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_gint16(FILE *fh, gint16* save_struc)
 {
   fprintf(fh, "%li", (long) *save_struc);
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_gint16(FILE *fh, gint16* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 564 "savegame.cfsml"
 
   *save_struc = strtol(lastval, &token, 0);
   if ( (*save_struc == 0) && (token == lastval) ) {
@@ -1324,11 +1433,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_song_t(FILE *fh, song_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "handle = ");
     _cfsml_write_song_handle_t(fh, (song_handle_t*) &(save_struc->handle));
@@ -1357,11 +1468,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_song_t(FILE *fh, song_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1393,53 +1506,62 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "handle")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_song_handle_t(fh, (song_handle_t*) &(save_struc->handle), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_song_handle_t() for handle at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "resource_num")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->resource_num), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for resource_num at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "priority")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->priority), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for priority at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "status")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->status), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for status at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "restore_behavior")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->restore_behavior), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for restore_behavior at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "restore_time")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->restore_time), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for restore_time at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "loops")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->loops), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for loops at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "hold")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->hold), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for hold at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("song_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1449,11 +1571,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_menu_item_t(FILE *fh, menu_item_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "type = ");
     _cfsml_write_int(fh, (int*) &(save_struc->type));
@@ -1469,6 +1593,7 @@
     fprintf(fh, "\n");
   fprintf(fh, "said = ");
     min = max = MENU_SAID_SPEC_SIZE;
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_byte(fh, &(save_struc->said[i]));
@@ -1500,11 +1625,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_menu_item_t(FILE *fh, menu_item_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1536,39 +1663,46 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "type")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->type), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for type at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "keytext")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_string(fh, (char **) &(save_struc->keytext), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_string() for keytext at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "keytext_size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->keytext_size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for keytext_size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "flags")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "said")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
          /* Prepare to restore static array */
          max = MENU_SAID_SPEC_SIZE;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -1585,47 +1719,55 @@
          } while (!done);
       } else
       if (!strcmp(token, "said_pos")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->said_pos), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for said_pos at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "text")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_string(fh, (char **) &(save_struc->text), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_string() for text at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "text_pos")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->text_pos), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for text_pos at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "modifiers")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->modifiers), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for modifiers at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "key")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->key), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for key at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "enabled")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->enabled), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for enabled at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "tag")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->tag), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for tag at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("menu_item_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1635,11 +1777,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_node_entry_t(FILE *fh, node_entry_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "next_free = ");
     _cfsml_write_int(fh, (int*) &(save_struc->next_free));
@@ -1650,11 +1794,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_node_entry_t(FILE *fh, node_entry_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1686,17 +1832,20 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "next_free")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->next_free), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for next_free at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "entry")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_node_t(fh, (node_t*) &(save_struc->entry), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_node_t() for entry at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("node_entry_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1706,16 +1855,19 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_seg_id_t(FILE *fh, seg_id_t* save_struc)
 {
   fprintf(fh, "%li", (long) *save_struc);
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_seg_id_t(FILE *fh, seg_id_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 564 "savegame.cfsml"
 
   *save_struc = strtol(lastval, &token, 0);
   if ( (*save_struc == 0) && (token == lastval) ) {
@@ -1729,11 +1881,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_dynmem_t(FILE *fh, dynmem_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "size = ");
     _cfsml_write_int(fh, (int*) &(save_struc->size));
@@ -1745,6 +1899,7 @@
     min = max = save_struc->size;
     if (!save_struc->buf)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_byte(fh, &(save_struc->buf[i]));
@@ -1755,11 +1910,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_dynmem_t(FILE *fh, dynmem_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1791,22 +1948,26 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "description")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_string(fh, (char **) &(save_struc->description), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_string() for description at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "buf")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -1823,9 +1984,11 @@
          }
          else
            save_struc->buf = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -1842,6 +2005,7 @@
          } while (!done);
          save_struc->size = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("dynmem_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1851,11 +2015,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_local_variables_t(FILE *fh, local_variables_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "script_id = ");
     _cfsml_write_int(fh, (int*) &(save_struc->script_id));
@@ -1867,6 +2033,7 @@
     min = max = save_struc->nr;
     if (!save_struc->locals)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       write_reg_t(fh, &(save_struc->locals[i]));
@@ -1877,11 +2044,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_local_variables_t(FILE *fh, local_variables_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -1913,22 +2082,26 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "script_id")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->script_id), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for script_id at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "locals")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -1945,9 +2118,11 @@
          }
          else
            save_struc->locals = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -1964,6 +2139,7 @@
          } while (!done);
          save_struc->nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("local_variables_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -1973,11 +2149,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_state_t(FILE *fh, state_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "savegame_version = ");
     _cfsml_write_int(fh, (int*) &(save_struc->savegame_version));
@@ -2007,6 +2185,7 @@
     min = max = save_struc->classtable_size;
     if (!save_struc->classtable)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_class_t(fh, &(save_struc->classtable[i]));
@@ -2020,11 +2199,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_state_t(FILE *fh, state_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2056,58 +2237,68 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "savegame_version")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->savegame_version), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for savegame_version at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "game_version")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_string(fh, (char **) &(save_struc->game_version), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_string() for game_version at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "version")) {
+#line 749 "savegame.cfsml"
          if (read_sci_version(fh, (sci_version_t*) &(save_struc->version), value, line, hiteof)) {
             _cfsml_error("Token expected by read_sci_version() for version at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "menubar")) {
+#line 749 "savegame.cfsml"
          if (read_menubar_tp(fh, (menubar_t **) &(save_struc->menubar), value, line, hiteof)) {
             _cfsml_error("Token expected by read_menubar_tp() for menubar at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "status_bar_foreground")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->status_bar_foreground), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for status_bar_foreground at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "status_bar_background")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->status_bar_background), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for status_bar_background at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "seg_manager")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_seg_manager_t(fh, (seg_manager_t*) &(save_struc->seg_manager), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_seg_manager_t() for seg_manager at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "classtable_size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->classtable_size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for classtable_size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "classtable")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -2124,9 +2315,11 @@
          }
          else
            save_struc->classtable = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -2144,11 +2337,13 @@
          save_struc->classtable_size = max ; /* Set array size accordingly */
       } else
       if (!strcmp(token, "sound")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_sfx_state_t(fh, (sfx_state_t*) &(save_struc->sound), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_sfx_state_t() for sound at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("state_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -2158,11 +2353,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_node_table_t(FILE *fh, node_table_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "entries_nr = ");
     _cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -2180,6 +2377,7 @@
     min = max = save_struc->entries_nr;
     if (!save_struc->table)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_node_entry_t(fh, &(save_struc->table[i]));
@@ -2190,11 +2388,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_node_table_t(FILE *fh, node_table_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2226,34 +2426,40 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "entries_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "first_free")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "entries_used")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "max_entry")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "table")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -2270,9 +2476,11 @@
          }
          else
            save_struc->table = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -2289,6 +2497,7 @@
          } while (!done);
          save_struc->entries_nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("node_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -2298,14 +2507,17 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_sys_strings_t(FILE *fh, sys_strings_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "strings = ");
     min = max = SYS_STRINGS_MAX;
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_sys_string_t(fh, &(save_struc->strings[i]));
@@ -2316,11 +2528,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_sys_strings_t(FILE *fh, sys_strings_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2352,15 +2566,18 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "strings")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
          /* Prepare to restore static array */
          max = SYS_STRINGS_MAX;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -2376,6 +2593,7 @@
            } else done = 1;
          } while (!done);
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("sys_strings_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -2385,16 +2603,19 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_byte(FILE *fh, byte* save_struc)
 {
   fprintf(fh, "%li", (long) *save_struc);
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_byte(FILE *fh, byte* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 564 "savegame.cfsml"
 
   *save_struc = strtol(lastval, &token, 0);
   if ( (*save_struc == 0) && (token == lastval) ) {
@@ -2408,11 +2629,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_node_t(FILE *fh, node_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "pred = ");
     write_reg_t(fh, (reg_t*) &(save_struc->pred));
@@ -2429,11 +2652,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_node_t(FILE *fh, node_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2465,29 +2690,34 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "pred")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->pred), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for pred at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "succ")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->succ), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for succ at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "key")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->key), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for key at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "value")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->value), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for value at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("node_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -2497,11 +2727,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_list_table_t(FILE *fh, list_table_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "entries_nr = ");
     _cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -2519,6 +2751,7 @@
     min = max = save_struc->entries_nr;
     if (!save_struc->table)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_list_entry_t(fh, &(save_struc->table[i]));
@@ -2529,11 +2762,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_list_table_t(FILE *fh, list_table_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2565,34 +2800,40 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "entries_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "first_free")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "entries_used")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "max_entry")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "table")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -2609,9 +2850,11 @@
          }
          else
            save_struc->table = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -2628,6 +2871,7 @@
          } while (!done);
          save_struc->entries_nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("list_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -2637,11 +2881,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_class_t(FILE *fh, class_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "script = ");
     _cfsml_write_int(fh, (int*) &(save_struc->script));
@@ -2652,11 +2898,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_class_t(FILE *fh, class_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2688,17 +2936,20 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "script")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->script), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for script at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "reg")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->reg), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for reg at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("class_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -2708,16 +2959,19 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_song_handle_t(FILE *fh, song_handle_t* save_struc)
 {
   fprintf(fh, "%li", (long) *save_struc);
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_song_handle_t(FILE *fh, song_handle_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 564 "savegame.cfsml"
 
   *save_struc = strtol(lastval, &token, 0);
   if ( (*save_struc == 0) && (token == lastval) ) {
@@ -2731,16 +2985,19 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_int(FILE *fh, int* save_struc)
 {
   fprintf(fh, "%li", (long) *save_struc);
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_int(FILE *fh, int* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 564 "savegame.cfsml"
 
   *save_struc = strtol(lastval, &token, 0);
   if ( (*save_struc == 0) && (token == lastval) ) {
@@ -2754,11 +3011,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_menu_t(FILE *fh, menu_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "title = ");
     _cfsml_write_string(fh, (char **) &(save_struc->title));
@@ -2773,6 +3032,7 @@
     min = max = save_struc->items_nr;
     if (!save_struc->items)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_menu_item_t(fh, &(save_struc->items[i]));
@@ -2783,11 +3043,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_menu_t(FILE *fh, menu_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2819,28 +3081,33 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "title")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_string(fh, (char **) &(save_struc->title), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_string() for title at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "title_width")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->title_width), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for title_width at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "width")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->width), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for width at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "items")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -2857,9 +3124,11 @@
          }
          else
            save_struc->items = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -2876,6 +3145,7 @@
          } while (!done);
          save_struc->items_nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("menu_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -2885,16 +3155,19 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_long(FILE *fh, long* save_struc)
 {
   fprintf(fh, "%li", (long) *save_struc);
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_long(FILE *fh, long* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
+#line 564 "savegame.cfsml"
 
   *save_struc = strtol(lastval, &token, 0);
   if ( (*save_struc == 0) && (token == lastval) ) {
@@ -2908,11 +3181,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_clone_table_t(FILE *fh, clone_table_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "entries_nr = ");
     _cfsml_write_int(fh, (int*) &(save_struc->entries_nr));
@@ -2930,6 +3205,7 @@
     min = max = save_struc->entries_nr;
     if (!save_struc->table)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_clone_entry_t(fh, &(save_struc->table[i]));
@@ -2940,11 +3216,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_clone_table_t(FILE *fh, clone_table_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -2976,34 +3254,40 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "entries_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->entries_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for entries_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "first_free")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->first_free), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for first_free at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "entries_used")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->entries_used), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for entries_used at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "max_entry")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->max_entry), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for max_entry at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "table")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -3020,9 +3304,11 @@
          }
          else
            save_struc->table = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -3039,6 +3325,7 @@
          } while (!done);
          save_struc->entries_nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("clone_table_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -3048,11 +3335,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_clone_t(FILE *fh, clone_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "flags = ");
     _cfsml_write_int(fh, (int*) &(save_struc->flags));
@@ -3073,6 +3362,7 @@
     min = max = save_struc->variables_nr;
     if (!save_struc->variables)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       write_reg_t(fh, &(save_struc->variables[i]));
@@ -3083,11 +3373,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_clone_t(FILE *fh, clone_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -3119,40 +3411,47 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "flags")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->flags), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for flags at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "pos")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->pos), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for pos at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "variables_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->variables_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for variables_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "variable_names_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->variable_names_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for variable_names_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "methods_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->methods_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for methods_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "variables")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -3169,9 +3468,11 @@
          }
          else
            save_struc->variables = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -3188,6 +3489,7 @@
          } while (!done);
          save_struc->variables_nr = max ; /* Set array size accordingly */
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("clone_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -3197,11 +3499,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_list_t(FILE *fh, list_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "first = ");
     write_reg_t(fh, (reg_t*) &(save_struc->first));
@@ -3212,11 +3516,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_list_t(FILE *fh, list_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -3248,17 +3554,20 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "first")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->first), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for first at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "last")) {
+#line 749 "savegame.cfsml"
          if (read_reg_t(fh, (reg_t*) &(save_struc->last), value, line, hiteof)) {
             _cfsml_error("Token expected by read_reg_t() for last at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("list_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -3268,11 +3577,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_sys_string_t(FILE *fh, sys_string_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "name = ");
     _cfsml_write_string(fh, (char **) &(save_struc->name));
@@ -3286,11 +3597,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_sys_string_t(FILE *fh, sys_string_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -3322,23 +3635,27 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "name")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_string(fh, (char **) &(save_struc->name), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_string() for name at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "max_size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->max_size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for max_size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "value")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_string(fh, (char **) &(save_struc->value), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_string() for value at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
+#line 758 "savegame.cfsml"
        {
           _cfsml_error("sys_string_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -3348,11 +3665,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_script_t(FILE *fh, script_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "nr = ");
     _cfsml_write_int(fh, (int*) &(save_struc->nr));
@@ -3388,6 +3707,7 @@
     min = max = save_struc->objects_allocated;
     if (!save_struc->objects)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       _cfsml_write_object_t(fh, &(save_struc->objects[i]));
@@ -3407,11 +3727,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_script_t(FILE *fh, script_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -3443,70 +3765,82 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "buf_size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->buf_size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_size_t() for buf_size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "script_size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->script_size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_size_t() for script_size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "heap_size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->heap_size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_size_t() for heap_size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "obj_indices")) {
+#line 749 "savegame.cfsml"
          if (read_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->obj_indices), value, line, hiteof)) {
             _cfsml_error("Token expected by read_int_hash_map_tp() for obj_indices at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "exports_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->exports_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for exports_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "synonyms_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->synonyms_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for synonyms_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "lockers")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->lockers), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for lockers at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "objects_allocated")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->objects_allocated), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for objects_allocated at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "objects_nr")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->objects_nr), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for objects_nr at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "objects")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -3523,9 +3857,11 @@
          }
          else
            save_struc->objects = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -3543,23 +3879,27 @@
          save_struc->objects_allocated = max ; /* Set array size accordingly */
       } else
       if (!strcmp(token, "locals_offset")) {
+#line 749 "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 749 "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 749 "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 758 "savegame.cfsml"
        {
           _cfsml_error("script_t: Assignment to invalid identifier '%s' in line %d\n", token, *line);
           return CFSML_FAILURE;
@@ -3569,11 +3909,13 @@
   return CFSML_SUCCESS;
 }
 
+#line 444 "savegame.cfsml"
 static void
 _cfsml_write_seg_manager_t(FILE *fh, seg_manager_t* save_struc)
 {
   int min, max, i;
 
+#line 464 "savegame.cfsml"
   fprintf(fh, "{\n");
   fprintf(fh, "id_seg_map = ");
     write_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->id_seg_map));
@@ -3582,6 +3924,7 @@
     min = max = save_struc->heap_size;
     if (!save_struc->heap)
        min = max = 0; /* Don't write if it points to NULL */
+#line 490 "savegame.cfsml"
     fprintf(fh, "[%d][\n", max);
     for (i = 0; i < min; i++) {
       write_mem_obj_tp(fh, &(save_struc->heap[i]));
@@ -3619,11 +3962,13 @@
   fprintf(fh, "}");
 }
 
+#line 538 "savegame.cfsml"
 static int
 _cfsml_read_seg_manager_t(FILE *fh, seg_manager_t* save_struc, char *lastval, int *line, int *hiteof)
 {
   char *token;
 int min, max, i;
+#line 599 "savegame.cfsml"
   int assignment, closed, done;
 
   if (strcmp(lastval, "{")) {
@@ -3655,16 +4000,19 @@
         return CFSML_FAILURE;
       }
       if (!strcmp(token, "id_seg_map")) {
+#line 749 "savegame.cfsml"
          if (read_int_hash_map_tp(fh, (int_hash_map_t **) &(save_struc->id_seg_map), value, line, hiteof)) {
             _cfsml_error("Token expected by read_int_hash_map_tp() for id_seg_map at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "heap")) {
+#line 663 "savegame.cfsml"
          if ((value[0] != '[') || (value[strlen(value) - 1] != '[')) {
             _cfsml_error("Opening brackets expected at line %d\n", *line);
             return CFSML_FAILURE;
          }
+#line 673 "savegame.cfsml"
          /* Prepare to restore dynamic array */
          max = strtol(value + 1, NULL, 0);
          if (max < 0) {
@@ -3681,9 +4029,11 @@
          }
          else
            save_struc->heap = NULL;
+#line 699 "savegame.cfsml"
          done = i = 0;
          do {
            if (!(value = _cfsml_get_identifier(fh, line, hiteof, NULL))) {
+#line 707 "savegame.cfsml"
               _cfsml_error("Token expected at line %d\n", *line);
               return 1;
            }
@@ -3701,59 +4051,69 @@
          save_struc->heap_size = max ; /* Set array size accordingly */
       } else
       if (!strcmp(token, "heap_size")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->heap_size), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for heap_size at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "reserved_id")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->reserved_id), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for reserved_id at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "exports_wide")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->exports_wide), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for exports_wide at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "sci1_1")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->sci1_1), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for sci1_1 at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "gc_mark_bits")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_int(fh, (int*) &(save_struc->gc_mark_bits), value, line, hiteof)) {
             _cfsml_error("Token expected by _cfsml_read_int() for gc_mark_bits at line %d\n", *line);
             return CFSML_FAILURE;
          }
       } else
       if (!strcmp(token, "mem_allocated")) {
+#line 749 "savegame.cfsml"
          if (_cfsml_read_size_t(fh, (size_t*) &(save_struc->mem_allocated), value, line, hiteof)) {

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


