diff --git a/zsnes/src/gui/guimisc.inc b/zsnes/src/gui/guimisc.inc index a94f840f..6bd4fc59 100644 --- a/zsnes/src/gui/guimisc.inc +++ b/zsnes/src/gui/guimisc.inc @@ -256,8 +256,10 @@ CalibrateDev1: mov ebx,[GUIInputRefP+eax*4] mov bl,[ebx] mov byte[GUICBHold],0 +%ifndef __LINUX__ cmp byte[pl1p209+eax],0 jne near .port209 +%endif cmp bl,1 jbe .nojoy cmp bl,18 diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 0f0ac7f8..55700493 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -1971,10 +1971,11 @@ DisplayGUIInputClick: DGOptnsProcBoxb 165,145,[edi+4] DGOptnsProcBoxb 125,135,[edi+8] DGOptnsProcBoxb 125,145,[edi+12] - +%ifndef __LINUX__ xor ebx,ebx mov bl,[cplayernum] GUIClickCButtonID 5,162,byte[pl1p209+ebx] +%endif ret diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 0536eff0..262a651a 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1017,7 +1017,9 @@ DisplayGUIInput: GUIOuttextwin2 3,76,132,GUIInputTextA GUIOuttextwin2 3,76,142,GUIInputTextB GUIOuttextwin2 3,76,152,GUIInputTextC +%ifndef __LINUX__ GUIOuttextwin2 3,20,167,GUIInputTextW +%endif GUIOuttextwin2 3,156,102,GUIInputText7 GUIOuttextwin2 3,156,112,GUIInputText8 GUIOuttextwin2 3,116,102,GUIInputText9 @@ -1039,7 +1041,9 @@ DisplayGUIInput: GUIOuttextwin2 3,75,131,GUIInputTextA GUIOuttextwin2 3,75,141,GUIInputTextB 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,111,GUIInputText8 GUIOuttextwin2 3,115,101,GUIInputText9 @@ -1048,6 +1052,7 @@ DisplayGUIInput: GUIOuttextwin2 3,152,146,GUIInputTexte GUIOuttextwin2 3,112,136,GUIInputTextf GUIOuttextwin2 3,112,146,GUIInputTextg +%ifndef __LINUX__ mov dword[GUITemp],GUIIconDataCheckBoxUC xor eax,eax mov al,[cplayernum] @@ -1056,6 +1061,7 @@ DisplayGUIInput: mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox2 GUIDisplayIconWin 3,5,162,[GUITemp] +%endif DrawGUIButton 3,125,34,155,45,GUIInputTextV,14,0,0 cmp byte[OSPort],3 je near .win32