Fix video configuration initialization order not being applied for 50% scan lines

This commit is contained in:
michaelangel007 2015-01-02 02:45:47 -08:00
parent 24ac8886c6
commit 88a7ab7b0b
3 changed files with 4 additions and 12 deletions

View file

@ -432,7 +432,6 @@ void LoadConfiguration(void)
REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED),(DWORD *)&enhancedisk); REGLOAD(TEXT(REGVALUE_ENHANCE_DISK_SPEED),(DWORD *)&enhancedisk);
Config_Load_Video(); Config_Load_Video();
VideoReinitialize();
REGLOAD(TEXT("Uthernet Active") ,(DWORD *)&tfe_enabled); REGLOAD(TEXT("Uthernet Active") ,(DWORD *)&tfe_enabled);

View file

@ -1232,12 +1232,11 @@ void NTSC_VideoInit( uint8_t* pFramebuffer ) // wsVideoInit
vbp0 = g_aNTSC_Lines[0]; // wsLines vbp0 = g_aNTSC_Lines[0]; // wsLines
g_pFunc_ntscMonoPixel = ntscMonoSinglePixel ; g_pFunc_NTSCVideoUpdateText = NTSC_UpdateVideoText40;
g_pFunc_ntscColorPixel = ntscColorSinglePixel;
g_pFunc_NTSCVideoUpdateText = NTSC_UpdateVideoText40;
g_pFunc_NTSCVideoUpdateGraphics = NTSC_UpdateVideoText40; g_pFunc_NTSCVideoUpdateGraphics = NTSC_UpdateVideoText40;
VideoReinitialize(); // Setup g_pFunc_ntsc*Pixel()
#if HGR_TEST_PATTERN #if HGR_TEST_PATTERN
// Michael -- Init HGR to almost all-possible-combinations // Michael -- Init HGR to almost all-possible-combinations
// CALL-151 // CALL-151

View file

@ -378,7 +378,6 @@ void VideoInitialize ()
g_pFramebufferinfo->bmiHeader.biClrUsed = 0; g_pFramebufferinfo->bmiHeader.biClrUsed = 0;
NTSC_VideoCreateDIBSection(); 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; g_VideoForceFullRedraw = 1;
VideoRefreshScreen( g_uVideoMode ); //g_uVideoMode ); VideoRefreshScreen( g_uVideoMode );
} }
//=========================================================================== //===========================================================================
@ -1276,11 +1275,6 @@ void VideoRefreshScreen ( int bVideoModeFlags )
// NTSC_END // NTSC_END
} }
//===========================================================================
//void _Video_RedrawScreen( VideoUpdateFuncPtr_t pfUpdate, bool bMixed )
// FrameReleaseVideoDC();
// SetLastDrawnImage();
//=========================================================================== //===========================================================================
void VideoReinitialize () void VideoReinitialize ()
{ {