From 34037c40d28c9fe179d930949320090448b249e9 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 15 Nov 2015 00:54:33 +0100 Subject: 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 --- npc/quests/first_class/tu_archer.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'npc/quests/first_class') diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index c2b34db1a..2ca63f2f5 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -1400,7 +1400,7 @@ pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; } - script ::Acolyte_Tu -1,{ mes "[Acolyte]"; if(tu_archer01 == 14){ - if(gettime(HOUR) >= 18 && gettime(HOUR) < 22){ + if (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 22) { mes "H-hello!"; mes "Umm, umm..."; mes "Are you R-Reidin Corse's"; @@ -1500,7 +1500,7 @@ pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; } close; } } else if(tu_archer01 == 15){ - if((gettime(HOUR) >= 18) && (gettime(HOUR) < 22)){ + if (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 22) { mes "^666666Zzzzz...^000000"; mes "Wh-wha...?"; mes "Who are you?"; -- cgit v1.2.3-70-g09d2