Added better random function for ball bounces

kliao2016 · Nov 13, 2017 · ae44e9b · ae44e9b
1 parent 9fa5188
commit ae44e9b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/BrickBreaker.elf b/BrickBreaker.elf
diff --git a/BrickBreaker.gba b/BrickBreaker.gba
diff --git a/game.c b/game.c
@@ -131,11 +131,10 @@ void handleCollisions(Ball *ballptr, Slider *sldptr) {
  && ballptr->col >= (sldptr->col - BALLSIZE)
  && ballptr->col <= (sldptr->col + SLIDER_WIDTH)) {
  ballptr->row = sldptr->row - BALLSIZE;
- ballptr->yDir *= -1;
+ ballptr->yDir = ballptr->yDir / ballptr->yDir * -1;
  int dirFactor = (rand() % 3) - 1;
  if (dirFactor != 0) {
- ballptr->xDir = ballptr->xDir * dirFactor;
- ballptr->yDir = ballptr->yDir * dirFactor;
+ ballptr->xDir = (ballptr->xDir / abs(ballptr->xDir)) * dirFactor;
  }
  }
 
@@ -196,13 +195,17 @@ void handleBrickCollisions(Brick *brptr, Ball *ballptr, int *numBricks, int bric
  *(numBricks) -= 1;
  cur->isHit = 1;
  ballptr->xDir *= -1;
+ ballptr->xDir = ((rand() % 2) + 1) * ballptr->xDir / abs(ballptr->xDir);
+ ballptr->yDir = ((rand() % 2) + 1) * ballptr->yDir / abs(ballptr->yDir);
  } else if ((((ballptr->row + BALLSIZE) == cur->row)
  || (ballptr->row == (cur->row + BRICKHEIGHT)))
  && ((ballptr->col >= (cur->col - BALLSIZE))
  && (ballptr->col <= (cur->col + BRICKWIDTH)))) {
  *(numBricks) -= 1;
  cur->isHit = 1;
  ballptr->yDir *= -1;
+ ballptr->xDir = ((rand() % 2) + 1) * ballptr->xDir / abs(ballptr->xDir);
+ ballptr->yDir = ((rand() % 2) + 1) * ballptr->yDir / abs(ballptr->yDir);
  }
  drawRect(cur->row, cur->col, BRICKHEIGHT, BRICKWIDTH, cur->color);
  }

diff --git a/game.o b/game.o