diff options
| author | Haru <haru@dotalux.com> | 2015-09-07 01:42:31 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-08-19 21:32:13 +0200 |
| commit | ea9ceb17bdf4ea4acf28dca84508b62bd7e94fd4 (patch) | |
| tree | d122655c806ae3a9dfea3688e6837da6272ffc7d /src/map/map.h | |
| parent | 9783ce1d536d0f3f5d7e34d90717a65779ff923a (diff) | |
| download | hercules-ea9ceb17bdf4ea4acf28dca84508b62bd7e94fd4.tar.gz hercules-ea9ceb17bdf4ea4acf28dca84508b62bd7e94fd4.tar.bz2 hercules-ea9ceb17bdf4ea4acf28dca84508b62bd7e94fd4.tar.xz hercules-ea9ceb17bdf4ea4acf28dca84508b62bd7e94fd4.zip | |
Ported inter-server.conf to libconfig
Ported to modern Hercules and cleaned up from Panikon's commits: 40f9ec33868e2240cab013308897898ed252b3e0, a9d646da19e25ab6fcf44dbd1ae7d90c30f6686c, 1aa8581a0aecbfd53e877686c399ffb731dcd75e, 72c645b015ae6130ca7d4309d0fb1413340e7f23, f8c906a0496b9acdae1d8244b1544fa03592061e, 51d88a58983c9552dfd1a0f059e5a031742aed61, 443684b3c77f4c32fe7877a7f8d62debf73b1e93, cf93eafef1f322cd1583226272b7d4008f562da4
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, 5 insertions, 2 deletions
diff --git a/src/map/map.h b/src/map/map.h index dbd30febf..f98e1cb7f 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -33,6 +33,7 @@ /* Forward Declarations */ struct Sql; // common/sql.h +struct config_t; // common/conf.h struct mob_data; struct npc_data; struct channel_data; @@ -1190,7 +1191,9 @@ END_ZEROED_BLOCK; int (*config_read) (char *cfgName); int (*config_read_sub) (char *cfgName); void (*reloadnpc_sub) (char *cfgName); - int (*inter_config_read) (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); + bool (*inter_config_read_connection) (const char *filename, const struct config_t *config, bool imported); int (*sql_init) (void); int (*sql_close) (void); bool (*zone_mf_cache) (int m, char *flag, char *params); |