a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better fix for variable name conflict. (Anyone have a clue why a linker error wasn't produced?

Browse Source
This commit is contained in:
n-a-c-h
2006-03-26 00:31:52 +00:00
parent 96adc883dd
commit 66f58ce6ec
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zsnes/src/linux/sdllink.c
View File

@@ -111,7 +111,7 @@ static float MouseMaxY = 223;
static int MouseX, MouseY; static int MouseX, MouseY;
static float MouseMoveX, MouseMoveY; static float MouseMoveX, MouseMoveY;
static int MouseMove2X, MouseMove2Y; static int MouseMove2X, MouseMove2Y;
static unsigned char MouseButton; unsigned char MouseButton;
static float MouseXScale = 1.0; static float MouseXScale = 1.0;
static float MouseYScale = 1.0; static float MouseYScale = 1.0;
DWORD LastUsedPos = 0; DWORD LastUsedPos = 0;

10
zsnes/src/uic.c
View File

@@ -448,9 +448,9 @@ int MouseCount = 0;
unsigned short MouseMoveX[2]; unsigned short MouseMoveX[2];
unsigned short MouseMoveY[2]; unsigned short MouseMoveY[2];
unsigned short MouseButton[2]; unsigned short MouseButtons[2];
bool MouseWaiting[2]; static bool MouseWaiting[2];
void MultiMouseShutdown() void MultiMouseShutdown()
{ {
@@ -466,7 +466,7 @@ void MultiMouseInit()
{ {
MouseMoveX[0] = MouseMoveX[1] = 0; MouseMoveX[0] = MouseMoveX[1] = 0;
MouseMoveY[0] = MouseMoveY[1] = 0; MouseMoveY[0] = MouseMoveY[1] = 0;
MouseButton[0] = MouseButton[1] = 0; MouseButtons[0] = MouseButtons[1] = 0;
MouseWaiting[0] = MouseWaiting[1] = false; MouseWaiting[0] = MouseWaiting[1] = false;
atexit(MultiMouseShutdown); atexit(MultiMouseShutdown);
@@ -519,8 +519,8 @@ void MultiMouseProcess()
} }
else if (event.type == MANYMOUSE_EVENT_BUTTON) else if (event.type == MANYMOUSE_EVENT_BUTTON)
{ {
if (event.item == 0) { MOUSE_BUTTON_HANDLE(MouseButton[event.device], 0, event.value); } if (event.item == 0) { MOUSE_BUTTON_HANDLE(MouseButtons[event.device], 0, event.value); }
else if (event.item == 1) { MOUSE_BUTTON_HANDLE(MouseButton[event.device], 1, event.value); } else if (event.item == 1) { MOUSE_BUTTON_HANDLE(MouseButtons[event.device], 1, event.value); }
} }
} }
} }

6
zsnes/src/video/procvid.asm
View File

@@ -42,7 +42,7 @@ EXTSYM MovieDisplayFrame
EXTSYM MouseCount,device2 EXTSYM MouseCount,device2
%ifndef __MSDOS__ %ifndef __MSDOS__
EXTSYM MouseMoveX,MouseMoveY,MouseButton,MultiMouseProcess,mouse EXTSYM MouseMoveX,MouseMoveY,MouseButtons,MultiMouseProcess,mouse
%endif %endif
%ifdef __MSDOS__ %ifdef __MSDOS__
@@ -160,7 +160,7 @@ NEWSYM processmouse1
mov byte[mouse],0 mov byte[mouse],0
call MultiMouseProcess call MultiMouseProcess
popad popad
mov bx,[MouseButton] mov bx,[MouseButtons]
mov [mousebuttons],bx mov [mousebuttons],bx
mov cx,[MouseMoveX] mov cx,[MouseMoveX]
mov dx,[MouseMoveY] mov dx,[MouseMoveY]
@@ -212,7 +212,7 @@ NEWSYM processmouse2
mov byte[mouse],1 mov byte[mouse],1
call MultiMouseProcess call MultiMouseProcess
popad popad
mov bx,[MouseButton+2] mov bx,[MouseButtons+2]
jmp .mousestuff jmp .mousestuff
.nomultimouse .nomultimouse
%endif %endif