summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-27 15:24:06 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-27 15:24:06 +0000
commit61aacc083393bead3227a049b57fb9e76186c7c5 (patch)
tree5872c3c351086969f539a105906568c1f39183b9 /src/map/map.h
parenta46c1fbcb1b7df32c678af8f0bbfda801d6142dc (diff)
downloadhercules-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.h')
-rw-r--r--src/map/map.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.h b/src/map/map.h
index cdae79a78..d894dffa9 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -1127,7 +1127,7 @@ struct flooritem_data {
struct block_list bl;
unsigned char subx,suby;
int cleartimer;
- int first_get_id,second_get_id,third_get_id;
+ int first_get_charid,second_get_charid,third_get_charid;
unsigned int first_get_tick,second_get_tick,third_get_tick;
struct item item_data;
};
@@ -1325,7 +1325,7 @@ int map_addnpc(int,struct npc_data *);
int map_clearflooritem_timer(int,unsigned int,int,int);
int map_removemobs_timer(int,unsigned int,int,int);
#define map_clearflooritem(id) map_clearflooritem_timer(0,0,id,1)
-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);
// キャラid=>キャラ名 変換関連
void map_addnickdb(int charid, const char* nick);