Skip to content

Fixed N64 Mouse wrapping. #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2015
Merged

Fixed N64 Mouse wrapping. #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/mame/machine/n64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1797,11 +1797,8 @@ int n64_periphs::pif_channel_handle_command(int channel, int slength, UINT8 *sda

case 2: //MOUSE
buttons = machine().root_device().ioport(portnames[(channel*5) + 0])->read();
x = machine().root_device().ioport(portnames[(channel*5) + 1 + 2])->read() - 128;
y = machine().root_device().ioport(portnames[(channel*5) + 2 + 2])->read() - 128;

//x /= 4;
//y /= 4;
x = (INT16)machine().root_device().ioport(portnames[(channel*5) + 1 + 2])->read();// - 128;
y = (INT16)machine().root_device().ioport(portnames[(channel*5) + 2 + 2])->read();// - 128;

int mouse_dx = 0;
int mouse_dy = 0;
Expand All @@ -1811,9 +1808,9 @@ int n64_periphs::pif_channel_handle_command(int channel, int slength, UINT8 *sda
mouse_dx = x - mouse_x2[channel];

if (mouse_dx > 0x40)
mouse_dx = (0x80) - mouse_dx;
mouse_dx = (0x80) - (mouse_dx - ((mouse_dx / 0x80) * 0x80));
else if (mouse_dx < -0x40)
mouse_dx = -(0x80) - mouse_dx;
mouse_dx = -(0x80) - (mouse_dx - ((mouse_dx / 0x80) * 0x80));

mouse_x2[channel] = x;
}
Expand All @@ -1823,9 +1820,9 @@ int n64_periphs::pif_channel_handle_command(int channel, int slength, UINT8 *sda
mouse_dy = y - mouse_y2[channel];

if (mouse_dy > 0x40)
mouse_dy = (0x80) - mouse_dy;
mouse_dy = (0x80) - (mouse_dy - ((mouse_dy / 0x80) * 0x80));
else if (mouse_dy < -0x40)
mouse_dy = -(0x80) - mouse_dy;
mouse_dy = -(0x80) - (mouse_dy - ((mouse_dy / 0x80) * 0x80));

mouse_y2[channel] = y;
}
Expand Down