From 1636d139eb360f06ebb109f66f52e4d1fe85c9bb Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 16 Mar 2005 23:06:14 +0000 Subject: [PATCH] use hardcoded value instead of sizeof(tmap_info), since size depends on whether editor is built or not. --- ChangeLog | 4 ++++ main/bm.c | 4 ++-- main/bm.h | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cfb5e48..079919be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-03-16 Bradley Bell + * main/bm.c, main/bm.h: use hardcoded value instead of + sizeof(tmap_info), since size depends on whether editor is built + or not. + * ui/mouse.c: gcc doesn't like multi-line // comments * main/dumpmine.c: get rid of compiler warnings diff --git a/main/bm.c b/main/bm.c index 42e843a6..28181604 100644 --- a/main/bm.c +++ b/main/bm.c @@ -1,4 +1,4 @@ -/* $Id: bm.c,v 1.47 2004-12-19 12:15:34 btb Exp $ */ +/* $Id: bm.c,v 1.48 2005-03-16 23:06:14 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -96,7 +96,7 @@ bitmap_index ObjBitmaps[MAX_OBJ_BITMAPS]; ushort ObjBitmapPtrs[MAX_OBJ_BITMAPS]; // These point back into ObjBitmaps, since some are used twice. #ifdef FAST_FILE_IO -#define tmap_info_read_n(ti, n, fp) cfread(ti, sizeof(tmap_info), n, fp) +#define tmap_info_read_n(ti, n, fp) cfread(ti, TMAP_INFO_SIZE, n, fp) #else /* * reads n tmap_info structs from a CFILE diff --git a/main/bm.h b/main/bm.h index 958d238b..9801abac 100644 --- a/main/bm.h +++ b/main/bm.h @@ -1,4 +1,4 @@ -/* $Id: bm.h,v 1.13 2004-08-28 23:17:45 schaffner Exp $ */ +/* $Id: bm.h,v 1.14 2005-03-16 23:06:14 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -48,6 +48,8 @@ typedef struct { #endif } __pack__ tmap_info; +#define TMAP_INFO_SIZE 20 // how much space it takes up on disk + extern int Num_object_types; #define N_COCKPIT_BITMAPS 6 -- 2.39.2