summaryrefslogtreecommitdiff
path: root/src/map/npc.cpp
diff options
context:
space:
mode:
authorHello TMW <hello@themanaworld.org>2024-04-06 01:14:30 +0000
committerHello TMW <hello@themanaworld.org>2024-04-06 01:14:30 +0000
commit90754fd121ffaec886c415689031f9ef01ae4972 (patch)
tree047f645931fdb0715afe784b8bc445743a78a371 /src/map/npc.cpp
parente42f76d0b0f4d2ec3a9008979267311f5246fb22 (diff)
parentebf078b9fa81142834dc45e22ea661a61c50d17b (diff)
downloadtmwa-90754fd121ffaec886c415689031f9ef01ae4972.tar.gz
tmwa-90754fd121ffaec886c415689031f9ef01ae4972.tar.bz2
tmwa-90754fd121ffaec886c415689031f9ef01ae4972.tar.xz
tmwa-90754fd121ffaec886c415689031f9ef01ae4972.zip
Merge branch tmwa:master into masterHEADmaster
Diffstat (limited to 'src/map/npc.cpp')
-rw-r--r--src/map/npc.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 4d9a8d1..ee2f30c 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -993,6 +993,12 @@ int npc_selllist(dumb_ptr<map_session_data> sd,
if (!nameid ||
sd->status.inventory[item_list[i].ioff2.unshift()].amount < item_list[i].count)
return 1;
+ if (bool(itemdb_search(nameid)->mode & ItemMode::NO_SELL_TO_NPC))
+ {
+ //clif_displaymessage(sd->sess, "This item can't be sold to an NPC."_s);
+ // M+ already outputs "Unable to sell unsellable item." on return value 3.
+ return 3;
+ }
if (sd->trade_partner)
return 2; // cant sell while trading
z += static_cast<double>(itemdb_value_sell(nameid)) * item_list[i].count;
@@ -1009,7 +1015,6 @@ int npc_selllist(dumb_ptr<map_session_data> sd,
}
return 0;
-
}
static