From af9e73cef058efd3195f4b1592c30b28819adee8 Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Thu, 6 Aug 2020 18:08:00 -0400
Subject: [PATCH] Easy conflicts - src/win32/win_dll.c and src/win32/win_vid.c

---
 src/win32/win_dll.c | 86 ---------------------------------------------
 src/win32/win_vid.c |  7 +---
 2 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c
index 4ae18690e..b9f433cdc 100644
--- a/src/win32/win_dll.c
+++ b/src/win32/win_dll.c
@@ -81,97 +81,11 @@ static VOID UnloadDLL (HMODULE* pModule)
 }
 #endif
 
-<<<<<<< HEAD
-=======
 // ==========================================================================
 // STANDARD 3D DRIVER DLL FOR DOOM LEGACY
 // ==========================================================================
 
 // note : the 3D driver loading should be put somewhere else..
-
-#ifdef HWRENDER
-static HMODULE hwdModule = NULL;
-
-static loadfunc_t hwdFuncTable[] = {
-#ifdef _X86_
-	{"Init@4",              &hwdriver.pfnInit},
-	{"Shutdown@0",          &hwdriver.pfnShutdown},
-	{"GetModeList@8",       &hwdriver.pfnGetModeList},
-	{"SetPalette@4",        &hwdriver.pfnSetPalette},
-	{"FinishUpdate@4",      &hwdriver.pfnFinishUpdate},
-	{"Draw2DLine@12",       &hwdriver.pfnDraw2DLine},
-	{"DrawPolygon@16",      &hwdriver.pfnDrawPolygon},
-	{"RenderSkyDome@16",    &hwdriver.pfnRenderSkyDome},
-	{"SetBlend@4",          &hwdriver.pfnSetBlend},
-	{"ClearBuffer@12",      &hwdriver.pfnClearBuffer},
-	{"SetTexture@4",        &hwdriver.pfnSetTexture},
-	{"ReadRect@24",         &hwdriver.pfnReadRect},
-	{"GClipRect@20",        &hwdriver.pfnGClipRect},
-	{"ClearMipMapCache@0",  &hwdriver.pfnClearMipMapCache},
-	{"SetSpecialState@8",   &hwdriver.pfnSetSpecialState},
-	{"DrawModel@16",        &hwdriver.pfnDrawModel},
-	{"SetTransform@4",      &hwdriver.pfnSetTransform},
-	{"GetTextureUsed@0",    &hwdriver.pfnGetTextureUsed},
-	{"GetRenderVersion@0",  &hwdriver.pfnGetRenderVersion},
-#ifdef SHUFFLE
-	{"PostImgRedraw@4",     &hwdriver.pfnPostImgRedraw},
-#endif
-	{"FlushScreenTextures@0",&hwdriver.pfnFlushScreenTextures},
-	{"StartScreenWipe@0",   &hwdriver.pfnStartScreenWipe},
-	{"EndScreenWipe@0",     &hwdriver.pfnEndScreenWipe},
-	{"DoScreenWipe@4",      &hwdriver.pfnDoScreenWipe},
-	{"DrawIntermissionBG@0",&hwdriver.pfnDrawIntermissionBG},
-	{"MakeScreenTexture@0", &hwdriver.pfnMakeScreenTexture},
-	{"MakeScreenFinalTexture@0", &hwdriver.pfnMakeScreenFinalTexture},
-	{"DrawScreenFinalTexture@8", &hwdriver.pfnDrawScreenFinalTexture},
-#else
-	{"Init",                &hwdriver.pfnInit},
-	{"Shutdown",            &hwdriver.pfnShutdown},
-	{"GetModeList",         &hwdriver.pfnGetModeList},
-	{"SetPalette",          &hwdriver.pfnSetPalette},
-	{"FinishUpdate",        &hwdriver.pfnFinishUpdate},
-	{"Draw2DLine",          &hwdriver.pfnDraw2DLine},
-	{"DrawPolygon",         &hwdriver.pfnDrawPolygon},
-	{"RenderSkyDome",       &hwdriver.pfnRenderSkyDome},
-	{"SetBlend",            &hwdriver.pfnSetBlend},
-	{"ClearBuffer",         &hwdriver.pfnClearBuffer},
-	{"SetTexture",          &hwdriver.pfnSetTexture},
-	{"ReadRect",            &hwdriver.pfnReadRect},
-	{"GClipRect",           &hwdriver.pfnGClipRect},
-	{"ClearMipMapCache",    &hwdriver.pfnClearMipMapCache},
-	{"SetSpecialState",     &hwdriver.pfnSetSpecialState},
-	{"DrawModel",           &hwdriver.pfnDrawModel},
-	{"SetTransform",        &hwdriver.pfnSetTransform},
-	{"GetTextureUsed",      &hwdriver.pfnGetTextureUsed},
-	{"GetRenderVersion",    &hwdriver.pfnGetRenderVersion},
-#ifdef SHUFFLE
-	{"PostImgRedraw",       &hwdriver.pfnPostImgRedraw},
-#endif
-	{"FlushScreenTextures", &hwdriver.pfnFlushScreenTextures},
-	{"StartScreenWipe",     &hwdriver.pfnStartScreenWipe},
-	{"EndScreenWipe",       &hwdriver.pfnEndScreenWipe},
-	{"DoScreenWipe",        &hwdriver.pfnDoScreenWipe},
-	{"DrawIntermissionBG",  &hwdriver.pfnDrawIntermissionBG},
-	{"MakeScreenTexture",   &hwdriver.pfnMakeScreenTexture},
-	{"MakeScreenFinalTexture", &hwdriver.pfnMakeScreenFinalTexture},
-	{"DrawScreenFinalTexture", &hwdriver.pfnDrawScreenFinalTexture},
-#endif
-	{NULL,NULL}
-};
-
-BOOL Init3DDriver (LPCSTR dllName)
-{
-	hwdModule = LoadDLL(dllName, hwdFuncTable);
-	return (hwdModule != NULL);
-}
-
-VOID Shutdown3DDriver (VOID)
-{
-	UnloadDLL(&hwdModule);
-}
-#endif
-
->>>>>>> srb2/next
 #ifdef HW3SOUND
 static HMODULE hwsModule = NULL;
 
diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c
index dbdff5981..f6c7b6601 100644
--- a/src/win32/win_vid.c
+++ b/src/win32/win_vid.c
@@ -298,15 +298,10 @@ static inline boolean I_SkipFrame(void)
 		case GS_LEVEL:
 			if (!paused)
 				return false;
-<<<<<<< HEAD
-			/* FALLTHRU */
-=======
+		/* FALLTHRU */
 		//case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible
->>>>>>> srb2/next
-#ifndef CLIENT_LOADINGSCREEN
 		/* FALLTHRU */
 		case GS_WAITINGPLAYERS:
-#endif
 			return skip; // Skip odd frames
 		default:
 			return false;