diff options
author | shenhuyong <shenhuyong@hotmail.com> | 2013-10-08 01:54:20 +0800 |
---|---|---|
committer | shenhuyong <shenhuyong@hotmail.com> | 2013-10-08 01:54:20 +0800 |
commit | 33622377e840c6d15ee7f65a1e4b9b9a815bd69b (patch) | |
tree | 6984312a8856cc67d5032a533eb6ad70cae19e9d /src/map/party.h | |
parent | 0a14a122a02aeac9b8cf007eb727cdab846f2329 (diff) | |
parent | 07cbb72a3e89ba0fe1fb4b3bed1cac6568259999 (diff) | |
download | hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.tar.gz hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.tar.bz2 hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.tar.xz hercules-33622377e840c6d15ee7f65a1e4b9b9a815bd69b.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/party.h')
-rw-r--r-- | src/map/party.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/map/party.h b/src/map/party.h index 570c7bd11..208edb846 100644 --- a/src/map/party.h +++ b/src/map/party.h @@ -34,6 +34,8 @@ struct party_data { } state; }; +#define PB_NOTICE_LENGTH (36 + 1) + #ifndef PARTY_RECRUIT struct party_booking_detail { short level; @@ -48,7 +50,6 @@ struct party_booking_ad_info { struct party_booking_detail p_detail; }; #else /* PARTY_RECRUIT */ -#define PB_NOTICE_LENGTH (36 + 1) struct party_booking_detail { short level; char notice[PB_NOTICE_LENGTH]; @@ -111,15 +112,13 @@ struct party_interface { /*========================================== * Party Booking in KRO [Spiria] *------------------------------------------*/ -#ifndef PARTY_RECRUIT void (*booking_register) (struct map_session_data *sd, short level, short mapid, short* job); void (*booking_update) (struct map_session_data *sd, short* job); void (*booking_search) (struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount); -#else /* PARTY_RECRUIT */ - void (*booking_register) (struct map_session_data *sd, short level, const char *notice); - void (*booking_update) (struct map_session_data *sd, const char *notice); - void (*booking_search) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount); -#endif + /* PARTY_RECRUIT */ + void (*recruit_register) (struct map_session_data *sd, short level, const char *notice); + void (*recruit_update) (struct map_session_data *sd, const char *notice); + void (*recruit_search) (struct map_session_data *sd, short level, short mapid, unsigned long lastindex, short resultcount); bool (*booking_delete) (struct map_session_data *sd); /* */ int (*vforeachsamemap) (int (*func)(struct block_list *,va_list),struct map_session_data *sd,int range, va_list ap); |