diff options
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index aea2f2da4..ca5662dd7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -154,7 +154,7 @@ struct delay_damage { unsigned short attack_type; }; -int battle_delay_damage_sub(int tid, unsigned int tick, int id, intptr data) +int battle_delay_damage_sub(int tid, unsigned int tick, int id, intptr_t data) { struct delay_damage *dat = (struct delay_damage *)data; struct block_list *target = map_id2bl(dat->target); @@ -208,7 +208,7 @@ int battle_delay_damage (unsigned int tick, int amotion, struct block_list *src, dat->distance = distance_bl(src, target)+10; //Attack should connect regardless unless you teleported. if (src->type != BL_PC && amotion > 1000) amotion = 1000; //Aegis places a damage-delay cap of 1 sec to non player attacks. [Skotlex] - add_timer(tick+amotion, battle_delay_damage_sub, src->id, (intptr)dat); + add_timer(tick+amotion, battle_delay_damage_sub, src->id, (intptr_t)dat); return 0; } @@ -1620,7 +1620,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo case AS_SPLASHER: skillratio += 400+50*skill_lv; if(sd) - skillratio += 30 * pc_checkskill(sd,AS_POISONREACT); + skillratio += 20 * pc_checkskill(sd,AS_POISONREACT); break; case ASC_BREAKER: skillratio += 100*skill_lv-100; |