From 1826273cc56b745d81621bb8b44ba0efd0d95c15 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Tue, 2 Jan 2007 17:31:31 +0000 Subject: Fixed Abyss banishment crash. Don't show -more- after the "cast into the Abyss" so that players on public servers are not tempted to kill the tty to escape the banishment. It's still possible that there are enough messages in view that the game puts in a -more- unasked for, but I'll live with that. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@769 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/effects.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'crawl-ref/source/effects.cc') diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 3123e073a8..ea4230b60a 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -128,17 +128,14 @@ void torment(int caster, int tx, int ty) apply_area_within_radius(torment_monsters, tx, ty, 0, 8, caster); } // end torment() -void banished(unsigned char gate_type) +void banished(int gate_type) { - you_teleport2( false ); - - // this is to ensure that you're standing on a suitable space (67) - grd[you.x_pos][you.y_pos] = gate_type; - - if ( gate_type == DNGN_ENTER_ABYSS ) + if (gate_type == DNGN_ENTER_ABYSS) + { take_note(Note(NOTE_USER_NOTE, 0, 0, "Cast into the Abyss"), true); + } - down_stairs(true, you.your_level, true); // heh heh + down_stairs(true, you.your_level, gate_type); // heh heh untag_followers(); // safety } // end banished() -- cgit v1.2.3-54-g00ecf