Changed the Select Comparison options' hotkeys from >, <, =, N to N, E ,W, A

This commit is contained in:
ipher
2005-05-25 06:15:21 +00:00
parent e5311cd3b3
commit 875236fdde
2 changed files with 33 additions and 22 deletions

View File

@@ -734,11 +734,11 @@ GUISpeedKeys:
ja .nocap ja .nocap
sub dh,'z'-'Z' sub dh,'z'-'Z'
.nocap .nocap
cmp dh,'T' ; Checkbox cmp dh,'T' ; Checkbox
jne .nofastforward jne .nofastforward
xor byte[FastFwdToggle],1 xor byte[FastFwdToggle],1
.nofastforward .nofastforward
cmp dh,'A' ; Checkboxes cmp dh,'A' ; Framerate Checkboxes
jne .noautofr jne .noautofr
mov byte[FPSOn],0 mov byte[FPSOn],0
cmp byte[frameskip],0 cmp byte[frameskip],0
@@ -2076,7 +2076,8 @@ GUICheatSearchKeys:
je near .view je near .view
cmp byte[CheatWinMode],1 cmp byte[CheatWinMode],1
je near .search je near .search
CompareKeyMacro '1',CheatSrcByteSize,0
CompareKeyMacro '1',CheatSrcByteSize,0 ; Main Menu
CompareKeyMacro '2',CheatSrcByteSize,1 CompareKeyMacro '2',CheatSrcByteSize,1
CompareKeyMacro '3',CheatSrcByteSize,2 CompareKeyMacro '3',CheatSrcByteSize,2
CompareKeyMacro '4',CheatSrcByteSize,3 CompareKeyMacro '4',CheatSrcByteSize,3
@@ -2084,7 +2085,8 @@ GUICheatSearchKeys:
CompareKeyMacro 'H',CheatSrcByteBase,1 CompareKeyMacro 'H',CheatSrcByteBase,1
CompareKeyMacro 'E',CheatSrcSearchType,0 CompareKeyMacro 'E',CheatSrcSearchType,0
CompareKeyMacro 'C',CheatSrcSearchType,1 CompareKeyMacro 'C',CheatSrcSearchType,1
cmp dh,13
cmp dh,13 ; Start Button
je .start je .start
cmp dh,'S' cmp dh,'S'
jne .notstart jne .notstart
@@ -2093,7 +2095,8 @@ GUICheatSearchKeys:
ret ret
.notstart .notstart
ret ret
.search
.search ; Shortcuts for Select Comparison
cmp byte[CheatSrcSearchType],1 cmp byte[CheatSrcSearchType],1
je .compare je .compare
call InsertSearchCharacter call InsertSearchCharacter
@@ -2101,30 +2104,31 @@ GUICheatSearchKeys:
.compare .compare
cmp dh,',' cmp dh,','
je .lessthan je .lessthan
cmp dh,'<' cmp dh,'N'
jne .notlessthan jne .notlessthan
.lessthan .lessthan
mov byte[CheatCompareValue],0 mov byte[CheatCompareValue],0
.notlessthan .notlessthan
cmp dh,'.' cmp dh,'.'
je .greaterthan je .greaterthan
cmp dh,'>' cmp dh,'E'
jne .notgreaterthan jne .notgreaterthan
.greaterthan .greaterthan
mov byte[CheatCompareValue],1 mov byte[CheatCompareValue],1
.notgreaterthan .notgreaterthan
cmp dh,'=' cmp dh,'W'
je .equalthan je .equalthan
cmp dh,'+' cmp dh,'+'
jne .notequalthan jne .notequalthan
.equalthan .equalthan
mov byte[CheatCompareValue],2 mov byte[CheatCompareValue],2
.notequalthan .notequalthan
cmp dh,'N' cmp dh,'A'
jne .notnotequalthan jne .notnotequalthan
mov byte[CheatCompareValue],3 mov byte[CheatCompareValue],3
.notnotequalthan .notnotequalthan
%ifdef __LINUX__
%ifdef __LINUX__ ; Select with Arrow Keys
cmp al,90 cmp al,90
je .yesmoveup je .yesmoveup
cmp dword[numlockptr],1 cmp dword[numlockptr],1
@@ -2155,7 +2159,9 @@ GUICheatSearchKeys:
cmp byte[CheatCompareValue],3 cmp byte[CheatCompareValue],3
je .nomovedown je .nomovedown
inc byte[CheatCompareValue] inc byte[CheatCompareValue]
.nomovedown
.nomovedown ; Restart/View/Search Buttons
cmp dh,'R' cmp dh,'R'
jne .notrestart jne .notrestart
mov byte[CheatWinMode],0 mov byte[CheatWinMode],0
@@ -2175,8 +2181,9 @@ GUICheatSearchKeys:
call CheatCodeSearchProcess call CheatCodeSearchProcess
.nosearchprocess .nosearchprocess
ret ret
.view
cmp dword[NumCheatSrc],0 .view ; View
cmp dword[NumCheatSrc],0 ; Return Hotkey
jne .nozero jne .nozero
cmp dh,27 cmp dh,27
je .yesret je .yesret
@@ -2186,7 +2193,8 @@ GUICheatSearchKeys:
mov byte[CheatWinMode],1 mov byte[CheatWinMode],1
.notreturnb .notreturnb
ret ret
.nozero
.nozero ; Select Codes with arrow keys
%ifdef __LINUX__ %ifdef __LINUX__
cmp al,89 cmp al,89
je .yeshome je .yeshome
@@ -2270,7 +2278,8 @@ GUICheatSearchKeys:
inc dword[GUIcurrentchtsrcviewloc] inc dword[GUIcurrentchtsrcviewloc]
.noviewinc .noviewinc
.nodown .nodown
%ifdef __LINUX__
%ifdef __LINUX__ ; Pageup/Down to select Cheats
cmp al,91 cmp al,91
je .yespgup je .yespgup
cmp dword[numlockptr],1 cmp dword[numlockptr],1
@@ -2323,7 +2332,8 @@ GUICheatSearchKeys:
mov dword[GUIcurrentchtsrcviewloc],ebx mov dword[GUIcurrentchtsrcviewloc],ebx
.posvd .posvd
.nopagedown .nopagedown
cmp dh,27
cmp dh,27 ; Return/Add Buttons
je .yesretb je .yesretb
cmp dh,'R' cmp dh,'R'
jne .notreturn jne .notreturn
@@ -2343,13 +2353,14 @@ GUICheatSearchKeys:
.notadd .notadd
ret ret
.add .add ; Add Cheat Window
cmp dh,27 cmp dh,27 ; Button Hotkey
je .yesretc je .yesretc
cmp byte[CurCStextpos],1 cmp byte[CurCStextpos],1
je .notreturnc je .notreturnc
cmp dh,'R' cmp dh,'R'
jne .notreturnc jne .notreturnc
.nofastforward
.yesretc .yesretc
mov byte[CheatWinMode],2 mov byte[CheatWinMode],2
.notreturnc .notreturnc

View File

@@ -3163,10 +3163,10 @@ CheatSearchingComp: ; Comparative search
je .zero2 je .zero2
mov byte[GUItextcolor],211 mov byte[GUItextcolor],211
.zero2 .zero2
TextWindowMacro 13,25,35,GUICSrcTextD1 TextWindowMacrou 13,25,35,GUICSrcTextD1,0
TextWindowMacro 13,25,45,GUICSrcTextD2 TextWindowMacrou 13,25,45,GUICSrcTextD2,1
TextWindowMacro 13,25,55,GUICSrcTextD3 TextWindowMacrou 13,25,55,GUICSrcTextD3,2
TextWindowMacro 13,25,65,GUICSrcTextD4 TextWindowMacrou 13,25,65,GUICSrcTextD4,5
GUIDisplayButtonHole 13,11,33,byte[CheatCompareValue],0 GUIDisplayButtonHole 13,11,33,byte[CheatCompareValue],0
GUIDisplayButtonHole 13,11,43,byte[CheatCompareValue],1 GUIDisplayButtonHole 13,11,43,byte[CheatCompareValue],1
GUIDisplayButtonHole 13,11,53,byte[CheatCompareValue],2 GUIDisplayButtonHole 13,11,53,byte[CheatCompareValue],2