diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-12-12 11:16:13 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-12-12 11:16:13 +0000 |
commit | ca6dfdc3fe49e0718e5380920e6696fc98ba2760 (patch) | |
tree | 19a81f102469da613d65360a732f711eb9841ea3 /apps/plugins/invadrox.c | |
parent | 8565dc217c2d17d1ec7ba4f6fc7259808de10a94 (diff) | |
download | rockbox-ca6dfdc3fe49e0718e5380920e6696fc98ba2760.tar.gz rockbox-ca6dfdc3fe49e0718e5380920e6696fc98ba2760.zip |
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
Diffstat (limited to 'apps/plugins/invadrox.c')
-rw-r--r-- | apps/plugins/invadrox.c | 27 |
1 files changed, 18 insertions, 9 deletions
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 | |||
199 | #error INVADROX: Unsupported keypad | 199 | #error INVADROX: Unsupported keypad |
200 | #endif | 200 | #endif |
201 | 201 | ||
202 | #ifndef RC_QUIT | ||
203 | #define RC_QUIT 0 | ||
204 | #endif | ||
205 | |||
202 | #ifdef HAVE_TOUCHSCREEN | 206 | #ifdef HAVE_TOUCHSCREEN |
203 | 207 | ||
208 | #ifndef QUIT | ||
209 | #define QUIT 0 | ||
210 | #endif | ||
211 | #ifndef LEFT | ||
212 | #define LEFT 0 | ||
213 | #endif | ||
214 | #ifndef RIGHT | ||
215 | #define RIGHT 0 | ||
216 | #endif | ||
217 | #ifndef FIRE | ||
218 | #define FIRE 0 | ||
219 | #endif | ||
220 | |||
204 | #define TOUCHSCREEN_QUIT BUTTON_TOPLEFT | 221 | #define TOUCHSCREEN_QUIT BUTTON_TOPLEFT |
205 | #define TOUCHSCREEN_LEFT (BUTTON_MIDLEFT | BUTTON_BOTTOMLEFT) | 222 | #define TOUCHSCREEN_LEFT (BUTTON_MIDLEFT | BUTTON_BOTTOMLEFT) |
206 | #define TOUCHSCREEN_RIGHT (BUTTON_MIDRIGHT | BUTTON_BOTTOMRIGHT) | 223 | #define TOUCHSCREEN_RIGHT (BUTTON_MIDRIGHT | BUTTON_BOTTOMRIGHT) |
207 | #define TOUCHSCREEN_FIRE (BUTTON_CENTER | BUTTON_BOTTOMMIDDLE) | 224 | #define TOUCHSCREEN_FIRE (BUTTON_CENTER | BUTTON_BOTTOMMIDDLE) |
208 | 225 | ||
209 | #ifdef RC_QUIT | ||
210 | #define ACTION_QUIT (QUIT | TOUCHSCREEN_QUIT | RC_QUIT) | 226 | #define ACTION_QUIT (QUIT | TOUCHSCREEN_QUIT | RC_QUIT) |
211 | #else | ||
212 | #define ACTION_QUIT (QUIT | TOUCHSCREEN_QUIT) | ||
213 | #endif | ||
214 | #define ACTION_LEFT (LEFT | TOUCHSCREEN_LEFT) | 227 | #define ACTION_LEFT (LEFT | TOUCHSCREEN_LEFT) |
215 | #define ACTION_RIGHT (RIGHT | TOUCHSCREEN_RIGHT) | 228 | #define ACTION_RIGHT (RIGHT | TOUCHSCREEN_RIGHT) |
216 | #define ACTION_FIRE (FIRE | TOUCHSCREEN_FIRE) | 229 | #define ACTION_FIRE (FIRE | TOUCHSCREEN_FIRE) |
217 | 230 | ||
218 | #else | 231 | #else /* HAVE_TOUCHSCREEN */ |
219 | 232 | ||
220 | #ifdef RC_QUIT | ||
221 | #define ACTION_QUIT (QUIT | RC_QUIT) | 233 | #define ACTION_QUIT (QUIT | RC_QUIT) |
222 | #else | ||
223 | #define ACTION_QUIT QUIT | ||
224 | #endif | ||
225 | #define ACTION_LEFT LEFT | 234 | #define ACTION_LEFT LEFT |
226 | #define ACTION_RIGHT RIGHT | 235 | #define ACTION_RIGHT RIGHT |
227 | #define ACTION_FIRE FIRE | 236 | #define ACTION_FIRE FIRE |