diff options
| author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-10 14:24:40 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-10 14:24:40 +0100 |
| commit | f1ef80cc67b73ae63865564ece8032e9b2276234 (patch) | |
| tree | abad1e086f495500e06f76b60e6268a1a7c8eb75 /crawl-ref/source/mon-stuff.cc | |
| parent | 4b71037efe0a72b312c377bbc39f2ffd279edaab (diff) | |
| download | crawl-ref-f1ef80cc67b73ae63865564ece8032e9b2276234.tar.gz crawl-ref-f1ef80cc67b73ae63865564ece8032e9b2276234.zip | |
Tidy up bracket placement according to our coding conventions.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
| -rw-r--r-- | crawl-ref/source/mon-stuff.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index fc109c5aee..afe17384ac 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -1115,7 +1115,7 @@ static void _elven_twin_died(monsters* twin, bool in_transit) found_duvessa = true; break; } - else if (mi->type == MONS_DOWAN + else if (mi->type == MONS_DOWAN || (mi->props.exists("original_name") && mi->props["original_name"].get_string() == "Dowan")) { @@ -2095,8 +2095,8 @@ int monster_die(monsters *monster, killer_type killer, // And his vault can be placed again. you.uniq_map_names.erase("uniq_boris"); } - else if (monster->type == MONS_KIRKE - || (monster->props.exists("original_name") + else if (monster->type == MONS_KIRKE + || (monster->props.exists("original_name") && monster->props["original_name"].get_string() == "Kirke") && !in_transit) { @@ -3708,7 +3708,6 @@ void monster_teleport(monsters *monster, bool instan, bool silent) monster->add_ench( mon_enchant(ENCH_TP, 0, KC_OTHER, random_range(20, 30)) ); } - return; } |