diff options
| author | Dastgir <dastgirpojee@rocketmail.com> | 2015-08-12 11:20:12 +0530 |
|---|---|---|
| committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-08-12 11:20:12 +0530 |
| commit | 10f24ba5b82e7e563cb720a8dea9a415fd8055d7 (patch) | |
| tree | 854d29dfa5096dcb1e427a2b50b47fdb4601b8b8 /src/char/char.h | |
| parent | c63f46ef29310ec846b7fb90e02e93a6abd7abdc (diff) | |
| parent | be8b2eaed13475ae043daa81882e490e78396562 (diff) | |
| download | hercules-10f24ba5b82e7e563cb720a8dea9a415fd8055d7.tar.gz hercules-10f24ba5b82e7e563cb720a8dea9a415fd8055d7.tar.bz2 hercules-10f24ba5b82e7e563cb720a8dea9a415fd8055d7.tar.xz hercules-10f24ba5b82e7e563cb720a8dea9a415fd8055d7.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/char/char.h')
| -rw-r--r-- | src/char/char.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/char/char.h b/src/char/char.h index b3aa7bc34..3b6e0fa8c 100644 --- a/src/char/char.h +++ b/src/char/char.h @@ -145,7 +145,7 @@ struct char_interface { int new_display; char *CHAR_CONF_NAME; - char *LAN_CONF_NAME; + char *NET_CONF_NAME; ///< Network config filename char *SQL_CONF_NAME; char *INTER_CONF_NAME; @@ -256,7 +256,7 @@ struct char_interface { int (*parse_frommap) (int fd); int (*search_mapserver) (unsigned short map, uint32 ip, uint16 port); int (*mapif_init) (int fd); - int (*lan_subnetcheck) (uint32 ip); + uint32 (*lan_subnet_check) (uint32 ip); void (*delete2_ack) (int fd, int char_id, uint32 result, time_t delete_date); void (*delete2_accept_actual_ack) (int fd, int char_id, uint32 result); void (*delete2_accept_ack) (int fd, int char_id, uint32 result); @@ -305,7 +305,6 @@ struct char_interface { int (*check_connect_login_server) (int tid, int64 tick, int id, intptr_t data); int (*online_data_cleanup_sub) (DBKey key, DBData *data, va_list ap); int (*online_data_cleanup) (int tid, int64 tick, int id, intptr_t data); - int (*lan_config_read) (const char *lancfgName); void (*sql_config_read) (const char* cfgName); void (*config_dispatch) (char *w1, char *w2); int (*config_read) (const char* cfgName); |