diff options
| author | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-27 09:35:47 +0000 |
|---|---|---|
| committer | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-27 09:35:47 +0000 |
| commit | b21b0c872e2b9d3169eb0a4c3d57095cdf5b1b28 (patch) | |
| tree | 000ed728b5638948692b6a20e81f33ebcc94c9ad /apps | |
| parent | 66916c6d6701f379d6040424e3245bd0fe64d0ed (diff) | |
| download | rockbox-b21b0c872e2b9d3169eb0a4c3d57095cdf5b1b28.tar.gz rockbox-b21b0c872e2b9d3169eb0a4c3d57095cdf5b1b28.zip | |
Brickmania: Use NUMBER_OF_POWERUPS in enum
Thanks for kugel and linuxstb for this
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24935 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/plugins/brickmania.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index c95a88ac06..f39d9b03c7 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -312,8 +312,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define BRICK_HEIGHT FIXED3(BMPHEIGHT_brickmania_bricks/7) #define BRICK_WIDTH FIXED3(BMPWIDTH_brickmania_bricks) #define LEFTMARGIN ((GAMESCREEN_WIDTH-10*BRICK_WIDTH)/2) -#define POWER_TYPE_COUNT 9 /* Number of items in enum power_types */ -#define POWERUP_HEIGHT FIXED3(BMPHEIGHT_brickmania_powerups/POWER_TYPE_COUNT) #define POWERUP_WIDTH FIXED3(BMPWIDTH_brickmania_powerups) #define BALL FIXED3(BMPHEIGHT_brickmania_ball) #define HALFBALL (BALL / 2) @@ -874,11 +872,12 @@ enum power_types POWER_TYPE_EXTRA_BALL, POWER_TYPE_PADDLE_LONG, POWER_TYPE_PADDLE_SHORT, - /* Make sure to update POWER_TYPE_COUNT value when adding new types */ + NUMBER_OF_POWERUPS, }; +#define POWERUP_HEIGHT FIXED3(BMPHEIGHT_brickmania_powerups/NUMBER_OF_POWERUPS) /* Increasing this value makes the game with less powerups */ -#define POWER_RAND (POWER_TYPE_COUNT + 15) +#define POWER_RAND (NUMBER_OF_POWERUPS + 15) enum difficulty_options { @@ -1426,7 +1425,7 @@ static void brick_hit(int i, int j) { int ran = rb->rand()%POWER_RAND; - if (ran<POWER_TYPE_COUNT) + if (ran<NUMBER_OF_POWERUPS) { power[used_powers].top = TOPMARGIN + i*BRICK_HEIGHT; power[used_powers].x_pos = LEFTMARGIN + j*BRICK_WIDTH + |