summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDastgir <dastgirpojee@rocketmail.com>2017-09-20 06:31:00 +0530
committerGitHub <noreply@github.com>2017-09-20 06:31:00 +0530
commit7cbd35644b73f254fc976070cd1e993aa43a7cfc (patch)
treebbfdcd7392ad452b5bb069f6b732727c8b2417f4 /src
parent94b3f24afa5e77bf770fdf90cf446396165b82c6 (diff)
parent6156d03ea9654ae455ce8e741b3b4a9c3fdd5bab (diff)
downloadhercules-7cbd35644b73f254fc976070cd1e993aa43a7cfc.tar.gz
hercules-7cbd35644b73f254fc976070cd1e993aa43a7cfc.tar.bz2
hercules-7cbd35644b73f254fc976070cd1e993aa43a7cfc.tar.xz
hercules-7cbd35644b73f254fc976070cd1e993aa43a7cfc.zip
Merge pull request #1842 from mekolat/getgroupid
Allow using getgroupid on another player
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 8ddb056bd..533e421d8 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9967,14 +9967,22 @@ BUILDIN(setgroupid) {
/// Returns the group ID of the player.
///
-/// getgroupid() -> <int>
-BUILDIN(getgroupid)
-{
- struct map_session_data *sd = script->rid2sd(st);
- if (sd == NULL)
+/// getgroupid({<account id>}) -> <int>
+BUILDIN(getgroupid) {
+ struct map_session_data *sd = NULL;
+
+ if (script_hasdata(st, 2)) {
+ sd = map->id2sd(script_getnum(st, 2));
+ } else {
+ sd = script->rid2sd(st);
+ }
+
+ if (sd == NULL) {
+ script_pushint(st, -1);
return true; // no player attached, report source
- script_pushint(st, pc_get_group_id(sd));
+ }
+ script_pushint(st, pc_get_group_id(sd));
return true;
}
@@ -23861,7 +23869,7 @@ void script_parse_builtin(void) {
BUILDIN_DEF(basicskillcheck,""),
BUILDIN_DEF(getgmlevel,""),
BUILDIN_DEF(setgroupid, "i?"),
- BUILDIN_DEF(getgroupid,""),
+ BUILDIN_DEF(getgroupid,"?"),
BUILDIN_DEF(end,""),
BUILDIN_DEF(checkoption,"i?"),
BUILDIN_DEF(setoption,"i??"),