- separation of software renderer from the rest of the code complete. All external access to the renderer is routed through the FRenderer interface class now, with two exceptions (2D texture drawing to a canvas and polymost testing code) that are handled by #defines.

SVN r3263 (trunk)

src/r_data/colormaps.cpp

@@ -52,6 +52,7 @@
 #include "v_video.h"
 #include "templates.h"
 #include "r_utility.h"
+#include "r_renderer.h"
 
 static bool R_CheckForFixedLights(const BYTE *colormaps);
 
@@ -205,7 +206,7 @@ FDynamicColormap *GetSpecialLights (PalEntry color, PalEntry fade, int desaturat
 	colormap->Desaturate = desaturate;
 	NormalLight.Next = colormap;
 
-	if (screen->UsesColormap())
+	if (Renderer->UsesColormap())
 	{
 		colormap->Maps = new BYTE[NUMCOLORMAPS*256];
 		colormap->BuildLights ();
@@ -365,7 +366,7 @@ void FDynamicColormap::ChangeColorFade (PalEntry lightcolor, PalEntry fadecolor)
 
 void FDynamicColormap::RebuildAllLights()
 {
-	if (screen->UsesColormap())
+	if (Renderer->UsesColormap())
 	{
 		FDynamicColormap *cm;
 

src/r_data/colormaps.h

@@ -6,7 +6,7 @@ void R_DeinitColormaps ();
 
 DWORD R_ColormapNumForName(const char *name);	// killough 4/4/98
 void R_SetDefaultColormap (const char *name);	// [RH] change normal fadetable
-DWORD R_BlendForColormap (DWORD map);		// [RH] return calculated blend for a colormap
+DWORD R_BlendForColormap (DWORD map);			// [RH] return calculated blend for a colormap
 extern BYTE *realcolormaps;						// [RH] make the colormaps externally visible
 extern size_t numfakecmaps;