summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-18 16:24:23 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-18 16:24:23 +0000
commit741745b5d1d832edc1f7593eee9f9ec243d9d78c (patch)
tree1e02d700fbb5f64e6b5f844e0355bb577d7fa1b3
parent9d7d036456ad886c3a60aa73c4db37822923bf60 (diff)
downloadhercules-741745b5d1d832edc1f7593eee9f9ec243d9d78c.tar.gz
hercules-741745b5d1d832edc1f7593eee9f9ec243d9d78c.tar.bz2
hercules-741745b5d1d832edc1f7593eee9f9ec243d9d78c.tar.xz
hercules-741745b5d1d832edc1f7593eee9f9ec243d9d78c.zip
* 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
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/intif.c5
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)