From 9deded2762668be64910332064ecbf53352e7bb4 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 13 Mar 2009 00:08:00 +0000 Subject: [PATCH] Win32 - Debugger - more vblank scanline display upgrades --- src/drivers/win/debugger.cpp | 8 +++++++- src/drivers/win/res.rc | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp index 3a01eac0..b5297275 100644 --- a/src/drivers/win/debugger.cpp +++ b/src/drivers/win/debugger.cpp @@ -547,8 +547,14 @@ void UpdateDebugger() if (ppupixel>341) //maximum number of pixels per scanline ppupixel = 0; //Currently pixel display is borked until Run 128 lines is clicked, this keeps garbage from displaying + //If not in the 0-239 pixel range, make special cases for display if (scanline == 240 && vblankScanLines < 22) - sprintf(str, "Scanline %d, PPU pixel %d", scanline+vblankScanLines,vblankPixel); + { + if (scanline + vblankScanLines == 261) + sprintf(str, "Scanline -1, PPU pixel %d", vblankPixel); //Pre-render + else + sprintf(str, "Scanline %d, PPU pixel %d", scanline+vblankScanLines,vblankPixel); + } else sprintf(str, "Scanline %d, PPU pixel %d", scanline,ppupixel); diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index c532a8e7..ccca1e38 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -958,10 +958,10 @@ BEGIN PUSHBUTTON "Seek To:",IDC_DEBUGGER_SEEK_TO,349,56,37,14 EDITTEXT IDC_DEBUGGER_VAL_PCSEEK,389,57,38,12,ES_UPPERCASE | ES_WANTRETURN LTEXT "PPU:",65531,349,196,19,10 - LTEXT "Sprite:",65530,395,196,21,10 + LTEXT "Sprite:",65530,394,196,21,10 EDITTEXT IDC_DEBUGGER_VAL_PPU,367,195,25,12,ES_UPPERCASE | ES_WANTRETURN - EDITTEXT IDC_DEBUGGER_VAL_SPR,417,195,15,12,ES_UPPERCASE | ES_WANTRETURN - LTEXT "Scanline:",IDC_DEBUGGER_VAL_SLINE,435,196,97,10 + EDITTEXT IDC_DEBUGGER_VAL_SPR,415,195,15,12,ES_UPPERCASE | ES_WANTRETURN + LTEXT "Scanline:",IDC_DEBUGGER_VAL_SLINE,432,196,102,10 CONTROL "",IDC_DEBUGGER_ADDR_LINE,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,5,307,328,10 CONTROL "Break on Bad Opcode",IDC_DEBUGGER_BREAK_ON_BAD_OP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,437,132,90,10