From 08492a2de99d44f5d86ad1e468b51f597275e64c Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Fri, 27 Jun 2014 23:47:34 -0700 Subject: [PATCH] remove linewise setting. linewise mode is always enabled now. --- include/resource.h | 1 - src/dosbox.cpp | 9 ++------- src/gui/menu.cpp | 2 -- src/gui/render.cpp | 3 +-- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/include/resource.h b/include/resource.h index 7aff96a5d..5da15a103 100644 --- a/include/resource.h +++ b/include/resource.h @@ -502,7 +502,6 @@ #define ID_REMOVE_STATE_9 602 #define ID_REMOVE_STATE_10 603 #define ID_REMOVE_STATE_ALL 604 -#define ID_LINEWISE 605 #define ID_CHAR9 606 #define ID_MULTISCAN 607 #define ID_CPU_ADVANCED 608 diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 8d462be1a..f6c080e6a 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -939,13 +939,11 @@ void DOSBOX_Init(void) { Pbool = secprop->Add_bool("page flip debug line",Property::Changeable::Always,false); Pbool->Set_help("VGA debugging switch. If set, an inverse line will be drawn on the exact scanline that the CRTC display offset registers were written.\n" - "This can be used to help diagnose whether or not the DOS game is page flipping properly according to vertical retrace if the display on-screen is flickering.\n" - "You must enable linewise mode for this debug option to work correctly."); + "This can be used to help diagnose whether or not the DOS game is page flipping properly according to vertical retrace if the display on-screen is flickering."); Pbool = secprop->Add_bool("vertical retrace poll debug line",Property::Changeable::Always,false); Pbool->Set_help("VGA debugging switch. If set, an inverse green dotted line will be drawn on the exact scanline that the CRTC status port (0x3DA) was read.\n" - "This can be used to help diagnose whether the DOS game is propertly waiting for vertical retrace.\n" - "You must enable linewise mode for this debug option to work correctly."); + "This can be used to help diagnose whether the DOS game is propertly waiting for vertical retrace."); Pbool = secprop->Add_bool("cgasnow",Property::Changeable::WhenIdle,true); Pbool->Set_help("When machine=cga, determines whether or not to emulate CGA snow"); @@ -1067,9 +1065,6 @@ void DOSBOX_Init(void) { Pbool = secprop->Add_bool("aspect",Property::Changeable::Always,false); Pbool->Set_help("Do aspect correction, if your output method doesn't support scaling this can slow things down!."); - Pbool = secprop->Add_bool("linewise",Property::Changeable::Always,true); - Pbool->Set_help("Draw the display line by line. Needed for certain special graphics effects in games and demos. Can be changed at runtime but will be put in effect at the next mode switch."); - Pbool = secprop->Add_bool("char9",Property::Changeable::Always,true); Pbool->Set_help("Allow 9-pixel wide text mode fonts."); diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index bd2ef35b1..83c0d04a7 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -1395,7 +1395,6 @@ int Reflect_Menu(void) { } sec = static_cast(control->GetSection("render")); if (sec) { - CheckMenuItem(m_handle, ID_LINEWISE, sec->Get_bool("linewise") ? MF_CHECKED : MF_STRING); CheckMenuItem(m_handle, ID_CHAR9, sec->Get_bool("char9") ? MF_CHECKED : MF_STRING); CheckMenuItem(m_handle, ID_MULTISCAN, sec->Get_bool("multiscan") ? MF_CHECKED : MF_STRING); } @@ -1842,7 +1841,6 @@ void MSG_Loop(void) { KEYBOARD_AddKey(KBD_delete, false); break; } - case ID_LINEWISE: MENU_SetBool("render", "linewise"); break; case ID_CHAR9: MENU_SetBool("render", "char9"); break; case ID_MULTISCAN: MENU_SetBool("render", "multiscan"); break; case ID_DRVFORCE_DIRECTX: { diff --git a/src/gui/render.cpp b/src/gui/render.cpp index e76ac2009..598651e5d 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -689,8 +689,7 @@ void RENDER_SetForceUpdate(bool f) { void RENDER_Init(Section * sec) { Section_prop * section=static_cast(sec); - // line-by-line emulation - vga.draw.linewise_set=section->Get_bool("linewise"); + vga.draw.linewise_set=true; vga.draw.doublescan_set=section->Get_bool("doublescan"); vga.draw.char9_set=section->Get_bool("char9");