diff options
| author | Dennis Friis <peavey@inspircd.org> | 2009-06-23 01:35:07 +0200 |
|---|---|---|
| committer | Dennis Friis <peavey@inspircd.org> | 2009-06-25 01:13:20 +0200 |
| commit | 2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c (patch) | |
| tree | 1f3e5351556519137c137942f78ef92f36bf67f3 /src/map/clif.c | |
| parent | 85f88cd23756be9be2028e0ca13cf1449e38c858 (diff) | |
| download | tmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.tar.gz tmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.tar.bz2 tmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.tar.xz tmwa-2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c.zip | |
More fixes to storage derived from ea stable.
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 2ca7e68..ad65f88 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7540,10 +7540,10 @@ void clif_parse_MoveToKafra(int fd, struct map_session_data *sd) { if (sd->npc_id != 0 && !sd->npc_flags.storage) return; - if (sd->state.storage_flag) - storage_guild_storageadd(sd, item_index, item_amount); - else + if (sd->state.storage_flag == 1) storage_storageadd(sd, item_index, item_amount); + else if (sd->state.storage_flag == 2) + storage_guild_storageadd(sd, item_index, item_amount); } /*========================================== @@ -7561,10 +7561,10 @@ void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd) { if (sd->npc_id != 0 && !sd->npc_flags.storage) return; - if (sd->state.storage_flag) - storage_guild_storageget(sd, item_index, item_amount); - else + if (sd->state.storage_flag == 1) storage_storageget(sd, item_index, item_amount); + else if(sd->state.storage_flag == 2) + storage_guild_storageget(sd, item_index, item_amount); } /*========================================== @@ -7576,10 +7576,10 @@ void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) { if (sd->npc_id != 0 && !sd->npc_flags.storage) return; - if (sd->state.storage_flag) - storage_guild_storageaddfromcart(sd, RFIFOW(fd,2) - 2, RFIFOL(fd,4)); - else + if (sd->state.storage_flag == 1) storage_storageaddfromcart(sd, RFIFOW(fd,2) - 2, RFIFOL(fd,4)); + else if (sd->state.storage_flag == 2) + storage_guild_storageaddfromcart(sd, RFIFOW(fd,2) - 2, RFIFOL(fd,4)); } /*========================================== @@ -7591,10 +7591,10 @@ void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) { if (sd->npc_id != 0) return; - if (sd->state.storage_flag) - storage_guild_storagegettocart(sd, RFIFOW(fd,2)-1, RFIFOL(fd,4)); - else + if (sd->state.storage_flag == 1) storage_storagegettocart(sd, RFIFOW(fd,2)-1, RFIFOL(fd,4)); + else if (sd->state.storage_flag == 2) + storage_guild_storagegettocart(sd, RFIFOW(fd,2)-1, RFIFOL(fd,4)); } /*========================================== @@ -7604,10 +7604,10 @@ void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) { void clif_parse_CloseKafra(int fd, struct map_session_data *sd) { nullpo_retv(sd); - if (sd->state.storage_flag) - storage_guild_storageclose(sd); - else + if (sd->state.storage_flag == 1) storage_storageclose(sd); + else if (sd->state.storage_flag == 2) + storage_guild_storageclose(sd); if (sd->npc_flags.storage) { sd->npc_flags.storage = 0; |