diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-04 05:26:00 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-04 05:26:00 +0000 |
| commit | 0a2eef4f7c8d6cab369dee37adef2aba41cdf557 (patch) | |
| tree | 7e1ec00e15db5ecc912038500c1fd64bfc38cefb /crawl-ref/source/dungeon.cc | |
| parent | ba61c9ea0ff447e24a9ad3f7f1b45160640c913b (diff) | |
| download | crawl-ref-0a2eef4f7c8d6cab369dee37adef2aba41cdf557.tar.gz crawl-ref-0a2eef4f7c8d6cab369dee37adef2aba41cdf557.zip | |
Add more habitat cleanups: rename HT_NORMAL to HT_LAND, remove
HT_SHALLOW_WATER, and rename HT_DEEP_WATER to HT_WATER.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3183 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index e7c4e87cc4..d2b0331ca1 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -4323,21 +4323,21 @@ bool dgn_place_monster(mons_spec &mspec, else if (mlev == -9) monster_level += 5; } - + if (mid != RANDOM_MONSTER && mid < NUM_MONSTERS) { if (mons_is_unique(mid) && you.unique_creatures[mid]) return (false); - + const habitat_type habitat = mons_habitat(mid); - if (habitat != HT_NORMAL) + if (habitat != HT_LAND) grd[vx][vy] = habitat2grid(habitat); } int mindex = NON_MONSTER; const bool placed = place_monster( mindex, mid, monster_level, - m_generate_awake? BEH_WANDER : BEH_SLEEP, + m_generate_awake ? BEH_WANDER : BEH_SLEEP, MHITNOT, true, vx, vy, false, PROX_ANYWHERE, mspec.monnum); if (placed && mindex != -1 && mindex != NON_MONSTER) |