diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-06 21:05:35 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-06 21:05:35 +0000 |
| commit | 7f97bf0e03db69e9f393d4b683705bcfdc3c7c86 (patch) | |
| tree | f891733aafa5643976f15a034284af6cfabbee07 | |
| parent | 09a1c70aa415d3f72526fd3d075b68002f180b86 (diff) | |
| download | crawl-ref-7f97bf0e03db69e9f393d4b683705bcfdc3c7c86.tar.gz crawl-ref-7f97bf0e03db69e9f393d4b683705bcfdc3c7c86.zip | |
Add still more minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8280 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/hiscores.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 49fe90b540..57a381ab11 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -762,9 +762,10 @@ void scorefile_entry::init_death_cause(int dam, int dsrc, auxkilldata = aux; // for death by monster - if ((death_type == KILLED_BY_MONSTER || death_type == KILLED_BY_BEAM - || death_type == KILLED_BY_SPORE - || death_type == KILLED_BY_REFLECTION) + if ((death_type == KILLED_BY_MONSTER + || death_type == KILLED_BY_BEAM + || death_type == KILLED_BY_SPORE + || death_type == KILLED_BY_REFLECTION) && !invalid_monster_index(death_source) && menv[death_source].type != -1) { diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 9588e310e1..65485c4b76 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -8212,7 +8212,7 @@ std::string do_mon_str_replacements(const std::string &in_msg, _replace_god_name(god, true, false)); msg = replace_all(msg, "@God_is@", _replace_god_name(god, true, true)); - // No verb needed, + // No verb needed. msg = replace_all(msg, "@foe_god@", _replace_god_name(god, false, false)); msg = replace_all(msg, "@foe_god@", @@ -8267,16 +8267,14 @@ std::string do_mon_str_replacements(const std::string &in_msg, msg = replace_all(msg, "@says@", "buggily says"); } else - { msg = replace_all(msg, "@says@", sound_list[s_type]); - } // The proper possessive for a word ending in an "s" is to // put an apostrophe after the "s": "Chris" -> "Chris'", // not "Chris" -> "Chris's". Stupid English language... msg = replace_all(msg, "s's", "s'"); - return msg; + return (msg); } static mon_body_shape _get_ghost_shape(const monsters *mon) diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 28d8b38baa..d2a7c40cf1 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -986,8 +986,10 @@ void _monster_die_cloud(const monsters* monster, bool corpse, bool silent, simple_monster_message(monster, (prefix + msg).c_str()); if (cloud != CLOUD_NONE) + { place_cloud(cloud, monster->pos(), 1 + random2(3), monster->kill_alignment()); + } } void monster_die(monsters *monster, killer_type killer, |