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 | ca26da592afb85c835469b88c03026f72328fab9 (patch) | |
tree | f776b4f111bb3f870d94f3960987c6c925a0945c | |
parent | d04c2ec639e3564d1d6544bed5e5e9ce4bc24e54 (diff) |
Replace uses of bool_ in mimic.*
-rw-r--r-- | src/mimic.cc | 36 | ||||
-rw-r--r-- | src/mimic.hpp | 2 | ||||
-rw-r--r-- | src/object2.cc | 4 | ||||
-rw-r--r-- | src/randart.cc | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/src/mimic.cc b/src/mimic.cc index 360e3a9c..656714a6 100644 --- a/src/mimic.cc +++ b/src/mimic.cc @@ -32,7 +32,7 @@ struct mimic_form_type const char *obj_name; /* Object mimicry form name */ const char *desc; /* Description */ const char *realm; /* Realm of mimicry */ - bool_ limit; /* If true, the form is not available except through special means */ + bool limit; /* If true, the form is not available except through special means */ byte level; byte rarity; mimic_duration_type duration; @@ -420,7 +420,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Abominable Cloak", "Abominations are failed experiments of powerful wizards.", NULL /* no realm */, - FALSE, + false, 1, 101, {20, 100}, abomination_calc, NULL, @@ -436,7 +436,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Mouse Fur", "Mice are small, fast and very stealthy", "nature", - FALSE, + false, 1, 10, {20, 40}, mouse_calc, mouse_power, @@ -448,7 +448,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Feathers Cloak", "Eagles are master of the air, good hunters with excellent vision.", "nature", - FALSE, + false, 10, 30, {10, 50}, eagle_calc, NULL, @@ -460,7 +460,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Feathered Cloak", "Eagles are master of the air, good hunters with excellent vision.", "nature", - FALSE, + false, 10, 30, {10, 50}, eagle_calc, NULL, @@ -472,7 +472,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Wolf Pelt", "Wolves are masters of movement, strong and have excellent eyesight.", "nature", - FALSE, + false, 20, 40, {10, 50}, wolf_calc, NULL, @@ -484,7 +484,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Spider Web", "Spiders are clever and become good climbers.", "nature", - FALSE, + false, 25, 50, {10, 50}, spider_calc, spider_power, @@ -496,7 +496,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Entish Bark", "Ents are powerful tree-like beings dating from the dawn of time.", "nature", - TRUE, + true, 40, 60, {10, 30}, ent_calc, ent_power, @@ -508,7 +508,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Cloak of Mist", "A sentient cloud, darting around", "nature", - FALSE, + false, 15, 10, {10, 40}, vapour_calc, NULL, @@ -520,7 +520,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Snakeskin Cloak", "Serpents are fast, lethal predators.", "nature", - FALSE, + false, 30, 25, {15, 20}, serpent_calc, NULL, @@ -532,7 +532,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = "Mumak Hide", "A giant, elaphantine form.", "nature", - FALSE, + false, 40, 40, {15, 20}, mumak_calc, NULL, @@ -548,7 +548,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = NULL, "A fierce, terrible bear.", NULL /* no realm */, - TRUE, + true, 1, 101, {50, 200}, bear_calc, NULL, @@ -560,7 +560,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = NULL, "A corrupted maia.", NULL /* no realm */, - TRUE, + true, 1, 101, {30, 70}, balrog_calc, NULL, @@ -572,7 +572,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = NULL, "A near god-like being.", NULL /* no realm */, - TRUE, + true, 1, 101, {30, 70}, maia_calc, NULL, @@ -584,7 +584,7 @@ static mimic_form_type mimic_forms[MIMIC_FORMS_MAX] = NULL, "A towering column of flames", NULL /* no realm */, - TRUE, + true, 1, 101, {10, 10}, fire_elemental_calc, NULL, @@ -601,11 +601,11 @@ static bool mimic_form_enabled(mimic_form_type const *f) { if (f->modules[i] == game_module_idx) { - return TRUE; + return true; } } - return FALSE; + return false; } /* @@ -638,7 +638,7 @@ s16b resolve_mimic_name(const char *name) /* * Find a random mimic form */ -s16b find_random_mimic_shape(byte level, bool_ limit) +s16b find_random_mimic_shape(byte level, bool limit) { int tries = 1000; diff --git a/src/mimic.hpp b/src/mimic.hpp index 3fbbcc15..80a1722c 100644 --- a/src/mimic.hpp +++ b/src/mimic.hpp @@ -1,7 +1,7 @@ #include "h-basic.hpp" s16b resolve_mimic_name(const char *name); -s16b find_random_mimic_shape(byte level, bool_ limit); +s16b find_random_mimic_shape(byte level, bool limit); const char *get_mimic_name(s16b mf_idx); const char *get_mimic_object_name(s16b mf_idx); byte get_mimic_level(s16b mf_idx); diff --git a/src/object2.cc b/src/object2.cc index d108ebf7..6ad818ca 100644 --- a/src/object2.cc +++ b/src/object2.cc @@ -2530,7 +2530,7 @@ static void a_m_aux_2(object_type *o_ptr, int level, int power) } else if (o_ptr->sval == SV_MIMIC_CLOAK) { - s32b mimic = find_random_mimic_shape(level, TRUE); + s32b mimic = find_random_mimic_shape(level, true); o_ptr->pval2 = mimic; } break; @@ -3245,7 +3245,7 @@ static void a_m_aux_4(object_type *o_ptr, int level, int power) case TV_POTION2: if (o_ptr->sval == SV_POTION2_MIMIC) { - s32b mimic = find_random_mimic_shape(level, FALSE); + s32b mimic = find_random_mimic_shape(level, false); o_ptr->pval2 = mimic; } break; diff --git a/src/randart.cc b/src/randart.cc index 66d3ea69..6018b3d1 100644 --- a/src/randart.cc +++ b/src/randart.cc @@ -374,7 +374,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll, bool get_name) /* HACKS for ToME */ if (o_ptr->tval == TV_CLOAK && o_ptr->sval == SV_MIMIC_CLOAK) { - s32b mimic = find_random_mimic_shape(127, TRUE); + s32b mimic = find_random_mimic_shape(127, true); o_ptr->pval2 = mimic; } else if (flags & TR_SPELL_CONTAIN) |