diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
| commit | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (patch) | |
| tree | df955a23899586104e67359dc490891221b2875b /src/map/map.c | |
| parent | caa8a41b40a5ce3c96eb793619ff75f191ca558b (diff) | |
| parent | 0f7c29113d7d898150108d66d1358f15bb018e0a (diff) | |
| download | hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.gz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.bz2 hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.xz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/plugins.conf
db/pre-re/skill_tree.txt
db/re/skill_tree.txt
db/sc_config.txt
npc/mobs/citycleaners.txt
src/map/atcommand.c
src/map/battle.c
src/map/clif.c
src/map/map.c
src/map/packets.h
src/map/pc.c
src/map/script.c
src/map/skill.c
src/map/status.c
src/map/storage.c
src/map/trade.h
Merged master.
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index d74263d1a..a030515d8 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -5031,7 +5031,7 @@ void do_final(void) do_final_npc(); script->final(); do_final_itemdb(); - do_final_storage(); + storage->final(); guild->final(); party->do_final_party(); pc->do_final_pc(); @@ -5235,7 +5235,13 @@ void map_hp_symbols(void) { HPM->share(buyingstore,"buyingstore"); HPM->share(clif,"clif"); HPM->share(guild,"guild"); +<<<<<<< HEAD HPM->share(homun,"homun"); +======= + HPM->share(gstorage,"gstorage"); + HPM->share(homun,"homun"); + HPM->share(iMap,"iMap"); +>>>>>>> upstream/master HPM->share(ircbot,"ircbot"); HPM->share(itemdb,"itemdb"); HPM->share(logs,"logs"); @@ -5246,7 +5252,12 @@ void map_hp_symbols(void) { HPM->share(vending,"vending"); HPM->share(pc,"pc"); HPM->share(party,"party"); +<<<<<<< HEAD HPM->share(iMap,"iMap"); +======= + HPM->share(storage,"storage"); + HPM->share(trade,"trade"); +>>>>>>> upstream/master /* partial */ HPM->share(mapit,"mapit"); /* sql link */ @@ -5265,6 +5276,7 @@ void load_defaults(void) { buyingstore_defaults(); clif_defaults(); guild_defaults(); + gstorage_defaults(); homunculus_defaults(); instance_defaults(); ircbot_defaults(); @@ -5278,6 +5290,11 @@ void load_defaults(void) { vending_defaults(); pc_defaults(); party_defaults(); +<<<<<<< HEAD +======= + storage_defaults(); + trade_defaults(); +>>>>>>> upstream/master } int do_init(int argc, char *argv[]) { @@ -5468,7 +5485,7 @@ int do_init(int argc, char *argv[]) do_init_status(); party->do_init_party(); guild->init(); - do_init_storage(); + storage->init(); do_init_pet(); homun->init(); do_init_mercenary(); |