From daeada6d981417e19bb073fb9e29c397c2ddb231 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 3 Mar 2013 01:03:33 +0000
Subject: [PATCH] Move */include/palette.h -> common/include/palette.h

---
 {d2x-rebirth => common}/include/palette.h |  6 ++++-
 d1x-rebirth/include/palette.h             | 33 -----------------------
 2 files changed, 5 insertions(+), 34 deletions(-)
 rename {d2x-rebirth => common}/include/palette.h (95%)
 delete mode 100644 d1x-rebirth/include/palette.h

diff --git a/d2x-rebirth/include/palette.h b/common/include/palette.h
similarity index 95%
rename from d2x-rebirth/include/palette.h
rename to common/include/palette.h
index 2029df38c..3b0eafdfe 100644
--- a/d2x-rebirth/include/palette.h
+++ b/common/include/palette.h
@@ -21,14 +21,18 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _PALETTE_H
 #define _PALETTE_H
 
+#ifdef DXX_BUILD_DESCENT_II
 #define DEFAULT_LEVEL_PALETTE "groupa.256" //don't confuse with D2_DEFAULT_PALETTE
+#endif
 
 extern void gr_palette_set_gamma( int gamma );
 extern int gr_palette_get_gamma();
-extern void gr_palette_clear();
 extern void gr_palette_load( ubyte * pal );
 extern void gr_make_cthru_table(ubyte * table, ubyte r, ubyte g, ubyte b );
+#ifdef DXX_BUILD_DESCENT_II
+extern void gr_palette_clear();
 extern void gr_make_blend_table(ubyte *blend_table, ubyte r, ubyte g, ubyte b);
+#endif
 extern int gr_find_closest_color_current( int r, int g, int b );
 extern void gr_palette_read(ubyte * palette);
 extern void init_computed_colors(void);
diff --git a/d1x-rebirth/include/palette.h b/d1x-rebirth/include/palette.h
deleted file mode 100644
index 20ea739e9..000000000
--- a/d1x-rebirth/include/palette.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
-SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
-END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
-ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
-IN USING, DISPLAYING,  AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
-SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
-FREE PURPOSES.  IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
-CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES.  THE END-USER UNDERSTANDS
-AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
-COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
-*/
-
-/*
- *
- * Protoypes for palette functions
- *
- */
-
-#ifndef _PALETTE_H
-#define _PALETTE_H
-
-extern void gr_palette_set_gamma( int gamma );
-extern int gr_palette_get_gamma();
-extern void gr_palette_load( ubyte * pal );
-extern void gr_make_cthru_table(ubyte * table, ubyte r, ubyte g, ubyte b );
-extern int gr_find_closest_color_current( int r, int g, int b );
-extern void gr_palette_read(ubyte * palette);
-extern void init_computed_colors(void);
-extern ubyte gr_palette_gamma;
-extern ubyte gr_current_pal[256*3];
-
-#endif