From e25cd2d1796a4147ac5c93f80c75cc683c7b7f32 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Thu, 23 Mar 2006 21:13:40 +0000
Subject: [PATCH] Mouse 2 is now working

---
 zsnes/src/init.asm          | 6 +++---
 zsnes/src/video/procvid.asm | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 30405c29..538c191b 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -683,7 +683,7 @@ CombContDatN dd 08000000h,04000000h,02000000h,01000000h,00800000h,80000000h
 CombContDatR dd 08000000h,04000000h,01000000h,02000000h,00800000h,80000000h
              dd 00400000h,40000000h,00200000h,00100000h,10000000h,20000000h
 
-EXTSYM MouseToRead,multimouse
+EXTSYM MouseToRead,multiMouseMode
 
 SECTION .text
 
@@ -718,7 +718,7 @@ NEWSYM ReadInputDevice
     ; Process Data
     mov dword[JoyAOrig],0
     ; Get Player1 input device
-    cmp byte[multimouse],1
+    cmp byte[multiMouseMode],1
     je .multimouse1
     cmp byte[snesmouse],1
     jne .nomouse1
@@ -772,7 +772,7 @@ NEWSYM ReadInputDevice
     and dword[JoyAOrig],7FFFFFFFh
 .noinput1
     mov dword[JoyBOrig],0
-    cmp byte[multimouse],1
+    cmp byte[multiMouseMode],1
     je .multimouse2
     cmp byte[snesmouse],2
     jne .nomouse2
diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm
index 7f1a8172..73f4ae61 100644
--- a/zsnes/src/video/procvid.asm
+++ b/zsnes/src/video/procvid.asm
@@ -173,13 +173,13 @@ NEWSYM processmouse
 .noautosw
     mov byte[ssautoswb],0
 .ss
-;    cmp byte[multiMouseMode],0
-;    je .nomultimouse
+    cmp byte[multiMouseMode],0
+    je .nomultimouse
     pushad
     call MultiMouseProcess
     popad
     cmp byte[MouseToRead],2
-;    je .getmouse2
+    je .getmouse2
     mov cx,[Mouse1MoveX]
     mov dx,[Mouse1MoveY]
     jmp .mousestuff