Index: apps/plugins/brickmania.c =================================================================== --- apps/plugins/brickmania.c (révision 22588) +++ apps/plugins/brickmania.c (copie de travail) @@ -258,12 +258,7 @@ #define TOPMARGIN (BRICK_HEIGHT * 2) -#if LCD_WIDTH<=LCD_HEIGHT -/* Maintain a 4/3 ratio (Width/Height) */ -#define GAMESCREEN_HEIGHT (LCD_WIDTH * 3 / 4) -#else #define GAMESCREEN_HEIGHT LCD_HEIGHT -#endif #define STRINGPOS_FINISH (GAMESCREEN_HEIGHT - (GAMESCREEN_HEIGHT / 6)) #define STRINGPOS_CONGRATS (STRINGPOS_FINISH - 20) @@ -273,28 +268,27 @@ /* Brickmania was originally designed for the H300, other targets should scale * up/down as needed based on the screen height. */ -#define SPEED_SCALE GAMESCREEN_HEIGHT/176 +#define SCALE_SPEED_HW(X) (((4 * (X * LCD_WIDTH * LCD_HEIGHT) / (176 * 220)) + X) / 5) +#define SCALE_SPEED_W(X) (((4 * (X * LCD_WIDTH ) / ( 220)) + X) / 5) /* These are all used as ball speeds depending on where the ball hit the * paddle. */ -#define SPEED_1Q_X ( 6 * SPEED_SCALE) -#define SPEED_1Q_Y (-2 * SPEED_SCALE) -#define SPEED_2Q_X ( 4 * SPEED_SCALE) -#define SPEED_2Q_Y (-3 * SPEED_SCALE) -#define SPEED_3Q_X ( 3 * SPEED_SCALE) -#define SPEED_3Q_Y (-4 * SPEED_SCALE) -#define SPEED_4Q_X ( 2 * SPEED_SCALE) -#define SPEED_4Q_Y (-4 * SPEED_SCALE) +#define SPEED_1Q_X SCALE_SPEED_HW( 6) +#define SPEED_1Q_Y SCALE_SPEED_HW(-2) +#define SPEED_2Q_X SCALE_SPEED_HW( 4) +#define SPEED_2Q_Y SCALE_SPEED_HW(-3) +#define SPEED_3Q_X SCALE_SPEED_HW( 3) +#define SPEED_3Q_Y SCALE_SPEED_HW(-4) +#define SPEED_4Q_X SCALE_SPEED_HW( 2) +#define SPEED_4Q_Y SCALE_SPEED_HW(-4) /* This is used to determine the speed of the paddle */ -#define SPEED_PAD ( 8 * SPEED_SCALE) - +#define SPEED_PAD SCALE_SPEED_W( 8) /* This defines the speed that the powerups drop */ -#define SPEED_POWER ( 2 * SPEED_SCALE) - +#define SPEED_POWER SCALE_SPEED_HW( 2) /* This defines the speed that the shot moves */ -#define SPEED_FIRE ( 4 * SPEED_SCALE) +#define SPEED_FIRE SCALE_SPEED_HW( 4) /*calculate paddle y-position */ #define PAD_POS_Y (GAMESCREEN_HEIGHT - PAD_HEIGHT - 1)