summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/beam.cc10
-rw-r--r--crawl-ref/source/it_use3.cc3
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 :