diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-11-16 11:29:27 -0600 |
| commit | 06f3895bacfc80c69dd1c3bbfa2d1857ecde165b (patch) | |
| tree | ea9c59532861b584dec95554aaaad310b1f31833 /crawl-ref/source/mon-transit.cc | |
| parent | e1dcbbafa2eb2c7bb835d65077ecc4f0766ff427 (diff) | |
| parent | 833bd72fba5a1c683a2391462986193e40d4d313 (diff) | |
| download | crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.tar.gz crawl-ref-06f3895bacfc80c69dd1c3bbfa2d1857ecde165b.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/fight.cc
crawl-ref/source/food.cc
crawl-ref/source/libutil.cc
crawl-ref/source/melee_attack.h
crawl-ref/source/mon-stuff.cc
crawl-ref/source/spl-damage.cc
Diffstat (limited to 'crawl-ref/source/mon-transit.cc')
| -rw-r--r-- | crawl-ref/source/mon-transit.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-transit.cc b/crawl-ref/source/mon-transit.cc index 7c9bd56955..1146b66a54 100644 --- a/crawl-ref/source/mon-transit.cc +++ b/crawl-ref/source/mon-transit.cc @@ -122,7 +122,7 @@ void add_monster_to_transit(const level_id &lid, const monster& m) cull_lost_mons(mlist, how_many); } -void place_lost_ones(void (*placefn)(m_transit_list &ml)) +static void _place_lost_ones(void (*placefn)(m_transit_list &ml)) { level_id c = level_id::current(); @@ -136,12 +136,12 @@ void place_lost_ones(void (*placefn)(m_transit_list &ml)) void place_transiting_monsters() { - place_lost_ones(level_place_lost_monsters); + _place_lost_ones(level_place_lost_monsters); } void place_followers() { - place_lost_ones(level_place_followers); + _place_lost_ones(level_place_followers); } static bool place_lost_monster(follower &f) |