diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm index ad711371..bddf2969 100644 --- a/zsnes/src/init.asm +++ b/zsnes/src/init.asm @@ -684,8 +684,6 @@ 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,multiMouseMode - SECTION .text %macro PlayerDeviceFix 1 @@ -773,7 +771,6 @@ NEWSYM ReadInputDevice mov dword[JoyBOrig],0 cmp byte[device2],1 jne .nomouse2 - mov byte[MouseToRead],1 call processmouse2 ProcSNESMouse JoyBOrig jmp .noinput2 diff --git a/zsnes/src/uic.c b/zsnes/src/uic.c index cb951cb4..99fe87a2 100644 --- a/zsnes/src/uic.c +++ b/zsnes/src/uic.c @@ -452,7 +452,6 @@ int Mouse2MoveX = 0; int Mouse1MoveY = 0; int Mouse2MoveY = 0; int MousePoll = 0; -unsigned char MouseToRead = 0; void MultiMouseShutdown() { diff --git a/zsnes/src/vcache.asm b/zsnes/src/vcache.asm index 2959aede..46a2a40d 100644 --- a/zsnes/src/vcache.asm +++ b/zsnes/src/vcache.asm @@ -33,7 +33,7 @@ EXTSYM statefileloc,fnamest,GUIClick,MousePRClick,ngmsdraw,cvidmode EXTSYM KeyDisableSC0,KeyDisableSC1,KeyDisableSC2,KeyDisableSC3,KeyDisableSC4 EXTSYM KeyDisableSC5,KeyDisableSC6,KeyDisableSC7,KeyFastFrwrd,SRAMSave5Sec EXTSYM KeyBGDisble0,KeyBGDisble1,KeyBGDisble2,KeyBGDisble3,KeySprDisble -EXTSYM KeyResetAll,KeyExtraEnab,KeyWinDisble,KeyNewGfxSwt,KeyOffsetMSw +EXTSYM KeyResetAll,KeyWinDisble,KeyNewGfxSwt,KeyOffsetMSw EXTSYM KeyStateSlc0,KeyStateSlc1,KeyStateSlc2,KeyStateSlc3,KeyStateSlc4 EXTSYM KeyStateSlc5,KeyStateSlc6,KeyStateSlc7,KeyStateSlc8,KeyStateSlc9 EXTSYM KeyIncStateSlot,KeyDecStateSlot,KeyUsePlayer1234,maxskip,DSPMem,dsp1ptr @@ -47,7 +47,7 @@ EXTSYM oamram,objhipr,objptr,objptrn,objsize1,objsize2,spritetablea,sprleftpr EXTSYM sprlefttot,vcache4b,objadds1,objadds2,objmovs1,objmovs2,tltype4b EXTSYM vidmemch4,vram,bgptr,bgptrc,bgptrd,curtileptr,vcache2b,vcache8b,vidmemch8 EXTSYM offsetmshl,NextLineCache,tltype2b,tltype8b,objwlrpos -EXTSYM cycleinputdevice,SRAMChdir,EmuSpeed,SDRatio,FFRatio,DisplayBatteryStatus +EXTSYM SRAMChdir,EmuSpeed,SDRatio,FFRatio,DisplayBatteryStatus EXTSYM KeyResetSpeed,KeyEmuSpeedUp,KeyEmuSpeedDown,KeyDisplayBatt,EMUPause EXTSYM device1,device2,snesinputdefault1,snesinputdefault2 EXTSYM KeyExtraEnab1,KeyExtraEnab2,cycleinputdevice1,cycleinputdevice2 diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm index 7ffacb31..4d4c4d27 100644 --- a/zsnes/src/video/procvid.asm +++ b/zsnes/src/video/procvid.asm @@ -41,6 +41,10 @@ EXTSYM MovieProcessing,mzt_chdir,UpChdir,MovieFrameStr,GetMovieFrameStr EXTSYM MovieDisplayFrame EXTSYM MouseCount,device2 +%ifndef __MSDOS__ +EXTSYM Mouse1MoveX,Mouse1MoveY,Mouse2MoveX,Mouse2MoveY,MultiMouseProcess +%endif + %ifdef __MSDOS__ EXTSYM SB_blank,vsyncon,Triplebufen,granadd %endif @@ -144,10 +148,6 @@ NEWSYM showvideo pop esi ret -%ifndef __MSDOS__ -EXTSYM multiMouseMode,Mouse1MoveX,Mouse1MoveY,Mouse2MoveX,Mouse2MoveY,MultiMouseProcess,MouseToRead -%endif - NEWSYM processmouse1 push esi push edi