From ca6dfdc3fe49e0718e5380920e6696fc98ba2760 Mon Sep 17 00:00:00 2001 From: Tomer Shalev Date: Sat, 12 Dec 2009 11:16:13 +0000 Subject: Invadrox: Fix red caused by touchscreen targets with no buttons defined for movements git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23943 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/invadrox.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 9aa8efeecb..940c60ffa3 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -199,29 +199,38 @@ CONFIG_KEYPAD == MROBE500_PAD #error INVADROX: Unsupported keypad #endif +#ifndef RC_QUIT +#define RC_QUIT 0 +#endif + #ifdef HAVE_TOUCHSCREEN +#ifndef QUIT +#define QUIT 0 +#endif +#ifndef LEFT +#define LEFT 0 +#endif +#ifndef RIGHT +#define RIGHT 0 +#endif +#ifndef FIRE +#define FIRE 0 +#endif + #define TOUCHSCREEN_QUIT BUTTON_TOPLEFT #define TOUCHSCREEN_LEFT (BUTTON_MIDLEFT | BUTTON_BOTTOMLEFT) #define TOUCHSCREEN_RIGHT (BUTTON_MIDRIGHT | BUTTON_BOTTOMRIGHT) #define TOUCHSCREEN_FIRE (BUTTON_CENTER | BUTTON_BOTTOMMIDDLE) -#ifdef RC_QUIT #define ACTION_QUIT (QUIT | TOUCHSCREEN_QUIT | RC_QUIT) -#else -#define ACTION_QUIT (QUIT | TOUCHSCREEN_QUIT) -#endif #define ACTION_LEFT (LEFT | TOUCHSCREEN_LEFT) #define ACTION_RIGHT (RIGHT | TOUCHSCREEN_RIGHT) #define ACTION_FIRE (FIRE | TOUCHSCREEN_FIRE) -#else +#else /* HAVE_TOUCHSCREEN */ -#ifdef RC_QUIT #define ACTION_QUIT (QUIT | RC_QUIT) -#else -#define ACTION_QUIT QUIT -#endif #define ACTION_LEFT LEFT #define ACTION_RIGHT RIGHT #define ACTION_FIRE FIRE -- cgit v1.2.3