diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-01 14:47:53 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-01 14:47:53 +0000 |
| commit | 106fb6de1cf3523c10197dc8e02ec44e94523f18 (patch) | |
| tree | be6eba2338470be1467fc89131f20d80878a4906 /crawl-ref/source/spl-util.cc | |
| parent | 83043ea070b1f45c5cad9c7ad1f1844a01079809 (diff) | |
| download | crawl-ref-106fb6de1cf3523c10197dc8e02ec44e94523f18.tar.gz crawl-ref-106fb6de1cf3523c10197dc8e02ec44e94523f18.zip | |
Type safety, cast cleanups, etc.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1401 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-util.cc')
| -rw-r--r-- | crawl-ref/source/spl-util.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 05458c1ba5..40eb6f662d 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -50,9 +50,9 @@ static int spell_list[NUM_SPELLS]; #define SPELLDATASIZE (sizeof(spelldata)/sizeof(struct spell_desc)) static struct spell_desc *seekspell(int spellid); -static bool cloud_helper( int (*func) (int, int, int, int, kill_category), - int x, int y, - int pow, int ctype, kill_category ); +static bool cloud_helper(int (*func)(int, int, int, cloud_type, kill_category), + int x, int y, + int pow, cloud_type ctype, kill_category ); /* * BEGIN PUBLIC FUNCTIONS @@ -523,9 +523,10 @@ int apply_area_within_radius( int (*func) (int, int, int, int), // We really need some sort of a queue structure, since ideally I'd like // to do a (shallow) breadth-first-search of the dungeon floor. // This ought to work okay for small clouds. -void apply_area_cloud( int (*func) (int, int, int, int, kill_category), +void apply_area_cloud( int (*func) (int, int, int, cloud_type, kill_category), int x, int y, - int pow, int number, int ctype, kill_category whose ) + int pow, int number, cloud_type ctype, + kill_category whose ) { int spread, clouds_left = number; int good_squares = 0, neighbours[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -811,9 +812,9 @@ static struct spell_desc *seekspell(int spell) return (&spelldata[spell_list[spell]]); } -static bool cloud_helper( int (*func) (int, int, int, int, kill_category), - int x, int y, - int pow, int ctype, kill_category whose ) +static bool cloud_helper(int (*func)(int, int, int, cloud_type, kill_category), + int x, int y, + int pow, cloud_type ctype, kill_category whose ) { if (!grid_is_solid(grd[x][y]) && env.cgrid[x][y] == EMPTY_CLOUD) { |