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/spells4.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crawl-ref/source/spells4.cc') diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 3877f30dee..f08a824b89 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -451,7 +451,7 @@ static int _tame_beast_monsters(coord_def where, int pow, int, actor *) if (monster == NULL) return 0; - if (!_is_domesticated_animal(monster->type) || mons_friendly(monster) + if (!_is_domesticated_animal(monster->type) || monster->friendly() || player_will_anger_monster(monster)) { return 0; -- cgit v1.2.3-54-g00ecf