From a85d33beb3c70068fab1493dedf20f45eab03429 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 21 Dec 2014 16:43:49 -0500 Subject: [PATCH 1/2] Switch VideoCheckVbl() to call VideoGetVbl() instead of VideoGetScannerAddress() --- source/Video.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Video.cpp b/source/Video.cpp index f5d11040..e5203faa 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -2196,11 +2196,10 @@ BYTE VideoCheckMode (WORD, WORD address, BYTE, BYTE, ULONG uExecutedCycles) BYTE VideoCheckVbl (WORD, WORD, BYTE, BYTE, ULONG uExecutedCycles) { - bool bVblBar = false; - VideoGetScannerAddress(&bVblBar, uExecutedCycles); + bool bVblBar = VideoGetVbl(uExecutedCycles); BYTE r = KeybGetKeycode(); - return (r & ~0x80) | ((bVblBar) ? 0x80 : 0); + return (r & ~0x80) | (bVblBar ? 0x80 : 0); } //=========================================================================== @@ -2669,6 +2668,7 @@ void VideoResetState () //=========================================================================== + BYTE VideoSetMode (WORD, WORD address, BYTE write, BYTE, ULONG uExecutedCycles) { address &= 0xFF; From 0fc6d18139bd501e6fbf01b01d1b8df2cadd6f76 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 21 Dec 2014 16:47:03 -0500 Subject: [PATCH 2/2] Removed some unused video constants --- source/Video.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/Video.cpp b/source/Video.cpp index bbf38c08..8f9cbd95 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -294,10 +294,6 @@ static bool bVideoScannerNTSC = true; // NTSC video scanning (or PAL) //------------------------------------- -// Video consts: - const UINT nVBlStop_NTSC = 21; - const UINT nVBlStop_PAL = 29; - // NOTE: KEEP IN SYNC: VideoType_e g_aVideoChoices g_apVideoModeDesc TCHAR g_aVideoChoices[] = TEXT("Monochrome (Custom Luminance)\0")