Compare commits

..

No commits in common. "b8ee8887567a516f330b137e90d5001449deaf9f" and "2fd1b3f10e95ea181a1a7ee7ac564c11fb04a551" have entirely different histories.

2 changed files with 4 additions and 29 deletions

View File

@ -1,24 +0,0 @@
#ifndef INPUT_MACROS_H
#define INPUT_MACROS_H
#include <wiiuse/wpad.h>
// Input definitions table
// TODO: GameCube controller support
// Macro name Classic Controller Wii Remote
#define INPUT_BUTTON_HOME (WPAD_CLASSIC_BUTTON_HOME || WPAD_BUTTON_HOME )
#define INPUT_BUTTON_PLUS (WPAD_CLASSIC_BUTTON_PLUS || WPAD_BUTTON_PLUS )
#define INPUT_BUTTON_MINUS (WPAD_CLASSIC_BUTTON_MINUS || WPAD_BUTTON_MINUS )
#define INPUT_BUTTON_A (WPAD_CLASSIC_BUTTON_Y || WPAD_BUTTON_A )
#define INPUT_BUTTON_B (WPAD_CLASSIC_BUTTON_B || WPAD_BUTTON_B )
#define INPUT_BUTTON_X (WPAD_CLASSIC_BUTTON_X || WPAD_BUTTON_1 )
#define INPUT_BUTTON_Y (WPAD_CLASSIC_BUTTON_A || WPAD_BUTTON_2 )
#define INPUT_BUTTON_UP (WPAD_CLASSIC_BUTTON_UP || WPAD_BUTTON_UP )
#define INPUT_BUTTON_DOWN (WPAD_CLASSIC_BUTTON_DOWN || WPAD_BUTTON_DOWN )
#define INPUT_BUTTON_LEFT (WPAD_CLASSIC_BUTTON_LEFT || WPAD_BUTTON_LEFT )
#define INPUT_BUTTON_RIGHT (WPAD_CLASSIC_BUTTON_RIGHT || WPAD_BUTTON_RIGHT )
#endif // INPUT_MACROS_H

View File

@ -3,12 +3,11 @@
#include <gccore.h> #include <gccore.h>
#include <network.h> #include <network.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include <jansson.h>
#include <stdbool.h> #include <stdbool.h>
#include "sandia/sandia.h" #include "sandia/sandia.h"
#include <jansson.h>
#include "input_macros.h"
// Uncomment if this is a development build // Uncomment if this is a development build
//#include "debug.h" //#include "debug.h"
@ -134,8 +133,8 @@ int main(int argc, char **argv) {
u32 pressed = WPAD_ButtonsDown(0); u32 pressed = WPAD_ButtonsDown(0);
if ( pressed && INPUT_BUTTON_HOME ) { if ( pressed & WPAD_BUTTON_HOME ) {
logprint(0, "HOME pressed, quitting!\n"); logprint(0, "HOME pressed, quitting!");
exit(0); exit(0);
} }