diff options
| author | Haru <haru@dotalux.com> | 2016-02-11 13:28:18 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-08-19 21:32:16 +0200 |
| commit | 85d10885379bbe52930c233f02bf1c94ec86ac30 (patch) | |
| tree | d05244bcdada0ae2e705b5dfa580e735c4f5a03e /src/map/map.h | |
| parent | 9d70a6f590dbbd267e90bff3acee9e70eab2643c (diff) | |
| download | hercules-85d10885379bbe52930c233f02bf1c94ec86ac30.tar.gz hercules-85d10885379bbe52930c233f02bf1c94ec86ac30.tar.bz2 hercules-85d10885379bbe52930c233f02bf1c94ec86ac30.tar.xz hercules-85d10885379bbe52930c233f02bf1c94ec86ac30.zip | |
Ported map-server.conf to libconfig
Ported to modern Hercules and cleaned up from Panikon's commits: ee48838b12d15902fc14738cfa46d58b39080d11, 55498ebb7ac5d28444d0b01506c88ef6874f6055, 6d1f8f50b0e7349bdab2c53bb172d0b036e47c04, 25dde7e46524ace330b83cb4bf0255cc4d796792
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/map.h b/src/map/map.h index f98e1cb7f..646e39448 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -968,7 +968,6 @@ struct map_interface { char db_path[256]; char help_txt[256]; - char help2_txt[256]; char charhelp_txt[256]; char wisp_server_name[NAME_LENGTH]; @@ -997,7 +996,7 @@ struct map_interface { char server_db[32]; struct Sql *mysql_handle; - int port; + uint16 port; int users; int enable_grf; //To enable/disable reading maps from GRF files, bypassing mapcache [blackhole89] bool ip_set; @@ -1188,8 +1187,8 @@ END_ZEROED_BLOCK; int (*waterheight) (char *mapname); int (*readgat) (struct map_data *m); int (*readallmaps) (void); - int (*config_read) (char *cfgName); - int (*config_read_sub) (char *cfgName); + bool (*config_read) (const char *filename, bool imported); + bool (*config_read_sub) (char *filename); void (*reloadnpc_sub) (char *cfgName); bool (*inter_config_read) (const char *filename, bool imported); bool (*inter_config_read_database_names) (const char *filename, const struct config_t *config, bool imported); |