Browse Source

* 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://svn.code.sf.net/p/rathena/svn/trunk@14606 54d463be-8e91-2dee-dedb-b68131a5f0ec

ai4rei 14 years ago
parent
commit
30d36bd8a1
2 changed files with 5 additions and 4 deletions
  1. 4 0
      Changelog-Trunk.txt
  2. 1 4
      src/map/intif.c

+ 4 - 0
Changelog-Trunk.txt

@@ -1,6 +1,10 @@
 Date	Added
 Date	Added
 
 
 2010/12/18
 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]
 	* 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...
 	- Guild storage is now sorted before being displayed rather than after being saved...
 	- Merged storage_gsortitem into storage_sortitem.
 	- Merged storage_gsortitem into storage_sortitem.

+ 1 - 4
src/map/intif.c

@@ -984,10 +984,7 @@ int intif_parse_LoadGuildStorage(int fd)
 	if(battle_config.save_log)
 	if(battle_config.save_log)
 		ShowInfo("intif_open_guild_storage: %d\n",RFIFOL(fd,4) );
 		ShowInfo("intif_open_guild_storage: %d\n",RFIFOL(fd,4) );
 	memcpy(gstor,RFIFOP(fd,12),sizeof(struct guild_storage));
 	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;
 	return 0;
 }
 }
 int intif_parse_SaveGuildStorage(int fd)
 int intif_parse_SaveGuildStorage(int fd)