summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 01:57:08 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-18 01:57:08 +0000
commit6f51acd64405e1f081e1a54a5c3f5c3b5431bc70 (patch)
treea8bc02495db478fcd7cea8704857de9ab96dc981 /src/map/unit.c
parentd305f53531e7dd0b4c29a677ff829379aac7e890 (diff)
downloadhercules-6f51acd64405e1f081e1a54a5c3f5c3b5431bc70.tar.gz
hercules-6f51acd64405e1f081e1a54a5c3f5c3b5431bc70.tar.bz2
hercules-6f51acd64405e1f081e1a54a5c3f5c3b5431bc70.tar.xz
hercules-6f51acd64405e1f081e1a54a5c3f5c3b5431bc70.zip
- Applied use of structure regen_data for a unified regen module. Natural and skill-heal is handled by this structure, while sitting-skill-heal is still player dependant (mostly because the other object types can't sit)
- Added SCB_REGEN constant to identify status changes which alter regeneration - Modified SC_REGENERATION so that if val4 is set, the status actually blocks regen rather than increase it, this is what now Frenzy uses instead of "canregen_tick" - Cleaned up the status calc code for homun by moving it from status_calc_bl_sub_homun to status_calc_homun (where it should had always been) - Moved the Fleet watk code to status_calc_watk where it belongs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8334 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 9f1163387..7c1e011ad 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1769,7 +1769,6 @@ int unit_free(struct block_list *bl) {
struct map_session_data *sd = hd->master;
// Desactive timers
merc_hom_hungry_timer_delete(hd);
- merc_natural_heal_timer_delete(hd);
if(sd) {
if (sd->homunculus.intimacy > 0)
merc_save(hd);