From 8cbb227becdc172839b901aedf972022dc73118d Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 8 Dec 2008 20:15:03 +0000 Subject: Apply a bunch of trunk commits, mostly by Haran, namely: 6766 (partly), 6834 (partly), 6867, 6892, 6903, 6906, 6908, 6909, 6927, 6928, 6929, 6943, 6945, 6946 * Message/description tweaks. * Fix enchanting hides not updating AC. * Fix incorrect score calculation. * All 't' commands now take a turn. * Don't prompt when swapping into dangerous terrain. * Fix backwards stealth check. * Fix off-by-1 error when selecting starting weapon. * Lichform discards holy wrath weapons. * Reinitialise zap counter for recharged wands, mention charges. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7786 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/acr.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'crawl-ref/source/acr.cc') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 7c561a11a5..7aabcfaa40 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3486,6 +3486,12 @@ static int _check_adjacent(dungeon_feature_type feat, int &dx, int &dy) // to be opened (eg if you type ctrl + dir). static void _open_door(int move_x, int move_y, bool check_confused) { + if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT) + { + mpr("You can't open doors in your present form."); + return; + } + struct dist door_move; int dx, dy; // door x, door y @@ -3665,6 +3671,18 @@ static void _open_door(int move_x, int move_y, bool check_confused) static void _close_door(int door_x, int door_y) { + if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT) + { + mpr("You can't close doors in your present form."); + return; + } + + if (you.attribute[ATTR_HELD]) + { + mpr("You can't close doors while held in a net."); + return; + } + struct dist door_move; int dx, dy; // door x, door y -- cgit v1.2.3-54-g00ecf