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_wolves.cc | |
| parent | ebc402cfa4182a50f46ac2d56e3b74c5372eed84 (diff) | |
Rework FF1_* flags to flags_set<>
Diffstat (limited to 'src/q_wolves.cc')
| -rw-r--r-- | src/q_wolves.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/q_wolves.cc b/src/q_wolves.cc index 96869fc9..46a66935 100644 --- a/src/q_wolves.cc +++ b/src/q_wolves.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" @@ -54,13 +55,12 @@ static bool_ quest_wolves_gen_hook(void *, void *, void *) /* Place some random wolves */ for (i = damroll(4, 4); 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)) { - m_idx = place_monster_one(y, x, 196, 0, magik(50), MSTATUS_ENEMY); + int m_idx = place_monster_one(y, x, 196, 0, magik(50), MSTATUS_ENEMY); if (m_idx) m_list[m_idx].mflag |= MFLAG_QUEST; --i; } @@ -69,13 +69,12 @@ static bool_ quest_wolves_gen_hook(void *, void *, void *) /* Place some random wargs */ for (i = damroll(4, 4); 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)) { - m_idx = place_monster_one(y, x, 257, 0, magik(50), MSTATUS_ENEMY); + int m_idx = place_monster_one(y, x, 257, 0, magik(50), MSTATUS_ENEMY); if (m_idx) m_list[m_idx].mflag |= MFLAG_QUEST; --i; } |