diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-01-05 13:10:51 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-01-05 13:10:51 +0100 |
| commit | 90ec54410b65d43855db7a68348ede3908979558 (patch) | |
| tree | 9cf053445bb26b6f06422eb2290a140546812d1e /crawl-ref/source/spl-util.h | |
| parent | 11214880ea8006145d52dc12ab3cb3511d033835 (diff) | |
| parent | fd18e77ace0f15f861fa5a74c583966cccfd2ac6 (diff) | |
| download | crawl-ref-90ec54410b65d43855db7a68348ede3908979558.tar.gz crawl-ref-90ec54410b65d43855db7a68348ede3908979558.zip | |
Merge branch 'master' into ench-split
Diffstat (limited to 'crawl-ref/source/spl-util.h')
| -rw-r--r-- | crawl-ref/source/spl-util.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h index 2fe685badb..2689e23cd8 100644 --- a/crawl-ref/source/spl-util.h +++ b/crawl-ref/source/spl-util.h @@ -96,9 +96,8 @@ const char* spelltype_long_name(int which_spelltype); typedef int cell_func(coord_def where, int pow, int aux, actor *agent); typedef int monster_func(monster* mon, int pow); typedef int cloud_func(coord_def where, int pow, int spreadrate, - cloud_type type, kill_category whose, - killer_type killer, int colour, std::string name, - std::string tile); + cloud_type type, const actor* agent, int colour, + std::string name, std::string tile); int apply_area_visible(cell_func cf, int power, bool pass_through_trans = false, actor *agent = NULL); @@ -124,7 +123,7 @@ int apply_area_within_radius(cell_func cf, const coord_def& where, void apply_area_cloud(cloud_func func, const coord_def& where, int pow, int number, cloud_type ctype, - kill_category kc, killer_type killer, + const actor *agent, int spread_rate = -1, int colour = -1, std::string name = "", std::string tile = ""); |