瀏覽代碼

Follow up r16427 fixed issue with parenthesis logic and a battle.c warning on missing parenthesis

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16444 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 年之前
父節點
當前提交
71cd7d13af
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/map/battle.c
  2. 1 1
      src/map/homunculus.c

+ 1 - 1
src/map/battle.c

@@ -2741,7 +2741,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
 
 			if(sc->data[SC_GT_CHANGE] && sc->data[SC_GT_CHANGE]->val2){
 				struct block_list *bl; // ATK increase: ATK [{(Caster’s DEX / 4) + (Caster’s STR / 2)} x Skill Level / 5]
-				if( bl = map_id2bl(sc->data[SC_GT_CHANGE]->val2) )
+				if( (bl = map_id2bl(sc->data[SC_GT_CHANGE]->val2)) )
 					ATK_ADD( ( status_get_dex(bl)/4 + status_get_str(bl)/2 ) * sc->data[SC_GT_CHANGE]->val1 / 5 );
 			}
 		}

+ 1 - 1
src/map/homunculus.c

@@ -244,7 +244,7 @@ int merc_hom_levelup(struct homun_data *hd)
 
 	m_class = hom_class2mapid(hd->homunculus.class_);
 
-	if((m_class&HOM_REG) && hd->homunculus.level >= battle_config.hom_max_level || (m_class&HOM_S) && hd->homunculus.level >= battle_config.hom_S_max_level || !hd->exp_next || hd->homunculus.exp < hd->exp_next)
+	if((m_class&HOM_REG) && (hd->homunculus.level >= battle_config.hom_max_level || ((m_class&HOM_S) && hd->homunculus.level >= battle_config.hom_S_max_level) || !hd->exp_next || hd->homunculus.exp < hd->exp_next))
 		return 0 ;
 
 	hom = &hd->homunculus;