summaryrefslogtreecommitdiff
path: root/npc/other/arena
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-09-14 08:13:28 +0200
committerHaru <haru@dotalux.com>2013-11-28 02:34:55 +0100
commit9a802b9147221ec1f31109242be2919f53401fd3 (patch)
tree22c42e57cc03151e0e1aa73f0035c614b73b468e /npc/other/arena
parentac6ae8c932efbca30ef1650fa5d7bd94ead336f5 (diff)
downloadhercules-9a802b9147221ec1f31109242be2919f53401fd3.tar.gz
hercules-9a802b9147221ec1f31109242be2919f53401fd3.tar.bz2
hercules-9a802b9147221ec1f31109242be2919f53401fd3.tar.xz
hercules-9a802b9147221ec1f31109242be2919f53401fd3.zip
Corrected operator precedence table.
- [ This commit is part of a larger script engine related update ] - Operator precedence rules now closely follow those of languages such as C and derivates/related (C++, Java, PHP, etc.) - Please note that if you had custom scripts with non parenthesized expressions containing bitwise |, &, ^ operators, they may behave incorrectly now (or perhaps they were already behaving incorrectly, since the previous behavior was undocumented). - Added an up to date operator precedence/associativity table in the script documentation. - Added an operator/keyword self-test script in the npc/custom folder, in case if may be of some use for future regression-testing.
Diffstat (limited to 'npc/other/arena')
-rw-r--r--npc/other/arena/arena_aco.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 725e8c58f..cc0b4b640 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -1084,7 +1084,7 @@ prt_are_in,25,31,3 script Staff#aco-2 1_F_02,{
set .@hour_endaco, .@end_timeaco / 10000;
set .@min_endaco, ((.@end_timeaco % 10000) / 100);
set .@sec_endaco, .@end_timeaco % 100;
- if ((.@hour_startaco == 23) & (.@hour_endaco == 0)) {
+ if ((.@hour_startaco == 23) && (.@hour_endaco == 0)) {
set .@hour_endaco,24;
}
set .@st_to_secaco, ((.@hour_startaco * 3600) + (.@min_startaco * 60) + (.@sec_startaco));