summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-10-22 14:05:21 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-10-22 14:05:21 -0700
commitbbcdc2b68c2de6068d550b134381ed76b098dc0a (patch)
tree7ab1247c05dd56bed6dbd87ff998987f4e6c79d2
parent48a120d6c5c6e862631bce33c8060bb7b2f858b3 (diff)
downloadtmwa-bbcdc2b68c2de6068d550b134381ed76b098dc0a.tar.gz
tmwa-bbcdc2b68c2de6068d550b134381ed76b098dc0a.tar.bz2
tmwa-bbcdc2b68c2de6068d550b134381ed76b098dc0a.tar.xz
tmwa-bbcdc2b68c2de6068d550b134381ed76b098dc0a.zip
Ignore hidden GMs when checking users in an area
-rw-r--r--src/map/script.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/script.cpp b/src/map/script.cpp
index a3aeb7b..b201ada 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -2867,14 +2867,18 @@ void builtin_getmapusers(ScriptState *st)
*------------------------------------------
*/
static
-void builtin_getareausers_sub(dumb_ptr<block_list>, int *users)
+void builtin_getareausers_sub(dumb_ptr<block_list> bl, int *users)
{
+ if (bool(bl->is_player()->status.option & Option::HIDE))
+ return;
(*users)++;
}
static
void builtin_getareausers_living_sub(dumb_ptr<block_list> bl, int *users)
{
+ if (bool(bl->is_player()->status.option & Option::HIDE))
+ return;
if (!pc_isdead(bl->is_player()))
(*users)++;
}