From 88a7ab7b0b2c7c2624237eb1ab78e3bb23fe0127 Mon Sep 17 00:00:00 2001
From: michaelangel007 <testcraft@sharedcraft.com>
Date: Fri, 2 Jan 2015 02:45:47 -0800
Subject: [PATCH] Fix video configuration initialization order not being
 applied for 50% scan lines

---
 source/Applewin.cpp | 1 -
 source/NTSC.cpp     | 7 +++----
 source/Video.cpp    | 8 +-------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/source/Applewin.cpp b/source/Applewin.cpp
index e22cfec3..da9542af 100644
--- a/source/Applewin.cpp
+++ b/source/Applewin.cpp
@@ -432,7 +432,6 @@ void LoadConfiguration(void)
 	REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED),(DWORD *)&enhancedisk);
 
 	Config_Load_Video();
-	VideoReinitialize();
 
 	REGLOAD(TEXT("Uthernet Active")   ,(DWORD *)&tfe_enabled);
 
diff --git a/source/NTSC.cpp b/source/NTSC.cpp
index 96820764..b723965a 100644
--- a/source/NTSC.cpp
+++ b/source/NTSC.cpp
@@ -1232,12 +1232,11 @@ void NTSC_VideoInit( uint8_t* pFramebuffer ) // wsVideoInit
 
 	vbp0 = g_aNTSC_Lines[0]; // wsLines
 
-	g_pFunc_ntscMonoPixel  = ntscMonoSinglePixel ;
-	g_pFunc_ntscColorPixel = ntscColorSinglePixel;
-
-	g_pFunc_NTSCVideoUpdateText   = NTSC_UpdateVideoText40;
+	g_pFunc_NTSCVideoUpdateText     = NTSC_UpdateVideoText40;
 	g_pFunc_NTSCVideoUpdateGraphics = NTSC_UpdateVideoText40;
 
+	VideoReinitialize(); // Setup g_pFunc_ntsc*Pixel()
+
 #if HGR_TEST_PATTERN
 // Michael -- Init HGR to almost all-possible-combinations
 // CALL-151
diff --git a/source/Video.cpp b/source/Video.cpp
index 5b3bf9a8..c36ff346 100644
--- a/source/Video.cpp
+++ b/source/Video.cpp
@@ -378,7 +378,6 @@ void VideoInitialize ()
 	g_pFramebufferinfo->bmiHeader.biClrUsed     = 0;
 
 	NTSC_VideoCreateDIBSection();
-//	VideoReinitialize(); // Can't call here since Config_Video_Load() hasn't been called yet
 }
 
 //===========================================================================
@@ -1197,7 +1196,7 @@ void VideoRedrawScreen ()
 {
 	g_VideoForceFullRedraw = 1;
 
-	VideoRefreshScreen( g_uVideoMode ); //g_uVideoMode );
+	VideoRefreshScreen( g_uVideoMode );
 }
 
 //===========================================================================
@@ -1276,11 +1275,6 @@ void VideoRefreshScreen ( int bVideoModeFlags )
 // NTSC_END
 }
 
-//===========================================================================
-//void _Video_RedrawScreen( VideoUpdateFuncPtr_t pfUpdate, bool bMixed )
-//	FrameReleaseVideoDC();
-//	SetLastDrawnImage();
-
 //===========================================================================
 void VideoReinitialize ()
 {