diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
| commit | 23d4052eb88176ceb3cb3d769b09aa46a56e79cc (patch) | |
| tree | 0ed44b420f012954e4cbb6d5ae401b4f972e2497 /src/q_dragons.cc | |
| parent | 2e84ed7ccc2c5d217729e4996bb0e833c0f89638 (diff) | |
Move 'dungeon_flags' global to Game struct
We can get rid of a couple of icky macros, and at least it's a little
bit less global now.
Diffstat (limited to 'src/q_dragons.cc')
| -rw-r--r-- | src/q_dragons.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/q_dragons.cc b/src/q_dragons.cc index 696dba4a..9427b701 100644 --- a/src/q_dragons.cc +++ b/src/q_dragons.cc @@ -7,6 +7,7 @@ #include "feature_type.hpp" #include "game.hpp" #include "hook_quest_finish_in.hpp" +#include "hook_quest_gen_in.hpp" #include "hooks.hpp" #include "init1.hpp" #include "monster2.hpp" @@ -19,8 +20,9 @@ #define cquest (quest[QUEST_DRAGONS]) -static bool quest_dragons_gen_hook(void *, void *, void *) +static bool quest_dragons_gen_hook(void *, void *in_, void *) { + auto in = static_cast<hook_quest_gen_in *>(in_); auto const &f_info = game->edit_data.f_info; int x, y, i; @@ -52,7 +54,7 @@ static bool quest_dragons_gen_hook(void *, void *, void *) init_flags = INIT_CREATE_DUNGEON; process_dungeon_file("dragons.map", &ystart, &xstart, cur_hgt, cur_wid, TRUE, FALSE); - dungeon_flags |= DF_NO_GENO; + in->dungeon_flags_ref |= DF_NO_GENO; /* Place some columns */ for (i = 35; i > 0; ) |