diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 06:17:06 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 06:17:06 +0000 |
| commit | 9ef634559f3cde232586b1dc6fd00bea3f3d8e53 (patch) | |
| tree | 541295af8a6fbfe15b09da353680be6dd4d6b3ff /src/map/pet.h | |
| parent | 9c100697bf79604fcef8b7eedbadeed45c63b41b (diff) | |
| download | hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.gz hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.bz2 hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.xz hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.zip | |
* Merged changes from trunk [14827:14894/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14895 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.h')
| -rw-r--r-- | src/map/pet.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/pet.h b/src/map/pet.h index 729fdeb92..52f4999df 100644 --- a/src/map/pet.h +++ b/src/map/pet.h @@ -121,10 +121,10 @@ int pet_change_name_ack(struct map_session_data *sd, char* name, int flag); int pet_equipitem(struct map_session_data *sd,int index); int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd); int pet_attackskill(struct pet_data *pd, int target_id); -int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr data); // [Skotlex] -int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr data); // [Valaris] -int pet_recovery_timer(int tid, unsigned int tick, int id, intptr data); // [Valaris] -int pet_heal_timer(int tid, unsigned int tick, int id, intptr data); // [Valaris] +int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr_t data); // [Skotlex] +int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data); // [Valaris] +int pet_recovery_timer(int tid, unsigned int tick, int id, intptr_t data); // [Valaris] +int pet_heal_timer(int tid, unsigned int tick, int id, intptr_t data); // [Valaris] #define pet_stop_walking(pd, type) unit_stop_walking(&(pd)->bl, type) #define pet_stop_attack(pd) unit_stop_attack(&(pd)->bl) |