diff options
Diffstat (limited to 'src/cave.cc')
| -rw-r--r-- | src/cave.cc | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/cave.cc b/src/cave.cc index 8d78a757..7136e060 100644 --- a/src/cave.cc +++ b/src/cave.cc @@ -1,7 +1,4 @@ -/* File: cave.c */ - -/* Purpose: low level dungeon routines -BEN- */ - +#include "cave.hpp" #include "angband.h" #include "q_rand.h" @@ -4502,33 +4499,16 @@ void disturb(int stop_search) } -/* - * Hack -- Check if a level is a "quest" level - */ -int is_quest(int level) -{ - int i = random_quest_number(); - - /* Check quests */ - if (p_ptr->inside_quest) - return (p_ptr->inside_quest); - - if (i) return (QUEST_RANDOM); - - /* Nope */ - return (0); -} - /* * Return the index of the random quest on this level * (or zero) */ -int random_quest_number() +static int random_quest_number() { if ((dun_level >= 1) && (dun_level < MAX_RANDOM_QUEST) && - (dungeon_flags1 & DF1_PRINCIPAL) && - (random_quests[dun_level].type) && + (dungeon_flags1 & DF1_PRINCIPAL) && + (random_quests[dun_level].type) && (!random_quests[dun_level].done) && (!is_randhero(dun_level))) { @@ -4540,6 +4520,25 @@ int random_quest_number() } + +/* + * Hack -- Check if a level is a "quest" level + */ +int is_quest(int level) +{ + int i = random_quest_number(); + + /* Check quests */ + if (p_ptr->inside_quest) + return (p_ptr->inside_quest); + + if (i) return (QUEST_RANDOM); + + /* Nope */ + return (0); +} + + /* * handle spell effects */ |