diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-02-09 20:31:57 -0700 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-02-09 20:34:27 -0700 |
| commit | a8cbd8820ca10dd431911e9bdbe7d3dca35a736f (patch) | |
| tree | 049022f1960e8993cd9b75e82630ca7135e26d87 /crawl-ref/source/mon-behv.cc | |
| parent | 61b4c5010bb9743a861494e46681f826e929f033 (diff) | |
| download | crawl-ref-a8cbd8820ca10dd431911e9bdbe7d3dca35a736f.tar.gz crawl-ref-a8cbd8820ca10dd431911e9bdbe7d3dca35a736f.zip | |
Fix some enemy battlesphere-related crashes.
Diffstat (limited to 'crawl-ref/source/mon-behv.cc')
| -rw-r--r-- | crawl-ref/source/mon-behv.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index a2b40f3a85..55e7b0cc17 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -690,8 +690,9 @@ void handle_behaviour(monster* mon) // they can't see their seek target. if (mons_is_avatar(mon->type)) { - new_foe = owner->mindex(); - mon->target = owner->pos(); + // XXX: should owner ever not be set here? + new_foe = owner ? owner->mindex() : MHITNOT; + mon->target = owner ? owner->pos() : mon->pos(); break; } else if (isFriendly && mon->foe != MHITYOU) @@ -771,7 +772,9 @@ void handle_behaviour(monster* mon) if (!isFriendly) break; - else if (mons_is_avatar(mon->type) && !owner->is_player()) + else if (mons_is_avatar(mon->type) + && owner + && !owner->is_player()) { mon->foe = owner->mindex(); break; |