diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-10-27 20:25:02 -0700 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-10-27 20:25:02 -0700 |
| commit | 12f74fc875b1de8089676ee8e78461f75dce6b00 (patch) | |
| tree | eddd66768492bc9cbd3e399611d539d5179b9b27 /crawl-ref/source/monplace.cc | |
| parent | d45dd6b1991b9c403bc7b9b2c9180ba8a6c54753 (diff) | |
| download | crawl-ref-12f74fc875b1de8089676ee8e78461f75dce6b00.tar.gz crawl-ref-12f74fc875b1de8089676ee8e78461f75dce6b00.zip | |
(MONS_PROGRAM_BUG || -1) --> MONS_NO_MONSTER
Change MONS_PROGRAM_BUG to MONS_NO_MONSTER when "no monster" is what was
meant. Now all instances of MONS_PROGRAM_BUG should indicated some sort
of failure or error.
Also, fixed some places which were still using -1 instead of
MONS_NO_MONSTER.
Diffstat (limited to 'crawl-ref/source/monplace.cc')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index e0515efdfd..6d6b5a5bc3 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -736,7 +736,7 @@ int place_monster(mgen_data mg, bool force_pos) mg.pos, mg.map_mask, &stair_type, &mg.power); - if (mg.cls == MONS_PROGRAM_BUG) + if (mg.cls == MONS_NO_MONSTER) return (-1); // (3) Decide on banding (good lord!) @@ -967,7 +967,7 @@ int place_monster(mgen_data mg, bool force_pos) // (5) For each band monster, loop call to place_monster_aux(). for (int i = 1; i < band_size; i++) { - if (band_monsters[i] == MONS_PROGRAM_BUG) + if (band_monsters[i] == MONS_NO_MONSTER) break; band_template.cls = band_monsters[i]; @@ -1408,7 +1408,7 @@ static void _define_zombie(int mid, monster_type ztype, monster_type cs, } // That is, random creature from which to fashion undead. - if (ztype == MONS_PROGRAM_BUG) + if (ztype == MONS_NO_MONSTER) { // How OOD this zombie can be. int relax = 5; @@ -2317,7 +2317,7 @@ int mons_place(mgen_data mg) #endif int mon_count = 0; for (int il = 0; il < MAX_MONSTERS; il++) - if (menv[il].type != -1) + if (menv[il].type != MONS_NO_MONSTER) mon_count++; if (mg.cls == WANDERING_MONSTER) |