diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-25 21:32:57 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-25 21:32:57 +0000 |
| commit | 7d9376f863ec9a6c08a096350d4148bd2d53a94b (patch) | |
| tree | 0f9afa02d6ecaf630b57c506f1fa6461986b6be2 | |
| parent | 908f9a6873878ca412549fd18927ceedb36a0326 (diff) | |
| download | hercules-7d9376f863ec9a6c08a096350d4148bd2d53a94b.tar.gz hercules-7d9376f863ec9a6c08a096350d4148bd2d53a94b.tar.bz2 hercules-7d9376f863ec9a6c08a096350d4148bd2d53a94b.tar.xz hercules-7d9376f863ec9a6c08a096350d4148bd2d53a94b.zip | |
- Added a check when buying from npcs to allow buying of item_avail items.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7883 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 3 |
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)
|