From ec9dd3f5afe605a6dedfc24468a01bfae18e4032 Mon Sep 17 00:00:00 2001
From: raa-eruanna <eruanna@drdteam.org>
Date: Fri, 21 Oct 2016 07:53:32 -0400
Subject: [PATCH] - Fixed compiler errors with r_fullbrightignoresectorcolor
 merge

---
 src/r_data/colormaps.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/r_data/colormaps.cpp b/src/r_data/colormaps.cpp
index f2f84a8ea..d64327e79 100644
--- a/src/r_data/colormaps.cpp
+++ b/src/r_data/colormaps.cpp
@@ -457,11 +457,6 @@ void R_DeinitColormaps ()
 	SpecialColormaps.Clear();
 	fakecmaps.Clear();
 	delete[] realcolormaps.Maps;
-	if (realfbcolormaps != NULL)
-	{
-		delete[] realfbcolormaps;
-		realfbcolormaps = NULL;
-	}
 	delete[] realfbcolormaps.Maps;
 	FreeSpecialLights();
 }
@@ -554,10 +549,10 @@ void R_InitColormaps ()
 	}
 
 	// [SP] Create a copy of the colormap
-	if (!realfbcolormaps)
+	if (!realfbcolormaps.Maps)
 	{
-		realfbcolormaps = new BYTE[256*NUMCOLORMAPS*fakecmaps.Size()];
-		memcpy(realfbcolormaps, realcolormaps, 256*NUMCOLORMAPS*fakecmaps.Size());
+		realfbcolormaps.Maps = new BYTE[256*NUMCOLORMAPS*fakecmaps.Size()];
+		memcpy(realfbcolormaps.Maps, realcolormaps.Maps, 256*NUMCOLORMAPS*fakecmaps.Size());
 	}
 
 	NormalLight.Color = PalEntry (255, 255, 255);