diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-27 04:43:34 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-27 04:43:34 +0000 |
| commit | d3ae981761ae3d805364cf14e418b878422d8247 (patch) | |
| tree | 935f440f6db2d0b2b4f8e6ea3f3d2031592148a7 /crawl-ref/source/monstuff.cc | |
| parent | 6c6d1d539dd951808594f85b2ca5156dc4835058 (diff) | |
| download | crawl-ref-d3ae981761ae3d805364cf14e418b878422d8247.tar.gz crawl-ref-d3ae981761ae3d805364cf14e418b878422d8247.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6165 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index e9397e4982..f1b92f8872 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1491,7 +1491,8 @@ static bool _is_poly_power_unsuitable( // Relaxation still takes effect when needed, no matter what relpower // says. bool monster_polymorph(monsters *monster, monster_type targetc, - poly_power_type power) + poly_power_type power, + bool force_beh) { std::string str_polymon; int source_power, target_power, relax; @@ -1630,7 +1631,8 @@ bool monster_polymorph(monsters *monster, monster_type targetc, if (old_mon_caught) check_net_will_hold_monster(monster); - player_angers_monster(monster); + if (!force_beh) + player_angers_monster(monster); return (player_messaged); } |