summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/buyingstore.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2be1e042c..57f841916 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/02/19
+ * Fixed buying stores could be opened and sold to regardless of distance between seller and buyer (since r14713). [Ai4rei]
* Fixed 'feature.conf' not getting loaded and a typo buying store feature setting name (follow up to r14713). [Ai4rei]
* Implemented buying store system (aka. reverse vending, purchase shop) together with related skill and items, without NPCs. [Ai4rei]
- For SQL apply upgrade_svn14713_log.sql to upgrade tables `picklog` and `zenylog`; for TXT no action is necessary.
diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c
index 21629e641..6871797c8 100644
--- a/src/map/buyingstore.c
+++ b/src/map/buyingstore.c
@@ -195,6 +195,11 @@ void buyingstore_open(struct map_session_data* sd, int account_id)
return;
}
+ if( sd->bl.m != pl_sd->bl.m || !check_distance_bl(&sd->bl, &pl_sd->bl, AREA_SIZE) )
+ {// out of view range
+ return;
+ }
+
// success
clif_buyingstore_itemlist(sd, pl_sd);
}
@@ -231,6 +236,12 @@ void buyingstore_trade(struct map_session_data* sd, int account_id, unsigned int
return;
}
+ if( sd->bl.m != pl_sd->bl.m || !check_distance_bl(&sd->bl, &pl_sd->bl, AREA_SIZE) )
+ {// out of view range
+ clif_buyingstore_trade_failed_seller(sd, BUYINGSTORE_TRADE_SELLER_FAILED, 0);
+ return;
+ }
+
if( pl_sd->status.zeny < pl_sd->buyingstore.zenylimit )
{// buyer lost zeny in the mean time? fix the limit
pl_sd->buyingstore.zenylimit = pl_sd->status.zeny;