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

Fixed stupid bug with Super Scope dominating second port.

Browse Source
This commit is contained in:
n-a-c-h
2005-05-17 22:38:03 +00:00
parent a437a0ab78
commit 3ae21876ec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zsnes/src/zmovie.c
View File

@@ -666,11 +666,11 @@ static size_t pad_bit_encoder(unsigned char pad, unsigned char *buffer, size_t s
last_state = zmv_vars.last_joy_state.E; last_state = zmv_vars.last_joy_state.E;
break; break;
} }
switch (pad) switch (pad)
{ {
case 2: case 2:
if (BIT(0x8)) //Super Scope if ((zmv_vars.inputs_enabled & BIT(0x8))) //Super Scope
{ {
unsigned int xdata = (zmv_vars.last_joy_state.latchx - 40) & 0xFF; unsigned int xdata = (zmv_vars.last_joy_state.latchx - 40) & 0xFF;
unsigned int ydata = zmv_vars.last_joy_state.latchy & 0xFF; unsigned int ydata = zmv_vars.last_joy_state.latchy & 0xFF;
@@ -683,7 +683,7 @@ static size_t pad_bit_encoder(unsigned char pad, unsigned char *buffer, size_t s
} }
case 1: case 1:
if (zmv_vars.inputs_enabled & ((pad == 1) ? BIT(0xA) : BIT(0x9))) //Mouse ? if ((zmv_vars.inputs_enabled & ((pad == 1) ? BIT(0xA) : BIT(0x9)))) //Mouse ?
{ {
skip_bits = bit_encoder(last_state, MOUSE_MASK, buffer, skip_bits); skip_bits = bit_encoder(last_state, MOUSE_MASK, buffer, skip_bits);
} }
@@ -740,7 +740,7 @@ static size_t pad_bit_decoder(unsigned char pad, unsigned char *buffer, size_t s
switch (pad) switch (pad)
{ {
case 2: case 2:
if (BIT(0x8)) //Super Scope if ((zmv_vars.inputs_enabled & BIT(0x8))) //Super Scope
{ {
unsigned int xdata, ydata; unsigned int xdata, ydata;