HPM: Pet.c Interface

Fully Integrated.

Signed-off-by: shennetsind <ind@henn.et>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/map/unit.c b/src/map/unit.c
index da6f26c9d..d8efcefef 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1613,7 +1613,7 @@ int unit_unattackable(struct block_list *bl)
 	if(bl->type == BL_MOB)
 		mob->unlocktarget((struct mob_data*)bl, iTimer->gettick()) ;
 	else if(bl->type == BL_PET)
-		pet_unlocktarget((struct pet_data*)bl);
+		pet->unlocktarget((struct pet_data*)bl);
 	return 0;
 }
 
@@ -1902,14 +1902,14 @@ int unit_attack_timer_sub(struct block_list* src, int tid, unsigned int tick)
 				iMap->foreachinrange(mob->linksearch, src, md->db->range2, BL_MOB, md->class_, target, tick);
 			}
 		}
-		if(src->type == BL_PET && pet_attackskill((TBL_PET*)src, target->id))
+		if(src->type == BL_PET && pet->attackskill((TBL_PET*)src, target->id))
 			return 1;
 
 		iMap->freeblock_lock();
 		ud->attacktarget_lv = battle->weapon_attack(src,target,tick,0);
 
 		if(sd && sd->status.pet_id > 0 && sd->pd && battle_config.pet_attack_support)
-			pet_target_check(sd,target,0);
+			pet->target_check(sd,target,0);
 		iMap->freeblock_unlock();
 		/**
 		 * Applied when you're unable to attack (e.g. out of ammo)
@@ -2423,7 +2423,7 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 		{
 			struct pet_data *pd = (struct pet_data*)bl;
 			struct map_session_data *sd = pd->msd;
-			pet_hungry_timer_delete(pd);
+			pet->hungry_timer_delete(pd);
 			if( pd->a_skill )
 			{
 				aFree(pd->a_skill);
@@ -2433,9 +2433,9 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 			{
 				if (pd->s_skill->timer != INVALID_TIMER) {
 					if (pd->s_skill->id)
-						iTimer->delete_timer(pd->s_skill->timer, pet_skill_support_timer);
+						iTimer->delete_timer(pd->s_skill->timer, pet->skill_support_timer);
 					else
-						iTimer->delete_timer(pd->s_skill->timer, pet_heal_timer);
+						iTimer->delete_timer(pd->s_skill->timer, pet->heal_timer);
 				}
 				aFree(pd->s_skill);
 				pd->s_skill = NULL;
@@ -2443,20 +2443,20 @@ int unit_free(struct block_list *bl, clr_type clrtype)
 			if( pd->recovery )
 			{
 				if(pd->recovery->timer != INVALID_TIMER)
-					iTimer->delete_timer(pd->recovery->timer, pet_recovery_timer);
+					iTimer->delete_timer(pd->recovery->timer, pet->recovery_timer);
 				aFree(pd->recovery);
 				pd->recovery = NULL;
 			}
 			if( pd->bonus )
 			{
 				if (pd->bonus->timer != INVALID_TIMER)
-					iTimer->delete_timer(pd->bonus->timer, pet_skill_bonus_timer);
+					iTimer->delete_timer(pd->bonus->timer, pet->skill_bonus_timer);
 				aFree(pd->bonus);
 				pd->bonus = NULL;
 			}
 			if( pd->loot )
 			{
-				pet_lootitem_drop(pd,sd);
+				pet->lootitem_drop(pd,sd);
 				if (pd->loot->item)
 					aFree(pd->loot->item);
 				aFree (pd->loot);