Steven Mahasin
/
DreamDungeon
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/Player/Player.cpp
- Revision:
- 34:1d5b4da3935e
- Parent:
- 33:4f3948dcd2f7
- Child:
- 35:06cd6be999ad
diff -r 4f3948dcd2f7 -r 1d5b4da3935e Entity/Player/Player.cpp
--- a/Entity/Player/Player.cpp Mon May 06 13:27:26 2019 +0000
+++ b/Entity/Player/Player.cpp Mon May 06 13:58:39 2019 +0000
@@ -57,7 +57,7 @@
}
// Functions
-void Player::move(float mapped_x, float mapped_y, int * map, bool * doorways)
+void Player::move(float mapped_x, float mapped_y, char * map, bool * doorways)
{
move_player(mapped_x, mapped_y, map, doorways);
move_bullets();
@@ -65,7 +65,7 @@
invulnerability_counter++;
}
-void Player::move_player(float mapped_x, float mapped_y, int * map, bool * doorways)
+void Player::move_player(float mapped_x, float mapped_y, char * map, bool * doorways)
{
if(!entity_to_map_collision_test(position.x + velocity*mapped_x, position.y, map, doorways)) {
position.x += velocity*mapped_x;
@@ -123,7 +123,7 @@
}
}
-bool Player::update_bullets(int * map, bool * doorways)
+bool Player::update_bullets(char * map, bool * doorways)
{
bool result = false;
for (int i = 0; i < bullets_max; i++) {