summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-abil.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 20:24:07 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-29 20:24:07 +0530
commit43d86ff397acfe79b6699845ae4e2ec9a8e485d0 (patch)
tree72a76a5ed900aa4ab9465bef1cbd0d7807bbbccd /crawl-ref/source/mon-abil.cc
parent3f8334b021c123a371f0dfe8062c3a84eebba673 (diff)
parent8efdaf11a28299dda120a8afe78702686a6e2a47 (diff)
downloadcrawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.tar.gz
crawl-ref-43d86ff397acfe79b6699845ae4e2ec9a8e485d0.zip
Merge branch 'shoals++'
Diffstat (limited to 'crawl-ref/source/mon-abil.cc')
-rw-r--r--crawl-ref/source/mon-abil.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index b64ffcf9b4..1c98be0c34 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -303,17 +303,7 @@ static bool _do_merge(monsters *initial_slime, monsters *merge_to)
merge_to->name(DESC_NOCAP_A).c_str());
}
- flash_view(LIGHTGREEN);
-
- int flash_delay = 150;
- // Scale delay to match change in arena_delay.
- if (crawl_state.arena)
- {
- flash_delay *= Options.arena_delay;
- flash_delay /= 600;
- }
-
- delay(flash_delay);
+ flash_view_delay(LIGHTGREEN, 150);
}
else if (you.can_see(initial_slime))
mpr("A slime creature suddenly disappears!");