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

Use the same code for script commands getitem & getitem2 as @item to avoid bug in bugreport:1324 (non-stackable items are stacked)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12603 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2008-04-15 18:37:06 +00:00
parent e3aec25c02
commit 034920992e
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/04/15 2008/04/15
* Use the same code for script commands getitem & getitem2 as @item to avoid
bug in bugreport:1324 (non-stackable items are stacked) [Toms]
* Removed all _ in the second name in item_db.txt and updated item_db.sql [Toms] * Removed all _ in the second name in item_db.txt and updated item_db.sql [Toms]
* Added a forward declaration of the struct quest instead of including mmo.h [Toms] * Added a forward declaration of the struct quest instead of including mmo.h [Toms]
* Corrected some invalid syntax in skill_db.txt (wrong usage of commas) * Corrected some invalid syntax in skill_db.txt (wrong usage of commas)

54
src/map/script.c
View File

@ -5310,7 +5310,7 @@ BUILDIN_FUNC(checkweight)
*------------------------------------------*/ *------------------------------------------*/
BUILDIN_FUNC(getitem) BUILDIN_FUNC(getitem)
{ {
int nameid,amount,flag = 0; int nameid,amount,get_count,i,flag = 0;
struct item it; struct item it;
TBL_PC *sd; TBL_PC *sd;
struct script_data *data; struct script_data *data;
@ -5362,13 +5362,27 @@ BUILDIN_FUNC(getitem)
} }
if( sd == NULL ) // no target if( sd == NULL ) // no target
return 0; return 0;
if( pet_create_egg(sd, nameid) )
amount = 1; //This is a pet!
else if( (flag=pc_additem(sd,&it,amount)) ){ //Check if it's stackable.
clif_additem(sd,0,0,flag); if (!itemdb_isstackable(nameid))
if( pc_candrop(sd,&it) ) get_count = 1;
map_addflooritem(&it,amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); else
} get_count = amount;
for (i = 0; i < amount; i += get_count)
{
// if not pet egg
if (!pet_create_egg(sd, nameid))
{
if ((flag = pc_additem(sd, &it, get_count)))
{
clif_additem(sd, 0, 0, flag);
if( pc_candrop(sd,&it) )
map_addflooritem(&it,get_count,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0);
}
}
}
//Logs items, got from (N)PC scripts [Lupus] //Logs items, got from (N)PC scripts [Lupus]
if(log_config.enable_logs&LOG_SCRIPT_TRANSACTIONS) if(log_config.enable_logs&LOG_SCRIPT_TRANSACTIONS)
@ -5382,7 +5396,7 @@ BUILDIN_FUNC(getitem)
*------------------------------------------*/ *------------------------------------------*/
BUILDIN_FUNC(getitem2) BUILDIN_FUNC(getitem2)
{ {
int nameid,amount,flag = 0; int nameid,amount,get_count,i,flag = 0;
int iden,ref,attr,c1,c2,c3,c4; int iden,ref,attr,c1,c2,c3,c4;
struct item_data *item_data; struct item_data *item_data;
struct item item_tmp; struct item item_tmp;
@ -5451,9 +5465,25 @@ BUILDIN_FUNC(getitem2)
item_tmp.card[1]=c2; item_tmp.card[1]=c2;
item_tmp.card[2]=c3; item_tmp.card[2]=c3;
item_tmp.card[3]=c4; item_tmp.card[3]=c4;
if((flag = pc_additem(sd,&item_tmp,amount))) {
clif_additem(sd,0,0,flag); //Check if it's stackable.
map_addflooritem(&item_tmp,amount,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); if (!itemdb_isstackable(nameid))
get_count = 1;
else
get_count = amount;
for (i = 0; i < amount; i += get_count)
{
// if not pet egg
if (!pet_create_egg(sd, nameid))
{
if ((flag = pc_additem(sd, &item_tmp, get_count)))
{
clif_additem(sd, 0, 0, flag);
if( pc_candrop(sd,&item_tmp) )
map_addflooritem(&item_tmp,get_count,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0);
}
}
} }
//Logs items, got from (N)PC scripts [Lupus] //Logs items, got from (N)PC scripts [Lupus]