summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-11-10 05:09:37 +0100
committerHaru <haru@dotalux.com>2013-11-10 05:09:37 +0100
commitf7f10cf7bb600b6871ed37f493fef18110dc182b (patch)
tree8675372615de5b48093f5093f0e0e890834971f0 /npc/other
parentb4f1b3b5c5c009ed4f7635c5349ea97c80c08c25 (diff)
downloadhercules-f7f10cf7bb600b6871ed37f493fef18110dc182b.tar.gz
hercules-f7f10cf7bb600b6871ed37f493fef18110dc182b.tar.bz2
hercules-f7f10cf7bb600b6871ed37f493fef18110dc182b.tar.xz
hercules-f7f10cf7bb600b6871ed37f493fef18110dc182b.zip
Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4
- Consolidated case in remaining variables, labels, constants. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/Global_Functions.txt22
1 files changed, 11 insertions, 11 deletions
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index b8e43199d..3f7d1d20a 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -309,14 +309,14 @@ function script F_GetArmorType {
// Time calculation Function
// *********************************************************************
function script Time2Str {
- set .@Time_Left, getarg(0) - gettimetick(2);
+ set .@time_left, getarg(0) - gettimetick(2);
- set .@Days, .@Time_Left / 86400;
- set .@Time_Left, .@Time_Left - (.@Days * 86400);
- set .@Hours, .@Time_Left / 3600;
- set .@Time_Left, .@Time_Left - (.@Hours * 3600);
- set .@Minutes, .@Time_Left / 60;
- set .@Time_Left, .@Time_Left - (.@Minutes * 60);
+ set .@Days, .@time_left / 86400;
+ set .@time_left, .@time_left - (.@Days * 86400);
+ set .@Hours, .@time_left / 3600;
+ set .@time_left, .@time_left - (.@Hours * 3600);
+ set .@Minutes, .@time_left / 60;
+ set .@time_left, .@time_left - (.@Minutes * 60);
set .@Time$, "";
if( .@Days > 1 )
@@ -334,10 +334,10 @@ function script Time2Str {
else if( .@Minutes > 0 )
set .@Time$, .@Time$ + .@Minutes + " minute, ";
- if( .@Time_Left > 1 || .@Time_Left == 0 )
- set .@Time$, .@Time$ + .@Time_Left + " seconds";
- else if( .@Time_Left == 1 )
- set .@Time$, .@Time$ + .@Time_Left + " second";
+ if( .@time_left > 1 || .@time_left == 0 )
+ set .@Time$, .@Time$ + .@time_left + " seconds";
+ else if( .@time_left == 1 )
+ set .@Time$, .@Time$ + .@time_left + " second";
return .@Time$;
}