diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/script.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c index bba559df8..aeaf851b1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10612,11 +10612,23 @@ static BUILDIN(gettimestr) char *tmpstr; const char *fmtstr; int maxlen; - time_t now = time(NULL); + time_t now; fmtstr=script_getstr(st,2); maxlen=script_getnum(st,3); + if (script_hasdata(st, 4)) { + int timestamp = script_getnum(st, 4); + if (timestamp < 0) { + ShowWarning("buildin_gettimestr: UNIX timestamp must be in positive value.\n"); + return false; + } + + now = (time_t)timestamp; + } else { + now = time(NULL); + } + tmpstr=(char *)aMalloc((maxlen+1)*sizeof(char)); strftime(tmpstr,maxlen,fmtstr,localtime(&now)); tmpstr[maxlen]='\0'; @@ -25378,7 +25390,7 @@ static void script_parse_builtin(void) BUILDIN_DEF(savepoint,"sii"), BUILDIN_DEF(gettimetick,"i"), BUILDIN_DEF(gettime,"i"), - BUILDIN_DEF(gettimestr,"si"), + BUILDIN_DEF(gettimestr, "si?"), BUILDIN_DEF(openstorage,""), BUILDIN_DEF(guildopenstorage,""), BUILDIN_DEF(itemskill,"vi?"), |