summaryrefslogtreecommitdiff
path: root/src/map/party.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-07 13:40:34 -0300
committershennetsind <ind@henn.et>2013-10-07 13:40:34 -0300
commitc56e3eb701658079f1de09db759f3b09327ec046 (patch)
treea37f7ff23a9adc9d7c725b85f94cf25685e30aba /src/map/party.h
parentbaa5c1fc386a706ba4bf4aa48409b8947274c928 (diff)
downloadhercules-c56e3eb701658079f1de09db759f3b09327ec046.tar.gz
hercules-c56e3eb701658079f1de09db759f3b09327ec046.tar.bz2
hercules-c56e3eb701658079f1de09db759f3b09327ec046.tar.xz
hercules-c56e3eb701658079f1de09db759f3b09327ec046.zip
Fixed Bug #7744
Adjusted missing #ifdef behavior to be friendly to the hooking. http://hercules.ws/board/tracker/issue-7744-compiler-error-on-hpm-hooking-after-undefined-packetver-re/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/party.h')
-rw-r--r--src/map/party.h13
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);