diff options
| -rw-r--r-- | src/birth.cc | 4 | ||||
| -rw-r--r-- | src/gods.cc | 7 | ||||
| -rw-r--r-- | src/loadsave.cc | 4 | ||||
| -rw-r--r-- | src/mimic.cc | 2 | ||||
| -rw-r--r-- | src/q_bounty.cc | 11 | ||||
| -rw-r--r-- | src/skill_type.hpp | 4 | ||||
| -rw-r--r-- | src/skills.cc | 14 | ||||
| -rw-r--r-- | src/xtra1.cc | 4 | ||||
| -rw-r--r-- | src/xtra2.cc | 2 |
9 files changed, 31 insertions, 21 deletions
diff --git a/src/birth.cc b/src/birth.cc index 2ed3fc79..4c75dcc0 100644 --- a/src/birth.cc +++ b/src/birth.cc @@ -2783,7 +2783,7 @@ static bool_ player_birth_aux() for (i = 1; i < max_s_idx; i++) { - s_info[i].dev = FALSE; + s_info[i].dev = false; } for (i = 1; i < max_s_idx; i++) @@ -2802,7 +2802,7 @@ static bool_ player_birth_aux() while (z != -1) { // Mark as developed - s_info[z].dev = TRUE; + s_info[z].dev = true; // Next node up the tree z = s_descriptors[z].father; if (z == 0) diff --git a/src/gods.cc b/src/gods.cc index 1163e9b6..f10209dc 100644 --- a/src/gods.cc +++ b/src/gods.cc @@ -97,8 +97,11 @@ void follow_god(int god, bool_ silent) /* Melkor offer Udun magic */ if (p_ptr->pgod == GOD_MELKOR) { - s_info[SKILL_UDUN].hidden = FALSE; - if (!silent) msg_print("You feel the dark powers of Melkor in you. You can now use the Udun skill."); + s_info[SKILL_UDUN].hidden = false; + if (!silent) + { + msg_print("You feel the dark powers of Melkor in you. You can now use the Udun skill."); + } } } } diff --git a/src/loadsave.cc b/src/loadsave.cc index 562a403b..b8544f01 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -610,8 +610,8 @@ static bool_ do_extra(ls_flag_t flag) { do_s32b(&s_info[i].value, flag); do_s32b(&s_info[i].mod, flag); - do_bool(&s_info[i].dev, flag); - do_bool(&s_info[i].hidden, flag); + do_std_bool(&s_info[i].dev, flag); + do_std_bool(&s_info[i].hidden, flag); } } diff --git a/src/mimic.cc b/src/mimic.cc index c540c732..463c389d 100644 --- a/src/mimic.cc +++ b/src/mimic.cc @@ -336,7 +336,7 @@ static s32b bear_calc() } /* activate the skill */ - s_info[SKILL_BEAR].hidden = FALSE; + s_info[SKILL_BEAR].hidden = false; return 0; } diff --git a/src/q_bounty.cc b/src/q_bounty.cc index 28cf71c5..56f2669a 100644 --- a/src/q_bounty.cc +++ b/src/q_bounty.cc @@ -136,16 +136,19 @@ bool_ quest_bounty_get_item() skill_type *lore = &s_info[SKILL_LORE]; skill_type *preservation = &s_info[SKILL_PRESERVATION]; - if (lore->mod == 0) { + if (lore->mod == 0) + { lore->mod = 900; - lore->dev = TRUE; + lore->dev = true; } + lore->value += lore->mod; - if (preservation->mod == 0) { + if (preservation->mod == 0) + { preservation->value = 800; preservation->mod = 800; - preservation->dev = TRUE; + preservation->dev = true; msg_print("I see you don't know the corpse preservation skill, I shall teach you it too."); } diff --git a/src/skill_type.hpp b/src/skill_type.hpp index e93303e6..c26d8649 100644 --- a/src/skill_type.hpp +++ b/src/skill_type.hpp @@ -23,10 +23,10 @@ struct skill_type /** * Is the branch developed? */ - bool_ dev = FALSE; + bool dev = false; /** * Is the skill hidden? */ - bool_ hidden = FALSE; + bool hidden = false; }; diff --git a/src/skills.cc b/src/skills.cc index a46bf7ed..df252683 100644 --- a/src/skills.cc +++ b/src/skills.cc @@ -229,7 +229,11 @@ static void init_table_aux(int table[MAX_SKILLS][2], int *idx, int father, int l table[*idx][0] = i; table[*idx][1] = lev; (*idx)++; - if (s_info[i].dev || full) init_table_aux(table, idx, i, lev + 1, full); + + if (s_info[i].dev || full) + { + init_table_aux(table, idx, i, lev + 1, full); + } } } @@ -528,8 +532,8 @@ void do_cmd_skill() /* Expand / collapse list of skills */ else if (c == '\r') { - if (s_info[table[sel][0]].dev) s_info[table[sel][0]].dev = FALSE; - else s_info[table[sel][0]].dev = TRUE; + s_info[table[sel][0]].dev = !s_info[table[sel][0]].dev; + init_table(table, &max, FALSE); } @@ -1206,8 +1210,8 @@ void init_skill(s32b value, s32b mod, int i) s_info[i].value = value; s_info[i].mod = mod; s_info[i].hidden = (s_descriptors[i].flags & SKF_HIDDEN) - ? TRUE - : FALSE + ? true + : false ; } diff --git a/src/xtra1.cc b/src/xtra1.cc index c97d3663..e2ae994b 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -2548,7 +2548,7 @@ static void calc_corruptions() { s_info[SKILL_DAEMON].mod = 1500; } - s_info[SKILL_DAEMON].hidden = FALSE; + s_info[SKILL_DAEMON].hidden = false; } if (player_has_corruption(CORRUPT_RANDOM_TELEPORT)) @@ -2974,7 +2974,7 @@ void calc_bonuses(bool_ silent) { if (s_descriptors[i].flags & SKF_AUTO_HIDE) { - s_info[i].hidden = TRUE; + s_info[i].hidden = true; } } diff --git a/src/xtra2.cc b/src/xtra2.cc index fe214950..fdcbfdfa 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -444,7 +444,7 @@ bool_ set_mimic(int v, int p, int level) notice = TRUE; if (p == resolve_mimic_name("Bear")) { - s_info[SKILL_BEAR].hidden = TRUE; + s_info[SKILL_BEAR].hidden = true; select_default_melee(); } p = 0; |