Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: mbed MotionSensor
Diff: Entity/Bullets/Bullets.cpp
- Revision:
- 27:a1b41626f57c
- Parent:
- 26:abbc19edc5c1
- Child:
- 28:98848e6a77a2
--- a/Entity/Bullets/Bullets.cpp Mon Apr 29 02:45:17 2019 +0000
+++ b/Entity/Bullets/Bullets.cpp Mon Apr 29 10:39:09 2019 +0000
@@ -16,7 +16,7 @@
direction = dir;
}
-void Bullets::move(float speed, float unused)
+void Bullets::move(float speed, float unused, int * unused2)
{
if (direction == 0) {
position.y -= speed;
@@ -39,9 +39,9 @@
return (int *) bullets_sprite;
}
-bool Bullets::out_of_bounds_check()
+bool Bullets::out_of_bounds_check(int * map)
{
- if (matrix_collision_test(position.x, position.y, 0)) {
+ if (matrix_collision_test(position.x, position.y, map)) {
return true;
}
if ((0 > position.x) || (position.x > 84) || (0 > position.y) || (position.y > 48)) {