a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed filtered gui bug with 2xSaI enabled

Browse Source
This commit is contained in:
pagefault
2001-08-01 01:50:26 +00:00
parent b6c674abd8
commit 3ee0d3d1c3
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zsnes/src/gui/guikeys.inc
View File

@@ -970,6 +970,9 @@ GUIGUIOptnsKeys:
cmp dh,'F' cmp dh,'F'
jne .guioptn13 jne .guioptn13
xor byte[FilteredGUI],1 xor byte[FilteredGUI],1
cmp byte[En2xSaI],1
jnae .guioptn13
call Clear2xSaIBuffer
.guioptn13 .guioptn13
cmp dh,'R' cmp dh,'R'
jne .guioptn14 jne .guioptn14

19
zsnes/src/gui/guimouse.inc
View File

@@ -15,6 +15,7 @@
;along with this program; if not, write to the Free Software ;along with this program; if not, write to the Free Software
;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
EXTSYM Clear2xSaIBuffer
%ifdef __WIN32__ %ifdef __WIN32__
EXTSYM CheckPriority EXTSYM CheckPriority
EXTSYM CheckAlwaysOnTop EXTSYM CheckAlwaysOnTop
@@ -1304,6 +1305,22 @@ GUIWinClicked:
%endif %endif
%endmacro %endmacro
%macro GUIClickCButtonI 3
cmp eax,%1+1
jl %%noclick
cmp edx,%2+3
jl %%noclick
cmp eax,%1+6
jg %%noclick
cmp edx,%2+8
jg %%noclick
xor %3,1
cmp byte[En2xSaI],1
jnae %%noclick
call Clear2xSaIBuffer
%%noclick
%endmacro
%macro GUISlidebarPostImpl 13 ; x1,y1,x2,y2,upjump,downjump,holdpos,scsize,view,cur,listsize %macro GUISlidebarPostImpl 13 ; x1,y1,x2,y2,upjump,downjump,holdpos,scsize,view,cur,listsize
cmp dword[%11],0 cmp dword[%11],0
je near %%nolower je near %%nolower
@@ -2692,7 +2709,7 @@ DisplayGUIOptnsClick:
GUIClickCButton 124,33,byte[MouseWheel] GUIClickCButton 124,33,byte[MouseWheel]
GUIClickCButton 124,53,byte[TrapMouseCursor] GUIClickCButton 124,53,byte[TrapMouseCursor]
%endif %endif
GUIClickCButton 124,43,byte[FilteredGUI] GUIClickCButtonI 124,43,byte[FilteredGUI]
GUIPButtonHole 48,108,byte[CurPalSelect],0 GUIPButtonHole 48,108,byte[CurPalSelect],0
GUIPButtonHole 88,108,byte[CurPalSelect],1 GUIPButtonHole 88,108,byte[CurPalSelect],1
GUIPButtonHole 135,108,byte[CurPalSelect],2 GUIPButtonHole 135,108,byte[CurPalSelect],2