diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-23 03:14:57 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-23 03:14:57 +0000 |
| commit | 7d10ecf3d159a3d4765b65a1eb1bd11399b0ef37 (patch) | |
| tree | 32d69f53bacb7597d55e5a27839dde6d952aca77 /src/map/pet.c | |
| parent | a278eb2e074ce0cb0c9c68e372c66b87f84577a1 (diff) | |
| download | hercules-7d10ecf3d159a3d4765b65a1eb1bd11399b0ef37.tar.gz hercules-7d10ecf3d159a3d4765b65a1eb1bd11399b0ef37.tar.bz2 hercules-7d10ecf3d159a3d4765b65a1eb1bd11399b0ef37.tar.xz hercules-7d10ecf3d159a3d4765b65a1eb1bd11399b0ef37.zip | |
* map_addflooritem and struct item_drop_list using id's instead of struct map_session_data's (fixes bugreport:36).
* Fixed buildin_escape_sql not properly escaping in sql servers.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11279 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index 9bebf27bc..f66492799 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -353,7 +353,7 @@ static int pet_return_egg(struct map_session_data *sd, struct pet_data *pd) tmp_item.card[3] = pd->pet.rename_flag; if((flag = pc_additem(sd,&tmp_item,1))) { clif_additem(sd,0,0,flag); - map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0); + map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } pd->pet.incuvate = 1; //No need, pet is saved on unit_free below. @@ -622,7 +622,7 @@ int pet_get_egg(int account_id,int pet_id,int flag) tmp_item.card[3] = 0; //New pets are not named. if((ret = pc_additem(sd,&tmp_item,1))) { clif_additem(sd,0,0,ret); - map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0); + map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } return 1; @@ -751,7 +751,7 @@ static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd) tmp_item.identify = 1; if((flag = pc_additem(sd,&tmp_item,1))) { clif_additem(sd,0,0,flag); - map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0); + map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } if (battle_config.pet_equip_required) { //Skotlex: halt support timers if needed @@ -1028,7 +1028,7 @@ static int pet_delay_item_drop(int tid,unsigned int tick,int id,int data) while (ditem) { map_addflooritem(&ditem->item_data,ditem->item_data.amount, list->m,list->x,list->y, - list->first_sd,list->second_sd,list->third_sd,0); + list->first_id,list->second_id,list->third_id,0); ditem_prev = ditem; ditem = ditem->next; ers_free(item_drop_ers, ditem_prev); @@ -1049,9 +1049,9 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd) dlist->m = pd->bl.m; dlist->x = pd->bl.x; dlist->y = pd->bl.y; - dlist->first_sd = NULL; - dlist->second_sd = NULL; - dlist->third_sd = NULL; + dlist->first_id = 0; + dlist->second_id = 0; + dlist->third_id = 0; dlist->item = NULL; for(i=0;i<pd->loot->count;i++) { |