diff options
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/traps.cc | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 492acc1721..9acb11bf28 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2121,7 +2121,7 @@ int tileidx_feature(int object, int gx, int gy) case DNGN_TRAP_MECHANICAL: case DNGN_TRAP_MAGICAL: case DNGN_TRAP_NATURAL: - return _tileidx_trap(trap_type_at_xy(coord_def(gx, gy))); + return _tileidx_trap(get_trap_type(coord_def(gx, gy))); case DNGN_ENTER_SHOP: return TILE_DNGN_ENTER_SHOP; case DNGN_ENTER_LABYRINTH: diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index b6979e574f..7d3c1430d7 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -1242,29 +1242,6 @@ dungeon_feature_type trap_def::category() const } } - -// Returns index of the trap for a given (x,y) coordinate pair {dlb} -int trap_at_xy(const coord_def& xy) -{ - for (int which_trap = 0; which_trap < MAX_TRAPS; which_trap++) - { - if (env.trap[which_trap].pos == xy - && env.trap[which_trap].type != TRAP_UNASSIGNED) - { - return (which_trap); - } - } - - // No idea how well this will be handled elsewhere. {dlb} - return (-1); -} - -trap_type trap_type_at_xy(const coord_def& xy) -{ - const int idx = trap_at_xy(xy); - return (idx == -1 ? NUM_TRAPS : env.trap[idx].type); -} - bool is_valid_shaft_level(const level_id &place) { if (place.level_type != LEVEL_DUNGEON) |