summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIbrahem Hossam <ibrahem.h.basyone@gmail.com>2016-09-11 23:50:07 +0200
committerGitHub <noreply@github.com>2016-09-11 23:50:07 +0200
commit5b67dd0f17949beb1a54ee0ac13bd9b07c1bdd40 (patch)
tree6865bd593752d2f4d4cad8aa05f1f9f298a2da74
parenteac5e483816488848512fe34e2ebfd1e9f022564 (diff)
parent4c52388bcd8fe0b7025fda2693bafa23998244a9 (diff)
downloadhercules-5b67dd0f17949beb1a54ee0ac13bd9b07c1bdd40.tar.gz
hercules-5b67dd0f17949beb1a54ee0ac13bd9b07c1bdd40.tar.bz2
hercules-5b67dd0f17949beb1a54ee0ac13bd9b07c1bdd40.tar.xz
hercules-5b67dd0f17949beb1a54ee0ac13bd9b07c1bdd40.zip
Merge pull request #483 from 4144/market
Allow sell items to market shop.
-rw-r--r--src/map/npc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 4f74ea5a5..36078837f 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2167,7 +2167,7 @@ int npc_selllist(struct map_session_data *sd, struct itemlist *item_list)
}
if( nd->subtype != SHOP ) {
- if( !(nd->subtype == SCRIPT && nd->u.scr.shop && nd->u.scr.shop->type == NST_ZENY) )
+ if (!(nd->subtype == SCRIPT && nd->u.scr.shop && (nd->u.scr.shop->type == NST_ZENY || nd->u.scr.shop->type == NST_MARKET)))
return 1;
}