diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-06 19:46:32 +0300 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-06 19:52:58 +0100 |
| commit | b4b8747ec41b3fa6543d7c51e02515b0cec1496f (patch) | |
| tree | efb1625c80d595b58b8bde933decd1dfc674ee04 /crawl-ref/source/acr.cc | |
| parent | 22adbee6a63d3fb1ee05d0e6ff41e80e95b4afc7 (diff) | |
| download | crawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.tar.gz crawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.zip | |
Move mons_is_friendly to monsters::friendly.
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 = |