diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-11 14:14:10 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-11 14:14:10 +0000 |
commit | 18dac1924da21380570eb193e6a363e0c813c9de (patch) | |
tree | dd9659e0a9a5b3127d4736aa3ca6b411ce9f2d90 /crawl-ref/source/monstuff.cc | |
parent | f95c27c96c4fa900e334d269619503410b5d1f78 (diff) | |
download | crawl-ref-18dac1924da21380570eb193e6a363e0c813c9de.tar.gz crawl-ref-18dac1924da21380570eb193e6a363e0c813c9de.zip |
Merged trunk fixes back to 0.2:
- Moth of wrath rage attack.
- Pulsating lump mutation attack.
- Combat messages for out-of-view monsters fighting monsters in LOS.
- Waypoint deletion.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1449 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r-- | crawl-ref/source/monstuff.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index a14d593a2e..b05018f745 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1003,7 +1003,7 @@ static bool valid_morph( struct monsters *monster, int new_mclass ) // note that power is (as of yet) unused within this function - // may be worthy of consideration of later implementation, though, // so I'll still let the parameter exist for the time being {dlb} -bool monster_polymorph( struct monsters *monster, int targetc, int power ) +bool monster_polymorph( monsters *monster, int targetc, int power ) { char str_polymon[INFO_SIZE] = ""; // cannot use info[] here {dlb} bool player_messaged = false; |