diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-03 09:45:16 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-03 09:45:16 +0000 |
| commit | 6ebcd3f73efb7cb08807bedd0524d1dfdd6db978 (patch) | |
| tree | d6892de9852312505e55de12d44e9fa1d5f8c41f /crawl-ref/source/xom.cc | |
| parent | e0906f57dbf4de544ed6151e7218604e222411f8 (diff) | |
| download | crawl-ref-6ebcd3f73efb7cb08807bedd0524d1dfdd6db978.tar.gz crawl-ref-6ebcd3f73efb7cb08807bedd0524d1dfdd6db978.zip | |
* Fix infinite Xom teleportation rides. Whoops!
* Move unseen altar/entrance tiles to dngn.png, so they're handled
correctly with magic mapping.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10482 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 0931a1ecb3..c1d0419e53 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1700,7 +1700,7 @@ static bool _xom_is_good(int sever, int tension) if (one_chance_in(10)) break; } - while (x_chance_in_y(3, 4) || count > 7 + random2(5) + while (x_chance_in_y(3, 4) || count <= 7 + random2(5) || player_in_a_dangerous_place()); maybe_update_stashes(); @@ -2720,7 +2720,7 @@ static bool _xom_is_bad(int sever, int tension) you_teleport_now(false); more(); } - while (count > 7 + random2(5) + while (count <= 7 + random2(5) || x_chance_in_y(3, 4) && !player_in_a_dangerous_place()); badness = player_in_a_dangerous_place() ? 3 : 1; maybe_update_stashes(); |