summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2009-12-13 21:04:16 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2009-12-13 21:04:16 +0000
commitf5e996532d3ac9d1607bf5018bd4834fda722c2c (patch)
treef772bc0cbd3a85b383f0ecd6e083539a8693877c /apps
parent1737a401e494562db6e997b883eddbd528608d88 (diff)
downloadrockbox-f5e996532d3ac9d1607bf5018bd4834fda722c2c.tar.gz
rockbox-f5e996532d3ac9d1607bf5018bd4834fda722c2c.tar.bz2
rockbox-f5e996532d3ac9d1607bf5018bd4834fda722c2c.zip
Bubbles: Rename defines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23980 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/bubbles.c20
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 {
#define ANGLE_STEP_REP 4
#endif
-#define BUBBLES_QUIT PLA_QUIT
-#define BUBBLES_START PLA_START
-#define BUBBLES_SELECT PLA_FIRE
-#define BUBBLES_RESUME PLA_MENU
+#define BUBBLES_QUIT1 PLA_QUIT
+#define BUBBLES_QUIT2 PLA_MENU
+#define BUBBLES_PAUSE PLA_START
+#define BUBBLES_FIRE PLA_FIRE
/* external bitmaps */
#ifdef HAVE_LCD_COLOR
@@ -2305,7 +2305,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
#if defined(HAS_BUTTON_HOLD) && !defined(HAVE_REMOTE_LCD_AS_MAIN)
/* FIXME: Should probably check remote hold here */
if (rb->button_hold())
- button = BUBBLES_START;
+ button = BUBBLES_PAUSE;
#endif
switch(button){
@@ -2321,7 +2321,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
if(bb->angle < MAX_ANGLE) bb->angle += ANGLE_STEP;
break;
- case BUBBLES_SELECT: /* fire the shot */
+ case BUBBLES_FIRE: /* fire the shot */
if(!animblock) {
bb->elapsedlvl += bb->elapsedshot;
bb->elapsedshot = 0;
@@ -2333,18 +2333,18 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
}
break;
- case BUBBLES_START: /* pause the game */
+ case BUBBLES_PAUSE: /* pause the game */
start = *rb->current_tick;
rb->splash(0, "Paused");
while(pluginlib_getaction(TIMEOUT_BLOCK,plugin_contexts,2)
- != (BUBBLES_START));
+ != BUBBLES_PAUSE);
bb->startedshot += *rb->current_tick-start;
bubbles_drawboard(bb);
rb->lcd_update();
break;
- case BUBBLES_RESUME: /* save and end the game */
- case BUBBLES_QUIT: /* end the game */
+ case BUBBLES_QUIT1:
+ case BUBBLES_QUIT2: /* end the game */
if(!animblock) {
resume = true;
return BB_END;