From 48b1b54aaf8c7ccc2b016158f58cf34385dd5068 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Fri, 17 Aug 2007 22:20:13 +0000 Subject: Fixed map marker crashes. Reduced size of Pan demon bands summoned post-Orb (cbus). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2010 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abyss.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/abyss.cc') diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 45ff746ddd..5d1302cfb7 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -377,7 +377,7 @@ void abyss_teleport( bool new_area ) static void place_corruption_seed(const coord_def &pos, int duration) { - env_add_marker(new map_corruption_marker(pos, duration)); + env.markers.add(new map_corruption_marker(pos, duration)); } static void initialise_level_corrupt_seeds(int power) @@ -398,7 +398,7 @@ static void initialise_level_corrupt_seeds(int power) do where = coord_def(random2(GXM), random2(GYM)); while (!in_bounds(where) || grd(where) != DNGN_FLOOR - || env_find_marker(where, MAT_ANY)); + || env.markers.find(where, MAT_ANY)); place_corruption_seed(where, random_range(low, high, 2)); } @@ -453,13 +453,13 @@ static void apply_corruption_effect( } cmark->duration -= duration; if (cmark->duration < 1) - env_remove_marker(cmark); + env.markers.remove(cmark); } void run_corruption_effects(int duration) { std::vector markers = - env_get_all_markers(MAT_CORRUPTION_NEXUS); + env.markers.get_all(MAT_CORRUPTION_NEXUS); for (int i = 0, size = markers.size(); i < size; ++i) { @@ -581,7 +581,7 @@ static void corrupt_level_features(const crawl_environment &oenv) { std::vector corrupt_seeds; std::vector corrupt_markers = - env_get_all_markers(MAT_CORRUPTION_NEXUS); + env.markers.get_all(MAT_CORRUPTION_NEXUS); for (int i = 0, size = corrupt_markers.size(); i < size; ++i) corrupt_seeds.push_back(corrupt_markers[i]->pos); @@ -616,7 +616,7 @@ static bool is_level_corrupted() || player_in_branch(BRANCH_VESTIBULE_OF_HELL)) return (true); - return (!!env_find_marker(MAT_CORRUPTION_NEXUS)); + return (!!env.markers.find(MAT_CORRUPTION_NEXUS)); } static bool is_level_incorruptible() -- cgit v1.2.3-54-g00ecf