From b4b8747ec41b3fa6543d7c51e02515b0cec1496f Mon Sep 17 00:00:00 2001 From: Vsevolod Kozlov Date: Fri, 6 Nov 2009 19:46:32 +0300 Subject: Move mons_is_friendly to monsters::friendly. Signed-off-by: Robert Vollmert --- crawl-ref/source/acr.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crawl-ref/source/acr.cc') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 2fc76337dd..cafcc35029 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3074,7 +3074,7 @@ static bool _untrap_target(const coord_def move, bool check_confused) monsters* mon = monster_at(target); if (mon && player_can_hit_monster(mon)) { - if (mon->caught() && mons_friendly(mon) + if (mon->caught() && mon->friendly() && player_can_open_doors() && !you.confused()) { const std::string prompt = -- cgit v1.2.3-54-g00ecf