From 4bf3d0470d4cbaef9c11368767ca0be5ad37612a Mon Sep 17 00:00:00 2001
From: gumi <mekolat@users.noreply.github.com>
Date: Sun, 26 Feb 2017 11:59:43 -0500
Subject: Revert "allow to get vars of other players with getd"

This reverts commit eb5fc0076764d2f604e6a484fe144988f6e9da9b.
---
 doc/script_commands.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 77b361498..ca7ebacca 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1371,11 +1371,10 @@ Examples:
 
 ---------------------------------------
 
-*getd("<variable name>"{, <GID>{, <default value>}})
+*getd("<variable name>")
 
 Returns a reference to a variable, the name can be constructed dynamically.
-If <GID> is present, it can be used to get a variable from another player or
-npc. If the target player or npc is not found, <default value> is returned.
+Refer to setd() for usage.
 
 This can also be used to set an array dynamically:
   setarray(getd(".array[0]"), 1, 2, 3, 4, 5);
-- 
cgit v1.2.3-70-g09d2


From 1b0d3bd8f84db5b471646e0404193759afb908db Mon Sep 17 00:00:00 2001
From: gumi <mekolat@users.noreply.github.com>
Date: Sun, 26 Feb 2017 12:04:23 -0500
Subject: add getvariableofpc() buildin

---
 doc/script_commands.txt | 21 ++++++++++++++++++++
 src/map/script.c        | 53 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 72 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index ca7ebacca..7015feec1 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1409,6 +1409,27 @@ getvariableofnpc() should not be used on them.
 
 ---------------------------------------
 
+*getvariableofpc(<variable>, <account id>{, <default value>})
+
+Returns a reference to a PC variable from the target player.
+If <default value> is passed, it will return this value if the player is
+not found.
+
+Examples:
+
+//This will return the value of @var, note that this can't be used, since
+//the value isn't caught.
+	getvariableofpc(@var, getcharid(CHAR_ID_ACCOUNT, "player"));
+	
+//This will set the .@v variable to the value of the player's @var
+//variable.
+	.@v = getvariableofpc(@var, getcharid(CHAR_ID_ACCOUNT, "player"));
+	
+//This will set the @var variable of the player to 1.
+	set(getvariableofpc(@var, getcharid(CHAR_ID_ACCOUNT, "player")), 1);
+
+---------------------------------------
+
 *goto(<label>)
 
 This command will make the script jump to a label, usually used in 
diff --git a/src/map/script.c b/src/map/script.c
index 6c0fdfb22..faaadb560 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2944,8 +2944,7 @@ struct script_data *get_val(struct script_state* st, struct script_data* data) {
 					data->u.num = script->get_val_ref_num(st, data->ref, data);
 				} else if (name[1] == '@') {
 					data->u.num = script->get_val_scope_num(st, &st->stack->scope, data);
-				}
-				else {
+				} else {
 					data->u.num = script->get_val_npc_num(st, &st->script->local, data);
 				}
 				break;
@@ -17595,6 +17594,55 @@ BUILDIN(getvariableofnpc)
 	return true;
 }
 
+BUILDIN(getvariableofpc)
+{
+	const char* name;
+	struct script_data* data = script_getdata(st, 2);
+	struct map_session_data *sd = map->id2sd(script_getnum(st, 3));
+
+	if (!data_isreference(data)) {
+		ShowError("script:getvariableofpc: not a variable\n");
+		script->reportdata(data);
+		script_pushnil(st);
+		st->state = END;
+		return false;
+	}
+
+	name = reference_getname(data);
+
+	switch (*name)
+	{
+	case '#':
+	case '$':
+	case '.':
+	case '\'':
+		ShowError("script:getvariableofpc: illegal scope (not pc variable)\n");
+		script->reportdata(data);
+		script_pushnil(st);
+		st->state = END;
+		return false;
+	}
+
+	if (sd == NULL)
+	{
+		// player not found, return default value
+		if (script_hasdata(st, 4)) {
+			script_pushcopy(st, 4);
+		} else if (is_string_variable(name)) {
+			script_pushconststr(st, "");
+		} else {
+			script_pushint(st, 0);
+		}
+		return true;
+	}
+
+	if (!sd->regs.vars)
+		sd->regs.vars = i64db_alloc(DB_OPT_RELEASE_DATA);
+
+	script->push_val(st->stack, C_NAME, reference_getuid(data), &sd->regs);
+	return true;
+}
+
 /// Opens a warp portal.
 /// Has no "portal opening" effect/sound, it opens the portal immediately.
 ///
@@ -21254,6 +21302,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(sleep2,"i"),
 		BUILDIN_DEF(awake,"s"),
 		BUILDIN_DEF(getvariableofnpc,"rs"),
+		BUILDIN_DEF(getvariableofpc,"ri?"),
 		BUILDIN_DEF(warpportal,"iisii"),
 		BUILDIN_DEF2(homunculus_evolution,"homevolution",""), //[orn]
 		BUILDIN_DEF2(homunculus_mutate,"hommutate","?"),
-- 
cgit v1.2.3-70-g09d2