Browse Source

Follow up r15749, fixed to return correct value.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15751 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 years ago
parent
commit
b47bd76816
1 changed files with 3 additions and 5 deletions
  1. 3 5
      src/map/battle.c

+ 3 - 5
src/map/battle.c

@@ -1094,8 +1094,7 @@ void battle_consume_ammo(TBL_PC*sd, int skill, int lv)
 	if (!battle_config.arrow_decrement)
 	if (!battle_config.arrow_decrement)
 		return;
 		return;
 	
 	
-	if (skill)
-	{
+	if (skill) {
 		qty = skill_get_ammo_qty(skill, lv);
 		qty = skill_get_ammo_qty(skill, lv);
 		if (!qty) qty = 1;
 		if (!qty) qty = 1;
 	}
 	}
@@ -3953,8 +3952,7 @@ int battle_damage_area( struct block_list *bl, va_list ap) {
 /*==========================================
 /*==========================================
  * ’Ê??UŒ‚?ˆ—?‚܂Ƃß
  * ’Ê??UŒ‚?ˆ—?‚܂Ƃß
  *------------------------------------------*/
  *------------------------------------------*/
-enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, unsigned int tick, int flag)
-{
+enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* target, unsigned int tick, int flag) {
 	struct map_session_data *sd = NULL, *tsd = NULL;
 	struct map_session_data *sd = NULL, *tsd = NULL;
 	struct status_data *sstatus, *tstatus;
 	struct status_data *sstatus, *tstatus;
 	struct status_change *sc, *tsc;
 	struct status_change *sc, *tsc;
@@ -4064,7 +4062,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 		}
 		}
 		if (rnd()%100 < triple_rate) {
 		if (rnd()%100 < triple_rate) {
 			if( skill_attack(BF_WEAPON,src,src,target,MO_TRIPLEATTACK,skillv,tick,0) )
 			if( skill_attack(BF_WEAPON,src,src,target,MO_TRIPLEATTACK,skillv,tick,0) )
-				return wd.dmg_lv;
+				return ATK_DEF;
 			return ATK_MISS;
 			return ATK_MISS;
 		}
 		}
 	}
 	}