diff --git a/src/r_draw.h b/src/r_draw.h
index 5d2a0c036..216870767 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -221,13 +221,13 @@ void R_Draw2sMultiPatchColumn(drawcolumndata_t* dc);
 void R_Draw2sMultiPatchTranslucentColumn(drawcolumndata_t* dc);
 
 // column drawers which use buffered drawing with flush
-void R_DrawColumnFlush(drawcolumndata_t* dc);
-void R_DrawTranslucentColumnFlush(drawcolumndata_t* dc);
-void R_DrawTranslatedColumnFlush(drawcolumndata_t* dc);
-void R_DrawColumnShadowedFlush(drawcolumndata_t* dc);
-void R_DrawTranslatedTranslucentColumnFlush(drawcolumndata_t* dc);
-void R_Draw2sMultiPatchColumnFlush(drawcolumndata_t* dc);
-void R_Draw2sMultiPatchTranslucentColumnFlush(drawcolumndata_t* dc);
+void R_DrawColumn_Flush(drawcolumndata_t* dc);
+void R_DrawTranslucentColumn_Flush(drawcolumndata_t* dc);
+void R_DrawTranslatedColumn_Flush(drawcolumndata_t* dc);
+void R_DrawColumnShadowed_Flush(drawcolumndata_t* dc);
+void R_DrawTranslatedTranslucentColumn_Flush(drawcolumndata_t* dc);
+void R_Draw2sMultiPatchColumn_Flush(drawcolumndata_t* dc);
+void R_Draw2sMultiPatchTranslucentColumn_Flush(drawcolumndata_t* dc);
 
 void R_DrawFogColumn(drawcolumndata_t* dc);
 void R_DrawColumnShadowed(drawcolumndata_t* dc);
diff --git a/src/r_draw_column.cpp b/src/r_draw_column.cpp
index 1824fb442..f84ec2ea6 100644
--- a/src/r_draw_column.cpp
+++ b/src/r_draw_column.cpp
@@ -364,27 +364,18 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
 	}
 
 #define DEFINE_COLUMN_COMBO(name, flags) \
-	DEFINE_COLUMN_FUNC(name, flags) \
-	DEFINE_COLUMN_FUNC(name ## _Brightmap, flags|DC_DIRECT|DC_BRIGHTMAP)
+	DEFINE_COLUMN_FUNC(name, flags|DC_DIRECT) \
+	DEFINE_COLUMN_FUNC(name ## _Brightmap, flags|DC_DIRECT|DC_BRIGHTMAP) \
+	DEFINE_COLUMN_FUNC(name ## _Flush, flags)
 
-DEFINE_COLUMN_COMBO(R_DrawColumn, DC_DIRECT|DC_BASIC)
-DEFINE_COLUMN_COMBO(R_DrawTranslucentColumn, DC_DIRECT|DC_TRANSMAP)
-DEFINE_COLUMN_COMBO(R_DrawTranslatedColumn, DC_DIRECT|DC_COLORMAP)
-DEFINE_COLUMN_COMBO(R_DrawColumnShadowed, DC_DIRECT|DC_LIGHTLIST)
-DEFINE_COLUMN_COMBO(R_DrawTranslatedTranslucentColumn, DC_DIRECT|DC_COLORMAP|DC_TRANSMAP)
-DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchColumn, DC_DIRECT|DC_HOLES)
-DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchTranslucentColumn, DC_DIRECT|DC_HOLES|DC_TRANSMAP)
+DEFINE_COLUMN_COMBO(R_DrawColumn, DC_BASIC)
+DEFINE_COLUMN_COMBO(R_DrawTranslucentColumn, DC_TRANSMAP)
+DEFINE_COLUMN_COMBO(R_DrawTranslatedColumn, DC_COLORMAP)
+DEFINE_COLUMN_COMBO(R_DrawColumnShadowed, DC_LIGHTLIST)
+DEFINE_COLUMN_COMBO(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP)
+DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchColumn, DC_HOLES)
+DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP)
 
-DEFINE_COLUMN_COMBO(R_DrawColumnFlush, DC_BASIC)
-DEFINE_COLUMN_COMBO(R_DrawTranslucentColumnFlush, DC_TRANSMAP)
-DEFINE_COLUMN_COMBO(R_DrawTranslatedColumnFlush, DC_COLORMAP)
-DEFINE_COLUMN_COMBO(R_DrawColumnShadowedFlush, DC_LIGHTLIST)
-DEFINE_COLUMN_COMBO(R_DrawTranslatedTranslucentColumnFlush, DC_COLORMAP|DC_TRANSMAP)
-DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchColumnFlush, DC_HOLES)
-DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchTranslucentColumnFlush, DC_HOLES|DC_TRANSMAP)
-
-//skymyass
-//DEFINE_COLUMN_FUNC(R_DrawSkyColumn, DC_SKY)
 
 void R_DrawFogColumn(drawcolumndata_t *dc)
 {
diff --git a/src/screen.c b/src/screen.c
index 4db2536fb..b9e233841 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -106,13 +106,13 @@ void SCR_SetDrawFuncs(enum columncontext_e _columncontext)
 
 	if (_columncontext == COLUMNCONTEXT_FLUSH)
 	{
-		colfuncs[BASEDRAWFUNC] = R_DrawColumnFlush;
-		colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumnFlush;
-		colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumnFlush;
-		colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowedFlush;
-		colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumnFlush;
-		colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumnFlush;
-		colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumnFlush;
+		colfuncs[BASEDRAWFUNC] = R_DrawColumn_Flush;
+		colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn_Flush;
+		colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn_Flush;
+		colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed_Flush;
+		colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn_Flush;
+		colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn_Flush;
+		colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn_Flush;
 	}
 	else
 	{