diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/bubbles.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 5b36c6692e..6d386aa08c 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -84,10 +84,10 @@ enum { | |||
84 | #define ANGLE_STEP_REP 4 | 84 | #define ANGLE_STEP_REP 4 |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #define BUBBLES_QUIT PLA_QUIT | 87 | #define BUBBLES_QUIT1 PLA_QUIT |
88 | #define BUBBLES_START PLA_START | 88 | #define BUBBLES_QUIT2 PLA_MENU |
89 | #define BUBBLES_SELECT PLA_FIRE | 89 | #define BUBBLES_PAUSE PLA_START |
90 | #define BUBBLES_RESUME PLA_MENU | 90 | #define BUBBLES_FIRE PLA_FIRE |
91 | 91 | ||
92 | /* external bitmaps */ | 92 | /* external bitmaps */ |
93 | #ifdef HAVE_LCD_COLOR | 93 | #ifdef HAVE_LCD_COLOR |
@@ -2305,7 +2305,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2305 | #if defined(HAS_BUTTON_HOLD) && !defined(HAVE_REMOTE_LCD_AS_MAIN) | 2305 | #if defined(HAS_BUTTON_HOLD) && !defined(HAVE_REMOTE_LCD_AS_MAIN) |
2306 | /* FIXME: Should probably check remote hold here */ | 2306 | /* FIXME: Should probably check remote hold here */ |
2307 | if (rb->button_hold()) | 2307 | if (rb->button_hold()) |
2308 | button = BUBBLES_START; | 2308 | button = BUBBLES_PAUSE; |
2309 | #endif | 2309 | #endif |
2310 | 2310 | ||
2311 | switch(button){ | 2311 | switch(button){ |
@@ -2321,7 +2321,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2321 | if(bb->angle < MAX_ANGLE) bb->angle += ANGLE_STEP; | 2321 | if(bb->angle < MAX_ANGLE) bb->angle += ANGLE_STEP; |
2322 | break; | 2322 | break; |
2323 | 2323 | ||
2324 | case BUBBLES_SELECT: /* fire the shot */ | 2324 | case BUBBLES_FIRE: /* fire the shot */ |
2325 | if(!animblock) { | 2325 | if(!animblock) { |
2326 | bb->elapsedlvl += bb->elapsedshot; | 2326 | bb->elapsedlvl += bb->elapsedshot; |
2327 | bb->elapsedshot = 0; | 2327 | bb->elapsedshot = 0; |
@@ -2333,18 +2333,18 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2333 | } | 2333 | } |
2334 | break; | 2334 | break; |
2335 | 2335 | ||
2336 | case BUBBLES_START: /* pause the game */ | 2336 | case BUBBLES_PAUSE: /* pause the game */ |
2337 | start = *rb->current_tick; | 2337 | start = *rb->current_tick; |
2338 | rb->splash(0, "Paused"); | 2338 | rb->splash(0, "Paused"); |
2339 | while(pluginlib_getaction(TIMEOUT_BLOCK,plugin_contexts,2) | 2339 | while(pluginlib_getaction(TIMEOUT_BLOCK,plugin_contexts,2) |
2340 | != (BUBBLES_START)); | 2340 | != BUBBLES_PAUSE); |
2341 | bb->startedshot += *rb->current_tick-start; | 2341 | bb->startedshot += *rb->current_tick-start; |
2342 | bubbles_drawboard(bb); | 2342 | bubbles_drawboard(bb); |
2343 | rb->lcd_update(); | 2343 | rb->lcd_update(); |
2344 | break; | 2344 | break; |
2345 | 2345 | ||
2346 | case BUBBLES_RESUME: /* save and end the game */ | 2346 | case BUBBLES_QUIT1: |
2347 | case BUBBLES_QUIT: /* end the game */ | 2347 | case BUBBLES_QUIT2: /* end the game */ |
2348 | if(!animblock) { | 2348 | if(!animblock) { |
2349 | resume = true; | 2349 | resume = true; |
2350 | return BB_END; | 2350 | return BB_END; |