Add HQ2X and HQ4X, also add HQxX support to SDL port

2003-12-05 20:26:37 +00:00
parent 0b40dabe35
commit 9aee713b31
18 changed files with 13101 additions and 212 deletions
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -158,7 +158,9 @@ EXTSYM TCPIPSendPacket,TCPIPSendPacketUDP
 EXTSYM TCPIPDisconnect,TCPIPStatus
 EXTSYM TCPIPStoreByte
 EXTSYM TCPIPGetByte,GUIBIFIL
+EXTSYM GUIHQ2X
 EXTSYM GUIHQ3X
+EXTSYM GUIHQ4X
 EXTSYM firstsaveinc
 EXTSYM nssdip1,nssdip2,nssdip3,nssdip4,nssdip5,nssdip6
 %ifdef __LINUX__
@@ -601,7 +603,7 @@ NEWSYM KeyDisplayFPS, dd 0
 NEWSYM KeyIncStateSlot, dd 0
 NEWSYM KeyDecStateSlot, dd 0
 NEWSYM KeyUsePlayer1234, dd 0
-NEWSYM hq3xFilter, db 0
+NEWSYM hqFilter, db 0
 NEWSYM reserved, db 0
 NEWSYM scale2xFilter, db 0

@@ -1542,7 +1544,7 @@ NEWSYM StartGUI
    jmp .no2xSaIdis
 .2xSaIdis
    mov byte[En2xSaI],0
-    mov byte[hq3xFilter],0
+    mov byte[hqFilter],0
 .no2xSaIdis
    cmp byte[En2xSaI],0
    je .no2xsaidis
@@ -1550,16 +1552,16 @@ NEWSYM StartGUI
 .no2xsaidis
    cmp byte[En2xSaI],0
    je .no2xsaien
-    mov byte[hq3xFilter],0
+    mov byte[hqFilter],0
    mov byte[scanlines],0
    mov byte[antienab],0
 .no2xsaien
-    cmp byte[hq3xFilter],0
-    je .nohq3x
+    cmp byte[hqFilter],0
+    je .nohq
    mov byte[En2xSaI],0
    mov byte[scanlines],0
    mov byte[antienab],0
-.nohq3x
+.nohq
    mov ecx,64
    mov eax,SpecialLine
 .slloop
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -1019,7 +1019,7 @@ GUIVideoKeys:
    jne .nofullscanlines
    cmp byte[En2xSaI],0
    jne .nofullscanlines
-    cmp byte[hq3xFilter],0
+    cmp byte[hqFilter],0
    jne .nofullscanlines
    call ClearScreen
    GUIkeystoggleoptn byte[scanlines],1
@@ -1045,7 +1045,7 @@ GUIVideoKeys:
    jne .nohalfscanlines
    cmp byte[En2xSaI],0
    jne .nohalfscanlines
-    cmp byte[hq3xFilter],0
+    cmp byte[hqFilter],0
    jne .nohalfscanlines
    call ClearScreen
    GUIkeystoggleoptn byte[scanlines],3
@@ -1062,7 +1062,7 @@ GUIVideoKeys:
    jne .noquarterscanlines
    cmp byte[En2xSaI],0
    jne .noquarterscanlines
-    cmp byte[hq3xFilter],0
+    cmp byte[hqFilter],0
    jne .noquarterscanlines
    call ClearScreen
    GUIkeystoggleoptn byte[scanlines],2
@@ -1076,19 +1076,25 @@ GUIVideoKeys:
 %endif
 .noquarterscanlines
    cmp dh,'Q'
-    jne .nohq3xfilter
+    jne .nohqfilter
    xor ebx,ebx
    mov bl,[cvidmode]
+    cmp byte[GUIHQ2X+ebx],0
+    jne .hqfilter
    cmp byte[GUIHQ3X+ebx],0
-    je .nohq3xfilter
-    xor byte[hq3xFilter],1
-    jz .nohq3xfilter
+    jne .hqfilter
+    cmp byte[GUIHQ4X+ebx],0
+    jne .hqfilter
+    jmp .nohqfilter
+.hqfilter
+    xor byte[hqFilter],1
+    jz .nohqfilter
    mov byte[scanlines],0
    mov byte[cfgscanline],0
    mov byte[En2xSaI],0
    mov byte[antienab],0
    mov byte[cfginterp],0
