diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/npc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 9d6d25cbb..7bdba2a61 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -769,7 +769,7 @@ int npc_settimerevent_tick(struct npc_data *nd,int newtimer) }
flag= sd->npc_timer_id != -1 ;
} else
- flag= nd->u.scr.timer != -1 ;
+ flag= nd->u.scr.timerid != -1 ;
if(flag)
npc_timerevent_stop(nd);
nd->u.scr.timer=newtimer;
diff --git a/src/map/skill.c b/src/map/skill.c index 729135ad7..cb9e7d255 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8489,7 +8489,8 @@ int skill_use_id (struct map_session_data *sd, int target_id, int skill_num, int if (!skill_check_condition(sd,0)) return 0;
if(sd->bl.id != target_id){ // Don't check range for self skills, this is useless...
- if(!battle_check_range(&sd->bl,bl,skill_get_range2(&sd->bl, skill_num,skill_lv)+1))
+ if(!battle_check_range(&sd->bl,bl,skill_get_range2(&sd->bl, skill_num,skill_lv)
+ +(skill_num==RG_CLOSECONFINE)?0:1)) //Close confine is expoitable thanks to this extra range "feature" of the client. [Skotlex]
return 0;
}
|