diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/blackjack.c | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index bb9d202fb7..5032a537cf 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -357,12 +357,13 @@ struct highscore highest[NUM_SCORES]; | |||
357 | 357 | ||
358 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 358 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
359 | #define BJACK_SELECT_NAME "SELECT" | 359 | #define BJACK_SELECT_NAME "SELECT" |
360 | #define BJACK_STAY_NAME "DOWN" | 360 | #define BJACK_STAY_NAME "PLAY" |
361 | #define BJACK_RESUME_NAME "MENU" | 361 | #define BJACK_RESUME_NAME "MENU" |
362 | #define BJACK_QUIT_NAME "BACK" | 362 | #define BJACK_QUIT_NAME "POWER" |
363 | #define BJACK_DOUBLE_NAME "CUSTOM" | 363 | #define BJACK_DOUBLE_NAME "CUSTOM" |
364 | #define BJACK_SELECT BUTTON_SELECT | 364 | #define BJACK_SELECT BUTTON_SELECT |
365 | #define BJACK_QUIT BUTTON_BACK | 365 | #define BJACK_QUIT BUTTON_POWER |
366 | #define BJACK_STAY BUTTON_PLAY | ||
366 | #define BJACK_MAX (BUTTON_CUSTOM|BUTTON_UP) | 367 | #define BJACK_MAX (BUTTON_CUSTOM|BUTTON_UP) |
367 | #define BJACK_MIN (BUTTON_CUSTOM|BUTTON_DOWN) | 368 | #define BJACK_MIN (BUTTON_CUSTOM|BUTTON_DOWN) |
368 | #define BJACK_DOUBLEDOWN BUTTON_CUSTOM | 369 | #define BJACK_DOUBLEDOWN BUTTON_CUSTOM |
@@ -896,17 +897,6 @@ static void blackjack_savegame(struct game_context* bj) { | |||
896 | } | 897 | } |
897 | 898 | ||
898 | /***************************************************************************** | 899 | /***************************************************************************** |
899 | * blackjack_callback() is the default event handler callback which is called | ||
900 | * on usb connect and shutdown. | ||
901 | ******************************************************************************/ | ||
902 | static void blackjack_callback(void* param) { | ||
903 | struct game_context* bj = (struct game_context*) param; | ||
904 | if(bj->dirty) { | ||
905 | highscore_save(HIGH_SCORE,highest,NUM_SCORES); | ||
906 | } | ||
907 | } | ||
908 | |||
909 | /***************************************************************************** | ||
910 | * blackjack_get_yes_no() gets a yes/no answer from the user | 900 | * blackjack_get_yes_no() gets a yes/no answer from the user |
911 | ******************************************************************************/ | 901 | ******************************************************************************/ |
912 | static unsigned int blackjack_get_yes_no(char message[20]) { | 902 | static unsigned int blackjack_get_yes_no(char message[20]) { |
@@ -1210,7 +1200,6 @@ void showhelp(void) { | |||
1210 | * blackjack_menu() is the initial menu at the start of the game. | 1200 | * blackjack_menu() is the initial menu at the start of the game. |
1211 | ******************************************************************************/ | 1201 | ******************************************************************************/ |
1212 | static unsigned int blackjack_menu(struct game_context* bj) { | 1202 | static unsigned int blackjack_menu(struct game_context* bj) { |
1213 | int button; | ||
1214 | int selection=0; | 1203 | int selection=0; |
1215 | bool breakout = false; | 1204 | bool breakout = false; |
1216 | 1205 | ||
@@ -1242,10 +1231,11 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1242 | break; | 1231 | break; |
1243 | case 5: | 1232 | case 5: |
1244 | return BJ_QUIT; | 1233 | return BJ_QUIT; |
1234 | |||
1235 | case MENU_ATTACHED_USB: | ||
1236 | return BJ_USB; | ||
1237 | |||
1245 | default: | 1238 | default: |
1246 | if(rb->default_event_handler_ex(button, blackjack_callback, | ||
1247 | (void*) bj) == SYS_USB_CONNECTED) | ||
1248 | return BJ_USB; | ||
1249 | break; | 1239 | break; |
1250 | } | 1240 | } |
1251 | } | 1241 | } |
@@ -1537,6 +1527,9 @@ enum plugin_status plugin_start(const void* parameter) | |||
1537 | 1527 | ||
1538 | case BJ_USB: | 1528 | case BJ_USB: |
1539 | rb->lcd_setfont(FONT_UI); | 1529 | rb->lcd_setfont(FONT_UI); |
1530 | if(bj.dirty) { | ||
1531 | highscore_save(HIGH_SCORE,highest,NUM_SCORES); | ||
1532 | } | ||
1540 | return PLUGIN_USB_CONNECTED; | 1533 | return PLUGIN_USB_CONNECTED; |
1541 | 1534 | ||
1542 | case BJ_QUIT: | 1535 | case BJ_QUIT: |