mirror of
https://github.com/libretro/RetroArch
synced 2025-04-10 06:44:27 +00:00
Rename macro.
This commit is contained in:
parent
dd9f4be2aa
commit
6cd4989651
40
wii/input.c
40
wii/input.c
@ -82,28 +82,28 @@ static void wii_input_poll(void *data)
|
|||||||
|
|
||||||
unsigned pads = PAD_ScanPads();
|
unsigned pads = PAD_ScanPads();
|
||||||
unsigned wpads = WPAD_ScanPads();
|
unsigned wpads = WPAD_ScanPads();
|
||||||
#define _B(btn) pad_state[i][SNES_DEVICE_ID_JOYPAD_##btn] = down & PAD_BUTTON_##btn
|
#define _BIND(btn) pad_state[i][SNES_DEVICE_ID_JOYPAD_##btn] = down & PAD_BUTTON_##btn
|
||||||
for (unsigned i = 0; i < pads; i++)
|
for (unsigned i = 0; i < pads; i++)
|
||||||
{
|
{
|
||||||
uint16_t down = PAD_ButtonsHeld(i) | PAD_ButtonsDown(i);
|
uint16_t down = PAD_ButtonsHeld(i) | PAD_ButtonsDown(i);
|
||||||
down &= ~PAD_ButtonsUp(i);
|
down &= ~PAD_ButtonsUp(i);
|
||||||
|
|
||||||
_B(B);
|
_BIND(B);
|
||||||
_B(Y);
|
_BIND(Y);
|
||||||
pad_state[i][SNES_DEVICE_ID_JOYPAD_SELECT] = down & PAD_TRIGGER_Z;
|
pad_state[i][SNES_DEVICE_ID_JOYPAD_SELECT] = down & PAD_TRIGGER_Z;
|
||||||
_B(START);
|
_BIND(START);
|
||||||
_B(UP);
|
_BIND(UP);
|
||||||
_B(DOWN);
|
_BIND(DOWN);
|
||||||
_B(LEFT);
|
_BIND(LEFT);
|
||||||
_B(RIGHT);
|
_BIND(RIGHT);
|
||||||
_B(A);
|
_BIND(A);
|
||||||
_B(X);
|
_BIND(X);
|
||||||
pad_state[i][SNES_DEVICE_ID_JOYPAD_L] = down & PAD_TRIGGER_L;
|
pad_state[i][SNES_DEVICE_ID_JOYPAD_L] = down & PAD_TRIGGER_L;
|
||||||
pad_state[i][SNES_DEVICE_ID_JOYPAD_R] = down & PAD_TRIGGER_R;
|
pad_state[i][SNES_DEVICE_ID_JOYPAD_R] = down & PAD_TRIGGER_R;
|
||||||
}
|
}
|
||||||
#undef _B
|
|
||||||
|
|
||||||
#define _B(btn) \
|
#undef _BIND
|
||||||
|
#define _BIND(btn) \
|
||||||
wpad_state[i][SNES_DEVICE_ID_JOYPAD_##btn] = down & WPAD_CLASSIC_BUTTON_##btn;
|
wpad_state[i][SNES_DEVICE_ID_JOYPAD_##btn] = down & WPAD_CLASSIC_BUTTON_##btn;
|
||||||
|
|
||||||
for (unsigned i = 0; i < wpads; i++)
|
for (unsigned i = 0; i < wpads; i++)
|
||||||
@ -111,16 +111,16 @@ static void wii_input_poll(void *data)
|
|||||||
uint32_t down = WPAD_ButtonsHeld(i) | WPAD_ButtonsDown(i);
|
uint32_t down = WPAD_ButtonsHeld(i) | WPAD_ButtonsDown(i);
|
||||||
down &= ~WPAD_ButtonsUp(i);
|
down &= ~WPAD_ButtonsUp(i);
|
||||||
|
|
||||||
_B(B);
|
_BIND(B);
|
||||||
_B(Y);
|
_BIND(Y);
|
||||||
wpad_state[i][SNES_DEVICE_ID_JOYPAD_SELECT] = down & WPAD_CLASSIC_BUTTON_MINUS;
|
wpad_state[i][SNES_DEVICE_ID_JOYPAD_SELECT] = down & WPAD_CLASSIC_BUTTON_MINUS;
|
||||||
wpad_state[i][SNES_DEVICE_ID_JOYPAD_START] = down & WPAD_CLASSIC_BUTTON_PLUS;
|
wpad_state[i][SNES_DEVICE_ID_JOYPAD_START] = down & WPAD_CLASSIC_BUTTON_PLUS;
|
||||||
_B(UP);
|
_BIND(UP);
|
||||||
_B(DOWN);
|
_BIND(DOWN);
|
||||||
_B(LEFT);
|
_BIND(LEFT);
|
||||||
_B(RIGHT);
|
_BIND(RIGHT);
|
||||||
_B(A);
|
_BIND(A);
|
||||||
_B(X);
|
_BIND(X);
|
||||||
wpad_state[i][SNES_DEVICE_ID_JOYPAD_L] = down & WPAD_CLASSIC_BUTTON_FULL_L;
|
wpad_state[i][SNES_DEVICE_ID_JOYPAD_L] = down & WPAD_CLASSIC_BUTTON_FULL_L;
|
||||||
wpad_state[i][SNES_DEVICE_ID_JOYPAD_R] = down & WPAD_CLASSIC_BUTTON_FULL_R;
|
wpad_state[i][SNES_DEVICE_ID_JOYPAD_R] = down & WPAD_CLASSIC_BUTTON_FULL_R;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user