Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed : - "uninitialized local variable 'i' used" in skill.c

Browse Source 
- "warning: suggest explicit braces to avoid ambiguous `else'" in battle.c 

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7943 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2006-07-28 11:04:44 +00:00
parent a007a94248
commit 31a0d55fb9
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/28
* Fixed "uninitialized local variable 'i' used" in skill.c and "warning: suggest explicit braces to avoid ambiguous `else'" in battle.c [Toms]
* Fixed "warning: long unsigned int format, unsigned int arg" in parse_login (login_sql\login.c) [Toms]
* Fixed sign warnings in login/login.c [Toms]
* Fixed "conversion from 'double' to 'int', possible loss of data" [Toms]

11
src/map/battle.c
View File

@ -1196,11 +1196,12 @@ static struct Damage battle_calc_weapon_attack(
// Added split damage for Huuma
if (skill_num == NJ_HUUMA) // Divide ATK in case of multiple targets skill
if(wflag>0)
wd.damage/= wflag;
else if(battle_config.error_log)
ShowError("0 enemies targeted by Throw Huuma, divide per 0 avoided!\n");
{
if(wflag>0)
wd.damage/= wflag;
else if(battle_config.error_log)
ShowError("0 enemies targeted by Throw Huuma, divide per 0 avoided!\n");
}
//Add any bonuses that modify the base baseatk+watk (pre-skills)
if(sd)
{

14
src/map/skill.c
View File

@ -3705,16 +3705,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
pc_delitem(sd, i, skill_db[skillid].amount[0], 0);
}
// 100% success rate at lv4 & 5, but lasts longer at lv5
if(!clif_skill_nodamage(src,bl,skillid,skilllv,
sc_start(bl,type,(60+skilllv*10),skilllv,
skill_get_time(skillid,skilllv)))
) {
if (sd) clif_skill_fail(sd,skillid,0,0);
if (skill_break_equip(bl, EQP_WEAPON, 10000, BCT_PARTY) &&
sd && sd != dstsd)
if(!clif_skill_nodamage(src,bl,skillid,skilllv, sc_start(bl,type,(60+skilllv*10),skilllv, skill_get_time(skillid,skilllv)))) {
if (sd)
clif_skill_fail(sd,skillid,0,0);
if (skill_break_equip(bl, EQP_WEAPON, 10000, BCT_PARTY) && sd && sd != dstsd)
clif_displaymessage(sd->fd,"You broke target's weapon");
}
clif_skill_nodamage(src,bl,skillid,skilllv,i);
//FIXME : Why clif_skill_nodamage 2 times ?
//clif_skill_nodamage(src,bl,skillid,skilllv,i);
break;
case PR_ASPERSIO: /* アスペルシオ */