summaryrefslogtreecommitdiffstats
path: root/apps/plugins/solitaire.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/solitaire.c')
-rw-r--r--apps/plugins/solitaire.c53
1 files changed, 17 insertions, 36 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 1996dc97e7..6c496663cf 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -646,26 +646,7 @@ CONFIG_KEYPAD == MROBE500_PAD
# define HK_CUR2STACK "DBL PLAY"
# define HK_REM2STACK "NEXT"
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-# define SOL_QUIT BUTTON_POWER
-# define SOL_UP BUTTON_HOME
-# define SOL_DOWN BUTTON_OPTION
-# define SOL_LEFT BUTTON_PREV
-# define SOL_RIGHT BUTTON_NEXT
-# define SOL_MOVE_PRE BUTTON_PLAY
-# define SOL_MOVE (BUTTON_PLAY | BUTTON_REL)
-# define SOL_DRAW (BUTTON_POWER | BUTTON_REPEAT)
-# define SOL_REM2CUR BUTTON_VOL_DOWN
-# define SOL_CUR2STACK_PRE BUTTON_PLAY
-# define SOL_CUR2STACK (BUTTON_PLAY | BUTTON_REPEAT)
-# define SOL_REM2STACK BUTTON_VOL_UP
-# define HK_MOVE "PLAY"
-# define HK_DRAW "DBL HOME"
-# define HK_REM2CUR "PREV"
-# define HK_CUR2STACK "DBL PLAY"
-# define HK_REM2STACK "NEXT"
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
# define SOL_QUIT BUTTON_POWER
# define SOL_UP BUTTON_HOME
# define SOL_DOWN BUTTON_OPTION
@@ -703,7 +684,7 @@ CONFIG_KEYPAD == MROBE500_PAD
# define HK_CUR2STACK "DBL PLAY"
# define HK_REM2STACK "NEXT"
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
# define SOL_QUIT BUTTON_POWER
# define SOL_UP BUTTON_PREV
# define SOL_DOWN BUTTON_NEXT
@@ -722,24 +703,24 @@ CONFIG_KEYPAD == MROBE500_PAD
# define HK_CUR2STACK "DBL PLAY"
# define HK_REM2STACK "POWER+"
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
# define SOL_QUIT BUTTON_POWER
# define SOL_UP BUTTON_PREV
# define SOL_DOWN BUTTON_NEXT
-# define SOL_LEFT BUTTON_HOME
-# define SOL_RIGHT BUTTON_VOL_DOWN
-# define SOL_MOVE_PRE BUTTON_VOL_UP
+# define SOL_LEFT BUTTON_SCROLL_BACK
+# define SOL_RIGHT BUTTON_SCROLL_FWD
+# define SOL_MOVE_PRE BUTTON_PLAY
# define SOL_MOVE (BUTTON_PLAY | BUTTON_REL)
# define SOL_DRAW (BUTTON_POWER | BUTTON_REPEAT)
-# define SOL_REM2CUR (BUTTON_POWER | BUTTON_VOL_DOWN)
+# define SOL_REM2CUR BUTTON_VOL_DOWN
# define SOL_CUR2STACK_PRE BUTTON_PLAY
# define SOL_CUR2STACK (BUTTON_PLAY | BUTTON_REPEAT)
-# define SOL_REM2STACK (BUTTON_POWER | BUTTON_VOL_UP)
+# define SOL_REM2STACK BUTTON_VOL_UP
# define HK_MOVE "PLAY"
-# define HK_DRAW "DBL POWER"
-# define HK_REM2CUR "POWER"
+# define HK_DRAW "DBL HOME"
+# define HK_REM2CUR "PREV"
# define HK_CUR2STACK "DBL PLAY"
-# define HK_REM2STACK "POWER+"
+# define HK_REM2STACK "NEXT"
#else
#error No keymap defined!
@@ -950,8 +931,8 @@ static void draw_card( card_t *card, int x, int y,
if( card->known )
{
rb->lcd_bitmap_part( card_deck, CARD_GFX_WIDTH * card->num,
- CARD_GFX_HEIGHT * card->suit,
- STRIDE(SCREEN_MAIN,
+ CARD_GFX_HEIGHT * card->suit,
+ STRIDE(SCREEN_MAIN,
BMPWIDTH_card_deck, BMPHEIGHT_card_deck),
x+1, y+1, CARD_GFX_WIDTH, CARD_GFX_HEIGHT );
}
@@ -967,7 +948,7 @@ static void draw_card( card_t *card, int x, int y,
static void draw_empty_stack( int s, int x, int y, bool cursor )
{
rb->lcd_bitmap_part( solitaire_suitsi, 0,
- CARD_GFX_HEIGHT * s,
+ CARD_GFX_HEIGHT * s,
STRIDE( SCREEN_MAIN,
BMPWIDTH_solitaire_suitsi, BMPHEIGHT_solitaire_suitsi),
x+1, y+1, CARD_GFX_WIDTH, CARD_GFX_HEIGHT );
@@ -1618,11 +1599,11 @@ static int save_game( void )
static int load_game( void )
{
int checksum, retval;
-
+
int fd = open_save_file( O_RDONLY );
if( fd < 0 )
return -1;
-
+
retval = 0; /* Assume good case */
if( ( rb->lseek( fd, -(off_t)sizeof( int ), SEEK_END ) == -((ssize_t)sizeof( int ))-1 )
|| ( rb->read( fd, &checksum, sizeof( int ) ) < ((ssize_t)sizeof( int )) )
@@ -1646,7 +1627,7 @@ static int load_game( void )
rb->splash( 2*HZ, "Save file was corrupted. Aborting." );
retval = -3;
}
-
+
rb->close( fd );
delete_save_file();
return retval;