summaryrefslogtreecommitdiff
path: root/src/map/pet.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-27 15:00:54 -0200
committershennetsind <ind@henn.et>2013-10-27 15:00:54 -0200
commita1c3a358aefa46b37e6745f9c54cc6df14ea6ba4 (patch)
tree200bfbff424724d1c324527359fce2c96c957957 /src/map/pet.h
parentbaef78f7954fa4e6fa2449f2c7de92a901c7f5f3 (diff)
parente6a1225802e01ad5390c033ca7a4653c1a976c24 (diff)
downloadhercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.tar.gz
hercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.tar.bz2
hercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.tar.xz
hercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/pet.h')
-rw-r--r--src/map/pet.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/map/pet.h b/src/map/pet.h
index 2f8e0b7c2..f95e860a2 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -86,7 +86,7 @@ struct pet_data {
unsigned skillbonus : 1;
} state;
int move_fail_count;
- unsigned int next_walktime,last_thinktime;
+ int64 next_walktime, last_thinktime;
short rate_fix; //Support rate as modified by intimacy (1000 = 100%) [Skotlex]
struct pet_recovery* recovery;
@@ -116,7 +116,7 @@ struct pet_interface {
int (*attackskill) (struct pet_data *pd, int target_id);
int (*target_check) (struct map_session_data *sd, struct block_list *bl, int type);
int (*sc_check) (struct map_session_data *sd, int type);
- int (*hungry) (int tid, unsigned int tick, int id, intptr_t data);
+ int (*hungry) (int tid, int64 tick, int id, intptr_t data);
int (*search_petDB_index) (int key, int type);
int (*hungry_timer_delete) (struct pet_data *pd);
int (*performance) (struct map_session_data *sd, struct pet_data *pd);
@@ -135,16 +135,16 @@ struct pet_interface {
int (*change_name) (struct map_session_data *sd, char *name);
int (*change_name_ack) (struct map_session_data *sd, char *name, int flag);
int (*equipitem) (struct map_session_data *sd, int index);
- int (*randomwalk) (struct pet_data *pd, unsigned int tick);
- int (*ai_sub_hard) (struct pet_data *pd, struct map_session_data *sd, unsigned int tick);
+ int (*randomwalk) (struct pet_data *pd, int64 tick);
+ int (*ai_sub_hard) (struct pet_data *pd, struct map_session_data *sd, int64 tick);
int (*ai_sub_foreachclient) (struct map_session_data *sd, va_list ap);
- int (*ai_hard) (int tid, unsigned int tick, int id, intptr_t data);
- int (*delay_item_drop) (int tid, unsigned int tick, int id, intptr_t data);
+ int (*ai_hard) (int tid, int64 tick, int id, intptr_t data);
+ int (*delay_item_drop) (int tid, int64 tick, int id, intptr_t data);
int (*lootitem_drop) (struct pet_data *pd, struct map_session_data *sd);
- int (*skill_bonus_timer) (int tid, unsigned int tick, int id, intptr_t data);
- int (*recovery_timer) (int tid, unsigned int tick, int id, intptr_t data);
- int (*heal_timer) (int tid, unsigned int tick, int id, intptr_t data);
- int (*skill_support_timer) (int tid, unsigned int tick, int id, intptr_t data);
+ int (*skill_bonus_timer) (int tid, int64 tick, int id, intptr_t data);
+ int (*recovery_timer) (int tid, int64 tick, int id, intptr_t data);
+ int (*heal_timer) (int tid, int64 tick, int id, intptr_t data);
+ int (*skill_support_timer) (int tid, int64 tick, int id, intptr_t data);
int (*read_db) ();
};