diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:45:08 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-10-05 18:49:37 +0200 |
| commit | 0c2f30b56c221a826ba64f0ec864c29d0f717644 (patch) | |
| tree | a7b38e7b9cf9a06aacd56ec8a7177d44d001c1df /src/q_shroom.cc | |
| parent | 5ddcbbf1cdce68e565376819efedd519892512ad (diff) | |
Move r_info into GameEditData
Diffstat (limited to 'src/q_shroom.cc')
| -rw-r--r-- | src/q_shroom.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/q_shroom.cc b/src/q_shroom.cc index 4fd1e066..ee5f9d1f 100644 --- a/src/q_shroom.cc +++ b/src/q_shroom.cc @@ -1,6 +1,7 @@ #include "q_shroom.hpp" #include "cave.hpp" +#include "game.hpp" #include "hook_chat_in.hpp" #include "hook_give_in.hpp" #include "hook_monster_death_in.hpp" @@ -128,6 +129,8 @@ static bool_ quest_shroom_death_hook(void *, void *in_, void *) static bool_ quest_shroom_give_hook(void *, void *in_, void *) { + auto const &r_info = game->edit_data.r_info; + struct hook_give_in *in = static_cast<struct hook_give_in *>(in_); object_type *o_ptr; monster_type *m_ptr; @@ -213,6 +216,8 @@ static bool_ quest_shroom_give_hook(void *, void *in_, void *) static void check_dogs_alive(s32b m_idx) { + auto const &r_info = game->edit_data.r_info; + if ((r_info[get_grip()].max_num == 0) || (r_info[get_wolf()].max_num == 0) || (r_info[get_fang()].max_num == 0)) |