summaryrefslogtreecommitdiff
path: root/src/map/duel.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-09-25 01:18:31 +0200
committerHaru <haru@dotalux.com>2013-09-25 01:19:19 +0200
commit66979ef89363c03e3cc02d63feb5248836daff4e (patch)
tree121d8cf0ef1299ca5cb00ca66a2a261156889560 /src/map/duel.c
parenta67007e744f44a74746e0b658160ddc8179d2c0a (diff)
downloadhercules-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/duel.c')
-rw-r--r--src/map/duel.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/map/duel.c b/src/map/duel.c
index 8be1baf5c..1291dd02b 100644
--- a/src/map/duel.c
+++ b/src/map/duel.c
@@ -17,25 +17,23 @@
/*==========================================
* Duel organizing functions [LuzZza]
*------------------------------------------*/
-void duel_savetime(struct map_session_data* sd)
-{
- time_t timer;
+void duel_savetime(struct map_session_data* sd) {
+ time_t clock;
struct tm *t;
- time(&timer);
- t = localtime(&timer);
+ time(&clock);
+ t = localtime(&clock);
pc_setglobalreg(sd, "PC_LAST_DUEL_TIME", t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min);
}
-int duel_checktime(struct map_session_data* sd)
-{
+int duel_checktime(struct map_session_data* sd) {
int diff;
- time_t timer;
+ time_t clock;
struct tm *t;
- time(&timer);
- t = localtime(&timer);
+ time(&clock);
+ t = localtime(&clock);
diff = t->tm_mday*24*60 + t->tm_hour*60 + t->tm_min - pc_readglobalreg(sd, "PC_LAST_DUEL_TIME");