-.nohq3xfilter
+.nohqfilter
    cmp dh,'X'
    jne .no2xsai
    xor ebx,ebx
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -2355,10 +2355,16 @@ DisplayGUIVideoClick:
 %endif
    xor ebx,ebx
    mov bl,[cvidmode]
+    cmp byte[GUIHQ2X+ebx],0
+    jne .checkboxhq
    cmp byte[GUIHQ3X+ebx],0
-    je .nocheckboxhq3x
-    GUIClickCButtonHQ 115,163,byte[hq3xFilter]
-.nocheckboxhq3x
+    jne .checkboxhq
+    cmp byte[GUIHQ4X+ebx],0
+    jne .checkboxhq
+    jmp .nocheckboxhq
+.checkboxhq
+    GUIClickCButtonHQ 115,163,byte[hqFilter]
+.nocheckboxhq
    xor ebx,ebx
    mov bl,[cvidmode]
    cmp byte[GUI2xVID+ebx],0
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -1643,7 +1643,7 @@ DisplayGUIVideo:
    jmp .no2xSaIdis
 .2xSaIdis
    mov byte[En2xSaI],0
-    mov byte[hq3xFilter],0
+    mov byte[hqFilter],0
 .no2xSaIdis
    cmp byte[En2xSaI],0
    je .no2xsaidis
@@ -1651,11 +1651,11 @@ DisplayGUIVideo:
 .no2xsaidis
    cmp byte[En2xSaI],0
    je .no2xsaien
-    mov byte[hq3xFilter],0
+    mov byte[hqFilter],0
    mov byte[scanlines],0
    mov byte[antienab],0
 .no2xsaien
-    cmp byte[hq3xFilter],0
+    cmp byte[hqFilter],0
    je .nohq3xen
    mov byte[En2xSaI],0
    mov byte[scanlines],0
@@ -1772,12 +1772,24 @@ DisplayGUIVideo:
    je near .notext11a
    GUIOuttextwin2u 5,130,158,GUIVideoTextscale2x,1
 .notext11a
+    xor eax,eax
+    mov al,[cvidmode]
+    cmp byte[GUIHQ2X+eax],0
+    je near .notexthq2xa
+    GUIOuttextwin2u 5,130,168,GUIVideoTexthq2x,1
+.notexthq2xa
    xor eax,eax
    mov al,[cvidmode]
    cmp byte[GUIHQ3X+eax],0
-    je near .notext11
+    je near .notexthq3xa
    GUIOuttextwin2u 5,130,168,GUIVideoTexthq3x,1
-.notext11
+.notexthq3xa
+    xor eax,eax
+    mov al,[cvidmode]
+    cmp byte[GUIHQ4X+eax],0
+    je near .notexthq4xa
+    GUIOuttextwin2u 5,130,168,GUIVideoTexthq4x,1
+.notexthq4xa
    GUIOuttextwin2u 5,26,188,GUIVideoText8c,0
 %ifndef __LINUX__
    GUIOuttextwin2u 5,130,188,GUIVideoText9,0
@@ -1885,12 +1897,24 @@ DisplayGUIVideo:
    je near .notext11b
    GUIOuttextwin2 5,129,157,GUIVideoTextscale2x
 .notext11b
+    xor eax,eax
+    mov al,[cvidmode]
+    cmp byte[GUIHQ2X+eax],0
+    je near .notexthq2xb
+    GUIOuttextwin2 5,129,167,GUIVideoTexthq2x
+.notexthq2xb
    xor eax,eax
    mov al,[cvidmode]
    cmp byte[GUIHQ3X+eax],0
-    je near .notext11c
+    je near .notexthq3xb
    GUIOuttextwin2 5,129,167,GUIVideoTexthq3x
-.notext11c
+.notexthq3xb
+    xor eax,eax
+    mov al,[cvidmode]
+    cmp byte[GUIHQ4X+eax],0
+    je near .notexthq4xb
+    GUIOuttextwin2 5,129,167,GUIVideoTexthq4x
+.notexthq4xb
    GUIOuttextwin2 5,25,187,GUIVideoText8c
 %ifndef __LINUX__
    GUIOuttextwin2 5,129,187,GUIVideoText9
