diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 21:17:20 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 21:17:20 +0200 |
| commit | 3966bfb2f6836d13c1a93bfab1e9fa61ec4fff35 (patch) | |
| tree | 589a331cab87e338882269d257048e6792f2c072 /src/q_dragons.cc | |
| parent | ebc402cfa4182a50f46ac2d56e3b74c5372eed84 (diff) | |
Rework FF1_* flags to flags_set<>
Diffstat (limited to 'src/q_dragons.cc')
| -rw-r--r-- | src/q_dragons.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/q_dragons.cc b/src/q_dragons.cc index 45666e77..8dc990d2 100644 --- a/src/q_dragons.cc +++ b/src/q_dragons.cc @@ -3,6 +3,7 @@ #include "cave.hpp" #include "cave_type.hpp" #include "dungeon_flag.hpp" +#include "feature_flag.hpp" #include "feature_type.hpp" #include "hook_quest_finish_in.hpp" #include "hooks.hpp" @@ -53,13 +54,12 @@ static bool_ quest_dragons_gen_hook(void *, void *, void *) /* Place some columns */ for (i = 35; i > 0; ) { - int flags; y = rand_int(21) + 3; x = rand_int(31) + 3; /* Bar columns on even squares so the whole level is guaranteed to be accessible */ - flags = f_info[cave[y][x].feat].flags1; - if (!(flags % 2) && !(flags & FF1_PERMANENT) && (flags & FF1_FLOOR)) + auto const flags = f_info[cave[y][x].feat].flags; + if (!(x % 2) && !(flags & FF_PERMANENT) && (flags & FF_FLOOR)) { --i; cave_set_feat(y, x, FEAT_MOUNTAIN); @@ -69,11 +69,10 @@ static bool_ quest_dragons_gen_hook(void *, void *, void *) /* Place some random dragons */ for (i = 25; i > 0; ) { - int m_idx, flags; y = rand_int(21) + 3; x = rand_int(31) + 3; - flags = f_info[cave[y][x].feat].flags1; - if (!(flags & FF1_PERMANENT) && (flags & FF1_FLOOR)) + auto const flags = f_info[cave[y][x].feat].flags; + if (!(flags & FF_PERMANENT) && (flags & FF_FLOOR)) { /* blue, white, red, black, bronze, gold, green, multi-hued */ int baby_dragons[8] = {163, 164, 167, 166, 218, 219, 165, 204}; @@ -95,7 +94,7 @@ static bool_ quest_dragons_gen_hook(void *, void *, void *) dragon = mature_dragons[color]; --i; - m_idx = place_monster_one(y, x, dragon, 0, magik(33), MSTATUS_ENEMY); + int m_idx = place_monster_one(y, x, dragon, 0, magik(33), MSTATUS_ENEMY); if (m_idx) m_list[m_idx].mflag |= MFLAG_QUEST; } } |