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/monstuff.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/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 4943bbf923..6d0f36f105 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -319,7 +319,8 @@ void monster_drop_ething(monsters *monster, bool mark_item_origins, int fill_out_corpse(const monsters* monster, item_def& corpse, bool allow_weightless) { - ASSERT(monster->type != -1 && monster->type != MONS_PROGRAM_BUG); + ASSERT(monster->type >= 0 && monster->type != MONS_PROGRAM_BUG + && monster->type < NUM_MONSTERS); corpse.clear(); int summon_type; @@ -2347,7 +2348,7 @@ bool monster_polymorph(monsters *monster, monster_type targetc, // deal with mons_sec monster->type = targetc; - monster->base_monster = MONS_PROGRAM_BUG; + monster->base_monster = MONS_NO_MONSTER; monster->number = 0; // Note: define_monster() will clear out all enchantments! - bwr @@ -5919,7 +5920,7 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) { monsters *targ = &menv[i]; - if (targ->type == -1 || targ->type == MONS_PROGRAM_BUG) + if (targ->type == MONS_NO_MONSTER) continue; if (distance(monster->pos(), targ->pos()) >= 5) @@ -7678,7 +7679,7 @@ static void _handle_monster_move(monsters *monster) _mons_in_cloud(monster); - if (monster->type == -1) + if (monster->type == MONS_NO_MONSTER) { monster->speed_increment = 1; break; @@ -7978,7 +7979,7 @@ static void _handle_monster_move(monsters *monster) } } - if (monster->type != -1 && monster->hit_points < 1) + if (monster->type != MONS_NO_MONSTER && monster->hit_points < 1) monster_die(monster, KILL_MISC, NON_MONSTER); } |