Use is_pit macro to check for (spiked) pit

2018-09-15 17:19:26 +03:00
parent bd23a56f29
commit adf070eb04
18 changed files with 52 additions and 55 deletions
--- a/src/zap.c
+++ b/src/zap.c
@@ -3373,7 +3373,7 @@ struct obj **pobj; /* object tossed/used, set to NULL
                              The(distant_name(obj, xname))); /* lame */
                    range = 0;
                } else if (Sokoban && (t = t_at(x, y)) != 0
-                           && (t->ttyp == PIT || t->ttyp == SPIKED_PIT
+                           && (is_pit(t->ttyp)
                               || t->ttyp == HOLE || t->ttyp == TRAPDOOR)) {
                    /* hero falls into the trap, so ball stops */
                    range = 0;