diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-21 21:34:31 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-21 21:34:31 +0000 |
| commit | bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8 (patch) | |
| tree | 3aa7da07fc43116707de469034c7cf8186e8b2d5 /src/map/mercenary.c | |
| parent | b21c980c03ea476e324c714a9ad2d5eff5cb981d (diff) | |
| download | hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.gz hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.bz2 hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.xz hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.zip | |
* Changed the data field of timers from int to intptr.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12633 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 66658a1d9..2c76ed8d6 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -43,7 +43,7 @@ struct s_homunculus_db homunculus_db[MAX_HOMUNCULUS_CLASS]; //[orn] struct skill_tree_entry hskill_tree[MAX_HOMUNCULUS_CLASS][MAX_SKILL_TREE]; -static int merc_hom_hungry(int tid,unsigned int tick,int id,int data); +static int merc_hom_hungry(int tid, unsigned int tick, int id, intptr data); static unsigned int hexptbl[MAX_LEVEL]; @@ -478,7 +478,7 @@ int merc_hom_food(struct map_session_data *sd, struct homun_data *hd) return 0; } -static int merc_hom_hungry(int tid,unsigned int tick,int id,int data) +static int merc_hom_hungry(int tid, unsigned int tick, int id, intptr data) { struct map_session_data *sd; struct homun_data *hd; |