diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-04-09 17:59:01 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-04-11 14:21:42 -0700 |
commit | 8ce76f29ab6bc6ea0809c085b4f395373b3cb8d7 (patch) | |
tree | 407e8fb0258440c6dd60cca98b6304fb946eba70 /src/map/npc.cpp | |
parent | 756085f91d0f01c69550735cf2e60cae54d9c72a (diff) | |
download | tmwa-8ce76f29ab6bc6ea0809c085b4f395373b3cb8d7.tar.gz tmwa-8ce76f29ab6bc6ea0809c085b4f395373b3cb8d7.tar.bz2 tmwa-8ce76f29ab6bc6ea0809c085b4f395373b3cb8d7.tar.xz tmwa-8ce76f29ab6bc6ea0809c085b4f395373b3cb8d7.zip |
Also implement x32 support
Diffstat (limited to 'src/map/npc.cpp')
-rw-r--r-- | src/map/npc.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index f0cacb9..7b88705 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -241,30 +241,29 @@ int npc_event_do_l(const char *name, int rid, int argc, argrec_t *args) static void npc_event_do_clock(TimerData *, tick_t) { - time_t timer = time(NULL); - struct tm *t = gmtime(&timer); + struct tm t = TimeT::now(); - if (t->tm_min != ev_tm_b.tm_min) + if (t.tm_min != ev_tm_b.tm_min) { std::string buf; - buf = STRPRINTF("OnMinute%02d", t->tm_min); + buf = STRPRINTF("OnMinute%02d", t.tm_min); npc_event_doall(buf.c_str()); - buf = STRPRINTF("OnClock%02d%02d", t->tm_hour, t->tm_min); + buf = STRPRINTF("OnClock%02d%02d", t.tm_hour, t.tm_min); npc_event_doall(buf.c_str()); } - if (t->tm_hour != ev_tm_b.tm_hour) + if (t.tm_hour != ev_tm_b.tm_hour) { std::string buf; - buf = STRPRINTF("OnHour%02d", t->tm_hour); + buf = STRPRINTF("OnHour%02d", t.tm_hour); npc_event_doall(buf.c_str()); } - if (t->tm_mday != ev_tm_b.tm_mday) + if (t.tm_mday != ev_tm_b.tm_mday) { std::string buf; - buf = STRPRINTF("OnDay%02d%02d", t->tm_mon + 1, t->tm_mday); + buf = STRPRINTF("OnDay%02d%02d", t.tm_mon + 1, t.tm_mday); npc_event_doall(buf.c_str()); } - memcpy(&ev_tm_b, t, sizeof(ev_tm_b)); + ev_tm_b = t; } /*========================================== |