Merge pull request #1170 from The-E/PaletteCleanup

Removes the Palette Manager

Author: MageKing17

code/ai/aicode.cpp

@@ -1238,12 +1238,12 @@ objp->orient = objp_orient_copy; //-V587
 	} else {
 		vm_forward_interpolate(&desired_fvec, &curr_orient, &vel_in, delta_time, delta_bank, &objp->orient, &vel_out, &vel_limit, &acc_limit);
 	}
-	
-#ifndef NDEBUG
-if (!((objp->type == OBJ_WEAPON) && (Weapon_info[Weapons[objp->instance].weapon_info_index].subtype == WP_MISSILE))) {
-	Assertion(!(delta_time < 0.25f && vm_vec_dot(&objp->orient.vec.fvec, &tvec) < 0.1f), "A ship rotated too far. Offending vessel is %s, please investigate.\n", Ships[objp->instance].ship_name);
-}
-#endif
+
+	#ifndef NDEBUG
+		if (!((objp->type == OBJ_WEAPON) && (Weapon_info[Weapons[objp->instance].weapon_info_index].subtype == WP_MISSILE))) {
+		Assertion(!(delta_time < 0.25f && vm_vec_dot(&objp->orient.vec.fvec, &tvec) < 0.1f), "A ship rotated too far. Offending vessel is %s, please investigate.\n", Ships[objp->instance].ship_name);		
+	}
+	#endif
 
 	pip->rotvel = vel_out;
 }

code/bmpman/bmpman.cpp

@@ -29,7 +29,6 @@
 #include "io/timer.h"
 #include "jpgutils/jpgutils.h"
 #include "network/multiutil.h"
-#include "palman/palman.h"
 #include "parse/parselo.h"
 #include "pcxutils/pcxutils.h"
 #include "pngutils/pngutils.h"
