diff options
author | shennetsind <ind@henn.et> | 2013-11-06 21:10:52 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-06 21:10:52 -0200 |
commit | aaf34515fa9d32fae10c71b5b3f615857fd7e55e (patch) | |
tree | bec3964580ead4ed1d45f7bf51b418753004f16b /src/map/itemdb.c | |
parent | eaf04b9a2f0b399027df251c5d19d58d74e24e6a (diff) | |
parent | 87d7348396af97428638723ae49ca2ff166e4acd (diff) | |
download | hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.gz hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.bz2 hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.xz hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/itemdb.c')
-rw-r--r-- | src/map/itemdb.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 8dd6e9d9d..d7d117574 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -1927,7 +1927,7 @@ int itemdb_uid_load() { /*==================================== * read all item-related databases *------------------------------------*/ -void itemdb_read(void) { +void itemdb_read(bool minimal) { int i; DBData prev; @@ -1945,6 +1945,9 @@ void itemdb_read(void) { } } + if (minimal) + return; + itemdb->read_combos(); itemdb->read_groups(); itemdb->read_chains(); @@ -2065,7 +2068,7 @@ void itemdb_reload(void) { db_clear(itemdb->names); // read new data - itemdb->read(); + itemdb->read(false); //Epoque's awesome @reloaditemdb fix - thanks! [Ind] //- Fixes the need of a @reloadmobdb after a @reloaditemdb to re-link monster drop data @@ -2174,12 +2177,16 @@ void do_final_itemdb(void) { db_destroy(itemdb->names); } -void do_init_itemdb(void) { +void do_init_itemdb(bool minimal) { memset(itemdb->array, 0, sizeof(itemdb->array)); itemdb->other = idb_alloc(DB_OPT_BASE); itemdb->names = strdb_alloc(DB_OPT_BASE,ITEM_NAME_LENGTH); itemdb->create_dummy_data(); //Dummy data item. - itemdb->read(); + itemdb->read(minimal); + + if (minimal) + return; + clif->cashshop_load(); } void itemdb_defaults(void) { |