Removed every last trace of OSPort.

2005-01-03 16:22:16 +00:00
parent a7598101d8
commit 111cc06bf1
17 changed files with 0 additions and 192 deletions
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -3334,11 +3334,6 @@ GUITryMenuItem:
    jne .noreset
    mov byte[GUICResetPos],1
 .noreset
-;    cmp byte[OSPort],3
-;    je .win32state
-;    cmp byte[CNetType],20
-;    je near .noromloaded
-;.win32state
    cmp byte[CNetType],21
    je near .noromloaded
    cmp byte[CNetType],22
@@ -3440,8 +3435,6 @@ GUITryMenuItem:
 .nocheat
    cmp byte[GUIcmenupos],5
    jne near .nonet
-;    cmp byte[GOSPort],3
-;    je near .win32
 %ifdef __MSDOS__
    cmp byte[CNetType],10
    jae .nomod
@@ -3894,8 +3887,6 @@ DisplayMenu:
    GUIBox 0,14,229,14,70
    GUIBox 0,15,229,15,71

-;    cmp byte[OSPort],3
-;    jne near .notwinpressa
    %ifdef __LINUX__
    GUIShadow 238,9,247,20
    GUIShadow 249,9,257,20
@@ -3907,9 +3898,6 @@ DisplayMenu:
    %endif
 .notwinpressa

-;    cmp byte[OSPort],3
-;    jne near .notwinpressb
-
    %ifdef __LINUX__
    mov byte[GUIMenuItem+36],247
    GUIDMHelpB 233,242,GUIMenuItem+36,1
@@ -3967,8 +3955,6 @@ DisplayMenu:
 .nomenu4
    cmp byte[GUIcmenupos],5
    jne near .nomenu5
-;    cmp byte[GOSPort],3
-;    je near .menu5b
 %ifdef __MSDOS__
    GUIDrawMenuM 140,16,10,2,GUINetPlayMenuData,142,145,22,39,48 ;19+2*10
    mov dword[GUICYLocPtr],MenuDat5
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -187,8 +187,6 @@ GUIgetcurrentinput:
    GUIqcheckkeys 1
    GUIqcheckkeys 1Ch

-;    cmp byte[OSPort],3
-;    jne near .notwinport
 %ifndef __MSDOS__
    GUIqcheckkeys 0C8h
    GUIqcheckkeys 0D0h
@@ -257,9 +255,6 @@ GUIgetcurrentinput:
    mov al,cl
 .notextkb

-;    cmp byte[OSPort],3
-;    jne near .notwinport2
-
 %ifdef __LINUX__
    GUIgetprkeys 90,90 ; UP
    GUIgetprkeys 96,96 ; DOWN
@@ -358,8 +353,6 @@ GUIgetcurrentinput:
 .yesnet15
    mov byte[CNetType],0
 %ifdef __MSDOS__
-;    cmp byte[OSPort],1
-;    je .nodeinitipx
    call deinitipx
 .nodeinitipx
 %endif
--- a/zsnes/src/gui/guiload.inc
+++ b/zsnes/src/gui/guiload.inc
@@ -529,11 +529,8 @@ GetNormalEntries2:
    GUIGetEntry2 GUIfindEUR
    GUIGetEntry2 GUIfindJAP
    GUIGetEntry2 GUIfindBIN
-;    cmp byte[OSPort],1
-;    je near .noasm
    GUIGetEntry2 GUIfindZIP
    GUIGetEntry2 GUIfindJMA
-;.noasm
    GUIGetEntry2 GUIfind1
    jmp .guiNext
 .guishowall
@@ -560,10 +557,7 @@ GetNormalEntries:
    GUIGetEntry GUIfindEUR
    GUIGetEntry GUIfindJAP
    GUIGetEntry GUIfindBIN
-;    cmp byte[OSPort],1
-;    je near .noasm
    GUIGetEntry GUIfindZIP
-;.noasm
    GUIGetEntry GUIfind1
    jmp .guiNext
 .guishowall
@@ -1093,8 +1087,6 @@ GetLoadData:
    mov dword[GUIcurrentdircursloc],0
    mov edi,spcRamcmp
    mov byte[Win95Failed],0
-;    cmp byte[OSPort],1
-;    ja .notdos
 %ifdef __MSDOS__
    cmp byte[GUIloadfntype],2
    jne .nowin95lfn
@@ -1103,7 +1095,6 @@ GetLoadData:
    int 21h
    jc .nowin95lfn
 %endif
