diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-11-18 13:42:09 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-11-18 13:42:09 +0000 |
commit | 65e0a0c934b7d07e588cf8034dbec80333540930 (patch) | |
tree | 2296e1a842012e128780744df28ccff3bc262eb5 /apps/plugins/bubbles.c | |
parent | 73e31d1af363905af315c9570a74744153f02c5c (diff) | |
download | rockbox-65e0a0c934b7d07e588cf8034dbec80333540930.tar.gz rockbox-65e0a0c934b7d07e588cf8034dbec80333540930.zip |
fix bubbles for good this time.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11547 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/bubbles.c')
-rwxr-xr-x | apps/plugins/bubbles.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 254539603f..2ff145b5f7 100755 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -2338,8 +2338,10 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2338 | long start; | 2338 | long start; |
2339 | const struct button_mapping *plugin_contexts[] | 2339 | const struct button_mapping *plugin_contexts[] |
2340 | = {generic_left_right_fire,generic_actions}; | 2340 | = {generic_left_right_fire,generic_actions}; |
2341 | button = pluginlib_getaction(rb,timeout,plugin_contexts,2); | ||
2342 | 2341 | ||
2342 | if (timeout < 0) | ||
2343 | timeout = 0; | ||
2344 | button = pluginlib_getaction(rb,timeout,plugin_contexts,2); | ||
2343 | #ifdef HAS_BUTTON_HOLD | 2345 | #ifdef HAS_BUTTON_HOLD |
2344 | if (rb->button_hold()) | 2346 | if (rb->button_hold()) |
2345 | button = BUBBLES_START; | 2347 | button = BUBBLES_START; |
@@ -2390,7 +2392,8 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2390 | case BUBBLES_QUIT: /* end the game */ | 2392 | case BUBBLES_QUIT: /* end the game */ |
2391 | return BB_END; | 2393 | return BB_END; |
2392 | 2394 | ||
2393 | case ACTION_UNKNOWN: /* no button pressed */ | 2395 | case ACTION_UNKNOWN: |
2396 | case ACTION_NONE: /* no button pressed */ | ||
2394 | break; | 2397 | break; |
2395 | 2398 | ||
2396 | default: | 2399 | default: |