diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-28 17:58:56 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-28 17:58:56 +0000 |
| commit | bfb4c510052f56c0af3f7fbca417ce23d0fd2203 (patch) | |
| tree | c1c0f5ec941a9dfb09b9d20293c822082b124475 /src/map/pet.c | |
| parent | ff2af609b86f5c35007fc30d0ef69214bd76bc12 (diff) | |
| download | hercules-bfb4c510052f56c0af3f7fbca417ce23d0fd2203.tar.gz hercules-bfb4c510052f56c0af3f7fbca417ce23d0fd2203.tar.bz2 hercules-bfb4c510052f56c0af3f7fbca417ce23d0fd2203.tar.xz hercules-bfb4c510052f56c0af3f7fbca417ce23d0fd2203.zip | |
- Added functions status_revive, pc_revive and mob_revive to handle revival (it doesn't handles player respawning, though)
- Corrected alive, raisemap, raiseall to use these functions.
- Updated resurrection/mob-kaizel to use status_revive
- Added SC_BLADESTOP to the skill enum at the beginning of status.c (fixes Bladestop causing an unknown status change message)
- Fixed MSS_DEAD state skills not triggering.
- Corrected some compilation warnings on the merc.* files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6807 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index 54ae71631..39e16ea70 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -893,7 +893,7 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, uns return 0;
}
- if (!check_distance_bl(&sd->bl, &pd->bl, pd->db->range2)) {
+ if (!check_distance_bl(&sd->bl, &pd->bl, pd->db->range2) && DIFF_TICK(tick, pd->ud.canmove_tick) > 0) {
//Master too far, chase.
if(pd->target_id)
pet_unlocktarget(pd);
|