-;.notdos
    mov byte[GUIloadfntype],0
 .nowin95lfn
    cmp byte[GUIloadfntype],2
--- a/zsnes/src/gui/guimisc.inc
+++ b/zsnes/src/gui/guimisc.inc
@@ -440,8 +440,6 @@ SetDevice:
    mov byte[GUICBHold],0
    xor eax,eax
    mov al,[cplayernum]
-;    cmp byte[OSPort],1
-;    ja .notdos
 %ifdef __MSDOS__
    cmp byte[pl1p209+eax],0
    jne .port209
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -305,8 +305,6 @@ ProcessMouseButtons:
    jmp .noclick
 .noclicked

-;    cmp byte[OSPort],3
-;    jne .noclick
 %ifdef __MSDOS__
    jmp .noclick
 %else
@@ -463,8 +461,6 @@ ProcessMouseButtons:
    mov byte[GUIpclicked],0
    mov byte[GUIHold],0

-;    cmp byte[OSPort],3
-;    jne .notwinpressa

 %ifdef __LINUX__
    cmp byte[GUIcwinpress],1
@@ -500,8 +496,6 @@ ProcessMouseButtons:

 .notwinpressa

-;    cmp byte[OSPort],3
-;    jne .notwinpressb
 %ifndef __MSDOS__
    cmp byte[GUIcwinpress],2
    jne .notwinpressb
@@ -518,8 +512,6 @@ ProcessMouseButtons:
    ret
 .notwinpressb

-    ;cmp byte[OSPort],3
-    ;jne .notwinpressc
    cmp byte[GUIcwinpress],3
    jne .notwinpressc
    mov byte[GUIcwinpress],0
@@ -793,8 +785,6 @@ ProcessMouseButtons:

 GUIProcVideo:
    mov al,[GUIcurrentvideocursloc]
-;    cmp byte[OSPort],2
-;    jae .yes16b
 %ifdef __MSDOS__
    cmp al,3
    je .yes16b
@@ -1281,8 +1271,6 @@ GUIWinClicked:
 %ifdef __MSDOS__
    cmp byte[En2xSaI],0
    jne %%nomodeq
-;    cmp byte[OSPort],2
-;    jae %%nomodeq
    cmp byte[cvidmode],2
    jne %%nomodeq
    jmp %%refresh
@@ -2054,8 +2042,6 @@ DisplayGUIMovieClick:
    cmp ebx,3Bh
    je %%cancelkey
    mov %3,ebx
-;    cmp byte[OSPort],3
-;    jne %%notwin32
 %ifndef __MSDOS__
    cmp dword[keycontrolval],0
    je %%notwin32
@@ -2159,12 +2145,9 @@ DisplayGUIInputClick:
    ;x,y,x2,y2,currentwin,vpos,#entries,starty,y/entry,cpos,winval,win#,dclicktick#
    GUIWinControl 5,36,107,34+5*8,GUIBlankVar,GUIcurrentinputviewloc,GUINumValue,35,8,GUIcurrentinputcursloc,4,3,0
    GUIPHoldbutton 125,34,155,45,14
-;    cmp byte[OSPort],3
-;    je near .win32
 %ifdef __MSDOS__
    GUIPHoldbutton 125,50,185,61,15
 %endif
-;.win32
    GUIPHoldbutton 125,66,185,77,40
    mov edi,pl1selk
    mov dword[keycontrolval],pl1contrl
@@ -2459,10 +2442,7 @@ DisplayGUISoundClick:
 %endif
 ;    GUIClickCButton 11,101,byte[SoundNoiseDis]
    GUIClickCButton 11,111,byte[RevStereo]
-;    cmp byte[OSPort],3
-;    je near .win32sound
    GUIClickCButton 11,121,byte[Surround]
-;.win32sound
    GUIClickCButton 11,131,byte[SoundBufEn]
    GUIClickCButton 11,141,byte[SPCDisable]
    GUIClickCButton5 11,163,byte[SoundInterpType],1
@@ -2840,12 +2820,9 @@ DisplayGameOptnsClick:
    DGOptnsProcBox 178,76,[KeyFRateUp]
    DGOptnsProcBox 178,84,[KeyFRateDown]
    DGOptnsProcBox 178,92,[KeyDisplayFPS]
-;    cmp byte[OSPort],3
-;    jne near .notwin32
 %ifndef __MSDOS__
    DGOptnsProcBox 178,44,[KeyRewind]
 %endif
