Mouse 2 is now working

This commit is contained in:
pagefault
2006-03-23 21:13:40 +00:00
parent 45156d1b04
commit e25cd2d179
2 changed files with 6 additions and 6 deletions

View File

@@ -683,7 +683,7 @@ CombContDatN dd 08000000h,04000000h,02000000h,01000000h,00800000h,80000000h
CombContDatR dd 08000000h,04000000h,01000000h,02000000h,00800000h,80000000h CombContDatR dd 08000000h,04000000h,01000000h,02000000h,00800000h,80000000h
dd 00400000h,40000000h,00200000h,00100000h,10000000h,20000000h dd 00400000h,40000000h,00200000h,00100000h,10000000h,20000000h
EXTSYM MouseToRead,multimouse EXTSYM MouseToRead,multiMouseMode
SECTION .text SECTION .text
@@ -718,7 +718,7 @@ NEWSYM ReadInputDevice
; Process Data ; Process Data
mov dword[JoyAOrig],0 mov dword[JoyAOrig],0
; Get Player1 input device ; Get Player1 input device
cmp byte[multimouse],1 cmp byte[multiMouseMode],1
je .multimouse1 je .multimouse1
cmp byte[snesmouse],1 cmp byte[snesmouse],1
jne .nomouse1 jne .nomouse1
@@ -772,7 +772,7 @@ NEWSYM ReadInputDevice
and dword[JoyAOrig],7FFFFFFFh and dword[JoyAOrig],7FFFFFFFh
.noinput1 .noinput1
mov dword[JoyBOrig],0 mov dword[JoyBOrig],0
cmp byte[multimouse],1 cmp byte[multiMouseMode],1
je .multimouse2 je .multimouse2
cmp byte[snesmouse],2 cmp byte[snesmouse],2
jne .nomouse2 jne .nomouse2

View File

@@ -173,13 +173,13 @@ NEWSYM processmouse
.noautosw .noautosw
mov byte[ssautoswb],0 mov byte[ssautoswb],0
.ss .ss
; cmp byte[multiMouseMode],0 cmp byte[multiMouseMode],0
; je .nomultimouse je .nomultimouse
pushad pushad
call MultiMouseProcess call MultiMouseProcess
popad popad
cmp byte[MouseToRead],2 cmp byte[MouseToRead],2
; je .getmouse2 je .getmouse2
mov cx,[Mouse1MoveX] mov cx,[Mouse1MoveX]
mov dx,[Mouse1MoveY] mov dx,[Mouse1MoveY]
jmp .mousestuff jmp .mousestuff