diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-23 01:39:03 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-23 01:39:03 +0000 |
| commit | 0b3a6d81250aab917ed00bbd6d0e6a116feb5753 (patch) | |
| tree | 52f70fe5b1998563e384eda322188ccb4dea4949 | |
| parent | 08653ce92d0f7f64b4bce34b6ffea1d366f94d58 (diff) | |
| download | crawl-ref-0b3a6d81250aab917ed00bbd6d0e6a116feb5753.tar.gz crawl-ref-0b3a6d81250aab917ed00bbd6d0e6a116feb5753.zip | |
Put the messages in the right sequence if Xom fails to animate your
weapon or summon hostile demons.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6061 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/xom.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index f9a19aa340..21ce200a73 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -850,16 +850,18 @@ static bool xom_is_bad(int sever) } else if (random2(sever) <= 9) { - bool success = false; + god_speaks(GOD_XOM, _get_xom_speech("hostile monster")); // Nasty, but fun. if (one_chance_in(4)) - success = cast_tukimas_dance(100, GOD_XOM, true, true); + cast_tukimas_dance(100, GOD_XOM, true, true); else { const int numdemons = std::min(random2(random2(random2(sever+1)+1)+1)+1, 14); + bool success = false; + for (int i = 0; i < numdemons; ++i) { if (create_monster( @@ -870,14 +872,12 @@ static bool xom_is_bad(int sever) success = true; } } - } - - if (success) - { - god_speaks(GOD_XOM, _get_xom_speech("hostile monster")); - done = true; + if (!success) + canned_msg(MSG_NOTHING_HAPPENS); } + + done = true; } else if (random2(sever) <= 10) { |