diff options
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.cc | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 41f6192500..e1b27e0d43 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1708,7 +1708,7 @@ void mons_load_spells( monsters *mon, mon_spellbook_type book ) mon->load_spells(book); } -static monster_type _random_draconian_monster_species() +monster_type random_draconian_monster_species() { const int num_drac = MONS_PALE_DRACONIAN - MONS_BLACK_DRACONIAN + 1; return static_cast<monster_type>(SP_BLACK_DRACONIAN + random2(num_drac)); @@ -1844,7 +1844,7 @@ void define_monster(monsters &mons) // White draconians will never be draconian scorchers, but // apart from that, anything goes. do - monbase = _random_draconian_monster_species(); + monbase = random_draconian_monster_species(); while (drac_colour_incompatible(mcls, monbase)); break; } @@ -1863,7 +1863,7 @@ void define_monster(monsters &mons) : MST_DEEP_ELF_CONJURER_II); } - monbase = _random_draconian_monster_species(); + monbase = random_draconian_monster_species(); break; } diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 191da8b724..913053930a 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -680,6 +680,8 @@ int mons_colour(const monsters *mon); void mons_load_spells( monsters *mon, mon_spellbook_type book ); +monster_type random_draconian_monster_species(); + // last updated 12may2000 {dlb} /* *********************************************************************** * called from: dungeon - fight diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 42e8220dcd..f68e4c5b85 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -497,11 +497,7 @@ static monster_type _resolve_monster_type(monster_type mon_type, || drac_colour_incompatible(mon_type, base_type))); } else if (mon_type == RANDOM_BASE_DRACONIAN) - { - mon_type = - static_cast<monster_type>( - random_range(MONS_BLACK_DRACONIAN, MONS_PALE_DRACONIAN)); - } + mon_type = random_draconian_monster_species(); else if (mon_type == RANDOM_NONBASE_DRACONIAN) { mon_type = |