diff options
| author | skyleo <skyleo@skyleo.de> | 2019-11-03 00:15:43 +0100 |
|---|---|---|
| committer | skyleo <skyleo@skyleo.de> | 2019-11-03 00:15:43 +0100 |
| commit | d8ec5447b32a0c4949f0753c6c6bc358d1a93d5c (patch) | |
| tree | db1873b0c1a4522fb9ea54b2b5c26e75e5922266 /src/map/mob.c | |
| parent | 857650c4f58d347455b0d075b49a53f69e6d0c51 (diff) | |
| download | hercules-d8ec5447b32a0c4949f0753c6c6bc358d1a93d5c.tar.gz hercules-d8ec5447b32a0c4949f0753c6c6bc358d1a93d5c.tar.bz2 hercules-d8ec5447b32a0c4949f0753c6c6bc358d1a93d5c.tar.xz hercules-d8ec5447b32a0c4949f0753c6c6bc358d1a93d5c.zip | |
Fix unintended nullpo errors
Follow up to 6608308
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 2ea189c23..ca1ce3585 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1364,10 +1364,10 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) ) { short x = bl->x, y = bl->y; mob_stop_attack(md); - const struct mob_data *m_md = BL_CCAST(BL_MOB, bl); - nullpo_retr(0, m_md); - if (map->search_freecell(&md->bl, bl->m, &x, &y, MOB_SLAVEDISTANCE, MOB_SLAVEDISTANCE, 1) - && (battle_config.slave_chase_masters_chasetarget == 0 || !mob->is_in_battle_state(m_md)) + const struct mob_data *m_md = BL_CCAST(BL_MOB, bl); // Can be NULL due to master being BL_PC + // If master is BL_MOB and in battle, lock & chase to master's target instead, unless configured not to. + if ((battle_config.slave_chase_masters_chasetarget == 0 || (m_md != NULL && !mob->is_in_battle_state(m_md))) + && map->search_freecell(&md->bl, bl->m, &x, &y, MOB_SLAVEDISTANCE, MOB_SLAVEDISTANCE, 1) && unit->walktoxy(&md->bl, x, y, 0)) return 1; } @@ -1380,13 +1380,12 @@ static int mob_ai_sub_hard_slavemob(struct mob_data *md, int64 tick) //Avoid attempting to lock the master's target too often to avoid unnecessary overload. [Skotlex] if (DIFF_TICK(md->last_linktime, tick) < MIN_MOBLINKTIME && !md->target_id) { struct unit_data *ud = unit->bl2ud(bl); - struct mob_data *m_md = BL_CAST(BL_MOB, bl); + struct mob_data *m_md = BL_CAST(BL_MOB, bl); // Can be NULL due to master being BL_PC nullpo_retr(0, ud); - nullpo_retr(0, m_md); md->last_linktime = tick; struct block_list *tbl = NULL; - if (battle_config.slave_chase_masters_chasetarget == 1 && m_md->target_id != 0) { // possibly chasing something + if (battle_config.slave_chase_masters_chasetarget == 1 && m_md != NULL && m_md->target_id != 0) { // possibly chasing something tbl = map->id2bl(m_md->target_id); } else if (ud->target != 0 && ud->state.attack_continue != 0) { tbl = map->id2bl(ud->target); |