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

Changed overlay support to ifdef

Browse Source
This commit is contained in:
pagefault
2001-06-16 01:06:03 +00:00
parent 0b59ad2fa0
commit dc160a5bb9
5 changed files with 89 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zsnes/src/gui/gui.asm
View File

@@ -176,7 +176,6 @@ EXTSYM numlockptr
%ifdef __WIN32__
EXTSYM CheckPriority
EXTSYM CheckAlwaysOnTop
EXTSYM initDirectDraw
%endif
NEWSYM GuiAsmStart
@@ -586,8 +585,6 @@ NEWSYM TripleBufferWin, db 0
NEWSYM ExclusiveSound, db 0
NEWSYM OverlayEnabled, db 0
GUIsave equ $-GUIRAdd
NEWSYM CombinDataGlob, times 3300 db 0 ; 20-name, 42-combo, 2-key#, 1-P#, 1-ff
@@ -605,9 +602,9 @@ ModemOKStat db 0 ; OK is detected on modem status
; LOAD STAT INPT OPT VID SND CHT NET GMKEY GUIOP ABT RSET SRC STCN MOVE CMBO ADDO
GUIwinposxo dd 0,5 ,60 ,30 ,55 ,50 ,65 ,5 ,30 ,20 ,10 ,80 ,65 ,20 ,70 ,50 ,3 ,50
GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,22 ,20 ,30 ,20 ,20 ,50 ,60 ,30 ,65 ,50 ,22 ,60
GUIwinposyo dd 0,20 ,70 ,30 ,20 ,20 ,26 ,20 ,30 ,20 ,20 ,50 ,60 ,30 ,65 ,50 ,22 ,60
GUIwinsizex dd 0,244 ,126 ,189 ,167 ,170 ,148 ,244 ,8*16,13*16,240 ,7*16,9*16,8*16,9*16,140 ,250 ,160
GUIwinsizey dd 0,190 ,3*16,166 ,190 ,196 ,184 ,191 ,40 ,189 ,192 ,98 ,42 ,40 ,42 ,70 ,190 ,60
GUIwinsizey dd 0,190 ,3*16,166 ,190 ,192 ,178 ,191 ,40 ,189 ,192 ,98 ,42 ,40 ,42 ,70 ,190 ,60
GUIwinptr db 0
GUItextcolor db 0,0,0,0,0

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

@@ -818,13 +818,6 @@ GUIOptionKeys:
xor byte[vsyncon],1
mov al,[vsyncon]
mov [cfgvsync],al
%ifdef __WIN32__
cmp byte[OverlayEnabled],1
jne .novsync
pushad
call initDirectDraw
popad
%endif
.novsync
%endif
cmp dh,'M'
@@ -895,14 +888,11 @@ GUIOptionKeys:
jne .nosavepath
xor byte[DontSavePath],1
.nosavepath
cmp dh,'I'
jne .nospcdisable
xor byte[SPCDisable],1
.nospcdisable
%ifdef __WIN32__
cmp dh,'Y'
jne .nooverlay
xor byte[OverlayEnabled],1
pushad
call initDirectDraw
popad
.nooverlay
cmp dh,'S'
jne .noalttimer
xor byte[AlternateTimer],1
@@ -1036,10 +1026,6 @@ GUISoundKeys:
xor byte[ExclusiveSound],1
.noexclusivesound
%endif
cmp dh,'D'
jne .nospcdisable
xor byte[SPCDisable],1
.nospcdisable
ret
.sampratenext db 1,4,5,6,2,3,0,0,0,0

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

