Steven Mahasin / Mbed 2 deprecated 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

Files at this revision

API Documentation at this revision

Revision 42:cdcda895cb1b, committed 2019-05-07

Comitter:
el17sm
Date:
Tue May 07 18:16:42 2019 +0000
Parent:
41:0697508a28ba
Child:
43:63f5c9d9689c
Commit message:
Boss death crash

Changed in this revision

RoomEngine/RoomEngine.cpp Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/RoomEngine/RoomEngine.cpp	Tue May 07 17:02:30 2019 +0000
+++ b/RoomEngine/RoomEngine.cpp	Tue May 07 18:16:42 2019 +0000
@@ -300,24 +300,24 @@
 
 void RoomEngine::check_walls_collision()
 {
-    // Enemy
-    for (int i = 0; i < MAX_ENEMIES; i++) {
-        if(room->valid_enemies[i]) {
-            room->enemies[i]->undo_move_x(entity_move_check_x(room->enemies[i], room->walls, 2, 10, room->valid_walls));
-            room->enemies[i]->undo_move_y(entity_move_check_y(room->enemies[i], room->walls, 2, 10, room->valid_walls));
-        }
-    }
-    // Player
-    player->undo_move_x(entity_move_check_x(player, room->walls, 2, 10, room->valid_walls));
-    player->undo_move_y(entity_move_check_y(player, room->walls, 2, 10, room->valid_walls));
-    // Bullets
-    for (int i = 0; i < bullets_max; i++) {
-        for (int j = 0; j < 2; j++) {
-            if ((player->valid_bullets[i]) && (room->valid_walls[j]) && (entity_collision(*player->bullets_array[i], *room->walls[j]))) {
-                delete player->bullets_array[i]; player->valid_bullets[i] = false;
-            }
-        }
-    }
+//    // Enemy
+//    for (int i = 0; i < MAX_ENEMIES; i++) {
+//        if(room->valid_enemies[i]) {
+//            room->enemies[i]->undo_move_x(entity_move_check_x(room->enemies[i], room->walls, 2, 10, room->valid_walls));
+//            room->enemies[i]->undo_move_y(entity_move_check_y(room->enemies[i], room->walls, 2, 10, room->valid_walls));
+//        }
+//    }
+//    // Player
+//    player->undo_move_x(entity_move_check_x(player, room->walls, 2, 10, room->valid_walls));
+//    player->undo_move_y(entity_move_check_y(player, room->walls, 2, 10, room->valid_walls));
+//    // Bullets
+//    for (int i = 0; i < bullets_max; i++) {
+//        for (int j = 0; j < 2; j++) {
+//            if ((player->valid_bullets[i]) && (room->valid_walls[j]) && (entity_collision(*player->bullets_array[i], *room->walls[j]))) {
+//                delete player->bullets_array[i]; player->valid_bullets[i] = false;
+//            }
+//        }
+//    }
 }
 
 void RoomEngine::move()

--- a/main.cpp	Tue May 07 17:02:30 2019 +0000
+++ b/main.cpp	Tue May 07 18:16:42 2019 +0000
@@ -72,7 +72,7 @@
     while(1) {  // Floor Loop 
         for (int i = 0; i < MAX_ROOMS_MAP_X; i++) {
             for (int j = 0; j < MAX_ROOMS_MAP_Y; j++) {
-                rooms[j][i] = new Room(0, 3);
+                rooms[j][i] = new Room(0, 0);
             }
         }