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/airports | |
| 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/airports')
| -rw-r--r-- | npc/airports/airships.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 2faab33af..58652ab56 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -1135,18 +1135,18 @@ airplane_01,32,61,4 script Nils#ein 1_M_03,1,1,{ mes .@line1_1$[.@wordtest]; mes .@line1_2$[.@wordtest]; mes .@line1_3$[.@wordtest]; - .@start_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND); + .@start_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); next; input .@save1$; - .@end_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND); + .@end_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); .@total_time = .@end_time - .@start_time; mes "[Nils]"; mes .@line2_1$[.@wordtest]; mes .@line2_2$[.@wordtest]; - .@start_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND); + .@start_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); next; input .@save2$; - .@end_time = gettime(HOUR)*60*60 + gettime(MINUTE)*60 + gettime(SECOND); + .@end_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); .@total_time = .@total_time + (.@start_time - .@end_time); .@tasoo = (.@letters[.@wordtest] / .@total_time) * 6; if ((.@save1$ == .@word1$[.@wordtest]) && (.@save2$ == .@word2$[.@wordtest])) { |