diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-02 15:54:27 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-02 15:54:27 +0000 |
| commit | d918805022383bbf9c63f82c700f88e443ff7cd2 (patch) | |
| tree | 41ac155389f08738d15bf786cd36bacce3b7cc56 /src/map/battle.c | |
| parent | 64d039f074c942a4265345e7ff832b4938d6381a (diff) | |
| download | hercules-d918805022383bbf9c63f82c700f88e443ff7cd2.tar.gz hercules-d918805022383bbf9c63f82c700f88e443ff7cd2.tar.bz2 hercules-d918805022383bbf9c63f82c700f88e443ff7cd2.tar.xz hercules-d918805022383bbf9c63f82c700f88e443ff7cd2.zip | |
Removed some long-unneccessary debug messages (from r1105).
Removed function skill_count_target() because it's a duplicate (see topic:169337).
Renamed skill_get_pl to skill_get_ele (because it retrieves element ids).
The block_list structure now uses the BL_ enums instead of 'unsigned char'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11640 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 66348ba6e..3a865a4a4 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -833,8 +833,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * /*========================================== * battle_calc_weapon_attack (by Skotlex) *------------------------------------------*/ -static struct Damage battle_calc_weapon_attack( - struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int wflag) +static struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int wflag) { unsigned int skillratio = 100; //Skill dmg modifiers. short skill=0; @@ -966,7 +965,7 @@ static struct Damage battle_calc_weapon_attack( } t_class = status_get_class(target); - s_ele = s_ele_ = skill_get_pl(skill_num, skill_lv); + s_ele = s_ele_ = skill_get_ele(skill_num, skill_lv); if (!skill_num || s_ele == -1) { //Take weapon's element s_ele = sstatus->rhw.ele; s_ele_ = sstatus->lhw?sstatus->lhw->ele:0; @@ -2135,7 +2134,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list BL_CAST(BL_PC, target, tsd); //Initialize variables that will be used afterwards - s_ele = skill_get_pl(skill_num, skill_lv); + s_ele = skill_get_ele(skill_num, skill_lv); if (s_ele == -1) // pl=-1 : the skill takes the weapon's element s_ele = sstatus->rhw.ele; @@ -2468,7 +2467,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * md.blewcount += battle_blewcount_bonus(sd, skill_num); } - s_ele = skill_get_pl(skill_num, skill_lv); + s_ele = skill_get_ele(skill_num, skill_lv); if (s_ele < 0) //Attack that takes weapon's element for misc attacks? Make it neutral [Skotlex] s_ele = ELE_NEUTRAL; |