-;.notwin32
    DGOptnsProcBox 178,52,[KeyFastFrwrd]
    DGOptnsProcBox 27,112,[KeyDisableSC0]
    DGOptnsProcBox 27+45,112,[KeyDisableSC1]
@@ -3037,12 +3014,9 @@ DisplayGUIOptnsClick:
    ret

 DisplayGUIAboutClick:
-;    cmp byte[OSPort],3
-;    jne near .nowin32
 %ifndef __MSDOS__
    GUIPHoldbutton 90,50,175,60,65
 %endif
-;.nowin32
    ret

 %macro ComboBoxProc 5
--- a/zsnes/src/gui/guinetpl.inc
+++ b/zsnes/src/gui/guinetpl.inc
@@ -259,8 +259,6 @@ SECTION .text
    pop es
    call .writehex
    ; ipx
-;    cmp byte[OSPort],1
-;    je .noinitipx
    call initipx
 .noinitipx
    cmp ax,0
@@ -282,8 +280,6 @@ SECTION .text
    cmp dword[ModemPTimer],0
    jne .nolookforconnect
    mov dword[ModemPTimer],36
-;    cmp byte[OSPort],1
-;    je .noipxlook
    call ipxlookforconnect
 .noipxlook
    cmp byte[IPXSearchval],0
--- a/zsnes/src/gui/guitools.inc
+++ b/zsnes/src/gui/guitools.inc
@@ -430,8 +430,6 @@ GUIOutputStringwinl:
    mov ecx,[cloadmaxlen]
 .more
    mov al,[edi]
-;    cmp byte[OSPort],1
-;    jbe .noperc
 %ifndef __MSDOS__
    cmp al,'%'
    jne .noperc
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -434,14 +434,11 @@ DisplayGUILoad:
    mov byte[GUItextcolor],211
 .zero
    sub byte[GUItextcolor],15
-;    cmp byte[OSPort],2
-;    jae near .noloadtypeb
 %ifdef __MSDOS__
    GUIOuttextwin2 1,21,166,GUILoadText3
    GUIOuttextwin2 1,21,174,GUILoadText4
    GUIOuttextwin2 1,21,182,GUILoadText5
 %endif
-.noloadtypeb
    GUIOuttextwin2 1,21,192,GUILoadText6
    GUIOuttextwin2 1,6,16,GUILoadText7
    GUIOuttextwin2 1,161,16,GUILoadText8
@@ -456,8 +453,6 @@ DisplayGUILoad:
    mov dword[cloadmaxlen],39
    cmp dword[GUIcurrentfilewin],0
    jne .nofiles
-;    cmp byte[OSPort],2
-;    jb .nofiles
 %ifndef __MSDOS__
    mov eax,[GUIcurrentcursloc]
    mov eax,[spcRamcmp+eax*4]
@@ -466,16 +461,12 @@ DisplayGUILoad:
    GUIOuttextwin2l 1,6,158,[cloadnpos]
 %endif
 .nofiles
-
    add byte[GUItextcolor],15
-;    cmp byte[OSPort],2
-;    jae near .noloadtypec
 %ifdef __MSDOS__
    GUIOuttextwin2 1,20,165,GUILoadText3
    GUIOuttextwin2 1,20,173,GUILoadText4
    GUIOuttextwin2 1,20,181,GUILoadText5
 %endif
-.noloadtypec
    GUIOuttextwin2 1,20,191,GUILoadText6
    GUIOuttextwin2 1,5,15,GUILoadText7
    GUIOuttextwin2 1,160,15,GUILoadText8
@@ -490,8 +481,6 @@ DisplayGUILoad:
    mov dword[cloadmaxlen],39
    cmp dword[GUIcurrentfilewin],0
    jne .nofilesb
-;    cmp byte[OSPort],2
-;    jb .nofilesb
 %ifndef __MSDOS__
    mov eax,[GUIcurrentcursloc]
    mov eax,[spcRamcmp+eax*4]
@@ -500,29 +489,20 @@ DisplayGUILoad:
    GUIOuttextwin2l 1,5,157,[cloadnpos]
 %endif
 .nofilesb
-
    DrawGUIButton 1,186,165,228,176,GUILoadText9,1,0,0
    mov al,[GUIWincol]
    mov byte[GUItextcolor],al
-;    GUIOuttextwin2 1,6,16,GUILoadText1
-;    cmp byte[OSPort],2
-;    jae near .noloadtypee
 %ifdef __MSDOS__
    GUIOuttextwin2 1,6,157,GUILoadText2
 %endif
