summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/script-fun.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index f8c81c4..3592095 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -3471,7 +3471,17 @@ void builtin_get(ScriptState *st)
}
else
{
- int var = pc_readreg(bl, reg);
+ int var;
+ if (prefix == '#' && bl)
+ {
+ if (name_[1] == '#')
+ var = pc_readaccountreg2(bl->is_player(), stringish<VarName>(name_));
+ else
+ var = pc_readaccountreg(bl->is_player(), stringish<VarName>(name_));
+ }
+ else
+ var = pc_readreg(bl, reg);
+
push_int<ScriptDataInt>(st->stack, var);
}
}