diff options
author | Jesusaves <cpntb1@ymail.com> | 2019-03-02 16:27:32 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2019-03-02 16:27:32 -0300 |
commit | e0a9d84eee22cef363bd6a399c47da9ccf6116f1 (patch) | |
tree | d5f93cc984b6b9d055dd8ad87ca43b19badf2b76 /src | |
parent | 613976cbee0a6d3e080a02ac27c104e8625c3360 (diff) | |
parent | 4effbb02d2e656d0d8f33e4337b4b932d6ae8ce7 (diff) | |
download | evol-hercules-e0a9d84eee22cef363bd6a399c47da9ccf6116f1.tar.gz evol-hercules-e0a9d84eee22cef363bd6a399c47da9ccf6116f1.tar.bz2 evol-hercules-e0a9d84eee22cef363bd6a399c47da9ccf6116f1.tar.xz evol-hercules-e0a9d84eee22cef363bd6a399c47da9ccf6116f1.zip |
Merge branch 'master' into tmw2
Diffstat (limited to 'src')
-rw-r--r-- | src/echar/char.c | 9 | ||||
-rw-r--r-- | src/echar/char.h | 2 | ||||
-rw-r--r-- | src/echar/init.c | 1 | ||||
-rw-r--r-- | src/emap/atcommand.c | 20 | ||||
-rw-r--r-- | src/emap/atcommand.h | 1 | ||||
-rw-r--r-- | src/emap/init.c | 1 |
6 files changed, 32 insertions, 2 deletions
diff --git a/src/echar/char.c b/src/echar/char.c index 037aa05..c0d80ba 100644 --- a/src/echar/char.c +++ b/src/echar/char.c @@ -177,11 +177,18 @@ void echar_parse_login_password_change_ack(int charFd) } } -void echar_send_HC_ACK_CHARINFO_PER_PAGE_post(int fd, struct char_session_data *sd) +void echar_send_HC_ACK_CHARINFO_PER_PAGE_post(int fd, + struct char_session_data *sd) { send_additional_slots(fd, sd); } +void echar_send_HC_ACK_CHARINFO_PER_PAGE_tail_pre(int *fdPtr __attribute__ ((unused)), + struct char_session_data **sdPtr __attribute__ ((unused))) +{ + hookStop(); +} + int echar_mmo_char_send_characters_post(int retVal, int fd, struct char_session_data* sd) diff --git a/src/echar/char.h b/src/echar/char.h index 708a558..23a9a4d 100644 --- a/src/echar/char.h +++ b/src/echar/char.h @@ -15,6 +15,8 @@ void echar_parse_login_password_change_ack(int charFd); void echar_send_HC_ACK_CHARINFO_PER_PAGE_post(int fd, struct char_session_data *sd); +void echar_send_HC_ACK_CHARINFO_PER_PAGE_tail_pre(int *fdPtr, struct char_session_data **sdPtr); + int echar_mmo_char_send_characters_post(int retVal, int fd, struct char_session_data *sd); void send_additional_slots(int fd, struct char_session_data* sd); diff --git a/src/echar/init.c b/src/echar/init.c index 4e9faa6..5d55735 100644 --- a/src/echar/init.c +++ b/src/echar/init.c @@ -60,6 +60,7 @@ HPExport void plugin_init (void) addHookPre(chr, parse_char_create_new_char, echar_parse_char_create_new_char); addHookPre(chr, creation_failed, echar_creation_failed); addHookPre(chr, parse_char_connect, echar_parse_char_connect_pre); + addHookPre(chr, send_HC_ACK_CHARINFO_PER_PAGE_tail, echar_send_HC_ACK_CHARINFO_PER_PAGE_tail_pre); addHookPost(chr, send_HC_ACK_CHARINFO_PER_PAGE, echar_send_HC_ACK_CHARINFO_PER_PAGE_post); addHookPost(chr, mmo_char_send_characters, echar_mmo_char_send_characters_post); diff --git a/src/emap/atcommand.c b/src/emap/atcommand.c index e7f97b3..f71698f 100644 --- a/src/emap/atcommand.c +++ b/src/emap/atcommand.c @@ -243,7 +243,6 @@ ACMD0(log) ACMD4(tee) { clif->disp_overhead(&sd->bl, message, AREA_CHAT_WOC, NULL); - return true; } @@ -271,3 +270,22 @@ ACMD1(serverExit) return true; } + +ACMD1(getName) +{ + int id = 0; + if (!*message || sscanf(message, "%10d", &id) < 1) + return false; + + const struct block_list* bl = map->id2bl(id); + if (bl == NULL) + { + clif->message(fd, "Unit not found"); + } + else + { + clif->message(fd, status->get_name(bl)); + } + + return true; +} diff --git a/src/emap/atcommand.h b/src/emap/atcommand.h index 5b8588b..50a92df 100644 --- a/src/emap/atcommand.h +++ b/src/emap/atcommand.h @@ -41,5 +41,6 @@ ACMD1(mapExit); ACMD1(serverExit); ACMD0(log); ACMD4(tee); +ACMD4(getName); #endif // EVOL_MAP_ATCOMMAND diff --git a/src/emap/init.c b/src/emap/init.c index e09d551..01e5e19 100644 --- a/src/emap/init.c +++ b/src/emap/init.c @@ -108,6 +108,7 @@ HPExport void plugin_init (void) addAtcommand("linus", linus); addAtcommand("tee", tee); addAtcommand("log", log); + addAtcommand("getname", getName); addCPCommand("serverexit", serverExit); |