diff options
| author | Dennis Friis <peavey@inspircd.org> | 2009-06-25 00:10:45 +0200 |
|---|---|---|
| committer | Dennis Friis <peavey@inspircd.org> | 2009-06-25 01:13:21 +0200 |
| commit | 3c6a843e796541aa36008a291667bceabe00645e (patch) | |
| tree | 31755646067c05d6a713dacef66a2753629d8c31 /src/map | |
| parent | 2ce3f7eeab3222e8819810ac245ae43dee114e89 (diff) | |
| download | tmwa-3c6a843e796541aa36008a291667bceabe00645e.tar.gz tmwa-3c6a843e796541aa36008a291667bceabe00645e.tar.bz2 tmwa-3c6a843e796541aa36008a291667bceabe00645e.tar.xz tmwa-3c6a843e796541aa36008a291667bceabe00645e.zip | |
Put back jaxads fixes for NPC storage.
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index c30f319..c234966 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7537,7 +7537,7 @@ void clif_parse_MoveToKafra(int fd, struct map_session_data *sd) { item_index = RFIFOW(fd,2) - 2; item_amount = RFIFOL(fd,4); - if (sd->npc_id != 0 || sd->trade_partner != 0 || !sd->state.storage_flag) + if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_flag) return; if (sd->state.storage_flag == 1) @@ -7558,7 +7558,7 @@ void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd) { item_index = RFIFOW(fd,2) - 1; item_amount = RFIFOL(fd,4); - if (sd->npc_id != 0 || sd->trade_partner != 0 || !sd->state.storage_flag) + if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_flag) return; if (sd->state.storage_flag == 1) @@ -7574,7 +7574,7 @@ void clif_parse_MoveFromKafra(int fd,struct map_session_data *sd) { void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) { nullpo_retv(sd); - if (sd->npc_id != 0 || sd->trade_partner != 0 || !sd->state.storage_flag) + if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_flag) return; if (sd->state.storage_flag == 1) storage_storageaddfromcart(sd, RFIFOW(fd,2) - 2, RFIFOL(fd,4)); @@ -7589,7 +7589,7 @@ void clif_parse_MoveToKafraFromCart(int fd, struct map_session_data *sd) { void clif_parse_MoveFromKafraToCart(int fd, struct map_session_data *sd) { nullpo_retv(sd); - if (sd->npc_id != 0 || sd->trade_partner != 0 || !sd->state.storage_flag) + if ((sd->npc_id != 0 && !sd->npc_flags.storage) || sd->trade_partner != 0 || !sd->state.storage_flag) return; if (sd->state.storage_flag == 1) storage_storagegettocart(sd, RFIFOW(fd,2)-1, RFIFOL(fd,4)); |