diff options
| author | Haru <haru@dotalux.com> | 2013-09-25 01:18:31 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-25 01:19:19 +0200 |
| commit | 66979ef89363c03e3cc02d63feb5248836daff4e (patch) | |
| tree | 121d8cf0ef1299ca5cb00ca66a2a261156889560 /src/map/skill.c | |
| parent | a67007e744f44a74746e0b658160ddc8179d2c0a (diff) | |
| download | hercules-66979ef89363c03e3cc02d63feb5248836daff4e.tar.gz hercules-66979ef89363c03e3cc02d63feb5248836daff4e.tar.bz2 hercules-66979ef89363c03e3cc02d63feb5248836daff4e.tar.xz hercules-66979ef89363c03e3cc02d63feb5248836daff4e.zip | |
Renamed local variables that would conflict with a rename of iTimer to timer
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 75df03b1b..c178bc074 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4807,8 +4807,8 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data) case NPC_GRANDDARKNESS: if( (sc = iStatus->get_sc(src)) && sc->data[SC_NOEQUIPSHIELD] ) { - const struct TimerData *timer = iTimer->get_timer(sc->data[SC_NOEQUIPSHIELD]->timer); - if( timer && timer->func == iStatus->change_timer && DIFF_TICK(timer->tick,iTimer->gettick()+skill->get_time(ud->skill_id, ud->skill_lv)) > 0 ) + const struct TimerData *td = iTimer->get_timer(sc->data[SC_NOEQUIPSHIELD]->timer); + if( td && td->func == iStatus->change_timer && DIFF_TICK(td->tick,iTimer->gettick()+skill->get_time(ud->skill_id, ud->skill_lv)) > 0 ) break; } sc_start2(src, SC_NOEQUIPSHIELD, 100, 0, 1, skill->get_time(ud->skill_id, ud->skill_lv)); |