summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/npc.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1b625525f..e9261074d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/25
+ * Added a check when buying from npcs to allow buying of item_avail items.
+ [Skotlex]
* Fixed duel accept invite sending the packet before the duel data is set
(resulting in a packet that noone receives). Thanks to Toms for finding it
out. [Skotlex]
diff --git a/src/map/npc.c b/src/map/npc.c
index 6de42ce27..ac5c88654 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1197,7 +1197,8 @@ int npc_buylist(struct map_session_data *sd,int n,unsigned short *item_list)
for(i=0,w=0,z=0;i<n;i++) {
for(j=0;nd->u.shop_item[j].nameid;j++) {
- if (nd->u.shop_item[j].nameid==item_list[i*2+1])
+ if (nd->u.shop_item[j].nameid==item_list[i*2+1] || //Normal items
+ itemdb_viewid(nd->u.shop_item[j].nameid)==item_list[i*2+1]) //item_avail replacement
break;
}
if (nd->u.shop_item[j].nameid==0)