From 335b8e9227107182ef1e4c8a707bb604bf9937cc Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 3 Aug 2006 19:45:12 +0000 Subject: - GAHH, I am sick tired of typing TBL_HOMUNCULUS/BL_HOMUNCULUS all over the place. The idea is that the TBL* versions are supposed to be easier to use than the standard structure definition, but using TBL_HOMUNCULUS as an alias to struct homun_data kinda beats the purpose! Renamed them all to TBL_HOM/BL_HOM. - Fixed using the right-hand weapon's size modifiers regardless of which weapon was being used. - Simplified the ignore-size check by making the Weapon Perfection check be done when specifying the flag, also moved the size-fix property of riding spear-knights to status_calc_pc. - Removed variable hd from status_calc_bl as it's not needed. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8112 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 44489790d..1fefcff84 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -808,7 +808,7 @@ int skill_calc_heal (struct block_list *bl, int skill_lv) if(bl->type == BL_PC && (skill = pc_checkskill((TBL_PC*)bl, HP_MEDITATIO)) > 0) heal += heal * skill * 2 / 100; - if(bl->type == BL_HOMUNCULUS && (skill = merc_hom_checkskill( ((TBL_HOMUNCULUS*)bl)->master, HLIF_BRAIN)) > 0) //[orn] + if(bl->type == BL_HOM && (skill = merc_hom_checkskill( ((TBL_HOM*)bl)->master, HLIF_BRAIN)) > 0) //[orn] heal += heal * skill * 2 / 100; return heal; } @@ -3271,7 +3271,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if (src->type == BL_PC) { sd = (struct map_session_data *)src; - } else if (src->type == BL_HOMUNCULUS) { //[orn] + } else if (src->type == BL_HOM) { //[orn] hd = (struct homun_data *)src; } else if (src->type == BL_MOB) { md = (struct mob_data *)src; @@ -3296,7 +3296,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in //Check for undead skills that convert a no-damage skill into a damage one. [Skotlex] switch (skillid) { case HLIF_HEAL: //[orn] - if (bl->type != BL_HOMUNCULUS) { + if (bl->type != BL_HOM) { if (sd) clif_skill_fail(sd,skillid,0,0) ; break ; } @@ -5690,7 +5690,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) nullpo_retr(0, ud); BL_CAST( BL_PC, src, sd); - BL_CAST( BL_HOMUNCULUS, src, hd); //[orn] + BL_CAST( BL_HOM, src, hd); //[orn] BL_CAST( BL_MOB, src, md); if( src->prev == NULL ) { @@ -5865,7 +5865,7 @@ int skill_castend_pos (int tid, unsigned int tick, int id, int data) nullpo_retr(0, ud); BL_CAST( BL_PC , src, sd); - BL_CAST( BL_HOMUNCULUS , src, hd); //[orn] + BL_CAST( BL_HOM , src, hd); //[orn] BL_CAST( BL_MOB, src, md); if( src->prev == NULL ) { @@ -10668,7 +10668,7 @@ int skill_blockpc_start(struct map_session_data *sd, int skillid, int tick) int skill_blockmerc_end (int tid, unsigned int tick, int id, int data) //[orn] { - struct homun_data *hd = (TBL_HOMUNCULUS*) map_id2bl(id); + struct homun_data *hd = (TBL_HOM*) map_id2bl(id); if (data <= 0 || data >= MAX_SKILL) return 0; if (hd) hd->blockskill[data] = 0; -- cgit v1.2.3-60-g2f50