From 66979ef89363c03e3cc02d63feb5248836daff4e Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Wed, 25 Sep 2013 01:18:31 +0200
Subject: Renamed local variables that would conflict with a rename of iTimer
 to timer

Signed-off-by: Haru <haru@dotalux.com>
---
 src/map/clif.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/map/clif.c')

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);
 			}
 		}
 		
-- 
cgit v1.2.3-60-g2f50