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/chrif.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/chrif.c')
| -rw-r--r-- | src/map/chrif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index 53ef808a0..cb0f29b4e 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -1170,7 +1170,7 @@ int chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of the unsigned int tick; struct status_change_data data; struct status_change *sc = &sd->sc; - const struct TimerData *timer; + const struct TimerData *td; chrif_check(-1); tick = iTimer->gettick(); @@ -1184,10 +1184,10 @@ int chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of the if (!sc->data[i]) continue; if (sc->data[i]->timer != INVALID_TIMER) { - timer = iTimer->get_timer(sc->data[i]->timer); - if (timer == NULL || timer->func != iStatus->change_timer || DIFF_TICK(timer->tick,tick) < 0) + td = iTimer->get_timer(sc->data[i]->timer); + if (td == NULL || td->func != iStatus->change_timer || DIFF_TICK(td->tick,tick) < 0) continue; - data.tick = DIFF_TICK(timer->tick,tick); //Duration that is left before ending. + data.tick = DIFF_TICK(td->tick,tick); //Duration that is left before ending. } else data.tick = -1; //Infinite duration data.type = i; |