diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-12-30 18:59:54 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-12-30 19:08:55 +0100 |
| commit | 635c65f0f6a863239fb067b3725905c8ddd5d405 (patch) | |
| tree | 019d0cccf17bae0b043bc2b3fd70e191d00d69bf /crawl-ref/source/xom.cc | |
| parent | 99b8db21f8b5f01f53bc81556712a7fde880bd92 (diff) | |
| download | crawl-ref-635c65f0f6a863239fb067b3725905c8ddd5d405.tar.gz crawl-ref-635c65f0f6a863239fb067b3725905c8ddd5d405.zip | |
Fix a crash with Xom swapping you with a monster.
It's possible there's a monster on the same square as the player,
if submerging or Fedhas are involved.
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 6f834ea3bf..7227c938a4 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1536,7 +1536,7 @@ static int _xom_swap_weapons(bool debug = false) // hostile monsters around. static int _xom_rearrange_pieces(int sever, bool debug = false) { - if (player_stair_delay()) + if (player_stair_delay() || monster_at(you.pos())) return XOM_DID_NOTHING; vector<monster* > mons; |