From 4d6daffb30df85a9432f47191a7ca3f013a2ba71 Mon Sep 17 00:00:00 2001 From: ipher <> Date: Wed, 9 Feb 2005 00:22:40 +0000 Subject: [PATCH] Added "Use Primary Buffer" dummy option to the Win32 port --- zsnes/src/gui/gui.asm | 2 +- zsnes/src/gui/guikeys.inc | 4 ++++ zsnes/src/gui/guimouse.inc | 3 ++- zsnes/src/gui/guiwindp.inc | 17 +++++++++++++---- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index 368fc8b1..22bf79e2 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -643,7 +643,7 @@ NEWSYM AutoPatch, db 1 NEWSYM RomInfo, db 1 NEWSYM SRAMState, db 0 NEWSYM RewindStates, db 16 - +NEWSYM PrimaryBuffer, db 0 GUIsave equ $-GUIRAdd section .bss diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index c75bf57c..c26aa09a 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -921,6 +921,10 @@ GUIOptionKeys: xor byte[RomInfo],1 .norominfo %ifdef __WIN32__ + cmp dh,'B' + jne .noprimarybuffer + xor byte[PrimaryBuffer],1 +.noprimarybuffer cmp dh,'I' jne .noscreensaver xor byte[DisableScreenSaver],1 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 9212c166..45bdc4a1 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2297,7 +2297,8 @@ DisplayGUIOptionClick: GUIClickCButton 11,140,byte[AutoPatch] GUIClickCButton 11,150,byte[RomInfo] %ifdef __WIN32__ - GUIClickCButtonW 11,160,byte[DisableScreenSaver] + GUIClickCButtonW 11,160,byte[PrimaryBuffer] + GUIClickCButtonW 11,170,byte[DisableScreenSaver] %endif ; Frameskip = 0 cmp byte[frameskip],0 diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 2348c5fa..ea80c920 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1637,7 +1637,8 @@ DisplayGUIOption: GUIOuttextwin2u 4,26,144,GUIOptionTextE,12 GUIOuttextwin2u 4,26,154,GUIOptionTextF,15 %ifdef __WIN32__ - GUIOuttextwin2u 4,26,164,GUIOptionTextW,1 + GUIOuttextwin2u 4,26,164,GUIOptionTextV,12 + GUIOuttextwin2u 4,26,174,GUIOptionTextW,1 %endif add byte[GUItextcolor],15 GUIOuttextwin2 4,5,13,[GUITemp] @@ -1661,7 +1662,8 @@ DisplayGUIOption: GUIOuttextwin2 4,25,143,GUIOptionTextE GUIOuttextwin2 4,25,153,GUIOptionTextF %ifdef __WIN32__ - GUIOuttextwin2 4,25,163,GUIOptionTextW + GUIOuttextwin2 4,25,163,GUIOptionTextV + GUIOuttextwin2 4,25,173,GUIOptionTextW %endif mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[frameskip],0 @@ -1759,11 +1761,17 @@ DisplayGUIOption: GUIDisplayIconWin 4,11,150,[GUITemp] %ifdef __WIN32__ mov dword[GUITemp],GUIIconDataCheckBoxUC - cmp byte[DisableScreenSaver],0 + cmp byte[PrimaryBuffer],0 je .nocheckbox14 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox14 GUIDisplayIconWin 4,11,160,[GUITemp] + mov dword[GUITemp],GUIIconDataCheckBoxUC + cmp byte[DisableScreenSaver],0 + je .nocheckbox15 + mov dword[GUITemp],GUIIconDataCheckBoxC +.nocheckbox15 + GUIDisplayIconWin 4,11,170,[GUITemp] %endif @@ -1874,7 +1882,8 @@ GUIOptionTextC db 'DON',39,'T SAVE CUR PATH',0 GUIOptionTextD db 'USE SMALL MESSAGE TEXT',0 GUIOptionTextE db 'ENABLE AUTO-PATCH',0 GUIOptionTextF db 'ENABLE ROMINFO.TXT',0 -GUIOptionTextW db 'DISABLE SCREENSAVER',0 ; Try to keep as last option, since its Win Only. +GUIOptionTextV db 'USE PRIMARY BUFFER',0 ; Try to keep as last option, since its Win Only. +GUIOptionTextW db 'DISABLE SCREENSAVER',0 ; Same. GUIOptionTextX db '-',0 GUIOptionTextY db '+',0 GUIOptionTextZ db '-',0