From 133ba5387d7476e418ee85f0baf3aada1ba8e8b7 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 11 Jan 2020 12:55:39 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20bool=E5=9E=8B=E3=81=AE?= =?utf8?q?=E8=BF=94=E3=82=8A=E5=80=A4=E3=81=AB=E4=BB=98=E3=81=84=E3=81=A6?= =?utf8?q?=E3=81=84=E3=81=9F=E3=82=AB=E3=83=83=E3=82=B3=E3=82=92=E9=99=A4?= =?utf8?q?=E5=8E=BB=20/=20Removed=20parenthesis=20from=20'return=20(TRUE)'?= =?utf8?q?=20and=20'return=20(FALSE)'=20to=20'return=20TRUE'=20and=20'retu?= =?utf8?q?rn=20FALSE'?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/artifact.c | 16 ++--- src/birth.c | 20 +++--- src/bldg.c | 42 ++++++------ src/chuukei.c | 20 +++--- src/cmd/cmd-basic.c | 16 ++--- src/cmd/cmd-hissatsu.c | 8 +-- src/cmd/cmd-mane.c | 4 +- src/cmd/cmd-spell.c | 12 ++-- src/combat/melee1.c | 16 ++--- src/combat/shoot.c | 12 ++-- src/core.c | 12 ++-- src/dungeon-file.c | 8 +-- src/files.c | 8 +-- src/floor-events.c | 6 +- src/floor.c | 22 +++---- src/load.c | 32 ++++----- src/main-win.c | 38 +++++------ src/mind.c | 8 +-- src/monster-process.c | 56 ++++++++-------- src/monster-status.c | 6 +- src/monster1.c | 18 +++--- src/monster2.c | 64 +++++++++--------- src/monsterrace-hook.c | 156 ++++++++++++++++++++++---------------------- src/mspells1.c | 172 ++++++++++++++++++++++++------------------------- src/mspells2.c | 14 ++-- src/mspells3.c | 6 +- src/mspells4.c | 2 +- src/object-broken.c | 52 +++++++-------- src/object-flavor.c | 12 ++-- src/object-hook.c | 100 ++++++++++++++-------------- src/object1.c | 4 +- src/objectkind-hook.c | 58 ++++++++--------- src/player-damage.c | 10 +-- src/player-effects.c | 110 +++++++++++++++---------------- src/player-inventory.c | 32 ++++----- src/player-move.c | 36 +++++------ src/readdib.c | 4 +- src/rooms-pitnest.c | 6 +- src/save.c | 18 +++--- src/sort.c | 28 ++++---- src/spells-object.c | 8 +-- src/spells-summon.c | 8 +-- src/spells-world.c | 4 +- src/spells1.c | 48 +++++++------- src/spells2.c | 4 +- src/spells3.c | 10 +-- src/store.c | 80 +++++++++++------------ src/trap.c | 8 +-- src/util.c | 18 +++--- src/view-mainwindow.c | 4 +- src/wizard1.c | 4 +- src/wizard2.c | 2 +- src/z-util.c | 6 +- 53 files changed, 734 insertions(+), 734 deletions(-) diff --git a/src/artifact.c b/src/artifact.c index f5cc077db..d091e099c 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -2236,10 +2236,10 @@ bool make_artifact(object_type *o_ptr) ARTIFACT_IDX i; /* No artifacts in the town */ - if (!p_ptr->current_floor_ptr->dun_level) return (FALSE); + if (!p_ptr->current_floor_ptr->dun_level) return FALSE; /* Paranoia -- no "plural" artifacts */ - if (o_ptr->number != 1) return (FALSE); + if (o_ptr->number != 1) return FALSE; /* Check the artifact list (skip the "specials") */ for (i = 0; i < max_a_idx; i++) @@ -2280,11 +2280,11 @@ bool make_artifact(object_type *o_ptr) random_artifact_resistance(o_ptr, a_ptr); /* Success */ - return (TRUE); + return TRUE; } /* Failure */ - return (FALSE); + return FALSE; } /*! @@ -2304,10 +2304,10 @@ bool make_artifact_special(object_type *o_ptr) KIND_OBJECT_IDX k_idx = 0; /*! @note 地上ではキャンセルする / No artifacts in the town */ - if (!p_ptr->current_floor_ptr->dun_level) return (FALSE); + if (!p_ptr->current_floor_ptr->dun_level) return FALSE; /*! @note get_obj_num_hookによる指定がある場合は生成をキャンセルする / Themed object */ - if (get_obj_num_hook) return (FALSE); + if (get_obj_num_hook) return FALSE; /*! @note 全固定アーティファクト中からIDの若い順に生成対象とその確率を走査する / Check the artifact list (just the "specials") */ for (i = 0; i < max_a_idx; i++) @@ -2349,9 +2349,9 @@ bool make_artifact_special(object_type *o_ptr) o_ptr->name1 = i; random_artifact_resistance(o_ptr, a_ptr); - return (TRUE); + return TRUE; } /*! @note 全INSTA_ART固定アーティファクトを試行しても決まらなかった場合 FALSEを返す / Failure */ - return (FALSE); + return FALSE; } diff --git a/src/birth.c b/src/birth.c index 8719b60f8..bcefdcbc0 100644 --- a/src/birth.c +++ b/src/birth.c @@ -912,7 +912,7 @@ static bool get_player_realms(player_type *creature_ptr) } } - return (TRUE); + return TRUE; } @@ -2562,7 +2562,7 @@ static bool get_player_race(player_type *creature_ptr) put_str(buf, 10, 10); c = inkey(); if (c == 'Q') birth_quit(); - if (c == 'S') return (FALSE); + if (c == 'S') return FALSE; if (c == ' ' || c == '\r' || c == '\n') { if(cs == MAX_RACES) @@ -2734,7 +2734,7 @@ static bool get_player_class(player_type *creature_ptr) put_str(buf, 10, 10); c = inkey(); if (c == 'Q') birth_quit(); - if (c == 'S') return (FALSE); + if (c == 'S') return FALSE; if (c == ' ' || c == '\r' || c == '\n') { if(cs == MAX_CLASS_CHOICE) @@ -2893,7 +2893,7 @@ static bool get_player_seikaku(player_type *creature_ptr) put_str(buf, 10, 10); c = inkey(); if (c == 'Q') birth_quit(); - if (c == 'S') return (FALSE); + if (c == 'S') return FALSE; if (c == ' ' || c == '\r' || c == '\n') { if(cs == MAX_SEIKAKU) @@ -3385,7 +3385,7 @@ static bool get_chara_limits(player_type *creature_ptr) case 'Q': birth_quit(); case 'S': - return (FALSE); + return FALSE; case ESCAPE: break; /*後でもう一回breakせんと*/ case ' ': @@ -3963,7 +3963,7 @@ static bool player_birth_aux(player_type *creature_ptr) put_str(buf, 10, 10); c = inkey(); if (c == 'Q') birth_quit(); - if (c == 'S') return (FALSE); + if (c == 'S') return FALSE; if (c == ' ' || c == '\r' || c == '\n') { if(cs == MAX_SEXES) @@ -4384,7 +4384,7 @@ static bool player_birth_aux(player_type *creature_ptr) if (c == 'Q') birth_quit(); /* Start over */ - if (c == 'S') return (FALSE); + if (c == 'S') return FALSE; /* Escape accepts the roll */ if (c == '\r' || c == '\n' || c == ESCAPE) break; @@ -4471,7 +4471,7 @@ static bool player_birth_aux(player_type *creature_ptr) if (c == 'Q') birth_quit(); /* Start over */ - if (c == 'S') return (FALSE); + if (c == 'S') return FALSE; /* Initialize random quests */ @@ -4482,7 +4482,7 @@ static bool player_birth_aux(player_type *creature_ptr) previous_char.quick_ok = TRUE; /* Accept */ - return (TRUE); + return TRUE; } /*! @@ -4508,7 +4508,7 @@ static bool ask_quick_start(player_type *creature_ptr) c = inkey(); if (c == 'Q') quit(NULL); - else if (c == 'S') return (FALSE); + else if (c == 'S') return FALSE; else if (c == '?') { #ifdef JP diff --git a/src/bldg.c b/src/bldg.c index e53a57ff8..640b7e806 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -136,21 +136,21 @@ static bool is_owner(building_type *bldg) { if (bldg->member_class[p_ptr->pclass] == BUILDING_OWNER) { - return (TRUE); + return TRUE; } if (bldg->member_race[p_ptr->prace] == BUILDING_OWNER) { - return (TRUE); + return TRUE; } if ((is_magic(p_ptr->realm1) && (bldg->member_realm[p_ptr->realm1] == BUILDING_OWNER)) || (is_magic(p_ptr->realm2) && (bldg->member_realm[p_ptr->realm2] == BUILDING_OWNER))) { - return (TRUE); + return TRUE; } - return (FALSE); + return FALSE; } /*! @@ -166,18 +166,18 @@ static bool is_member(building_type *bldg) { if (bldg->member_class[p_ptr->pclass]) { - return (TRUE); + return TRUE; } if (bldg->member_race[p_ptr->prace]) { - return (TRUE); + return TRUE; } if ((is_magic(p_ptr->realm1) && bldg->member_realm[p_ptr->realm1]) || (is_magic(p_ptr->realm2) && bldg->member_realm[p_ptr->realm2])) { - return (TRUE); + return TRUE; } @@ -191,7 +191,7 @@ static bool is_member(building_type *bldg) } return OK; } - return (FALSE); + return FALSE; } /*! @@ -1198,7 +1198,7 @@ static bool gamble_comm(int cmd) msg_print(_("おい！金が足りないじゃないか！出ていけ！", "Hey! You don't have the gold - get out of here!")); msg_print(NULL); screen_load(); - return (FALSE); + return FALSE; } else if (wager > maxbet) { @@ -1441,7 +1441,7 @@ static bool gamble_comm(int cmd) msg_print(NULL); } screen_load(); - return (TRUE); + return TRUE; } /*! @@ -1642,7 +1642,7 @@ static bool kakutoujou(player_type *player_ptr) msg_print(NULL); screen_load(); - return (FALSE); + return FALSE; } else if (wager > maxbet) { @@ -1670,12 +1670,12 @@ static bool kakutoujou(player_type *player_ptr) screen_load(); - return (TRUE); + return TRUE; } } screen_load(); - return (FALSE); + return FALSE; } /*! @@ -2092,7 +2092,7 @@ static bool inn_comm(player_type *customer_ptr, int cmd) } } - return (TRUE); + return TRUE; } @@ -2824,7 +2824,7 @@ static bool eval_ac(ARMOUR_CLASS iAC) (void)inkey(); screen_load(); - return (TRUE); + return TRUE; } @@ -3176,14 +3176,14 @@ static bool enchant_item(player_type *player_ptr, PRICE cost, HIT_PROB to_hit, H s = _("改良できるものがありません。", "You have nothing to improve."); o_ptr = choose_object(player_ptr, &item, q, s, (USE_INVEN | USE_EQUIP | IGNORE_BOTHHAND_SLOT), item_tester_tval); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; /* Check if the player has enough money */ if (player_ptr->au < (cost * o_ptr->number)) { object_desc(tmp_str, o_ptr, OD_NAME_ONLY); msg_format(_("%sを改良するだけのゴールドがありません！", "You do not have the gold to improve %s!"), tmp_str); - return (FALSE); + return FALSE; } /* Enchant to hit */ @@ -3230,7 +3230,7 @@ static bool enchant_item(player_type *player_ptr, PRICE cost, HIT_PROB to_hit, H { if (flush_failure) flush(); msg_print(_("改良に失敗した。", "The improvement failed.")); - return (FALSE); + return FALSE; } else { @@ -3247,7 +3247,7 @@ static bool enchant_item(player_type *player_ptr, PRICE cost, HIT_PROB to_hit, H if (item >= INVEN_RARM) calc_android_exp(player_ptr); /* Something happened */ - return (TRUE); + return TRUE; } } @@ -3640,7 +3640,7 @@ static bool research_mon(player_type *player_ptr) { screen_load(); - return (FALSE); + return FALSE; } /* Find that character info, and describe it */ @@ -3750,7 +3750,7 @@ static bool research_mon(player_type *player_ptr) C_KILL(who, max_r_idx, MONRACE_IDX); screen_load(); - return (FALSE); + return FALSE; } /* Sort by level */ diff --git a/src/chuukei.c b/src/chuukei.c index 8cf370d88..c75fd7163 100644 --- a/src/chuukei.c +++ b/src/chuukei.c @@ -520,21 +520,21 @@ static bool string_is_repeat(char *str, int len) char c = str[0]; int i; - if (len < 2) return (FALSE); + if (len < 2) return FALSE; #ifdef JP - if (iskanji(c)) return (FALSE); + if (iskanji(c)) return FALSE; #endif for (i = 1; i < len; i++) { #ifdef JP - if(c != str[i] || iskanji(str[i])) return (FALSE); + if(c != str[i] || iskanji(str[i])) return FALSE; #else - if(c != str[i]) return (FALSE); + if(c != str[i]) return FALSE; #endif } - return (TRUE); + return TRUE; } static errr send_text_to_chuukei_server(TERM_LEN x, TERM_LEN y, int len, TERM_COLOR col, concptr str) @@ -909,9 +909,9 @@ static bool get_nextbuf(char *buf) if (*ptr++ == '\0') break; } - if (buf[0] == 'd') return (FALSE); + if (buf[0] == 'd') return FALSE; - return (TRUE); + return TRUE; } /* プレイホストのマップが大きいときクライアントのマップもリサイズする */ @@ -936,10 +936,10 @@ static bool flush_ringbuf_client(void) char buf[1024]; /* 書くデータなし */ - if (fresh_queue.next == fresh_queue.tail) return (FALSE); + if (fresh_queue.next == fresh_queue.tail) return FALSE; /* まだ書くべき時でない */ - if (fresh_queue.time[fresh_queue.next] > get_current_time() - epoch_time) return (FALSE); + if (fresh_queue.time[fresh_queue.next] > get_current_time() - epoch_time) return FALSE; /* 時間情報(区切り)が得られるまで書く */ while (get_nextbuf(buf)) @@ -1023,7 +1023,7 @@ static bool flush_ringbuf_client(void) fresh_queue.next++; if (fresh_queue.next == FRESH_QUEUE_SIZE) fresh_queue.next = 0; - return (TRUE); + return TRUE; } #ifdef CHUUKEI diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index a1e4da71a..1ad24ed46 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -1031,7 +1031,7 @@ static bool do_cmd_tunnel_test(floor_type *floor_ptr, POSITION y, POSITION x) { msg_print(_("そこには何も見当たらない。", "You see nothing there.")); - return (FALSE); + return FALSE; } /* Must be a wall/door/etc */ @@ -1039,10 +1039,10 @@ static bool do_cmd_tunnel_test(floor_type *floor_ptr, POSITION y, POSITION x) { msg_print(_("そこには掘るものが見当たらない。", "You see nothing there to tunnel.")); - return (FALSE); + return FALSE; } - return (TRUE); + return TRUE; } @@ -1066,7 +1066,7 @@ static bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x) bool more = FALSE; /* Verify legality */ - if (!do_cmd_tunnel_test(creature_ptr->current_floor_ptr, y, x)) return (FALSE); + if (!do_cmd_tunnel_test(creature_ptr->current_floor_ptr, y, x)) return FALSE; take_turn(creature_ptr, 100); @@ -1278,7 +1278,7 @@ bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x) /* Must be a closed door */ if (!is_closed_door(g_ptr->feat)) { - return (FALSE); + return FALSE; } /* Jammed door */ @@ -1342,7 +1342,7 @@ bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x) sound(SOUND_OPENDOOR); } - return (TRUE); + return TRUE; } /*! @@ -1917,11 +1917,11 @@ static bool get_spike(player_type *creature_ptr, INVENTORY_IDX *ip) (*ip) = i; /* Success */ - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c index 676059a41..30b56d7ab 100644 --- a/src/cmd/cmd-hissatsu.c +++ b/src/cmd/cmd-hissatsu.c @@ -73,7 +73,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) if (technic_info[TECHNIC_HISSATSU][*sn].slevel <= plev) { /* Success */ - return (TRUE); + return TRUE; } } @@ -109,7 +109,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) case '0': { screen_load(); - return (FALSE); + return FALSE; } case '8': @@ -295,7 +295,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) handle_stuff(creature_ptr); /* Abort if needed */ - if (!flag) return (FALSE); + if (!flag) return FALSE; /* Save the choice */ (*sn) = j; @@ -303,7 +303,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) repeat_push((COMMAND_CODE)j); /* Success */ - return (TRUE); + return TRUE; } diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c index 7dc618bc0..ff7181b6c 100644 --- a/src/cmd/cmd-mane.c +++ b/src/cmd/cmd-mane.c @@ -246,7 +246,7 @@ static int get_mane_power(player_type *caster_ptr, int *sn, bool baigaesi) handle_stuff(caster_ptr); /* Abort if needed */ - if (!flag) return (FALSE); + if (!flag) return FALSE; /* Save the choice */ (*sn) = i; @@ -254,7 +254,7 @@ static int get_mane_power(player_type *caster_ptr, int *sn, bool baigaesi) damage = (baigaesi ? caster_ptr->mane_dam[i]*2 : caster_ptr->mane_dam[i]); /* Success */ - return (TRUE); + return TRUE; } diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c index cd7c19ebd..a4bb69c24 100644 --- a/src/cmd/cmd-spell.c +++ b/src/cmd/cmd-spell.c @@ -238,7 +238,7 @@ static bool spell_okay(player_type *caster_ptr, int spell, bool learned, bool st } /* Spell is illegal */ - if (s_ptr->slevel > caster_ptr->lev) return (FALSE); + if (s_ptr->slevel > caster_ptr->lev) return FALSE; /* Spell is forgotten */ if ((use_realm == caster_ptr->realm2) ? @@ -246,11 +246,11 @@ static bool spell_okay(player_type *caster_ptr, int spell, bool learned, bool st (caster_ptr->spell_forgotten1 & (1L << spell))) { /* Never okay */ - return (FALSE); + return FALSE; } - if (caster_ptr->pclass == CLASS_SORCERER) return (TRUE); - if (caster_ptr->pclass == CLASS_RED_MAGE) return (TRUE); + if (caster_ptr->pclass == CLASS_SORCERER) return TRUE; + if (caster_ptr->pclass == CLASS_RED_MAGE) return TRUE; /* Spell is learned */ if ((use_realm == caster_ptr->realm2) ? @@ -340,7 +340,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ if (spell_okay(caster_ptr, *sn, learned, FALSE, use_realm)) { /* Success */ - return (TRUE); + return TRUE; } } @@ -371,7 +371,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ } /* No "okay" spells */ - if (!okay) return (FALSE); + if (!okay) return FALSE; if (((use_realm) != caster_ptr->realm1) && ((use_realm) != caster_ptr->realm2) && (caster_ptr->pclass != CLASS_SORCERER) && (caster_ptr->pclass != CLASS_RED_MAGE)) return FALSE; if (((caster_ptr->pclass == CLASS_SORCERER) || (caster_ptr->pclass == CLASS_RED_MAGE)) && !is_magic(use_realm)) return FALSE; if ((caster_ptr->pclass == CLASS_RED_MAGE) && ((use_realm) != REALM_ARCANE) && (sval > 1)) return FALSE; diff --git a/src/combat/melee1.c b/src/combat/melee1.c index fd16eaabf..86b8e5f0c 100644 --- a/src/combat/melee1.c +++ b/src/combat/melee1.c @@ -1017,8 +1017,8 @@ static int check_hit(player_type *target_ptr, int power, DEPTH level, int stun) ac = target_ptr->ac + target_ptr->to_a; if (target_ptr->special_attack & ATTACK_SUIKEN) ac += (target_ptr->lev * 2); - if ((i > 0) && (randint1(i) > ((ac * 3) / 4))) return (TRUE); - return (FALSE); + if ((i > 0) && (randint1(i) > ((ac * 3) / 4))) return TRUE; + return FALSE; } /*! @@ -1038,8 +1038,8 @@ static int check_hit2(int power, DEPTH level, ARMOUR_CLASS ac, int stun) if (k < 10) return (k < 5); i = (power + (level * 3)); - if ((i > 0) && (randint1(i) > ((ac * 3) / 4))) return (TRUE); - return (FALSE); + if ((i > 0) && (randint1(i) > ((ac * 3) / 4))) return TRUE; + return FALSE; } /*! モンスターの侮辱行為メッセージテーブル / Hack -- possible "insult" messages */ @@ -2382,9 +2382,9 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) int abbreviate = 0; // ２回目以降の省略表現フラグ /* Not allowed to attack */ - if (r_ptr->flags1 & (RF1_NEVER_BLOW)) return (FALSE); + if (r_ptr->flags1 & (RF1_NEVER_BLOW)) return FALSE; - if (d_info[target_ptr->dungeon_idx].flags1 & DF1_NO_MELEE) return (FALSE); + if (d_info[target_ptr->dungeon_idx].flags1 & DF1_NO_MELEE) return FALSE; /* ...nor if friendly */ if (!is_hostile(m_ptr)) return FALSE; @@ -4110,7 +4110,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) } /* Assume we attacked */ - return (TRUE); + return TRUE; } @@ -4159,7 +4159,7 @@ bool monst_attack_monst(player_type *subject_ptr, MONSTER_IDX m_idx, MONSTER_IDX /* Not allowed to attack */ if (r_ptr->flags1 & RF1_NEVER_BLOW) return FALSE; - if (d_info[subject_ptr->dungeon_idx].flags1 & DF1_NO_MELEE) return (FALSE); + if (d_info[subject_ptr->dungeon_idx].flags1 & DF1_NO_MELEE) return FALSE; /* Total armor */ ac = tr_ptr->ac; diff --git a/src/combat/shoot.c b/src/combat/shoot.c index aa5d42314..4722189d1 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -903,14 +903,14 @@ bool test_hit_fire(player_type *shooter_ptr, int chance, monster_type *m_ptr, in k += shooter_ptr->concent; /* Hack -- Instant miss or hit */ - if (k <= 5) return (FALSE); - if (k > 95) return (TRUE); + if (k <= 5) return FALSE; + if (k > 95) return TRUE; if (shooter_ptr->pseikaku == SEIKAKU_NAMAKE) - if (one_in_(20)) return (FALSE); + if (one_in_(20)) return FALSE; /* Never hit */ - if (chance <= 0) return (FALSE); + if (chance <= 0) return FALSE; ac = r_ptr->ac; if (shooter_ptr->concent) @@ -933,11 +933,11 @@ bool test_hit_fire(player_type *shooter_ptr, int chance, monster_type *m_ptr, in monster_desc(m_name, m_ptr, 0); msg_format(_("%sは%sを斬り捨てた！", "%s cuts down %s!"), m_name, o_name); } - return (FALSE); + return FALSE; } /* Assume hit */ - return (TRUE); + return TRUE; } diff --git a/src/core.c b/src/core.c index ba70811a3..47d6dcad2 100644 --- a/src/core.c +++ b/src/core.c @@ -3394,7 +3394,7 @@ static bool enter_wizard_mode(void) /* Verify request */ if (!get_check(_("本当にウィザードモードに入りたいのですか? ", "Are you sure you want to enter wizard mode? "))) { - return (FALSE); + return FALSE; } exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode.")); @@ -3403,7 +3403,7 @@ static bool enter_wizard_mode(void) } /* Success */ - return (TRUE); + return TRUE; } @@ -3435,7 +3435,7 @@ static bool enter_debug_mode(void) /* Verify request */ if (!get_check(_("本当にデバッグ・コマンドを使いますか? ", "Are you sure you want to use debug commands? "))) { - return (FALSE); + return FALSE; } exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands.")); @@ -3444,7 +3444,7 @@ static bool enter_debug_mode(void) } /* Success */ - return (TRUE); + return TRUE; } /* @@ -3476,7 +3476,7 @@ static bool enter_borg_mode(void) /* Verify request */ if (!get_check(_("本当にボーグ・コマンドを使いますか? ", "Are you sure you want to use borg commands? "))) { - return (FALSE); + return FALSE; } exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("ボーグ・コマンドを使用してスコアを残せなくなった。", "give up recording score to use borg commands.")); @@ -3485,7 +3485,7 @@ static bool enter_borg_mode(void) } /* Success */ - return (TRUE); + return TRUE; } /* diff --git a/src/dungeon-file.c b/src/dungeon-file.c index e101ee3b6..a7666e3c5 100644 --- a/src/dungeon-file.c +++ b/src/dungeon-file.c @@ -1039,7 +1039,7 @@ static bool add_text(u32b *offset, header *head, concptr buf, bool normal_text) { /* Hack -- Verify space */ if (head->text_size + strlen(buf) + 8 > FAKE_TEXT_SIZE) - return (FALSE); + return FALSE; /* New text? */ if (*offset == 0) @@ -1082,7 +1082,7 @@ static bool add_text(u32b *offset, header *head, concptr buf, bool normal_text) head->text_size += strlen(buf); /* Success */ - return (TRUE); + return TRUE; } @@ -1101,7 +1101,7 @@ static bool add_name(u32b *offset, header *head, concptr buf) { /* Hack -- Verify space */ if (head->name_size + strlen(buf) + 8 > FAKE_NAME_SIZE) - return (FALSE); + return FALSE; /* New name? */ if (*offset == 0) @@ -1117,7 +1117,7 @@ static bool add_name(u32b *offset, header *head, concptr buf) head->name_size += strlen(buf); /* Success */ - return (TRUE); + return TRUE; } diff --git a/src/files.c b/src/files.c index 8a1d2d9c6..c600abb7b 100644 --- a/src/files.c +++ b/src/files.c @@ -5343,7 +5343,7 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG msg_format(_("'%s'をオープンできません。", "Cannot open '%s'."), name); msg_print(NULL); - return (TRUE); + return TRUE; } @@ -5418,7 +5418,7 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG /* Hack -- Re-Open the file */ fff = my_fopen(path, "r"); - if (!fff) return (FALSE); + if (!fff) return FALSE; /* File has been restarted */ next = 0; @@ -5731,10 +5731,10 @@ bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAG my_fclose(fff); /* Escape */ - if (skey == 'q') return (FALSE); + if (skey == 'q') return FALSE; /* Normal return */ - return (TRUE); + return TRUE; } diff --git a/src/floor-events.c b/src/floor-events.c index 4255822f7..72ceaa357 100644 --- a/src/floor-events.c +++ b/src/floor-events.c @@ -708,7 +708,7 @@ static bool update_view_aux(floor_type *floor_ptr, POSITION y, POSITION x, POSIT f2 = (cave_los_grid(g2_c_ptr)); /* Totally blocked by physical walls */ - if (!f1 && !f2) return (TRUE); + if (!f1 && !f2) return TRUE; /* Check for visibility */ @@ -716,7 +716,7 @@ static bool update_view_aux(floor_type *floor_ptr, POSITION y, POSITION x, POSIT v2 = (f2 && (g2_c_ptr->info & (CAVE_VIEW))); /* Totally blocked by "unviewable neighbors" */ - if (!v1 && !v2) return (TRUE); + if (!v1 && !v2) return TRUE; g_ptr = &floor_ptr->grid_array[y][x]; @@ -777,7 +777,7 @@ static bool update_view_aux(floor_type *floor_ptr, POSITION y, POSITION x, POSIT /* Assume no line of sight. */ - return (TRUE); + return TRUE; } diff --git a/src/floor.c b/src/floor.c index c205dd4ab..eba38a002 100644 --- a/src/floor.c +++ b/src/floor.c @@ -573,10 +573,10 @@ bool projectable(floor_type *floor_ptr, POSITION y1, POSITION x1, POSITION y2, P x = GRID_X(grid_g[grid_n - 1]); /* May not end in an unrequested grid */ - if ((y != y2) || (x != x2)) return (FALSE); + if ((y != y2) || (x != x2)) return FALSE; /* Assume okay */ - return (TRUE); + return TRUE; } @@ -633,7 +633,7 @@ bool cave_valid_bold(floor_type *floor_ptr, POSITION y, POSITION x) OBJECT_IDX this_o_idx, next_o_idx = 0; /* Forbid perma-grids */ - if (cave_perma_grid(g_ptr)) return (FALSE); + if (cave_perma_grid(g_ptr)) return FALSE; /* Check objects */ for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx) @@ -643,11 +643,11 @@ bool cave_valid_bold(floor_type *floor_ptr, POSITION y, POSITION x) next_o_idx = o_ptr->next_o_idx; /* Forbid artifact grids */ - if (object_is_artifact(o_ptr)) return (FALSE); + if (object_is_artifact(o_ptr)) return FALSE; } /* Accept */ - return (TRUE); + return TRUE; } /* @@ -1026,13 +1026,13 @@ bool get_is_floor(floor_type *floor_ptr, POSITION x, POSITION y) if (!in_bounds(floor_ptr, y, x)) { /* Out of bounds */ - return (FALSE); + return FALSE; } /* Do the real check */ - if (is_floor_bold(floor_ptr, y, x)) return (TRUE); + if (is_floor_bold(floor_ptr, y, x)) return TRUE; - return (FALSE); + return FALSE; } /*! @@ -1097,19 +1097,19 @@ static bool possible_doorway(floor_type *floor_ptr, POSITION y, POSITION x) if (cave_have_flag_bold(floor_ptr, y - 1, x, FF_WALL) && cave_have_flag_bold(floor_ptr, y + 1, x, FF_WALL)) { - return (TRUE); + return TRUE; } /* Check Horizontal */ if (cave_have_flag_bold(floor_ptr, y, x - 1, FF_WALL) && cave_have_flag_bold(floor_ptr, y, x + 1, FF_WALL)) { - return (TRUE); + return TRUE; } } /* No doorway */ - return (FALSE); + return FALSE; } /*! diff --git a/src/load.c b/src/load.c index faec6b0de..a2e571eb3 100644 --- a/src/load.c +++ b/src/load.c @@ -130,23 +130,23 @@ static byte kanji_code = 0; static bool h_older_than(byte major, byte minor, byte patch, byte extra) { /* Much older, or much more recent */ - if (current_world_ptr->h_ver_major < major) return (TRUE); - if (current_world_ptr->h_ver_major > major) return (FALSE); + if (current_world_ptr->h_ver_major < major) return TRUE; + if (current_world_ptr->h_ver_major > major) return FALSE; /* Distinctly older, or distinctly more recent */ - if (current_world_ptr->h_ver_minor < minor) return (TRUE); - if (current_world_ptr->h_ver_minor > minor) return (FALSE); + if (current_world_ptr->h_ver_minor < minor) return TRUE; + if (current_world_ptr->h_ver_minor > minor) return FALSE; /* Barely older, or barely more recent */ - if (current_world_ptr->h_ver_patch < patch) return (TRUE); - if (current_world_ptr->h_ver_patch > patch) return (FALSE); + if (current_world_ptr->h_ver_patch < patch) return TRUE; + if (current_world_ptr->h_ver_patch > patch) return FALSE; /* Barely older, or barely more recent */ - if (current_world_ptr->h_ver_extra < extra) return (TRUE); - if (current_world_ptr->h_ver_extra > extra) return (FALSE); + if (current_world_ptr->h_ver_extra < extra) return TRUE; + if (current_world_ptr->h_ver_extra > extra) return FALSE; /* Identical versions */ - return (FALSE); + return FALSE; } @@ -160,19 +160,19 @@ static bool h_older_than(byte major, byte minor, byte patch, byte extra) static bool z_older_than(byte x, byte y, byte z) { /* Much older, or much more recent */ - if (current_world_ptr->z_major < x) return (TRUE); - if (current_world_ptr->z_major > x) return (FALSE); + if (current_world_ptr->z_major < x) return TRUE; + if (current_world_ptr->z_major > x) return FALSE; /* Distinctly older, or distinctly more recent */ - if (current_world_ptr->z_minor < y) return (TRUE); - if (current_world_ptr->z_minor > y) return (FALSE); + if (current_world_ptr->z_minor < y) return TRUE; + if (current_world_ptr->z_minor > y) return FALSE; /* Barely older, or barely more recent */ - if (current_world_ptr->z_patch < z) return (TRUE); - if (current_world_ptr->z_patch > z) return (FALSE); + if (current_world_ptr->z_patch < z) return TRUE; + if (current_world_ptr->z_patch > z) return FALSE; /* Identical versions */ - return (FALSE); + return FALSE; } diff --git a/src/main-win.c b/src/main-win.c index d40929314..1e04f3980 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -1038,26 +1038,26 @@ static bool check_file(concptr s) attrib = GetFileAttributes(path); /* Require valid filename */ - if (attrib == INVALID_FILE_NAME) return (FALSE); + if (attrib == INVALID_FILE_NAME) return FALSE; /* Prohibit directory */ - if (attrib & FILE_ATTRIBUTE_DIRECTORY) return (FALSE); + if (attrib & FILE_ATTRIBUTE_DIRECTORY) return FALSE; #else /* WIN32 */ /* Examine and verify */ - if (_dos_getfileattr(path, &attrib)) return (FALSE); + if (_dos_getfileattr(path, &attrib)) return FALSE; /* Prohibit something */ - if (attrib & FA_LABEL) return (FALSE); + if (attrib & FA_LABEL) return FALSE; /* Prohibit directory */ - if (attrib & FA_DIREC) return (FALSE); + if (attrib & FA_DIREC) return FALSE; #endif /* WIN32 */ /* Success */ - return (TRUE); + return TRUE; } @@ -1095,26 +1095,26 @@ static bool check_dir(concptr s) attrib = GetFileAttributes(path); /* Require valid filename */ - if (attrib == INVALID_FILE_NAME) return (FALSE); + if (attrib == INVALID_FILE_NAME) return FALSE; /* Require directory */ - if (!(attrib & FILE_ATTRIBUTE_DIRECTORY)) return (FALSE); + if (!(attrib & FILE_ATTRIBUTE_DIRECTORY)) return FALSE; #else /* WIN32 */ /* Examine and verify */ - if (_dos_getfileattr(path, &attrib)) return (FALSE); + if (_dos_getfileattr(path, &attrib)) return FALSE; /* Prohibit something */ - if (attrib & FA_LABEL) return (FALSE); + if (attrib & FA_LABEL) return FALSE; /* Require directory */ - if (!(attrib & FA_DIREC)) return (FALSE); + if (!(attrib & FA_DIREC)) return FALSE; #endif /* WIN32 */ /* Success */ - return (TRUE); + return TRUE; } @@ -1661,7 +1661,7 @@ static int new_palette(void) /* This makes no sense */ - if (!paletted) return (TRUE); + if (!paletted) return TRUE; /* No bitmap */ @@ -1689,7 +1689,7 @@ static int new_palette(void) rnfree(lppe, lppeSize); /* Fail */ - return (FALSE); + return FALSE; } } @@ -1768,7 +1768,7 @@ static int new_palette(void) hPal = hNewPal; /* Success */ - return (TRUE); + return TRUE; } @@ -1841,7 +1841,7 @@ static bool init_graphics(void) if (!ReadDIB(data[0].w, buf, &infGraph)) { plog_fmt(_("ビットマップ '%s' を読み込めません。", "Cannot read bitmap file '%s'"), name); - return (FALSE); + return FALSE; } /* Save the new sizes */ @@ -1861,7 +1861,7 @@ static bool init_graphics(void) if (!ReadDIB(data[0].w, buf, &infMask)) { plog_fmt("Cannot read bitmap file '%s'", buf); - return (FALSE); + return FALSE; } } if (arg_graphics == GRAPHICS_HENGBAND) @@ -1873,7 +1873,7 @@ static bool init_graphics(void) if (!ReadDIB(data[0].w, buf, &infMask)) { plog_fmt("Cannot read bitmap file '%s'", buf); - return (FALSE); + return FALSE; } } @@ -1883,7 +1883,7 @@ static bool init_graphics(void) /* Free bitmap */ plog(_("パレットを実現できません！", "Cannot activate palette!")); - return (FALSE); + return FALSE; } /* Graphics available */ diff --git a/src/mind.c b/src/mind.c index 1463d7088..00178a224 100644 --- a/src/mind.c +++ b/src/mind.c @@ -767,7 +767,7 @@ static bool_hack get_mind_power(player_type *caster_ptr, SPELL_IDX *sn, bool onl if (mind_ptr->info[*sn].min_lev <= plev) { /* Success */ - return (TRUE); + return TRUE; } } @@ -812,7 +812,7 @@ static bool_hack get_mind_power(player_type *caster_ptr, SPELL_IDX *sn, bool onl case '0': { if (!only_browse) screen_load(); - return (FALSE); + return FALSE; } case '8': @@ -1007,7 +1007,7 @@ static bool_hack get_mind_power(player_type *caster_ptr, SPELL_IDX *sn, bool onl handle_stuff(caster_ptr); /* Abort if needed */ - if (!flag) return (FALSE); + if (!flag) return FALSE; /* Save the choice */ (*sn) = i; @@ -1015,7 +1015,7 @@ static bool_hack get_mind_power(player_type *caster_ptr, SPELL_IDX *sn, bool onl repeat_push((COMMAND_CODE)i); /* Success */ - return (TRUE); + return TRUE; } /*! diff --git a/src/monster-process.c b/src/monster-process.c index ebd770593..26b511bf1 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -243,15 +243,15 @@ static bool mon_will_run(MONSTER_IDX m_idx) } /* Keep monsters from running too far away */ - if (m_ptr->cdis > MAX_SIGHT + 5) return (FALSE); + if (m_ptr->cdis > MAX_SIGHT + 5) return FALSE; /* All "afraid" monsters will run away */ - if (MON_MONFEAR(m_ptr)) return (TRUE); + if (MON_MONFEAR(m_ptr)) return TRUE; #ifdef ALLOW_TERROR /* Nearby monsters will not become terrified */ - if (m_ptr->cdis <= 5) return (FALSE); + if (m_ptr->cdis <= 5) return FALSE; /* Examine player power (level) */ p_lev = p_ptr->lev; @@ -260,8 +260,8 @@ static bool mon_will_run(MONSTER_IDX m_idx) m_lev = r_ptr->level + (m_idx & 0x08) + 25; /* Optimize extreme cases below */ - if (m_lev > p_lev + 4) return (FALSE); - if (m_lev + 4 <= p_lev) return (TRUE); + if (m_lev > p_lev + 4) return FALSE; + if (m_lev + 4 <= p_lev) return TRUE; /* Examine player health */ p_chp = p_ptr->chp; @@ -276,12 +276,12 @@ static bool mon_will_run(MONSTER_IDX m_idx) m_val = (m_lev * m_mhp) + (m_chp << 2); /* div m_mhp */ /* Strong players scare strong monsters */ - if (p_val * m_mhp > m_val * p_mhp) return (TRUE); + if (p_val * m_mhp > m_val * p_mhp) return TRUE; #endif /* Assume no terror */ - return (FALSE); + return FALSE; } @@ -310,7 +310,7 @@ static bool get_moves_aux2(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp) x1 = m_ptr->fx; /* Monster can already cast spell to player */ - if (projectable(p_ptr->current_floor_ptr, y1, x1, p_ptr->y, p_ptr->x)) return (FALSE); + if (projectable(p_ptr->current_floor_ptr, y1, x1, p_ptr->y, p_ptr->x)) return FALSE; /* Set current grid cost */ now_cost = p_ptr->current_floor_ptr->grid_array[y1][x1].cost; @@ -334,7 +334,7 @@ static bool get_moves_aux2(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp) if (!in_bounds2(p_ptr->current_floor_ptr, y, x)) continue; /* Simply move to player */ - if (player_bold(p_ptr, y, x)) return (FALSE); + if (player_bold(p_ptr, y, x)) return FALSE; g_ptr = &p_ptr->current_floor_ptr->grid_array[y][x]; @@ -363,10 +363,10 @@ static bool get_moves_aux2(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp) } /* No legal move (?) */ - if (best == 999) return (FALSE); + if (best == 999) return FALSE; /* Success */ - return (TRUE); + return TRUE; } @@ -415,22 +415,22 @@ static bool get_moves_aux(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp, bool no r_ptr->a_ability_flags2 & (RF6_ATTACK_MASK)) { /* Can move spell castable grid? */ - if (get_moves_aux2(m_idx, yp, xp)) return (TRUE); + if (get_moves_aux2(m_idx, yp, xp)) return TRUE; } /* Monster can't flow */ - if (no_flow) return (FALSE); + if (no_flow) return FALSE; /* Monster can go through rocks */ - if ((r_ptr->flags2 & RF2_PASS_WALL) && ((m_idx != p_ptr->riding) || p_ptr->pass_wall)) return (FALSE); - if ((r_ptr->flags2 & RF2_KILL_WALL) && (m_idx != p_ptr->riding)) return (FALSE); + if ((r_ptr->flags2 & RF2_PASS_WALL) && ((m_idx != p_ptr->riding) || p_ptr->pass_wall)) return FALSE; + if ((r_ptr->flags2 & RF2_KILL_WALL) && (m_idx != p_ptr->riding)) return FALSE; /* Monster location */ y1 = m_ptr->fy; x1 = m_ptr->fx; /* Hack -- Player can see us, run towards him */ - if (player_has_los_bold(p_ptr, y1, x1) && projectable(p_ptr->current_floor_ptr, p_ptr->y, p_ptr->x, y1, x1)) return (FALSE); + if (player_has_los_bold(p_ptr, y1, x1) && projectable(p_ptr->current_floor_ptr, p_ptr->y, p_ptr->x, y1, x1)) return FALSE; /* Monster grid */ g_ptr = &p_ptr->current_floor_ptr->grid_array[y1][x1]; @@ -445,7 +445,7 @@ static bool get_moves_aux(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp, bool no else if (g_ptr->when) { /* Too old smell */ - if (p_ptr->current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].when - g_ptr->when > 127) return (FALSE); + if (p_ptr->current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].when - g_ptr->when > 127) return FALSE; use_scent = TRUE; best = 0; @@ -454,7 +454,7 @@ static bool get_moves_aux(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp, bool no /* Otherwise, advance blindly */ else { - return (FALSE); + return FALSE; } /* Check nearby grids, diagonals first */ @@ -498,10 +498,10 @@ static bool get_moves_aux(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp, bool no } /* No legal move (?) */ - if (best == 999 || best == 0) return (FALSE); + if (best == 999 || best == 0) return FALSE; /* Success */ - return (TRUE); + return TRUE; } @@ -565,14 +565,14 @@ static bool get_fear_moves_aux(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp) } /* No legal move (?) */ - if (score == -1) return (FALSE); + if (score == -1) return FALSE; /* Find deltas */ (*yp) = fy - gy; (*xp) = fx - gx; /* Success */ - return (TRUE); + return TRUE; } /* @@ -777,12 +777,12 @@ static bool find_safety(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp) (*xp) = fx - gx; /* Found safe place */ - return (TRUE); + return TRUE; } } /* No safe place */ - return (FALSE); + return FALSE; } @@ -857,12 +857,12 @@ static bool find_hiding(MONSTER_IDX m_idx, POSITION *yp, POSITION *xp) (*xp) = fx - gx; /* Found good place */ - return (TRUE); + return TRUE; } } /* No good place */ - return (FALSE); + return FALSE; } @@ -1034,7 +1034,7 @@ static bool get_moves(MONSTER_IDX m_idx, DIRECTION *mm) /* Check for no move */ - if (!x && !y) return (FALSE); + if (!x && !y) return FALSE; /* Extract the "absolute distances" */ @@ -1195,7 +1195,7 @@ static bool get_moves(MONSTER_IDX m_idx, DIRECTION *mm) } /* Wants to move... */ - return (TRUE); + return TRUE; } diff --git a/src/monster-status.c b/src/monster-status.c index 9a395bc93..c34c7e986 100644 --- a/src/monster-status.c +++ b/src/monster-status.c @@ -804,7 +804,7 @@ bool set_monster_timewalk(player_type *target_ptr, int num, MONSTER_IDX who, boo { monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[hack_m_idx]; /* the world monster */ - if (current_world_ptr->timewalk_m_idx) return (FALSE); + if (current_world_ptr->timewalk_m_idx) return FALSE; if (vs_player) { @@ -1359,7 +1359,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note) (*fear) = FALSE; /* Monster is dead */ - return (TRUE); + return TRUE; } @@ -1401,7 +1401,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note) #endif /* Not dead yet */ - return (FALSE); + return FALSE; } bool monster_is_valid(monster_type *m_ptr) diff --git a/src/monster1.c b/src/monster1.c index 3abac8a67..938f8007e 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -81,11 +81,11 @@ static bool know_armour(MONRACE_IDX r_idx) bool known = (r_ptr->r_cast_spell == MAX_UCHAR)? TRUE: FALSE; - if (cheat_know || known) return (TRUE); - if (kills > 304 / (4 + level)) return (TRUE); - if (!(r_ptr->flags1 & RF1_UNIQUE)) return (FALSE); - if (kills > 304 / (38 + (5 * level) / 4)) return (TRUE); - return (FALSE); + if (cheat_know || known) return TRUE; + if (kills > 304 / (4 + level)) return TRUE; + if (!(r_ptr->flags1 & RF1_UNIQUE)) return FALSE; + if (kills > 304 / (38 + (5 * level) / 4)) return TRUE; + return FALSE; } @@ -115,12 +115,12 @@ static bool know_damage(MONRACE_IDX r_idx, int i) s32b d = d1 * d2; if (d >= ((4+level)*MAX_UCHAR)/80) d = ((4+level)*MAX_UCHAR-1)/80; - if ((4 + level) * a > 80 * d) return (TRUE); - if (!(r_ptr->flags1 & RF1_UNIQUE)) return (FALSE); - if ((4 + level) * (2 * a) > 80 * d) return (TRUE); + if ((4 + level) * a > 80 * d) return TRUE; + if (!(r_ptr->flags1 & RF1_UNIQUE)) return FALSE; + if ((4 + level) * (2 * a) > 80 * d) return TRUE; /* Assume false */ - return (FALSE); + return FALSE; } diff --git a/src/monster2.c b/src/monster2.c index f6eba9f0f..82b93a65a 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -2502,9 +2502,9 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I /* DO NOT PLACE A MONSTER IN THE SMALL SCALE WILDERNESS !!! */ if (p_ptr->wild_mode) return FALSE; - if (!in_bounds(p_ptr->current_floor_ptr, y, x)) return (FALSE); - if (!r_idx) return (FALSE); - if (!r_ptr->name) return (FALSE); + if (!in_bounds(p_ptr->current_floor_ptr, y, x)) return FALSE; + if (!r_idx) return FALSE; + if (!r_ptr->name) return FALSE; if (!(mode & PM_IGNORE_TERRAIN)) { @@ -2523,13 +2523,13 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I (r_ptr->cur_num >= r_ptr->max_num)) { /* Cannot create */ - return (FALSE); + return FALSE; } if ((r_ptr->flags7 & (RF7_UNIQUE2)) && (r_ptr->cur_num >= 1)) { - return (FALSE); + return FALSE; } if (r_idx == MON_BANORLUPART) @@ -2543,7 +2543,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I (!ironman_nightmare || (r_ptr->flags1 & (RF1_QUESTOR)))) { /* Cannot create */ - return (FALSE); + return FALSE; } } @@ -2600,7 +2600,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I hack_m_idx_ii = g_ptr->m_idx; /* Mega-Hack -- catch "failure" */ - if (!g_ptr->m_idx) return (FALSE); + if (!g_ptr->m_idx) return FALSE; /* Get a new monster record */ @@ -2853,7 +2853,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I } /* Success */ - return (TRUE); + return TRUE; } @@ -3027,7 +3027,7 @@ static bool place_monster_group(MONSTER_IDX who, POSITION y, POSITION x, MONRACE /* Success */ - return (TRUE); + return TRUE; } /*! @@ -3057,19 +3057,19 @@ static bool place_monster_can_escort(MONRACE_IDX r_idx) monster_race *z_ptr = &r_info[r_idx]; /* Hack - Escorts have to have the same dungeon flag */ - if (mon_hook_dungeon(place_monster_idx) != mon_hook_dungeon(r_idx)) return (FALSE); + if (mon_hook_dungeon(place_monster_idx) != mon_hook_dungeon(r_idx)) return FALSE; /* Require similar "race" */ - if (z_ptr->d_char != r_ptr->d_char) return (FALSE); + if (z_ptr->d_char != r_ptr->d_char) return FALSE; /* Skip more advanced monsters */ - if (z_ptr->level > r_ptr->level) return (FALSE); + if (z_ptr->level > r_ptr->level) return FALSE; /* Skip unique monsters */ - if (z_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (z_ptr->flags1 & RF1_UNIQUE) return FALSE; /* Paranoia -- Skip identical monsters */ - if (place_monster_idx == r_idx) return (FALSE); + if (place_monster_idx == r_idx) return FALSE; /* Skip different alignment */ if (monster_has_hostile_align(m_ptr, 0, 0, z_ptr)) return FALSE; @@ -3082,7 +3082,7 @@ static bool place_monster_can_escort(MONRACE_IDX r_idx) if ((r_ptr->flags7 & RF7_CHAMELEON) && !(z_ptr->flags7 & RF7_CHAMELEON)) return FALSE; - return (TRUE); + return TRUE; } @@ -3119,10 +3119,10 @@ bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_id mode |= PM_KAGE; /* Place one monster, or fail */ - if (!place_monster_one(who, y, x, r_idx, mode)) return (FALSE); + if (!place_monster_one(who, y, x, r_idx, mode)) return FALSE; /* Require the "group" flag */ - if (!(mode & PM_ALLOW_GROUP)) return (TRUE); + if (!(mode & PM_ALLOW_GROUP)) return TRUE; place_monster_m_idx = hack_m_idx_ii; @@ -3185,7 +3185,7 @@ bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_id } /* Success */ - return (TRUE); + return TRUE; } /*! @@ -3204,12 +3204,12 @@ bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode) r_idx = get_mon_num(p_ptr->current_floor_ptr->monster_level); /* Handle failure */ - if (!r_idx) return (FALSE); + if (!r_idx) return FALSE; /* Attempt to place the monster */ - if (place_monster_aux(0, y, x, r_idx, mode)) return (TRUE); + if (place_monster_aux(0, y, x, r_idx, mode)) return TRUE; - return (FALSE); + return FALSE; } /*! @@ -3234,7 +3234,7 @@ bool alloc_horde(POSITION y, POSITION x) r_idx = get_mon_num(p_ptr->current_floor_ptr->monster_level); /* Handle failure */ - if (!r_idx) return (FALSE); + if (!r_idx) return FALSE; r_ptr = &r_info[r_idx]; @@ -3359,7 +3359,7 @@ bool alloc_monster(POSITION dis, BIT_FLAGS mode) msg_print(_("警告！新たなモンスターを配置できません。小さい階ですか？", "Warning! Could not allocate a new monster. Small level?")); } - return (FALSE); + return FALSE; } @@ -3367,16 +3367,16 @@ bool alloc_monster(POSITION dis, BIT_FLAGS mode) { if (alloc_horde(y, x)) { - return (TRUE); + return TRUE; } } else { /* Attempt to place the monster, allow groups */ - if (place_monster(y, x, (mode | PM_ALLOW_GROUP))) return (TRUE); + if (place_monster(y, x, (mode | PM_ALLOW_GROUP))) return TRUE; } - return (FALSE); + return FALSE; } @@ -3391,7 +3391,7 @@ static bool summon_specific_okay(MONRACE_IDX r_idx) monster_type *m_ptr = &p_ptr->current_floor_ptr->m_list[summon_specific_who]; /* Hack - Only summon dungeon monsters */ - if (!mon_hook_dungeon(r_idx)) return (FALSE); + if (!mon_hook_dungeon(r_idx)) return FALSE; /* Hack -- identify the summoning monster */ if (summon_specific_who > 0) @@ -3415,7 +3415,7 @@ static bool summon_specific_okay(MONRACE_IDX r_idx) if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) return FALSE; /* Hack -- no specific type specified */ - if (!summon_specific_type) return (TRUE); + if (!summon_specific_type) return TRUE; if ((summon_specific_who < 0) && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) && @@ -3464,7 +3464,7 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t POSITION x, y; MONRACE_IDX r_idx; - if (p_ptr->current_floor_ptr->inside_arena) return (FALSE); + if (p_ptr->current_floor_ptr->inside_arena) return FALSE; if (!mon_scatter(0, &y, &x, y1, x1, 2)) return FALSE; @@ -3484,7 +3484,7 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t if (!r_idx) { summon_specific_type = 0; - return (FALSE); + return FALSE; } if ((type == SUMMON_BLUE_HORROR) || (type == SUMMON_DAWN)) mode |= PM_NO_KAGE; @@ -3493,13 +3493,13 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t if (!place_monster_aux(who, y, x, r_idx, mode)) { summon_specific_type = 0; - return (FALSE); + return FALSE; } summon_specific_type = 0; /* Success */ sound(SOUND_SUMMON); - return (TRUE); + return TRUE; } diff --git a/src/monsterrace-hook.c b/src/monsterrace-hook.c index a5a90252f..64be91d2d 100644 --- a/src/monsterrace-hook.c +++ b/src/monsterrace-hook.c @@ -374,11 +374,11 @@ bool vault_aux_simple(MONRACE_IDX r_idx) bool vault_aux_jelly(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE); - if (r_ptr->flags3 & (RF3_EVIL)) return (FALSE); - if (!my_strchr("ijm,", r_ptr->d_char)) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return FALSE; + if (r_ptr->flags3 & (RF3_EVIL)) return FALSE; + if (!my_strchr("ijm,", r_ptr->d_char)) return FALSE; + return TRUE; } /*! @@ -390,9 +390,9 @@ bool vault_aux_jelly(MONRACE_IDX r_idx) bool vault_aux_animal(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!(r_ptr->flags3 & (RF3_ANIMAL))) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!(r_ptr->flags3 & (RF3_ANIMAL))) return FALSE; + return TRUE; } @@ -405,9 +405,9 @@ bool vault_aux_animal(MONRACE_IDX r_idx) bool vault_aux_undead(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!(r_ptr->flags3 & (RF3_UNDEAD))) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!(r_ptr->flags3 & (RF3_UNDEAD))) return FALSE; + return TRUE; } /*! @@ -426,9 +426,9 @@ bool vault_aux_chapel_g(MONRACE_IDX r_idx) int i; monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (r_ptr->flags3 & (RF3_EVIL)) return (FALSE); - if ((r_idx == MON_A_GOLD) || (r_idx == MON_A_SILVER)) return (FALSE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (r_ptr->flags3 & (RF3_EVIL)) return FALSE; + if ((r_idx == MON_A_GOLD) || (r_idx == MON_A_SILVER)) return FALSE; if (r_ptr->d_char == 'A') return TRUE; for (i = 0; chapel_list[i]; i++) if (r_idx == chapel_list[i]) return TRUE; @@ -444,9 +444,9 @@ bool vault_aux_chapel_g(MONRACE_IDX r_idx) bool vault_aux_kennel(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!my_strchr("CZ", r_ptr->d_char)) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!my_strchr("CZ", r_ptr->d_char)) return FALSE; + return TRUE; } /*! @@ -458,9 +458,9 @@ bool vault_aux_kennel(MONRACE_IDX r_idx) bool vault_aux_mimic(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!my_strchr("!$&(/=?[\\|", r_ptr->d_char)) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!my_strchr("!$&(/=?[\\|", r_ptr->d_char)) return FALSE; + return TRUE; } /*! @@ -471,7 +471,7 @@ bool vault_aux_mimic(MONRACE_IDX r_idx) */ bool vault_aux_clone(MONRACE_IDX r_idx) { - if (!vault_monster_okay(r_idx)) return (FALSE); + if (!vault_monster_okay(r_idx)) return FALSE; return (r_idx == vault_aux_race); } @@ -485,11 +485,11 @@ bool vault_aux_clone(MONRACE_IDX r_idx) bool vault_aux_symbol_e(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE); - if (r_ptr->flags3 & (RF3_GOOD)) return (FALSE); - if (r_ptr->d_char != vault_aux_char) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return FALSE; + if (r_ptr->flags3 & (RF3_GOOD)) return FALSE; + if (r_ptr->d_char != vault_aux_char) return FALSE; + return TRUE; } @@ -502,11 +502,11 @@ bool vault_aux_symbol_e(MONRACE_IDX r_idx) bool vault_aux_symbol_g(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE); - if (r_ptr->flags3 & (RF3_EVIL)) return (FALSE); - if (r_ptr->d_char != vault_aux_char) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return FALSE; + if (r_ptr->flags3 & (RF3_EVIL)) return FALSE; + if (r_ptr->d_char != vault_aux_char) return FALSE; + return TRUE; } @@ -519,10 +519,10 @@ bool vault_aux_symbol_g(MONRACE_IDX r_idx) bool vault_aux_orc(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!(r_ptr->flags3 & RF3_ORC)) return (FALSE); - if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!(r_ptr->flags3 & RF3_ORC)) return FALSE; + if (r_ptr->flags3 & RF3_UNDEAD) return FALSE; + return TRUE; } @@ -535,10 +535,10 @@ bool vault_aux_orc(MONRACE_IDX r_idx) bool vault_aux_troll(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!(r_ptr->flags3 & RF3_TROLL)) return (FALSE); - if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!(r_ptr->flags3 & RF3_TROLL)) return FALSE; + if (r_ptr->flags3 & RF3_UNDEAD) return FALSE; + return TRUE; } @@ -551,11 +551,11 @@ bool vault_aux_troll(MONRACE_IDX r_idx) bool vault_aux_giant(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!(r_ptr->flags3 & RF3_GIANT)) return (FALSE); - if (r_ptr->flags3 & RF3_GOOD) return (FALSE); - if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!(r_ptr->flags3 & RF3_GIANT)) return FALSE; + if (r_ptr->flags3 & RF3_GOOD) return FALSE; + if (r_ptr->flags3 & RF3_UNDEAD) return FALSE; + return TRUE; } @@ -568,11 +568,11 @@ bool vault_aux_giant(MONRACE_IDX r_idx) bool vault_aux_dragon(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if (!(r_ptr->flags3 & RF3_DRAGON)) return (FALSE); - if (r_ptr->flags4 != vault_aux_dragon_mask4) return (FALSE); - if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if (!(r_ptr->flags3 & RF3_DRAGON)) return FALSE; + if (r_ptr->flags4 != vault_aux_dragon_mask4) return FALSE; + if (r_ptr->flags3 & RF3_UNDEAD) return FALSE; + return TRUE; } @@ -585,10 +585,10 @@ bool vault_aux_dragon(MONRACE_IDX r_idx) bool vault_aux_demon(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE); - if (!(r_ptr->flags3 & RF3_DEMON)) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return FALSE; + if (!(r_ptr->flags3 & RF3_DEMON)) return FALSE; + return TRUE; } @@ -601,10 +601,10 @@ bool vault_aux_demon(MONRACE_IDX r_idx) bool vault_aux_cthulhu(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); - if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return (FALSE); - if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return (FALSE); - return (TRUE); + if (!vault_monster_okay(r_idx)) return FALSE; + if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) return FALSE; + if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return FALSE; + return TRUE; } /*! @@ -698,13 +698,13 @@ bool get_nightmare(MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Require eldritch horrors */ - if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return (FALSE); + if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return FALSE; /* Require high level */ - if (r_ptr->level <= p_ptr->lev) return (FALSE); + if (r_ptr->level <= p_ptr->lev) return FALSE; /* Accept this monster */ - return (TRUE); + return TRUE; } /*! @@ -740,23 +740,23 @@ bool monster_can_entry_arena(MONRACE_IDX r_idx) /* if (!mon_hook_dungeon(r_idx)) return FALSE; */ /* Decline unique monsters */ -/* if (r_ptr->flags1 & (RF1_UNIQUE)) return (FALSE); */ -/* if (r_ptr->flags7 & (RF7_NAZGUL)) return (FALSE); */ +/* if (r_ptr->flags1 & (RF1_UNIQUE)) return FALSE; */ +/* if (r_ptr->flags7 & (RF7_NAZGUL)) return FALSE; */ - if (r_ptr->flags1 & (RF1_NEVER_MOVE)) return (FALSE); - if (r_ptr->flags2 & (RF2_MULTIPLY)) return (FALSE); - if (r_ptr->flags2 & (RF2_QUANTUM)) return (FALSE); - if (r_ptr->flags7 & (RF7_AQUATIC)) return (FALSE); - if (r_ptr->flags7 & (RF7_CHAMELEON)) return (FALSE); + if (r_ptr->flags1 & (RF1_NEVER_MOVE)) return FALSE; + if (r_ptr->flags2 & (RF2_MULTIPLY)) return FALSE; + if (r_ptr->flags2 & (RF2_QUANTUM)) return FALSE; + if (r_ptr->flags7 & (RF7_AQUATIC)) return FALSE; + if (r_ptr->flags7 & (RF7_CHAMELEON)) return FALSE; for (i = 0; i < 4; i++) { - if (r_ptr->blow[i].method == RBM_EXPLODE) return (FALSE); + if (r_ptr->blow[i].method == RBM_EXPLODE) return FALSE; if (r_ptr->blow[i].effect != RBE_DR_MANA) dam += r_ptr->blow[i].d_dice; } - if (!dam && !(r_ptr->flags4 & (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_BREATH_MASK)) && !(r_ptr->a_ability_flags1 & (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_BREATH_MASK)) && !(r_ptr->a_ability_flags2 & (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_BREATH_MASK))) return (FALSE); + if (!dam && !(r_ptr->flags4 & (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_BREATH_MASK)) && !(r_ptr->a_ability_flags1 & (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_BREATH_MASK)) && !(r_ptr->a_ability_flags2 & (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_BREATH_MASK))) return FALSE; - return (TRUE); + return TRUE; } /*! @@ -769,13 +769,13 @@ bool item_monster_okay(MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; /* No uniques */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); - if (r_ptr->flags7 & RF7_KAGE) return (FALSE); - if (r_ptr->flagsr & RFR_RES_ALL) return (FALSE); - if (r_ptr->flags7 & RF7_NAZGUL) return (FALSE); - if (r_ptr->flags1 & RF1_FORCE_DEPTH) return (FALSE); - if (r_ptr->flags7 & RF7_UNIQUE2) return (FALSE); - - return (TRUE); + if (r_ptr->flags1 & RF1_UNIQUE) return FALSE; + if (r_ptr->flags7 & RF7_KAGE) return FALSE; + if (r_ptr->flagsr & RFR_RES_ALL) return FALSE; + if (r_ptr->flags7 & RF7_NAZGUL) return FALSE; + if (r_ptr->flags1 & RF1_FORCE_DEPTH) return FALSE; + if (r_ptr->flags7 & RF7_UNIQUE2) return FALSE; + + return TRUE; } diff --git a/src/mspells1.c b/src/mspells1.c index a3a5da2ca..3f3b2afcd 100644 --- a/src/mspells1.c +++ b/src/mspells1.c @@ -398,7 +398,7 @@ bool summon_possible(POSITION y1, POSITION x1) if (pattern_tile(y, x)) continue; /* Require empty floor grid in line of projection */ - if (cave_empty_bold(p_ptr->current_floor_ptr, y, x) && projectable(p_ptr->current_floor_ptr, y1, x1, y, x) && projectable(p_ptr->current_floor_ptr, y, x, y1, x1)) return (TRUE); + if (cave_empty_bold(p_ptr->current_floor_ptr, y, x) && projectable(p_ptr->current_floor_ptr, y1, x1, y, x) && projectable(p_ptr->current_floor_ptr, y, x, y1, x1)) return TRUE; } } @@ -481,14 +481,14 @@ bool clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_frie grid_n = project_path(p_ptr->current_floor_ptr, grid_g, MAX_RANGE, y1, x1, y2, x2, 0); /* No grid is ever projectable from itself */ - if (!grid_n) return (FALSE); + if (!grid_n) return FALSE; /* Final grid */ y = GRID_Y(grid_g[grid_n-1]); x = GRID_X(grid_g[grid_n-1]); /* May not end in an unrequested grid */ - if ((y != y2) || (x != x2)) return (FALSE); + if ((y != y2) || (x != x2)) return FALSE; for (i = 0; i < grid_n; i++) { @@ -500,17 +500,17 @@ bool clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_frie monster_type *m_ptr = &p_ptr->current_floor_ptr->m_list[p_ptr->current_floor_ptr->grid_array[y][x].m_idx]; if (is_friend == is_pet(m_ptr)) { - return (FALSE); + return FALSE; } } /* Pets may not shoot through the character - TNB */ if (player_bold(p_ptr, y, x)) { - if (is_friend) return (FALSE); + if (is_friend) return FALSE; } } - return (TRUE); + return TRUE; } /*! @@ -646,22 +646,22 @@ void breath(POSITION y, POSITION x, MONSTER_IDX m_idx, EFFECT_ID typ, int dam_hp static bool spell_attack(byte spell) { /* All RF4 spells hurt (except for shriek and dispel) */ - if (spell < 128 && spell > 98) return (TRUE); + if (spell < 128 && spell > 98) return TRUE; /* Various "ball" spells */ - if (spell >= 128 && spell <= 128 + 8) return (TRUE); + if (spell >= 128 && spell <= 128 + 8) return TRUE; /* "Cause wounds" and "bolt" spells */ - if (spell >= 128 + 12 && spell < 128 + 27) return (TRUE); + if (spell >= 128 + 12 && spell < 128 + 27) return TRUE; /* Hand of Doom */ - if (spell == 160 + 1) return (TRUE); + if (spell == 160 + 1) return TRUE; /* Psycho-Spear */ - if (spell == 160 + 11) return (TRUE); + if (spell == 160 + 11) return TRUE; /* Doesn't hurt */ - return (FALSE); + return FALSE; } @@ -674,13 +674,13 @@ static bool spell_attack(byte spell) static bool spell_escape(byte spell) { /* Blink or Teleport */ - if (spell == 160 + 4 || spell == 160 + 5) return (TRUE); + if (spell == 160 + 4 || spell == 160 + 5) return TRUE; /* Teleport the player away */ - if (spell == 160 + 9 || spell == 160 + 10) return (TRUE); + if (spell == 160 + 9 || spell == 160 + 10) return TRUE; /* Isn't good for escaping */ - return (FALSE); + return FALSE; } /*! @@ -692,25 +692,25 @@ static bool spell_escape(byte spell) static bool spell_annoy(byte spell) { /* Shriek */ - if (spell == 96 + 0) return (TRUE); + if (spell == 96 + 0) return TRUE; /* Brain smash, et al (added curses) */ - if (spell >= 128 + 9 && spell <= 128 + 14) return (TRUE); + if (spell >= 128 + 9 && spell <= 128 + 14) return TRUE; /* Scare, confuse, blind, slow, paralyze */ - if (spell >= 128 + 27 && spell <= 128 + 31) return (TRUE); + if (spell >= 128 + 27 && spell <= 128 + 31) return TRUE; /* Teleport to */ - if (spell == 160 + 8) return (TRUE); + if (spell == 160 + 8) return TRUE; /* Teleport level */ - if (spell == 160 + 10) return (TRUE); + if (spell == 160 + 10) return TRUE; /* Darkness, make traps, cause amnesia */ - if (spell >= 160 + 12 && spell <= 160 + 14) return (TRUE); + if (spell >= 160 + 12 && spell <= 160 + 14) return TRUE; /* Doesn't annoy */ - return (FALSE); + return FALSE; } /*! @@ -722,10 +722,10 @@ static bool spell_annoy(byte spell) static bool spell_summon(byte spell) { /* All summon spells */ - if (spell >= 160 + 16) return (TRUE); + if (spell >= 160 + 16) return TRUE; /* Doesn't summon */ - return (FALSE); + return FALSE; } @@ -738,10 +738,10 @@ static bool spell_summon(byte spell) static bool spell_raise(byte spell) { /* All raise-dead spells */ - if (spell == 160 + 15) return (TRUE); + if (spell == 160 + 15) return TRUE; /* Doesn't summon */ - return (FALSE); + return FALSE; } /*! @@ -753,10 +753,10 @@ static bool spell_raise(byte spell) static bool spell_tactic(byte spell) { /* Blink */ - if (spell == 160 + 4) return (TRUE); + if (spell == 160 + 4) return TRUE; /* Not good */ - return (FALSE); + return FALSE; } /*! @@ -768,10 +768,10 @@ static bool spell_tactic(byte spell) static bool spell_invulner(byte spell) { /* Invulnerability */ - if (spell == 160 + 3) return (TRUE); + if (spell == 160 + 3) return TRUE; /* No invulnerability */ - return (FALSE); + return FALSE; } /*! @@ -783,10 +783,10 @@ static bool spell_invulner(byte spell) static bool spell_haste(byte spell) { /* Haste self */ - if (spell == 160 + 0) return (TRUE); + if (spell == 160 + 0) return TRUE; /* Not a haste spell */ - return (FALSE); + return FALSE; } @@ -798,8 +798,8 @@ static bool spell_haste(byte spell) */ static bool spell_world(byte spell) { - if (spell == 160 + 6) return (TRUE); - return (FALSE); + if (spell == 160 + 6) return TRUE; + return FALSE; } @@ -812,8 +812,8 @@ static bool spell_world(byte spell) static bool spell_special(byte spell) { if (p_ptr->phase_out) return FALSE; - if (spell == 160 + 7) return (TRUE); - return (FALSE); + if (spell == 160 + 7) return TRUE; + return FALSE; } @@ -826,10 +826,10 @@ static bool spell_special(byte spell) static bool spell_psy_spe(byte spell) { /* world */ - if (spell == 160 + 11) return (TRUE); + if (spell == 160 + 11) return TRUE; /* Not a haste spell */ - return (FALSE); + return FALSE; } @@ -842,10 +842,10 @@ static bool spell_psy_spe(byte spell) static bool spell_heal(byte spell) { /* Heal */ - if (spell == 160 + 2) return (TRUE); + if (spell == 160 + 2) return TRUE; /* No healing */ - return (FALSE); + return FALSE; } @@ -858,10 +858,10 @@ static bool spell_heal(byte spell) static bool spell_dispel(byte spell) { /* Dispel */ - if (spell == 96 + 2) return (TRUE); + if (spell == 96 + 2) return TRUE; /* No dispel */ - return (FALSE); + return FALSE; } @@ -877,94 +877,94 @@ bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx) monster_race *r_ptr = &r_info[m_ptr->r_idx]; /* Invulnabilty (including the song) */ - if (IS_INVULN(creature_ptr)) return (TRUE); + if (IS_INVULN(creature_ptr)) return TRUE; /* Wraith form */ - if (creature_ptr->wraith_form) return (TRUE); + if (creature_ptr->wraith_form) return TRUE; /* Shield */ - if (creature_ptr->shield) return (TRUE); + if (creature_ptr->shield) return TRUE; /* Magic defence */ - if (creature_ptr->magicdef) return (TRUE); + if (creature_ptr->magicdef) return TRUE; /* Multi Shadow */ - if (creature_ptr->multishadow) return (TRUE); + if (creature_ptr->multishadow) return TRUE; /* Robe of dust */ - if (creature_ptr->dustrobe) return (TRUE); + if (creature_ptr->dustrobe) return TRUE; /* Berserk Strength */ - if (creature_ptr->shero && (creature_ptr->pclass != CLASS_BERSERKER)) return (TRUE); + if (creature_ptr->shero && (creature_ptr->pclass != CLASS_BERSERKER)) return TRUE; /* Demon Lord */ - if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) return (TRUE); + if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) return TRUE; /* Elemental resistances */ if (r_ptr->flags4 & RF4_BR_ACID) { - if (!creature_ptr->immune_acid && (creature_ptr->oppose_acid || music_singing(creature_ptr, MUSIC_RESIST))) return (TRUE); - if (creature_ptr->special_defense & DEFENSE_ACID) return (TRUE); + if (!creature_ptr->immune_acid && (creature_ptr->oppose_acid || music_singing(creature_ptr, MUSIC_RESIST))) return TRUE; + if (creature_ptr->special_defense & DEFENSE_ACID) return TRUE; } if (r_ptr->flags4 & RF4_BR_FIRE) { if (!((creature_ptr->prace == RACE_DEMON) && creature_ptr->lev > 44)) { - if (!creature_ptr->immune_fire && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST))) return (TRUE); - if (creature_ptr->special_defense & DEFENSE_FIRE) return (TRUE); + if (!creature_ptr->immune_fire && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST))) return TRUE; + if (creature_ptr->special_defense & DEFENSE_FIRE) return TRUE; } } if (r_ptr->flags4 & RF4_BR_ELEC) { - if (!creature_ptr->immune_elec && (creature_ptr->oppose_elec || music_singing(creature_ptr, MUSIC_RESIST))) return (TRUE); - if (creature_ptr->special_defense & DEFENSE_ELEC) return (TRUE); + if (!creature_ptr->immune_elec && (creature_ptr->oppose_elec || music_singing(creature_ptr, MUSIC_RESIST))) return TRUE; + if (creature_ptr->special_defense & DEFENSE_ELEC) return TRUE; } if (r_ptr->flags4 & RF4_BR_COLD) { - if (!creature_ptr->immune_cold && (creature_ptr->oppose_cold || music_singing(creature_ptr, MUSIC_RESIST))) return (TRUE); - if (creature_ptr->special_defense & DEFENSE_COLD) return (TRUE); + if (!creature_ptr->immune_cold && (creature_ptr->oppose_cold || music_singing(creature_ptr, MUSIC_RESIST))) return TRUE; + if (creature_ptr->special_defense & DEFENSE_COLD) return TRUE; } if (r_ptr->flags4 & (RF4_BR_POIS | RF4_BR_NUKE)) { if (!((creature_ptr->pclass == CLASS_NINJA) && creature_ptr->lev > 44)) { - if (creature_ptr->oppose_pois || music_singing(creature_ptr, MUSIC_RESIST)) return (TRUE); - if (creature_ptr->special_defense & DEFENSE_POIS) return (TRUE); + if (creature_ptr->oppose_pois || music_singing(creature_ptr, MUSIC_RESIST)) return TRUE; + if (creature_ptr->special_defense & DEFENSE_POIS) return TRUE; } } /* Ultimate resistance */ - if (creature_ptr->ult_res) return (TRUE); + if (creature_ptr->ult_res) return TRUE; /* Potion of Neo Tsuyosi special */ - if (creature_ptr->tsuyoshi) return (TRUE); + if (creature_ptr->tsuyoshi) return TRUE; /* Elemental Brands */ - if ((creature_ptr->special_attack & ATTACK_ACID) && !(r_ptr->flagsr & RFR_EFF_IM_ACID_MASK)) return (TRUE); - if ((creature_ptr->special_attack & ATTACK_FIRE) && !(r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)) return (TRUE); - if ((creature_ptr->special_attack & ATTACK_ELEC) && !(r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK)) return (TRUE); - if ((creature_ptr->special_attack & ATTACK_COLD) && !(r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)) return (TRUE); - if ((creature_ptr->special_attack & ATTACK_POIS) && !(r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)) return (TRUE); + if ((creature_ptr->special_attack & ATTACK_ACID) && !(r_ptr->flagsr & RFR_EFF_IM_ACID_MASK)) return TRUE; + if ((creature_ptr->special_attack & ATTACK_FIRE) && !(r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)) return TRUE; + if ((creature_ptr->special_attack & ATTACK_ELEC) && !(r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK)) return TRUE; + if ((creature_ptr->special_attack & ATTACK_COLD) && !(r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)) return TRUE; + if ((creature_ptr->special_attack & ATTACK_POIS) && !(r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)) return TRUE; if (creature_ptr->pspeed < 145) { - if (IS_FAST(creature_ptr)) return (TRUE); + if (IS_FAST(creature_ptr)) return TRUE; } /* Light speed */ - if (creature_ptr->lightspeed && (m_ptr->mspeed < 136)) return (TRUE); + if (creature_ptr->lightspeed && (m_ptr->mspeed < 136)) return TRUE; if (creature_ptr->riding && (creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].mspeed < 135)) { - if (MON_FAST(&creature_ptr->current_floor_ptr->m_list[creature_ptr->riding])) return (TRUE); + if (MON_FAST(&creature_ptr->current_floor_ptr->m_list[creature_ptr->riding])) return TRUE; } /* No need to cast dispel spell */ - return (FALSE); + return FALSE; } @@ -1393,12 +1393,12 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) if (MON_CONFUSED(m_ptr)) { reset_target(m_ptr); - return (FALSE); + return FALSE; } /* Cannot cast spells when nice */ - if (m_ptr->mflag & MFLAG_NICE) return (FALSE); - if (!is_hostile(m_ptr)) return (FALSE); + if (m_ptr->mflag & MFLAG_NICE) return FALSE; + if (!is_hostile(m_ptr)) return FALSE; /* Sometimes forbid inate attacks (breaths) */ @@ -1415,7 +1415,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) /*** require projectable player ***/ /* Check range */ - if ((m_ptr->cdis > MAX_RANGE) && !m_ptr->target_y) return (FALSE); + if ((m_ptr->cdis > MAX_RANGE) && !m_ptr->target_y) return FALSE; /* Check path for lite breath */ if (f4 & RF4_BR_LITE) @@ -1572,7 +1572,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) } /* No spells left */ - if (!f4 && !f5 && !f6) return (FALSE); + if (!f4 && !f5 && !f6) return FALSE; /* Remove the "ineffective" spells */ remove_bad_spells(m_idx, target_ptr, &f4, &f5, &f6); @@ -1587,7 +1587,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) } /* No spells left */ - if (!f4 && !f5 && !f6) return (FALSE); + if (!f4 && !f5 && !f6) return FALSE; if (!(r_ptr->flags2 & RF2_STUPID)) { @@ -1634,7 +1634,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) } /* No spells left */ - if (!f4 && !f5 && !f6) return (FALSE); + if (!f4 && !f5 && !f6) return FALSE; } /* Extract the "inate" spells */ @@ -1656,13 +1656,13 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) } /* No spells left */ - if (!num) return (FALSE); + if (!num) return FALSE; /* Stop if player is dead or gone */ - if (!target_ptr->playing || target_ptr->is_dead) return (FALSE); + if (!target_ptr->playing || target_ptr->is_dead) return FALSE; /* Stop if player is leaving */ - if (target_ptr->leaving) return (FALSE); + if (target_ptr->leaving) return FALSE; /* Get the monster name (or "it") */ monster_desc(m_name, m_ptr, 0x00); @@ -1702,7 +1702,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) } /* Abort if no spell was chosen */ - if (!thrown_spell) return (FALSE); + if (!thrown_spell) return FALSE; /* Calculate spell failure rate */ failrate = 25 - (rlev + 3) / 4; @@ -1717,14 +1717,14 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) disturb(target_ptr, TRUE, TRUE); msg_format(_("%^sは呪文を唱えようとしたが失敗した。", "%^s tries to cast a spell, but fails."), m_name); - return (TRUE); + return TRUE; } /* Hex: Anti Magic Barrier */ if (!spell_is_inate(thrown_spell) && magic_barrier(p_ptr, m_idx)) { msg_format(_("反魔法バリアが%^sの呪文をかき消した。", "Anti magic barrier cancels the spell which %^s casts."), m_name); - return (TRUE); + return TRUE; } /* Projectable? */ @@ -1767,7 +1767,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) case 160 + 11: /* RF6_PSY_SPEAR */ case 160 + 12: /* RF6_DARKNESS */ case 160 + 14: /* RF6_FORGET */ - return (FALSE); + return FALSE; } } @@ -1836,5 +1836,5 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) } /* A spell was cast */ - return (TRUE); + return TRUE; } diff --git a/src/mspells2.c b/src/mspells2.c index 2a1fb6746..3323c0976 100644 --- a/src/mspells2.c +++ b/src/mspells2.c @@ -54,7 +54,7 @@ static bool direct_beam(POSITION y1, POSITION x1, POSITION y2, POSITION x2, mons grid_n = project_path(p_ptr->current_floor_ptr, grid_g, MAX_RANGE, y1, x1, y2, x2, PROJECT_THRU); /* No grid is ever projectable from itself */ - if (!grid_n) return (FALSE); + if (!grid_n) return FALSE; for (i = 0; i < grid_n; i++) { @@ -310,7 +310,7 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx) bool can_remember; /* Cannot cast spells when confused */ - if (MON_CONFUSED(m_ptr)) return (FALSE); + if (MON_CONFUSED(m_ptr)) return FALSE; /* Extract the racial spell flags */ f4 = r_ptr->flags4; @@ -672,13 +672,13 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx) } /* No spells left */ - if (!num) return (FALSE); + if (!num) return FALSE; /* Stop if player is dead or gone */ - if (!target_ptr->playing || target_ptr->is_dead) return (FALSE); + if (!target_ptr->playing || target_ptr->is_dead) return FALSE; /* Handle "leaving" */ - if (target_ptr->leaving) return (FALSE); + if (target_ptr->leaving) return FALSE; /* Get the monster name (or "it") */ monster_desc(m_name, m_ptr, 0x00); @@ -703,7 +703,7 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx) if (see_m) msg_format(_("%^sは呪文を唱えようとしたが失敗した。", "%^s tries to cast a spell, but fails."), m_name); - return (TRUE); + return TRUE; } /* Hex: Anti Magic Barrier */ @@ -711,7 +711,7 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx) { if (see_m) msg_format(_("反魔法バリアが%^sの呪文をかき消した。", "Anti magic barrier cancels the spell which %^s casts."), m_name); - return (TRUE); + return TRUE; } can_remember = is_original_ap_and_seen(m_ptr); diff --git a/src/mspells3.c b/src/mspells3.c index 4d0afd27a..b6e2c3c7f 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -592,7 +592,7 @@ static bool get_learned_power(player_type *caster_ptr, SPELL_IDX *sn) if (i == num) { msg_print(_("その種類の魔法は覚えていない！", "You don't know any spell of this type.")); - return (FALSE); + return FALSE; } /* Build a prompt (accept all spells) */ @@ -614,7 +614,7 @@ static bool get_learned_power(player_type *caster_ptr, SPELL_IDX *sn) case '0': { screen_load(); - return (FALSE); + return FALSE; } case '8': @@ -806,7 +806,7 @@ static bool get_learned_power(player_type *caster_ptr, SPELL_IDX *sn) handle_stuff(caster_ptr); /* Abort if needed */ - if (!flag) return (FALSE); + if (!flag) return FALSE; /* Save the choice */ (*sn) = spellnum[i]; diff --git a/src/mspells4.c b/src/mspells4.c index f3a3759dd..7786b3340 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -1928,7 +1928,7 @@ HIT_POINT spell_RF6_WORLD(player_type *target_ptr, MONSTER_IDX m_idx) disturb(target_ptr, TRUE, TRUE); if (m_ptr->r_idx == MON_DIO) who = 1; else if (m_ptr->r_idx == MON_WONG) who = 3; - if (!set_monster_timewalk(target_ptr, randint1(2) + 2, who, TRUE)) return (FALSE); + if (!set_monster_timewalk(target_ptr, randint1(2) + 2, who, TRUE)) return FALSE; return who; } diff --git a/src/object-broken.c b/src/object-broken.c index 7ce57c8f3..b606ca677 100644 --- a/src/object-broken.c +++ b/src/object-broken.c @@ -34,20 +34,20 @@ bool hates_acid(object_type *o_ptr) case TV_HARD_ARMOR: case TV_DRAG_ARMOR: { - return (TRUE); + return TRUE; } /* Staffs/Scrolls are wood/paper */ case TV_STAFF: case TV_SCROLL: { - return (TRUE); + return TRUE; } /* Ouch */ case TV_CHEST: { - return (TRUE); + return TRUE; } /* Junk is useless */ @@ -55,11 +55,11 @@ bool hates_acid(object_type *o_ptr) case TV_BOTTLE: case TV_JUNK: { - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } @@ -76,11 +76,11 @@ bool hates_elec(object_type *o_ptr) case TV_RING: case TV_WAND: { - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } @@ -109,7 +109,7 @@ bool hates_fire(object_type *o_ptr) case TV_CLOAK: case TV_SOFT_ARMOR: { - return (TRUE); + return TRUE; } /* Books */ @@ -127,24 +127,24 @@ bool hates_fire(object_type *o_ptr) case TV_HISSATSU_BOOK: case TV_HEX_BOOK: { - return (TRUE); + return TRUE; } /* Chests */ case TV_CHEST: { - return (TRUE); + return TRUE; } /* Staffs/Scrolls burn */ case TV_STAFF: case TV_SCROLL: { - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } @@ -162,11 +162,11 @@ bool hates_cold(object_type *o_ptr) case TV_FLASK: case TV_BOTTLE: { - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } @@ -181,10 +181,10 @@ bool hates_cold(object_type *o_ptr) int set_acid_destroy(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; - if (!hates_acid(o_ptr)) return (FALSE); + if (!hates_acid(o_ptr)) return FALSE; object_flags(o_ptr, flgs); - if (have_flag(flgs, TR_IGNORE_ACID)) return (FALSE); - return (TRUE); + if (have_flag(flgs, TR_IGNORE_ACID)) return FALSE; + return TRUE; } @@ -198,10 +198,10 @@ int set_acid_destroy(object_type *o_ptr) int set_elec_destroy(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; - if (!hates_elec(o_ptr)) return (FALSE); + if (!hates_elec(o_ptr)) return FALSE; object_flags(o_ptr, flgs); - if (have_flag(flgs, TR_IGNORE_ELEC)) return (FALSE); - return (TRUE); + if (have_flag(flgs, TR_IGNORE_ELEC)) return FALSE; + return TRUE; } @@ -215,10 +215,10 @@ int set_elec_destroy(object_type *o_ptr) int set_fire_destroy(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; - if (!hates_fire(o_ptr)) return (FALSE); + if (!hates_fire(o_ptr)) return FALSE; object_flags(o_ptr, flgs); - if (have_flag(flgs, TR_IGNORE_FIRE)) return (FALSE); - return (TRUE); + if (have_flag(flgs, TR_IGNORE_FIRE)) return FALSE; + return TRUE; } @@ -232,10 +232,10 @@ int set_fire_destroy(object_type *o_ptr) int set_cold_destroy(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; - if (!hates_cold(o_ptr)) return (FALSE); + if (!hates_cold(o_ptr)) return FALSE; object_flags(o_ptr, flgs); - if (have_flag(flgs, TR_IGNORE_COLD)) return (FALSE); - return (TRUE); + if (have_flag(flgs, TR_IGNORE_COLD)) return FALSE; + return TRUE; } /*! diff --git a/src/object-flavor.c b/src/object-flavor.c index 7dc3dcc62..318955161 100644 --- a/src/object-flavor.c +++ b/src/object-flavor.c @@ -89,7 +89,7 @@ static bool object_easy_know(int i) case TV_HISSATSU_BOOK: case TV_HEX_BOOK: { - return (TRUE); + return TRUE; } /* Simple items */ @@ -100,7 +100,7 @@ static bool object_easy_know(int i) case TV_SPIKE: case TV_WHISTLE: { - return (TRUE); + return TRUE; } /* All Food, Potions, Scrolls, Rods */ @@ -109,11 +109,11 @@ static bool object_easy_know(int i) case TV_SCROLL: case TV_ROD: { - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } /*! @@ -1039,11 +1039,11 @@ static bool have_flag_of(flag_insc_table *fi_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]) { if (have_flag(flgs, fi_ptr->flag) && (fi_ptr->except_flag == -1 || !have_flag(flgs, fi_ptr->except_flag))) - return (TRUE); + return TRUE; fi_ptr++; } - return (FALSE); + return FALSE; } /*! diff --git a/src/object-hook.c b/src/object-hook.c index 4d8c5e9af..2d34f9df6 100644 --- a/src/object-hook.c +++ b/src/object-hook.c @@ -23,7 +23,7 @@ bool item_tester_hook_convertible(object_type *o_ptr) { if ((o_ptr->tval == TV_JUNK) || (o_ptr->tval == TV_SKELETON)) return TRUE; if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_SKELETON)) return TRUE; - return (FALSE); + return FALSE; } /*! @@ -39,15 +39,15 @@ bool item_tester_hook_orthodox_melee_weapons(object_type *o_ptr) case TV_POLEARM: case TV_DIGGING: { - return (TRUE); + return TRUE; } case TV_SWORD: { - if (o_ptr->sval != SV_DOKUBARI) return (TRUE); + if (o_ptr->sval != SV_DOKUBARI) return TRUE; } } - return (FALSE); + return FALSE; } /*! @@ -58,8 +58,8 @@ bool item_tester_hook_orthodox_melee_weapons(object_type *o_ptr) bool item_tester_hook_melee_weapon(object_type *o_ptr) { /* Check for a usable slot */ - if ((o_ptr->tval >= TV_DIGGING) && (o_ptr->tval <= TV_SWORD)) return (TRUE); - return (FALSE); + if ((o_ptr->tval >= TV_DIGGING) && (o_ptr->tval <= TV_SWORD)) return TRUE; + return FALSE; } @@ -76,11 +76,11 @@ bool item_tester_hook_ammo(object_type *o_ptr) case TV_ARROW: case TV_BOLT: { - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } /*! @@ -109,8 +109,8 @@ bool item_tester_hook_broken_weapon(object_type *o_ptr) */ bool item_tester_hook_boomerang(object_type *o_ptr) { - if ((o_ptr->tval == TV_DIGGING) || (o_ptr->tval == TV_SWORD) || (o_ptr->tval == TV_POLEARM) || (o_ptr->tval == TV_HAFTED)) return (TRUE); - return (FALSE); + if ((o_ptr->tval == TV_DIGGING) || (o_ptr->tval == TV_SWORD) || (o_ptr->tval == TV_POLEARM) || (o_ptr->tval == TV_HAFTED)) return TRUE; + return FALSE; } /*! @@ -149,7 +149,7 @@ bool item_tester_hook_eatable(object_type *o_ptr) return TRUE; } - return (FALSE); + return FALSE; } /*! @@ -162,8 +162,8 @@ bool item_tester_hook_mochikae(object_type *o_ptr) /* Check for a usable slot */ if (((o_ptr->tval >= TV_DIGGING) && (o_ptr->tval <= TV_SWORD)) || (o_ptr->tval == TV_SHIELD) || (o_ptr->tval == TV_CAPTURE) || - (o_ptr->tval == TV_CARD)) return (TRUE); - return (FALSE); + (o_ptr->tval == TV_CARD)) return TRUE; + return FALSE; } /*! @@ -177,13 +177,13 @@ bool item_tester_hook_activate(object_type *o_ptr) BIT_FLAGS flgs[TR_FLAG_SIZE]; /* Not known */ - if (!object_is_known(o_ptr)) return (FALSE); + if (!object_is_known(o_ptr)) return FALSE; object_flags(o_ptr, flgs); /* Check activation flag */ - if (have_flag(flgs, TR_ACTIVATE)) return (TRUE); + if (have_flag(flgs, TR_ACTIVATE)) return TRUE; - return (FALSE); + return FALSE; } /*! @@ -197,9 +197,9 @@ bool item_tester_hook_wear(object_type *o_ptr) if (p_ptr->psex == SEX_MALE) return FALSE; /* Check for a usable slot */ - if (wield_slot(p_ptr, o_ptr) >= INVEN_RARM) return (TRUE); + if (wield_slot(p_ptr, o_ptr) >= INVEN_RARM) return TRUE; - return (FALSE); + return FALSE; } @@ -215,7 +215,7 @@ bool item_tester_hook_use(object_type *o_ptr) /* Ammo */ if (o_ptr->tval == p_ptr->tval_ammo) - return (TRUE); + return TRUE; /* Useable object */ switch (o_ptr->tval) @@ -228,7 +228,7 @@ bool item_tester_hook_use(object_type *o_ptr) case TV_POTION: case TV_FOOD: { - return (TRUE); + return TRUE; } default: @@ -236,7 +236,7 @@ bool item_tester_hook_use(object_type *o_ptr) int i; /* Not known */ - if (!object_is_known(o_ptr)) return (FALSE); + if (!object_is_known(o_ptr)) return FALSE; /* HACK - only items from the equipment can be activated */ for (i = INVEN_RARM; i < INVEN_TOTAL; i++) @@ -246,13 +246,13 @@ bool item_tester_hook_use(object_type *o_ptr) object_flags(o_ptr, flgs); /* Check activation flag */ - if (have_flag(flgs, TR_ACTIVATE)) return (TRUE); + if (have_flag(flgs, TR_ACTIVATE)) return TRUE; } } } } - return (FALSE); + return FALSE; } @@ -283,8 +283,8 @@ bool item_tester_hook_quaff(object_type *o_ptr) */ bool item_tester_hook_readable(object_type *o_ptr) { - if ((o_ptr->tval == TV_SCROLL) || (o_ptr->tval == TV_PARCHMENT) || (o_ptr->name1 == ART_GHB) || (o_ptr->name1 == ART_POWER)) return (TRUE); - return (FALSE); + if ((o_ptr->tval == TV_SCROLL) || (o_ptr->tval == TV_PARCHMENT) || (o_ptr->name1 == ART_GHB) || (o_ptr->name1 == ART_POWER)) return TRUE; + return FALSE; } @@ -304,15 +304,15 @@ bool item_tester_hook_melee_ammo(object_type *o_ptr) case TV_ARROW: case TV_SHOT: { - return (TRUE); + return TRUE; } case TV_SWORD: { - if (o_ptr->sval != SV_DOKUBARI) return (TRUE); + if (o_ptr->sval != SV_DOKUBARI) return TRUE; } } - return (FALSE); + return FALSE; } /*! @@ -329,11 +329,11 @@ bool item_tester_hook_weapon_except_bow(object_type *o_ptr) case TV_POLEARM: case TV_DIGGING: { - return (TRUE); + return TRUE; } } - return (FALSE); + return FALSE; } /*! @@ -420,15 +420,15 @@ bool item_tester_hook_identify_fully_weapon_armour(object_type *o_ptr) bool item_tester_hook_recharge(object_type *o_ptr) { /* Recharge staffs */ - if (o_ptr->tval == TV_STAFF) return (TRUE); + if (o_ptr->tval == TV_STAFF) return TRUE; /* Recharge wands */ - if (o_ptr->tval == TV_WAND) return (TRUE); + if (o_ptr->tval == TV_WAND) return TRUE; /* Hack -- Recharge rods */ - if (o_ptr->tval == TV_ROD) return (TRUE); + if (o_ptr->tval == TV_ROD) return TRUE; - return (FALSE); + return FALSE; } /*! @@ -452,12 +452,12 @@ bool item_tester_learn_spell(object_type *o_ptr) } } - if ((o_ptr->tval < TV_LIFE_BOOK) || (o_ptr->tval > (TV_LIFE_BOOK + MAX_REALM - 1))) return (FALSE); - if ((o_ptr->tval == TV_MUSIC_BOOK) && (p_ptr->pclass == CLASS_BARD)) return (TRUE); + if ((o_ptr->tval < TV_LIFE_BOOK) || (o_ptr->tval > (TV_LIFE_BOOK + MAX_REALM - 1))) return FALSE; + if ((o_ptr->tval == TV_MUSIC_BOOK) && (p_ptr->pclass == CLASS_BARD)) return TRUE; else if (!is_magic(tval2realm(o_ptr->tval))) return FALSE; - if ((REALM1_BOOK == o_ptr->tval) || (REALM2_BOOK == o_ptr->tval)) return (TRUE); - if (choices & (0x0001 << (tval2realm(o_ptr->tval) - 1))) return (TRUE); - return (FALSE); + if ((REALM1_BOOK == o_ptr->tval) || (REALM2_BOOK == o_ptr->tval)) return TRUE; + if (choices & (0x0001 << (tval2realm(o_ptr->tval) - 1))) return TRUE; + return FALSE; } /*! @@ -497,14 +497,14 @@ bool item_tester_high_level_book(object_type *o_ptr) bool item_tester_refill_lantern(object_type *o_ptr) { /* Flasks of oil are okay */ - if (o_ptr->tval == TV_FLASK) return (TRUE); + if (o_ptr->tval == TV_FLASK) return TRUE; /* Laterns are okay */ if ((o_ptr->tval == TV_LITE) && - (o_ptr->sval == SV_LITE_LANTERN)) return (TRUE); + (o_ptr->sval == SV_LITE_LANTERN)) return TRUE; /* Assume not okay */ - return (FALSE); + return FALSE; } @@ -901,10 +901,10 @@ bool object_can_refill_torch(object_type *o_ptr) { /* Torches are okay */ if ((o_ptr->tval == TV_LITE) && - (o_ptr->sval == SV_LITE_TORCH)) return (TRUE); + (o_ptr->sval == SV_LITE_TORCH)) return TRUE; /* Assume not okay */ - return (FALSE); + return FALSE; } @@ -988,10 +988,10 @@ OBJECT_TYPE_VALUE item_tester_tval; bool item_tester_okay(object_type *o_ptr, OBJECT_TYPE_VALUE tval) { /* Hack -- allow listing empty slots */ - // if (item_tester_full) return (TRUE); // TODO:DELETE + // if (item_tester_full) return TRUE; // TODO:DELETE /* Require an item */ - if (!o_ptr->k_idx) return (FALSE); + if (!o_ptr->k_idx) return FALSE; /* Hack -- ignore "gold" */ if (o_ptr->tval == TV_GOLD) @@ -999,7 +999,7 @@ bool item_tester_okay(object_type *o_ptr, OBJECT_TYPE_VALUE tval) /* See xtra2.c */ extern bool show_gold_on_floor; - if (!show_gold_on_floor) return (FALSE); + if (!show_gold_on_floor) return FALSE; } /* Check the tval */ @@ -1009,15 +1009,15 @@ bool item_tester_okay(object_type *o_ptr, OBJECT_TYPE_VALUE tval) if ((tval <= TV_DEATH_BOOK) && (tval >= TV_LIFE_BOOK)) return check_book_realm(o_ptr->tval, o_ptr->sval); else - if (tval != o_ptr->tval) return (FALSE); + if (tval != o_ptr->tval) return FALSE; } /* Check the hook */ if (item_tester_hook) { - if (!(*item_tester_hook)(o_ptr)) return (FALSE); + if (!(*item_tester_hook)(o_ptr)) return FALSE; } /* Assume okay */ - return (TRUE); + return TRUE; } diff --git a/src/object1.c b/src/object1.c index 65d3e0fd9..e1beadb3f 100644 --- a/src/object1.c +++ b/src/object1.c @@ -1245,7 +1245,7 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode) if (mode & SCROBJ_FORCE_DETAIL) trivial_info = 0; /* No relevant informations */ - if (i <= trivial_info) return (FALSE); + if (i <= trivial_info) return FALSE; screen_save(); Term_get_size(&wid, &hgt); @@ -1297,7 +1297,7 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode) screen_load(); /* Gave knowledge */ - return (TRUE); + return TRUE; } diff --git a/src/objectkind-hook.c b/src/objectkind-hook.c index 29a1c428e..e67c79b8c 100644 --- a/src/objectkind-hook.c +++ b/src/objectkind-hook.c @@ -15,11 +15,11 @@ bool kind_is_cloak(KIND_OBJECT_IDX k_idx) /* Analyze the item type */ if (k_ptr->tval == TV_CLOAK) { - return (TRUE); + return TRUE; } /* Assume not good */ - return (FALSE); + return FALSE; } @@ -36,11 +36,11 @@ bool kind_is_polearm(KIND_OBJECT_IDX k_idx) /* Analyze the item type */ if (k_ptr->tval == TV_POLEARM) { - return (TRUE); + return TRUE; } /* Assume not good */ - return (FALSE); + return FALSE; } @@ -57,11 +57,11 @@ bool kind_is_sword(KIND_OBJECT_IDX k_idx) /* Analyze the item type */ if ((k_ptr->tval == TV_SWORD) && (k_ptr->sval > 2)) { - return (TRUE); + return TRUE; } /* Assume not good */ - return (FALSE); + return FALSE; } @@ -78,11 +78,11 @@ bool kind_is_book(KIND_OBJECT_IDX k_idx) /* Analyze the item type */ if ((k_ptr->tval >= TV_LIFE_BOOK) && (k_ptr->tval <= TV_CRUSADE_BOOK)) { - return (TRUE); + return TRUE; } /* Assume not good */ - return (FALSE); + return FALSE; } @@ -99,11 +99,11 @@ bool kind_is_good_book(KIND_OBJECT_IDX k_idx) /* Analyze the item type */ if ((k_ptr->tval >= TV_LIFE_BOOK) && (k_ptr->tval <= TV_CRUSADE_BOOK) && (k_ptr->tval != TV_ARCANE_BOOK) && (k_ptr->sval > 1)) { - return (TRUE); + return TRUE; } /* Assume not good */ - return (FALSE); + return FALSE; } @@ -120,11 +120,11 @@ bool kind_is_armor(KIND_OBJECT_IDX k_idx) /* Analyze the item type */ if (k_ptr->tval == TV_HARD_ARMOR) { - return (TRUE); + return TRUE; } /* Assume not good */ - return (FALSE); + return FALSE; } @@ -141,11 +141,11 @@ bool kind_is_hafted(KIND_OBJECT_IDX k_idx) /* Analyze the item type */ if (k_ptr->tval == TV_HAFTED) { - return (TRUE); + return TRUE; } /* Assume not good */ - return (FALSE); + return FALSE; } /* @@ -180,8 +180,8 @@ bool kind_is_good(KIND_OBJECT_IDX k_idx) case TV_HELM: case TV_CROWN: { - if (k_ptr->to_a < 0) return (FALSE); - return (TRUE); + if (k_ptr->to_a < 0) return FALSE; + return TRUE; } /* Weapons -- Good unless damaged */ @@ -191,16 +191,16 @@ bool kind_is_good(KIND_OBJECT_IDX k_idx) case TV_POLEARM: case TV_DIGGING: { - if (k_ptr->to_h < 0) return (FALSE); - if (k_ptr->to_d < 0) return (FALSE); - return (TRUE); + if (k_ptr->to_h < 0) return FALSE; + if (k_ptr->to_d < 0) return FALSE; + return TRUE; } /* Ammo -- Arrows/Bolts are good */ case TV_BOLT: case TV_ARROW: { - return (TRUE); + return TRUE; } /* Books -- High level books are good (except Arcane books) */ @@ -217,27 +217,27 @@ bool kind_is_good(KIND_OBJECT_IDX k_idx) case TV_HISSATSU_BOOK: case TV_HEX_BOOK: { - if (k_ptr->sval >= SV_BOOK_MIN_GOOD) return (TRUE); - return (FALSE); + if (k_ptr->sval >= SV_BOOK_MIN_GOOD) return TRUE; + return FALSE; } /* Rings -- Rings of Speed are good */ case TV_RING: { - if (k_ptr->sval == SV_RING_SPEED) return (TRUE); - if (k_ptr->sval == SV_RING_LORDLY) return (TRUE); - return (FALSE); + if (k_ptr->sval == SV_RING_SPEED) return TRUE; + if (k_ptr->sval == SV_RING_LORDLY) return TRUE; + return FALSE; } /* Amulets -- Amulets of the Magi and Resistance are good */ case TV_AMULET: { - if (k_ptr->sval == SV_AMULET_THE_MAGI) return (TRUE); - if (k_ptr->sval == SV_AMULET_RESISTANCE) return (TRUE); - return (FALSE); + if (k_ptr->sval == SV_AMULET_THE_MAGI) return TRUE; + if (k_ptr->sval == SV_AMULET_RESISTANCE) return TRUE; + return FALSE; } } /* Assume not good */ - return (FALSE); + return FALSE; } diff --git a/src/player-damage.c b/src/player-damage.c index 4a9829320..e6f3b4554 100644 --- a/src/player-damage.c +++ b/src/player-damage.c @@ -141,8 +141,8 @@ static bool acid_minus_ac(player_type *creature_ptr) case 7: o_ptr = &creature_ptr->inventory_list[INVEN_FEET]; break; } - if (!o_ptr->k_idx) return (FALSE); - if (!object_is_armour(o_ptr)) return (FALSE); + if (!o_ptr->k_idx) return FALSE; + if (!object_is_armour(o_ptr)) return FALSE; object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); object_flags(o_ptr, flgs); @@ -150,14 +150,14 @@ static bool acid_minus_ac(player_type *creature_ptr) if (o_ptr->ac + o_ptr->to_a <= 0) { msg_format(_("%sは既にボロボロだ！", "Your %s is already crumble!"), o_name); - return (FALSE); + return FALSE; } /* Object resists */ if (have_flag(flgs, TR_IGNORE_ACID)) { msg_format(_("しかし%sには効果がなかった！", "Your %s is unaffected!"), o_name); - return (TRUE); + return TRUE; } msg_format(_("%sが酸で腐食した！", "Your %s is corroded!"), o_name); @@ -172,7 +172,7 @@ static bool acid_minus_ac(player_type *creature_ptr) calc_android_exp(creature_ptr); /* Item was damaged */ - return (TRUE); + return TRUE; } diff --git a/src/player-effects.c b/src/player-effects.c index d14d7bc1f..6d971621d 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -398,7 +398,7 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool creature_ptr->tim_mimic = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, TRUE); @@ -466,7 +466,7 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); /* Fully update the visuals */ @@ -549,7 +549,7 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); @@ -592,7 +592,7 @@ bool set_poisoned(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); @@ -649,7 +649,7 @@ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); @@ -695,7 +695,7 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->redraw |= (PR_STATE); @@ -746,7 +746,7 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, TRUE); @@ -798,7 +798,7 @@ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->fast = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -849,7 +849,7 @@ bool set_lightspeed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->lightspeed = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -896,7 +896,7 @@ bool set_slow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->slow = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -945,7 +945,7 @@ bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -994,7 +994,7 @@ bool set_tsubureru(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1043,7 +1043,7 @@ bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1091,7 +1091,7 @@ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1140,7 +1140,7 @@ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1192,7 +1192,7 @@ bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1243,7 +1243,7 @@ bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); @@ -1304,7 +1304,7 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1370,7 +1370,7 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1418,7 +1418,7 @@ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1467,7 +1467,7 @@ bool set_tim_invis(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1518,7 +1518,7 @@ bool set_tim_infra(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1569,7 +1569,7 @@ bool set_tim_regen(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1617,7 +1617,7 @@ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1671,7 +1671,7 @@ bool set_superstealth(player_type *creature_ptr, bool set) } /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -1718,7 +1718,7 @@ bool set_tim_levitation(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1766,7 +1766,7 @@ bool set_tim_sh_touki(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); @@ -1813,7 +1813,7 @@ bool set_tim_sh_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1861,7 +1861,7 @@ bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1909,7 +1909,7 @@ bool set_tim_eyeeye(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -1958,7 +1958,7 @@ bool set_resist_magic(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -2006,7 +2006,7 @@ bool set_tim_reflect(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -2052,7 +2052,7 @@ bool set_multishadow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -2100,7 +2100,7 @@ bool set_dustrobe(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -2148,7 +2148,7 @@ bool set_kabenuke(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -2202,7 +2202,7 @@ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -2387,7 +2387,7 @@ bool set_oppose_acid(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->oppose_acid = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -2434,7 +2434,7 @@ bool set_oppose_elec(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->oppose_elec = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -2482,7 +2482,7 @@ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->oppose_fire = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -2529,7 +2529,7 @@ bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->oppose_cold = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -2577,7 +2577,7 @@ bool set_oppose_pois(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->oppose_pois = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -2722,7 +2722,7 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->stun = v; /* No change */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -2913,7 +2913,7 @@ bool set_cut(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->cut = v; /* No change */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -3105,7 +3105,7 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->food = v; /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -3176,7 +3176,7 @@ bool inc_stat(player_type *creature_ptr, int stat) } /* Nothing to gain */ - return (FALSE); + return FALSE; } /*! @@ -3323,7 +3323,7 @@ bool res_stat(player_type *creature_ptr, int stat) } /* Nothing to restore */ - return (FALSE); + return FALSE; } @@ -3335,7 +3335,7 @@ bool hp_player(player_type *creature_ptr, int num) int vir; vir = virtue_number(creature_ptr, V_VITALITY); - if(num <= 0) return (FALSE); + if(num <= 0) return FALSE; if(vir) { @@ -3388,7 +3388,7 @@ bool hp_player(player_type *creature_ptr, int num) } /* Ignore */ - return (FALSE); + return FALSE; } @@ -3458,7 +3458,7 @@ bool do_dec_stat(player_type *creature_ptr, int stat) } /* Nothing obvious */ - return (FALSE); + return FALSE; } @@ -3475,7 +3475,7 @@ bool do_res_stat(player_type *creature_ptr, int stat) } /* Nothing obvious */ - return (FALSE); + return FALSE; } @@ -3519,7 +3519,7 @@ bool do_inc_stat(player_type *creature_ptr, int stat) } /* Nothing obvious */ - return (FALSE); + return FALSE; } @@ -3544,7 +3544,7 @@ bool restore_level(player_type *creature_ptr) } /* No effect */ - return (FALSE); + return FALSE; } /* @@ -4020,7 +4020,7 @@ bool set_ultimate_res(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -4062,7 +4062,7 @@ bool set_tim_res_nether(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); @@ -4104,7 +4104,7 @@ bool set_tim_res_time(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); /* Nothing to notice */ - if (!notice) return (FALSE); + if (!notice) return FALSE; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); diff --git a/src/player-inventory.c b/src/player-inventory.c index ff9960d13..4a5d351fb 100644 --- a/src/player-inventory.c +++ b/src/player-inventory.c @@ -238,15 +238,15 @@ void toggle_inven_equip(player_type *creature_ptr) bool get_item_okay(OBJECT_IDX i) { /* Illegal items */ - if ((i < 0) || (i >= INVEN_TOTAL)) return (FALSE); + if ((i < 0) || (i >= INVEN_TOTAL)) return FALSE; if (select_ring_slot) return is_ring_slot(i); /* Verify the item */ - if (!item_tester_okay(&p_ptr->inventory_list[i], item_tester_tval)) return (FALSE); + if (!item_tester_okay(&p_ptr->inventory_list[i], item_tester_tval)) return FALSE; /* Assume okay */ - return (TRUE); + return TRUE; } /*! @@ -317,7 +317,7 @@ static bool get_tag_floor(COMMAND_CODE *cp, char tag, FLOOR_IDX floor_list[], IT *cp = i; /* Success */ - return (TRUE); + return TRUE; } /* Find another '@' */ @@ -356,7 +356,7 @@ static bool get_tag_floor(COMMAND_CODE *cp, char tag, FLOOR_IDX floor_list[], IT *cp = i; /* Success */ - return (TRUE); + return TRUE; } /* Find another '@' */ @@ -365,7 +365,7 @@ static bool get_tag_floor(COMMAND_CODE *cp, char tag, FLOOR_IDX floor_list[], IT } /* No such tag */ - return (FALSE); + return FALSE; } @@ -432,7 +432,7 @@ static bool get_tag(COMMAND_CODE *cp, char tag, BIT_FLAGS mode, OBJECT_TYPE_VALU *cp = i; /* Success */ - return (TRUE); + return TRUE; } /* Find another '@' */ @@ -474,7 +474,7 @@ static bool get_tag(COMMAND_CODE *cp, char tag, BIT_FLAGS mode, OBJECT_TYPE_VALU *cp = i; /* Success */ - return (TRUE); + return TRUE; } /* Find another '@' */ @@ -483,7 +483,7 @@ static bool get_tag(COMMAND_CODE *cp, char tag, BIT_FLAGS mode, OBJECT_TYPE_VALU } /* No such tag */ - return (FALSE); + return FALSE; } /*! @@ -780,7 +780,7 @@ static bool get_item_allow(INVENTORY_IDX item) } /* No inscription */ - if (!o_ptr->inscription) return (TRUE); + if (!o_ptr->inscription) return TRUE; /* Find a '!' */ s = my_strchr(quark_str(o_ptr->inscription), '!'); @@ -792,7 +792,7 @@ static bool get_item_allow(INVENTORY_IDX item) if ((s[1] == command_cmd) || (s[1] == '*')) { /* Verify the choice */ - if (!verify(_("本当に", "Really try"), item)) return (FALSE); + if (!verify(_("本当に", "Really try"), item)) return FALSE; } /* Find another '!' */ @@ -800,7 +800,7 @@ static bool get_item_allow(INVENTORY_IDX item) } /* Allow it */ - return (TRUE); + return TRUE; } @@ -908,7 +908,7 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, tval = 0; item_tester_hook = NULL; command_cmd = 0; /* Hack -- command_cmd is no longer effective */ - return (TRUE); + return TRUE; } /* Floor item? */ @@ -1860,7 +1860,7 @@ bool get_item_floor(player_type *creature_ptr, COMMAND_CODE *cp, concptr pmt, co tval = 0; item_tester_hook = NULL; command_cmd = 0; /* Hack -- command_cmd is no longer effective */ - return (TRUE); + return TRUE; } /* Floor item? */ @@ -2956,13 +2956,13 @@ static bool py_pickup_floor_aux(void) } else { - return (FALSE); + return FALSE; } /* Pick up the object */ py_pickup_aux(p_ptr, this_o_idx); - return (TRUE); + return TRUE; } /*! diff --git a/src/player-move.c b/src/player-move.c index ecfc7bb44..28aaeedfa 100644 --- a/src/player-move.c +++ b/src/player-move.c @@ -1306,7 +1306,7 @@ static bool see_wall(DIRECTION dir, POSITION y, POSITION x) x += ddx[dir]; /* Illegal grids are not known walls */ - if (!in_bounds2(p_ptr->current_floor_ptr, y, x)) return (FALSE); + if (!in_bounds2(p_ptr->current_floor_ptr, y, x)) return FALSE; /* Access grid */ g_ptr = &p_ptr->current_floor_ptr->grid_array[y][x]; @@ -1349,16 +1349,16 @@ static bool see_nothing(DIRECTION dir, POSITION y, POSITION x) x += ddx[dir]; /* Illegal grids are unknown */ - if (!in_bounds2(p_ptr->current_floor_ptr, y, x)) return (TRUE); + if (!in_bounds2(p_ptr->current_floor_ptr, y, x)) return TRUE; /* Memorized grids are always known */ - if (p_ptr->current_floor_ptr->grid_array[y][x].info & (CAVE_MARK)) return (FALSE); + if (p_ptr->current_floor_ptr->grid_array[y][x].info & (CAVE_MARK)) return FALSE; /* Viewable door/wall grids are known */ - if (player_can_see_bold(p_ptr, y, x)) return (FALSE); + if (player_can_see_bold(p_ptr, y, x)) return FALSE; /* Default */ - return (TRUE); + return TRUE; } @@ -1573,7 +1573,7 @@ static bool run_test(void) monster_type *m_ptr = &p_ptr->current_floor_ptr->m_list[g_ptr->m_idx]; /* Visible monster */ - if (m_ptr->ml) return (TRUE); + if (m_ptr->ml) return TRUE; } /* Visible objects abort running */ @@ -1584,7 +1584,7 @@ static bool run_test(void) next_o_idx = o_ptr->next_o_idx; /* Visible object */ - if (o_ptr->marked & OM_FOUND) return (TRUE); + if (o_ptr->marked & OM_FOUND) return TRUE; } /* Assume unknown */ @@ -1628,7 +1628,7 @@ static bool run_test(void) } /* Interesting feature */ - if (notice) return (TRUE); + if (notice) return TRUE; /* The grid is "visible" */ inv = FALSE; @@ -1652,13 +1652,13 @@ static bool run_test(void) /* Three new directions. Stop running. */ else if (option2) { - return (TRUE); + return TRUE; } /* Two non-adjacent new directions. Stop running. */ else if (option != cycle[chome[prev_dir] + i - 1]) { - return (TRUE); + return TRUE; } /* Two new (adjacent) directions (case 1) */ @@ -1709,7 +1709,7 @@ static bool run_test(void) /* Looking to break right */ if (find_breakright) { - return (TRUE); + return TRUE; } } @@ -1719,7 +1719,7 @@ static bool run_test(void) /* Looking to break left */ if (find_breakleft) { - return (TRUE); + return TRUE; } } } @@ -1733,7 +1733,7 @@ static bool run_test(void) /* Looking to break left */ if (find_breakleft) { - return (TRUE); + return TRUE; } } @@ -1743,7 +1743,7 @@ static bool run_test(void) /* Looking to break right */ if (find_breakright) { - return (TRUE); + return TRUE; } } } @@ -1755,7 +1755,7 @@ static bool run_test(void) /* No options */ if (!option) { - return (TRUE); + return TRUE; } /* One option */ @@ -1802,7 +1802,7 @@ static bool run_test(void) /* STOP: we are next to an intersection or a room */ else { - return (TRUE); + return TRUE; } } @@ -1826,11 +1826,11 @@ static bool run_test(void) /* About to hit a known wall, stop */ if (see_wall(find_current, p_ptr->y, p_ptr->x)) { - return (TRUE); + return TRUE; } /* Failure */ - return (FALSE); + return FALSE; } diff --git a/src/readdib.c b/src/readdib.c index 0e0e82379..e220b0664 100644 --- a/src/readdib.c +++ b/src/readdib.c @@ -234,14 +234,14 @@ BOOL ReadDIB(HWND hWnd, LPSTR lpFileName, DIBINIT *pInfo) { wsprintf(str, "Can't open file '%s'", (LPSTR)lpFileName); MessageBox(NULL, str, "Error", MB_ICONSTOP | MB_OK); - return (FALSE); + return FALSE; } pInfo->hDIB = GlobalAlloc(GHND, (DWORD)(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD))); if (!pInfo->hDIB) - return (FALSE); + return FALSE; lpbi = (LPBITMAPINFOHEADER)GlobalLock(pInfo->hDIB); diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c index 20c555123..6fa177577 100644 --- a/src/rooms-pitnest.c +++ b/src/rooms-pitnest.c @@ -713,12 +713,12 @@ static bool vault_aux_trapped_pit(MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - if (!vault_monster_okay(r_idx)) return (FALSE); + if (!vault_monster_okay(r_idx)) return FALSE; /* No wall passing monster */ - if (r_ptr->flags2 & (RF2_PASS_WALL | RF2_KILL_WALL)) return (FALSE); + if (r_ptr->flags2 & (RF2_PASS_WALL | RF2_KILL_WALL)) return FALSE; - return (TRUE); + return TRUE; } diff --git a/src/save.c b/src/save.c index 186d851a5..2a5177c2b 100644 --- a/src/save.c +++ b/src/save.c @@ -1571,7 +1571,7 @@ static bool save_player_aux(player_type *player_ptr, char *name) /* Failure */ - if (!ok) return (FALSE); + if (!ok) return FALSE; counts_write(0, current_world_ptr->play_time); @@ -1579,7 +1579,7 @@ static bool save_player_aux(player_type *player_ptr, char *name) current_world_ptr->character_saved = TRUE; /* Success */ - return (TRUE); + return TRUE; } @@ -1738,7 +1738,7 @@ bool load_player(void) /* Allow empty savefile name */ - if (!savefile[0]) return (TRUE); + if (!savefile[0]) return TRUE; #if !defined(MACINTOSH) && !defined(WINDOWS) @@ -1754,7 +1754,7 @@ bool load_player(void) msg_print(NULL); /* Allow this */ - return (TRUE); + return TRUE; } #endif @@ -1784,7 +1784,7 @@ bool load_player(void) msg_print(_("セーブファイルは現在使用中です。", "Savefile is currently in use.")); msg_print(NULL); - return (FALSE); + return FALSE; } /* Create a lock file */ @@ -1899,7 +1899,7 @@ bool load_player(void) { /* A character was loaded */ current_world_ptr->character_loaded = TRUE; - return (TRUE); + return TRUE; } /* Player is no longer "dead" */ @@ -1908,7 +1908,7 @@ bool load_player(void) /* Count lives */ current_world_ptr->sf_lives++; - return (TRUE); + return TRUE; } /* A character was loaded */ @@ -1924,7 +1924,7 @@ bool load_player(void) } /* Success */ - return (TRUE); + return TRUE; } @@ -1950,7 +1950,7 @@ bool load_player(void) msg_print(NULL); - return (FALSE); + return FALSE; } /*! diff --git a/src/sort.c b/src/sort.c index 5de9fe923..7309bea12 100644 --- a/src/sort.c +++ b/src/sort.c @@ -222,8 +222,8 @@ bool ang_sort_art_comp(vptr u, vptr v, int a, int b) z2 = a_info[w2].tval; /* Compare total kills */ - if (z1 < z2) return (TRUE); - if (z1 > z2) return (FALSE); + if (z1 < z2) return TRUE; + if (z1 > z2) return FALSE; } @@ -235,8 +235,8 @@ bool ang_sort_art_comp(vptr u, vptr v, int a, int b) z2 = a_info[w2].sval; /* Compare levels */ - if (z1 < z2) return (TRUE); - if (z1 > z2) return (FALSE); + if (z1 < z2) return TRUE; + if (z1 > z2) return FALSE; } @@ -248,8 +248,8 @@ bool ang_sort_art_comp(vptr u, vptr v, int a, int b) z2 = a_info[w2].level; /* Compare experience */ - if (z1 < z2) return (TRUE); - if (z1 > z2) return (FALSE); + if (z1 < z2) return TRUE; + if (z1 > z2) return FALSE; } @@ -375,8 +375,8 @@ bool ang_sort_comp_hook(vptr u, vptr v, int a, int b) z2 = r_info[w2].r_pkills; /* Compare player kills */ - if (z1 < z2) return (TRUE); - if (z1 > z2) return (FALSE); + if (z1 < z2) return TRUE; + if (z1 > z2) return FALSE; } @@ -388,8 +388,8 @@ bool ang_sort_comp_hook(vptr u, vptr v, int a, int b) z2 = r_info[w2].r_tkills; /* Compare total kills */ - if (z1 < z2) return (TRUE); - if (z1 > z2) return (FALSE); + if (z1 < z2) return TRUE; + if (z1 > z2) return FALSE; } @@ -401,8 +401,8 @@ bool ang_sort_comp_hook(vptr u, vptr v, int a, int b) z2 = r_info[w2].level; /* Compare levels */ - if (z1 < z2) return (TRUE); - if (z1 > z2) return (FALSE); + if (z1 < z2) return TRUE; + if (z1 > z2) return FALSE; } @@ -414,8 +414,8 @@ bool ang_sort_comp_hook(vptr u, vptr v, int a, int b) z2 = r_info[w2].mexp; /* Compare experience */ - if (z1 < z2) return (TRUE); - if (z1 > z2) return (FALSE); + if (z1 < z2) return TRUE; + if (z1 > z2) return FALSE; } diff --git a/src/spells-object.c b/src/spells-object.c index efb862a1f..6e6e0e708 100644 --- a/src/spells-object.c +++ b/src/spells-object.c @@ -271,7 +271,7 @@ bool import_magic_device(player_type *user_ptr) OBJECT_IDX item; object_type *o_ptr; o_ptr = choose_object(user_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; if (o_ptr->tval == TV_STAFF && o_ptr->sval == SV_STAFF_NOTHING) { @@ -1211,14 +1211,14 @@ bool enchant(player_type *caster_ptr, object_type *o_ptr, int n, int eflag) } /* Failure */ - if (!res) return (FALSE); + if (!res) return FALSE; caster_ptr->update |= (PU_BONUS | PU_COMBINE | PU_REORDER); caster_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER); calc_android_exp(caster_ptr); /* Success */ - return (TRUE); + return TRUE; } @@ -1248,7 +1248,7 @@ bool enchant_spell(player_type *caster_ptr, HIT_PROB num_hit, HIT_POINT num_dam, OBJECT_IDX item; object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; GAME_TEXT o_name[MAX_NLEN]; object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); diff --git a/src/spells-summon.c b/src/spells-summon.c index 13104c735..e36c33ab1 100644 --- a/src/spells-summon.c +++ b/src/spells-summon.c @@ -185,13 +185,13 @@ bool cast_summon_octopus(player_type *creature_ptr) bool item_tester_offer(object_type *o_ptr) { /* Flasks of oil are okay */ - if (o_ptr->tval != TV_CORPSE) return (FALSE); - if (o_ptr->sval != SV_CORPSE) return (FALSE); + if (o_ptr->tval != TV_CORPSE) return FALSE; + if (o_ptr->sval != SV_CORPSE) return FALSE; - if (my_strchr("pht", r_info[o_ptr->pval].d_char)) return (TRUE); + if (my_strchr("pht", r_info[o_ptr->pval].d_char)) return TRUE; /* Assume not okay */ - return (FALSE); + return FALSE; } /*! diff --git a/src/spells-world.c b/src/spells-world.c index 8a5b80d68..edc7c127d 100644 --- a/src/spells-world.c +++ b/src/spells-world.c @@ -13,14 +13,14 @@ bool set_gametime(void) sprintf(ppp, "Dungeon Turn (0-%ld): ", (long)current_world_ptr->dungeon_turn_limit); sprintf(tmp_val, "%ld", (long)current_world_ptr->dungeon_turn); - if (!get_string(ppp, tmp_val, 10)) return (FALSE); + if (!get_string(ppp, tmp_val, 10)) return FALSE; tmp_int = atoi(tmp_val); /* Verify */ if (tmp_int >= current_world_ptr->dungeon_turn_limit) tmp_int = current_world_ptr->dungeon_turn_limit - 1; else if (tmp_int < 0) tmp_int = 0; current_world_ptr->dungeon_turn = current_world_ptr->game_turn = tmp_int; - return (TRUE); + return TRUE; } diff --git a/src/spells1.c b/src/spells1.c index 6ce6f0914..cb28d88d4 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1209,16 +1209,16 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID DEPTH caster_lev = (who > 0) ? r_info[m_caster_ptr->r_idx].level : (caster_ptr->lev * 2); /* Nobody here */ - if (!g_ptr->m_idx) return (FALSE); + if (!g_ptr->m_idx) return FALSE; /* Never affect projector */ - if (who && (g_ptr->m_idx == who)) return (FALSE); - if ((g_ptr->m_idx == caster_ptr->riding) && !who && !(typ == GF_OLD_HEAL) && !(typ == GF_OLD_SPEED) && !(typ == GF_STAR_HEAL)) return (FALSE); + if (who && (g_ptr->m_idx == who)) return FALSE; + if ((g_ptr->m_idx == caster_ptr->riding) && !who && !(typ == GF_OLD_HEAL) && !(typ == GF_OLD_SPEED) && !(typ == GF_STAR_HEAL)) return FALSE; if (sukekaku && ((m_ptr->r_idx == MON_SUKE) || (m_ptr->r_idx == MON_KAKU))) return FALSE; /* Don't affect already death monsters */ /* Prevents problems with chain reactions of exploding monsters */ - if (m_ptr->hp < 0) return (FALSE); + if (m_ptr->hp < 0) return FALSE; /* Reduce damage by distance */ dam = (dam + r) / (r + 1); @@ -3361,7 +3361,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID delete_monster_idx(g_ptr->m_idx); - return (TRUE); + return TRUE; } else { @@ -3611,7 +3611,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID } /* Absolutely no effect */ - if (skipped) return (FALSE); + if (skipped) return FALSE; /* "Unique" monsters cannot be polymorphed */ if (r_ptr->flags1 & (RF1_UNIQUE)) do_poly = FALSE; @@ -4026,7 +4026,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name /* Player is not here */ - if (!player_bold(target_ptr, y, x)) return (FALSE); + if (!player_bold(target_ptr, y, x)) return FALSE; if ((target_ptr->special_defense & NINJA_KAWARIMI) && dam && (randint0(55) < (target_ptr->lev * 3 / 5 + 20)) && who && (who != target_ptr->riding)) { @@ -4034,8 +4034,8 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name } /* Player cannot hurt himself */ - if (!who) return (FALSE); - if (who == target_ptr->riding) return (FALSE); + if (!who) return FALSE; + if (who == target_ptr->riding) return FALSE; if ((target_ptr->reflect || ((target_ptr->special_defense & KATA_FUUJIN) && !target_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10)) { @@ -5138,10 +5138,10 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO ax = ABS(dx); /* Handle adjacent (or identical) grids */ - if ((ax < 2) && (ay < 2)) return (TRUE); + if ((ax < 2) && (ay < 2)) return TRUE; /* Paranoia -- require "safe" origin */ - /* if (!in_bounds(floor_ptr, y1, x1)) return (FALSE); */ + /* if (!in_bounds(floor_ptr, y1, x1)) return FALSE; */ /* Directly South/North */ if (!dx) @@ -5151,7 +5151,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (ty = y1 + 1; ty < y2; ty++) { - if (cave_stop_disintegration(floor_ptr, ty, x1)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, ty, x1)) return FALSE; } } @@ -5160,12 +5160,12 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (ty = y1 - 1; ty > y2; ty--) { - if (cave_stop_disintegration(floor_ptr, ty, x1)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, ty, x1)) return FALSE; } } /* Assume los */ - return (TRUE); + return TRUE; } /* Directly East/West */ @@ -5176,7 +5176,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (tx = x1 + 1; tx < x2; tx++) { - if (cave_stop_disintegration(floor_ptr, y1, tx)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, y1, tx)) return FALSE; } } @@ -5185,12 +5185,12 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (tx = x1 - 1; tx > x2; tx--) { - if (cave_stop_disintegration(floor_ptr, y1, tx)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, y1, tx)) return FALSE; } } /* Assume los */ - return (TRUE); + return TRUE; } /* Extract some signs */ @@ -5202,7 +5202,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { if (ay == 2) { - if (!cave_stop_disintegration(floor_ptr, y1 + sy, x1)) return (TRUE); + if (!cave_stop_disintegration(floor_ptr, y1 + sy, x1)) return TRUE; } } @@ -5211,7 +5211,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { if (ax == 2) { - if (!cave_stop_disintegration(floor_ptr, y1, x1 + sx)) return (TRUE); + if (!cave_stop_disintegration(floor_ptr, y1, x1 + sx)) return TRUE; } } @@ -5246,7 +5246,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO /* the LOS exactly meets the corner of a tile. */ while (x2 - tx) { - if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE; qy += m; @@ -5257,7 +5257,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO else if (qy > f2) { ty += sy; - if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE; qy -= f1; tx += sx; } @@ -5292,7 +5292,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO /* the LOS exactly meets the corner of a tile. */ while (y2 - ty) { - if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE; qx += m; @@ -5303,7 +5303,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO else if (qx > f2) { tx += sx; - if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE); + if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE; qx -= f1; ty += sy; } @@ -6171,7 +6171,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y, } /* Speed -- ignore "non-explosions" */ - if (!grids) return (FALSE); + if (!grids) return FALSE; /* Display the "blast area" if requested */ diff --git a/src/spells2.c b/src/spells2.c index 75c32f2b5..14971415a 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -1157,7 +1157,7 @@ bool symbol_genocide(player_type *caster_ptr, int power, bool player_cast) if (is_special_floor) { msg_print(_("何も起きないようだ……", "It seems nothing happen here...")); - return (FALSE); + return FALSE; } /* Mega-Hack -- Get a monster symbol */ @@ -4158,7 +4158,7 @@ bool psychometry(player_type *caster_ptr) object_type *o_ptr; OBJECT_IDX item; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; if (object_is_known(o_ptr)) { diff --git a/src/spells3.c b/src/spells3.c index 9ccad0dcd..3a191594a 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -1470,7 +1470,7 @@ bool alchemy(player_type *caster_ptr) OBJECT_IDX item; object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; /* See how many items */ int amt = 1; @@ -1545,7 +1545,7 @@ bool artifact_scroll(player_type *caster_ptr) object_type *o_ptr; OBJECT_IDX item; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; GAME_TEXT o_name[MAX_NLEN]; object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); @@ -1713,7 +1713,7 @@ bool ident_spell(player_type *caster_ptr, bool only_equip) OBJECT_IDX item; object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; bool old_known = identify_item(caster_ptr, o_ptr); @@ -1760,7 +1760,7 @@ bool mundane_spell(player_type *owner_ptr, bool only_equip) concptr s = _("使えるものがありません。", "You have nothing you can use."); o_ptr = choose_object(owner_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!")); POSITION iy = o_ptr->iy; @@ -1820,7 +1820,7 @@ bool identify_fully(player_type *caster_ptr, bool only_equip) OBJECT_IDX item; object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), 0); - if (!o_ptr) return (FALSE); + if (!o_ptr) return FALSE; bool old_known = identify_item(caster_ptr, o_ptr); diff --git a/src/store.c b/src/store.c index 36da10df1..a9ee0789d 100644 --- a/src/store.c +++ b/src/store.c @@ -2490,7 +2490,7 @@ static bool store_object_similar(object_type *o_ptr, object_type *j_ptr) if (o_ptr->discount != j_ptr->discount) return (0); /* They match, so they must be similar */ - return (TRUE); + return TRUE; } @@ -2630,8 +2630,8 @@ static bool is_blessed(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; object_flags(o_ptr, flgs); - if (have_flag(flgs, TR_BLESSED)) return (TRUE); - else return (FALSE); + if (have_flag(flgs, TR_BLESSED)) return TRUE; + else return FALSE; } @@ -2647,7 +2647,7 @@ static bool is_blessed(object_type *o_ptr) static bool store_will_buy(object_type *o_ptr) { /* Hack -- The Home is simple */ - if ((cur_store_num == STORE_HOME) || (cur_store_num == STORE_MUSEUM)) return (TRUE); + if ((cur_store_num == STORE_HOME) || (cur_store_num == STORE_MUSEUM)) return TRUE; /* Switch on the store */ switch (cur_store_num) @@ -2678,7 +2678,7 @@ static bool store_will_buy(object_type *o_ptr) case TV_CARD: break; default: - return (FALSE); + return FALSE; } break; } @@ -2700,7 +2700,7 @@ static bool store_will_buy(object_type *o_ptr) case TV_DRAG_ARMOR: break; default: - return (FALSE); + return FALSE; } break; } @@ -2722,11 +2722,11 @@ static bool store_will_buy(object_type *o_ptr) break; case TV_HAFTED: { - if(o_ptr->sval == SV_WIZSTAFF) return (FALSE); + if(o_ptr->sval == SV_WIZSTAFF) return FALSE; } break; default: - return (FALSE); + return FALSE; } break; } @@ -2769,7 +2769,7 @@ static bool store_will_buy(object_type *o_ptr) if (is_blessed(o_ptr)) break; } default: - return (FALSE); + return FALSE; } break; } @@ -2784,7 +2784,7 @@ static bool store_will_buy(object_type *o_ptr) case TV_POTION: break; default: - return (FALSE); + return FALSE; } break; } @@ -2817,10 +2817,10 @@ static bool store_will_buy(object_type *o_ptr) case TV_HAFTED: { if(o_ptr->sval == SV_WIZSTAFF) break; - else return (FALSE); + else return FALSE; } default: - return (FALSE); + return FALSE; } break; } @@ -2844,17 +2844,17 @@ static bool store_will_buy(object_type *o_ptr) case TV_HEX_BOOK: break; default: - return (FALSE); + return FALSE; } break; } } /* Ignore "worthless" items */ - if (object_value(o_ptr) <= 0) return (FALSE); + if (object_value(o_ptr) <= 0) return FALSE; /* Assume okay */ - return (TRUE); + return TRUE; } @@ -3303,12 +3303,12 @@ static bool black_market_crap(object_type *o_ptr) int i, j; /* Ego items are never crap */ - if (object_is_ego(o_ptr)) return (FALSE); + if (object_is_ego(o_ptr)) return FALSE; /* Good items are never crap */ - if (o_ptr->to_a > 0) return (FALSE); - if (o_ptr->to_h > 0) return (FALSE); - if (o_ptr->to_d > 0) return (FALSE); + if (o_ptr->to_a > 0) return FALSE; + if (o_ptr->to_h > 0) return FALSE; + if (o_ptr->to_d > 0) return FALSE; /* Check all stores */ for (i = 0; i < MAX_STORES; i++) @@ -3322,12 +3322,12 @@ static bool black_market_crap(object_type *o_ptr) object_type *j_ptr = &town_info[p_ptr->town_num].store[i].stock[j]; /* Duplicate item "type", assume crappy */ - if (o_ptr->k_idx == j_ptr->k_idx) return (TRUE); + if (o_ptr->k_idx == j_ptr->k_idx) return TRUE; } } /* Assume okay */ - return (FALSE); + return FALSE; } @@ -3495,16 +3495,16 @@ static bool noneedtobargain(PRICE minprice) PRICE bad = st_ptr->bad_buy; /* Cheap items are "boring" */ - if (minprice < 10L) return (TRUE); + if (minprice < 10L) return TRUE; /* Perfect haggling */ - if (good == MAX_SHORT) return (TRUE); + if (good == MAX_SHORT) return TRUE; /* Reward good haggles, punish bad haggles, notice price */ - if (good > ((3 * bad) + (5 + (minprice/50)))) return (TRUE); + if (good > ((3 * bad) + (5 + (minprice/50)))) return TRUE; /* Return the flag */ - return (FALSE); + return FALSE; } @@ -3858,7 +3858,7 @@ static int get_stock(COMMAND_CODE *com_val, concptr pmt, int i, int j) if ((*com_val >= i) && (*com_val <= j)) { /* Success */ - return (TRUE); + return TRUE; } } msg_print(NULL); @@ -3908,12 +3908,12 @@ static int get_stock(COMMAND_CODE *com_val, concptr pmt, int i, int j) /* Clear the prompt */ prt("", 0, 0); - if (command == ESCAPE) return (FALSE); + if (command == ESCAPE) return FALSE; repeat_push(*com_val); /* Success */ - return (TRUE); + return TRUE; } @@ -3942,11 +3942,11 @@ static int increase_insults(void) st_ptr->store_open = current_world_ptr->game_turn + TURNS_PER_TICK*TOWN_DAWN/8 + randint1(TURNS_PER_TICK*TOWN_DAWN/8); /* Closed */ - return (TRUE); + return TRUE; } /* Not closed */ - return (FALSE); + return FALSE; } @@ -3970,13 +3970,13 @@ static void decrease_insults(void) static int haggle_insults(void) { /* Increase insults */ - if (increase_insults()) return (TRUE); + if (increase_insults()) return TRUE; /* Display and flush insult */ say_comment_5(); /* Still okay */ - return (FALSE); + return FALSE; } @@ -4115,7 +4115,7 @@ static int get_haggle(concptr pmt, s32b *poffer, PRICE price, int final) } /* Success */ - return (TRUE); + return TRUE; } @@ -4139,20 +4139,20 @@ static bool receive_offer(concptr pmt, s32b *poffer, while (TRUE) { /* Get a haggle (or cancel) */ - if (!get_haggle(pmt, poffer, price, final)) return (TRUE); + if (!get_haggle(pmt, poffer, price, final)) return TRUE; /* Acceptable offer */ if (((*poffer) * factor) >= (last_offer * factor)) break; /* Insult, and check for kicked out */ - if (haggle_insults()) return (TRUE); + if (haggle_insults()) return TRUE; /* Reject offer (correctly) */ (*poffer) = last_offer; } /* Success */ - return (FALSE); + return FALSE; } @@ -4320,12 +4320,12 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price) } } - if (cancel) return (TRUE); + if (cancel) return TRUE; updatebargain(*price, final_ask, o_ptr->number); /* Do not cancel */ - return (FALSE); + return FALSE; } @@ -4519,12 +4519,12 @@ static bool sell_haggle(object_type *o_ptr, s32b *price) } } - if (cancel) return (TRUE); + if (cancel) return TRUE; updatebargain(*price, final_ask, o_ptr->number); /* Do not cancel */ - return (FALSE); + return FALSE; } diff --git a/src/trap.c b/src/trap.c index 87e950e4b..2a653aff1 100644 --- a/src/trap.c +++ b/src/trap.c @@ -246,19 +246,19 @@ static int check_hit(player_type *target_ptr, int power) if (k < 10) return (k < 5); if (target_ptr->pseikaku == SEIKAKU_NAMAKE) - if (one_in_(20)) return (TRUE); + if (one_in_(20)) return TRUE; /* Paranoia -- No power */ - if (power <= 0) return (FALSE); + if (power <= 0) return FALSE; /* Total armor */ ac = target_ptr->ac + target_ptr->to_a; /* Power competes against Armor */ - if (randint1(power) > ((ac * 3) / 4)) return (TRUE); + if (randint1(power) > ((ac * 3) / 4)) return TRUE; /* Assume miss */ - return (FALSE); + return FALSE; } diff --git a/src/util.c b/src/util.c index a01b43776..c85fa8bdb 100644 --- a/src/util.c +++ b/src/util.c @@ -3851,11 +3851,11 @@ bool get_com(concptr prompt, char *command, bool z_escape) prt("", 0, 0); /* Handle "cancel" */ - if (*command == ESCAPE) return (FALSE); - if (z_escape && ((*command == 'z') || (*command == 'Z'))) return (FALSE); + if (*command == ESCAPE) return FALSE; + if (z_escape && ((*command == 'z') || (*command == 'Z'))) return FALSE; /* Success */ - return (TRUE); + return TRUE; } @@ -4770,10 +4770,10 @@ bool is_a_vowel(int ch) case 'I': case 'O': case 'U': - return (TRUE); + return TRUE; } - return (FALSE); + return FALSE; } @@ -4797,7 +4797,7 @@ static bool insert_str(char *buf, concptr target, concptr insert) buf = my_strstr(buf, target); /* No target found */ - if (!buf) return (FALSE); + if (!buf) return FALSE; /* Be sure we have an insertion string */ if (!insert) insert = ""; @@ -4829,7 +4829,7 @@ static bool insert_str(char *buf, concptr target, concptr insert) for (i = 0; i < i_len; ++i) buf[i] = insert[i]; /* Successful operation */ - return (TRUE); + return TRUE; } @@ -4919,13 +4919,13 @@ void repeat_push(COMMAND_CODE what) bool repeat_pull(COMMAND_CODE *what) { /* All out of keys */ - if (repeat__idx == repeat__cnt) return (FALSE); + if (repeat__idx == repeat__cnt) return FALSE; /* Grab the next key, advance */ *what = repeat__key[repeat__idx++]; /* Success */ - return (TRUE); + return TRUE; } void repeat_check(void) diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c index dabbc85cd..f551e41ab 100644 --- a/src/view-mainwindow.c +++ b/src/view-mainwindow.c @@ -2451,11 +2451,11 @@ bool change_panel(POSITION dy, POSITION dx) handle_stuff(p_ptr); /* Success */ - return (TRUE); + return TRUE; } /* No change */ - return (FALSE); + return FALSE; } /*! diff --git a/src/wizard1.c b/src/wizard1.c index b8a33ca3f..6d8602e71 100644 --- a/src/wizard1.c +++ b/src/wizard1.c @@ -1564,7 +1564,7 @@ static bool make_fake_artifact(object_type *o_ptr, IDX name1) /* Acquire the "kind" index */ i = lookup_kind(a_ptr->tval, a_ptr->sval); - if (!i) return (FALSE); + if (!i) return FALSE; object_prep(o_ptr, i); @@ -1582,7 +1582,7 @@ static bool make_fake_artifact(object_type *o_ptr, IDX name1) o_ptr->weight = a_ptr->weight; /* Success */ - return (TRUE); + return TRUE; } diff --git a/src/wizard2.c b/src/wizard2.c index b178a3bf9..f1fdf4e45 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -157,7 +157,7 @@ static bool wiz_dimension_door(player_type *caster_ptr) POSITION x = 0, y = 0; if (!tgt_pt(caster_ptr, &x, &y)) return FALSE; teleport_player_to(caster_ptr, y, x, TELEPORT_NONMAGICAL); - return (TRUE); + return TRUE; } /*! diff --git a/src/z-util.c b/src/z-util.c index a89c55a28..fd76c7474 100644 --- a/src/z-util.c +++ b/src/z-util.c @@ -37,7 +37,7 @@ bool suffix(concptr s, concptr t) int slen = strlen(s); /* Check for incompatible lengths */ - if (tlen > slen) return (FALSE); + if (tlen > slen) return FALSE; /* Compare "t" to the end of "s" */ return (!strcmp(s + slen - tlen, t)); @@ -53,11 +53,11 @@ bool prefix(concptr s, concptr t) while (*t) { /* Compare content and length */ - if (*t++ != *s++) return (FALSE); + if (*t++ != *s++) return FALSE; } /* Matched, we have a prefix */ - return (TRUE); + return TRUE; } -- 2.11.0