From 741745b5d1d832edc1f7593eee9f9ec243d9d78c Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 18 Dec 2010 16:24:23 +0000 Subject: * Bunch of intif_parse_LoadGuildStorage fixes. - Fixed guild storage not being sorted, when the storage had to be requested first (follow up to r14605). - Fixed missing check, whether or not the character has already an open storage (follow up to r4562). - Fixed missing GM trust check, whether or not the player is allowed to use guild storage (follow up to r3481). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14606 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 4 ++++ src/map/intif.c | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9e2d86998..4e25a1f9b 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,10 @@ Date Added 2010/12/18 + * Bunch of intif_parse_LoadGuildStorage fixes. [Ai4rei] + - Fixed guild storage not being sorted, when the storage had to be requested first (follow up to r14605). + - Fixed missing check, whether or not the character has already an open storage (follow up to r4562). + - Fixed missing GM trust check, whether or not the player is allowed to use guild storage (follow up to r3481). * Fixed character storage no longer being sorted (bugreport:1982, since r12950). [Ai4rei] - Guild storage is now sorted before being displayed rather than after being saved... - Merged storage_gsortitem into storage_sortitem. diff --git a/src/map/intif.c b/src/map/intif.c index aeee11b9d..875baa036 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -984,10 +984,7 @@ int intif_parse_LoadGuildStorage(int fd) if(battle_config.save_log) ShowInfo("intif_open_guild_storage: %d\n",RFIFOL(fd,4) ); memcpy(gstor,RFIFOP(fd,12),sizeof(struct guild_storage)); - gstor->storage_status = 1; - sd->state.storage_flag = 2; - clif_storagelist(sd, gstor->storage_, ARRAYLENGTH(gstor->storage_)); - clif_updateguildstorageamount(sd,gstor->storage_amount); + storage_guild_storageopen(sd); return 0; } int intif_parse_SaveGuildStorage(int fd) -- cgit v1.2.3-60-g2f50