Fix regression bug with shattering and dormant turrets (#701)

Fixes issue introduced by #669 where dormant turrets would not get destroyed by shattering and instead would become active.
tmewett · Jul 3, 2024 · ef342f3 · ef342f3
1 parent 27472d2
commit ef342f3
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/brogue/Items.c b/src/brogue/Items.c
@@ -4147,6 +4147,9 @@ static void crystalize(short radius) {
 
                 if (tileCatalog[pmap[i][j].layers[DUNGEON]].flags & (T_OBSTRUCTS_PASSABILITY | T_OBSTRUCTS_VISION)) {
 
+                    pmap[i][j].layers[DUNGEON] = FORCEFIELD;
+                    spawnDungeonFeature(i, j, &dungeonFeatureCatalog[DF_SHATTERING_SPELL], true, false);
+
                     if (pmap[i][j].flags & HAS_MONSTER) {
                         monst = monsterAtLoc((pos){ i, j });
                         if (monst->info.flags & MONST_ATTACKABLE_THRU_WALLS) {
@@ -4156,13 +4159,8 @@ static void crystalize(short radius) {
                             freeCaptivesEmbeddedAt(i, j);
                         }
                     }
-
                     if (i == 0 || i == DCOLS - 1 || j == 0 || j == DROWS - 1) {
-                        pmap[i][j].layers[DUNGEON] = CRYSTAL_WALL; // don't dissolve the boundary walls
-                    } else {
-                        pmap[i][j].layers[DUNGEON] = FORCEFIELD;
-                        spawnDungeonFeature(i, j, &dungeonFeatureCatalog[DF_SHATTERING_SPELL], true, false);
-
+                        pmap[i][j].layers[DUNGEON] = CRYSTAL_WALL; // boundary walls turn to crystal
                     }
                 }
             }