Fix conditionals on rendermode to allow for more modes

src/d_main.cpp

@@ -587,7 +587,7 @@ static bool D_Display(bool world)
 							HWR_RenderPlayerView();
 						else
 #endif
-						if (rendermode != render_none)
+						if (rendermode == render_soft)
 						{
 							if (i > 0) // Splitscreen-specific
 							{

src/f_wipe.cpp

@@ -357,7 +357,7 @@ void F_WipeStartScreen(void)
 {
 #ifndef NOWIPE
 #ifdef HWRENDER
-	if(rendermode != render_soft)
+	if(rendermode == render_opengl)
 	{
 		HWR_StartScreenWipe();
 		return;
@@ -393,7 +393,7 @@ void F_WipeEndScreen(void)
 {
 #ifndef NOWIPE
 #ifdef HWRENDER
-	if(rendermode != render_soft)
+	if(rendermode == render_opengl)
 	{
 		HWR_EndScreenWipe();
 		return;
@@ -565,7 +565,7 @@ void F_RunWipe(UINT8 wipemode, UINT8 wipetype, boolean drawMenu, const char *col
 			M_LegacySaveFrame();
 		else
 #endif
-		if (moviemode && rendermode != render_none)
+		if (moviemode && rendermode == render_soft)
 			I_CaptureVideoFrame();
 
 		NetKeepAlive(); // Update the network so we don't cause timeouts

src/g_game.c

@@ -1284,7 +1284,7 @@ void G_PreLevelTitleCard(void)
 			M_LegacySaveFrame();
 		else
 #endif
-		if (moviemode && rendermode != render_none)
+		if (moviemode && rendermode == render_soft)
 			I_CaptureVideoFrame();
 
 		while (!((nowtime = I_GetTime()) - lasttime))

src/hu_stuff.c

@@ -2144,7 +2144,7 @@ void HU_Erase(void)
 		con_hudupdate = false; // if it was set..
 	}
 #ifdef HWRENDER
-	else if (rendermode != render_none)
+	else if (rendermode == render_opengl)
 	{
 		// refresh just what is needed from the view borders
 		HWR_DrawViewBorder(secondframelines);

src/k_vote.c

@@ -1797,7 +1797,7 @@ static void Y_UnloadVoteData(void)
 
 	vote.loaded = false;
 
-	if (rendermode != render_soft)
+	if (rendermode == render_opengl)
 	{
 		return;
 	}

src/m_misc.cpp

@@ -1462,7 +1462,7 @@ void M_LegacySaveFrame(void)
 #endif
 				M_PNGFrame(apng_ptr, apng_info_ptr, (png_bytep)linear);
 #ifdef HWRENDER
-				if (rendermode != render_soft && linear)
+				if (rendermode == render_opengl && linear)
 					free(linear);
 #endif
 

src/p_enemy.c

@@ -3883,7 +3883,7 @@ void A_OverlayThink(mobj_t *actor)
 	if (!actor->target)
 		return;
 
-	if (!r_splitscreen && rendermode != render_soft)
+	if (!r_splitscreen && rendermode == render_opengl)
 	{
 		angle_t viewingangle;
 

src/p_setup.cpp

@@ -8466,7 +8466,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 		lastwipetic = nowtime; \
 		if (moviemode && rendermode == render_opengl) \
 			M_LegacySaveFrame(); \
-		else if (moviemode && rendermode != render_none) \
+		else if (moviemode && rendermode == render_soft) \
 			I_CaptureVideoFrame(); \
 		NetKeepAlive(); \
 	} \

src/r_data.c

@@ -1162,7 +1162,7 @@ void R_PrecacheLevel(void)
 		return;
 
 	// do not flush the memory, Z_Malloc twice with same user will cause error in Z_CheckHeap()
-	if (rendermode != render_soft)
+	if (rendermode == render_opengl)
 		return;
 
 	// Precache flats.

src/r_draw.cpp

@@ -524,7 +524,7 @@ void R_FillBackScreen(void)
 	INT32 x, y, step, boff;
 
 	// quickfix, don't cache lumps in both modes
-	if (rendermode != render_soft)
+	if (rendermode == render_opengl)
 		return;
 
 	// draw pattern around the status bar too (when hires),
@@ -620,7 +620,7 @@ void R_DrawViewBorder(void)
 	if (rendermode == render_none)
 		return;
 #ifdef HWRENDER
-	if (rendermode != render_soft)
+	if (rendermode == render_opengl)
 	{
 		HWR_DrawViewBorder(0);
 		return;

src/r_main.cpp

@@ -1100,7 +1100,7 @@ void R_ExecuteSetViewSize(void)
 
 	// continue to do the software setviewsize as long as we use the reference software view
 #ifdef HWRENDER
-	if (rendermode != render_soft)
+	if (rendermode == render_opengl)
 		HWR_SetViewSize();
 #endif
 

src/r_things.cpp

@@ -2784,7 +2784,7 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 	INT32 lightnum;
 	fixed_t limit_dist;
 
-	if (rendermode != render_soft)
+	if (rendermode == render_opengl)
 		return;
 
 	// BSP is traversed by subsector.

src/sdl/i_video.cpp

@@ -1220,8 +1220,8 @@ void I_UpdateNoVsync(void)
 //
 void I_ReadScreen(UINT8 *scr)
 {
-	if (rendermode != render_soft)
-		I_Error ("I_ReadScreen: called while in non-software mode");
+	if (rendermode == render_opengl)
+		I_Error ("I_ReadScreen: called while in Legacy GL mode");
 	else
 		VID_BlitLinearScreen(screens[0], scr,
 			vid.width*vid.bpp, vid.height,

src/v_video.cpp

@@ -797,7 +797,6 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 		return;
 
 #ifdef HWRENDER
-	//if (rendermode != render_soft && !con_startup)		// Why?
 	if (rendermode == render_opengl)
 	{
 		HWR_DrawStretchyFixedPatch(patch, x, y, pscale, vscale, scrn, colormap);
@@ -1016,7 +1015,6 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 		return;
 
 #ifdef HWRENDER
-	//if (rendermode != render_soft && !con_startup)		// Not this again
 	if (rendermode == render_opengl)
 	{
 		HWR_DrawFill(x, y, w, h, c);
@@ -1600,7 +1598,7 @@ const UINT8 *V_OffsetIntoFadeMap(const lighttable_t *clm, UINT8 strength)
 void V_DrawCustomFadeScreen(const char *lump, UINT8 strength)
 {
 #ifdef HWRENDER
-	if (rendermode != render_soft && rendermode != render_none)
+	if (rendermode == render_opengl)
 	{
 		HWR_DrawCustomFadeScreen(
 			(strcmp(lump, "FADEMAP1") != 0
@@ -1664,7 +1662,7 @@ void V_DrawFadeConsBack(INT32 plines)
 void V_EncoreInvertScreen(void)
 {
 #ifdef HWRENDER
-	if (rendermode != render_soft && rendermode != render_none)
+	if (rendermode == render_opengl)
 	{
 		HWR_EncoreInvertScreen();
 		return;

src/w_wad.cpp

@@ -2001,7 +2001,7 @@ void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
 
 #ifdef HWRENDER
 	// Software-only compile cache the data without conversion
-	if (rendermode == render_soft || rendermode == render_none)
+	if (rendermode != render_opengl)
 #endif
 		return (void *)patch;
 

src/win32ce/win_vid.c

@@ -233,8 +233,8 @@ void I_LoadingScreen(LPCSTR msg)
 void I_ReadScreen(UINT8 *scr)
 {
 	// DEBUGGING
-	if (rendermode != render_soft)
-		I_Error("I_ReadScreen: called while in non-software mode");
+	if (rendermode == render_opengl)
+		I_Error("I_ReadScreen: called while in Legacy GL mode");
 	VID_BlitLinearScreen(screens[0], scr, vid.width*vid.bpp, vid.height, vid.width*vid.bpp,
 		vid.rowbytes);
 }

src/y_inter.cpp

@@ -2523,7 +2523,7 @@ static void Y_UnloadData(void)
 {
 	// In hardware mode, don't Z_ChangeTag a pointer returned by W_CachePatchName().
 	// It doesn't work and is unnecessary.
-	if (rendermode != render_soft)
+	if (rendermode == render_opengl)
 		return;
 
 	// unload the background patches