diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-14 08:33:17 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-14 08:33:17 +0000 |
| commit | 3fa05ce142611938fc0bd7ea0cf776d5574e0aaa (patch) | |
| tree | acdbb92535414371c67ce301130eef48680debe5 | |
| parent | da5f08af19251e81993a6527bf4307ae3d39c9f9 (diff) | |
| download | crawl-ref-3fa05ce142611938fc0bd7ea0cf776d5574e0aaa.tar.gz crawl-ref-3fa05ce142611938fc0bd7ea0cf776d5574e0aaa.zip | |
[1595668] Fixed disc of storms producing buggy messages.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.1.3@394 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/beam.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/it_use3.cc | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 15a8174eb7..8af9139d9e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3928,22 +3928,12 @@ static void explosion1(struct bolt &pbolt) if (pbolt.name == "golden flame") { seeMsg = "The flame explodes!"; - hearMsg = "You hear a strange explosion."; - - pbolt.type = SYM_BURST; - pbolt.flavour = BEAM_HOLY; // same as golden flame? [dlb] - } - - if (pbolt.name == "golden flame") - { - seeMsg = "The flame explodes!"; hearMsg = "You feel a deep, resonant explosion."; pbolt.type = SYM_BURST; pbolt.flavour = BEAM_HOLY; ex_size = 2; } - if (pbolt.name == "fireball") { diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 6ffea41ef5..3de5614691 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -780,7 +780,6 @@ static bool ball_of_seeing(void) static bool disc_of_storms(void) { int temp_rand = 0; // probability determination {dlb} - struct bolt beam; int disc_count = 0; unsigned char which_zap = 0; @@ -801,6 +800,8 @@ static bool disc_of_storms(void) while (disc_count) { + bolt beam; + temp_rand = random2(3); which_zap = ((temp_rand > 1) ? ZAP_LIGHTNING : |