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/map.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/map.c')
| -rw-r--r-- | src/map/map.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/map.c b/src/map/map.c index a60e059b4..668929dfc 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1549,7 +1549,7 @@ int map_search_freecell(struct block_list *src, int m, short *x,short *y, int rx * item_dataはamount以外をcopyする * type flag: &1 MVP item. &2 do stacking check. *------------------------------------------*/ -int map_addflooritem(struct item *item_data,int amount,int m,int x,int y,int first_id,int second_id,int third_id,int flags) +int map_addflooritem(struct item *item_data,int amount,int m,int x,int y,int first_charid,int second_charid,int third_charid,int flags) { int r; struct flooritem_data *fitem=NULL; @@ -1572,11 +1572,11 @@ int map_addflooritem(struct item *item_data,int amount,int m,int x,int y,int fir return 0; } - fitem->first_get_id = first_id; + fitem->first_get_charid = first_charid; fitem->first_get_tick = gettick() + (flags&1 ? battle_config.mvp_item_first_get_time : battle_config.item_first_get_time); - fitem->second_get_id = second_id; + fitem->second_get_charid = second_charid; fitem->second_get_tick = fitem->first_get_tick + (flags&1 ? battle_config.mvp_item_second_get_time : battle_config.item_second_get_time); - fitem->third_get_id = third_id; + fitem->third_get_charid = third_charid; fitem->third_get_tick = fitem->second_get_tick + (flags&1 ? battle_config.mvp_item_third_get_time : battle_config.item_third_get_time); memcpy(&fitem->item_data,item_data,sizeof(*item_data)); |