Removed extra variables and EXTSYMs.

This commit is contained in:
n-a-c-h
2006-03-24 00:56:12 +00:00
parent 14f40da8b0
commit 560b4c58b0
4 changed files with 6 additions and 10 deletions

View File

@@ -684,8 +684,6 @@ 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,multiMouseMode
SECTION .text SECTION .text
%macro PlayerDeviceFix 1 %macro PlayerDeviceFix 1
@@ -773,7 +771,6 @@ NEWSYM ReadInputDevice
mov dword[JoyBOrig],0 mov dword[JoyBOrig],0
cmp byte[device2],1 cmp byte[device2],1
jne .nomouse2 jne .nomouse2
mov byte[MouseToRead],1
call processmouse2 call processmouse2
ProcSNESMouse JoyBOrig ProcSNESMouse JoyBOrig
jmp .noinput2 jmp .noinput2

View File

@@ -452,7 +452,6 @@ int Mouse2MoveX = 0;
int Mouse1MoveY = 0; int Mouse1MoveY = 0;
int Mouse2MoveY = 0; int Mouse2MoveY = 0;
int MousePoll = 0; int MousePoll = 0;
unsigned char MouseToRead = 0;
void MultiMouseShutdown() void MultiMouseShutdown()
{ {

View File

@@ -33,7 +33,7 @@ EXTSYM statefileloc,fnamest,GUIClick,MousePRClick,ngmsdraw,cvidmode
EXTSYM KeyDisableSC0,KeyDisableSC1,KeyDisableSC2,KeyDisableSC3,KeyDisableSC4 EXTSYM KeyDisableSC0,KeyDisableSC1,KeyDisableSC2,KeyDisableSC3,KeyDisableSC4
EXTSYM KeyDisableSC5,KeyDisableSC6,KeyDisableSC7,KeyFastFrwrd,SRAMSave5Sec EXTSYM KeyDisableSC5,KeyDisableSC6,KeyDisableSC7,KeyFastFrwrd,SRAMSave5Sec
EXTSYM KeyBGDisble0,KeyBGDisble1,KeyBGDisble2,KeyBGDisble3,KeySprDisble EXTSYM KeyBGDisble0,KeyBGDisble1,KeyBGDisble2,KeyBGDisble3,KeySprDisble
EXTSYM KeyResetAll,KeyExtraEnab,KeyWinDisble,KeyNewGfxSwt,KeyOffsetMSw EXTSYM KeyResetAll,KeyWinDisble,KeyNewGfxSwt,KeyOffsetMSw
EXTSYM KeyStateSlc0,KeyStateSlc1,KeyStateSlc2,KeyStateSlc3,KeyStateSlc4 EXTSYM KeyStateSlc0,KeyStateSlc1,KeyStateSlc2,KeyStateSlc3,KeyStateSlc4
EXTSYM KeyStateSlc5,KeyStateSlc6,KeyStateSlc7,KeyStateSlc8,KeyStateSlc9 EXTSYM KeyStateSlc5,KeyStateSlc6,KeyStateSlc7,KeyStateSlc8,KeyStateSlc9
EXTSYM KeyIncStateSlot,KeyDecStateSlot,KeyUsePlayer1234,maxskip,DSPMem,dsp1ptr 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 sprlefttot,vcache4b,objadds1,objadds2,objmovs1,objmovs2,tltype4b
EXTSYM vidmemch4,vram,bgptr,bgptrc,bgptrd,curtileptr,vcache2b,vcache8b,vidmemch8 EXTSYM vidmemch4,vram,bgptr,bgptrc,bgptrd,curtileptr,vcache2b,vcache8b,vidmemch8
EXTSYM offsetmshl,NextLineCache,tltype2b,tltype8b,objwlrpos 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 KeyResetSpeed,KeyEmuSpeedUp,KeyEmuSpeedDown,KeyDisplayBatt,EMUPause
EXTSYM device1,device2,snesinputdefault1,snesinputdefault2 EXTSYM device1,device2,snesinputdefault1,snesinputdefault2
EXTSYM KeyExtraEnab1,KeyExtraEnab2,cycleinputdevice1,cycleinputdevice2 EXTSYM KeyExtraEnab1,KeyExtraEnab2,cycleinputdevice1,cycleinputdevice2

View File

@@ -41,6 +41,10 @@ EXTSYM MovieProcessing,mzt_chdir,UpChdir,MovieFrameStr,GetMovieFrameStr
EXTSYM MovieDisplayFrame EXTSYM MovieDisplayFrame
EXTSYM MouseCount,device2 EXTSYM MouseCount,device2
%ifndef __MSDOS__
EXTSYM Mouse1MoveX,Mouse1MoveY,Mouse2MoveX,Mouse2MoveY,MultiMouseProcess
%endif
%ifdef __MSDOS__ %ifdef __MSDOS__
EXTSYM SB_blank,vsyncon,Triplebufen,granadd EXTSYM SB_blank,vsyncon,Triplebufen,granadd
%endif %endif
@@ -144,10 +148,6 @@ NEWSYM showvideo
pop esi pop esi
ret ret
%ifndef __MSDOS__
EXTSYM multiMouseMode,Mouse1MoveX,Mouse1MoveY,Mouse2MoveX,Mouse2MoveY,MultiMouseProcess,MouseToRead
%endif
NEWSYM processmouse1 NEWSYM processmouse1
push esi push esi
push edi push edi