-.noloadtypee
    mov byte[GUItextcolor],163
    cmp byte[GUIWincoladd],0
    je .zero3
    mov byte[GUItextcolor],164
 .zero3
-;    GUIOuttextwin2 1,5,15,GUILoadText1
-;    cmp byte[OSPort],2
-;    jae near .noloadtyped
 %ifdef __MSDOS__
    GUIOuttextwin2 1,5,156,GUILoadText2
 %endif
-.noloadtyped
    DrawGUIWinBox 1,5,25,144,134,167    ; 126 = 6 * 21, 112 = 7 * 16
    DrawGUIWinBox 1,160,25,228,134,167  ; 78 =  6 * 13
    DrawGUIWinBox 1,5,145,228,152,167    ; 126 = 6 * 21, 112 = 7 * 16
@@ -684,14 +664,11 @@ DisplayGUILoad:
    mov bl,[GUILoadPos]
    mov byte[GUILoadTextA+ebx],0

-;    cmp byte[OSPort],2
-;    jae near .noloadtype
 %ifdef __MSDOS__
    GUIDisplayButtonHole 1,9,163,byte[GUIloadfntype],0
    GUIDisplayButtonHole 1,9,171,byte[GUIloadfntype],1
    GUIDisplayButtonHole 1,9,179,byte[GUIloadfntype],2
 %endif
-.noloadtype
    mov dword[GUITemp],GUIIconDataCheckBoxUC
    cmp byte[showallext],1
    jne .noshowallext
@@ -1126,12 +1103,9 @@ DisplayGUIInput:
    GUIDisplayIconWin 3,5,162,[GUITemp]
 %endif
    DrawGUIButton 3,125,34,155,45,GUIInputTextV,14,0,0
-;    cmp byte[OSPort],3
-;    je near .win32
 %ifdef __MSDOS__
    DrawGUIButton 3,125,50,185,61,GUIInputTexta,15,0,0
 %endif
-.win32
    DrawGUIButton 3,125,66,179,77,GUIInputTexta2,15,0,0
    mov al,[GUIWincol]
    mov byte[GUItextcolor],al
@@ -1670,15 +1644,12 @@ DisplayGUIVideo:
 .zero
    sub byte[GUItextcolor],15

-;    cmp byte[OSPort],3
-;    jne near .nowin32pt2
 %ifndef __MSDOS__
    GUIOuttextwin2 5,12,76,GUIVideoTextw0
    GUIOuttextwin2 5,12,83,GUIVideoTextw1
    GUIOuttextwin2 5,12,90,GUIVideoTextw2
    GUIOuttextwin2 5,12,97,GUIVideoTextw3
 %endif
-;.nowin32pt2

    xor eax,eax
    mov al,[cvidmode]
@@ -1796,15 +1767,12 @@ DisplayGUIVideo:
 %endif
    add byte[GUItextcolor],15

-;    cmp byte[OSPort],3
-;    jne near .nowin32pt
 %ifndef __MSDOS__
    GUIOuttextwin2 5,11,75,GUIVideoTextw0
    GUIOuttextwin2 5,11,82,GUIVideoTextw1
    GUIOuttextwin2 5,11,89,GUIVideoTextw2
    GUIOuttextwin2 5,11,96,GUIVideoTextw3
 %endif
-;.nowin32pt
    xor eax,eax
    mov al,[cvidmode]
    cmp byte[GUISLVID+eax],0
@@ -2274,19 +2242,12 @@ DisplayGUISound:
    ; R = Sample Rate
    GUIOuttextwin2u 6,26,26,GUISoundText1,0
    GUIOuttextwin2u 6,26,35,GUISoundText3,0
-;    cmp byte[OSPort],3
-;    je near .win32b
 %ifdef __MSDOS__
    GUIOuttextwin2u 6,116,26,GUISoundText1b,0
    GUIOuttextwin2u 6,26,44,GUISoundText2b,1
 %endif
-;.win32b
-;    GUIOuttextwin2u 6,26,106,GUISoundText4,8
    GUIOuttextwin2u 6,26,116,GUISoundTextH,2
-;    cmp byte[OSPort],3
-;    je near .win32s2
    GUIOuttextwin2u 6,26,126,GUISoundTextI,1
-;.win32s2
    GUIOuttextwin2u 6,26,136,GUISoundTextJ,6
    GUIOuttextwin2u 6,26,146,GUISoundTextK,0
    GUIOuttextwin2u 6,26,168,GUISoundTextQ,0
