From 831e39065799b4ca6aae60d3fbee4cb946c4b8bf Mon Sep 17 00:00:00 2001 From: Alexander Levin Date: Mon, 2 Mar 2009 20:32:33 +0000 Subject: [PATCH] Improve grammar and key map in reversi (FS#9960 and FS#9961) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20179 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/reversi/reversi-gui.c | 4 ++-- apps/plugins/reversi/reversi-gui.h | 2 +- docs/CREDITS | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index 78e6f068c1..b6bbd5f3b1 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c @@ -612,7 +612,7 @@ enum plugin_status plugin_start(const void *parameter) { if (reversi_game_is_finished(&game, cur_player)) { reversi_count_occupied_cells(&game, &w_cnt, &b_cnt); rb->snprintf(msg_buf, sizeof(msg_buf), - "Game over. %s have won.", + "Game over. %s won.", (w_cnt>b_cnt?"WHITE":"BLACK")); rb->splash(HZ*2, msg_buf); draw_screen = true; /* Must update screen after splash */ @@ -648,7 +648,7 @@ enum plugin_status plugin_start(const void *parameter) { if (reversi_game_is_finished(&game, cur_player)) { reversi_count_occupied_cells(&game, &w_cnt, &b_cnt); rb->snprintf(msg_buf, sizeof(msg_buf), - "Game over. %s have won.", + "Game over. %s won.", (w_cnt>b_cnt?"WHITE":"BLACK")); rb->splash(HZ*2, msg_buf); draw_screen = true; /* Must update screen after splash */ diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index ccd67aaa18..27bd3e421b 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h @@ -116,7 +116,7 @@ #define REVERSI_BUTTON_DOWN BUTTON_DOWN #define REVERSI_BUTTON_LEFT BUTTON_LEFT #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT -#define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT +#define REVERSI_BUTTON_MAKE_MOVE (BUTTON_SELECT|BUTTON_REL) #define REVERSI_BUTTON_MENU (BUTTON_SELECT|BUTTON_REPEAT) #elif CONFIG_KEYPAD == MROBE500_PAD diff --git a/docs/CREDITS b/docs/CREDITS index e9aa7d7af2..4f7a7f5ec9 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -451,6 +451,8 @@ Eric Shattow Joshua Simmons Sei Aoyumi Martin Pool +Gareth Schakel + The libmad team The wavpack team