diff options
| -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/map.c | 5 | ||||
| -rw-r--r-- | src/emap/map.h | 2 |
5 files changed, 4 insertions, 15 deletions
diff --git a/src/echar/char.c b/src/echar/char.c index 6cf13fc..a926f13 100644 --- a/src/echar/char.c +++ b/src/echar/char.c @@ -305,15 +305,6 @@ void send_additional_slots(int fd, struct char_session_data* sd) SQL->StmtFree(stmt); } -void echar_parse_frommap_request_stats_report_pre(int *fdPtr) -{ - const int fd = *fdPtr; - RFIFOSKIP(fd, 2); /* we skip first 2 bytes which are the 0x3008, so we end up with a buffer equal to the one we send */ - RFIFOSKIP(fd, RFIFOW(fd,2)); /* skip this packet */ - RFIFOFLUSH(fd); - hookStop(); -} - void echar_parse_map_serverexit(int mapFd) { const int code = RFIFOW(mapFd, 2); diff --git a/src/echar/char.h b/src/echar/char.h index 2fe84d1..8726d93 100644 --- a/src/echar/char.h +++ b/src/echar/char.h @@ -23,8 +23,6 @@ void echar_parse_char_connect_pre(int *fdPtr, struct char_session_data **sd, uin void echar_parse_char_connect_post(int fd, struct char_session_data *sd, uint32 ipl); -void echar_parse_frommap_request_stats_report_pre(int *fdPtr); - void echar_parse_map_serverexit(int mapFd); void echat_send_login_serverexit(const int code); diff --git a/src/echar/init.c b/src/echar/init.c index 87c49d7..d241d8c 100644 --- a/src/echar/init.c +++ b/src/echar/init.c @@ -57,7 +57,6 @@ 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, parse_frommap_request_stats_report, echar_parse_frommap_request_stats_report_pre); addHookPost(chr, mmo_char_send099d, echar_mmo_char_send099d_post); addHookPost(chr, mmo_char_send_characters, echar_mmo_char_send_characters_post); diff --git a/src/emap/map.c b/src/emap/map.c index 1fc0132..cc4bae4 100644 --- a/src/emap/map.c +++ b/src/emap/map.c @@ -463,7 +463,7 @@ void emap_iwall_get_pre(struct map_session_data **sdPtr) hookStop(); } -void emap_iwall_remove_pre(const char **namePtr) +bool emap_iwall_remove_pre(const char **namePtr) { struct WallData *wall; const char *name = *namePtr; @@ -471,7 +471,7 @@ void emap_iwall_remove_pre(const char **namePtr) if ((wall = (struct WallData *)strdb_get(map->iwall_db, name)) == NULL) { hookStop(); - return; // Nothing to do + return false; // Nothing to do } int x; @@ -496,6 +496,7 @@ void emap_iwall_remove_pre(const char **namePtr) map->list[wall->m].iwall_num--; strdb_remove(map->iwall_db, wall->name); hookStop(); + return true; } bool emap_iwall_set2(int m, diff --git a/src/emap/map.h b/src/emap/map.h index f67f8b2..2d6a25a 100644 --- a/src/emap/map.h +++ b/src/emap/map.h @@ -36,7 +36,7 @@ bool emap_iwall_set_pre(int16 *m, bool *shootable, const char **wall_namePtr); void emap_iwall_get_pre(struct map_session_data **sdPtr); -void emap_iwall_remove_pre(const char **namePtr); +bool emap_iwall_remove_pre(const char **namePtr); bool emap_iwall_set2(int m, int layer, int x1, int y1, |