diff options
| author | Andrei Karas <akaras@inbox.ru> | 2019-01-15 23:57:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-15 23:57:23 +0000 |
| commit | 85690028a05b76c3423ff5777fd545d7af04cf6d (patch) | |
| tree | 77c994f19cbd2d1a887e0a711df580048b52d16f /src/map/map.c | |
| parent | 21edafad0f74e85c408336274dd1e59db2fe3880 (diff) | |
| parent | 828cbdc9e761499ba1336a2bb68267a161053d19 (diff) | |
| download | hercules-85690028a05b76c3423ff5777fd545d7af04cf6d.tar.gz hercules-85690028a05b76c3423ff5777fd545d7af04cf6d.tar.bz2 hercules-85690028a05b76c3423ff5777fd545d7af04cf6d.tar.xz hercules-85690028a05b76c3423ff5777fd545d7af04cf6d.zip | |
Merge pull request #2339 from 4144/updatepackets
Update packet up to 2019-01-09
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c index 93e86f80b..6212493c8 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -4479,6 +4479,7 @@ static bool inter_config_read_database_names(const char *filename, const struct libconfig->setting_lookup_mutable_string(setting, "autotrade_merchants_db", map->autotrade_merchants_db, sizeof(map->autotrade_merchants_db)); libconfig->setting_lookup_mutable_string(setting, "autotrade_data_db", map->autotrade_data_db, sizeof(map->autotrade_data_db)); libconfig->setting_lookup_mutable_string(setting, "npc_market_data_db", map->npc_market_data_db, sizeof(map->npc_market_data_db)); + libconfig->setting_lookup_mutable_string(setting, "npc_barter_data_db", map->npc_barter_data_db, sizeof(map->npc_barter_data_db)); if (!mapreg->config_read(filename, setting, imported)) retval = false; @@ -6742,6 +6743,7 @@ int do_init(int argc, char *argv[]) npc->event_do_oninit( false ); // Init npcs (OnInit) npc->market_fromsql(); /* after OnInit */ + npc->barter_fromsql(); /* after OnInit */ if (battle_config.pk_mode) ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n"); |