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/clif.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/clif.c')
| -rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 513ec0d7c..9ea7f6a2e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9945,9 +9945,9 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd) if( unit->is_walking(&sd->bl) ) clif->move(&sd->ud); } else if ( sd->disguise == sd->status.class_ && sd->fontcolor_tid != INVALID_TIMER ) { - const struct TimerData *timer; - if( (timer = iTimer->get_timer(sd->fontcolor_tid)) ) { - iTimer->settick_timer(sd->fontcolor_tid, timer->tick+5000); + const struct TimerData *td; + if( (td = iTimer->get_timer(sd->fontcolor_tid)) ) { + iTimer->settick_timer(sd->fontcolor_tid, td->tick+5000); } } |