@@ -994,24 +994,6 @@ GUIWinClicked:
%%noclick
%endmacro
%ifdef __WIN32__
%macro GUIClickCButtonov 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
pushad
call initDirectDraw
popad
%%noclick
%endmacro
%endif
%macro GUIClickCButtonat 3
cmp eax,%1+1
jl %%noclick
@@ -1151,32 +1133,6 @@ GUIWinClicked:
%%noclick
%endmacro
%ifndef __LINUX__
%macro GUIClickCButton2ov 5
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,%5
mov al,%3
mov %4,al
%ifdef __WIN32__
cmp byte[OverlayEnabled],1
jne %%noinit
pushad
call initDirectDraw
popad
%%noinit
%endif
ret
%%noclick
%endmacro
%endif
%macro GUIClickCButton3 5
cmp eax,%1+1
jl %%noclick
@@ -2144,7 +2100,7 @@ DisplayGUIOptionClick:
GUIClickCButton2 11,36,byte[newengen],byte[cfgnewgfx],1
.invalidng
%ifndef __LINUX__
GUIClickCButton2ov 11,46,byte[vsyncon],byte[cfgvsync],1
GUIClickCButton2 11,46,byte[vsyncon],byte[cfgvsync],1
%endif
GUIClickCButton2 11,56,byte[FPUCopy],byte[cfgcopymethod],2
GUIClickCButtonM 11,66,byte[pl12s34]
@@ -2163,8 +2119,8 @@ DisplayGUIOptionClick:
GUIClickCButton 11,146,byte[LatestSave]
GUIClickCButton 11,156,byte[AutoState]
GUIClickCButton 11,166,byte[DontSavePath]
GUIClickCButton 11,176,byte[SPCDisable]
%ifdef __WIN32__
GUIClickCButtonov 11,176,byte[OverlayEnabled]
GUIClickCButtonat 11,186,byte[AlternateTimer]
%endif
; Frameskip = 0
@@ -2296,7 +2252,6 @@ DisplayGUISoundClick:
%ifdef __WIN32__
GUIClickCButton 11,171,byte[ExclusiveSound]
%endif
GUIClickCButton 11,181,byte[SPCDisable]
cmp eax,15
jl near .nosrate
cmp edx,61

15
zsnes/src/gui/guiwindp.inc
View File

@@ -1374,7 +1374,7 @@ DisplayGUIOption:
GUIOuttextwin2u 4,26,151,GUIOptionTextH,9
GUIOuttextwin2u 4,26,161,GUIOptionTextI,15
GUIOuttextwin2u 4,26,171,GUIOptionTextJ,0
GUIOuttextwin2u 4,26,181,GUIOptionTextK,6
GUIOuttextwin2u 4,26,181,GUIOptionTextK,1
add byte[GUItextcolor],15
GUIOuttextwin2 4,5,15,[GUITemp]
GUIOuttextwin2 4,25,30,GUIOptionText2
@@ -1505,7 +1505,7 @@ DisplayGUIOption:
.nocheckbox13
GUIDisplayIconWin 4,11,166,[GUITemp]
mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[OverlayEnabled],0
cmp byte[SPCDisable],0
je .nocheckbox14
mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheckbox14
@@ -1580,7 +1580,7 @@ GUIOptionTextG db 'OLD GFX MODE 2',0
GUIOptionTextH db 'START AT LATEST SAVE',0
GUIOptionTextI db 'AUTO STATE SAVE/LOAD',0
GUIOptionTextJ db 'DON',39,'T SAVE CURRENT PATH',0
GUIOptionTextK db 'OVERLAY SUPPORT',0
GUIOptionTextK db 'DISABLE SOUND CPU EMU',0
GUIOptionTextL db 'USE ALTERNATE TIMER',0
GUIOptionText8 db '-',0
GUIOptionText9 db '+',0
@@ -2142,7 +2142,6 @@ DisplayGUISound:
GUIOuttextwin2u 6,26,166,GUISoundTextM,0
%ifdef __WIN32__
GUIOuttextwin2u 6,26,176,GUISoundTextN,1
GUIOuttextwin2u 6,26,186,GUISoundTextO,0
%endif
add byte[GUItextcolor],15
GUIOuttextwin2 6,25,25,GUISoundText1
@@ -2170,7 +2169,6 @@ DisplayGUISound:
GUIOuttextwin2 6,25,165,GUISoundTextM
%ifdef __WIN32__
GUIOuttextwin2 6,25,175,GUISoundTextN
GUIOuttextwin2 6,25,185,GUISoundTextO
%endif
mov al,[GUIWincol]
mov byte[GUItextcolor],al
@@ -2270,12 +2268,6 @@ DisplayGUISound:
mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheckbox9
GUIDisplayIconWin 6,11,171,[GUITemp]
mov dword[GUITemp],GUIIconDataCheckBoxUC
cmp byte[OverlayEnabled],0
je .nocheckbox10
mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheckbox10
GUIDisplayIconWin 6,11,181,[GUITemp]
%endif
DrawGUIWinBox 6,15,61,69,69,167
mov dword[GUITemp],GUISoundText7
@@ -2368,7 +2360,6 @@ GUISoundTextK db 'LOW PASS FILTER',0
GUISoundTextL db 'SOUND BUFFERING',0
GUISoundTextM db 'CUBIC SPLINE INTERP',0
GUISoundTextN db 'EXCLUSIVE MODE',0
GUISoundTextO db 'DISABLE SPC EMU',0
DisplayGUICheatConv:
mov eax,[ccheatnpos]