diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 22d76c545d..a40be68063 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -39,8 +39,8 @@ bounce.c #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) bubbles.c #endif -#if (LCD_WIDTH != 138) && (LCD_WIDTH != 128) -/* These need adjusting for the Mini's and iRiver if'p screen */ +#if LCD_WIDTH != 128 +/* These need adjusting for the iRiver if'p screen */ brickmania.c #endif calculator.c @@ -59,7 +59,7 @@ solitaire.c sokoban.c star.c starfield.c -#if (LCD_WIDTH != 240) && (LCD_WIDTH != 138) && (LCD_WIDTH != 128) +#if (LCD_WIDTH != 240) && (LCD_WIDTH != 128) tetrox.c #endif #if CONFIG_LCD == LCD_SSD1815 diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index d019cb8924..42cc3cb25d 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -148,9 +148,14 @@ brickmania_sel_start.220x176x16.bmp brickmania_start.220x176x16.bmp brickmania_break.220x176x16.bmp -#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) +#elif (((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \ + ((LCD_WIDTH == 138) && (LCD_HEIGHT == 110))) && (LCD_DEPTH == 2) brickmania_ball.160x128x2.bmp +#if (LCD_WIDTH == 160) brickmania_bricks.160x128x2.bmp +#else +brickmania_bricks.138x110x2.bmp +#endif brickmania_gameover.160x128x2.bmp brickmania_help.160x128x2.bmp brickmania_menu_bg.160x128x2.bmp @@ -215,6 +220,8 @@ tetrox_background.176x132x16.bmp tetrox_background.160x128x16.bmp #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) tetrox_background.160x128x2.bmp +#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) && (LCD_DEPTH == 2) +tetrox_background.138x110x2.bmp #endif diff --git a/apps/plugins/bitmaps/native/brickmania_bricks.138x110x2.bmp b/apps/plugins/bitmaps/native/brickmania_bricks.138x110x2.bmp new file mode 100644 index 0000000000..dbbacecff3 Binary files /dev/null and b/apps/plugins/bitmaps/native/brickmania_bricks.138x110x2.bmp differ diff --git a/apps/plugins/bitmaps/native/tetrox_background.138x110x2.bmp b/apps/plugins/bitmaps/native/tetrox_background.138x110x2.bmp new file mode 100644 index 0000000000..071a9f2b17 Binary files /dev/null and b/apps/plugins/bitmaps/native/tetrox_background.138x110x2.bmp differ diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index ef4dd9e9d9..7c9a2433c7 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -259,6 +259,59 @@ extern const fb_data brickmania_bricks[]; #define STRINGPOS_navi 100 #define STRINGPOS_flipsides 100 +/* iPod Mini */ +#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) +/* The time (in ms) for one iteration through the game loop - decrease this + to speed up the game - note that current_tick is (currently) only accurate + to 10ms. +*/ +#define CYCLETIME 50 + +#define PAD_WIDTH 30 +#define PAD_HEIGHT 5 +#define PAD_POS_Y LCD_HEIGHT - 5 +#define BRICK_HEIGHT 7 +#define BRICK_WIDTH 13 +#define BALL 5 +#define HALFBALL 3 +#define LEFTMARGIN 4 +#define TOPMARGIN 10 + +#define BMPHEIGHT_start 16 +#define BMPWIDTH_start 88 + +#define BMPHEIGHT_resume 14 +#define BMPWIDTH_resume 78 + +#define BMPHEIGHT_help 15 +#define BMPWIDTH_help 30 + +#define BMPHEIGHT_quit 17 +#define BMPWIDTH_quit 30 + +#define BMPHEIGHT_powerup 6 +#define BMPWIDTH_powerup 10 + +#define BMPHEIGHT_menu 45 +#define BMPWIDTH_menu 160 + +#define BMPXOFS_start 28 +#define BMPYOFS_start 41 +#define BMPXOFS_resume 33 +#define BMPYOFS_resume 58 +#define BMPXOFS_help 56 +#define BMPYOFS_help 74 +#define BMPXOFS_quit 56 +#define BMPYOFS_quit 90 +#define HIGHSCORE_XPOS 76 +#define HIGHSCORE_YPOS 22 + +#define STRINGPOS_finsh 54 +#define STRINGPOS_congrats 44 +#define STRINGPOS_navi 44 +#define STRINGPOS_flipsides 44 + + #elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) /* The time (in ms) for one iteration through the game loop - decrease this to speed up the game - note that current_tick is (currently) only accurate diff --git a/docs/CREDITS b/docs/CREDITS index 732ab26e67..b55d2b5898 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -195,3 +195,4 @@ Alexander Bondar Peter Cawley Rani Hod Tom Ross +Anton Romanov