diff options
| author | Haru <haru@dotalux.com> | 2018-06-29 13:31:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-29 13:31:47 +0200 |
| commit | 9bcb4b5257c3f2048c6610fdf03ddf681a0e84ff (patch) | |
| tree | 71040f996066d017b85f09b97e1a4899d2ada128 /src | |
| parent | 6c1c1e77d0f1a47437428aad00e797ac04a0ea5a (diff) | |
| parent | 184758c5b9ad73faf2a9dc395b277a0f60b27817 (diff) | |
| download | hercules-9bcb4b5257c3f2048c6610fdf03ddf681a0e84ff.tar.gz hercules-9bcb4b5257c3f2048c6610fdf03ddf681a0e84ff.tar.bz2 hercules-9bcb4b5257c3f2048c6610fdf03ddf681a0e84ff.tar.xz hercules-9bcb4b5257c3f2048c6610fdf03ddf681a0e84ff.zip | |
Merge pull request #2098 from Asheraf/pairshipupdate
update private airship map list to match main kRO servers
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/clif.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index c085c4fe4..ce963f5ae 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -20767,7 +20767,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); @@ -20778,22 +20778,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; } @@ -20802,7 +20802,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 } |