diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:14 +0200 |
| commit | 639976ed95b8031cfde1f64e85b5efdeba417164 (patch) | |
| tree | 461573b19a4976b007cdf9a02d5dd5b45d656ab4 /src/loadsave.cc | |
| parent | fdeb84f9ae4927938d3c0a541129e17338f39e15 (diff) | |
Un-overload do_bool() in loadsave
It turns out this causes issues with inference around
templated functions, so it's best to avoid it for now.
Diffstat (limited to 'src/loadsave.cc')
| -rw-r--r-- | src/loadsave.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/loadsave.cc b/src/loadsave.cc index 84061354..f71a0e63 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -149,7 +149,7 @@ static void do_bool(bool_ *f, ls_flag_t flag) } } -static void do_bool(bool *x, ls_flag_t flag) +static void do_std_bool(bool *x, ls_flag_t flag) { switch (flag) { @@ -490,7 +490,7 @@ static void do_spells(int i, ls_flag_t flag) do_byte(&s_ptr->dam_sides, flag); do_byte(&s_ptr->dam_dice, flag); do_byte(&s_ptr->level, flag); - do_bool(&s_ptr->untried, flag); + do_std_bool(&s_ptr->untried, flag); } @@ -696,7 +696,7 @@ static bool_ do_extra(ls_flag_t flag) { do_byte(&random_quests[i].type, flag); do_s16b(&random_quests[i].r_idx, flag); - do_bool(&random_quests[i].done, flag); + do_std_bool(&random_quests[i].done, flag); } } @@ -751,10 +751,10 @@ static bool_ do_extra(ls_flag_t flag) } /* Help */ - do_bool(&p_ptr->help.enabled, flag); + do_std_bool(&p_ptr->help.enabled, flag); for (std::size_t i = 0; i < HELP_MAX; i++) { - do_bool(&p_ptr->help.activated[i], flag); + do_std_bool(&p_ptr->help.activated[i], flag); } /* More info */ |