@@ -2302,19 +2263,12 @@ DisplayGUISound:
    add byte[GUItextcolor],15
    GUIOuttextwin2 6,25,25,GUISoundText1
    GUIOuttextwin2 6,25,34,GUISoundText3
-;    cmp byte[OSPort],3
-;    je near .win32c
 %ifdef __MSDOS__
    GUIOuttextwin2 6,115,25,GUISoundText1b
    GUIOuttextwin2 6,25,43,GUISoundText2b
 %endif
-;.win32c
-;    GUIOuttextwin2 6,25,105,GUISoundText4
    GUIOuttextwin2 6,25,115,GUISoundTextH
-;    cmp byte[OSPort],3
-;    je near .win32s
    GUIOuttextwin2 6,25,125,GUISoundTextI
-;.win32s
    GUIOuttextwin2 6,25,135,GUISoundTextJ
    GUIOuttextwin2 6,25,145,GUISoundTextK
    GUIOuttextwin2 6,25,167,GUISoundTextQ
@@ -2370,25 +2324,14 @@ DisplayGUISound:
    je .nocheckbox1b
    mov dword[GUITemp],GUIIconDataCheckBoxC
 .nocheckbox1b
-;    cmp byte[OSPort],3
-;    je near .win32
    GUIDisplayIconWin 6,11,39,[GUITemp]
 %endif
-;.win32
-;    mov dword[GUITemp],GUIIconDataCheckBoxUC
-;    cmp byte[SoundNoiseDis],0
-;    je .nocheckbox2
-;    mov dword[GUITemp],GUIIconDataCheckBoxC
-;.nocheckbox2
-;    GUIDisplayIconWin 6,11,101,[GUITemp]
    mov dword[GUITemp],GUIIconDataCheckBoxUC
    cmp byte[RevStereo],0
    je .nocheckbox3
    mov dword[GUITemp],GUIIconDataCheckBoxC
 .nocheckbox3
    GUIDisplayIconWin 6,11,111,[GUITemp]
-;    cmp byte[OSPort],3
-;    je near .nocheckbox42
    mov dword[GUITemp],GUIIconDataCheckBoxUC
    cmp byte[Surround],0
    je .nocheckbox4
@@ -4609,12 +4552,9 @@ DisplayGameOptns:
    GUIOuttextwin2 9,9,78,GUIGameOptnsTextF
    GUIOuttextwin2 9,9,86,GUIGameOptnsTextG
    GUIOuttextwin2 9,9,94,GUIGameOptnsTextT
-;    cmp byte[OSPort],3
-;    jne near .notwin32
 %ifndef __MSDOS__
    GUIOuttextwin2 9,109,46,GUIGameOptnsTextS
 %endif
-;.notwin32
    GUIOuttextwin2 9,109,54,GUIGameOptnsTextH
    GUIOuttextwin2 9,109,62,GUIGameOptnsTextM
    GUIOuttextwin2 9,109,70,GUIGameOptnsTextN
@@ -4718,12 +4658,9 @@ DisplayGameOptns:
    GUIOuttextwin2 9,8,77,GUIGameOptnsTextF
    GUIOuttextwin2 9,8,85,GUIGameOptnsTextG
    GUIOuttextwin2 9,8,93,GUIGameOptnsTextT
-;    cmp byte[OSPort],3
-;    jne near .notwin32b
 %ifndef __MSDOS__
    GUIOuttextwin2 9,108,45,GUIGameOptnsTextS
 %endif
-;.notwin32b
    GUIOuttextwin2 9,108,53,GUIGameOptnsTextH
    GUIOuttextwin2 9,108,61,GUIGameOptnsTextM
    GUIOuttextwin2 9,108,69,GUIGameOptnsTextN
@@ -4807,12 +4744,9 @@ DisplayGameOptns:
    DGOptnsDrawBox 78,76,[KeyWinDisble]
    DGOptnsDrawBox 78,84,[KeyOffsetMSw]
    DGOptnsDrawBox 78,92,[KeySlowDown]
-;    cmp byte[OSPort],3
-;    jne near .notwin32c
 %ifndef __MSDOS__
    DGOptnsDrawBox 178,44,[KeyRewind]
 %endif
-;.notwin32c
    DGOptnsDrawBox 178,52,[KeyFastFrwrd]
    DGOptnsDrawBox 178,60,[KeyVolUp]
    DGOptnsDrawBox 178,68,[KeyVolDown]