From 1db0cad6f719f48e794afc04f4abb02297369b20 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 20 Dec 2004 06:34:42 +0000 Subject: [PATCH] Enable global structs for mine saving functions --- ChangeLog | 3 +++ main/gamemine.c | 8 ++++---- main/gamemine.h | 6 +++--- main/gamesave.c | 8 ++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c5d8ea6..81864ec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ main/editor/segment.c, main/gameseg.h, main/physics.c: Pass the extra two parameters to get_seg_masks. + * main/gamemine.c, main/gamemine.h, main/gamesave.c: Enable global + structs for mine saving functions + 2004-12-19 Bradley Bell * ui/Makefile.am: fix ui Makefile.am diff --git a/main/gamemine.c b/main/gamemine.c index 19f354e4..ad1319ef 100644 --- a/main/gamemine.c +++ b/main/gamemine.c @@ -1,4 +1,4 @@ -/* $Id: gamemine.c,v 1.31 2004-11-19 18:02:32 schaffner Exp $ */ +/* $Id: gamemine.c,v 1.32 2004-12-20 06:34:42 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: gamemine.c,v 1.31 2004-11-19 18:02:32 schaffner Exp $"; +static char rcsid[] = "$Id: gamemine.c,v 1.32 2004-12-20 06:34:42 btb Exp $"; #endif #include @@ -67,12 +67,12 @@ fix Level_shake_frequency = 0, Level_shake_duration = 0; int Secret_return_segment = 0; vms_matrix Secret_return_orient; -#if 0 +#ifdef EDITOR struct mtfi mine_top_fileinfo; // Should be same as first two fields below... struct mfi mine_fileinfo; struct mh mine_header; struct me mine_editor; -#endif // 0 +#endif // EDITOR typedef struct v16_segment { #ifdef EDITOR diff --git a/main/gamemine.h b/main/gamemine.h index ffe2fa18..4ec90ba1 100644 --- a/main/gamemine.h +++ b/main/gamemine.h @@ -1,4 +1,4 @@ -/* $Id: gamemine.h,v 1.8 2004-08-28 23:17:45 schaffner Exp $ */ +/* $Id: gamemine.h,v 1.9 2004-12-20 06:34:42 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -25,7 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define MINE_VERSION 20 // Current version expected #define COMPATIBLE_VERSION 16 // Oldest version that can safely be loaded. -#if 0 +#ifdef EDITOR struct mtfi { ushort fileinfo_signature; ushort fileinfo_version; @@ -88,7 +88,7 @@ struct mfi { int segment2_howmany; int segment2_sizeof; }; -#endif // 0 +#endif // EDITOR struct mh { int num_vertices; diff --git a/main/gamesave.c b/main/gamesave.c index 0441acab..2fc54feb 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -1,4 +1,4 @@ -/* $Id: gamesave.c,v 1.26 2004-12-19 12:29:11 btb Exp $ */ +/* $Id: gamesave.c,v 1.27 2004-12-20 06:34:42 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char gamesave_rcsid[] = "$Id: gamesave.c,v 1.26 2004-12-19 12:29:11 btb Exp $"; +char gamesave_rcsid[] = "$Id: gamesave.c,v 1.27 2004-12-20 06:34:42 btb Exp $"; #endif #include @@ -88,7 +88,7 @@ int Gamesave_current_version; #define MENU_CURSOR_X_MIN MENU_X #define MENU_CURSOR_X_MAX MENU_X+6 -#if 0 +#ifdef EDITOR struct { ushort fileinfo_signature; ushort fileinfo_version; @@ -131,7 +131,7 @@ struct { int delta_light_howmany; int delta_light_sizeof; } game_fileinfo; -#endif // 0 +#endif // EDITOR // LINT: adding function prototypes void read_object(object *obj, CFILE *f, int version); -- 2.39.2