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/fight.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/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index c769a4f563..522ad3dbe5 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2795,7 +2795,7 @@ static bool _make_zombie(monsters* mon, int corpse_class, int corpse_index, // NOTE: Isn't called if monster dies from poisoning caused by chaos. void melee_attack::chaos_killed_defender(monsters* mon) { - ASSERT(mon->type != -1 && mon->type != MONS_PROGRAM_BUG); + ASSERT(mon->type != -1 && mon->type != MONS_NO_MONSTER); ASSERT(in_bounds(mon->pos())); ASSERT(!defender->alive()); |