From 2ca62094a347c9fe69383709728fe1a64650e401 Mon Sep 17 00:00:00 2001 From: wushin Date: Thu, 11 Jun 2015 21:54:55 -0500 Subject: Allow getequipid to use charname --- src/map/script-fun.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 2d9ac23..8044b4d 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -1402,7 +1402,10 @@ void builtin_getequipid(ScriptState *st) int num; dumb_ptr sd; - sd = script_rid2sd(st); + if (HARG(1)) + sd = map_nick2sd(stringish(ZString(conv_str(st, &AARG(1))))); + else + sd = script_rid2sd(st); if (sd == nullptr) { PRINTF("getequipid: sd == nullptr\n"_fmt); @@ -3742,7 +3745,7 @@ BuiltinFunction builtin_functions[] = BUILTIN(getcharid, "i?"_s, 'i'), BUILTIN(getversion, ""_s, 'i'), BUILTIN(strcharinfo, "i"_s, 's'), - BUILTIN(getequipid, "i"_s, 'i'), + BUILTIN(getequipid, "i?"_s, 'i'), BUILTIN(bonus, "ii"_s, '\0'), BUILTIN(bonus2, "iii"_s, '\0'), BUILTIN(skill, "ii?"_s, '\0'), -- cgit v1.2.3-70-g09d2