diff options
| author | wushin <pasekei@gmail.com> | 2015-06-11 21:54:55 -0500 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:44:53 -0400 |
| commit | 2ca62094a347c9fe69383709728fe1a64650e401 (patch) | |
| tree | 34da2087c07be36473391434b11bd23bcf49eb08 | |
| parent | 506a41d6926405b2753894f0b40130b4077828b3 (diff) | |
| download | tmwa-2ca62094a347c9fe69383709728fe1a64650e401.tar.gz tmwa-2ca62094a347c9fe69383709728fe1a64650e401.tar.bz2 tmwa-2ca62094a347c9fe69383709728fe1a64650e401.tar.xz tmwa-2ca62094a347c9fe69383709728fe1a64650e401.zip | |
Allow getequipid to use charname
| -rw-r--r-- | src/map/script-fun.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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<map_session_data> sd; - sd = script_rid2sd(st); + if (HARG(1)) + sd = map_nick2sd(stringish<CharName>(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'), |