From ffdca88c08e5f1d2b2619c7bbbcb978b297a9b1f Mon Sep 17 00:00:00 2001 From: pagefault <> Date: Mon, 29 Oct 2001 19:26:20 +0000 Subject: [PATCH] Code updates --- zsnes/src/gui/guikeys.inc | 4 ++++ zsnes/src/gui/guimouse.inc | 4 ++++ zsnes/src/gui/guiwindp.inc | 12 ++++++++++++ zsnes/src/win/winlink.cpp | 1 - 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index 24964cf8..80ebb931 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -1253,12 +1253,14 @@ GUISoundKeys: jne .nocubicinterp GUIkeystoggleoptn byte[SoundInterpType],2 .nocubicinterp +%ifndef __MSDOS__ cmp dh,'8' jne .no8ptinterp cmp byte[MMXSupport],0 je .no8ptinterp GUIkeystoggleoptn byte[SoundInterpType],3 .no8ptinterp +%endif cmp dh,'I' jne .nosimplefilter GUIkeystoggleoptn byte[LowPassFilterType],1 @@ -1267,12 +1269,14 @@ GUISoundKeys: jne .nodynamicfilter GUIkeystoggleoptn byte[LowPassFilterType],2 .nodynamicfilter +%ifndef __MSDOS__ cmp dh,'H' jne .nohiqualityfilter cmp byte[MMXSupport],0 je .nohiqualityfilter GUIkeystoggleoptn byte[LowPassFilterType],3 .nohiqualityfilter +%endif ret .sampratenext db 1,4,5,6,2,3,0,0,0,0 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 91968a88..8e13d7a8 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2360,10 +2360,14 @@ DisplayGUISoundClick: GUIClickCButton 11,141,byte[SPCDisable] GUIClickCButton5 11,163,byte[SoundInterpType],1 GUIClickCButton5 11,173,byte[SoundInterpType],2 +%ifndef __MSDOS__ GUIClickCButton5MMX 11,183,byte[SoundInterpType],3 +%endif GUIClickCButton5 111,163,byte[LowPassFilterType],1 GUIClickCButton5 111,173,byte[LowPassFilterType],2 +%ifndef __MSDOS__ GUIClickCButton5MMX 111,183,byte[LowPassFilterType],3 +%endif cmp eax,15 jl near .nosrate cmp edx,61 diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 8a3455da..acc05bdf 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -2183,10 +2183,14 @@ DisplayGUISound: GUIOuttextwin2u 6,26,146,GUISoundTextK,0 GUIOuttextwin2u 6,26,168,GUISoundTextQ,0 GUIOuttextwin2u 6,26,178,GUISoundTextR,0 +%ifndef __MSDOS__ GUIOuttextwin2u 6,26,188,GUISoundTextS,0 +%endif GUIOuttextwin2u 6,126,168,GUISoundTextU,1 GUIOuttextwin2u 6,126,178,GUISoundTextV,1 +%ifndef __MSDOS__ GUIOuttextwin2u 6,126,188,GUISoundTextW,0 +%endif add byte[GUItextcolor],15 GUIOuttextwin2 6,25,25,GUISoundText1 GUIOuttextwin2 6,25,34,GUISoundText3 @@ -2206,10 +2210,14 @@ DisplayGUISound: GUIOuttextwin2 6,25,145,GUISoundTextK GUIOuttextwin2 6,25,167,GUISoundTextQ GUIOuttextwin2 6,25,177,GUISoundTextR +%ifndef __MSDOS__ GUIOuttextwin2 6,25,187,GUISoundTextS +%endif GUIOuttextwin2 6,125,167,GUISoundTextU GUIOuttextwin2 6,125,177,GUISoundTextV +%ifndef __MSDOS__ GUIOuttextwin2 6,125,187,GUISoundTextW +%endif mov al,[GUIWincol] mov byte[GUItextcolor],al GUIOuttextwin2 6,6,16,GUISoundText6 @@ -2294,12 +2302,14 @@ DisplayGUISound: mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox8 GUIDisplayIconWin 6,11,173,[GUITemp] +%ifndef __MSDOS__ mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[SoundInterpType],3 jne .nocheckbox9 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox9 GUIDisplayIconWin 6,11,183,[GUITemp] +%endif mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[LowPassFilterType],1 jne .nocheckbox10 @@ -2312,12 +2322,14 @@ DisplayGUISound: mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox11 GUIDisplayIconWin 6,111,173,[GUITemp] +%ifndef __MSDOS__ mov dword[GUITemp],GUIIconDataCheckBoxUC cmp byte[LowPassFilterType],3 jne .nocheckbox12 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox12 GUIDisplayIconWin 6,111,183,[GUITemp] +%endif DrawGUIWinBox 6,15,61,69,69,167 mov dword[GUITemp],GUISoundText7 xor eax,eax diff --git a/zsnes/src/win/winlink.cpp b/zsnes/src/win/winlink.cpp index 9681564c..79c98bd4 100644 --- a/zsnes/src/win/winlink.cpp +++ b/zsnes/src/win/winlink.cpp @@ -1972,7 +1972,6 @@ extern DWORD AddEndBytes; extern DWORD NumBytesPerLine; extern unsigned char * WinVidMemStart; extern void copy640x480x16bwin(void); -extern unsigned char MMXSupport; extern unsigned char NGNoTransp; extern unsigned char newengen;