Fixed screen refresh for SDL software modes when toggling hq2x. Fixed a key repeating bug when changing resolutions. Can now choose screen mode with enter key. Some source cleanup.
This commit is contained in:
@@ -1530,7 +1530,7 @@ guimencodermsg:
|
||||
|
||||
SECTION .data
|
||||
guimencodert1 db ' MENCODER IS MISSING: ',0
|
||||
guimencodert2 db ' PRESS SPACE TO CONTINUE',0
|
||||
guimencodert2 db 'PRESS SPACE TO PROCEED',0
|
||||
|
||||
SECTION .text
|
||||
|
||||
@@ -1730,17 +1730,18 @@ guiprevideo:
|
||||
mov ecx,256+128+64
|
||||
.b
|
||||
cmp byte[pressed+ebx],0
|
||||
jne .pressedokay
|
||||
jne .pressedkey
|
||||
inc ebx
|
||||
dec ecx
|
||||
jnz .b
|
||||
cmp byte[MouseDis],1
|
||||
je .mousedis
|
||||
je .again
|
||||
call Get_MouseData
|
||||
test bx,01h
|
||||
jnz .pressedokay
|
||||
.mousedis
|
||||
jmp .again
|
||||
.pressedkey
|
||||
mov byte[pressed+ebx],0
|
||||
.pressedokay
|
||||
ret
|
||||
|
||||
@@ -2251,16 +2252,16 @@ SECTION .text
|
||||
|
||||
DisplayBoxes: ; Displays window when item is clicked
|
||||
xor esi,esi
|
||||
mov byte[cwindrawn],0
|
||||
.next2
|
||||
mov al,[GUIwinorder+esi]
|
||||
cmp al,0
|
||||
je .done
|
||||
inc byte[cwindrawn]
|
||||
inc esi
|
||||
jmp .next2
|
||||
.done
|
||||
dec byte[cwindrawn]
|
||||
mov eax,esi
|
||||
dec eax
|
||||
mov [cwindrawn],al
|
||||
xor eax,eax
|
||||
xor esi,esi
|
||||
.next
|
||||
|
||||
@@ -150,8 +150,7 @@ SECTION .text
|
||||
|
||||
GUIgetcurrentinput:
|
||||
mov byte[UseExtKey],0
|
||||
xor ch,ch
|
||||
xor cl,cl
|
||||
xor cx,cx
|
||||
.getnextkey
|
||||
call Check_Key
|
||||
or al,al
|
||||
@@ -1103,6 +1102,11 @@ GUIVideoKeys:
|
||||
mov [GUIcurrentvideoviewloc],ebx
|
||||
.posvd
|
||||
.nopagedown
|
||||
; "Return"
|
||||
cmp dl,13
|
||||
jne .noreturn
|
||||
mov byte[GUICBHold],4
|
||||
.noreturn
|
||||
.notmodestab
|
||||
|
||||
cmp dword[GUIVideoTabs],2
|
||||
|
||||
@@ -654,9 +654,9 @@ ProcessMouseButtons:
|
||||
jne .noAppend
|
||||
mov byte[GUICBHold],0
|
||||
mov byte[GUIQuit],2
|
||||
pushad
|
||||
;pushad
|
||||
;call MovieAppend
|
||||
popad
|
||||
;popad
|
||||
ret
|
||||
.noAppend
|
||||
cmp byte[GUICBHold],34 ; dump raw
|
||||
@@ -1025,6 +1025,7 @@ GUIWinClicked:
|
||||
cmp ebx,21
|
||||
je near DisplayGUISpeedClick
|
||||
ret
|
||||
|
||||
%macro GUIClickCButton 3
|
||||
cmp eax,%1+1
|
||||
jl %%noclick
|
||||
@@ -2488,6 +2489,9 @@ DisplayGUIVideoClick:
|
||||
jmp .nocheckboxhq
|
||||
.checkboxhq
|
||||
GUIClickCButtonHQ 115,163,byte[hqFilter]
|
||||
pushad
|
||||
call Clear2xSaIBuffer
|
||||
popad
|
||||
.nocheckboxhq
|
||||
xor ebx,ebx
|
||||
mov bl,[cvidmode]
|
||||
|
||||
Reference in New Issue
Block a user