summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-09-28 13:05:53 -0600
committerJared Adams <jaxad0127@gmail.com>2009-09-28 13:05:53 -0600
commit48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8 (patch)
tree2a7e85569d0bcbf90437b35275a2a8146b51a44d /src/map
parentb6054caba250ed1af333604fb483d51d28a7aa90 (diff)
downloadtmwa-48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8.tar.gz
tmwa-48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8.tar.bz2
tmwa-48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8.tar.xz
tmwa-48d96bc41a4791b6cb0bc2cf514a6cc1f06c4dd8.zip
Revert "Prevent trading with other players who are shoping"
This reverts commit b3939b91deda8081c5b144109829599b05e81272.
Diffstat (limited to 'src/map')
-rw-r--r--src/map/trade.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index 9e99ef1..31f29ce 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -28,7 +28,7 @@ void trade_traderequest(struct map_session_data *sd,int target_id)
return;
}
}
- if (target_sd->npc_id || target_sd->npc_shopid)
+ if (target_sd->npc_id)
{
//Trade fails if you are using an NPC.
clif_tradestart(sd, 2);