From f78d7fea310ba0b3d587e7409ea0b56e5bc9dbd0 Mon Sep 17 00:00:00 2001 From: mekolat Date: Tue, 18 Aug 2015 15:39:39 -0400 Subject: add max and min builtins --- src/map/script-fun.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index f85a181..23702e5 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -310,6 +310,66 @@ void builtin_rand(ScriptState *st) } } +static +void builtin_max(ScriptState *st) +{ + int max=0, num; + if (HARG(1)) + { + max = conv_num(st, &AARG(0)); + for (int i = 1; HARG(i); i++) + { + num = conv_num(st, &AARG(i)); + if (num > max) + max = num; + } + } + else + { + SIR reg = AARG(0).get_if()->reg; + ZString name = variable_names.outtern(reg.base()); + char prefix = name.front(); + if (prefix != '$' && prefix != '@' && prefix != '.') + { + PRINTF("builtin_max: illegal scope!\n"_fmt); + return; + } + for (int i = reg.index(); i < 256; i++) + { + struct script_data vd = get_val2(st, reg.iplus(i)); + MATCH_BEGIN (vd) + { + MATCH_CASE (const ScriptDataInt&, u) + { + if (u.numi > max) + max = u.numi; + continue; + } + } + MATCH_END (); + abort(); + } + } + + push_int(st->stack, max); +} + +static +void builtin_min(ScriptState *st) +{ + int min, num; + min = conv_num(st, &AARG(0)); + + for (int i = 1; HARG(i); i++) + { + num = conv_num(st, &AARG(i)); + if (num < min) + min = num; + } + + push_int(st->stack, min); +} + static void builtin_sqrt(ScriptState *st) { @@ -3387,6 +3447,8 @@ BuiltinFunction builtin_functions[] = BUILTIN(mapexit, ""_s, '\0'), BUILTIN(freeloop, "i"_s, '\0'), BUILTIN(if_then_else, "iii"_s, '.'), + BUILTIN(max, "e?*"_s, 'i'), + BUILTIN(min, "ii*"_s, 'i'), BUILTIN(sqrt, "i"_s, 'i'), BUILTIN(cbrt, "i"_s, 'i'), BUILTIN(pow, "ii"_s, 'i'), -- cgit v1.2.3-60-g2f50