diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-11-03 23:53:48 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-04 00:06:51 +0100 |
| commit | e10d5cb12d979e733cedee3f71b021c553197bce (patch) | |
| tree | 3724e66cd54b1307fee7fde326231fa280f9731e | |
| parent | 5770878427657e6317cb21c73666c9f2d36e0234 (diff) | |
| download | crawl-ref-e10d5cb12d979e733cedee3f71b021c553197bce.tar.gz crawl-ref-e10d5cb12d979e733cedee3f71b021c553197bce.zip | |
Cope with old saves with 0-piece slime creatures.
Can be reverted once CDO is updated or purged.
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monster.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 1b1db5653d..a389cd6c16 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1316,7 +1316,7 @@ int exper_value(const monsters *monster) // Hacks to make merged slime creatures not worth so much exp. We // will calculate the experience we would get for 1 blob, and then // just multiply it so that exp is linear with blobs merged. -cao - if (monster->mons_species() == MONS_SLIME_CREATURE) + if (monster->mons_species() == MONS_SLIME_CREATURE && monster->number) maxhp /= monster->number; // These are some values we care about. diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 67df8f42ab..c206d8cf86 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2067,9 +2067,9 @@ static std::string _str_monam(const monsters& mon, description_level_type desc, if (mon.mons_species() == MONS_SLIME_CREATURE && desc != DESC_DBNAME) { ASSERT(mon.number <= 5); - const char* cardinals[] = {"", "large ", "very large ", + const char* cardinals[] = {"buggy ", "", "large ", "very large ", "enormous ", "titanic "}; - result += cardinals[mon.number - 1]; + result += cardinals[mon.number]; } // Done here to cover cases of undead versions of hydras. |