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

snake: Clear backdrop before displaying highscores and restore background, foreground and backdrop after displaying highscores.

Browse source 
go back to menu when game is over. r22206 failed to do it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22408 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2009-08-18 13:40:08 +00:00
parent 5c20ddfcd9
commit 08bf107214
1 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

44
apps/plugins/snake.c
View file

@ -220,7 +220,7 @@ PLUGIN_HEADER
static int board[BOARD_WIDTH][BOARD_HEIGHT],snakelength; static int board[BOARD_WIDTH][BOARD_HEIGHT],snakelength;
static int score,level=1; static int score,level=1;
static int dir,dead=0; static int dir,dead=0,quit=0;
static bool apple; static bool apple;
static struct highscore highscores[NUM_SCORES]; static struct highscore highscores[NUM_SCORES];
@ -247,6 +247,12 @@ void die (void)
void colission (short x, short y) void colission (short x, short y)
{ {
if (x==BOARD_WIDTH || x<0 || y==BOARD_HEIGHT || y<0)
{
die();
return;
}
switch (board[x][y]) { switch (board[x][y]) {
case 0: case 0:
break; break;
@ -259,8 +265,6 @@ void colission (short x, short y)
die(); die();
break; break;
} }
if (x==BOARD_WIDTH || x<0 || y==BOARD_HEIGHT || y<0)
die();
} }
void move_head (short x, short y) void move_head (short x, short y)
@ -362,6 +366,7 @@ void game_pause (void) {
#endif #endif
case SNAKE_QUIT: case SNAKE_QUIT:
dead=1; dead=1;
quit=1;
return; return;
case SNAKE_PLAYPAUSE: case SNAKE_PLAYPAUSE:
redraw(); redraw();
@ -369,7 +374,8 @@ void game_pause (void) {
return; return;
default: default:
if (rb->default_event_handler(button)==SYS_USB_CONNECTED) { if (rb->default_event_handler(button)==SYS_USB_CONNECTED) {
dead=2; dead = 1;
quit = 2;
return; return;
} }
break; break;
@ -422,14 +428,14 @@ void game (void) {
case SNAKE_RC_QUIT: case SNAKE_RC_QUIT:
#endif #endif
case SNAKE_QUIT: case SNAKE_QUIT:
dead=1; quit = 1;
return; return;
case SNAKE_PLAYPAUSE: case SNAKE_PLAYPAUSE:
game_pause(); game_pause();
break; break;
default: default:
if (rb->default_event_handler(button)==SYS_USB_CONNECTED) { if (rb->default_event_handler(button)==SYS_USB_CONNECTED) {
dead=2; quit = 2;
return; return;
} }
break; break;
@ -453,6 +459,10 @@ void game_init(void) {
score=0; score=0;
board[11][7]=1; board[11][7]=1;
#if LCD_DEPTH > 1
fb_data *backdrop = rb->lcd_get_backdrop();
#endif
MENUITEM_STRINGLIST(menu, "Snake Menu", NULL, MENUITEM_STRINGLIST(menu, "Snake Menu", NULL,
"Start New Game", "Starting Level", "Start New Game", "Starting Level",
"High Scores", "High Scores",
@ -473,7 +483,19 @@ void game_init(void) {
break; break;
case 2: case 2:
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(NULL);
#endif
highscore_show(NUM_SCORES, highscores, NUM_SCORES, true); highscore_show(NUM_SCORES, highscores, NUM_SCORES, true);
rb->lcd_setfont(FONT_UI);
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(backdrop);
#ifdef HAVE_LCD_COLOR
rb->lcd_set_background(rb->global_settings->bg_color);
rb->lcd_set_foreground(rb->global_settings->fg_color);
#endif
#endif
break; break;
case 3: case 3:
@ -481,12 +503,12 @@ void game_init(void) {
break; break;
case MENU_ATTACHED_USB: case MENU_ATTACHED_USB:
dead = 2; quit = 2;
menu_quit = true; menu_quit = true;
break; break;
default: default:
dead=1; /* quit program */ quit = 1; /* quit program */
menu_quit = true; menu_quit = true;
break; break;
@ -499,16 +521,16 @@ enum plugin_status plugin_start(const void* parameter)
(void)(parameter); (void)(parameter);
highscore_load(SCORE_FILE, highscores, NUM_SCORES); highscore_load(SCORE_FILE, highscores, NUM_SCORES);
while(dead == 0) while(!quit)
{ {
game_init(); game_init();
if(dead) if(quit)
break; break;
rb->lcd_clear_display(); rb->lcd_clear_display();
game(); game();
} }
highscore_save(SCORE_FILE, highscores, NUM_SCORES); highscore_save(SCORE_FILE, highscores, NUM_SCORES);
return (dead==1)?PLUGIN_OK:PLUGIN_USB_CONNECTED; return (quit==1)?PLUGIN_OK:PLUGIN_USB_CONNECTED;
} }
#endif #endif