diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 16:47:03 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 19:23:28 -0700 |
| commit | 7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77 (patch) | |
| tree | 961575586f475d4b47f167a2b40f865f864a0206 /src/map/script.cpp | |
| parent | 71204f7324a2e01ce50007f16c46386354712ec9 (diff) | |
| download | tmwa-7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77.tar.gz tmwa-7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77.tar.bz2 tmwa-7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77.tar.xz tmwa-7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77.zip | |
It's about time I did this
Diffstat (limited to 'src/map/script.cpp')
| -rw-r--r-- | src/map/script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/script.cpp b/src/map/script.cpp index adc7789..37861e5 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -99,7 +99,7 @@ Map<SIR, RString> mapregstr_db; static int mapreg_dirty = -1; AString mapreg_txt = "save/mapreg.txt"_s; -constexpr std::chrono::milliseconds MAPREG_AUTOSAVE_INTERVAL = std::chrono::seconds(10); +constexpr std::chrono::milliseconds MAPREG_AUTOSAVE_INTERVAL = 10_s; Map<ScriptLabel, int> scriptlabel_db; static @@ -3131,7 +3131,7 @@ void builtin_sc_start(ScriptState *st) int val1; StatusChange type = static_cast<StatusChange>(conv_num(st, &AARGO2(2))); interval_t tick = static_cast<interval_t>(conv_num(st, &AARGO2(3))); - if (tick < std::chrono::seconds(1)) + if (tick < 1_s) // work around old behaviour of: // speed potion // atk potion @@ -3307,7 +3307,7 @@ void builtin_pvpon(ScriptState *st) { if (m == pl_sd->bl_m && !pl_sd->pvp_timer) { - pl_sd->pvp_timer = Timer(gettick() + std::chrono::milliseconds(200), + pl_sd->pvp_timer = Timer(gettick() + 200_ms, std::bind(pc_calc_pvprank_timer, ph::_1, ph::_2, pl_sd->bl_id)); pl_sd->pvp_rank = 0; |