diff options
| author | Charles Otto <ottochar@gmail.com> | 2010-07-07 19:26:11 -0400 |
|---|---|---|
| committer | Charles Otto <ottochar@gmail.com> | 2010-07-07 19:26:11 -0400 |
| commit | a058b35e6daf5e36a18c069d3ce85ccaf4c305db (patch) | |
| tree | cd7a6219d0622361ac5b6813f2ff4170f85dbf7a /crawl-ref/source/mon-abil.h | |
| parent | 524008619edbfe25bf5129e64ffc09d573559017 (diff) | |
| parent | 1a2035778593f1530ee309df690a3fe98382b75c (diff) | |
| download | crawl-ref-a058b35e6daf5e36a18c069d3ce85ccaf4c305db.tar.gz crawl-ref-a058b35e6daf5e36a18c069d3ce85ccaf4c305db.zip | |
Merge master into articulated_kraken
Diffstat (limited to 'crawl-ref/source/mon-abil.h')
| -rw-r--r-- | crawl-ref/source/mon-abil.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-abil.h b/crawl-ref/source/mon-abil.h index 4159cc5640..367c1ee375 100644 --- a/crawl-ref/source/mon-abil.h +++ b/crawl-ref/source/mon-abil.h @@ -14,7 +14,6 @@ bool mon_special_ability(monsters *monster, bolt & beem); void mon_nearby_ability(monsters *monster); bool ugly_thing_mutate(monsters *ugly, bool proximity = false); -bool slime_split_merge(monsters *thing); void ballisto_on_move(monsters * monster, const coord_def & pos); void activate_ballistomycetes(monsters * monster, const coord_def & origin, |