Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Brickmania: Test if power-up hit side of paddle

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24949 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2010-02-27 18:45:37 +00:00
parent ce8b00d540
commit 985d0bb3f0
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/plugins/brickmania.c
View file

@ -901,11 +901,11 @@ enum paddle_type
enum intersection enum intersection
{ {
INTERSECTION_NONE = 0,
INTERSECTION_TOP, INTERSECTION_TOP,
INTERSECTION_BOTTOM, INTERSECTION_BOTTOM,
INTERSECTION_LEFT, INTERSECTION_LEFT,
INTERSECTION_RIGHT, INTERSECTION_RIGHT,
INTERSECTION_ALL,
}; };
struct brick struct brick
@ -1147,8 +1147,13 @@ static int check_rect(struct line *line, struct rect *rect,
break; break;
} }
default: case INTERSECTION_ALL: /* Test hit on all edges */
return 0; /* shouldn't reach here */ {
return (check_rect(line, rect, INTERSECTION_TOP, hitp) ||
check_rect(line, rect, INTERSECTION_BOTTOM, hitp) ||
check_rect(line, rect, INTERSECTION_LEFT, hitp) ||
check_rect(line, rect, INTERSECTION_RIGHT, hitp));
}
} }
return check_lines(line, &edge, hitp); return check_lines(line, &edge, hitp);
@ -1516,8 +1521,8 @@ static int brickmania_game_loop(void)
int sec_count=0; int sec_count=0;
int end; int end;
/* pad_line used for powerup/ball checks */ /* pad_rect used for powerup/ball checks */
struct line pad_line; struct rect pad_rect;
/* This is used for various lines that are checked (ball and powerup) */ /* This is used for various lines that are checked (ball and powerup) */
struct line misc_line; struct line misc_line;
@ -1602,11 +1607,11 @@ static int brickmania_game_loop(void)
brick_on_board--; brick_on_board--;
/* Setup the pad line-later used in intersection test */ /* Setup the pad line-later used in intersection test */
pad_line.p1.x = pad_pos_x; pad_rect.top_left.x = pad_pos_x;
pad_line.p1.y = PAD_POS_Y; pad_rect.top_left.y = PAD_POS_Y;
pad_line.p2.x = pad_pos_x + pad_width; pad_rect.bottom_right.x = pad_pos_x + pad_width;
pad_line.p2.y = PAD_POS_Y; pad_rect.bottom_right.y = PAD_POS_Y + PAD_HEIGHT;
if (game_state!=ST_PAUSE) if (game_state!=ST_PAUSE)
{ {
@ -1668,7 +1673,8 @@ static int brickmania_game_loop(void)
misc_line.p2.y += SPEED_POWER; misc_line.p2.y += SPEED_POWER;
/* Check if the powerup will hit the paddle */ /* Check if the powerup will hit the paddle */
if (check_lines(&misc_line, &pad_line, &pt_hit)) if (check_rect(&misc_line, &pad_rect, INTERSECTION_ALL,
&pt_hit))
{ {
/* power hit paddle */ /* power hit paddle */
@ -2051,7 +2057,8 @@ static int brickmania_game_loop(void)
/* Did the ball hit the paddle? Depending on where the ball /* Did the ball hit the paddle? Depending on where the ball
* Hit set the x/y speed appropriately. * Hit set the x/y speed appropriately.
*/ */
if(check_lines(&misc_line, &pad_line, &pt_hit) ) if(check_rect(&misc_line, &pad_rect, INTERSECTION_TOP,
&pt_hit) )
{ {
/* Re-position ball based on collision */ /* Re-position ball based on collision */
ball[k].tempy = ON_PAD_POS_Y; ball[k].tempy = ON_PAD_POS_Y;