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 | 5a3f511fd036dd73152786e83f32c32f274f2398 (patch) | |
| tree | 7a90c6b860ddd225802df000059a7e02da805326 | |
| parent | d52879d4ed58423e1e9ccc7f5dc34d237a295527 (diff) | |
Use 'bool' in struct help_info
| -rw-r--r-- | src/help.cc | 6 | ||||
| -rw-r--r-- | src/help_info.hpp | 4 | ||||
| -rw-r--r-- | src/loadsave.cc | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/help.cc b/src/help.cc index be078d59..f8d75e79 100644 --- a/src/help.cc +++ b/src/help.cc @@ -601,13 +601,11 @@ static bool_ triggered_help_hook(void *data, void *in, void *out) (!p_ptr->help.activated[triggered_help->help_index]) && triggered_help->trigger_func(in,out)) { - int i; - /* Triggered */ - p_ptr->help.activated[triggered_help->help_index] = TRUE; + p_ptr->help.activated[triggered_help->help_index] = true; /* Show the description */ - for (i = 0; (i < DESC_MAX) && (triggered_help->desc[i] != NULL); i++) + for (std::size_t i = 0; (i < DESC_MAX) && (triggered_help->desc[i] != NULL); i++) { cmsg_print(TERM_YELLOW, triggered_help->desc[i]); } diff --git a/src/help_info.hpp b/src/help_info.hpp index 0960af77..1b4a3757 100644 --- a/src/help_info.hpp +++ b/src/help_info.hpp @@ -12,6 +12,6 @@ constexpr int HELP_MAX = 64; */ struct help_info { - bool_ enabled = FALSE; /* ingame help enabled */ - bool_ activated[HELP_MAX] = { FALSE }; /* help item #i activated? */ + bool enabled = false; /* ingame help enabled */ + bool activated[HELP_MAX] = { false }; /* help item #i activated? */ }; diff --git a/src/loadsave.cc b/src/loadsave.cc index 73429be4..2e3ac33f 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -751,7 +751,7 @@ static bool_ do_extra(ls_flag_t flag) do_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_bool(&p_ptr->help.activated[i], flag); } /* More info */ |