From 018a817900b615a13d101325cc0eacdcdb91e6c9 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Tue, 21 Aug 2001 19:28:14 +0000
Subject: [PATCH] Fixed scanlines config in dos port

---
 zsnes/src/dos/dosintrf.asm |  2 +-
 zsnes/src/gui/guimouse.inc |  2 +-
 zsnes/src/gui/guiwindp.inc | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/zsnes/src/dos/dosintrf.asm b/zsnes/src/dos/dosintrf.asm
index 836521e3..f3e688b2 100644
--- a/zsnes/src/dos/dosintrf.asm
+++ b/zsnes/src/dos/dosintrf.asm
@@ -1030,7 +1030,7 @@ db '                 ',0
 ; Left side starts with Video Mode 0
 NEWSYM GUI16VID, db 0,0,1,0,1,0,1,0,1,0,1,0     ; 16-bit mode
 NEWSYM GUINGVID, db 1,1,1,1,1,1,0,1,1,1,1,0     ; New Graphics Mode Available
-NEWSYM GUISLVID, db 1,0,1,0,0,1,1,0,0,1,1,0     ; Scanlines
+NEWSYM GUISLVID, db 0,0,1,0,0,1,1,0,0,1,1,0     ; Scanlines
 NEWSYM GUIINVID, db 0,0,0,0,0,0,0,0,0,0,1,0     ; Interpolation
 NEWSYM GUIEAVID, db 0,0,0,0,0,0,0,0,0,1,0,0     ; Eagle
 NEWSYM GUIIEVID, db 0,0,0,0,0,0,0,0,0,1,1,0     ; (Interp | Eagle)
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 4b4e4fc7..9d3bec04 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -2207,6 +2207,7 @@ DisplayGUIVideoClick:
     xor ebx,ebx
     mov bl,[cvidmode]
     cmp byte[GUISLVID+ebx],0
+    GUIClickCButton4 21,114,byte[scanlines],byte[cfgscanline],1
     je near .nocheckboxb
 .nocheckboxb
     xor ebx,ebx
@@ -2229,7 +2230,6 @@ DisplayGUIVideoClick:
     mov bl,[cvidmode]
     cmp byte[GUIHSVID+ebx],0
     je near .nohsline
-    GUIClickCButton4 21,114,byte[scanlines],byte[cfgscanline],1
     GUIClickCButton4 61,114,byte[scanlines],byte[cfgscanline],3
     GUIClickCButton4 101,114,byte[scanlines],byte[cfgscanline],2
 .nohsline
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 3cd60945..0cd09250 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -1667,13 +1667,14 @@ DisplayGUIVideo:
     mov al,[cvidmode]
     cmp byte[GUISLVID+eax],0
     je .notext2
+    GUIOuttextwin2 5,13,111,GUIVideoTextb
+    GUIOuttextwin2 5,36,119,GUIVideoTexta
 .notext2
     xor eax,eax
     mov al,[cvidmode]
     cmp byte[GUIHSVID+eax],0
     je near .notexta
     GUIOuttextwin2 5,13,111,GUIVideoTextb
-    GUIOuttextwin2 5,36,119,GUIVideoTexta
     GUIOuttextwin2 5,76,119,GUIVideoTexta2
     GUIOuttextwin2 5,116,119,GUIVideoTexta3
 .notexta
@@ -1762,13 +1763,14 @@ DisplayGUIVideo:
     mov al,[cvidmode]
     cmp byte[GUISLVID+eax],0
     je .notext2b
+    GUIOuttextwin2 5,12,110,GUIVideoTextb
+    GUIOuttextwin2 5,35,118,GUIVideoTexta
 .notext2b
     xor eax,eax
     mov al,[cvidmode]
     cmp byte[GUIHSVID+eax],0
     je near .notextab
     GUIOuttextwin2 5,12,110,GUIVideoTextb
-    GUIOuttextwin2 5,35,118,GUIVideoTexta
     GUIOuttextwin2 5,75,118,GUIVideoTexta2
     GUIOuttextwin2 5,115,118,GUIVideoTexta3
 .notextab
@@ -1854,8 +1856,8 @@ DisplayGUIVideo:
     GUIOuttextwin2 5,5,15,GUIVideoText1
     xor eax,eax
     mov al,[cvidmode]
-    cmp byte[GUIHSVID+eax],0
-    je near .nocheckboxw
+    cmp byte[GUISLVID+eax],0
+    je near .nocheckboxb
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     cmp byte[scanlines],1
     jne .nocheckbox
@@ -1863,6 +1865,10 @@ DisplayGUIVideo:
 .nocheckbox
     GUIDisplayIconWin 5,21,114,[GUITemp]
 .nocheckboxb
+    xor eax,eax
+    mov al,[cvidmode]
+    cmp byte[GUIHSVID+eax],0
+    je .nocheckboxw
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     cmp byte[scanlines],3
     jne .nocheckboxv