diff options
Diffstat (limited to 'src/q_rand.cc')
| -rw-r--r-- | src/q_rand.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/q_rand.cc b/src/q_rand.cc index 94adef86..df1981f8 100644 --- a/src/q_rand.cc +++ b/src/q_rand.cc @@ -2,6 +2,7 @@ #include "hooks.h" #include "util.hpp" #include "messages.h" +#include <cassert> static int randquest_hero[] = { 20, 13, 15, 16, 9, 17, 18, 8, -1 }; @@ -18,6 +19,9 @@ static int random_quests_types[MAX_RANDOM_QUESTS_TYPES] = /* Enforce OoD monsters until this level */ #define RQ_LEVEL_CAP 49 +// Generate lookup function +GENERATE_MONSTER_LOOKUP_FN(get_adventurer, "Adventurer") + void initialize_random_quests(int n) { int step, lvl, i, k; @@ -348,11 +352,12 @@ static void hero_death(s32b m_idx, s32b r_idx) if (i < 20) { - int m_idx; + int r_idx = get_adventurer(); + + m_allow_special[r_idx] = TRUE; + int m_idx = place_monster_one(y, x, r_idx, 0, FALSE, MSTATUS_COMPANION); + m_allow_special[r_idx] = FALSE; - m_allow_special[test_monster_name("Adventurer")] = TRUE; - m_idx = place_monster_one(y, x, test_monster_name("Adventurer"), 0, FALSE, MSTATUS_COMPANION); - m_allow_special[test_monster_name("Adventurer")] = FALSE; if (m_idx) { m_list[m_idx].exp = monster_exp(1 + (dun_level * 3 / 2)); |