diff options
author | Fate <fate-tmw@googlemail.com> | 2009-10-08 05:48:29 +0000 |
---|---|---|
committer | Fate <fate-tmw@googlemail.com> | 2009-10-08 05:48:29 +0000 |
commit | d90c344f576d0be5206db7f7e7eb265a6a38019c (patch) | |
tree | 6af512881122e492f9aa2b9bece5d0395e6f740a /src/map/trade.c | |
parent | 4298d06a2e8885022f745973b3400d6c1660a531 (diff) | |
parent | 40792ad45c1929f999602dd386483ce99b0ed30a (diff) | |
download | tmwa-d90c344f576d0be5206db7f7e7eb265a6a38019c.tar.gz tmwa-d90c344f576d0be5206db7f7e7eb265a6a38019c.tar.bz2 tmwa-d90c344f576d0be5206db7f7e7eb265a6a38019c.tar.xz tmwa-d90c344f576d0be5206db7f7e7eb265a6a38019c.zip |
Merge branch 'master' of gitorious.org:tmw-eathena/mainline
Diffstat (limited to 'src/map/trade.c')
-rw-r--r-- | src/map/trade.c | 2 |
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); |