From 66979ef89363c03e3cc02d63feb5248836daff4e Mon Sep 17 00:00:00 2001 From: Haru 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 --- src/map/npc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 6ab8df2fa..348829935 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -398,13 +398,13 @@ int npc_event_doall(const char* name) int npc_event_do_clock(int tid, unsigned int tick, int id, intptr_t data) { static struct tm ev_tm_b; // tracks previous execution time - time_t timer; + time_t clock; struct tm* t; char buf[64]; int c = 0; - timer = time(NULL); - t = localtime(&timer); + clock = time(NULL); + t = localtime(&clock); if (t->tm_min != ev_tm_b.tm_min ) { char* day; -- cgit v1.2.3-70-g09d2