From 0e330c0683af1a091ffb647a4a522646a11fb171 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Tue, 10 Jun 2003 07:31:38 +0000
Subject: [PATCH] gr_copy_palette not really a kludge, I think

---
 2d/palette.c  | 10 +++++++++-
 ChangeLog     |  3 +++
 main/kludge.c | 11 +----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/2d/palette.c b/2d/palette.c
index fa9a31ed..92da632b 100644
--- a/2d/palette.c
+++ b/2d/palette.c
@@ -1,4 +1,4 @@
-/* $Id: palette.c,v 1.8 2003-03-19 19:21:34 btb Exp $ */
+/* $Id: palette.c,v 1.9 2003-06-10 07:31:38 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -195,6 +195,14 @@ int gr_palette_get_gamma()
 }
 
 
+void gr_copy_palette(ubyte *gr_palette, ubyte *pal, int size)
+{
+	        memcpy(gr_palette, pal, size);
+
+	        Num_computed_colors = 0;
+}
+
+
 void gr_use_palette_table( char * filename )
 {
 	CFILE *fp;
diff --git a/ChangeLog b/ChangeLog
index 2dab6d93..7b46fe12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-06-09  Bradley Bell  <btb@icculus.org>
 
+	* 2d/palette.c, main/kludge.c: gr_copy_palette not really a
+	kludge, I think
+
 	* include/libmve.h, libmve/mve_main.c, libmve/mvelib.c,
 	libmve/mvelib.h, libmve/mveplay.c, main/movie.c: merged libmve
 	from physfs branch
diff --git a/main/kludge.c b/main/kludge.c
index 5df960a2..6afd03bd 100644
--- a/main/kludge.c
+++ b/main/kludge.c
@@ -21,18 +21,9 @@ char CDROM_dir[40] = ".";
 int gr_check_mode(u_int32_t a)
 {
   return 0;
-} 
-#endif
-
-extern int Num_computed_colors;
-void gr_copy_palette(ubyte *gr_palette, ubyte *pal, int size)
-{
-	        memcpy(gr_palette, pal, size);
-
-	        Num_computed_colors = 0;
 }
 
-#ifndef __DJGPP__
+
 void joy_set_btn_values( int btn, int state, int time_down, int downcount, int upcount )
 {
 
-- 
2.39.2