summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2010-02-07 20:19:34 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2010-02-07 20:19:34 +0000
commit07a6de15bd8386113db3448fbc294e9db43dfb8c (patch)
tree87c657452c61946651f0a18fe1939722f2ae250b
parented0290d30ff1449144218738e1f2f6f9d94dc1bc (diff)
downloadrockbox-07a6de15bd8386113db3448fbc294e9db43dfb8c.tar.gz
rockbox-07a6de15bd8386113db3448fbc294e9db43dfb8c.zip
Brickmania: Use touchpad actions even if buttons are assigned to them (Cowon D2)
Thanks for Strife89DS and pixelma for spotting this git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24554 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/brickmania.c34
-rw-r--r--manual/plugins/brickmania.tex4
2 files changed, 27 insertions, 11 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index ba3b495005..16f62388f7 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -231,20 +231,26 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#endif
#ifdef HAVE_TOUCHSCREEN
-#ifndef LEFT
-#define LEFT BUTTON_BOTTOMLEFT
+#ifdef LEFT
+#define ALTLEFT BUTTON_BOTTOMLEFT
+#else
+#define LEFT BUTTON_BOTTOMLEFT
#endif
-#ifndef RIGHT
-#define RIGHT BUTTON_BOTTOMRIGHT
+#ifdef RIGHT
+#define ALTRIGHT BUTTON_BOTTOMRIGHT
+#else
+#define RIGHT BUTTON_BOTTOMRIGHT
#endif
-#ifndef SELECT
-#define SELECT BUTTON_CENTER
+#ifdef SELECT
+#define ALTSELECT BUTTON_CENTER
+#else
+#define SELECT BUTTON_CENTER
#endif
#ifndef UP
-#define UP BUTTON_TOPMIDDLE
+#define UP BUTTON_TOPMIDDLE
#endif
#ifndef DOWN
-#define DOWN BUTTON_BOTTOMMIDDLE
+#define DOWN BUTTON_BOTTOMMIDDLE
#endif
#endif
@@ -1100,13 +1106,20 @@ static int brickmania_help(void)
"Destroy", "all", "the", "bricks", "by", "bouncing",
"the", "ball", "of", "them", "using", "the", "paddle.", "", "",
"Controls", "",
- "< & >", "Moves", "the", "paddle", "",
+#if CONFIG_KEYPAD == COWON_D2_PAD
+ "- & +:",
+#else
+ "< & >:",
+#endif
+ "Moves", "the", "paddle", "",
#if CONFIG_KEYPAD == ONDIO_PAD
"MENU:",
#elif (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IAUDIO_M3_PAD)
"PLAY:",
#elif CONFIG_KEYPAD == IRIVER_H300_PAD
"NAVI:",
+#elif CONFIG_KEYPAD == COWON_D2_PAD
+ "MENU:",
#else
"SELECT:",
#endif
@@ -2070,6 +2083,9 @@ static int brickmania_game_loop(void)
#endif
case UP:
case SELECT:
+#ifdef ALTSELECT
+ case ALTSELECT:
+#endif
if (game_state==ST_READY)
{
/* Initialize used balls starting speed */
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index f191a457be..8801668466 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -31,7 +31,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
\ButtonVolDown\ / \ButtonVolUp}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{
\ButtonScrollBack\ / \ButtonScrollFwd}
- \opt{COWON_D2_PAD}{\ButtonMinus\ / \ButtonPlus}
+ \opt{COWON_D2_PAD}{\ButtonMinus{} or \TouchBottomLeft{} / \ButtonPlus{} or \TouchBottomRight}
\opt{HAVEREMOTEKEYMAP}{& }
& Moves the paddle\\
\opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay\ / \ButtonUp}
@@ -40,7 +40,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect\ / \ButtonUp}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
\opt{IRIVER_H10_PAD}{\ButtonPlay\ / \ButtonScrollUp}
- \opt{COWON_D2_PAD}{\ButtonMenu}
+ \opt{COWON_D2_PAD}{\ButtonMenu{} or \TouchCenter}
\opt{HAVEREMOTEKEYMAP}{& }
& Release the ball / Fire\\
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}