summaryrefslogtreecommitdiff
path: root/src/map/battle.cpp
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2019-08-23 14:06:56 -0400
committergumi <git@gumi.ca>2019-08-23 14:11:00 -0400
commit93595818978b50428c311d5ba20f2b8f102b6a4b (patch)
treec048e007dfb7bf2f82f4341ed16ba783240a0dd5 /src/map/battle.cpp
parente1c1b70df9d58223aa8d0ed851ee7179832ce662 (diff)
downloadtmwa-93595818978b50428c311d5ba20f2b8f102b6a4b.tar.gz
tmwa-93595818978b50428c311d5ba20f2b8f102b6a4b.tar.bz2
tmwa-93595818978b50428c311d5ba20f2b8f102b6a4b.tar.xz
tmwa-93595818978b50428c311d5ba20f2b8f102b6a4b.zip
allow to summon multiple mobs with @summon
Diffstat (limited to 'src/map/battle.cpp')
-rw-r--r--src/map/battle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index df01a5c..a4596e9 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -2070,9 +2070,9 @@ int battle_check_target(dumb_ptr<block_list> src, dumb_ptr<block_list> target,
if (src->bl_type == BL::MOB)
{
dumb_ptr<mob_data> md = src->is_mob();
- if (md && md->master_id)
+ if (md && (md->master_id || md->parent_id))
{
- if (md->master_id == target->bl_id) // 主なら肯定
+ if (md->master_id == target->bl_id || md->parent_id == target->bl_id) // 主なら肯定
return 1;
if (md->state.special_mob_ai)
{