diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2010-09-28 22:54:23 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2010-09-28 23:14:58 +1000 |
| commit | 595985e90fd8aafe6e3ff68d3cd34549a89dc0d1 (patch) | |
| tree | b0688d20c5c954ba8d6e8ab8234c775ba32613b4 /crawl-ref/source/mon-abil.h | |
| parent | 0bffd73144467e5c404904f82e43240285a825be (diff) | |
| parent | a655d7e83f7d9d6fb747b080b6914103944014f9 (diff) | |
| download | crawl-ref-595985e90fd8aafe6e3ff68d3cd34549a89dc0d1.tar.gz crawl-ref-595985e90fd8aafe6e3ff68d3cd34549a89dc0d1.zip | |
Merge branch 'master' into malign_gateway
Conflicts:
crawl-ref/source/directn.cc
crawl-ref/source/enum.h
crawl-ref/source/main.cc
crawl-ref/source/mon-abil.cc
crawl-ref/source/mon-abil.h
crawl-ref/source/mon-act.cc
crawl-ref/source/mon-stuff.cc
crawl-ref/source/monster.cc
crawl-ref/source/spells3.cc
Diffstat (limited to 'crawl-ref/source/mon-abil.h')
| -rw-r--r-- | crawl-ref/source/mon-abil.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/mon-abil.h b/crawl-ref/source/mon-abil.h index 908ff1b4fb..c04399ce35 100644 --- a/crawl-ref/source/mon-abil.h +++ b/crawl-ref/source/mon-abil.h @@ -7,19 +7,19 @@ #ifndef MONABIL_H #define MONABIL_H -class monsters; +class monster; struct bolt; -bool mon_special_ability(monsters *monster, bolt & beem); -void mon_nearby_ability(monsters *monster); +bool mon_special_ability(monster* mons, bolt & beem); +void mon_nearby_ability(monster* mons); -bool ugly_thing_mutate(monsters *ugly, bool proximity = false); +bool ugly_thing_mutate(monster* ugly, bool proximity = false); -void ballisto_on_move(monsters * monster, const coord_def & pos); -void activate_ballistomycetes(monsters * monster, const coord_def & origin, +void ballisto_on_move(monster* mons, const coord_def & pos); +void activate_ballistomycetes(monster* mons, const coord_def & origin, bool player_kill); -void move_kraken_tentacles(monsters * kraken); -void move_demon_tentacle(monsters * tentacle); +void move_kraken_tentacles(monster * kraken); +void move_demon_tentacle(monster * tentacle); #endif |