From e6e23a2b707784ae905ebcc23d05d2318718b8bf Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sun, 13 Oct 2024 16:19:28 +0200 Subject: Allow item ID as parameter to builtin getitemlink In addition to item name. Alternative to https://git.themanaworld.org/legacy/serverdata/-/merge_requests/808 --- src/map/script-fun.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index fee39d6..91beb96 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -4366,9 +4366,14 @@ void builtin_getitemlink(ScriptState *st) struct script_data *data; AString buf; data = &AARG(0); - ZString name = conv_str(st, data); + Option> item_data_ = None; + + get_val(st, data); + if (data->is()) + item_data_ = itemdb_searchname(conv_str(st, data)); + else + item_data_ = itemdb_exists(wrap(conv_num(st, data))); - Option> item_data_ = itemdb_searchname(name); OMATCH_BEGIN (item_data_) { OMATCH_CASE_SOME (item_data) -- cgit v1.2.3-70-g09d2