diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2012-11-30 15:43:12 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-05 15:02:46 -0800 |
commit | 266f7b4ac45f546e55774ccba57b0ed2525d1eb2 (patch) | |
tree | b865e1800a243348559529c3c71c845153d0ce13 /src/map/map.cpp | |
parent | 0ea504c7b77c7d2e3efabc4678fcd396fbeec083 (diff) | |
download | tmwa-266f7b4ac45f546e55774ccba57b0ed2525d1eb2.tar.gz tmwa-266f7b4ac45f546e55774ccba57b0ed2525d1eb2.tar.bz2 tmwa-266f7b4ac45f546e55774ccba57b0ed2525d1eb2.tar.xz tmwa-266f7b4ac45f546e55774ccba57b0ed2525d1eb2.zip |
Change some unused int returns to void
Also clean up a little formatting in script.cpp
This is what passes for "minimally invasive" in tmwa ...
Diffstat (limited to 'src/map/map.cpp')
-rw-r--r-- | src/map/map.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index 6470d97..2cd324f 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -359,7 +359,7 @@ int map_count_oncell (int m, int x, int y) * type!=0 ならその種類のみ *------------------------------------------ */ -void map_foreachinarea (int (*func) (struct block_list *, va_list), int m, +void map_foreachinarea (void (*func) (struct block_list *, va_list), int m, int x0, int y0, int x1, int y1, int type, ...) { int bx, by; @@ -437,7 +437,7 @@ void map_foreachinarea (int (*func) (struct block_list *, va_list), int m, * dx,dyは-1,0,1のみとする(どんな値でもいいっぽい?) *------------------------------------------ */ -void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, +void map_foreachinmovearea (void (*func) (struct block_list *, va_list), int m, int x0, int y0, int x1, int y1, int dx, int dy, int type, ...) { @@ -588,7 +588,7 @@ void map_foreachinmovearea (int (*func) (struct block_list *, va_list), int m, // which only checks the exact single x/y passed to it rather than an // area radius - may be more useful in some instances) // -void map_foreachincell (int (*func) (struct block_list *, va_list), int m, +void map_foreachincell (void (*func) (struct block_list *, va_list), int m, int x, int y, int type, ...) { int bx, by; @@ -737,7 +737,7 @@ int map_delobject (int id, int type) * *------------------------------------------ */ -void map_foreachobject (int (*func) (struct block_list *, va_list), int type, +void map_foreachobject (void (*func) (struct block_list *, va_list), int type, ...) { int i; @@ -2034,9 +2034,10 @@ int map_config_read (const char *cfgName) return 0; } -static int cleanup_sub (struct block_list *bl, va_list ap) +static +void cleanup_sub (struct block_list *bl, va_list ap) { - nullpo_retr (0, bl); + nullpo_retv (bl); switch (bl->type) { @@ -2059,8 +2060,6 @@ static int cleanup_sub (struct block_list *bl, va_list ap) spell_free_invocation ((struct invocation *) bl); break; } - - return 0; } /*========================================== |