diff options
| author | Haru <haru@dotalux.com> | 2020-02-09 20:14:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 20:14:56 +0100 |
| commit | 57a71ed4da680c81a9ef313b80454b15f2c29765 (patch) | |
| tree | 803ba967a4b5396181de4d1c7a692dd073122bf5 /src/map/map.c | |
| parent | c6859fe3af9165b4187470d92ee39aa1ac684b1b (diff) | |
| parent | 35cc058ec2a4ccf5c3fbfae4ad4687398e3e7f62 (diff) | |
| download | hercules-57a71ed4da680c81a9ef313b80454b15f2c29765.tar.gz hercules-57a71ed4da680c81a9ef313b80454b15f2c29765.tar.bz2 hercules-57a71ed4da680c81a9ef313b80454b15f2c29765.tar.xz hercules-57a71ed4da680c81a9ef313b80454b15f2c29765.zip | |
Merge pull request #2625 from 4144/updatepackets
Update packets up to 2020-02-06
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 afdc2ed41..9a45c4d21 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -4452,6 +4452,7 @@ static bool inter_config_read_database_names(const char *filename, const struct 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)); + libconfig->setting_lookup_mutable_string(setting, "npc_expanded_barter_data_db", map->npc_expanded_barter_data_db, sizeof(map->npc_expanded_barter_data_db)); if (!mapreg->config_read(filename, setting, imported)) retval = false; @@ -6749,6 +6750,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 */ + npc->expanded_barter_fromsql(); /* after OnInit */ if (battle_config.pk_mode) ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n"); |