summaryrefslogtreecommitdiff
path: root/src/cmd2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd2.c')
-rw-r--r--src/cmd2.c124
1 files changed, 62 insertions, 62 deletions
diff --git a/src/cmd2.c b/src/cmd2.c
index 7d2a33b9..bf7899aa 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -17,7 +17,7 @@ void do_cmd_immovable_special(void);
/*
* Try to bash an altar
*/
-static bool do_cmd_bash_altar(int y, int x)
+static bool_ do_cmd_bash_altar(int y, int x)
{
msg_print("Are you mad? You want to anger the gods?");
return (FALSE);
@@ -27,13 +27,13 @@ static bool do_cmd_bash_altar(int y, int x)
/*
* Try to bash a fountain
*/
-static bool do_cmd_bash_fountain(int y, int x)
+static bool_ do_cmd_bash_fountain(int y, int x)
{
int bash, temp;
cave_type *c_ptr;
- bool more = TRUE;
+ bool_ more = TRUE;
monster_race *r_ptr = &r_info[p_ptr->body_monster];
@@ -85,7 +85,7 @@ static bool do_cmd_bash_fountain(int y, int x)
*/
void do_cmd_go_up(void)
{
- bool go_up = FALSE, go_up_many = FALSE, prob_traveling = FALSE;
+ bool_ go_up = FALSE, go_up_many = FALSE, prob_traveling = FALSE;
cave_type *c_ptr;
@@ -249,7 +249,7 @@ void do_cmd_go_up(void)
/*
* Returns TRUE if we are in the Between...
*/
-static bool between_effect(void)
+static bool_ between_effect(void)
{
byte bx, by;
@@ -297,9 +297,9 @@ void do_cmd_go_down(void)
{
cave_type *c_ptr;
- bool go_down = FALSE, go_down_many = FALSE, prob_traveling = FALSE;
+ bool_ go_down = FALSE, go_down_many = FALSE, prob_traveling = FALSE;
- bool fall_trap = FALSE;
+ bool_ fall_trap = FALSE;
char i;
@@ -632,7 +632,7 @@ static void chest_death(int y, int x, s16b o_idx)
{
int number;
- bool small;
+ bool_ small;
object_type forge;
object_type *q_ptr;
@@ -710,7 +710,7 @@ static void chest_trap(int y, int x, s16b o_idx)
object_type *o_ptr = &o_list[o_idx];
- bool ident = FALSE;
+ bool_ ident = FALSE;
/* Ignore disarmed chests */
@@ -740,13 +740,13 @@ static void chest_trap(int y, int x, s16b o_idx)
*
* Returns TRUE if repeated commands may continue
*/
-static bool do_cmd_open_chest(int y, int x, s16b o_idx)
+static bool_ do_cmd_open_chest(int y, int x, s16b o_idx)
{
int i, j;
- bool flag = TRUE;
+ bool_ flag = TRUE;
- bool more = FALSE;
+ bool_ more = FALSE;
object_type *o_ptr = &o_list[o_idx];
@@ -825,7 +825,7 @@ static bool do_cmd_open_chest(int y, int x, s16b o_idx)
/*
* Return TRUE if the given grid is an open door
*/
-static bool is_open(cave_type *c_ptr)
+static bool_ is_open(cave_type *c_ptr)
{
return (c_ptr->feat == FEAT_OPEN);
}
@@ -834,7 +834,7 @@ static bool is_open(cave_type *c_ptr)
/*
* Return TRUE if the given grid is a closed door
*/
-static bool is_closed(cave_type *c_ptr)
+static bool_ is_closed(cave_type *c_ptr)
{
byte feat;
@@ -848,7 +848,7 @@ static bool is_closed(cave_type *c_ptr)
/*
* Return TRUE if the given grid has a trap
*/
-static bool is_trap(cave_type *c_ptr)
+static bool_ is_trap(cave_type *c_ptr)
{
return ((c_ptr->info & (CAVE_TRDT)) != 0);
}
@@ -858,8 +858,8 @@ static bool is_trap(cave_type *c_ptr)
* Return the number of doors/traps around (or under)
* the character using the filter function 'test'
*/
-static int count_feats(int *y, int *x, bool (*test) (cave_type *c_ptr),
- bool under)
+static int count_feats(int *y, int *x, bool_ (*test) (cave_type *c_ptr),
+ bool_ under)
{
int d;
@@ -908,7 +908,7 @@ static int count_feats(int *y, int *x, bool (*test) (cave_type *c_ptr),
* Return the number of chests around (or under) the character.
* If requested, count only trapped chests.
*/
-static int count_chests(int *y, int *x, bool trapped)
+static int count_chests(int *y, int *x, bool_ trapped)
{
int d, count, o_idx;
@@ -984,13 +984,13 @@ static int coords_to_dir(int y, int x)
*
* Returns TRUE if repeated commands may continue
*/
-static bool do_cmd_open_aux(int y, int x, int dir)
+static bool_ do_cmd_open_aux(int y, int x, int dir)
{
int i, j;
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
monster_race *r_ptr = &r_info[p_ptr->body_monster];
@@ -1105,7 +1105,7 @@ void do_cmd_open(void)
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
monster_race *r_ptr = &r_info[p_ptr->body_monster];
@@ -1225,11 +1225,11 @@ void do_cmd_open(void)
*
* Returns TRUE if repeated commands may continue
*/
-static bool do_cmd_close_aux(int y, int x, int dir)
+static bool_ do_cmd_close_aux(int y, int x, int dir)
{
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
monster_race *r_ptr = &r_info[p_ptr->body_monster];
@@ -1284,7 +1284,7 @@ void do_cmd_close(void)
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
/* Option: Pick a direction */
@@ -1371,7 +1371,7 @@ void do_cmd_close(void)
/*
* Determine if a given grid may be "tunneled"
*/
-static bool do_cmd_tunnel_test(int y, int x)
+static bool_ do_cmd_tunnel_test(int y, int x)
{
/* Must have knowledge(execpt on "forget" levels) */
if (!(cave[y][x].info & (CAVE_MARK)))
@@ -1418,7 +1418,7 @@ static bool do_cmd_tunnel_test(int y, int x)
* This will, however, produce grids which are NOT illuminated
* (or darkened) along with the rest of the room.
*/
-static bool twall(int y, int x, byte feat)
+static bool_ twall(int y, int x, byte feat)
{
cave_type *c_ptr = &cave[y][x];
@@ -1451,14 +1451,14 @@ static bool twall(int y, int x, byte feat)
*
* Returns TRUE if repeated commands may continue
*/
-bool do_cmd_tunnel_aux(int y, int x, int dir)
+bool_ do_cmd_tunnel_aux(int y, int x, int dir)
{
int skill_req = 0, skill_req_1pct = 0;
cave_type *c_ptr = &cave[y][x];
feature_type *f_ptr = &f_info[c_ptr->feat];
- bool more = FALSE;
+ bool_ more = FALSE;
/* Must be have something to dig with (except for sandwalls) */
@@ -1542,10 +1542,10 @@ bool do_cmd_tunnel_aux(int y, int x, int dir)
((c_ptr->feat >= FEAT_SANDWALL) &&
(c_ptr->feat <= FEAT_SANDWALL_K)))
{
- bool okay = FALSE;
- bool gold = FALSE;
- bool hard = FALSE;
- bool soft = FALSE;
+ bool_ okay = FALSE;
+ bool_ gold = FALSE;
+ bool_ hard = FALSE;
+ bool_ soft = FALSE;
/* Found gold */
if ((c_ptr->feat >= FEAT_MAGMA_H) &&
@@ -1743,7 +1743,7 @@ void do_cmd_tunnel(void)
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
if (p_ptr->wild_mode) return;
@@ -1823,7 +1823,7 @@ void do_cmd_tunnel(void)
* do_cmd_open_test() and do_cmd_open_aux().
*/
-bool easy_open_door(int y, int x)
+bool_ easy_open_door(int y, int x)
{
int i, j;
@@ -1938,11 +1938,11 @@ bool easy_open_door(int y, int x)
*
* Returns TRUE if repeated commands may continue
*/
-static bool do_cmd_disarm_chest(int y, int x, s16b o_idx)
+static bool_ do_cmd_disarm_chest(int y, int x, s16b o_idx)
{
int i, j;
- bool more = FALSE;
+ bool_ more = FALSE;
object_type *o_ptr = &o_list[o_idx];
@@ -2016,7 +2016,7 @@ static bool do_cmd_disarm_chest(int y, int x, s16b o_idx)
*
* Returns TRUE if repeated commands may continue
*/
-bool do_cmd_disarm_aux(int y, int x, int dir, int do_pickup)
+bool_ do_cmd_disarm_aux(int y, int x, int dir, int do_pickup)
{
int i, j, power;
@@ -2024,7 +2024,7 @@ bool do_cmd_disarm_aux(int y, int x, int dir, int do_pickup)
cptr name;
- bool more = FALSE;
+ bool_ more = FALSE;
/* Take a turn */
@@ -2133,7 +2133,7 @@ void do_cmd_disarm(void)
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
/* Option: Pick a direction */
@@ -2234,13 +2234,13 @@ void do_cmd_disarm(void)
*
* Returns TRUE if repeated commands may continue
*/
-static bool do_cmd_bash_aux(int y, int x, int dir)
+static bool_ do_cmd_bash_aux(int y, int x, int dir)
{
int bash, temp;
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
monster_race *r_ptr = &r_info[p_ptr->body_monster];
@@ -2354,7 +2354,7 @@ void do_cmd_bash(void)
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
monster_race *r_ptr = &r_info[p_ptr->body_monster];
@@ -2451,7 +2451,7 @@ void do_cmd_alter(void)
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
/* Allow repeated command */
@@ -2527,7 +2527,7 @@ void do_cmd_alter(void)
*
* XXX XXX XXX Let user choose a pile of spikes, perhaps?
*/
-static bool get_spike(int *ip)
+static bool_ get_spike(int *ip)
{
int i;
@@ -2631,11 +2631,11 @@ void do_cmd_spike(void)
}
-static void do_cmd_walk_jump(int pickup, bool disarm)
+static void do_cmd_walk_jump(int pickup, bool_ disarm)
{
int dir;
- bool more = FALSE;
+ bool_ more = FALSE;
/* Allow repeated command */
@@ -2694,7 +2694,7 @@ static void do_cmd_walk_jump(int pickup, bool disarm)
/*
* Support code for the "Walk" and "Jump" commands
*/
-void do_cmd_walk(int pickup, bool disarm)
+void do_cmd_walk(int pickup, bool_ disarm)
{
/* Move (usually pickup) */
@@ -3063,7 +3063,7 @@ void do_cmd_fire(void)
object_type *j_ptr;
- bool hit_body = FALSE;
+ bool_ hit_body = FALSE;
byte missile_attr;
@@ -3299,7 +3299,7 @@ void do_cmd_fire(void)
/* Did we hit it (penalize range) */
if (test_hit_fire(chance - cur_dis, m_ptr->ac, m_ptr->ml))
{
- bool fear = FALSE;
+ bool_ fear = FALSE;
/* Assume a default death */
cptr note_dies = " dies.";
@@ -3520,9 +3520,9 @@ void do_cmd_throw(void)
object_type *o_ptr;
- bool hit_body = FALSE;
+ bool_ hit_body = FALSE;
- bool hit_wall = FALSE;
+ bool_ hit_wall = FALSE;
byte missile_attr;
@@ -3735,7 +3735,7 @@ void do_cmd_throw(void)
/* Did we hit it (penalize range) */
if (test_hit_fire(chance - cur_dis, m_ptr->ac, m_ptr->ml))
{
- bool fear = FALSE;
+ bool_ fear = FALSE;
/* Assume a default death */
cptr note_dies = " dies.";
@@ -3915,9 +3915,9 @@ void do_cmd_boomerang(void)
object_type *o_ptr;
- bool hit_body = FALSE;
+ bool_ hit_body = FALSE;
- bool hit_wall = FALSE;
+ bool_ hit_wall = FALSE;
byte missile_attr;
@@ -4065,7 +4065,7 @@ void do_cmd_boomerang(void)
/* Did we hit it (penalize range) */
if (test_hit_fire(chance - cur_dis, m_ptr->ac, m_ptr->ml))
{
- bool fear = FALSE;
+ bool_ fear = FALSE;
/* Assume a default death */
cptr note_dies = " dies.";
@@ -4236,7 +4236,7 @@ void do_cmd_unwalk()
cave_type *c_ptr;
- bool more = FALSE;
+ bool_ more = FALSE;
if (!get_rep_dir(&dir)) return;
@@ -4399,7 +4399,7 @@ void do_cmd_unwalk()
}
-static bool tport_vertically(bool how)
+static bool_ tport_vertically(bool_ how)
{
/* arena or quest -KMW- */
if ((p_ptr->inside_arena) || (p_ptr->inside_quest))
@@ -4458,9 +4458,9 @@ void do_cmd_immovable_special(void)
int lose_hp = 0;
- bool did_act = FALSE;
+ bool_ did_act = FALSE;
- bool did_load = FALSE;
+ bool_ did_load = FALSE;
if (foo > 1)
@@ -4618,7 +4618,7 @@ void do_cmd_immovable_special(void)
}
/* Can we sacrifice it ? */
-static bool item_tester_hook_sacrifiable(object_type *o_ptr)
+static bool_ item_tester_hook_sacrifiable(object_type *o_ptr)
{
GOD(GOD_MELKOR)
{
@@ -4744,7 +4744,7 @@ void do_cmd_sacrifice(void)
*
* Return a list of o_list[] indexes of items of the given monster
*/
-bool scan_monst(int *items, int *item_num, int m_idx)
+bool_ scan_monst(int *items, int *item_num, int m_idx)
{
int this_o_idx, next_o_idx;
@@ -4904,7 +4904,7 @@ void do_cmd_steal()
byte num = 0;
- bool done = FALSE;
+ bool_ done = FALSE;
int monst_list[23];
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 03:44:00 +0000