summaryrefslogtreecommitdiff
path: root/src/map/party.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-11-30 15:43:12 -0800
committerBen Longbons <b.r.longbons@gmail.com>2012-12-05 15:02:46 -0800
commit266f7b4ac45f546e55774ccba57b0ed2525d1eb2 (patch)
treeb865e1800a243348559529c3c71c845153d0ce13 /src/map/party.cpp
parent0ea504c7b77c7d2e3efabc4678fcd396fbeec083 (diff)
downloadtmwa-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/party.cpp')
-rw-r--r--src/map/party.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/map/party.cpp b/src/map/party.cpp
index 95763b8..b58234a 100644
--- a/src/map/party.cpp
+++ b/src/map/party.cpp
@@ -701,15 +701,15 @@ int party_send_xy_clear (struct party *p)
}
// HP通知の必要性検査用(map_foreachinmoveareaから呼ばれる)
-int party_send_hp_check (struct block_list *bl, va_list ap)
+void party_send_hp_check (struct block_list *bl, va_list ap)
{
int party_id;
int *flag;
struct map_session_data *sd;
- nullpo_retr (0, bl);
- nullpo_retr (0, ap);
- nullpo_retr (0, sd = (struct map_session_data *) bl);
+ nullpo_retv (bl);
+ nullpo_retv (ap);
+ nullpo_retv (sd = (struct map_session_data *) bl);
party_id = va_arg (ap, int);
flag = va_arg (ap, int *);
@@ -719,7 +719,6 @@ int party_send_hp_check (struct block_list *bl, va_list ap)
*flag = 1;
sd->party_hp = -1;
}
- return 0;
}
// 経験値公平分配
@@ -744,7 +743,7 @@ int party_exp_share (struct party *p, int map, int base_exp, int job_exp)
// 同じマップのパーティメンバー全体に処理をかける
// type==0 同じマップ
// !=0 画面内
-void party_foreachsamemap (int (*func) (struct block_list *, va_list),
+void party_foreachsamemap (void (*func) (struct block_list *, va_list),
struct map_session_data *sd, int type, ...)
{
struct party *p;