diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-07 10:32:26 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-07 10:32:26 +0000 |
commit | 1b63786182b52163ce7c26a4683a415f38b8029a (patch) | |
tree | f29d2f4fc11ace932ff4df12e0c65d8b9a2d0017 /crawl-ref/source | |
parent | 3f69a6bffb46e58209cd7f9d6b4227eb5199ee9a (diff) | |
download | crawl-ref-1b63786182b52163ce7c26a4683a415f38b8029a.tar.gz crawl-ref-1b63786182b52163ce7c26a4683a415f38b8029a.zip |
Fix for 1827415: handle_time()-induced banishments (e.g. Hell miscasts)
were being applied one turn too late.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2778 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/acr.cc | 27 | ||||
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 1 |
2 files changed, 2 insertions, 26 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 3207be08e6..24746d3c65 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1252,8 +1252,7 @@ static void input() fire_monster_alerts(); - if (Options.tut_just_triggered) - Options.tut_just_triggered = false; + Options.tut_just_triggered = false; if ( i_feel_safe() ) { @@ -2833,6 +2832,7 @@ static void world_reacts() { handle_time(200 + (you.time_taken - you.synch_time)); you.synch_time = 200; + check_banished(); } else { @@ -2863,29 +2863,6 @@ static void world_reacts() } } - //jmf: added silence messages - // [jpeg] Commenting out until we add other sources of Silence - // than the player casting the spell (messages handled elsewhere) -/* - bool its_quiet = silenced(you.x_pos, you.y_pos); - - if (you.attribute[ATTR_WAS_SILENCED] != its_quiet) - { - if (its_quiet) - { - if (!one_chance_in(30)) - mpr("You are enveloped in profound silence.", MSGCH_WARN); - else - mpr("The dungeon seems quiet ... too quiet!", MSGCH_WARN); - } - else - { - mpr("Your hearing returns.", MSGCH_RECOVERY); - } - - you.attribute[ATTR_WAS_SILENCED] = its_quiet; - } -*/ viewwindow(true, false); if (you.cannot_act() && any_messages()) diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 2769e17e99..cd47404152 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1969,7 +1969,6 @@ static bool send_abyss(const char *cause) { if (you.level_type != LEVEL_ABYSS) { - mpr("You are cast into the Abyss!"); you.banish(cause? cause : ""); return (true); } |