Fixed corner case, cleaned up code.
This commit is contained in:
@@ -475,9 +475,18 @@ void MultiMouseProcess(unsigned int mouse)
|
|||||||
ManyMouseEvent event;
|
ManyMouseEvent event;
|
||||||
event.device = ~0;
|
event.device = ~0;
|
||||||
|
|
||||||
if ((mouse == 1) && Mouse1Waiting)
|
if (mouse == 1)
|
||||||
{
|
{
|
||||||
Mouse1MoveX = Mouse1MoveY = 0;
|
Mouse1MoveX = Mouse1MoveY = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mouse == 2)
|
||||||
|
{
|
||||||
|
Mouse2MoveX = Mouse2MoveY = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((mouse == 1) && Mouse1Waiting)
|
||||||
|
{
|
||||||
if (Mouse1Event.type == MANYMOUSE_EVENT_RELMOTION)
|
if (Mouse1Event.type == MANYMOUSE_EVENT_RELMOTION)
|
||||||
{
|
{
|
||||||
if (Mouse1Event.item == 0) { Mouse1MoveX = Mouse1Event.value; } else { Mouse1MoveY = Mouse1Event.value; }
|
if (Mouse1Event.item == 0) { Mouse1MoveX = Mouse1Event.value; } else { Mouse1MoveY = Mouse1Event.value; }
|
||||||
@@ -488,7 +497,6 @@ void MultiMouseProcess(unsigned int mouse)
|
|||||||
|
|
||||||
if ((mouse == 2) && Mouse2Waiting)
|
if ((mouse == 2) && Mouse2Waiting)
|
||||||
{
|
{
|
||||||
Mouse2MoveX = Mouse2MoveY = 0;
|
|
||||||
if (Mouse2Event.type == MANYMOUSE_EVENT_RELMOTION)
|
if (Mouse2Event.type == MANYMOUSE_EVENT_RELMOTION)
|
||||||
{
|
{
|
||||||
if (Mouse2Event.item == 1) { Mouse2MoveX = Mouse2Event.value; } else { Mouse2MoveY = Mouse2Event.value; }
|
if (Mouse2Event.item == 1) { Mouse2MoveX = Mouse2Event.value; } else { Mouse2MoveY = Mouse2Event.value; }
|
||||||
@@ -501,14 +509,6 @@ void MultiMouseProcess(unsigned int mouse)
|
|||||||
{
|
{
|
||||||
if (!ManyMouse_PollEvent(&event))
|
if (!ManyMouse_PollEvent(&event))
|
||||||
{
|
{
|
||||||
if (mouse == 1)
|
|
||||||
{
|
|
||||||
Mouse1MoveX = Mouse1MoveY = 0;
|
|
||||||
}
|
|
||||||
if (mouse == 2)
|
|
||||||
{
|
|
||||||
Mouse2MoveX = Mouse2MoveY = 0;
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -530,13 +530,11 @@ void MultiMouseProcess(unsigned int mouse)
|
|||||||
{
|
{
|
||||||
if (event.device == 0)
|
if (event.device == 0)
|
||||||
{
|
{
|
||||||
Mouse1MoveX = Mouse1MoveY = 0;
|
|
||||||
if (event.item == 0) { Mouse1MoveX = event.value; } else { Mouse1MoveY = event.value; }
|
if (event.item == 0) { Mouse1MoveX = event.value; } else { Mouse1MoveY = event.value; }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event.device == 1)
|
if (event.device == 1)
|
||||||
{
|
{
|
||||||
Mouse2MoveX = Mouse2MoveY = 0;
|
|
||||||
if (event.item == 0) { Mouse2MoveX = event.value; } else { Mouse2MoveY = event.value; }
|
if (event.item == 0) { Mouse2MoveX = event.value; } else { Mouse2MoveY = event.value; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user