diff options
| author | Haru <haru@dotalux.com> | 2019-07-28 22:37:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 22:37:07 +0200 |
| commit | 893a01ab14ad56579a4c280ac7a302e4e6d7c755 (patch) | |
| tree | b4e40b659924f9f0a08a9ab63be79307ddbab699 /src/map/guild.h | |
| parent | cd04fd96954ccb9fbbe33d05ad1eb3e2f7ce98c5 (diff) | |
| parent | c67015a13bd6ed0e3be7fcbb0db525fa482c9bda (diff) | |
| download | hercules-893a01ab14ad56579a4c280ac7a302e4e6d7c755.tar.gz hercules-893a01ab14ad56579a4c280ac7a302e4e6d7c755.tar.bz2 hercules-893a01ab14ad56579a4c280ac7a302e4e6d7c755.tar.xz hercules-893a01ab14ad56579a4c280ac7a302e4e6d7c755.zip | |
Merge pull request #2506 from Asheraf/castledb_update
Convert guild castle database to use libconfig
Diffstat (limited to 'src/map/guild.h')
| -rw-r--r-- | src/map/guild.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/guild.h b/src/map/guild.h index 396cbda86..40209b988 100644 --- a/src/map/guild.h +++ b/src/map/guild.h @@ -165,7 +165,8 @@ struct guild_interface { int (*payexp_timer) (int tid, int64 tick, int id, intptr_t data); struct map_session_data *(*sd_check) (int guild_id, int account_id, int char_id); bool (*read_guildskill_tree_db) (char* split[], int columns, int current); - bool (*read_castledb) (char* str[], int columns, int current); + bool (*read_castledb_libconfig) (void); + bool (*read_castledb_libconfig_sub) (struct config_setting_t *it, int idx, const char *source); int (*payexp_timer_sub) (union DBKey key, struct DBData *data, va_list ap); int (*send_xy_timer_sub) (union DBKey key, struct DBData *data, va_list ap); int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data); |