@@ -2280,7 +2279,7 @@ void bm_lock_pcx(int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int b
 	data = (ubyte *)bm_malloc(bitmapnum, be->mem_taken);
 	bmp->bpp = bpp;
 	bmp->data = (ptr_u)data;
-	bmp->palette = (bpp == 8) ? gr_palette : NULL;
+	bmp->palette = NULL;
 	memset(data, 0, be->mem_taken);
 
 	Assert(&be->bm == bmp);

code/graphics/2d.cpp

@@ -32,7 +32,6 @@
 #include "io/keycontrol.h" // m!m
 #include "io/timer.h"
 #include "osapi/osapi.h"
-#include "palman/palman.h"
 #include "scripting/scripting.h"
 #include "parse/parselo.h"
 #include "render/3d.h"
@@ -635,9 +634,7 @@ void gr_close()
 	if ( !Gr_inited ) {
 		return;
 	}
-
-	palette_flush();
-
+	
 	font::close();
 
 	switch (gr_screen.mode) {
@@ -703,18 +700,13 @@ void gr_set_palette_internal( const char *name, ubyte * palette, int restrict_fo
 		if (palette) {
 			memmove(palette, Gr_current_palette, 768);
 		}
-
-		// Update Palette Manager tables
-		memmove( gr_palette, Gr_current_palette, 768 );
-		palette_update(name, restrict_font_to_128);
 	}
 }
 
 
 void gr_set_palette( const char *name, ubyte * palette, int restrict_font_to_128 )
 {
 	char *p;
-	palette_flush();
 	strcpy_s( Gr_current_palette_name, name );
 	p = strchr( Gr_current_palette_name, '.' );
 	if ( p ) *p = 0;

code/graphics/opengl/gropengl.cpp

@@ -29,7 +29,6 @@
 #include "nebula/neb.h"
 #include "osapi/osapi.h"
 #include "osapi/osregistry.h"
-#include "palman/palman.h"
 #include "render/3d.h"
 #include "popup/popup.h"
 #include "tracing/tracing.h"

code/graphics/opengl/gropengldraw.cpp

@@ -33,7 +33,6 @@
 #include "nebula/neb.h"
 #include "tracing/tracing.h"
 #include "osapi/osapi.h"
-#include "palman/palman.h"
 #include "render/3d.h"
 #include "localization/localize.h"
 

code/jpgutils/jpgutils.cpp

@@ -30,7 +30,6 @@
 #include "jpgutils/jpgutils.h"
 #include "cfile/cfile.h"
 #include "bmpman/bmpman.h"
-#include "palman/palman.h"
 #include "graphics/2d.h"
 
 

code/menuui/barracks.cpp

@@ -1287,11 +1287,8 @@ void barracks_draw_pilot_pic()
 	if (Cur_pilot->callsign[0] && (Pic_number >= 0) && (Pic_number < Num_pilot_images)) {
 		if (Pilot_images[Pic_number] >= 0) {
 			// JAS: This code is hacked to allow the animation to use all 256 colors
-			extern int Palman_allow_any_color;
-			Palman_allow_any_color = 1;
 			gr_set_bitmap(Pilot_images[Pic_number]);
 			gr_bitmap(Barracks_image_coords[gr_screen.res][BARRACKS_X_COORD], Barracks_image_coords[gr_screen.res][BARRACKS_Y_COORD], GR_RESIZE_MENU);
-			Palman_allow_any_color = 0;
 
 			// print number of the current pic
 			char buf[40];			
@@ -1312,11 +1309,8 @@ void barracks_draw_squad_pic()
 	if (Cur_pilot->callsign[0] && (Pic_squad_number >= 0) && (Pic_squad_number < Num_pilot_squad_images)) {
 		if (Pilot_squad_images[Pic_squad_number] >= 0) {
 			// JAS: This code is hacked to allow the animation to use all 256 colors
-			extern int Palman_allow_any_color;
-			Palman_allow_any_color = 1;
 			gr_set_bitmap(Pilot_squad_images[Pic_squad_number]);
 			gr_bitmap(Barracks_squad_coords[gr_screen.res][BARRACKS_X_COORD], Barracks_squad_coords[gr_screen.res][BARRACKS_Y_COORD], GR_RESIZE_MENU);
-			Palman_allow_any_color = 0;
 
 			// print number of current squad pic
 			if(Player_sel_mode != PLAYER_SELECT_MODE_SINGLE){

code/menuui/mainhallmenu.cpp

@@ -32,7 +32,6 @@
 #include "network/multi_voice.h"
 #include "network/multiui.h"
 #include "network/multiutil.h"
-#include "palman/palman.h"
 #include "parse/parselo.h"
 #include "scripting/scripting.h"
 #include "playerman/player.h"

code/missionui/missionscreencommon.cpp

@@ -39,7 +39,6 @@
 #include "network/multimsgs.h"
 #include "network/multiteamselect.h"
 #include "network/multiutil.h"
-#include "palman/palman.h"
 #include "parse/sexp.h"
 #include "popup/popup.h"
 #include "render/3d.h"
@@ -441,9 +440,6 @@ void common_free_interface_palette()
 		bm_release(InterfacePaletteBitmap);
 		InterfacePaletteBitmap = -1;
 	}
-
-	// restore the normal game palette
-	palette_restore_palette();
 }
 
 // Init timers used for flashing buttons

code/nebula/neb.cpp

@@ -524,12 +524,7 @@ int neb2_skip_render(object *objp, float z_depth)
 	if (!neb_skip_opt) {
 		return 0;
 	}
-
-	// lame rendering
-	if (Neb2_render_mode == NEB2_RENDER_LAME) {
-		return 0;
-	}
-
+	
 	// get near and far fog values based upon object type and rendering mode
 	neb2_get_adjusted_fog_values(&fog_near, &fog_far, objp);
 
@@ -937,11 +932,6 @@ void neb2_render_player()
 		neb2_regen();
 		Neb2_regen = 0;
 	}
-
-	// don't render in lame mode
-	if ((Neb2_render_mode == NEB2_RENDER_LAME) || (Neb2_render_mode == NEB2_RENDER_NONE)) {
-		return;
-	}
 
     memset(&p, 0, sizeof(p));
 	memset(&ptemp, 0, sizeof(ptemp));
@@ -1294,14 +1284,6 @@ void neb2_get_pixel(int x, int y, int *r, int *g, int *b)
 	ubyte avg_count;
 	int xs, ys;
 
-	// if we're in lame rendering mode, return a constant value
-	if (Neb2_render_mode == NEB2_RENDER_LAME) {
-		*r = Neb2_background_color[0];
-		*g = Neb2_background_color[1];
-		*b = Neb2_background_color[2];
-
-		return;
-	}
 
 	// get the proper pixel index to be looking up
 	rv = gv = bv = 0;
@@ -1571,20 +1553,12 @@ DCF(neb2_mode, "Switches nebula render modes")
 			Neb2_render_mode = NEB2_RENDER_NONE;
 		break;
 
-		case NEB2_RENDER_POLY:
-			Neb2_render_mode = NEB2_RENDER_POLY;
-		break;
-
 		case NEB2_RENDER_POF:
 			Neb2_render_mode = NEB2_RENDER_POF;
 			stars_set_background_model(BACKGROUND_MODEL_FILENAME, "Eraseme3");
 			stars_set_background_orientation();
 		break;
 
-		case NEB2_RENDER_LAME:
-			Neb2_render_mode = NEB2_RENDER_LAME;
-		break;
-
 		case NEB2_RENDER_HTL:
 			Neb2_render_mode = NEB2_RENDER_HTL;
 		break;