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/intif.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/intif.c')
| -rw-r--r-- | src/map/intif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index f3931e79e..e364f5c25 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -1011,7 +1011,7 @@ int intif_parse_LoadGuildStorage(int fd) ShowError("intif_parse_LoadGuildStorage: user not found %d\n",RFIFOL(fd,4)); return 1; } - gstor=guild2storage(guild_id); + gstor=gstorage->id2storage(guild_id); if(!gstor) { ShowWarning("intif_parse_LoadGuildStorage: error guild_id %d not exist\n",guild_id); return 1; @@ -1031,14 +1031,14 @@ int intif_parse_LoadGuildStorage(int fd) } memcpy(gstor,RFIFOP(fd,12),sizeof(struct guild_storage)); - storage_guild_storageopen(sd); + gstorage->open(sd); return 0; } // ACK guild_storage saved int intif_parse_SaveGuildStorage(int fd) { - storage_guild_storagesaved(/*RFIFOL(fd,2), */RFIFOL(fd,6)); + gstorage->saved(/*RFIFOL(fd,2), */RFIFOL(fd,6)); return 0; } |