len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-16 16:42:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Jewels: fix a couple minor menu inconsistencies

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9623 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Adam Boot 2006-04-11 21:46:51 +00:00
parent d01d65f55a
commit c9ca7ef23d
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
apps/plugins/jewels.c
View file

@ -78,12 +78,12 @@ PLUGIN_HEADER
#define JEWELS_CANCEL BUTTON_PLAY #define JEWELS_CANCEL BUTTON_PLAY
#elif CONFIG_KEYPAD == GIGABEAT_PAD #elif CONFIG_KEYPAD == GIGABEAT_PAD
#define JEWELS_UP BUTTON_UP #define JEWELS_UP BUTTON_UP
#define JEWELS_DOWN BUTTON_DOWN #define JEWELS_DOWN BUTTON_DOWN
#define JEWELS_LEFT BUTTON_LEFT #define JEWELS_LEFT BUTTON_LEFT
#define JEWELS_RIGHT BUTTON_RIGHT #define JEWELS_RIGHT BUTTON_RIGHT
#define JEWELS_SELECT BUTTON_SELECT #define JEWELS_SELECT BUTTON_SELECT
#define JEWELS_CANCEL BUTTON_A #define JEWELS_CANCEL BUTTON_A
#else #else
#error JEWELS: Unsupported keypad #error JEWELS: Unsupported keypad
@ -96,8 +96,9 @@ PLUGIN_HEADER
#define YOFS 0 #define YOFS 0
#define NUM_SCORES 10 #define NUM_SCORES 10
/* use 22x22 tiles (H300, iPod Color) */ /* use 22x22 tiles (H300, iPod Color, Gigabeat) */
#elif ((LCD_HEIGHT == 176) && (LCD_WIDTH == 220)) || ((LCD_HEIGHT == 320) && (LCD_WIDTH == 240)) #elif ((LCD_HEIGHT == 176) && (LCD_WIDTH == 220)) || \
((LCD_HEIGHT == 320) && (LCD_WIDTH == 240))
#define TILE_WIDTH 22 #define TILE_WIDTH 22
#define TILE_HEIGHT 22 #define TILE_HEIGHT 22
#define YOFS 0 #define YOFS 0
@ -1285,6 +1286,7 @@ static int jewels_main(struct game_context* bj) {
case MRES_PLAYBACK: case MRES_PLAYBACK:
playback_control(rb); playback_control(rb);
inmenu = false; inmenu = false;
selected = false;
break; break;
case MRES_SAVE: case MRES_SAVE:
@ -1305,12 +1307,14 @@ static int jewels_main(struct game_context* bj) {
switch(button){ switch(button){
case JEWELS_LEFT: /* move cursor left */ case JEWELS_LEFT: /* move cursor left */
case (JEWELS_LEFT|BUTTON_REPEAT): case (JEWELS_LEFT|BUTTON_REPEAT):
if(selected) { if(!inmenu) {
bj->score += jewels_swapjewels(bj, x, y, SWAP_LEFT); if(selected) {
selected = false; bj->score += jewels_swapjewels(bj, x, y, SWAP_LEFT);
if (!jewels_movesavail(bj)) return BJ_LOSE; selected = false;
} else { if (!jewels_movesavail(bj)) return BJ_LOSE;
x = (x+BJ_WIDTH-1)%BJ_WIDTH; } else {
x = (x+BJ_WIDTH-1)%BJ_WIDTH;
}
} }
break; break;