summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2020-10-18 13:58:59 +0000
committerJesusaves <cpntb1@ymail.com>2021-02-14 15:56:06 -0300
commita7c7755746d4835ed2e07c044f40500095ec477a (patch)
treed48152d2b3334c931c1d81396bc039984049d527 /src
parent8a05507c7ac9cf9e5c6beed10286102346166299 (diff)
downloadhercules-a7c7755746d4835ed2e07c044f40500095ec477a.tar.gz
hercules-a7c7755746d4835ed2e07c044f40500095ec477a.tar.bz2
hercules-a7c7755746d4835ed2e07c044f40500095ec477a.tar.xz
hercules-a7c7755746d4835ed2e07c044f40500095ec477a.zip
allow to use buildin_getcharid with an account id
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index a63f1e835..536061307 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8822,10 +8822,15 @@ static BUILDIN(getcharid)
int num = script_getnum(st, 2);
struct map_session_data *sd;
- if (script_hasdata(st, 3))
- sd = map->nick2sd(script_getstr(st, 3), false);
- else
+ if (script_hasdata(st, 3)) {
+ if (script_isstringtype(st, 3)) {
+ sd = map->nick2sd(script_getstr(st, 3), false);
+ } else {
+ sd = map->id2sd(script_getnum(st, 3));
+ }
+ } else {
sd = script->rid2sd(st);
+ }
if (sd == NULL) {
script_pushint(st, 0); //return 0, according docs