devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Brickmania: Use touchpad actions even if buttons are assigned to them (Cowon D2)

Browse source 
Thanks for Strife89DS and pixelma for spotting this


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24554 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2010-02-07 20:19:34 +00:00
parent ed0290d30f
commit 07a6de15bd
2 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/plugins/brickmania.c
View file

@ -231,20 +231,26 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#endif #endif
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
#ifndef LEFT #ifdef LEFT
#define LEFT BUTTON_BOTTOMLEFT #define ALTLEFT BUTTON_BOTTOMLEFT
#else
#define LEFT BUTTON_BOTTOMLEFT
#endif #endif
#ifndef RIGHT #ifdef RIGHT
#define RIGHT BUTTON_BOTTOMRIGHT #define ALTRIGHT BUTTON_BOTTOMRIGHT
#else
#define RIGHT BUTTON_BOTTOMRIGHT
#endif #endif
#ifndef SELECT #ifdef SELECT
#define SELECT BUTTON_CENTER #define ALTSELECT BUTTON_CENTER
#else
#define SELECT BUTTON_CENTER
#endif #endif
#ifndef UP #ifndef UP
#define UP BUTTON_TOPMIDDLE #define UP BUTTON_TOPMIDDLE
#endif #endif
#ifndef DOWN #ifndef DOWN
#define DOWN BUTTON_BOTTOMMIDDLE #define DOWN BUTTON_BOTTOMMIDDLE
#endif #endif
#endif #endif
@ -1100,13 +1106,20 @@ static int brickmania_help(void)
"Destroy", "all", "the", "bricks", "by", "bouncing", "Destroy", "all", "the", "bricks", "by", "bouncing",
"the", "ball", "of", "them", "using", "the", "paddle.", "", "", "the", "ball", "of", "them", "using", "the", "paddle.", "", "",
"Controls", "", "Controls", "",
"< & >", "Moves", "the", "paddle", "", #if CONFIG_KEYPAD == COWON_D2_PAD
"- & +:",
#else
"< & >:",
#endif
"Moves", "the", "paddle", "",
#if CONFIG_KEYPAD == ONDIO_PAD #if CONFIG_KEYPAD == ONDIO_PAD
"MENU:", "MENU:",
#elif (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IAUDIO_M3_PAD) #elif (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IAUDIO_M3_PAD)
"PLAY:", "PLAY:",
#elif CONFIG_KEYPAD == IRIVER_H300_PAD #elif CONFIG_KEYPAD == IRIVER_H300_PAD
"NAVI:", "NAVI:",
#elif CONFIG_KEYPAD == COWON_D2_PAD
"MENU:",
#else #else
"SELECT:", "SELECT:",
#endif #endif
@ -2070,6 +2083,9 @@ static int brickmania_game_loop(void)
#endif #endif
case UP: case UP:
case SELECT: case SELECT:
#ifdef ALTSELECT
case ALTSELECT:
#endif
if (game_state==ST_READY) if (game_state==ST_READY)
{ {
/* Initialize used balls starting speed */ /* Initialize used balls starting speed */

4
manual/plugins/brickmania.tex
View file

@ -31,7 +31,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
\ButtonVolDown\ / \ButtonVolUp} \ButtonVolDown\ / \ButtonVolUp}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{ \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{
\ButtonScrollBack\ / \ButtonScrollFwd} \ButtonScrollBack\ / \ButtonScrollFwd}
\opt{COWON_D2_PAD}{\ButtonMinus\ / \ButtonPlus} \opt{COWON_D2_PAD}{\ButtonMinus{} or \TouchBottomLeft{} / \ButtonPlus{} or \TouchBottomRight}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Moves the paddle\\ & Moves the paddle\\
\opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay\ / \ButtonUp} \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} ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonSelect\ / \ButtonUp}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect} \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
\opt{IRIVER_H10_PAD}{\ButtonPlay\ / \ButtonScrollUp} \opt{IRIVER_H10_PAD}{\ButtonPlay\ / \ButtonScrollUp}
\opt{COWON_D2_PAD}{\ButtonMenu} \opt{COWON_D2_PAD}{\ButtonMenu{} or \TouchCenter}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Release the ball / Fire\\ & Release the ball / Fire\\
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}