😕

ucsd-cse125-sp24 · Jun 7, 2024 · caee1d5 · caee1d5
1 parent 1d25e1f
commit caee1d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/config.json b/config.json
@@ -2,7 +2,7 @@
   "game": {
     "maze": {
       "directory": "maps",
-      "procedural": false,
+      "procedural": true,
       "maze_file": "test/itemRoom.maze"
     },
     "disable_enemies": false
@@ -16,7 +16,7 @@
     "lobby_broadcast": true,
     "max_players": 2,
     "disable_dm": false,
-    "skip_intro": false
+    "skip_intro": true
   },
   "client": {
     "default_name": "Conan O'Brien",

diff --git a/src/server/game/projectile.cpp b/src/server/game/projectile.cpp
@@ -70,6 +70,12 @@ void Projectile::doCollision(Object* other, ServerGameState& state) {
     //handle cases for spell projectiles
     else {
         SpellOrb* orb = dynamic_cast<SpellOrb*>(this);
+
+        if (orb == nullptr) {
+            std::cout << "Just saved us from a seg fault 6/7/2024 1:07am BRUHHHHHHHHHHHHHhhhhhhhhh\n";
+            return;
+        }
+
         switch (orb->sType) {
         case SpellType::Fireball: {
             // do damage if creature