summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-03 02:51:45 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-03 02:51:45 +0000
commitdd90153762be1de239e2e6d244dd25d50e5c2fe4 (patch)
tree75a2e3b38d74a859b731357bcfd03a1ebdfa138f /src/map/skill.c
parent6c1bf412e2ed8a8578c55149dd64e3755499f2af (diff)
downloadhercules-dd90153762be1de239e2e6d244dd25d50e5c2fe4.tar.gz
hercules-dd90153762be1de239e2e6d244dd25d50e5c2fe4.tar.bz2
hercules-dd90153762be1de239e2e6d244dd25d50e5c2fe4.tar.xz
hercules-dd90153762be1de239e2e6d244dd25d50e5c2fe4.zip
- Added the skill-related variables to pet_data, removed the pet skill delay structure.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5440 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 0a08e459e..6d74de30b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8863,18 +8863,8 @@ int skill_castcancel (struct block_list *bl, int type)
ShowError("delete timer error : skillid : %d\n", md->skillid);
return 0;
} if (bl->type == BL_PET) {
- struct pet_data *pd = (struct pet_data*)bl;
- pd->state.casting_flag = 0;
+ ((struct pet_data*)bl)->state.casting_flag = 0;
clif_skillcastcancel(bl);
- if (pd->timer != -1)
- { //Free the data attached to casting. [Skotlex]
- struct TimerData *td = get_timer(pd->timer);
- if (td && td->data)
- {
- aFree((struct cast_end_delay*)td->data);
- td->data = 0;
- }
- }
//The timer is not deleted as the pet's attack will be resumed.
return 0;
}