From c4d63c569f7146d653ec48ce363bc0562b186b1b Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Fri, 25 Sep 2009 11:51:11 -0500 Subject: Make screen color flashes from god effects more consistent. --- crawl-ref/source/abyss.cc | 9 ++++----- crawl-ref/source/religion.cc | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 125787719a..6708ef758c 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -935,9 +935,9 @@ bool lugonu_corrupt_level(int power) if (is_level_incorruptible()) return (false); - mprf(MSGCH_GOD, "Lugonu's Hand of Corruption reaches out!"); + mpr("Lugonu's Hand of Corruption reaches out!", MSGCH_GOD); - you.flash_colour = ETC_MUTAGENIC; + you.flash_colour = MAGENTA; viewwindow(true, false); _initialise_level_corrupt_seeds(power); @@ -958,11 +958,10 @@ bool lugonu_corrupt_level(int power) _corrupt_level_features(*abyssal); run_corruption_effects(300); - you.flash_colour = ETC_MUTAGENIC; - viewwindow(true, false); +#ifndef USE_TILE // Allow extra time for the flash to linger. delay(1000); - viewwindow(true, false); +#endif return (true); } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index f32c5cea4d..4d48b3635c 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -6879,10 +6879,11 @@ static bool _bless_weapon(god_type god, brand_type brand, int colour) wpn.name(DESC_NOCAP_A).c_str(), desc.c_str())); wpn.flags |= ISFLAG_NOTED_ID; + mpr("Your weapon shines brightly!", MSGCH_GOD); + you.flash_colour = colour; viewwindow(true, false); - mpr("Your weapon shines brightly!", MSGCH_GOD); simple_god_message(" booms: Use this gift wisely!"); if (god == GOD_SHINING_ONE) @@ -6896,6 +6897,7 @@ static bool _bless_weapon(god_type god, brand_type brand, int colour) } #ifndef USE_TILE + // Allow extra time for the flash to linger. delay(1000); #endif -- cgit v1.2.3-54-g00ecf