From eb6b8414383d35eb8bef0e565adcf2c68a87ef7d Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 10 Mar 2016 18:41:54 +0100 Subject: Use proper "bool" for use_symbiotic_power() parameters --- src/cmd5.cc | 2 +- src/cmd5.hpp | 2 +- src/cmd7.cc | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cmd5.cc b/src/cmd5.cc index 6f93da8c..9bb12421 100644 --- a/src/cmd5.cc +++ b/src/cmd5.cc @@ -662,7 +662,7 @@ std::vector extract_monster_powers(monster_race const *r_ptr, bool great) /* * Use a power of the monster in symbiosis */ -int use_symbiotic_power(int r_idx, bool_ great, bool_ no_cost) +int use_symbiotic_power(int r_idx, bool great, bool no_cost) { monster_race const *r_ptr = &r_info[r_idx]; diff --git a/src/cmd5.hpp b/src/cmd5.hpp index 4ec84593..1b436f0d 100644 --- a/src/cmd5.hpp +++ b/src/cmd5.hpp @@ -11,7 +11,7 @@ extern void do_cmd_browse(void); extern void fetch(int dir, int wgt, bool_ require_los); extern void do_poly_self(void); extern cptr symbiote_name(bool_ capitalize); -extern int use_symbiotic_power(int r_idx, bool_ great, bool_ no_cost); +extern int use_symbiotic_power(int r_idx, bool great, bool no_cost); extern bool_ is_ok_spell(s32b spell_idx, s32b pval); extern s32b get_school_spell(cptr do_what, s16b force_book); extern void do_cmd_copy_spell(void); diff --git a/src/cmd7.cc b/src/cmd7.cc index ffb136cb..711bf2ca 100644 --- a/src/cmd7.cc +++ b/src/cmd7.cc @@ -1838,10 +1838,10 @@ void do_cmd_possessor() } /* Do we have access to all the powers ? */ - bool_ use_great = (get_skill_scale(SKILL_POSSESSION, 100) >= r_info[p_ptr->body_monster].level); + bool use_great = (get_skill_scale(SKILL_POSSESSION, 100) >= r_info[p_ptr->body_monster].level); /* Select power */ - use_symbiotic_power(p_ptr->body_monster, use_great, FALSE); + use_symbiotic_power(p_ptr->body_monster, use_great, false); if (p_ptr->csp < 0) { @@ -4268,7 +4268,7 @@ void do_cmd_symbiotic(void) break; } - if (0 > use_symbiotic_power(o_ptr->pval, FALSE, TRUE)) + if (0 > use_symbiotic_power(o_ptr->pval, false, true)) return; break; @@ -4307,7 +4307,7 @@ void do_cmd_symbiotic(void) break; } - if(0 > use_symbiotic_power(o_ptr->pval, TRUE, TRUE)) + if(0 > use_symbiotic_power(o_ptr->pval, true, true)) return; break; @@ -4335,7 +4335,7 @@ void do_cmd_symbiotic(void) if (!c_ptr->m_idx) break; m_ptr = &m_list[c_ptr->m_idx]; - use_symbiotic_power(m_ptr->r_idx, TRUE, TRUE); + use_symbiotic_power(m_ptr->r_idx, true, true); break; } -- cgit v1.2.3