From aa8110a9204f7f9a1c50d98f3ada4d8c6e3b405e Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 3 Nov 2009 23:09:13 +0100 Subject: Rename map_feature() from mapdef.h to map_feature_at. This was causing conflicts with enum map_feature (not sure why this didn't show up earlier). --- crawl-ref/source/dungeon.cc | 4 ++-- crawl-ref/source/mapdef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index ece327f7b3..5c0021d3e2 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -4833,7 +4833,7 @@ static bool _dgn_place_one_monster( const vault_placement &place, } // Grr, keep this in sync with vault_grid. -dungeon_feature_type map_feature(map_def *map, const coord_def &c, int rawfeat) +dungeon_feature_type map_feature_at(map_def *map, const coord_def &c, int rawfeat) { if (rawfeat == -1) rawfeat = map->glyph_at(c); @@ -4856,7 +4856,7 @@ dungeon_feature_type map_feature(map_def *map, const coord_def &c, int rawfeat) else if (f.feat >= 0) return static_cast(f.feat); else if (f.glyph >= 0) - return map_feature(NULL, c, rawfeat); + return map_feature_at(NULL, c, rawfeat); else if (f.shop >= 0) return (DNGN_ENTER_SHOP); diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index de55bd511c..d08418451c 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -632,7 +632,7 @@ struct dlua_set_map }; class map_def; -dungeon_feature_type map_feature(map_def *map, const coord_def &c, int rawfeat); +dungeon_feature_type map_feature_at(map_def *map, const coord_def &c, int rawfeat); struct map_file_place { @@ -805,7 +805,7 @@ public: // feature slots, but that's fine by us. dungeon_feature_type operator () (const coord_def &c) const { - return (map_feature(&map, c, -1)); + return (map_feature_at(&map, c, -1)); } }; -- cgit v1.2.3-54-g00ecf