diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-04-26 17:29:06 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2015-04-26 17:29:06 -0400 |
| commit | d05cda6da48aebb0e3513045e30c0f4136952e10 (patch) | |
| tree | 0da755b087d988c42b61d4155658e334952bbb8a /world/map/npc | |
| parent | e8a1900fc0651a3ee74ce4cbe181fce2851f6420 (diff) | |
| download | serverdata-d05cda6da48aebb0e3513045e30c0f4136952e10.tar.gz serverdata-d05cda6da48aebb0e3513045e30c0f4136952e10.tar.bz2 serverdata-d05cda6da48aebb0e3513045e30c0f4136952e10.tar.xz serverdata-d05cda6da48aebb0e3513045e30c0f4136952e10.zip | |
do not accept negative values in humantime
Diffstat (limited to 'world/map/npc')
| -rw-r--r-- | world/map/npc/functions/time.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/world/map/npc/functions/time.txt b/world/map/npc/functions/time.txt index 7d16a200..bd80a1b1 100644 --- a/world/map/npc/functions/time.txt +++ b/world/map/npc/functions/time.txt @@ -75,6 +75,7 @@ function|script|HumanTime if(@seconds) set @ms, @ms + (@seconds * 1000); if(@minutes) set @ms, @ms + (@minutes * 60000); if(@days) set @ms, @ms + (@days * 1440000); + if(@ms < 0) goto L_TooShort; if(@ms < 1000) goto L_Millis; // under 1 second we have nothing to count set @seconds, @ms / 1000; set @ms, @ms % 1000; @@ -90,6 +91,10 @@ function|script|HumanTime if(@days) goto L_Days; goto L_Clean; +L_TooShort: + debugmes "HumanTime: negative value: "+@ms; + mapexit; + L_Millis: set @time$, @ms + "ms"; return; |