diff --git a/src/r_segs.cpp b/src/r_segs.cpp
index b376605de..1e0911da1 100644
--- a/src/r_segs.cpp
+++ b/src/r_segs.cpp
@@ -136,13 +136,29 @@ static void R_Render2sidedMultiPatchColumn(drawcolumndata_t* dc, column_t *colum
 
 		drawcolumndata_t dc_copy = *dc;
 		coldrawfunc_t* colfunccopy = colfunc;
+
+		// FIXME: do something better to look these up WITHOUT affecting global state...
 		if (R_CheckColumnFunc(BASEDRAWFUNC) == true)
 		{
-			colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCH];
+			if (brightmap != NULL)
+			{
+				colfunccopy = colfuncs_bm[COLDRAWFUNC_TWOSMULTIPATCH];
+			}
+			else
+			{
+				colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCH];
+			}
 		}
 		else if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == true)
 		{
-			colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS];
+			if (brightmap != NULL)
+			{
+				colfunccopy = colfuncs_bm[COLDRAWFUNC_TWOSMULTIPATCHTRANS];
+			}
+			else
+			{
+				colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS];
+			}
 		}
 
 		colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
diff --git a/src/screen.h b/src/screen.h
index a91b0fd50..c8a2e1062 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -118,17 +118,6 @@ struct vmode_t
 #define NUMSPECIALMODES  4
 extern vmode_t specialmodes[NUMSPECIALMODES];
 
-// -----
-// CPUID
-// -----
-extern boolean R_ASM;
-extern boolean R_486;
-extern boolean R_586;
-extern boolean R_MMX;
-extern boolean R_3DNow;
-extern boolean R_MMXExt;
-extern boolean R_SSE2;
-
 // ----------------
 // screen variables
 // ----------------