summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2017-10-21 00:23:56 +0200
committerGitHub <noreply@github.com>2017-10-21 00:23:56 +0200
commit122ae7b779bb0996f220b4cfb481d75b22420544 (patch)
treeac223afa4a8a10f49eb999e223ad444bb3fedd4b /src/map/map.c
parent0b1a9d52a5cbf0338ce53eabc0cd446380c517ea (diff)
parent3f978c02ec2550714a60e6180ecb60e9e779b364 (diff)
downloadhercules-122ae7b779bb0996f220b4cfb481d75b22420544.tar.gz
hercules-122ae7b779bb0996f220b4cfb481d75b22420544.tar.bz2
hercules-122ae7b779bb0996f220b4cfb481d75b22420544.tar.xz
hercules-122ae7b779bb0996f220b4cfb481d75b22420544.zip
Merge pull request #1827 from HerculesWS/cell-stack-hiddennpc
Ignore hidden units in the cell stack limit checks
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c
index f8aebcfa6..ff5c2aafd 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -447,6 +447,11 @@ int map_count_oncell(int16 m, int16 x, int16 y, int type, int flag) {
struct status_change *sc = status->get_sc(bl);
if (sc && (sc->option&OPTION_INVISIBLE))
continue;
+ if (bl->type == BL_NPC) {
+ const struct npc_data *nd = BL_UCCAST(BL_NPC, bl);
+ if (nd->class_ == FAKE_NPC || nd->class_ == HIDDEN_WARP_CLASS)
+ continue;
+ }
}
if (flag&0x1) {
struct unit_data *ud = unit->bl2ud(bl);