From 1a0796b1f02c29b62683bb6153f86748551a96cd Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Sat, 31 Aug 2002 05:25:11 +0000
Subject: [PATCH] fast file i/o for font headers

---
 2d/font.c    | 6 +++++-
 include/gr.h | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/2d/font.c b/2d/font.c
index 1209e945..aebf68b4 100644
--- a/2d/font.c
+++ b/2d/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.20 2002-08-26 06:37:32 btb Exp $ */
+/* $Id: font.c,v 1.21 2002-08-31 05:24:35 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1589,6 +1589,9 @@ void decode_data_asm(ubyte *data, int num_pixels, ubyte * colormap, int * count
 
 #endif
 
+#ifdef FAST_FILE_IO
+#define grs_font_read(gf, fp) cfread(gf, GRS_FONT_SIZE, 1, fp)
+#else
 /*
  * reads a grs_font structure from a CFILE
  */
@@ -1606,6 +1609,7 @@ void grs_font_read(grs_font *gf, CFILE *fp)
 	gf->ft_widths = (short *)cfile_read_int(fp);
 	gf->ft_kerndata = (ubyte *)cfile_read_int(fp);
 }
+#endif
 
 grs_font * gr_init_font( char * fontname )
 {
diff --git a/include/gr.h b/include/gr.h
index 858d4b61..7929aaa3 100644
--- a/include/gr.h
+++ b/include/gr.h
@@ -1,4 +1,4 @@
-/* $Id: gr.h,v 1.13 2002-08-15 08:53:11 btb Exp $ */
+/* $Id: gr.h,v 1.14 2002-08-31 05:25:11 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -139,7 +139,7 @@ typedef struct _grs_font {
 	grs_bitmap *ft_bitmaps;
 	grs_bitmap ft_parent_bitmap;
 #endif
-} grs_font;
+} __pack__ grs_font;
 
 #define GRS_FONT_SIZE 28    // how much space it takes up on disk
 
-- 
2.39.2