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

Removed the "Use joystick port 209h" from the GUI. Windows people may want to get rid of this too

Browse Source
This commit is contained in:
teuf
2001-04-28 18:03:38 +00:00
parent 3155406147
commit bd1a1d8ab3
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zsnes/src/gui/guimisc.inc
View File

@@ -256,8 +256,10 @@ CalibrateDev1:
mov ebx,[GUIInputRefP+eax*4] mov ebx,[GUIInputRefP+eax*4]
mov bl,[ebx] mov bl,[ebx]
mov byte[GUICBHold],0 mov byte[GUICBHold],0
%ifndef __LINUX__
cmp byte[pl1p209+eax],0 cmp byte[pl1p209+eax],0
jne near .port209 jne near .port209
%endif
cmp bl,1 cmp bl,1
jbe .nojoy jbe .nojoy
cmp bl,18 cmp bl,18

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

@@ -1971,10 +1971,11 @@ DisplayGUIInputClick:
DGOptnsProcBoxb 165,145,[edi+4] DGOptnsProcBoxb 165,145,[edi+4]
DGOptnsProcBoxb 125,135,[edi+8] DGOptnsProcBoxb 125,135,[edi+8]
DGOptnsProcBoxb 125,145,[edi+12] DGOptnsProcBoxb 125,145,[edi+12]
%ifndef __LINUX__
xor ebx,ebx xor ebx,ebx
mov bl,[cplayernum] mov bl,[cplayernum]
GUIClickCButtonID 5,162,byte[pl1p209+ebx] GUIClickCButtonID 5,162,byte[pl1p209+ebx]
%endif
ret ret

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

@@ -1017,7 +1017,9 @@ DisplayGUIInput:
GUIOuttextwin2 3,76,132,GUIInputTextA GUIOuttextwin2 3,76,132,GUIInputTextA
GUIOuttextwin2 3,76,142,GUIInputTextB GUIOuttextwin2 3,76,142,GUIInputTextB
GUIOuttextwin2 3,76,152,GUIInputTextC GUIOuttextwin2 3,76,152,GUIInputTextC
%ifndef __LINUX__
GUIOuttextwin2 3,20,167,GUIInputTextW GUIOuttextwin2 3,20,167,GUIInputTextW
%endif
GUIOuttextwin2 3,156,102,GUIInputText7 GUIOuttextwin2 3,156,102,GUIInputText7
GUIOuttextwin2 3,156,112,GUIInputText8 GUIOuttextwin2 3,156,112,GUIInputText8
GUIOuttextwin2 3,116,102,GUIInputText9 GUIOuttextwin2 3,116,102,GUIInputText9
@@ -1039,7 +1041,9 @@ DisplayGUIInput:
GUIOuttextwin2 3,75,131,GUIInputTextA GUIOuttextwin2 3,75,131,GUIInputTextA
GUIOuttextwin2 3,75,141,GUIInputTextB GUIOuttextwin2 3,75,141,GUIInputTextB
GUIOuttextwin2 3,75,151,GUIInputTextC GUIOuttextwin2 3,75,151,GUIInputTextC
GUIOuttextwin2 3,19,166,GUIInputTextW %ifndef __LINUX__
GUIOuttextwin2 3,20,167,GUIInputTextW
%endif
GUIOuttextwin2 3,155,101,GUIInputText7 GUIOuttextwin2 3,155,101,GUIInputText7
GUIOuttextwin2 3,155,111,GUIInputText8 GUIOuttextwin2 3,155,111,GUIInputText8
GUIOuttextwin2 3,115,101,GUIInputText9 GUIOuttextwin2 3,115,101,GUIInputText9
@@ -1048,6 +1052,7 @@ DisplayGUIInput:
GUIOuttextwin2 3,152,146,GUIInputTexte GUIOuttextwin2 3,152,146,GUIInputTexte
GUIOuttextwin2 3,112,136,GUIInputTextf GUIOuttextwin2 3,112,136,GUIInputTextf
GUIOuttextwin2 3,112,146,GUIInputTextg GUIOuttextwin2 3,112,146,GUIInputTextg
%ifndef __LINUX__
mov dword[GUITemp],GUIIconDataCheckBoxUC mov dword[GUITemp],GUIIconDataCheckBoxUC
xor eax,eax xor eax,eax
mov al,[cplayernum] mov al,[cplayernum]
@@ -1056,6 +1061,7 @@ DisplayGUIInput:
mov dword[GUITemp],GUIIconDataCheckBoxC mov dword[GUITemp],GUIIconDataCheckBoxC
.nocheckbox2 .nocheckbox2
GUIDisplayIconWin 3,5,162,[GUITemp] GUIDisplayIconWin 3,5,162,[GUITemp]
%endif
DrawGUIButton 3,125,34,155,45,GUIInputTextV,14,0,0 DrawGUIButton 3,125,34,155,45,GUIInputTextV,14,0,0
cmp byte[OSPort],3 cmp byte[OSPort],3
je near .win32 je near .win32