Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed a bug when unloading a npc near a shop.

Browse Source 
* Fixed npc_buylist not giving/checking the good item when it was an item_avail in the shop (the real one was added in inventory).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12616 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2008-04-18 14:33:31 +00:00
parent b7b80e5c97
commit 2577ffdf25
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -4,6 +4,9 @@ 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.
2008/04/18
* Fixed a bug when unloading a npc near a shop.
* Fixed npc_buylist not giving/checking the good item when it was an
item_avail in the shop (the real one was added in inventory).
* Implemented config setting 'vending_over_max', to let people configure
the behavior of vending items over the MAX_ZENY limit [ultramage]
2008/04/15

37
src/map/npc.c
View File

@ -1106,16 +1106,16 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list)
if (nd->master_nd) //Script-based shops.
return npc_buylist_sub(sd,n,item_list,nd->master_nd);
if (nd->subtype!=SHOP)
if (nd->subtype != SHOP)
return 3;
for(i=0,w=0,z=0;i<n;i++) {
for(j=0;nd->u.shop.shop_item[j].nameid;j++) {
for(i=0,w=0,z=0; i < n; i++) {
for(j=0; nd->u.shop.shop_item[j].nameid; j++) {
if (nd->u.shop.shop_item[j].nameid==item_list[i*2+1] || //Normal items
itemdb_viewid(nd->u.shop.shop_item[j].nameid)==item_list[i*2+1]) //item_avail replacement
break;
}
if (nd->u.shop.shop_item[j].nameid==0)
if (nd->u.shop.shop_item[j].nameid == 0)
return 3;
if (!itemdb_isstackable(nd->u.shop.shop_item[j].nameid) && item_list[i*2] > 1)
@ -1130,24 +1130,29 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list)
z+=(double)pc_modifybuyvalue(sd,nd->u.shop.shop_item[j].value) * item_list[i*2];
itemamount+=item_list[i*2];
switch(pc_checkadditem(sd,item_list[i*2+1],item_list[i*2])) {
switch(pc_checkadditem(sd,nd->u.shop.shop_item[j].nameid,item_list[i*2])) {
case ADDITEM_EXIST:
break;
case ADDITEM_NEW:
new_++;
break;
case ADDITEM_OVERAMOUNT:
return 2;
}
w+=itemdb_weight(item_list[i*2+1]) * item_list[i*2];
w += itemdb_weight(nd->u.shop.shop_item[j].nameid) * item_list[i*2];
if (nd->u.shop.shop_item[j].nameid != item_list[i*2+1])
item_list[i*2+1] = nd->u.shop.shop_item[j].nameid; // item_avail replacement
}
if (z > (double)sd->status.zeny)
return 1; // zeny•s‘«
return 1; // Not enough Zeny
if (w+sd->weight > sd->max_weight)
return 2; // <EFBFBD>d—Ê’´‰ß
if (pc_inventoryblank(sd)<new_)
return 3; // Ží—Þ<EFBFBD>”’´‰ß
return 2; // Too heavy
if (pc_inventoryblank(sd) < new_)
return 3; // Not enough space to store items
//Logs (S)hopping Zeny [Lupus]
if(log_config.zeny > 0 )
@ -1155,7 +1160,7 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list)
//Logs
pc_payzeny(sd,(int)z);
for(i=0;i<n;i++) {
for(i=0; i<n; i++) {
struct item item_tmp;
memset(&item_tmp,0,sizeof(item_tmp));
@ -2029,12 +2034,18 @@ void npc_setcells(struct npc_data* nd)
int m = nd->bl.m, x = nd->bl.x, y = nd->bl.y, xs, ys;
int i,j;
if (nd->subtype == WARP) {
switch(nd->subtype)
{
case WARP:
xs = nd->u.warp.xs;
ys = nd->u.warp.ys;
} else {
break;
case SCRIPT:
xs = nd->u.scr.xs;
ys = nd->u.scr.ys;
break;
default:
return; // Other types doesn't have touch area
}
if (m < 0 || xs < 0 || ys < 0)