@@ -2076,15 +2100,21 @@ DisplayGUIVideo:
 .nocheckbox2scale2x
    xor eax,eax
    mov al,[cvidmode]
+    cmp byte[GUIHQ2X+eax],0
+    jne near .checkboxhq
    cmp byte[GUIHQ3X+eax],0
-    je near .nocheckbox2hq3x
+    jne near .checkboxhq
+    cmp byte[GUIHQ4X+eax],0
+    jne near .checkboxhq
+    jmp .nocheckboxhq
+.checkboxhq
    mov dword[GUITemp],GUIIconDataCheckBoxUC
-    cmp byte[hq3xFilter],0
-    je .nocheckbox1hq3x
+    cmp byte[hqFilter],0
+    je .uncheckedhq
    mov dword[GUITemp],GUIIconDataCheckBoxC
-.nocheckbox1hq3x
+.uncheckedhq
    GUIDisplayIconWin 5,115,163,[GUITemp]
-.nocheckbox2hq3x
+.nocheckboxhq
    DrawGUIWinBox 5,5,26,115,69,167
    DrawSlideBarWin 5,117,34,[GUIcurrentvideoviewloc],[NumVideoModes],5,28,GUIVStA
    cmp byte[GUICHold],5
@@ -2205,7 +2235,9 @@ GUIVideoTextbf db 'BILINEAR FILTER',0
 GUIVideoText3 db 'INTERPOLATION',0      ; -y
 GUIVideoText4 db 'EAGLE ENGINE',0       ; -y
 GUIVideoTextscale2x db 'SCALE2X',0
+GUIVideoTexthq2x db 'HQ2X',0
 GUIVideoTexthq3x db 'HQ3X',0
+GUIVideoTexthq4x db 'HQ4X',0
 GUIVideoText5 db 'FULL SCREEN',0        ; -c
 GUIVideoText5b db 'WIDE SCREEN',0        ; -c
 GUIVideoText6 db 'SMALL SCREEN',0       ; -c
@@ -3764,8 +3796,8 @@ DisplayNetOptns:
    mov dword[GUINetDisp],'INTE'
    mov dword[GUINetDisp+4],'RNET'
    mov byte[GUINetDisp+8],0
-;    cmp byte[NetPlayNoMore],1
-;    jne .notcpip
+    cmp byte[NetPlayNoMore],1
+    jne .notcpip
    mov dword[GUIwinsizex+8*4],201
    mov dword[GUIwinsizey+8*4],48
 .notcpip
@@ -3943,8 +3975,8 @@ DisplayNetOptnsTCPIP:
 .zero
    sub byte[GUItextcolor],15

-;    cmp byte[NetPlayNoMore],1
-;    jne near .tcpip
+    cmp byte[NetPlayNoMore],1
+    jne near .tcpip
    GUIOuttextwin2 8,6,16,GUINetTextr1
    GUIOuttextwin2 8,6,36,GUINetTextr2
    GUIOuttextwin2 8,6,46,GUINetTextr3
@@ -4541,12 +4573,9 @@ GUINetTextm2 db 0,0,0
 GUINetTextn2 db '_',0
 GUINetTexto2 db 'BACK BUFFER',0
 GUINetTextp2 db 'ALLOW UDP CONNECTION',0
-GUINetTextr1 db 'NETPLAY IS DISABLED IN',0
-GUINetTextr2 db 'WIP VERSIONS UNTIL',0
-GUINetTextr3 db 'FURTHER NOTICE',0
-;GUINetTextr1 db 'PLEASE RESTART ZSNESW',0
-;GUINetTextr2 db 'BEFORE STARTING A NEW',0
-;GUINetTextr3 db 'NETPLAY SESSION',0
+GUINetTextr1 db 'PLEASE RESTART ZSNESW',0
+GUINetTextr2 db 'BEFORE STARTING A NEW',0
+GUINetTextr3 db 'NETPLAY SESSION',0

 %ifdef __MSDOS__
 BaudVal  dd 9600,14400,19200,28800,38400,57600,115200