diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-27 15:24:06 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-27 15:24:06 +0000 |
| commit | 61aacc083393bead3227a049b57fb9e76186c7c5 (patch) | |
| tree | 5872c3c351086969f539a105906568c1f39183b9 /src/map/pet.c | |
| parent | a46c1fbcb1b7df32c678af8f0bbfda801d6142dc (diff) | |
| download | hercules-61aacc083393bead3227a049b57fb9e76186c7c5.tar.gz hercules-61aacc083393bead3227a049b57fb9e76186c7c5.tar.bz2 hercules-61aacc083393bead3227a049b57fb9e76186c7c5.tar.xz hercules-61aacc083393bead3227a049b57fb9e76186c7c5.zip | |
* Loot code using charid's instead of id's in pick priority.
* configure script using svn:eol-style LF and require mysql/pcre when --with-mysql/pcre is used.
Added a forgotten file from r11311. (script_commands.txt)
Note: charid's are globally unique, id's are equal for characters in the same account.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11312 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 ac369bff5..0b7da5da2 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -997,14 +997,14 @@ static int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap) struct pet_data* pd; struct flooritem_data *fitem = (struct flooritem_data *)bl; struct block_list **target; - int sd_id =0; + int sd_charid =0; pd=va_arg(ap,struct pet_data *); target=va_arg(ap,struct block_list**); - sd_id = fitem->first_get_id; + sd_charid = fitem->first_get_charid; - if(sd_id && sd_id != pd->msd->bl.id) + if(sd_charid && sd_charid != pd->msd->status.char_id) return 0; if(unit_can_reach_bl(&pd->bl,bl, pd->db->range2, 1, NULL, NULL) && @@ -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_id,list->second_id,list->third_id,0); + list->first_charid,list->second_charid,list->third_charid,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_id = 0; - dlist->second_id = 0; - dlist->third_id = 0; + dlist->first_charid = 0; + dlist->second_charid = 0; + dlist->third_charid = 0; dlist->item = NULL; for(i=0;i<pd->loot->count;i++) { |