From f074f8d13f4fb6f6b21ecc18118ed52d9b52d174 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Sat, 22 Mar 2003 03:19:50 +0000
Subject: [PATCH] move bitmap replacement functions to piggy.c

---
 main/gameseq.c |  5 ++---
 main/piggy.c   | 14 +++++++-------
 main/piggy.h   |  7 ++++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/main/gameseq.c b/main/gameseq.c
index f09b07ef..0017ec03 100644
--- a/main/gameseq.c
+++ b/main/gameseq.c
@@ -1,4 +1,4 @@
-/* $Id: gameseq.c,v 1.23 2003-03-22 03:14:30 btb Exp $ */
+/* $Id: gameseq.c,v 1.24 2003-03-22 03:15:24 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char gameseq_rcsid[] = "$Id: gameseq.c,v 1.23 2003-03-22 03:14:30 btb Exp $";
+char gameseq_rcsid[] = "$Id: gameseq.c,v 1.24 2003-03-22 03:15:24 btb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -123,7 +123,6 @@ char gameseq_rcsid[] = "$Id: gameseq.c,v 1.23 2003-03-22 03:14:30 btb Exp $";
 #include "editor/editor.h"
 #endif
 
-#include "makesig.h"
 #include "strutil.h"
 #include "rle.h"
 
diff --git a/main/piggy.c b/main/piggy.c
index 7d3bbef3..bd4f7b09 100644
--- a/main/piggy.c
+++ b/main/piggy.c
@@ -1,4 +1,4 @@
-/* $Id: piggy.c,v 1.25 2003-03-22 03:14:30 btb Exp $ */
+/* $Id: piggy.c,v 1.26 2003-03-22 03:19:50 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -386,7 +386,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: piggy.c,v 1.25 2003-03-22 03:14:30 btb Exp $";
+static char rcsid[] = "$Id: piggy.c,v 1.26 2003-03-22 03:19:50 btb Exp $";
 #endif
 
 
@@ -2234,9 +2234,9 @@ void load_bitmap_replacements(char *level_name)
 
 		cfclose(ifile);
 
-		last_palette_loaded_pig[0]= 0;	//force pig re-load
+		last_palette_loaded_pig[0]= 0;  //force pig re-load
 
-		texmerge_flush();		//for re-merging with new textures
+		texmerge_flush();       //for re-merging with new textures
 	}
 
 	atexit(free_bitmap_replacements);
@@ -2298,7 +2298,7 @@ void load_d1_bitmap_replacements()
 	{
 		int N_sounds = cfile_read_int(d1_Piggy_fp);
 		int header_size = N_bitmaps * DISKBITMAPHEADER_D1_SIZE
-				+ N_sounds * DISKSOUNDHEADER_SIZE;
+			+ N_sounds * DISKSOUNDHEADER_SIZE;
 		bitmap_header_start = pig_data_start + 2 * sizeof(int);
 		bitmap_data_start = bitmap_header_start + header_size;
 	}
@@ -2358,9 +2358,9 @@ void load_d1_bitmap_replacements()
 
 	cfclose(d1_Piggy_fp);
 
-	last_palette_loaded_pig[0]= 0;	//force pig re-load
+	last_palette_loaded_pig[0]= 0;  //force pig re-load
 
-	texmerge_flush();		//for re-merging with new textures
+	texmerge_flush();       //for re-merging with new textures
 
 	atexit(free_bitmap_replacements);
 }
diff --git a/main/piggy.h b/main/piggy.h
index e50044ec..4d4f2de8 100644
--- a/main/piggy.h
+++ b/main/piggy.h
@@ -1,4 +1,4 @@
-/* $Id: piggy.h,v 1.11 2003-03-19 22:44:15 btb Exp $ */
+/* $Id: piggy.h,v 1.12 2003-03-22 03:14:31 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -116,6 +116,11 @@ void piggy_read_sounds();
 //returns the size of all the bitmap data
 void piggy_new_pigfile(char *pigname);
 
+//loads custom bitmaps for current level
+void load_bitmap_replacements(char *level_name);
+//if descent.pig exists, loads descent 1 texture bitmaps
+void load_d1_bitmap_replacements();
+
 #ifdef FAST_FILE_IO
 #define bitmap_index_read(bi, fp) cfread(bi, sizeof(bitmap_index), 1, fp)
 #define bitmap_index_read_n(bi, n, fp) cfread(bi, sizeof(bitmap_index), n, fp)
-- 
2.39.2