summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsheraf <acheraf1998@gmail.com>2018-06-21 00:11:15 +0100
committerAsheraf <acheraf1998@gmail.com>2018-06-22 05:31:46 +0100
commit184758c5b9ad73faf2a9dc395b277a0f60b27817 (patch)
tree0d8da23a5dac18c3bdf567d37e5b1ed7489ac689
parent5b695f9ba27190c299887b9341d718aba551b302 (diff)
downloadhercules-184758c5b9ad73faf2a9dc395b277a0f60b27817.tar.gz
hercules-184758c5b9ad73faf2a9dc395b277a0f60b27817.tar.bz2
hercules-184758c5b9ad73faf2a9dc395b277a0f60b27817.tar.xz
hercules-184758c5b9ad73faf2a9dc395b277a0f60b27817.zip
enable use of private airship on packetver_main
-rw-r--r--src/map/clif.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index aeaf03e43..cf0ca36ff 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -20644,7 +20644,7 @@ void clif_ui_action(struct map_session_data *sd, int32 UIType, int32 data)
void clif_parse_private_airship_request(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
void clif_parse_private_airship_request(int fd, struct map_session_data *sd)
{
-#if defined(PACKETVER_RE) && PACKETVER >= 20180321
+#if PACKETVER_RE_NUM >= 20180321 || PACKETVER_MAIN_NUM >= 20180620
char evname[EVENT_NAME_LENGTH];
struct event_data *ev = NULL;
const struct PACKET_CZ_PRIVATE_AIRSHIP_REQUEST *p = RP2PTR(fd);
@@ -20655,22 +20655,22 @@ void clif_parse_private_airship_request(int fd, struct map_session_data *sd)
pc->setreg(sd, script->add_str("@itemid"), p->ItemID);
script->run_npc(ev->nd->u.scr.script, ev->pos, sd->bl.id, ev->nd->bl.id);
} else {
- ShowError("clif_parse_private_airship_request: event '%s' not found, operation failed\n", evname);
+ ShowError("clif_parse_private_airship_request: event '%s' not found, operation failed.\n", evname);
}
#else
- ShowWarning("clif_parse_private_airship_request: private airship is not supported in this client version, possible packet manipulation.");
+ ShowWarning("clif_parse_private_airship_request: private airship is not supported in this client version, possible packet manipulation.\n");
#endif
}
void clif_private_airship_response(struct map_session_data *sd, uint32 flag)
{
-#if defined(PACKETVER_RE) && PACKETVER >= 20180321
+#if PACKETVER_RE_NUM >= 20180321 || PACKETVER_MAIN_NUM >= 20180620
struct PACKET_ZC_PRIVATE_AIRSHIP_RESPONSE p;
nullpo_retv(sd);
if (flag > P_AIRSHIP_ITEM_INVALID) {
- ShowError("clif_private_airship_response: invalid flag given '%d', defaulting to 0.\n", flag);
+ ShowError("clif_private_airship_response: invalid flag given '%u', defaulting to 0.\n", flag);
flag = 0;
}
@@ -20679,7 +20679,7 @@ void clif_private_airship_response(struct map_session_data *sd, uint32 flag)
clif->send(&p, sizeof(p), &sd->bl, SELF);
#else
- ShowWarning("clif_private_airship_response: private airship works only for clients >= 20180321.");
+ ShowWarning("clif_private_airship_response: private airship works only for clients PACKETVER_RE_NUM >= 20180321 || PACKETVER_MAIN_NUM >= 20180620.\n");
#endif
}