diff options
author | Haru <haru@dotalux.com> | 2015-11-15 00:54:33 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-11-15 00:57:00 +0100 |
commit | 34037c40d28c9fe179d930949320090448b249e9 (patch) | |
tree | 3fe4d79c6185df4f165beae47cc3e7a286ce5af8 /npc/other | |
parent | 8ee5eafc741d581579efd696765fb0646b72a553 (diff) | |
download | hercules-34037c40d28c9fe179d930949320090448b249e9.tar.gz hercules-34037c40d28c9fe179d930949320090448b249e9.tar.bz2 hercules-34037c40d28c9fe179d930949320090448b249e9.tar.xz hercules-34037c40d28c9fe179d930949320090448b249e9.zip |
Fixed too-generic constant names of gettime() types
- Follow-up to 3bd77ffc0daca508352834add828766490075aee
- The names were too generic (not namespaced), and were easily clashing
with custom (and potential future official) constants or variables.
- Constants are now prefixed with a 'GETTIME_' namespace:
- GETTIME_SECOND
- GETTIME_MINUTE
- GETTIME_HOUR
- GETTIME_WEEKDAY
- GETTIME_DAYOFMONTH
- GETTIME_MONTH
- GETTIME_YEAR
- GETTIME_DAYOFYEAR
- Fixed some excessive (and some times incorrect) parentheses in
various scripts using gettime().
- Updated documentation.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/other')
-rw-r--r-- | npc/other/arena/arena_lvl50.txt | 8 | ||||
-rw-r--r-- | npc/other/arena/arena_lvl60.txt | 8 | ||||
-rw-r--r-- | npc/other/arena/arena_lvl70.txt | 8 | ||||
-rw-r--r-- | npc/other/arena/arena_lvl80.txt | 8 | ||||
-rw-r--r-- | npc/other/arena/arena_party.txt | 8 |
5 files changed, 20 insertions, 20 deletions
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index 015dc64db..2c1301368 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/npc/other/arena/arena_lvl50.txt @@ -37,8 +37,8 @@ force_1-1,99,20,4 script Heel and Toe#arena 4_F_TELEPORTER,{ OnStart: initnpctimer; - $arena_min50st = gettime(MINUTE); - $arena_sec50st = gettime(SECOND); + $arena_min50st = gettime(GETTIME_MINUTE); + $arena_sec50st = gettime(GETTIME_SECOND); end; OnTimer3000: @@ -774,8 +774,8 @@ OnMyMobDead: donpcevent "Heel and Toe#arena::On09_End"; donpcevent "arena#50::OnReset_09"; donpcevent "arena#50::OnReset_All"; - $arena_min50end = gettime(MINUTE); - $arena_sec50end = gettime(SECOND); + $arena_min50end = gettime(GETTIME_MINUTE); + $arena_sec50end = gettime(GETTIME_SECOND); } end; } diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 7fbaea869..71f80dcd4 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -38,8 +38,8 @@ force_2-1,99,20,4 script Minilover#arena 4_F_TELEPORTER,{ OnStart: initnpctimer; - $arena_min60st = gettime(MINUTE); - $arena_sec60st = gettime(SECOND); + $arena_min60st = gettime(GETTIME_MINUTE); + $arena_sec60st = gettime(GETTIME_SECOND); end; OnTimer3000: @@ -784,8 +784,8 @@ OnMyMobDead: donpcevent "Minilover#arena::On09_End"; donpcevent "arena#60::OnReset_09"; donpcevent "arena#60::OnReset_All"; - $arena_min60end = gettime(MINUTE); - $arena_sec60end = gettime(SECOND); + $arena_min60end = gettime(GETTIME_MINUTE); + $arena_sec60end = gettime(GETTIME_SECOND); } end; } diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index a0b88f5dd..889089107 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/npc/other/arena/arena_lvl70.txt @@ -37,8 +37,8 @@ force_3-1,99,20,4 script Cadillac#arena 4_F_TELEPORTER,{ OnStart: initnpctimer; - $arena_min70st = gettime(MINUTE); - $arena_sec70st = gettime(SECOND); + $arena_min70st = gettime(GETTIME_MINUTE); + $arena_sec70st = gettime(GETTIME_SECOND); end; OnTimer3000: @@ -749,8 +749,8 @@ OnMyMobDead: donpcevent "Cadillac#arena::On09_End"; donpcevent "arena#70::OnReset_09"; donpcevent "arena#70::OnReset_All"; - $arena_min70end = gettime(MINUTE); - $arena_sec70end = gettime(SECOND); + $arena_min70end = gettime(GETTIME_MINUTE); + $arena_sec70end = gettime(GETTIME_SECOND); } end; } diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index 8922a3376..1529e555d 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/npc/other/arena/arena_lvl80.txt @@ -37,8 +37,8 @@ force_4-1,99,20,4 script Octus#arena 4_F_TELEPORTER,{ OnStart: initnpctimer; - $arena_min80st = gettime(MINUTE); - $arena_sec80st = gettime(SECOND); + $arena_min80st = gettime(GETTIME_MINUTE); + $arena_sec80st = gettime(GETTIME_SECOND); end; OnTimer3000: @@ -730,8 +730,8 @@ OnMyMobDead: donpcevent "Octus#arena::On09_End"; donpcevent "arena#80::OnReset_09"; donpcevent "arena#80::OnReset_All"; - $arena_min80end = gettime(MINUTE); - $arena_sec80end = gettime(SECOND); + $arena_min80end = gettime(GETTIME_MINUTE); + $arena_sec80end = gettime(GETTIME_SECOND); } end; } diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index 3011e7a43..ac9c5ff53 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -147,8 +147,8 @@ OnTouch: force_1-2,99,31,4 script Slipslowrun#party 4_F_TELEPORTER,{ OnStart: initnpctimer; - $arena_minptst = gettime(MINUTE); - $arena_secptst = gettime(SECOND); + $arena_minptst = gettime(GETTIME_MINUTE); + $arena_secptst = gettime(GETTIME_SECOND); end; OnTimer2000: @@ -412,8 +412,8 @@ OnReset: force_1-2,95,187,0 script force_09_exit WARPNPC,1,1,{ OnTouch: - $arena_minptend = gettime(MINUTE); - $arena_secptend = gettime(SECOND); + $arena_minptend = gettime(GETTIME_MINUTE); + $arena_secptend = gettime(GETTIME_SECOND); warp "prt_are_in",73,139; donpcevent "#arn_timer_pt::OnEnter"; donpcevent "arena_p::OnReset"; |