summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 11:04:44 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-28 11:04:44 +0000
commit38c37abce31ac6d4adc4ad6dbffe59e1b243f1b5 (patch)
tree432f625d0748e59ff6b4e9b1d1c91f782721be09
parent81d6d4816f3a80f62013750c780a762c80af3b47 (diff)
downloadhercules-38c37abce31ac6d4adc4ad6dbffe59e1b243f1b5.tar.gz
hercules-38c37abce31ac6d4adc4ad6dbffe59e1b243f1b5.tar.bz2
hercules-38c37abce31ac6d4adc4ad6dbffe59e1b243f1b5.tar.xz
hercules-38c37abce31ac6d4adc4ad6dbffe59e1b243f1b5.zip
Fixed : - "uninitialized local variable 'i' used" in skill.c
- "warning: suggest explicit braces to avoid ambiguous `else'" in battle.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7943 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/battle.c11
-rw-r--r--src/map/skill.c14
3 files changed, 13 insertions, 13 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 53c99f557..81c0b6c40 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -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]
diff --git a/src/map/battle.c b/src/map/battle.c
index ad5f25d0a..84978c67f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -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)
{
diff --git a/src/map/skill.c b/src/map/skill.c
index e9dde1409..08c8469a9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -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: /* アスペルシオ */