diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-05 16:33:14 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-05 16:33:14 +0000 |
| commit | f6604b9ce1ec6e56c5fe5928d10dd0164a30fff6 (patch) | |
| tree | 8e9eeb2d4b5daff1557a1a554d06f7d891330447 /crawl-ref/source/monplace.cc | |
| parent | 87c95a753d11b0b540f7c6a3d3e7f8a8b67ae3c1 (diff) | |
| download | crawl-ref-f6604b9ce1ec6e56c5fe5928d10dd0164a30fff6.tar.gz crawl-ref-f6604b9ce1ec6e56c5fe5928d10dd0164a30fff6.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6410 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monplace.cc')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index ed491e5efd..e5f7fb077e 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -290,7 +290,7 @@ monster_type pick_random_monster(const level_id &place, int power, } if (place == BRANCH_MAIN_DUNGEON - && lev_mons < 28) + && lev_mons <= 27) { // If on D:1, allow moderately out-of-depth monsters only after // a certain elapsed turn count on the level (currently 700 turns). @@ -306,8 +306,7 @@ monster_type pick_random_monster(const level_id &place, int power, //if (need_moderate_ood(lev_mons)) // lev_mons += random2(5); - if (lev_mons > 27) - lev_mons = 27; + lev_mons = std::min(27, lev_mons); } // Abyss or Pandemonium. Almost never called from Pan; probably only @@ -338,11 +337,10 @@ monster_type pick_random_monster(const level_id &place, int power, { int level, diff, chance; - if (lev_mons > 30) - lev_mons = 30; + lev_mons = std::min(30, lev_mons); int i; - for (i = 0; i < 10000; i++) + for (i = 0; i < 10000; ++i) { int count = 0; @@ -356,9 +354,9 @@ monster_type pick_random_monster(const level_id &place, int power, if (count == 2000) return (MONS_PROGRAM_BUG); - level = mons_level( mon_type, place ); + level = mons_level(mon_type, place); diff = level - lev_mons; - chance = mons_rarity( mon_type, place ) - (diff * diff); + chance = mons_rarity(mon_type, place) - (diff * diff); if ((lev_mons >= level - 5 && lev_mons <= level + 5) && random2avg(100, 2) <= chance) @@ -370,6 +368,7 @@ monster_type pick_random_monster(const level_id &place, int power, if (i == 10000) return (MONS_PROGRAM_BUG); } + return (mon_type); } |