From a4e2d564cda453311ab25d046f8d4ca4c530f356 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 29 May 2021 23:32:08 +0900 Subject: [PATCH] [Refactor] #1172 Changed '(TRUE)', 'TRUE;' and 'FALSE;' to '(true)', 'true;' and 'false;' --- src/action/action-limited.cpp | 34 ++-- src/action/activation-execution.cpp | 34 ++-- src/action/movement-execution.cpp | 58 +++---- src/action/mutation-execution.cpp | 80 ++++----- src/action/open-close-execution.cpp | 26 +-- src/action/run-execution.cpp | 90 +++++------ src/action/throw-util.cpp | 12 +- src/action/travel-execution.cpp | 2 +- src/action/tunnel-execution.cpp | 14 +- src/artifact/random-art-characteristics.cpp | 20 +-- src/artifact/random-art-generator.cpp | 20 +-- src/artifact/random-art-misc.cpp | 22 +-- src/artifact/random-art-pval-investor.cpp | 22 +-- src/artifact/random-art-resistance.cpp | 40 ++--- src/artifact/random-art-slay.cpp | 34 ++-- src/autopick/autopick-command-menu.cpp | 8 +- src/autopick/autopick-describer.cpp | 6 +- src/autopick/autopick-destroyer.cpp | 40 ++--- src/autopick/autopick-editor-command.cpp | 22 +-- src/autopick/autopick-editor-util.cpp | 38 ++--- src/autopick/autopick-entry.cpp | 38 ++--- src/autopick/autopick-finder.cpp | 26 +-- src/autopick/autopick-inserter-killer.cpp | 24 +-- src/autopick/autopick-matcher.cpp | 132 +++++++-------- src/autopick/autopick-reader-writer.cpp | 4 +- src/autopick/autopick-registry.cpp | 36 ++--- src/birth/auto-roller.cpp | 16 +- src/birth/birth-select-class.cpp | 10 +- src/birth/birth-select-personality.cpp | 10 +- src/birth/birth-select-race.cpp | 10 +- src/birth/birth-select-realm.cpp | 28 ++-- src/birth/birth-stat.cpp | 4 +- src/birth/birth-wizard.cpp | 92 +++++------ src/birth/character-builder.cpp | 6 +- src/birth/game-play-initializer.cpp | 40 ++--- src/birth/history-editor.cpp | 4 +- src/birth/inventory-initializer.cpp | 2 +- src/birth/quick-start.cpp | 10 +- src/blue-magic/blue-magic-ball-bolt.cpp | 88 +++++----- src/blue-magic/blue-magic-breath.cpp | 88 +++++----- src/blue-magic/blue-magic-caster.cpp | 76 ++++----- src/blue-magic/blue-magic-checker.cpp | 2 +- src/blue-magic/blue-magic-spirit-curse.cpp | 28 ++-- src/blue-magic/blue-magic-status.cpp | 20 +-- src/blue-magic/blue-magic-summon.cpp | 64 ++++---- src/blue-magic/blue-magic-util.cpp | 2 +- src/blue-magic/learnt-power-getter.cpp | 72 ++++----- src/cmd-action/cmd-attack.cpp | 20 +-- src/cmd-action/cmd-hissatsu.cpp | 38 ++--- src/cmd-action/cmd-mane.cpp | 186 ++++++++++----------- src/cmd-action/cmd-mind.cpp | 28 ++-- src/cmd-action/cmd-move.cpp | 24 +-- src/cmd-action/cmd-open-close.cpp | 22 +-- src/cmd-action/cmd-others.cpp | 14 +- src/cmd-action/cmd-pet.cpp | 58 +++---- src/cmd-action/cmd-racial.cpp | 2 +- src/cmd-action/cmd-shoot.cpp | 2 +- src/cmd-action/cmd-spell.cpp | 58 +++---- src/cmd-action/cmd-travel.cpp | 4 +- src/cmd-action/cmd-tunnel.cpp | 2 +- src/cmd-building/cmd-building.cpp | 44 ++--- src/cmd-building/cmd-inn.cpp | 24 +-- src/cmd-io/cmd-autopick.cpp | 4 +- src/cmd-io/cmd-diary.cpp | 2 +- src/cmd-io/cmd-dump.cpp | 4 +- src/cmd-io/cmd-floor.cpp | 2 +- src/cmd-io/cmd-gameoption.cpp | 38 ++--- src/cmd-io/cmd-knowledge.cpp | 4 +- src/cmd-io/cmd-lore.cpp | 24 +-- src/cmd-io/cmd-macro.cpp | 6 +- src/cmd-io/cmd-process-screen.cpp | 46 +++--- src/cmd-io/cmd-save.cpp | 4 +- src/cmd-io/macro-util.cpp | 4 +- src/cmd-item/cmd-destroy.cpp | 32 ++-- src/cmd-item/cmd-eat.cpp | 64 ++++---- src/cmd-item/cmd-equipment.cpp | 10 +- src/cmd-item/cmd-item.cpp | 4 +- src/cmd-item/cmd-magiceat.cpp | 48 +++--- src/cmd-item/cmd-smith.cpp | 60 +++---- src/cmd-item/cmd-throw.cpp | 64 ++++---- src/cmd-item/cmd-usestaff.cpp | 60 +++---- src/cmd-item/cmd-zaprod.cpp | 90 +++++------ src/cmd-item/cmd-zapwand.cpp | 70 ++++---- src/cmd-visual/cmd-draw.cpp | 6 +- src/cmd-visual/cmd-map.cpp | 2 +- src/cmd-visual/cmd-visuals.cpp | 32 ++-- src/combat/attack-accuracy.cpp | 26 +-- src/combat/aura-counterattack.cpp | 28 ++-- src/combat/shoot.cpp | 28 ++-- src/core/asking-player.cpp | 34 ++-- src/core/game-closer.cpp | 12 +- src/core/game-play.cpp | 62 +++---- src/core/magic-effects-timeout-reducer.cpp | 2 +- src/core/player-processor.cpp | 40 ++--- src/core/scores.cpp | 16 +- src/core/show-file.cpp | 14 +- src/core/stuff-handler.cpp | 4 +- src/dungeon/dungeon-processor.cpp | 20 +-- src/dungeon/dungeon.cpp | 8 +- src/dungeon/quest-completion-checker.cpp | 8 +- src/dungeon/quest-monster-placer.cpp | 6 +- src/dungeon/quest.cpp | 4 +- src/effect/effect-feature.cpp | 30 ++-- src/effect/effect-item.cpp | 66 ++++---- src/effect/effect-monster-charm.cpp | 40 ++--- src/effect/effect-monster-curse.cpp | 8 +- src/effect/effect-monster-evil.cpp | 56 +++---- src/effect/effect-monster-lite-dark.cpp | 8 +- src/effect/effect-monster-oldies.cpp | 38 ++--- src/effect/effect-monster-psi.cpp | 22 +-- src/effect/effect-monster-resist-hurt.cpp | 76 ++++----- src/effect/effect-monster-spirit.cpp | 6 +- src/effect/effect-monster-switcher.cpp | 42 ++--- src/effect/effect-monster-util.cpp | 10 +- src/effect/effect-monster.cpp | 42 ++--- src/effect/effect-player.cpp | 6 +- src/effect/effect-processor.cpp | 50 +++--- src/flavor/flavor-describer.cpp | 8 +- src/flavor/flavor-util.cpp | 24 +-- src/flavor/named-item-describer.cpp | 32 ++-- src/flavor/object-flavor.cpp | 10 +- src/flavor/tval-description-switcher.cpp | 6 +- src/floor/cave-generator.cpp | 56 +++---- src/floor/fixed-map-generator.cpp | 34 ++-- src/floor/floor-changer.cpp | 14 +- src/floor/floor-generator.cpp | 22 +-- src/floor/floor-leaver.cpp | 24 +-- src/floor/floor-object.cpp | 22 +-- src/floor/floor-save.cpp | 2 +- src/floor/floor-streams.cpp | 6 +- src/floor/floor-util.cpp | 2 +- src/floor/geometry.cpp | 14 +- src/floor/line-of-sight.cpp | 30 ++-- src/floor/object-allocator.cpp | 20 +-- src/floor/object-scanner.cpp | 4 +- src/floor/pattern-walk.cpp | 38 ++--- src/floor/tunnel-generator.cpp | 54 +++---- src/floor/wild.cpp | 34 ++-- src/game-option/runtime-arguments.cpp | 2 +- src/game-option/special-options.cpp | 2 +- src/grid/feature-generator.cpp | 14 +- src/grid/grid.cpp | 78 ++++----- src/grid/stair.cpp | 22 +-- src/grid/trap.cpp | 18 +-- src/hpmp/hp-mp-processor.cpp | 22 +-- src/hpmp/hp-mp-regenerator.cpp | 4 +- src/info-reader/feature-reader.cpp | 2 +- src/info-reader/fixed-map-parser.cpp | 2 +- src/inventory/floor-item-getter.cpp | 102 ++++++------ src/inventory/inventory-object.cpp | 24 +-- src/inventory/inventory-util.cpp | 28 ++-- src/inventory/item-getter.cpp | 104 ++++++------ src/inventory/item-selection-util.cpp | 22 +-- src/inventory/player-inventory.cpp | 8 +- src/inventory/recharge-processor.cpp | 6 +- src/io-dump/character-dump.cpp | 14 +- src/io-dump/dump-remover.cpp | 14 +- src/io-dump/dump-util.cpp | 36 ++--- src/io-dump/special-class-dump.cpp | 4 +- src/io/command-repeater.cpp | 4 +- src/io/cursor.cpp | 4 +- src/io/files-util.cpp | 8 +- src/io/input-key-acceptor.cpp | 44 ++--- src/io/input-key-processor.cpp | 18 +-- src/io/input-key-requester.cpp | 14 +- src/io/interpret-pref-file.cpp | 4 +- src/io/read-pref-file.cpp | 16 +- src/io/record-play-movie.cpp | 26 +-- src/io/report.cpp | 14 +- src/io/signal-handlers.cpp | 6 +- src/io/write-diary.cpp | 20 +-- src/knowledge/knowledge-features.cpp | 20 +-- src/knowledge/knowledge-inventory.cpp | 10 +- src/knowledge/knowledge-items.cpp | 22 +-- src/knowledge/knowledge-monsters.cpp | 22 +-- src/knowledge/knowledge-quests.cpp | 8 +- src/knowledge/knowledge-uniques.cpp | 16 +- src/load/angband-version-comparer.cpp | 32 ++-- src/load/birth-loader.cpp | 2 +- src/load/dungeon-loader.cpp | 2 +- src/load/floor-loader.cpp | 16 +- src/load/inventory-loader.cpp | 2 +- src/load/item-loader.cpp | 4 +- src/load/load-util.cpp | 2 +- src/load/load-v1-5-0.cpp | 4 +- src/load/load.cpp | 28 ++-- src/load/option-loader.cpp | 26 +-- src/load/player-info-loader.cpp | 2 +- src/load/quest-loader.cpp | 4 +- src/load/store-loader.cpp | 4 +- src/load/world-loader.cpp | 4 +- src/locale/english.cpp | 4 +- src/locale/japanese.cpp | 14 +- src/locale/utf-8.cpp | 4 +- src/lore/lore-calculator.cpp | 20 +-- src/lore/lore-util.cpp | 8 +- src/lore/monster-lore.cpp | 6 +- src/main-win.cpp | 120 +++++++------- src/main-win/main-win-file-utils.cpp | 12 +- src/market/arena.cpp | 54 +++---- src/market/bounty.cpp | 22 +-- src/market/building-craft-armor.cpp | 2 +- src/market/building-craft-fix.cpp | 2 +- src/market/building-craft-weapon.cpp | 12 +- src/market/building-enchanter.cpp | 16 +- src/market/building-monster.cpp | 28 ++-- src/market/building-quest.cpp | 10 +- src/market/building-recharger.cpp | 4 +- src/market/building-service.cpp | 20 +-- src/market/play-gamble.cpp | 38 ++--- src/market/poker.cpp | 58 +++---- src/melee/melee-postprocess.cpp | 28 ++-- src/melee/melee-spell-flags-checker.cpp | 12 +- src/melee/melee-spell.cpp | 18 +-- src/melee/melee-switcher.cpp | 50 +++--- src/melee/melee-util.cpp | 12 +- src/melee/monster-attack-monster.cpp | 24 +-- src/mind/mind-archer.cpp | 20 +-- src/mind/mind-berserker.cpp | 10 +- src/mind/mind-blue-mage.cpp | 12 +- src/mind/mind-cavalry.cpp | 8 +- src/mind/mind-elementalist.cpp | 108 ++++++------- src/mind/mind-force-trainer.cpp | 52 +++--- src/mind/mind-hobbit.cpp | 2 +- src/mind/mind-mage.cpp | 8 +- src/mind/mind-magic-eater.cpp | 10 +- src/mind/mind-magic-resistance.cpp | 14 +- src/mind/mind-mindcrafter.cpp | 28 ++-- src/mind/mind-mirror-master.cpp | 64 ++++---- src/mind/mind-monk.cpp | 10 +- src/mind/mind-ninja.cpp | 62 +++---- src/mind/mind-priest.cpp | 16 +- src/mind/mind-samurai.cpp | 16 +- src/mind/mind-sniper.cpp | 30 ++-- src/mind/mind-warrior-mage.cpp | 6 +- src/mind/mind-warrior.cpp | 8 +- src/mind/mind-weaponsmith.cpp | 10 +- src/mind/monk-attack.cpp | 6 +- src/monster-attack/monster-attack-describer.cpp | 28 ++-- src/monster-attack/monster-attack-lose.cpp | 16 +- src/monster-attack/monster-attack-player.cpp | 50 +++--- src/monster-attack/monster-attack-processor.cpp | 32 ++-- src/monster-attack/monster-attack-status.cpp | 28 ++-- src/monster-attack/monster-attack-switcher.cpp | 30 ++-- src/monster-attack/monster-attack-util.cpp | 10 +- src/monster-attack/monster-eating.cpp | 34 ++-- src/monster-floor/monster-death.cpp | 14 +- src/monster-floor/monster-direction.cpp | 40 ++--- src/monster-floor/monster-generator.cpp | 64 ++++---- src/monster-floor/monster-move.cpp | 108 ++++++------- src/monster-floor/monster-object.cpp | 6 +- src/monster-floor/monster-runaway.cpp | 8 +- src/monster-floor/monster-safety-hiding.cpp | 8 +- src/monster-floor/monster-summon.cpp | 30 ++-- src/monster-floor/monster-sweep-grid.cpp | 48 +++--- src/monster-floor/one-monster-placer.cpp | 48 +++--- src/monster-floor/quantum-effect.cpp | 10 +- src/monster-floor/special-death-switcher.cpp | 12 +- src/monster-race/monster-race-hook.cpp | 206 ++++++++++++------------ src/monster/monster-describer.cpp | 4 +- src/monster/monster-info.cpp | 64 ++++---- src/monster/monster-list.cpp | 38 ++--- src/monster/monster-processor-util.cpp | 22 +-- src/monster/monster-processor.cpp | 56 +++---- src/monster/monster-status-setter.cpp | 66 ++++---- src/monster/monster-status.cpp | 34 ++-- src/monster/monster-update.cpp | 80 ++++----- src/monster/monster-util.cpp | 96 +++++------ src/mspell/mspell-attack.cpp | 52 +++--- src/mspell/mspell-breath.cpp | 28 ++-- src/mspell/mspell-checker.cpp | 18 +-- src/mspell/mspell-curse.cpp | 2 +- src/mspell/mspell-damage-calculator.cpp | 2 +- src/mspell/mspell-floor.cpp | 18 +-- src/mspell/mspell-judgement.cpp | 106 ++++++------ src/mspell/mspell-lite.cpp | 18 +-- src/mspell/mspell-selector.cpp | 46 +++--- src/mspell/mspell-status.cpp | 2 +- src/mspell/mspell-summon.cpp | 38 ++--- src/mspell/mspell-util.cpp | 2 +- src/mspell/summon-checker.cpp | 6 +- src/mutation/mutation-investor-remover.cpp | 12 +- src/mutation/mutation-processor.cpp | 26 +-- src/mutation/mutation-techniques.cpp | 4 +- src/mutation/mutation-util.cpp | 2 +- src/object-activation/activation-bolt-ball.cpp | 114 ++++++------- src/object-activation/activation-breath.cpp | 14 +- src/object-activation/activation-charm.cpp | 16 +- src/object-activation/activation-genocide.cpp | 4 +- src/object-activation/activation-others.cpp | 74 ++++----- src/object-activation/activation-resistance.cpp | 34 ++-- src/object-activation/activation-switcher.cpp | 58 +++---- src/object-activation/activation-teleport.cpp | 24 +-- src/object-enchant/apply-magic-armor.cpp | 36 ++--- src/object-enchant/apply-magic-others.cpp | 12 +- src/object-enchant/apply-magic-weapon.cpp | 4 +- src/object-enchant/object-boost.cpp | 4 +- src/object-enchant/object-curse.cpp | 10 +- src/object-hook/hook-armor.cpp | 10 +- src/object-hook/hook-bow.cpp | 14 +- src/object-hook/hook-enchant.cpp | 22 +-- src/object-hook/hook-expendable.cpp | 32 ++-- src/object-hook/hook-magic.cpp | 28 ++-- src/object-hook/hook-perception.cpp | 10 +- src/object-hook/hook-quest.cpp | 18 +-- src/object-hook/hook-weapon.cpp | 80 ++++----- src/object-use/quaff-execution.cpp | 2 +- src/object-use/read-execution.cpp | 142 ++++++++-------- src/object/item-tester-hooker.cpp | 8 +- src/object/object-broken.cpp | 72 ++++----- src/object/object-flags.cpp | 2 +- src/object/object-info.cpp | 2 +- src/object/object-kind-hook.cpp | 4 +- src/object/object-stack.cpp | 4 +- src/object/object-value.cpp | 4 +- src/object/warning.cpp | 40 ++--- src/perception/identification.cpp | 4 +- src/perception/object-perception.cpp | 4 +- src/perception/simple-perception.cpp | 30 ++-- src/pet/pet-fall-off.cpp | 20 +-- src/player-attack/attack-chaos-effect.cpp | 14 +- src/player-attack/blood-sucking-processor.cpp | 14 +- src/player-attack/player-attack.cpp | 22 +-- src/player-info/avatar.cpp | 10 +- src/player-info/equipment-info.cpp | 2 +- src/player/digestion-processor.cpp | 10 +- src/player/patron.cpp | 2 +- src/player/player-damage.cpp | 18 +-- src/player/player-move.cpp | 28 ++-- src/player/player-status-flags.cpp | 64 ++++---- src/player/player-status.cpp | 52 +++--- src/player/player-view.cpp | 6 +- src/player/process-death.cpp | 8 +- src/player/process-name.cpp | 2 +- src/racial/racial-android.cpp | 12 +- src/racial/racial-balrog.cpp | 4 +- src/racial/racial-draconian.cpp | 4 +- src/racial/racial-kutar.cpp | 14 +- src/racial/racial-switcher.cpp | 134 +++++++-------- src/racial/racial-vampire.cpp | 10 +- src/realm/realm-arcane.cpp | 8 +- src/realm/realm-chaos.cpp | 8 +- src/realm/realm-craft.cpp | 8 +- src/realm/realm-crusade.cpp | 8 +- src/realm/realm-death.cpp | 8 +- src/realm/realm-demon.cpp | 8 +- src/realm/realm-hex.cpp | 56 +++---- src/realm/realm-hissatsu.cpp | 16 +- src/realm/realm-life.cpp | 8 +- src/realm/realm-nature.cpp | 8 +- src/realm/realm-song.cpp | 14 +- src/realm/realm-sorcery.cpp | 8 +- src/realm/realm-trump.cpp | 14 +- src/room/cave-filler.cpp | 24 +-- src/room/room-generator.cpp | 12 +- src/room/rooms-builder.cpp | 8 +- src/room/rooms-city.cpp | 14 +- src/room/rooms-fractal.cpp | 8 +- src/room/rooms-normal.cpp | 36 ++--- src/room/rooms-pit-nest.cpp | 48 +++--- src/room/rooms-special.cpp | 4 +- src/room/rooms-trap.cpp | 4 +- src/room/rooms-vault.cpp | 36 ++--- src/room/space-finder.cpp | 32 ++-- src/save/floor-writer.cpp | 10 +- src/save/info-writer.cpp | 2 +- src/save/save.cpp | 24 +-- src/specific-object/blade-turner.cpp | 4 +- src/specific-object/bloody-moon.cpp | 4 +- src/specific-object/chest.cpp | 2 +- src/specific-object/death-crimson.cpp | 6 +- src/specific-object/monster-ball.cpp | 26 +-- src/specific-object/muramasa.cpp | 6 +- src/specific-object/ring-of-power.cpp | 4 +- src/specific-object/toragoroshi.cpp | 2 +- src/spell-kind/blood-curse.cpp | 6 +- src/spell-kind/earthquake.cpp | 16 +- src/spell-kind/magic-item-recharger.cpp | 8 +- src/spell-kind/spells-detection.cpp | 84 +++++----- src/spell-kind/spells-enchant.cpp | 16 +- src/spell-kind/spells-equipment.cpp | 12 +- src/spell-kind/spells-fetcher.cpp | 16 +- src/spell-kind/spells-floor.cpp | 10 +- src/spell-kind/spells-genocide.cpp | 28 ++-- src/spell-kind/spells-grid.cpp | 20 +-- src/spell-kind/spells-launcher.cpp | 6 +- src/spell-kind/spells-lite.cpp | 10 +- src/spell-kind/spells-neighbor.cpp | 2 +- src/spell-kind/spells-perception.cpp | 12 +- src/spell-kind/spells-pet.cpp | 4 +- src/spell-kind/spells-polymorph.cpp | 16 +- src/spell-kind/spells-random.cpp | 16 +- src/spell-kind/spells-sight.cpp | 16 +- src/spell-kind/spells-teleport.cpp | 58 +++---- src/spell-kind/spells-world.cpp | 68 ++++---- src/spell-realm/spells-chaos.cpp | 8 +- src/spell-realm/spells-craft.cpp | 20 +-- src/spell-realm/spells-crusade.cpp | 34 ++-- src/spell-realm/spells-demon.cpp | 14 +- src/spell-realm/spells-hex.cpp | 34 ++-- src/spell-realm/spells-nature.cpp | 4 +- src/spell-realm/spells-song.cpp | 14 +- src/spell-realm/spells-sorcery.cpp | 16 +- src/spell/range-calc.cpp | 30 ++-- src/spell/spell-info.cpp | 12 +- src/spell/spells-diceroll.cpp | 14 +- src/spell/spells-object.cpp | 40 ++--- src/spell/spells-staff-only.cpp | 18 +-- src/spell/spells-status.cpp | 112 ++++++------- src/spell/spells-summon.cpp | 36 ++--- src/status/action-setter.cpp | 2 +- src/status/bad-status-setter.cpp | 120 +++++++------- src/status/base-status.cpp | 46 +++--- src/status/body-improvement.cpp | 70 ++++---- src/status/buff-setter.cpp | 134 +++++++-------- src/status/element-resistance.cpp | 70 ++++---- src/status/experience.cpp | 10 +- src/status/sight-setter.cpp | 42 ++--- src/status/temporary-resistance.cpp | 56 +++---- src/store/black-market.cpp | 12 +- src/store/cmd-store.cpp | 16 +- src/store/home.cpp | 24 +-- src/store/rumor.cpp | 8 +- src/store/service-checker.cpp | 38 ++--- src/store/store-key-processor.cpp | 4 +- src/store/store-util.cpp | 38 ++--- src/store/store.cpp | 18 +-- src/target/grid-selector.cpp | 26 +-- src/target/projection-path-calculator.cpp | 18 +-- src/target/target-checker.cpp | 8 +- src/target/target-describer.cpp | 24 +-- src/target/target-getter.cpp | 12 +- src/target/target-preparation.cpp | 28 ++-- src/target/target-setter.cpp | 46 +++--- src/term/screen-processor.cpp | 2 +- src/term/z-form.cpp | 20 +-- src/term/z-rand.cpp | 4 +- src/term/z-term.cpp | 22 +-- src/term/z-util.cpp | 6 +- src/util/buffer-shaper.cpp | 4 +- src/util/object-sort.cpp | 44 ++--- src/util/sort.cpp | 126 +++++++-------- src/util/string-processor.cpp | 18 +-- src/util/tag-sorter.cpp | 2 +- src/view/display-lore-drops.cpp | 12 +- src/view/display-lore-magics.cpp | 8 +- src/view/display-lore.cpp | 18 +-- src/view/display-map.cpp | 8 +- src/view/display-messages.cpp | 18 +-- src/view/display-player.cpp | 24 +-- src/view/status-first-page.cpp | 12 +- src/window/display-sub-window-spells.cpp | 6 +- src/window/display-sub-windows.cpp | 4 +- src/window/main-window-util.cpp | 4 +- src/wizard/cmd-wizard.cpp | 6 +- src/wizard/fixed-artifacts-spoiler.cpp | 8 +- src/wizard/items-spoiler.cpp | 2 +- src/wizard/spoiler-util.cpp | 20 +-- src/wizard/wizard-item-modifier.cpp | 54 +++---- src/wizard/wizard-special-process.cpp | 16 +- src/wizard/wizard-spells.cpp | 10 +- src/wizard/wizard-spoiler.cpp | 12 +- src/world/world-movement-processor.cpp | 8 +- src/world/world-turn-processor.cpp | 8 +- src/world/world.cpp | 4 +- 465 files changed, 5909 insertions(+), 5909 deletions(-) diff --git a/src/action/action-limited.cpp b/src/action/action-limited.cpp index 50ec67e9e..86be292f5 100644 --- a/src/action/action-limited.cpp +++ b/src/action/action-limited.cpp @@ -25,50 +25,50 @@ bool cmd_limit_cast(player_type *creature_ptr) if (is_in_dungeon(creature_ptr) && (d_info[creature_ptr->dungeon_idx].flags.has(DF::NO_MAGIC))) { msg_print(_("ダンジョンが魔法を吸収した！", "The dungeon absorbs all attempted magic!")); msg_print(NULL); - return TRUE; + return true; } if (creature_ptr->anti_magic) { msg_print(_("反魔法バリアが魔法を邪魔した！", "An anti-magic shell disrupts your magic!")); - return TRUE; + return true; } if (is_shero(creature_ptr) && (creature_ptr->pclass != CLASS_BERSERKER)) { msg_format(_("狂戦士化していて頭が回らない！", "You cannot think directly!")); - return TRUE; + return true; } - return FALSE; + return false; } bool cmd_limit_confused(player_type *creature_ptr) { if (creature_ptr->confused) { msg_print(_("混乱していてできない！", "You are too confused!")); - return TRUE; + return true; } - return FALSE; + return false; } bool cmd_limit_image(player_type *creature_ptr) { if (creature_ptr->image) { msg_print(_("幻覚が見えて集中できない！", "Your hallucinations prevent you from concentrating!")); - return TRUE; + return true; } - return FALSE; + return false; } bool cmd_limit_stun(player_type *creature_ptr) { if (creature_ptr->stun) { msg_print(_("頭が朦朧としていて集中できない！", "You are too stunned!")); - return TRUE; + return true; } - return FALSE; + return false; } bool cmd_limit_arena(player_type *creature_ptr) @@ -76,25 +76,25 @@ bool cmd_limit_arena(player_type *creature_ptr) if (creature_ptr->current_floor_ptr->inside_arena) { msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!")); msg_print(NULL); - return TRUE; + return true; } - return FALSE; + return false; } bool cmd_limit_blind(player_type *creature_ptr) { if (creature_ptr->blind) { msg_print(_("目が見えない。", "You can't see anything.")); - return TRUE; + return true; } if (no_lite(creature_ptr)) { msg_print(_("明かりがないので見えない。", "You have no light.")); - return TRUE; + return true; } - return FALSE; + return false; } bool cmd_limit_time_walk(player_type *creature_ptr) @@ -105,8 +105,8 @@ bool cmd_limit_time_walk(player_type *creature_ptr) msg_print(_("止まった時の中ではうまく働かないようだ。", "It shows no reaction.")); sound(SOUND_FAIL); - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/src/action/activation-execution.cpp b/src/action/activation-execution.cpp index 204e6eba1..87ab0dc50 100644 --- a/src/action/activation-execution.cpp +++ b/src/action/activation-execution.cpp @@ -89,7 +89,7 @@ static void decide_chance_fail(player_type *user_ptr, ae_type *ae_ptr) static void decide_activation_success(player_type *user_ptr, ae_type *ae_ptr) { if (user_ptr->pclass == CLASS_BERSERKER) { - ae_ptr->success = FALSE; + ae_ptr->success = false; return; } @@ -104,33 +104,33 @@ static void decide_activation_success(player_type *user_ptr, ae_type *ae_ptr) static bool check_activation_success(ae_type *ae_ptr) { if (ae_ptr->success) - return TRUE; + return true; if (flush_failure) flush(); msg_print(_("うまく始動させることができなかった。", "You failed to activate it properly.")); sound(SOUND_FAIL); - return FALSE; + return false; } static bool check_activation_conditions(player_type *user_ptr, ae_type *ae_ptr) { if (!check_activation_success(ae_ptr)) - return FALSE; + return false; if (ae_ptr->o_ptr->timeout) { msg_print(_("それは微かに音を立て、輝き、消えた...", "It whines, glows and fades...")); - return FALSE; + return false; } if (!ae_ptr->o_ptr->xtra4 && (ae_ptr->o_ptr->tval == TV_FLASK) && ((ae_ptr->o_ptr->sval == SV_LITE_TORCH) || (ae_ptr->o_ptr->sval == SV_LITE_LANTERN))) { msg_print(_("燃料がない。", "It has no fuel.")); PlayerEnergy(user_ptr).reset_player_turn(); - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -145,42 +145,42 @@ static bool activate_artifact(player_type *user_ptr, object_type *o_ptr) const activation_type *const act_ptr = find_activation_info(user_ptr, o_ptr); if (!act_ptr) { msg_print("Activation information is not found."); - return FALSE; + return false; } if (!switch_activation(user_ptr, &o_ptr, act_ptr, name)) - return FALSE; + return false; if (act_ptr->timeout.constant >= 0) { o_ptr->timeout = (s16b)act_ptr->timeout.constant; if (act_ptr->timeout.dice > 0) o_ptr->timeout += randint1(act_ptr->timeout.dice); - return TRUE; + return true; } switch (act_ptr->index) { case ACT_BR_FIRE: o_ptr->timeout = ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) ? 200 : 250; - return TRUE; + return true; case ACT_BR_COLD: o_ptr->timeout = ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) ? 200 : 250; - return TRUE; + return true; case ACT_TERROR: o_ptr->timeout = 3 * (user_ptr->lev + 10); - return TRUE; + return true; case ACT_MURAMASA: - return TRUE; + return true; default: msg_format("Special timeout is not implemented: %d.", act_ptr->index); - return FALSE; + return false; } } static bool activate_whistle(player_type *user_ptr, ae_type *ae_ptr) { if (ae_ptr->o_ptr->tval != TV_WHISTLE) - return FALSE; + return false; if (music_singing_any(user_ptr)) stop_singing(user_ptr); @@ -205,7 +205,7 @@ static bool activate_whistle(player_type *user_ptr, ae_type *ae_ptr) C_KILL(who, current_world_ptr->max_m_idx, MONSTER_IDX); ae_ptr->o_ptr->timeout = 100 + randint1(100); - return TRUE; + return true; } /*! diff --git a/src/action/movement-execution.cpp b/src/action/movement-execution.cpp index a21ab672e..5e19155cd 100644 --- a/src/action/movement-execution.cpp +++ b/src/action/movement-execution.cpp @@ -86,7 +86,7 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool floor_type *floor_ptr = creature_ptr->current_floor_ptr; grid_type *g_ptr = &floor_ptr->grid_array[y][x]; bool p_can_enter = player_can_enter(creature_ptr, g_ptr->feat, CEM_P_CAN_ENTER_PATTERN); - bool stormbringer = FALSE; + bool stormbringer = false; if (!floor_ptr->dun_level && !creature_ptr->wild_mode && ((x == 0) || (x == MAX_WID - 1) || (y == 0) || (y == MAX_HGT - 1))) { if (g_ptr->mimic && player_can_enter(creature_ptr, g_ptr->mimic, 0)) { if ((y == 0) && (x == 0)) { @@ -94,69 +94,69 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool creature_ptr->wilderness_x--; creature_ptr->oldpy = floor_ptr->height - 2; creature_ptr->oldpx = floor_ptr->width - 2; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } else if ((y == 0) && (x == MAX_WID - 1)) { creature_ptr->wilderness_y--; creature_ptr->wilderness_x++; creature_ptr->oldpy = floor_ptr->height - 2; creature_ptr->oldpx = 1; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } else if ((y == MAX_HGT - 1) && (x == 0)) { creature_ptr->wilderness_y++; creature_ptr->wilderness_x--; creature_ptr->oldpy = 1; creature_ptr->oldpx = floor_ptr->width - 2; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } else if ((y == MAX_HGT - 1) && (x == MAX_WID - 1)) { creature_ptr->wilderness_y++; creature_ptr->wilderness_x++; creature_ptr->oldpy = 1; creature_ptr->oldpx = 1; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } else if (y == 0) { creature_ptr->wilderness_y--; creature_ptr->oldpy = floor_ptr->height - 2; creature_ptr->oldpx = x; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } else if (y == MAX_HGT - 1) { creature_ptr->wilderness_y++; creature_ptr->oldpy = 1; creature_ptr->oldpx = x; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } else if (x == 0) { creature_ptr->wilderness_x--; creature_ptr->oldpx = floor_ptr->width - 2; creature_ptr->oldpy = y; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } else if (x == MAX_WID - 1) { creature_ptr->wilderness_x++; creature_ptr->oldpx = 1; creature_ptr->oldpy = y; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; } - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; PlayerEnergy(creature_ptr).set_player_turn_energy(100); return; } - p_can_enter = FALSE; + p_can_enter = false; } monster_type *m_ptr; m_ptr = &floor_ptr->m_list[g_ptr->m_idx]; if (creature_ptr->inventory_list[INVEN_MAIN_HAND].name1 == ART_STORMBRINGER) - stormbringer = TRUE; + stormbringer = true; if (creature_ptr->inventory_list[INVEN_SUB_HAND].name1 == ART_STORMBRINGER) - stormbringer = TRUE; + stormbringer = true; feature_type *f_ptr = &f_info[g_ptr->feat]; bool p_can_kill_walls = has_kill_wall(creature_ptr) && has_flag(f_ptr->flags, FF_HURT_DISI) && (!p_can_enter || !has_flag(f_ptr->flags, FF_LOS)) && !has_flag(f_ptr->flags, FF_PERMANENT); GAME_TEXT m_name[MAX_NLEN]; - bool can_move = TRUE; - bool do_past = FALSE; + bool can_move = true; + bool do_past = false; if (g_ptr->m_idx && (m_ptr->ml || p_can_enter || p_can_kill_walls)) { monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!is_hostile(m_ptr) @@ -174,17 +174,17 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool if ((stormbringer && (randint1(1000) > 666)) || (creature_ptr->pclass == CLASS_BERSERKER)) { do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE); - can_move = FALSE; + can_move = false; } else if (monster_can_cross_terrain(creature_ptr, floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].feat, r_ptr, 0)) { - do_past = TRUE; + do_past = true; } else { msg_format(_("%^sが邪魔だ！", "%^s is in your way!"), m_name); PlayerEnergy(creature_ptr).reset_player_turn(); - can_move = FALSE; + can_move = false; } } else { do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE); - can_move = FALSE; + can_move = false; } } @@ -195,16 +195,16 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool if (riding_r_ptr->flags1 & RF1_NEVER_MOVE) { msg_print(_("動けない！", "Can't move!")); energy.reset_player_turn(); - can_move = FALSE; + can_move = false; disturb(creature_ptr, FALSE, TRUE); } else if (monster_fear_remaining(riding_m_ptr)) { GAME_TEXT steed_name[MAX_NLEN]; monster_desc(creature_ptr, steed_name, riding_m_ptr, 0); msg_format(_("%sが恐怖していて制御できない。", "%^s is too scared to control."), steed_name); - can_move = FALSE; + can_move = false; disturb(creature_ptr, FALSE, TRUE); } else if (creature_ptr->riding_ryoute) { - can_move = FALSE; + can_move = false; disturb(creature_ptr, FALSE, TRUE); } else if (has_flag(f_ptr->flags, FF_CAN_FLY) && (riding_r_ptr->flags7 & RF7_CAN_FLY)) { /* Allow moving */ @@ -214,17 +214,17 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool && (has_flag(f_ptr->flags, FF_DEEP) || (riding_r_ptr->flags2 & RF2_AURA_FIRE))) { msg_format(_("%sの上に行けない。", "Can't swim."), f_info[get_feat_mimic(g_ptr)].name.c_str()); energy.reset_player_turn(); - can_move = FALSE; + can_move = false; disturb(creature_ptr, FALSE, TRUE); } else if (!has_flag(f_ptr->flags, FF_WATER) && (riding_r_ptr->flags7 & RF7_AQUATIC)) { msg_format(_("%sから上がれない。", "Can't land."), f_info[get_feat_mimic(&floor_ptr->grid_array[creature_ptr->y][creature_ptr->x])].name.c_str()); energy.reset_player_turn(); - can_move = FALSE; + can_move = false; disturb(creature_ptr, FALSE, TRUE); } else if (has_flag(f_ptr->flags, FF_LAVA) && !(riding_r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)) { msg_format(_("%sの上に行けない。", "Too hot to go through."), f_info[get_feat_mimic(g_ptr)].name.c_str()); energy.reset_player_turn(); - can_move = FALSE; + can_move = false; disturb(creature_ptr, FALSE, TRUE); } @@ -232,7 +232,7 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool GAME_TEXT steed_name[MAX_NLEN]; monster_desc(creature_ptr, steed_name, riding_m_ptr, 0); msg_format(_("%sが朦朧としていてうまく動けない！", "You cannot control stunned %s!"), steed_name); - can_move = FALSE; + can_move = false; disturb(creature_ptr, FALSE, TRUE); } } @@ -242,7 +242,7 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool msg_format(_("空を飛ばないと%sの上には行けない。", "You need to fly to go through the %s."), f_info[get_feat_mimic(g_ptr)].name.c_str()); energy.reset_player_turn(); creature_ptr->running = 0; - can_move = FALSE; + can_move = false; } else if (has_flag(f_ptr->flags, FF_TREE) && !p_can_kill_walls) { if ((creature_ptr->pclass != CLASS_RANGER) && !creature_ptr->levitation && (!creature_ptr->riding || !(riding_r_ptr->flags8 & RF8_WILD_WOOD))) { energy.mul_player_turn_energy(2); @@ -256,7 +256,7 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool FEAT_IDX feat = get_feat_mimic(g_ptr); feature_type *mimic_f_ptr = &f_info[feat]; concptr name = mimic_f_ptr->name.c_str(); - can_move = FALSE; + can_move = false; if (!(g_ptr->info & CAVE_MARK) && !player_can_see_bold(creature_ptr, y, x)) { if (boundary_floor(g_ptr, f_ptr, mimic_f_ptr)) msg_print(_("それ以上先には進めないようだ。", "You feel you cannot go any more.")); @@ -298,7 +298,7 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool energy.reset_player_turn(); disturb(creature_ptr, FALSE, TRUE); - can_move = FALSE; + can_move = false; } if (!can_move) diff --git a/src/action/mutation-execution.cpp b/src/action/mutation-execution.cpp index 66209537c..282ff9272 100644 --- a/src/action/mutation-execution.cpp +++ b/src/action/mutation-execution.cpp @@ -69,83 +69,83 @@ bool exe_mutation_power(player_type *creature_ptr, MUTA power) switch (power) { case MUTA::SPIT_ACID: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; stop_mouth(creature_ptr); msg_print(_("酸を吐きかけた...", "You spit acid...")); fire_ball(creature_ptr, GF_ACID, dir, lvl, 1 + (lvl / 30)); - return TRUE; + return true; case MUTA::BR_FIRE: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; stop_mouth(creature_ptr); msg_print(_("あなたは火炎のブレスを吐いた...", "You breathe fire...")); fire_breath(creature_ptr, GF_FIRE, dir, lvl * 2, 1 + (lvl / 20)); - return TRUE; + return true; case MUTA::HYPN_GAZE: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; msg_print(_("あなたの目は幻惑的になった...", "Your eyes look mesmerizing...")); (void)charm_monster(creature_ptr, dir, lvl); - return TRUE; + return true; case MUTA::TELEKINES: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; msg_print(_("集中している...", "You concentrate...")); fetch_item(creature_ptr, dir, lvl * 10, TRUE); - return TRUE; + return true; case MUTA::VTELEPORT: msg_print(_("集中している...", "You concentrate...")); teleport_player(creature_ptr, 10 + 4 * lvl, TELEPORT_SPONTANEOUS); - return TRUE; + return true; case MUTA::MIND_BLST: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; msg_print(_("集中している...", "You concentrate...")); fire_bolt(creature_ptr, GF_PSI, dir, damroll(3 + ((lvl - 1) / 5), 3)); - return TRUE; + return true; case MUTA::RADIATION: msg_print(_("体から放射能が発生した！", "Radiation flows from your body!")); fire_ball(creature_ptr, GF_NUKE, 0, (lvl * 2), 3 + (lvl / 20)); - return TRUE; + return true; case MUTA::VAMPIRISM: vampirism(creature_ptr); - return TRUE; + return true; case MUTA::SMELL_MET: stop_mouth(creature_ptr); (void)detect_treasure(creature_ptr, DETECT_RAD_DEFAULT); - return TRUE; + return true; case MUTA::SMELL_MON: stop_mouth(creature_ptr); (void)detect_monsters_normal(creature_ptr, DETECT_RAD_DEFAULT); - return TRUE; + return true; case MUTA::BLINK: teleport_player(creature_ptr, 10, TELEPORT_SPONTANEOUS); - return TRUE; + return true; case MUTA::EAT_ROCK: return eat_rock(creature_ptr); case MUTA::SWAP_POS: project_length = -1; if (!get_aim_dir(creature_ptr, &dir)) { project_length = 0; - return FALSE; + return false; } (void)teleport_swap(creature_ptr, dir); project_length = 0; - return TRUE; + return true; case MUTA::SHRIEK: stop_mouth(creature_ptr); (void)fire_ball(creature_ptr, GF_SOUND, 0, 2 * lvl, 8); (void)aggravate_monsters(creature_ptr, 0); - return TRUE; + return true; case MUTA::ILLUMINE: (void)lite_area(creature_ptr, damroll(2, (lvl / 2)), (lvl / 10) + 1); - return TRUE; + return true; case MUTA::DET_CURSE: for (int i = 0; i < INVEN_TOTAL; i++) { object_type *o_ptr = &creature_ptr->inventory_list[i]; @@ -155,23 +155,23 @@ bool exe_mutation_power(player_type *creature_ptr, MUTA power) o_ptr->feeling = FEEL_CURSED; } - return TRUE; + return true; case MUTA::BERSERK: (void)berserk(creature_ptr, randint1(25) + 25); - return TRUE; + return true; case MUTA::POLYMORPH: if (!get_check(_("変身します。よろしいですか？", "You will polymorph your self. Are you sure? "))) - return FALSE; + return false; do_poly_self(creature_ptr); - return TRUE; + return true; case MUTA::MIDAS_TCH: return alchemy(creature_ptr); case MUTA::GROW_MOLD: for (DIRECTION i = 0; i < 8; i++) summon_specific(creature_ptr, -1, creature_ptr->y, creature_ptr->x, lvl, SUMMON_MOLD, PM_FORCE_PET); - return TRUE; + return true; case MUTA::RESIST: { int num = lvl / 10; TIME_EFFECT dur = randint1(20) + 20; @@ -200,39 +200,39 @@ bool exe_mutation_power(player_type *creature_ptr, MUTA power) num--; } - return TRUE; + return true; } case MUTA::EARTHQUAKE: (void)earthquake(creature_ptr, creature_ptr->y, creature_ptr->x, 10, 0); - return TRUE; + return true; case MUTA::EAT_MAGIC: return eat_magic(creature_ptr, creature_ptr->lev * 2); case MUTA::WEIGH_MAG: report_magics(creature_ptr); - return TRUE; + return true; case MUTA::STERILITY: msg_print(_("突然頭が痛くなった！", "You suddenly have a headache!")); take_hit(creature_ptr, DAMAGE_LOSELIFE, randint1(17) + 17, _("禁欲を強いた疲労", "the strain of forcing abstinence")); creature_ptr->current_floor_ptr->num_repro += MAX_REPRO; - return TRUE; + return true; case MUTA::HIT_AND_AWAY: return hit_and_away(creature_ptr); case MUTA::DAZZLE: stun_monsters(creature_ptr, lvl * 4); confuse_monsters(creature_ptr, lvl * 4); turn_monsters(creature_ptr, lvl * 4); - return TRUE; + return true; case MUTA::LASER_EYE: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; fire_beam(creature_ptr, GF_LITE, dir, 2 * lvl); - return TRUE; + return true; case MUTA::RECALL: return recall_player(creature_ptr, randint0(21) + 15); case MUTA::BANISH: { if (!get_direction(creature_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; POSITION y = creature_ptr->y + ddy[dir]; POSITION x = creature_ptr->x + ddx[dir]; @@ -241,7 +241,7 @@ bool exe_mutation_power(player_type *creature_ptr, MUTA power) if (!g_ptr->m_idx) { msg_print(_("邪悪な存在を感じとれません！", "You sense no evil there!")); - return TRUE; + return true; } monster_type *m_ptr; @@ -258,18 +258,18 @@ bool exe_mutation_power(player_type *creature_ptr, MUTA power) delete_monster_idx(creature_ptr, g_ptr->m_idx); msg_print(_("その邪悪なモンスターは硫黄臭い煙とともに消え去った！", "The evil creature vanishes in a puff of sulfurous smoke!")); - return TRUE; + return true; } msg_print(_("祈りは効果がなかった！", "Your invocation is ineffectual!")); if (one_in_(13)) m_ptr->mflag2.set(MFLAG2::NOGENO); - return TRUE; + return true; } case MUTA::COLD_TOUCH: { if (!get_direction(creature_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; POSITION y = creature_ptr->y + ddy[dir]; POSITION x = creature_ptr->x + ddx[dir]; @@ -277,17 +277,17 @@ bool exe_mutation_power(player_type *creature_ptr, MUTA power) g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; if (!g_ptr->m_idx) { msg_print(_("あなたは何もない場所で手を振った。", "You wave your hands in the air.")); - return TRUE; + return true; } fire_bolt(creature_ptr, GF_COLD, dir, 2 * lvl); - return TRUE; + return true; } case MUTA::LAUNCHER: return do_cmd_throw(creature_ptr, 2 + lvl / 40, FALSE, -1); default: PlayerEnergy(creature_ptr).reset_player_turn(); msg_format(_("能力 %s は実装されていません。", "Power %s not implemented. Oops."), power); - return TRUE; + return true; } } diff --git a/src/action/open-close-execution.cpp b/src/action/open-close-execution.cpp index bd8b3eac2..e91d7acd2 100644 --- a/src/action/open-close-execution.cpp +++ b/src/action/open-close-execution.cpp @@ -42,13 +42,13 @@ bool exe_open(player_type *creature_ptr, POSITION y, POSITION x) PlayerEnergy(creature_ptr).set_player_turn_energy(100); if (!has_flag(f_ptr->flags, FF_OPEN)) { msg_format(_("%sはがっちりと閉じられているようだ。", "The %s appears to be stuck."), f_info[get_feat_mimic(g_ptr)].name.c_str()); - return FALSE; + return false; } if (!f_ptr->power) { cave_alter_feat(creature_ptr, y, x, FF_OPEN); sound(SOUND_OPENDOOR); - return FALSE; + return false; } int i = creature_ptr->skill_dis; @@ -68,14 +68,14 @@ bool exe_open(player_type *creature_ptr, POSITION y, POSITION x) flush(); msg_print(_("鍵をはずせなかった。", "You failed to pick the lock.")); - return TRUE; + return true; } msg_print(_("鍵をはずした。", "You have picked the lock.")); cave_alter_feat(creature_ptr, y, x, FF_OPEN); sound(SOUND_OPENDOOR); gain_exp(creature_ptr, 1); - return FALSE; + return false; } /*! @@ -94,7 +94,7 @@ bool exe_close(player_type *creature_ptr, POSITION y, POSITION x) { grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; FEAT_IDX old_feat = g_ptr->feat; - bool more = FALSE; + bool more = false; PlayerEnergy(creature_ptr).set_player_turn_energy(100); if (!has_flag(f_info[old_feat].flags, FF_CLOSE)) return more; @@ -134,7 +134,7 @@ bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x) grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; feature_type *f_ptr = &f_info[g_ptr->feat]; if (!is_closed_door(creature_ptr, g_ptr->feat)) - return FALSE; + return false; if (!has_flag(f_ptr->flags, FF_OPEN)) { msg_format(_("%sはがっちりと閉じられているようだ。", "The %s appears to be stuck."), f_info[get_feat_mimic(g_ptr)].name.c_str()); @@ -167,7 +167,7 @@ bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x) sound(SOUND_OPENDOOR); } - return TRUE; + return true; } /*! @@ -186,7 +186,7 @@ bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x) */ bool exe_disarm_chest(player_type *creature_ptr, POSITION y, POSITION x, OBJECT_IDX o_idx) { - bool more = FALSE; + bool more = false; object_type *o_ptr = &creature_ptr->current_floor_ptr->o_list[o_idx]; PlayerEnergy(creature_ptr).set_player_turn_energy(100); int i = creature_ptr->skill_dis; @@ -211,7 +211,7 @@ bool exe_disarm_chest(player_type *creature_ptr, POSITION y, POSITION x, OBJECT_ gain_exp(creature_ptr, o_ptr->pval); o_ptr->pval = (0 - o_ptr->pval); } else if ((i > 5) && (randint1(i) > 5)) { - more = TRUE; + more = true; if (flush_failure) flush(); @@ -246,7 +246,7 @@ bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir feature_type *f_ptr = &f_info[g_ptr->feat]; concptr name = f_ptr->name.c_str(); int power = f_ptr->power; - bool more = FALSE; + bool more = false; int i = creature_ptr->skill_dis; PlayerEnergy(creature_ptr).set_player_turn_energy(100); if (creature_ptr->blind || no_lite(creature_ptr)) @@ -269,7 +269,7 @@ bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir flush(); msg_format(_("%sの解除に失敗した。", "You failed to disarm the %s."), name); - more = TRUE; + more = true; } else { msg_format(_("%sを作動させてしまった！", "You set off the %s!"), name); exe_movement(creature_ptr, dir, easy_disarm, FALSE); @@ -298,7 +298,7 @@ bool exe_bash(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir) feature_type *f_ptr = &f_info[g_ptr->feat]; int bash = adj_str_blow[creature_ptr->stat_index[A_STR]]; int temp = f_ptr->power; - bool more = FALSE; + bool more = false; concptr name = f_info[get_feat_mimic(g_ptr)].name.c_str(); PlayerEnergy(creature_ptr).set_player_turn_energy(100); msg_format(_("%sに体当たりをした！", "You smash into the %s!"), name); @@ -321,7 +321,7 @@ bool exe_bash(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir) exe_movement(creature_ptr, dir, FALSE, FALSE); } else if (randint0(100) < adj_dex_safe[creature_ptr->stat_index[A_DEX]] + creature_ptr->lev) { msg_format(_("この%sは頑丈だ。", "The %s holds firm."), name); - more = TRUE; + more = true; } else { msg_print(_("体のバランスをくずしてしまった。", "You are off-balance.")); (void)set_paralyzed(creature_ptr, creature_ptr->paralyzed + 2 + randint0(2)); diff --git a/src/action/run-execution.cpp b/src/action/run-execution.cpp index b66cb17e0..d04f8c438 100644 --- a/src/action/run-execution.cpp +++ b/src/action/run-execution.cpp @@ -60,12 +60,12 @@ static bool see_wall(player_type *creature_ptr, DIRECTION dir, POSITION y, POSIT x += ddx[dir]; floor_type *floor_ptr = creature_ptr->current_floor_ptr; if (!in_bounds2(floor_ptr, y, x)) - return FALSE; + return false; grid_type *g_ptr; g_ptr = &floor_ptr->grid_array[y][x]; if (!(g_ptr->info & CAVE_MARK)) - return FALSE; + return false; s16b feat = get_feat_mimic(g_ptr); feature_type *f_ptr = &f_info[feat]; @@ -73,12 +73,12 @@ static bool see_wall(player_type *creature_ptr, DIRECTION dir, POSITION y, POSIT return !has_flag(f_ptr->flags, FF_DOOR); if (has_flag(f_ptr->flags, FF_AVOID_RUN) && !ignore_avoid_run) - return TRUE; + return true; if (!has_flag(f_ptr->flags, FF_MOVE) && !has_flag(f_ptr->flags, FF_CAN_FLY)) return !has_flag(f_ptr->flags, FF_DOOR); - return FALSE; + return false; } /*! @@ -102,12 +102,12 @@ static void run_init(player_type *creature_ptr, DIRECTION dir) { find_current = dir; find_prevdir = dir; - find_openarea = TRUE; - find_breakright = find_breakleft = FALSE; - bool deepleft = FALSE; - bool deepright = FALSE; - bool shortright = FALSE; - bool shortleft = FALSE; + find_openarea = true; + find_breakright = find_breakleft = false; + bool deepleft = false; + bool deepright = false; + bool shortright = false; + bool shortleft = false; creature_ptr->run_py = creature_ptr->y; creature_ptr->run_px = creature_ptr->x; int row = creature_ptr->y + ddy[dir]; @@ -115,25 +115,25 @@ static void run_init(player_type *creature_ptr, DIRECTION dir) ignore_avoid_run = cave_has_flag_bold(creature_ptr->current_floor_ptr, row, col, FF_AVOID_RUN); int i = chome[dir]; if (see_wall(creature_ptr, cycle[i + 1], creature_ptr->y, creature_ptr->x)) { - find_breakleft = TRUE; - shortleft = TRUE; + find_breakleft = true; + shortleft = true; } else if (see_wall(creature_ptr, cycle[i + 1], row, col)) { - find_breakleft = TRUE; - deepleft = TRUE; + find_breakleft = true; + deepleft = true; } if (see_wall(creature_ptr, cycle[i - 1], creature_ptr->y, creature_ptr->x)) { - find_breakright = TRUE; - shortright = TRUE; + find_breakright = true; + shortright = true; } else if (see_wall(creature_ptr, cycle[i - 1], row, col)) { - find_breakright = TRUE; - deepright = TRUE; + find_breakright = true; + deepright = true; } if (!find_breakleft || !find_breakright) return; - find_openarea = FALSE; + find_openarea = false; if (dir & 0x01) { if (deepleft && !deepright) { find_prevdir = cycle[i - 1]; @@ -170,15 +170,15 @@ static bool see_nothing(player_type *creature_ptr, DIRECTION dir, POSITION y, PO floor_type *floor_ptr = creature_ptr->current_floor_ptr; if (!in_bounds2(floor_ptr, y, x)) - return TRUE; + return true; if (floor_ptr->grid_array[y][x].info & (CAVE_MARK)) - return FALSE; + return false; if (player_can_see_bold(creature_ptr, y, x)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -195,7 +195,7 @@ static bool run_test(player_type *creature_ptr) int max = (prev_dir & 0x01) + 1; floor_type *floor_ptr = creature_ptr->current_floor_ptr; if ((disturb_trap_detect || alert_trap_detect) && creature_ptr->dtrap && !(floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_IN_DETECT)) { - creature_ptr->dtrap = FALSE; + creature_ptr->dtrap = false; if (!(floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_UNSAFE)) { if (alert_trap_detect) { msg_print(_("* 注意:この先はトラップの感知範囲外です！ *", "*Leaving trap detect region!*")); @@ -203,7 +203,7 @@ static bool run_test(player_type *creature_ptr) if (disturb_trap_detect) { /* Break Run */ - return TRUE; + return true; } } } @@ -222,44 +222,44 @@ static bool run_test(player_type *creature_ptr) if (g_ptr->m_idx) { monster_type *m_ptr = &floor_ptr->m_list[g_ptr->m_idx]; if (m_ptr->ml) - return TRUE; + return true; } for (const auto this_o_idx : g_ptr->o_idx_list) { object_type *o_ptr; o_ptr = &floor_ptr->o_list[this_o_idx]; if (o_ptr->marked & OM_FOUND) - return TRUE; + return true; } - bool inv = TRUE; + bool inv = true; if (g_ptr->info & (CAVE_MARK)) { bool notice = has_flag(f_ptr->flags, FF_NOTICE); if (notice && has_flag(f_ptr->flags, FF_MOVE)) { if (find_ignore_doors && has_flag(f_ptr->flags, FF_DOOR) && has_flag(f_ptr->flags, FF_CLOSE)) { - notice = FALSE; + notice = false; } else if (find_ignore_stairs && has_flag(f_ptr->flags, FF_STAIRS)) { - notice = FALSE; + notice = false; } else if (has_flag(f_ptr->flags, FF_LAVA) && (has_immune_fire(creature_ptr) || is_invuln(creature_ptr))) { - notice = FALSE; + notice = false; } else if (has_flag(f_ptr->flags, FF_WATER) && has_flag(f_ptr->flags, FF_DEEP) && (creature_ptr->levitation || creature_ptr->can_swim || (calc_inventory_weight(creature_ptr) <= calc_weight_limit(creature_ptr)))) { - notice = FALSE; + notice = false; } } if (notice) - return TRUE; + return true; - inv = FALSE; + inv = false; } if (!inv && see_wall(creature_ptr, 0, row, col)) { if (find_openarea) { if (i < 0) { - find_breakright = TRUE; + find_breakright = true; } else if (i > 0) { - find_breakleft = TRUE; + find_breakleft = true; } } @@ -275,10 +275,10 @@ static bool run_test(player_type *creature_ptr) } if (option2) - return TRUE; + return true; if (option != cycle[chome[prev_dir] + i - 1]) - return TRUE; + return true; if (new_dir & 0x01) { check_dir = cycle[chome[prev_dir] + i - 2]; @@ -295,20 +295,20 @@ static bool run_test(player_type *creature_ptr) for (int i = -max; i < 0; i++) { if (!see_wall(creature_ptr, cycle[chome[prev_dir] + i], creature_ptr->y, creature_ptr->x)) { if (find_breakright) - return TRUE; + return true; } else { if (find_breakleft) - return TRUE; + return true; } } for (int i = max; i > 0; i--) { if (!see_wall(creature_ptr, cycle[chome[prev_dir] + i], creature_ptr->y, creature_ptr->x)) { if (find_breakleft) - return TRUE; + return true; } else { if (find_breakright) - return TRUE; + return true; } } @@ -316,7 +316,7 @@ static bool run_test(player_type *creature_ptr) } if (!option) - return TRUE; + return true; if (!option2) { find_current = option; @@ -337,7 +337,7 @@ static bool run_test(player_type *creature_ptr) return see_wall(creature_ptr, find_current, creature_ptr->y, creature_ptr->x); } - return TRUE; + return true; } if (find_cut) { @@ -360,7 +360,7 @@ static bool run_test(player_type *creature_ptr) void run_step(player_type *creature_ptr, DIRECTION dir) { if (dir) { - ignore_avoid_run = TRUE; + ignore_avoid_run = true; if (see_wall(creature_ptr, dir, creature_ptr->y, creature_ptr->x)) { sound(SOUND_HITWALL); msg_print(_("その方向には走れません。", "You cannot run in that direction.")); diff --git a/src/action/throw-util.cpp b/src/action/throw-util.cpp index e5f4075a4..1465b1ed8 100644 --- a/src/action/throw-util.cpp +++ b/src/action/throw-util.cpp @@ -13,12 +13,12 @@ it_type *initialize_it_type( item_throw_ptr->boomerang = boomerang; item_throw_ptr->shuriken = shuriken; item_throw_ptr->q_ptr = q_ptr; - item_throw_ptr->hit_body = FALSE; - item_throw_ptr->hit_wall = FALSE; - item_throw_ptr->equiped_item = FALSE; - item_throw_ptr->return_when_thrown = FALSE; + item_throw_ptr->hit_body = false; + item_throw_ptr->hit_wall = false; + item_throw_ptr->equiped_item = false; + item_throw_ptr->return_when_thrown = false; item_throw_ptr->msec = delay_factor_val * delay_factor_val * delay_factor_val; - item_throw_ptr->come_back = FALSE; - item_throw_ptr->do_drop = TRUE; + item_throw_ptr->come_back = false; + item_throw_ptr->do_drop = true; return item_throw_ptr; } diff --git a/src/action/travel-execution.cpp b/src/action/travel-execution.cpp index b63b2ba3e..fc142d206 100644 --- a/src/action/travel-execution.cpp +++ b/src/action/travel-execution.cpp @@ -38,7 +38,7 @@ static DIRECTION travel_test(player_type *creature_ptr, DIRECTION prev_dir) floor_type *floor_ptr = creature_ptr->current_floor_ptr; if ((disturb_trap_detect || alert_trap_detect) && creature_ptr->dtrap && !(floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_IN_DETECT)) { - creature_ptr->dtrap = FALSE; + creature_ptr->dtrap = false; if (!(floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_UNSAFE)) { if (alert_trap_detect) msg_print(_("* 注意:この先はトラップの感知範囲外です！ *", "*Leaving trap detect region!*")); diff --git a/src/action/tunnel-execution.cpp b/src/action/tunnel-execution.cpp index ff95801fc..1b8bee7bf 100644 --- a/src/action/tunnel-execution.cpp +++ b/src/action/tunnel-execution.cpp @@ -30,15 +30,15 @@ static bool do_cmd_tunnel_test(floor_type *floor_ptr, POSITION y, POSITION x) grid_type *g_ptr = &floor_ptr->grid_array[y][x]; if (!(g_ptr->info & CAVE_MARK)) { msg_print(_("そこには何も見当たらない。", "You see nothing there.")); - return FALSE; + return false; } if (!cave_has_flag_grid(g_ptr, FF_TUNNEL)) { msg_print(_("そこには掘るものが見当たらない。", "You see nothing there to tunnel.")); - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -58,9 +58,9 @@ bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x) feature_type *f_ptr, *mimic_f_ptr; int power; concptr name; - bool more = FALSE; + bool more = false; if (!do_cmd_tunnel_test(creature_ptr->current_floor_ptr, y, x)) - return FALSE; + return false; PlayerEnergy(creature_ptr).set_player_turn_energy(100); g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; @@ -81,7 +81,7 @@ bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x) creature_ptr->update |= PU_FLOW; } else { msg_format(_("%sをくずしている。", "You dig into the %s."), name); - more = TRUE; + more = true; } } else { bool tree = has_flag(mimic_f_ptr->flags, FF_TREE); @@ -108,7 +108,7 @@ bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x) msg_format(_("%sに穴を掘っている。", "You tunnel into the %s."), name); } - more = TRUE; + more = true; } } diff --git a/src/artifact/random-art-characteristics.cpp b/src/artifact/random-art-characteristics.cpp index 4fc5fdd95..93f9ecd65 100644 --- a/src/artifact/random-art-characteristics.cpp +++ b/src/artifact/random-art-characteristics.cpp @@ -190,39 +190,39 @@ bool has_extreme_damage_rate(player_type *player_ptr, object_type *o_ptr) object_flags(player_ptr, o_ptr, flgs); if (has_flag(flgs, TR_VAMPIRIC)) { if (has_flag(flgs, TR_BLOWS) && (o_ptr->pval == 1) && (calc_arm_avgdamage(player_ptr, o_ptr) > 52)) { - return TRUE; + return true; } if (has_flag(flgs, TR_BLOWS) && (o_ptr->pval == 2) && (calc_arm_avgdamage(player_ptr, o_ptr) > 43)) { - return TRUE; + return true; } if (has_flag(flgs, TR_BLOWS) && (o_ptr->pval == 3) && (calc_arm_avgdamage(player_ptr, o_ptr) > 33)) { - return TRUE; + return true; } if (calc_arm_avgdamage(player_ptr, o_ptr) > 63) { - return TRUE; + return true; } - return FALSE; + return false; } if (has_flag(flgs, TR_BLOWS) && (o_ptr->pval == 1) && (calc_arm_avgdamage(player_ptr, o_ptr) > 65)) { - return TRUE; + return true; } if (has_flag(flgs, TR_BLOWS) && (o_ptr->pval == 2) && (calc_arm_avgdamage(player_ptr, o_ptr) > 52)) { - return TRUE; + return true; } if (has_flag(flgs, TR_BLOWS) && (o_ptr->pval == 3) && (calc_arm_avgdamage(player_ptr, o_ptr) > 40)) { - return TRUE; + return true; } if (calc_arm_avgdamage(player_ptr, o_ptr) > 75) { - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/src/artifact/random-art-generator.cpp b/src/artifact/random-art-generator.cpp index 1fe3368ac..4f1a05dc3 100644 --- a/src/artifact/random-art-generator.cpp +++ b/src/artifact/random-art-generator.cpp @@ -49,17 +49,17 @@ static bool weakening_artifact(player_type *player_ptr, object_type *o_ptr) if (has_flag(flgs, TR_KILL_EVIL)) { remove_flag(o_ptr->art_flags, TR_KILL_EVIL); add_flag(o_ptr->art_flags, TR_SLAY_EVIL); - return TRUE; + return true; } if (k_ptr->dd < o_ptr->dd) { o_ptr->dd--; - return TRUE; + return true; } if (k_ptr->ds < o_ptr->ds) { o_ptr->ds--; - return TRUE; + return true; } if (o_ptr->to_d > 10) { @@ -68,10 +68,10 @@ static bool weakening_artifact(player_type *player_ptr, object_type *o_ptr) o_ptr->to_d = 10; } - return TRUE; + return true; } - return FALSE; + return false; } static void set_artifact_bias(player_type *player_ptr, object_type *o_ptr, int *warrior_artifact_bias) @@ -167,12 +167,12 @@ static void decide_warrior_bias(player_type *player_ptr, object_type *o_ptr, con static bool decide_random_art_cursed(const bool a_scroll, object_type *o_ptr) { if (!a_scroll && one_in_(A_CURSED)) - return TRUE; + return true; if (((o_ptr->tval == TV_AMULET) || (o_ptr->tval == TV_RING)) && object_is_cursed(o_ptr)) - return TRUE; + return true; - return FALSE; + return false; } static int decide_random_art_power(const bool a_cursed) @@ -198,7 +198,7 @@ static void invest_powers(player_type *player_ptr, object_type *o_ptr, int *powe case 1: case 2: random_plus(o_ptr); - *has_pval = TRUE; + *has_pval = true; break; case 3: case 4: @@ -440,5 +440,5 @@ bool become_random_artifact(player_type *player_ptr, object_type *o_ptr, bool a_ weakening_artifact(player_ptr, o_ptr); generate_unnatural_random_artifact(player_ptr, o_ptr, a_scroll, power_level, max_powers, total_flags); - return TRUE; + return true; } diff --git a/src/artifact/random-art-misc.cpp b/src/artifact/random-art-misc.cpp index 00bc1bcbb..febca284e 100644 --- a/src/artifact/random-art-misc.cpp +++ b/src/artifact/random-art-misc.cpp @@ -14,7 +14,7 @@ static bool invest_misc_ranger(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SUST_CON)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SUST_CON); return one_in_(2); @@ -23,7 +23,7 @@ static bool invest_misc_ranger(object_type *o_ptr) static bool invest_misc_strength(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SUST_STR)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SUST_STR); return one_in_(2); @@ -32,7 +32,7 @@ static bool invest_misc_strength(object_type *o_ptr) static bool invest_misc_wisdom(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SUST_WIS)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SUST_WIS); return one_in_(2); @@ -41,7 +41,7 @@ static bool invest_misc_wisdom(object_type *o_ptr) static bool invest_misc_intelligence(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SUST_INT)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SUST_INT); return one_in_(2); @@ -50,7 +50,7 @@ static bool invest_misc_intelligence(object_type *o_ptr) static bool invest_misc_dexterity(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SUST_DEX)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SUST_DEX); return one_in_(2); @@ -59,7 +59,7 @@ static bool invest_misc_dexterity(object_type *o_ptr) static bool invest_misc_constitution(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SUST_CON)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SUST_CON); return one_in_(2); @@ -68,7 +68,7 @@ static bool invest_misc_constitution(object_type *o_ptr) static bool invest_misc_charisma(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SUST_CHR)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SUST_CHR); return one_in_(2); @@ -77,7 +77,7 @@ static bool invest_misc_charisma(object_type *o_ptr) static bool invest_misc_chaos(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_TELEPORT)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_TELEPORT); return one_in_(2); @@ -86,7 +86,7 @@ static bool invest_misc_chaos(object_type *o_ptr) static bool invest_misc_res_curse(object_type* o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_CURSE)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_CURSE); return one_in_(2); @@ -120,9 +120,9 @@ static bool switch_misc_bias(object_type *o_ptr) if (!(has_flag(o_ptr->art_flags, TR_LITE_1))) add_flag(o_ptr->art_flags, TR_LITE_1); - return FALSE; + return false; default: - return FALSE; + return false; } } diff --git a/src/artifact/random-art-pval-investor.cpp b/src/artifact/random-art-pval-investor.cpp index fd372b21c..da3369347 100644 --- a/src/artifact/random-art-pval-investor.cpp +++ b/src/artifact/random-art-pval-investor.cpp @@ -16,7 +16,7 @@ static bool random_art_bias_strength(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_STR)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_STR); return one_in_(2); @@ -25,7 +25,7 @@ static bool random_art_bias_strength(object_type *o_ptr) static bool random_art_bias_intelligence(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_INT)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_INT); return one_in_(2); @@ -34,7 +34,7 @@ static bool random_art_bias_intelligence(object_type *o_ptr) static bool random_art_bias_wisdom(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_WIS)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_WIS); return one_in_(2); @@ -43,7 +43,7 @@ static bool random_art_bias_wisdom(object_type *o_ptr) static bool random_art_bias_dexterity(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_DEX)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_DEX); return one_in_(2); @@ -52,7 +52,7 @@ static bool random_art_bias_dexterity(object_type *o_ptr) static bool random_art_bias_constitution(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_CON)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_CON); return one_in_(2); @@ -61,7 +61,7 @@ static bool random_art_bias_constitution(object_type *o_ptr) static bool random_art_bias_charisma(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_CHR)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_CHR); return one_in_(2); @@ -70,7 +70,7 @@ static bool random_art_bias_charisma(object_type *o_ptr) static bool random_art_bias_magic_mastery(object_type *o_ptr) { if ((o_ptr->tval != TV_GLOVES) || has_flag(o_ptr->art_flags, TR_MAGIC_MASTERY)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_MAGIC_MASTERY); return one_in_(2); @@ -79,7 +79,7 @@ static bool random_art_bias_magic_mastery(object_type *o_ptr) static bool random_art_bias_stealth(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_STEALTH)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_STEALTH); return one_in_(2); @@ -88,7 +88,7 @@ static bool random_art_bias_stealth(object_type *o_ptr) static bool random_art_bias_search(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SEARCH)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SEARCH); return one_in_(2); @@ -119,7 +119,7 @@ static bool switch_random_art_bias(object_type *o_ptr) case BIAS_CHR: return random_art_bias_charisma(o_ptr); default: - return FALSE; + return false; } } @@ -127,7 +127,7 @@ static bool random_art_bias_decrease_mana(object_type *o_ptr) { if (((o_ptr->artifact_bias != BIAS_MAGE) && (o_ptr->artifact_bias != BIAS_PRIESTLY)) || (o_ptr->tval != TV_SOFT_ARMOR) || (o_ptr->sval != SV_ROBE) || has_flag(o_ptr->art_flags, TR_DEC_MANA) || !one_in_(3)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_DEC_MANA); return one_in_(2); diff --git a/src/artifact/random-art-resistance.cpp b/src/artifact/random-art-resistance.cpp index df55e6ea4..73bceb0d1 100644 --- a/src/artifact/random-art-resistance.cpp +++ b/src/artifact/random-art-resistance.cpp @@ -12,7 +12,7 @@ static bool random_art_resistance_acid(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_ACID)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_ACID); return one_in_(2); @@ -21,7 +21,7 @@ static bool random_art_resistance_acid(object_type *o_ptr) static bool random_art_immunity_acid(object_type *o_ptr) { if (!one_in_(BIAS_LUCK) || has_flag(o_ptr->art_flags, TR_IM_ACID)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_IM_ACID); if (one_in_(IM_LUCK)) @@ -36,7 +36,7 @@ static bool random_art_immunity_acid(object_type *o_ptr) static bool random_art_resistance_elec(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_ELEC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_ELEC); return one_in_(2); @@ -45,7 +45,7 @@ static bool random_art_resistance_elec(object_type *o_ptr) static bool random_art_aura_elec(object_type *o_ptr) { if ((o_ptr->tval < TV_CLOAK) || (o_ptr->tval > TV_HARD_ARMOR) || has_flag(o_ptr->art_flags, TR_SH_ELEC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SH_ELEC); return one_in_(2); @@ -54,7 +54,7 @@ static bool random_art_aura_elec(object_type *o_ptr) static bool random_art_immunity_elec(object_type *o_ptr) { if (!one_in_(BIAS_LUCK) || has_flag(o_ptr->art_flags, TR_IM_ELEC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_IM_ELEC); if (one_in_(IM_LUCK)) @@ -69,7 +69,7 @@ static bool random_art_immunity_elec(object_type *o_ptr) static bool random_art_resistance_fire(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_FIRE)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_FIRE); return one_in_(2); @@ -78,7 +78,7 @@ static bool random_art_resistance_fire(object_type *o_ptr) static bool random_art_aura_fire(object_type *o_ptr) { if ((o_ptr->tval < TV_CLOAK) || (o_ptr->tval > TV_HARD_ARMOR) || has_flag(o_ptr->art_flags, TR_SH_FIRE)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SH_FIRE); return one_in_(2); @@ -87,7 +87,7 @@ static bool random_art_aura_fire(object_type *o_ptr) static bool random_art_immunity_fire(object_type *o_ptr) { if (!one_in_(BIAS_LUCK) || has_flag(o_ptr->art_flags, TR_IM_FIRE)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_IM_FIRE); if (one_in_(IM_LUCK)) @@ -102,7 +102,7 @@ static bool random_art_immunity_fire(object_type *o_ptr) static bool random_art_resistance_cold(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_COLD)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_COLD); return one_in_(2); @@ -111,7 +111,7 @@ static bool random_art_resistance_cold(object_type *o_ptr) static bool random_art_aura_cold(object_type *o_ptr) { if ((o_ptr->tval < TV_CLOAK) || (o_ptr->tval > TV_HARD_ARMOR) || has_flag(o_ptr->art_flags, TR_SH_COLD)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SH_COLD); return one_in_(2); @@ -120,7 +120,7 @@ static bool random_art_aura_cold(object_type *o_ptr) static bool random_art_immunity_cold(object_type *o_ptr) { if (!one_in_(BIAS_LUCK) || has_flag(o_ptr->art_flags, TR_IM_COLD)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_IM_COLD); if (one_in_(IM_LUCK)) @@ -135,7 +135,7 @@ static bool random_art_immunity_cold(object_type *o_ptr) static bool random_art_resistance_pois(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_POIS)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_POIS); return one_in_(2); @@ -144,7 +144,7 @@ static bool random_art_resistance_pois(object_type *o_ptr) static bool random_art_resistance_fear(object_type *o_ptr) { if (one_in_(3) || has_flag(o_ptr->art_flags, TR_RES_FEAR)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_FEAR); return one_in_(2); @@ -153,7 +153,7 @@ static bool random_art_resistance_fear(object_type *o_ptr) static bool random_art_resistance_no_magic(object_type *o_ptr) { if (!one_in_(3) || has_flag(o_ptr->art_flags, TR_NO_MAGIC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_NO_MAGIC); return one_in_(2); @@ -162,7 +162,7 @@ static bool random_art_resistance_no_magic(object_type *o_ptr) static bool random_art_resistance_nether(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_NETHER)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_NETHER); return one_in_(2); @@ -171,7 +171,7 @@ static bool random_art_resistance_nether(object_type *o_ptr) static bool random_art_resistance_dark(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_DARK)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_DARK); return one_in_(2); @@ -180,7 +180,7 @@ static bool random_art_resistance_dark(object_type *o_ptr) static bool random_art_resistance_chaos(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_CHAOS)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_CHAOS); return one_in_(2); @@ -189,7 +189,7 @@ static bool random_art_resistance_chaos(object_type *o_ptr) static bool random_art_resistance_confusion(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_CONF)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_CONF); return one_in_(2); @@ -198,7 +198,7 @@ static bool random_art_resistance_confusion(object_type *o_ptr) static bool random_art_resistance_disenchant(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_RES_DISEN)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_RES_DISEN); return one_in_(2); @@ -224,7 +224,7 @@ static bool switch_random_art_resistance(object_type *o_ptr) case BIAS_CHAOS: return random_art_resistance_chaos(o_ptr) || random_art_resistance_confusion(o_ptr) || random_art_resistance_disenchant(o_ptr); default: - return FALSE; + return false; } } diff --git a/src/artifact/random-art-slay.cpp b/src/artifact/random-art-slay.cpp index 400ade862..d60b60af6 100644 --- a/src/artifact/random-art-slay.cpp +++ b/src/artifact/random-art-slay.cpp @@ -13,7 +13,7 @@ static bool random_art_slay_bow(object_type *o_ptr) { if (o_ptr->tval != TV_BOW) - return FALSE; + return false; switch (randint1(6)) { case 1: @@ -26,7 +26,7 @@ static bool random_art_slay_bow(object_type *o_ptr) if ((o_ptr->artifact_bias == BIAS_NONE) && one_in_(9)) o_ptr->artifact_bias = BIAS_RANGER; - return TRUE; + return true; default: add_flag(o_ptr->art_flags, TR_XTRA_SHOTS); if (!one_in_(7)) @@ -35,14 +35,14 @@ static bool random_art_slay_bow(object_type *o_ptr) if ((o_ptr->artifact_bias == BIAS_NONE) && one_in_(9)) o_ptr->artifact_bias = BIAS_RANGER; - return TRUE; + return true; } } static bool random_art_slay_chaos(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_CHAOTIC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_CHAOTIC); return one_in_(2); @@ -51,7 +51,7 @@ static bool random_art_slay_chaos(object_type *o_ptr) static bool random_art_brand_magical(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_BRAND_MAGIC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_BRAND_MAGIC); return one_in_(3); @@ -60,7 +60,7 @@ static bool random_art_brand_magical(object_type *o_ptr) static bool random_art_slay_vampiric(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_VAMPIRIC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_VAMPIRIC); return one_in_(2); @@ -69,7 +69,7 @@ static bool random_art_slay_vampiric(object_type *o_ptr) static bool random_art_slay_brand_acid(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_BRAND_ACID)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_BRAND_ACID); return one_in_(2); @@ -78,7 +78,7 @@ static bool random_art_slay_brand_acid(object_type *o_ptr) static bool random_art_slay_brand_elec(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_BRAND_ELEC)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_BRAND_ELEC); return one_in_(2); @@ -87,7 +87,7 @@ static bool random_art_slay_brand_elec(object_type *o_ptr) static bool random_art_slay_brand_fire(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_BRAND_FIRE)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_BRAND_FIRE); return one_in_(2); @@ -96,7 +96,7 @@ static bool random_art_slay_brand_fire(object_type *o_ptr) static bool random_art_slay_brand_cold(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_BRAND_COLD)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_BRAND_COLD); return one_in_(2); @@ -105,7 +105,7 @@ static bool random_art_slay_brand_cold(object_type *o_ptr) static bool random_art_slay_brand_pois(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_BRAND_POIS) || one_in_(2)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_BRAND_POIS); return one_in_(2); @@ -114,7 +114,7 @@ static bool random_art_slay_brand_pois(object_type *o_ptr) static bool random_art_slay_animal(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SLAY_ANIMAL)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SLAY_ANIMAL); return one_in_(2); @@ -123,7 +123,7 @@ static bool random_art_slay_animal(object_type *o_ptr) static bool random_art_slay_evil(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SLAY_EVIL)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SLAY_EVIL); return one_in_(2); @@ -132,7 +132,7 @@ static bool random_art_slay_evil(object_type *o_ptr) static bool random_art_slay_undead(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SLAY_UNDEAD)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SLAY_UNDEAD); return one_in_(2); @@ -141,7 +141,7 @@ static bool random_art_slay_undead(object_type *o_ptr) static bool random_art_slay_demon(object_type *o_ptr) { if (has_flag(o_ptr->art_flags, TR_SLAY_DEMON)) - return FALSE; + return false; add_flag(o_ptr->art_flags, TR_SLAY_DEMON); return one_in_(2); @@ -159,7 +159,7 @@ static bool switch_random_art_slay(object_type *o_ptr) if (((o_ptr->tval == TV_SWORD) || (o_ptr->tval == TV_POLEARM)) && !has_flag(o_ptr->art_flags, TR_BLESSED)) add_flag(o_ptr->art_flags, TR_BLESSED); - return FALSE; + return false; case BIAS_NECROMANTIC: return random_art_slay_vampiric(o_ptr) || random_art_slay_brand_pois(o_ptr); case BIAS_RANGER: @@ -184,7 +184,7 @@ static bool switch_random_art_slay(object_type *o_ptr) case BIAS_LAW: return random_art_slay_evil(o_ptr) || random_art_slay_undead(o_ptr) || random_art_slay_demon(o_ptr); default: - return FALSE; + return false; } } diff --git a/src/autopick/autopick-command-menu.cpp b/src/autopick/autopick-command-menu.cpp index bf223115d..a017b3faf 100644 --- a/src/autopick/autopick-command-menu.cpp +++ b/src/autopick/autopick-command-menu.cpp @@ -58,7 +58,7 @@ static void redraw_edit_command_menu(bool *redraw, int level, int start, char *l } term_putstr(col0, row1, -1, TERM_WHITE, linestr); - *redraw = FALSE; + *redraw = false; } /* @@ -97,8 +97,8 @@ int do_command_menu(int level, int start) } strcat(linestr, "+"); - bool redraw = TRUE; - while (TRUE) { + bool redraw = true; + while (true) { redraw_edit_command_menu(&redraw, level, start, linestr, &menu_key, max_len); prt(format(_("(a-%c) コマンド:", "(a-%c) Command:"), menu_key + 'a' - 1), 0, 0); char key = inkey(); @@ -126,7 +126,7 @@ int do_command_menu(int level, int start) if (com_id) return com_id; else - redraw = TRUE; + redraw = true; } else if (com_id) { return com_id; } diff --git a/src/autopick/autopick-describer.cpp b/src/autopick/autopick-describer.cpp index d9831f812..35505ae2b 100644 --- a/src/autopick/autopick-describer.cpp +++ b/src/autopick/autopick-describer.cpp @@ -206,7 +206,7 @@ static void describe_autpick_jp(char *buff, autopick_type *entry, autopick_descr if (*describer->str) { if (*describer->str == '^') { describer->str++; - describer->top = TRUE; + describer->top = true; } strcat(buff, "で、名前が「"); @@ -439,7 +439,7 @@ void describe_autopick_en(char *buff, autopick_type *entry, autopick_describer * if (*describer->str) { if (*describer->str == '^') { describer->str++; - describer->top = TRUE; + describer->top = true; whose_str[whose_n] = "names begin with \""; whose_arg_str[whose_n] = ""; ++whose_n; @@ -536,7 +536,7 @@ void describe_autopick(char *buff, autopick_type *entry) describer.str = entry->name; describer.act = entry->action; describer.insc = entry->insc; - describer.top = FALSE; + describer.top = false; describer.before_n = 0; describer.body_str = _("アイテム", "items"); #ifdef JP diff --git a/src/autopick/autopick-destroyer.cpp b/src/autopick/autopick-destroyer.cpp index caa83e907..91a385645 100644 --- a/src/autopick/autopick-destroyer.cpp +++ b/src/autopick/autopick-destroyer.cpp @@ -39,23 +39,23 @@ static bool is_leave_special_item(player_type *player_ptr, object_type *o_ptr) { if (!leave_special) - return TRUE; + return true; if (player_ptr->prace == RACE_BALROG) { if (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_CORPSE && angband_strchr("pht", r_info[o_ptr->pval].d_char)) - return FALSE; + return false; } else if (player_ptr->pclass == CLASS_ARCHER) { if (o_ptr->tval == TV_SKELETON || (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON)) - return FALSE; + return false; } else if (player_ptr->pclass == CLASS_NINJA) { if (o_ptr->tval == TV_LITE && o_ptr->name2 == EGO_LITE_DARKNESS && object_is_known(o_ptr)) - return FALSE; + return false; } else if (player_ptr->pclass == CLASS_BEASTMASTER || player_ptr->pclass == CLASS_CAVALRY) { if (o_ptr->tval == TV_WAND && o_ptr->sval == SV_WAND_HEAL_MONSTER && object_is_aware(o_ptr)) - return FALSE; + return false; } - return TRUE; + return true; } /* @@ -64,53 +64,53 @@ static bool is_leave_special_item(player_type *player_ptr, object_type *o_ptr) static bool is_opt_confirm_destroy(player_type *player_ptr, object_type *o_ptr) { if (!destroy_items) - return FALSE; + return false; if (leave_worth) if (object_value(player_ptr, o_ptr) > 0) - return FALSE; + return false; if (leave_equip) if (object_is_weapon_armour_ammo(player_ptr, o_ptr)) - return FALSE; + return false; if (leave_chest) if ((o_ptr->tval == TV_CHEST) && o_ptr->pval) - return FALSE; + return false; if (leave_wanted) if (object_is_bounty(player_ptr, o_ptr)) - return FALSE; + return false; if (leave_corpse) if (o_ptr->tval == TV_CORPSE) - return FALSE; + return false; if (leave_junk) if ((o_ptr->tval == TV_SKELETON) || (o_ptr->tval == TV_BOTTLE) || (o_ptr->tval == TV_JUNK) || (o_ptr->tval == TV_STATUE)) - return FALSE; + return false; if (!is_leave_special_item(player_ptr, o_ptr)) - return FALSE; + return false; if (o_ptr->tval == TV_GOLD) - return FALSE; + return false; - return TRUE; + return true; } void auto_destroy_item(player_type *player_ptr, object_type *o_ptr, int autopick_idx) { - bool destroy = FALSE; + bool destroy = false; if (is_opt_confirm_destroy(player_ptr, o_ptr)) - destroy = TRUE; + destroy = true; if (autopick_idx >= 0 && !(autopick_list[autopick_idx].action & DO_AUTODESTROY)) - destroy = FALSE; + destroy = false; if (!always_pickup) { if (autopick_idx >= 0 && (autopick_list[autopick_idx].action & DO_AUTODESTROY)) - destroy = TRUE; + destroy = true; } if (!destroy) diff --git a/src/autopick/autopick-editor-command.cpp b/src/autopick/autopick-editor-command.cpp index ee56f3283..fe2fed3c7 100644 --- a/src/autopick/autopick-editor-command.cpp +++ b/src/autopick/autopick-editor-command.cpp @@ -56,7 +56,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->dirty_flags |= DIRTY_ALL | DIRTY_MODE | DIRTY_EXPRESSION; tb->cx = tb->cy = 0; tb->mark = 0; - tb->changed = FALSE; + tb->changed = false; break; } case EC_HELP: { @@ -168,7 +168,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->cy = 0; break; case EC_BOTTOM: - while (TRUE) { + while (true) { if (!tb->lines_list[tb->cy + 1]) { if (!add_empty_line(tb)) break; @@ -206,7 +206,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->mark = 0; tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; break; } case EC_COPY: { @@ -293,7 +293,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->dirty_flags |= DIRTY_ALL; tb->dirty_flags |= DIRTY_EXPRESSION; - tb->changed = TRUE; + tb->changed = true; break; } case EC_BLOCK: { @@ -348,7 +348,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int if (tb->yank_eol) add_str_to_yank(tb, ""); - tb->yank_eol = TRUE; + tb->yank_eol = true; do_editor_command(player_ptr, tb, EC_DELETE_CHAR); break; } @@ -409,7 +409,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->cy--; tb->dirty_flags |= DIRTY_ALL; tb->dirty_flags |= DIRTY_EXPRESSION; - tb->changed = TRUE; + tb->changed = true; break; } @@ -436,7 +436,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->lines_list[tb->cy] = string_make(buf); tb->dirty_line = tb->cy; check_expression_line(tb, tb->cy); - tb->changed = TRUE; + tb->changed = true; break; } case EC_SEARCH_STR: { @@ -525,7 +525,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int string_free(tb->lines_list[tb->cy]); tb->lines_list[tb->cy] = string_make(tb->last_destroyed); tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; break; } case EC_INSERT_BLOCK: { @@ -548,7 +548,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int string_free(tb->lines_list[tb->cy]); tb->lines_list[tb->cy] = string_make("?:1"); tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; break; } case EC_INSERT_MACRO: { @@ -560,7 +560,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->cx = 2; tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; break; } case EC_INSERT_KEYMAP: { @@ -574,7 +574,7 @@ ape_quittance do_editor_command(player_type *player_ptr, text_body_type *tb, int tb->cx = 2; tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; break; } case EC_CL_AUTOPICK: diff --git a/src/autopick/autopick-editor-util.cpp b/src/autopick/autopick-editor-util.cpp index 09a0a3331..58b2edc11 100644 --- a/src/autopick/autopick-editor-util.cpp +++ b/src/autopick/autopick-editor-util.cpp @@ -14,8 +14,8 @@ void toggle_keyword(text_body_type *tb, BIT_FLAGS flg) { int by1, by2; - bool add = TRUE; - bool fixed = FALSE; + bool add = true; + bool fixed = false; if (tb->mark) { by1 = MIN(tb->my, tb->cy); by2 = MAX(tb->my, tb->cy); @@ -32,11 +32,11 @@ void toggle_keyword(text_body_type *tb, BIT_FLAGS flg) string_free(tb->lines_list[y]); if (!fixed) { if (!IS_FLG(flg)) - add = TRUE; + add = true; else - add = FALSE; + add = false; - fixed = TRUE; + fixed = true; } if (FLG_NOUN_BEGIN <= flg && flg <= FLG_NOUN_END) { @@ -64,7 +64,7 @@ void toggle_keyword(text_body_type *tb, BIT_FLAGS flg) tb->lines_list[y] = autopick_line_from_entry_kill(entry); tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; } } @@ -76,8 +76,8 @@ void toggle_command_letter(text_body_type *tb, byte flg) autopick_type an_entry; autopick_type *entry = &an_entry; int by1, by2; - bool add = TRUE; - bool fixed = FALSE; + bool add = true; + bool fixed = false; if (tb->mark) { by1 = MIN(tb->my, tb->cy); by2 = MAX(tb->my, tb->cy); @@ -96,11 +96,11 @@ void toggle_command_letter(text_body_type *tb, byte flg) if (!fixed) { if (!(entry->action & flg)) - add = TRUE; + add = true; else - add = FALSE; + add = false; - fixed = TRUE; + fixed = true; } if (entry->action & DONT_AUTOPICK) @@ -142,7 +142,7 @@ void toggle_command_letter(text_body_type *tb, byte flg) tb->lines_list[y] = autopick_line_from_entry_kill(entry); tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; } } @@ -179,7 +179,7 @@ void add_keyword(text_body_type *tb, BIT_FLAGS flg) ADD_FLG(flg); tb->lines_list[y] = autopick_line_from_entry_kill(entry); tb->dirty_flags |= DIRTY_ALL; - tb->changed = TRUE; + tb->changed = true; } } @@ -191,12 +191,12 @@ bool add_empty_line(text_body_type *tb) int num_lines = count_line(tb); if (!tb->lines_list[num_lines - 1][0]) - return FALSE; + return false; tb->lines_list[num_lines] = string_make(""); tb->dirty_flags |= DIRTY_EXPRESSION; - tb->changed = TRUE; - return TRUE; + tb->changed = true; + return true; } static chain_str_type *new_chain_str(concptr str) @@ -212,7 +212,7 @@ void kill_yank_chain(text_body_type *tb) { chain_str_type *chain = tb->yank; tb->yank = NULL; - tb->yank_eol = TRUE; + tb->yank_eol = true; while (chain) { chain_str_type *next = chain->next; @@ -225,7 +225,7 @@ void kill_yank_chain(text_body_type *tb) void add_str_to_yank(text_body_type *tb, concptr str) { - tb->yank_eol = FALSE; + tb->yank_eol = false; if (NULL == tb->yank) { tb->yank = new_chain_str(str); return; @@ -234,7 +234,7 @@ void add_str_to_yank(text_body_type *tb, concptr str) chain_str_type *chain; chain = tb->yank; - while (TRUE) { + while (true) { if (!chain->next) { chain->next = new_chain_str(str); return; diff --git a/src/autopick/autopick-entry.cpp b/src/autopick/autopick-entry.cpp index fbfafa6b0..12532dce5 100644 --- a/src/autopick/autopick-entry.cpp +++ b/src/autopick/autopick-entry.cpp @@ -44,7 +44,7 @@ bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default) case 'A': case 'P': case 'C': - return FALSE; + return false; } entry->flag[0] = entry->flag[1] = 0L; @@ -52,7 +52,7 @@ bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default) entry->bonus = 0; byte act = DO_AUTOPICK | DO_DISPLAY; - while (TRUE) { + while (true) { if ((act & DO_AUTOPICK) && *str == '!') { act &= ~DO_AUTOPICK; act |= DO_AUTODESTROY; @@ -109,9 +109,9 @@ bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default) buf[i] = '\0'; if (!allow_default && *buf == 0) - return FALSE; + return false; if (*buf == 0 && insc) - return FALSE; + return false; concptr prev_ptr, ptr; ptr = prev_ptr = buf; @@ -281,7 +281,7 @@ bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default) entry->action = act; entry->insc = string_make(insc); - return TRUE; + return true; } /* @@ -290,7 +290,7 @@ bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default) void autopick_entry_from_object(player_type *player_ptr, autopick_type *entry, object_type *o_ptr) { /* Assume that object name is to be added */ - bool name = TRUE; + bool name = true; GAME_TEXT name_str[MAX_NLEN + 32]; name_str[0] = '\0'; entry->insc = string_make(quark_str(o_ptr->inscription)); @@ -303,24 +303,24 @@ void autopick_entry_from_object(player_type *player_ptr, autopick_type *entry, o bool is_hat_added = _(FALSE, TRUE); if (!object_is_aware(o_ptr)) { ADD_FLG(FLG_UNAWARE); - is_hat_added = TRUE; + is_hat_added = true; } else if (!object_is_known(o_ptr)) { if (!(o_ptr->ident & IDENT_SENSE)) { ADD_FLG(FLG_UNIDENTIFIED); - is_hat_added = TRUE; + is_hat_added = true; } else { switch (o_ptr->feeling) { case FEEL_AVERAGE: case FEEL_GOOD: ADD_FLG(FLG_NAMELESS); - is_hat_added = TRUE; + is_hat_added = true; break; case FEEL_BROKEN: case FEEL_CURSED: ADD_FLG(FLG_NAMELESS); ADD_FLG(FLG_WORTHLESS); - is_hat_added = TRUE; + is_hat_added = true; break; case FEEL_TERRIBLE: @@ -355,7 +355,7 @@ void autopick_entry_from_object(player_type *player_ptr, autopick_type *entry, o /* We ommit the basename and cannot use the ^ mark */ strcpy(name_str, e_ptr->name.c_str()); #endif - name = FALSE; + name = false; if (!object_is_rare(o_ptr)) ADD_FLG(FLG_COMMON); } @@ -367,7 +367,7 @@ void autopick_entry_from_object(player_type *player_ptr, autopick_type *entry, o if (object_is_equipment(o_ptr)) ADD_FLG(FLG_NAMELESS); - is_hat_added = TRUE; + is_hat_added = true; } } @@ -394,19 +394,19 @@ void autopick_entry_from_object(player_type *player_ptr, autopick_type *entry, o if (o_ptr->tval >= TV_LIFE_BOOK && !check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval)) { ADD_FLG(FLG_UNREADABLE); if (o_ptr->tval != TV_ARCANE_BOOK) - name = FALSE; + name = false; } bool realm_except_class = player_ptr->pclass == CLASS_SORCERER || player_ptr->pclass == CLASS_RED_MAGE; if (get_realm1_book(player_ptr) == o_ptr->tval && !realm_except_class) { ADD_FLG(FLG_REALM1); - name = FALSE; + name = false; } if (get_realm2_book(player_ptr) == o_ptr->tval && !realm_except_class) { ADD_FLG(FLG_REALM2); - name = FALSE; + name = false; } if (o_ptr->tval >= TV_LIFE_BOOK && 0 == o_ptr->sval) @@ -552,7 +552,7 @@ concptr autopick_line_from_entry(autopick_type *entry) if (IS_FLG(FLG_ARTIFACT)) ADD_KEY(KEY_ARTIFACT); - bool sepa_flag = TRUE; + bool sepa_flag = true; if (IS_FLG(FLG_ITEMS)) ADD_KEY2(KEY_ITEMS); else if (IS_FLG(FLG_WEAPONS)) @@ -594,7 +594,7 @@ concptr autopick_line_from_entry(autopick_type *entry) else if (IS_FLG(FLG_BOOTS)) ADD_KEY2(KEY_BOOTS); else if (!IS_FLG(FLG_ARTIFACT)) - sepa_flag = FALSE; + sepa_flag = false; if (entry->name && entry->name[0]) { if (sepa_flag) @@ -651,8 +651,8 @@ bool entry_from_choosed_object(player_type *player_ptr, autopick_type *entry) object_type *o_ptr; o_ptr = choose_object(player_ptr, NULL, q, s, USE_INVEN | USE_FLOOR | USE_EQUIP, TV_NONE); if (!o_ptr) - return FALSE; + return false; autopick_entry_from_object(player_ptr, entry, o_ptr); - return TRUE; + return true; } diff --git a/src/autopick/autopick-finder.cpp b/src/autopick/autopick-finder.cpp index 9e0e515b9..2f2d4b768 100644 --- a/src/autopick/autopick-finder.cpp +++ b/src/autopick/autopick-finder.cpp @@ -60,14 +60,14 @@ bool get_object_for_search(player_type *player_ptr, object_type **o_handle, conc object_type *o_ptr; o_ptr = choose_object(player_ptr, NULL, q, s, USE_INVEN | USE_FLOOR | USE_EQUIP, TV_NONE); if (!o_ptr) - return FALSE; + return false; *o_handle = o_ptr; string_free(*search_strp); char buf[MAX_NLEN + 20]; describe_flavor(player_ptr, buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL)); *search_strp = string_make(format("<%s>", buf)); - return TRUE; + return true; } /* @@ -76,14 +76,14 @@ bool get_object_for_search(player_type *player_ptr, object_type **o_handle, conc bool get_destroyed_object_for_search(player_type *player_ptr, object_type **o_handle, concptr *search_strp) { if (!autopick_last_destroyed_object.k_idx) - return FALSE; + return false; *o_handle = &autopick_last_destroyed_object; string_free(*search_strp); char buf[MAX_NLEN + 20]; describe_flavor(player_ptr, buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL)); *search_strp = string_make(format("<%s>", buf)); - return TRUE; + return true; } /* @@ -111,13 +111,13 @@ byte get_string_for_search(player_type *player_ptr, object_type **o_handle, conc prt(prompt, 0, 0); int pos = 0; - while (TRUE) { - bool back = FALSE; + while (true) { + bool back = false; term_erase(col, 0, 255); term_putstr(col, 0, -1, color, buf); term_gotoxy(col + pos, 0); - int skey = inkey_special(TRUE); + int skey = inkey_special(true); switch (skey) { case SKEY_LEFT: case KTRL('b'): { @@ -126,7 +126,7 @@ byte get_string_for_search(player_type *player_ptr, object_type **o_handle, conc if (pos == 0) break; - while (TRUE) { + while (true) { int next_pos = i + 1; #ifdef JP @@ -163,7 +163,7 @@ byte get_string_for_search(player_type *player_ptr, object_type **o_handle, conc return 0; case KTRL('r'): - back = TRUE; + back = true; /* Fall through */ case '\n': @@ -190,7 +190,7 @@ byte get_string_for_search(player_type *player_ptr, object_type **o_handle, conc if (pos == 0) break; - while (TRUE) { + while (true) { int next_pos = i + 1; #ifdef JP if (iskanji(buf[i])) @@ -247,7 +247,7 @@ byte get_string_for_search(player_type *player_ptr, object_type **o_handle, conc #ifdef JP if (iskanji(c)) { char next; - inkey_base = TRUE; + inkey_base = true; next = inkey(); if (pos + 1 < len) { @@ -298,7 +298,7 @@ void search_for_object(player_type *player_ptr, text_body_type *tb, object_type describe_flavor(player_ptr, o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL)); str_tolower(o_name); - while (TRUE) { + while (true) { bool match; if (forward) { if (!tb->lines_list[++i]) @@ -350,7 +350,7 @@ void search_for_string(text_body_type *tb, concptr search_str, bool forward) int bypassed_cx = 0; int i = tb->cy; - while (TRUE) { + while (true) { concptr pos; if (forward) { if (!tb->lines_list[++i]) diff --git a/src/autopick/autopick-inserter-killer.cpp b/src/autopick/autopick-inserter-killer.cpp index 5a0b58192..d3d61da55 100644 --- a/src/autopick/autopick-inserter-killer.cpp +++ b/src/autopick/autopick-inserter-killer.cpp @@ -68,8 +68,8 @@ bool insert_return_code(text_body_type *tb) string_free(tb->lines_list[tb->cy]); tb->lines_list[tb->cy] = string_make(buf); tb->dirty_flags |= DIRTY_EXPRESSION; - tb->changed = TRUE; - return TRUE; + tb->changed = true; + return true; } /* @@ -81,13 +81,13 @@ bool insert_macro_line(text_body_type *tb) return false; int i, n = 0; flush(); - inkey_base = TRUE; + inkey_base = true; i = inkey(); char buf[1024]; while (i) { buf[n++] = (char)i; - inkey_base = TRUE; - inkey_scan = TRUE; + inkey_base = true; + inkey_scan = true; i = inkey(); } @@ -97,7 +97,7 @@ bool insert_macro_line(text_body_type *tb) char tmp[1024]; ascii_to_text(tmp, buf); if (!tmp[0]) - return FALSE; + return false; tb->cx = 0; insert_return_code(tb); @@ -115,7 +115,7 @@ bool insert_macro_line(text_body_type *tb) string_free(tb->lines_list[tb->cy]); tb->lines_list[tb->cy] = string_make(format("A:%s", tmp)); - return TRUE; + return true; } /* @@ -141,7 +141,7 @@ bool insert_keymap_line(text_body_type *tb) char tmp[1024]; ascii_to_text(tmp, buf); if (!tmp[0]) - return FALSE; + return false; tb->cx = 0; insert_return_code(tb); @@ -157,7 +157,7 @@ bool insert_keymap_line(text_body_type *tb) string_free(tb->lines_list[tb->cy]); tb->lines_list[tb->cy] = string_make(format("A:%s", tmp)); - return TRUE; + return true; } /* @@ -176,7 +176,7 @@ void insert_single_letter(text_body_type *tb, int key) if (iskanji(key)) { int next; - inkey_base = TRUE; + inkey_base = true; next = inkey(); if (j + 2 < MAX_LINELEN) { buf[j++] = (char)key; @@ -204,7 +204,7 @@ void insert_single_letter(text_body_type *tb, int key) tb->dirty_line = tb->cy; check_expression_line(tb, tb->cy); - tb->changed = TRUE; + tb->changed = true; } /* @@ -241,5 +241,5 @@ void kill_line_segment(text_body_type *tb, int y, int x0, int x1, bool whole) string_free(tb->lines_list[y]); tb->lines_list[y] = string_make(buf); check_expression_line(tb, y); - tb->changed = TRUE; + tb->changed = true; } diff --git a/src/autopick/autopick-matcher.cpp b/src/autopick/autopick-matcher.cpp index 71201b6eb..840851b08 100644 --- a/src/autopick/autopick-matcher.cpp +++ b/src/autopick/autopick-matcher.cpp @@ -40,91 +40,91 @@ bool is_autopick_match(player_type *player_ptr, object_type *o_ptr, autopick_typ { concptr ptr = entry->name; if (IS_FLG(FLG_UNAWARE) && object_is_aware(o_ptr)) - return FALSE; + return false; if (IS_FLG(FLG_UNIDENTIFIED) && (object_is_known(o_ptr) || (o_ptr->ident & IDENT_SENSE))) - return FALSE; + return false; if (IS_FLG(FLG_IDENTIFIED) && !object_is_known(o_ptr)) - return FALSE; + return false; if (IS_FLG(FLG_STAR_IDENTIFIED) && (!object_is_known(o_ptr) || !object_is_fully_known(o_ptr))) - return FALSE; + return false; if (IS_FLG(FLG_BOOSTED)) { object_kind *k_ptr = &k_info[o_ptr->k_idx]; if (!object_is_melee_weapon(o_ptr)) - return FALSE; + return false; if ((o_ptr->dd == k_ptr->dd) && (o_ptr->ds == k_ptr->ds)) - return FALSE; + return false; if (!object_is_known(o_ptr) && object_is_quest_target(player_ptr->current_floor_ptr->inside_quest, o_ptr)) { - return FALSE; + return false; } } if (IS_FLG(FLG_MORE_DICE)) { if (o_ptr->dd * o_ptr->ds < entry->dice) - return FALSE; + return false; } if (IS_FLG(FLG_MORE_BONUS)) { if (!object_is_known(o_ptr)) - return FALSE; + return false; if (o_ptr->pval) { if (o_ptr->pval < entry->bonus) - return FALSE; + return false; } else { if (o_ptr->to_h < entry->bonus && o_ptr->to_d < entry->bonus && o_ptr->to_a < entry->bonus && o_ptr->pval < entry->bonus) - return FALSE; + return false; } } if (IS_FLG(FLG_WORTHLESS) && object_value(player_ptr, o_ptr) > 0) - return FALSE; + return false; if (IS_FLG(FLG_ARTIFACT)) { if (!object_is_known(o_ptr) || !object_is_artifact(o_ptr)) - return FALSE; + return false; } if (IS_FLG(FLG_EGO)) { if (!object_is_ego(o_ptr)) - return FALSE; + return false; if (!object_is_known(o_ptr) && !((o_ptr->ident & IDENT_SENSE) && o_ptr->feeling == FEEL_EXCELLENT)) - return FALSE; + return false; } if (IS_FLG(FLG_GOOD)) { if (!object_is_equipment(o_ptr)) - return FALSE; + return false; if (object_is_known(o_ptr)) { if (!object_is_nameless(player_ptr, o_ptr)) - return FALSE; + return false; if (o_ptr->to_a <= 0 && (o_ptr->to_h + o_ptr->to_d) <= 0) - return FALSE; + return false; } else if (o_ptr->ident & IDENT_SENSE) { switch (o_ptr->feeling) { case FEEL_GOOD: break; default: - return FALSE; + return false; } } else { - return FALSE; + return false; } } if (IS_FLG(FLG_NAMELESS)) { if (!object_is_equipment(o_ptr)) - return FALSE; + return false; if (object_is_known(o_ptr)) { if (!object_is_nameless(player_ptr, o_ptr)) - return FALSE; + return false; } else if (o_ptr->ident & IDENT_SENSE) { switch (o_ptr->feeling) { case FEEL_AVERAGE: @@ -134,88 +134,88 @@ bool is_autopick_match(player_type *player_ptr, object_type *o_ptr, autopick_typ break; default: - return FALSE; + return false; } } else { - return FALSE; + return false; } } if (IS_FLG(FLG_AVERAGE)) { if (!object_is_equipment(o_ptr)) - return FALSE; + return false; if (object_is_known(o_ptr)) { if (!object_is_nameless(player_ptr, o_ptr)) - return FALSE; + return false; if (object_is_cursed(o_ptr) || object_is_broken(o_ptr)) - return FALSE; + return false; if (o_ptr->to_a > 0 || (o_ptr->to_h + o_ptr->to_d) > 0) - return FALSE; + return false; } else if (o_ptr->ident & IDENT_SENSE) { switch (o_ptr->feeling) { case FEEL_AVERAGE: break; default: - return FALSE; + return false; } } else { - return FALSE; + return false; } } if (IS_FLG(FLG_RARE) && !object_is_rare(o_ptr)) - return FALSE; + return false; if (IS_FLG(FLG_COMMON) && object_is_rare(o_ptr)) - return FALSE; + return false; if (IS_FLG(FLG_WANTED) && !object_is_bounty(player_ptr, o_ptr)) - return FALSE; + return false; if (IS_FLG(FLG_UNIQUE) && ((o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_STATUE) || !(r_info[o_ptr->pval].flags1 & RF1_UNIQUE))) - return FALSE; + return false; if (IS_FLG(FLG_HUMAN) && (o_ptr->tval != TV_CORPSE || !angband_strchr("pht", r_info[o_ptr->pval].d_char))) - return FALSE; + return false; if (IS_FLG(FLG_UNREADABLE) && (o_ptr->tval < TV_LIFE_BOOK || check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval))) - return FALSE; + return false; bool realm_except_class = player_ptr->pclass == CLASS_SORCERER || player_ptr->pclass == CLASS_RED_MAGE; if (IS_FLG(FLG_REALM1) && (get_realm1_book(player_ptr) != o_ptr->tval || realm_except_class)) - return FALSE; + return false; if (IS_FLG(FLG_REALM2) && (get_realm2_book(player_ptr) != o_ptr->tval || realm_except_class)) - return FALSE; + return false; if (IS_FLG(FLG_FIRST) && (o_ptr->tval < TV_LIFE_BOOK || 0 != o_ptr->sval)) - return FALSE; + return false; if (IS_FLG(FLG_SECOND) && (o_ptr->tval < TV_LIFE_BOOK || 1 != o_ptr->sval)) - return FALSE; + return false; if (IS_FLG(FLG_THIRD) && (o_ptr->tval < TV_LIFE_BOOK || 2 != o_ptr->sval)) - return FALSE; + return false; if (IS_FLG(FLG_FOURTH) && (o_ptr->tval < TV_LIFE_BOOK || 3 != o_ptr->sval)) - return FALSE; + return false; if (IS_FLG(FLG_WEAPONS)) { if (!object_is_weapon(player_ptr, o_ptr)) - return FALSE; + return false; } else if (IS_FLG(FLG_FAVORITE_WEAPONS)) { if (!object_is_favorite(player_ptr, o_ptr)) - return FALSE; + return false; } else if (IS_FLG(FLG_ARMORS)) { if (!object_is_armour(player_ptr, o_ptr)) - return FALSE; + return false; } else if (IS_FLG(FLG_MISSILES)) { if (!object_is_ammo(o_ptr)) - return FALSE; + return false; } else if (IS_FLG(FLG_DEVICES)) { switch (o_ptr->tval) { case TV_SCROLL: @@ -224,11 +224,11 @@ bool is_autopick_match(player_type *player_ptr, object_type *o_ptr, autopick_typ case TV_ROD: break; default: - return FALSE; + return false; } } else if (IS_FLG(FLG_LIGHTS)) { if (!(o_ptr->tval == TV_LITE)) - return FALSE; + return false; } else if (IS_FLG(FLG_JUNKS)) { switch (o_ptr->tval) { case TV_SKELETON: @@ -237,57 +237,57 @@ bool is_autopick_match(player_type *player_ptr, object_type *o_ptr, autopick_typ case TV_STATUE: break; default: - return FALSE; + return false; } } else if (IS_FLG(FLG_CORPSES)) { if (o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_SKELETON) - return FALSE; + return false; } else if (IS_FLG(FLG_SPELLBOOKS)) { if (!(o_ptr->tval >= TV_LIFE_BOOK)) - return FALSE; + return false; } else if (IS_FLG(FLG_HAFTED)) { if (!(o_ptr->tval == TV_HAFTED)) - return FALSE; + return false; } else if (IS_FLG(FLG_SHIELDS)) { if (!(o_ptr->tval == TV_SHIELD)) - return FALSE; + return false; } else if (IS_FLG(FLG_BOWS)) { if (!(o_ptr->tval == TV_BOW)) - return FALSE; + return false; } else if (IS_FLG(FLG_RINGS)) { if (!(o_ptr->tval == TV_RING)) - return FALSE; + return false; } else if (IS_FLG(FLG_AMULETS)) { if (!(o_ptr->tval == TV_AMULET)) - return FALSE; + return false; } else if (IS_FLG(FLG_SUITS)) { if (!(o_ptr->tval == TV_DRAG_ARMOR || o_ptr->tval == TV_HARD_ARMOR || o_ptr->tval == TV_SOFT_ARMOR)) - return FALSE; + return false; } else if (IS_FLG(FLG_CLOAKS)) { if (!(o_ptr->tval == TV_CLOAK)) - return FALSE; + return false; } else if (IS_FLG(FLG_HELMS)) { if (!(o_ptr->tval == TV_CROWN || o_ptr->tval == TV_HELM)) - return FALSE; + return false; } else if (IS_FLG(FLG_GLOVES)) { if (!(o_ptr->tval == TV_GLOVES)) - return FALSE; + return false; } else if (IS_FLG(FLG_BOOTS)) { if (!(o_ptr->tval == TV_BOOTS)) - return FALSE; + return false; } if (*ptr == '^') { ptr++; if (strncmp(o_name, ptr, strlen(ptr))) - return FALSE; + return false; } else { if (!angband_strstr(o_name, ptr)) - return FALSE; + return false; } if (!IS_FLG(FLG_COLLECTING)) - return TRUE; + return true; for (int j = 0; j < INVEN_PACK; j++) { /* @@ -296,8 +296,8 @@ bool is_autopick_match(player_type *player_ptr, object_type *o_ptr, autopick_typ * But an item can not be absorbed into itself! */ if ((&player_ptr->inventory_list[j] != o_ptr) && object_similar(&player_ptr->inventory_list[j], o_ptr)) - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/src/autopick/autopick-reader-writer.cpp b/src/autopick/autopick-reader-writer.cpp index 035d54f5d..a9fbee3dd 100644 --- a/src/autopick/autopick-reader-writer.cpp +++ b/src/autopick/autopick-reader-writer.cpp @@ -171,12 +171,12 @@ bool write_text_lines(concptr filename, concptr *lines_list) FILE *fff; fff = angband_fopen(buf, "w"); if (!fff) - return FALSE; + return false; for (int lines = 0; lines_list[lines]; lines++) { angband_fputs(fff, lines_list[lines], 1024); } angband_fclose(fff); - return TRUE; + return true; } diff --git a/src/autopick/autopick-registry.cpp b/src/autopick/autopick-registry.cpp index e9fea6957..4f6feb1c3 100644 --- a/src/autopick/autopick-registry.cpp +++ b/src/autopick/autopick-registry.cpp @@ -40,7 +40,7 @@ static bool clear_auto_register(player_type *player_ptr) } if (!pref_fff) { - return TRUE; + return true; } char tmp_file[1024]; @@ -50,13 +50,13 @@ static bool clear_auto_register(player_type *player_ptr) fclose(pref_fff); msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), tmp_file); msg_print(NULL); - return FALSE; + return false; } - bool autoregister = FALSE; + bool autoregister = false; int num = 0; char buf[1024]; - while (TRUE) { + while (true) { if (angband_fgets(pref_fff, buf, sizeof(buf))) break; @@ -67,7 +67,7 @@ static bool clear_auto_register(player_type *player_ptr) } if (streq(buf, autoregister_header)) { - autoregister = TRUE; + autoregister = true; } else { fprintf(tmp_fff, "%s\n", buf); } @@ -76,14 +76,14 @@ static bool clear_auto_register(player_type *player_ptr) angband_fclose(pref_fff); angband_fclose(tmp_fff); - bool okay = TRUE; + bool okay = true; if (num) { msg_format(_("以前のキャラクター用の自動設定(%d行)が残っています。", "Auto registered lines (%d lines) for previous character are remaining."), num); strcpy(buf, _("古い設定行は削除します。よろしいですか？", "These lines will be deleted. Are you sure? ")); if (!get_check(buf)) { - okay = FALSE; - autoregister = FALSE; + okay = false; + autoregister = false; msg_print(_("エディタのカット&ペースト等を使って必要な行を避難してください。", "Use cut & paste of auto picker editor (_) to keep old prefs.")); } @@ -124,7 +124,7 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr) what = _("確認して拾う", "query auto-pickup"); msg_format(_("そのアイテムは既に%sように設定されています。", "The object is already registered to %s."), what); - return FALSE; + return false; } if ((object_is_known(o_ptr) && object_is_artifact(o_ptr)) @@ -132,12 +132,12 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr) GAME_TEXT o_name[MAX_NLEN]; describe_flavor(player_ptr, o_name, o_ptr, 0); msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name); - return FALSE; + return false; } if (!player_ptr->autopick_autoregister) { if (!clear_auto_register(player_ptr)) - return FALSE; + return false; } char buf[1024]; @@ -152,14 +152,14 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr) } if (pref_fff) { - while (TRUE) { + while (true) { if (angband_fgets(pref_fff, buf, sizeof(buf))) { - player_ptr->autopick_autoregister = FALSE; + player_ptr->autopick_autoregister = false; break; } if (streq(buf, autoregister_header)) { - player_ptr->autopick_autoregister = TRUE; + player_ptr->autopick_autoregister = true; break; } } @@ -170,14 +170,14 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr) * File could not be opened for reading. Assume header not * present. */ - player_ptr->autopick_autoregister = FALSE; + player_ptr->autopick_autoregister = false; } pref_fff = angband_fopen(pref_file, "a"); if (!pref_fff) { msg_format(_("%s を開くことができませんでした。", "Failed to open %s."), pref_file); msg_print(NULL); - return FALSE; + return false; } if (!player_ptr->autopick_autoregister) { @@ -187,7 +187,7 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr) fprintf(pref_fff, "%s\n", _("# 後で自動的に削除されますので、必要な行は上の方へ移動しておいてください。", "# Keep it by cut & paste if you need these lines for future characters.")); - player_ptr->autopick_autoregister = TRUE; + player_ptr->autopick_autoregister = true; } autopick_entry_from_object(player_ptr, entry, o_ptr); @@ -198,5 +198,5 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr) fprintf(pref_fff, "%s\n", tmp); string_free(tmp); fclose(pref_fff); - return TRUE; + return true; } diff --git a/src/birth/auto-roller.cpp b/src/birth/auto-roller.cpp index 43ad6bce1..1fd905a2a 100644 --- a/src/birth/auto-roller.cpp +++ b/src/birth/auto-roller.cpp @@ -216,7 +216,7 @@ bool get_stat_limits(player_type *creature_ptr) int cs = 0; int os = A_MAX; - while (TRUE) { + while (true) { if (cs != os) { if (os == 7) display_autoroller_chance(cval); @@ -241,7 +241,7 @@ bool get_stat_limits(player_type *creature_ptr) birth_quit(); break; case 'S': - return FALSE; + return false; case ESCAPE: break; case ' ': @@ -272,7 +272,7 @@ bool get_stat_limits(player_type *creature_ptr) cval[cs]--; os = 7; } else - return FALSE; + return false; } break; @@ -286,7 +286,7 @@ bool get_stat_limits(player_type *creature_ptr) cval[cs]++; os = 7; } else - return FALSE; + return false; } break; @@ -325,7 +325,7 @@ bool get_stat_limits(player_type *creature_ptr) for (int i = 0; i < A_MAX; i++) stat_limit[i] = (s16b)cval[i]; - return TRUE; + return true; } void initialize_chara_limit(chara_limit_type *chara_limit_ptr) @@ -428,7 +428,7 @@ bool get_chara_limits(player_type *creature_ptr, chara_limit_type *chara_limit_p int cs = 0; int os = MAXITEMS; - while (TRUE) { + while (true) { if (cs != os) { const char accept[] = _("決定する", "Accept"); if (os == MAXITEMS) @@ -452,7 +452,7 @@ bool get_chara_limits(player_type *creature_ptr, chara_limit_type *chara_limit_p birth_quit(); break; case 'S': - return FALSE; + return false; case ESCAPE: break; /*後でもう一回breakせんと*/ case ' ': @@ -580,5 +580,5 @@ bool get_chara_limits(player_type *creature_ptr, chara_limit_type *chara_limit_p chara_limit_ptr->wtmax = (s16b)cval[5]; chara_limit_ptr->scmin = (s16b)cval[6]; chara_limit_ptr->scmax = (s16b)cval[7]; - return TRUE; + return true; } diff --git a/src/birth/birth-select-class.cpp b/src/birth/birth-select-class.cpp index a1f58f54f..4ffbe34e9 100644 --- a/src/birth/birth-select-class.cpp +++ b/src/birth/birth-select-class.cpp @@ -115,7 +115,7 @@ static bool select_class(player_type *creature_ptr, char *cur, char *sym, int *k { int cs = creature_ptr->pclass; int os = MAX_CLASS; - while (TRUE) { + while (true) { display_class_stat(cs, &os, cur, sym); if (*k >= 0) break; @@ -129,7 +129,7 @@ static bool select_class(player_type *creature_ptr, char *cur, char *sym, int *k birth_quit(); if (c == 'S') - return FALSE; + return false; if (c == ' ' || c == '\r' || c == '\n') { if (cs == MAX_CLASS) { @@ -165,7 +165,7 @@ static bool select_class(player_type *creature_ptr, char *cur, char *sym, int *k birth_help_option(creature_ptr, c, BK_CLASS); } - return TRUE; + return true; } /*! @@ -187,11 +187,11 @@ bool get_player_class(player_type *creature_ptr) sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); int k = -1; if (!select_class(creature_ptr, cur, sym, &k)) - return FALSE; + return false; creature_ptr->pclass = static_cast(k); cp_ptr = &class_info[creature_ptr->pclass]; mp_ptr = &m_info[creature_ptr->pclass]; c_put_str(TERM_L_BLUE, cp_ptr->title, 5, 15); - return TRUE; + return true; } diff --git a/src/birth/birth-select-personality.cpp b/src/birth/birth-select-personality.cpp index 84212e774..36b10b402 100644 --- a/src/birth/birth-select-personality.cpp +++ b/src/birth/birth-select-personality.cpp @@ -118,7 +118,7 @@ static bool select_personality(player_type *creature_ptr, int *k, concptr *str, sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); int cs = creature_ptr->pseikaku; int os = MAX_PERSONALITIES; - while (TRUE) { + while (true) { display_personality_stat(cs, &os, str, cur, sym); if (*k >= 0) break; @@ -132,7 +132,7 @@ static bool select_personality(player_type *creature_ptr, int *k, concptr *str, birth_quit(); if (c == 'S') - return FALSE; + return false; if (c == ' ' || c == '\r' || c == '\n') { if (cs == MAX_PERSONALITIES) { @@ -178,7 +178,7 @@ static bool select_personality(player_type *creature_ptr, int *k, concptr *str, birth_help_option(creature_ptr, c, BK_PERSONALITY); } - return TRUE; + return true; } /*! @@ -196,7 +196,7 @@ bool get_player_personality(player_type *creature_ptr) enumerate_personality_list(creature_ptr, &str, sym); int k = -1; if (!select_personality(creature_ptr, &k, &str, sym)) - return FALSE; + return false; creature_ptr->pseikaku = (player_personality_type)k; ap_ptr = &personality_info[creature_ptr->pseikaku]; @@ -211,5 +211,5 @@ bool get_player_personality(player_type *creature_ptr) #endif strcat(tmp, creature_ptr->name); c_put_str(TERM_L_BLUE, tmp, 1, 34); - return TRUE; + return true; } diff --git a/src/birth/birth-select-race.cpp b/src/birth/birth-select-race.cpp index 8e8fa1e3d..a19d645c1 100644 --- a/src/birth/birth-select-race.cpp +++ b/src/birth/birth-select-race.cpp @@ -97,7 +97,7 @@ static bool select_race(player_type *creature_ptr, char *sym, int *k) sprintf(cur, "%c%c%s", '*', p2, _("ランダム", "Random")); int cs = creature_ptr->prace; int os = MAX_RACES; - while (TRUE) { + while (true) { display_race_stat(cs, &os, cur, sym); if (*k >= 0) break; @@ -110,7 +110,7 @@ static bool select_race(player_type *creature_ptr, char *sym, int *k) birth_quit(); if (c == 'S') - return FALSE; + return false; if (c == ' ' || c == '\r' || c == '\n') { if (cs == MAX_RACES) { @@ -146,7 +146,7 @@ static bool select_race(player_type *creature_ptr, char *sym, int *k) birth_help_option(creature_ptr, c, BK_RACE); } - return TRUE; + return true; } /*! @@ -163,10 +163,10 @@ bool get_player_race(player_type *creature_ptr) enumerate_race_list(sym); int k = -1; if (!select_race(creature_ptr, sym, &k)) - return FALSE; + return false; creature_ptr->prace = static_cast(k); rp_ptr = &race_info[creature_ptr->prace]; c_put_str(TERM_L_BLUE, rp_ptr->title, 4, 15); - return TRUE; + return true; } diff --git a/src/birth/birth-select-realm.cpp b/src/birth/birth-select-realm.cpp index f3b129266..a566eafa7 100644 --- a/src/birth/birth-select-realm.cpp +++ b/src/birth/birth-select-realm.cpp @@ -198,7 +198,7 @@ static void interpret_realm_select_key(birth_realm_type *birth_realm_ptr, char c static bool get_a_realm(player_type *creature_ptr, birth_realm_type *birth_realm_ptr) { birth_realm_ptr->os = birth_realm_ptr->n; - while (TRUE) { + while (true) { move_birth_realm_cursor(birth_realm_ptr); if (birth_realm_ptr->k >= 0) break; @@ -210,7 +210,7 @@ static bool get_a_realm(player_type *creature_ptr, birth_realm_type *birth_realm char c = inkey(); interpret_realm_select_key(birth_realm_ptr, c); if (c == 'S') - return TRUE; + return true; if (c == ' ' || c == '\r' || c == '\n') { if (birth_realm_ptr->cs == birth_realm_ptr->n) { @@ -243,7 +243,7 @@ static bool get_a_realm(player_type *creature_ptr, birth_realm_type *birth_realm birth_help_option(creature_ptr, c, BK_REALM); } - return FALSE; + return false; } /*! @@ -294,11 +294,11 @@ static bool check_realm_selection(player_type *creature_ptr, int count) prt(_("何かキーを押してください", "Hit any key."), 0, 0); (void)inkey(); prt("", 0, 0); - return TRUE; + return true; } else if (get_check_strict(creature_ptr, _("よろしいですか？", "Are you sure? "), CHECK_DEFAULT_Y)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -320,20 +320,20 @@ bool get_player_realms(player_type *creature_ptr) if (creature_ptr->pclass == CLASS_ELEMENTALIST) { creature_ptr->element = select_element_realm(creature_ptr); if (creature_ptr->element == REALM_SELECT_CANCEL) - return FALSE; + return false; put_str(_("魔法 :", "Magic :"), 6, 1); c_put_str(TERM_L_BLUE, get_element_title(creature_ptr->element), 6, 15); creature_ptr->realm2 = REALM_NONE; - return TRUE; + return true; } - while (TRUE) { + while (true) { char temp[80 * 10]; int count = 0; creature_ptr->realm1 = select_realm(creature_ptr, realm_choices1[creature_ptr->pclass], &count); if (creature_ptr->realm1 == REALM_SELECT_CANCEL) - return FALSE; + return false; if (!creature_ptr->realm1) break; @@ -356,20 +356,20 @@ bool get_player_realms(player_type *creature_ptr) /* Select the second realm */ creature_ptr->realm2 = REALM_NONE; if (creature_ptr->realm1 == REALM_NONE) - return TRUE; + return true; /* Print the realm */ put_str(_("魔法 :", "Magic :"), 6, 1); c_put_str(TERM_L_BLUE, realm_names[creature_ptr->realm1], 6, 15); /* Select the second realm */ - while (TRUE) { + while (true) { char temp[80 * 8]; int count = 0; creature_ptr->realm2 = select_realm(creature_ptr, realm_choices2[creature_ptr->pclass], &count); if (creature_ptr->realm2 == REALM_SELECT_CANCEL) - return FALSE; + return false; if (!creature_ptr->realm2) break; @@ -394,5 +394,5 @@ bool get_player_realms(player_type *creature_ptr) c_put_str(TERM_L_BLUE, format("%s, %s", realm_names[creature_ptr->realm1], realm_names[creature_ptr->realm2]), 6, 15); } - return TRUE; + return true; } diff --git a/src/birth/birth-stat.cpp b/src/birth/birth-stat.cpp index a5d7e672f..98e9af031 100644 --- a/src/birth/birth-stat.cpp +++ b/src/birth/birth-stat.cpp @@ -61,7 +61,7 @@ int adjust_stat(int value, int amount) */ void get_stats(player_type* creature_ptr) { - while (TRUE) { + while (true) { int sum = 0; for (int i = 0; i < 2; i++) { s32b tmp = randint0(60 * 60 * 60); @@ -153,7 +153,7 @@ void get_extra(player_type* creature_ptr, bool roll_hitdie) void get_max_stats(player_type* creature_ptr) { int dice[6]; - while (TRUE) { + while (true) { int j = 0; for (int i = 0; i < A_MAX; i++) { dice[i] = randint1(7); diff --git a/src/birth/birth-wizard.cpp b/src/birth/birth-wizard.cpp index 25ec00089..cb07e66ad 100644 --- a/src/birth/birth-wizard.cpp +++ b/src/birth/birth-wizard.cpp @@ -92,7 +92,7 @@ static bool get_player_sex(player_type *creature_ptr, char *buf) int k = -1; int cs = 0; int os = MAX_SEXES; - while (TRUE) { + while (true) { if (cs != os) { put_str(cur, 12 + (os / 5), 2 + 15 * (os % 5)); if (cs == MAX_SEXES) @@ -117,7 +117,7 @@ static bool get_player_sex(player_type *creature_ptr, char *buf) birth_quit(); if (c == 'S') - return FALSE; + return false; if (c == ' ' || c == '\r' || c == '\n') { k = cs == MAX_SEXES ? randint0(MAX_SEXES) : cs; @@ -152,17 +152,17 @@ static bool get_player_sex(player_type *creature_ptr, char *buf) creature_ptr->psex = (byte)k; sp_ptr = &sex_info[creature_ptr->psex]; c_put_str(TERM_L_BLUE, sp_ptr->title, 3, 15); - return TRUE; + return true; } static bool let_player_select_race(player_type *creature_ptr) { clear_from(10); creature_ptr->prace = RACE_HUMAN; - while (TRUE) { + while (true) { char temp[80 * 10]; if (!get_player_race(creature_ptr)) - return FALSE; + return false; clear_from(10); shape_buffer(race_explanations[creature_ptr->prace], 74, temp, sizeof(temp)); @@ -182,17 +182,17 @@ static bool let_player_select_race(player_type *creature_ptr) c_put_str(TERM_WHITE, " ", 4, 15); } - return TRUE; + return true; } static bool let_player_select_class(player_type *creature_ptr) { clear_from(10); creature_ptr->pclass = CLASS_WARRIOR; - while (TRUE) { + while (true) { char temp[80 * 9]; if (!get_player_class(creature_ptr)) - return FALSE; + return false; clear_from(10); shape_buffer(class_explanations[creature_ptr->pclass], 74, temp, sizeof(temp)); @@ -212,16 +212,16 @@ static bool let_player_select_class(player_type *creature_ptr) c_put_str(TERM_WHITE, " ", 5, 15); } - return TRUE; + return true; } static bool let_player_select_personality(player_type *creature_ptr) { creature_ptr->pseikaku = PERSONALITY_ORDINARY; - while (TRUE) { + while (true) { char temp[80 * 8]; if (!get_player_personality(creature_ptr)) - return FALSE; + return false; clear_from(10); shape_buffer(personality_explanations[creature_ptr->pseikaku], 74, temp, sizeof(temp)); @@ -242,28 +242,28 @@ static bool let_player_select_personality(player_type *creature_ptr) prt("", 1, 34 + strlen(creature_ptr->name)); } - return TRUE; + return true; } static bool let_player_build_character(player_type *creature_ptr) { char buf[80]; if (!get_player_sex(creature_ptr, buf)) - return FALSE; + return false; if (!let_player_select_race(creature_ptr)) - return FALSE; + return false; if (!let_player_select_class(creature_ptr)) - return FALSE; + return false; if (!get_player_realms(creature_ptr)) - return FALSE; + return false; if (!let_player_select_personality(creature_ptr)) - return FALSE; + return false; - return TRUE; + return true; } static void display_initial_options(player_type *creature_ptr) @@ -349,12 +349,12 @@ static void auto_roller_count(void) static bool decide_initial_stat(player_type *creature_ptr) { if (!autoroller) - return TRUE; + return true; - bool accept = TRUE; + bool accept = true; for (int i = 0; i < A_MAX; i++) { if (creature_ptr->stat_max[i] < stat_limit[i]) { - accept = FALSE; + accept = false; break; } } @@ -365,20 +365,20 @@ static bool decide_initial_stat(player_type *creature_ptr) static bool decide_body_spec(player_type *creature_ptr, chara_limit_type chara_limit, bool *accept) { if (!*accept) - return FALSE; + return false; get_ahw(creature_ptr); get_history(creature_ptr); if (autochara) { if ((creature_ptr->age < chara_limit.agemin) || (creature_ptr->age > chara_limit.agemax)) - *accept = FALSE; + *accept = false; if ((creature_ptr->ht < chara_limit.htmin) || (creature_ptr->ht > chara_limit.htmax)) - *accept = FALSE; + *accept = false; if ((creature_ptr->wt < chara_limit.wtmin) || (creature_ptr->wt > chara_limit.wtmax)) - *accept = FALSE; + *accept = false; if ((creature_ptr->sc < chara_limit.scmin) || (creature_ptr->sc > chara_limit.scmax)) - *accept = FALSE; + *accept = false; } return *accept; @@ -387,7 +387,7 @@ static bool decide_body_spec(player_type *creature_ptr, chara_limit_type chara_l static bool display_auto_roller_count(player_type *creature_ptr, const int col) { if ((auto_round % AUTOROLLER_STEP) != 0) - return FALSE; + return false; birth_put_stats(creature_ptr); if (auto_upper_round) @@ -395,14 +395,14 @@ static bool display_auto_roller_count(player_type *creature_ptr, const int col) else put_str(format("%10ld", auto_round), 10, col + 20); term_fresh(); - inkey_scan = TRUE; + inkey_scan = true; if (inkey()) { get_ahw(creature_ptr); get_history(creature_ptr); - return TRUE; + return true; } - return FALSE; + return false; } static void exe_auto_roller(player_type *creature_ptr, chara_limit_type chara_limit, const int col) @@ -423,7 +423,7 @@ static void exe_auto_roller(player_type *creature_ptr, chara_limit_type chara_li static bool display_auto_roller_result(player_type *creature_ptr, bool prev, char *c) { BIT_FLAGS mode = 0; - while (TRUE) { + while (true) { creature_ptr->update |= (PU_BONUS | PU_HP); update_creature(creature_ptr); creature_ptr->chp = creature_ptr->mhp; @@ -449,7 +449,7 @@ static bool display_auto_roller_result(player_type *creature_ptr, bool prev, cha birth_quit(); if (*c == 'S') - return FALSE; + return false; if (*c == '\r' || *c == '\n' || *c == ESCAPE) break; @@ -471,7 +471,7 @@ static bool display_auto_roller_result(player_type *creature_ptr, bool prev, cha bell(); } - return TRUE; + return true; } /* @@ -482,9 +482,9 @@ static bool display_auto_roller_result(player_type *creature_ptr, bool prev, cha */ static bool display_auto_roller(player_type *creature_ptr, chara_limit_type chara_limit) { - bool prev = FALSE; + bool prev = false; - while (TRUE) { + while (true) { int col = 22; if (autoroller || autochara) { term_clear(); @@ -509,17 +509,17 @@ static bool display_auto_roller(player_type *creature_ptr, chara_limit_type char char c; if (!display_auto_roller_result(creature_ptr, prev, &c)) - return FALSE; + return false; if (c == '\r' || c == '\n' || c == ESCAPE) break; save_prev_data(creature_ptr, &previous_char); - previous_char.quick_ok = FALSE; - prev = TRUE; + previous_char.quick_ok = false; + prev = true; } - return TRUE; + return true; } /*! @@ -557,7 +557,7 @@ bool player_birth_wizard(player_type *creature_ptr) } if (!let_player_build_character(creature_ptr)) - return FALSE; + return false; display_initial_options(creature_ptr); if (autoroller || autochara) { @@ -568,18 +568,18 @@ bool player_birth_wizard(player_type *creature_ptr) if (autoroller) if (!get_stat_limits(creature_ptr)) - return FALSE; + return false; chara_limit_type chara_limit; initialize_chara_limit(&chara_limit); if (autochara) if (!get_chara_limits(creature_ptr, &chara_limit)) - return FALSE; + return false; clear_from(10); init_turn(creature_ptr); if (!display_auto_roller(creature_ptr, chara_limit)) - return FALSE; + return false; set_name_history(creature_ptr); char c = inkey(); @@ -587,10 +587,10 @@ bool player_birth_wizard(player_type *creature_ptr) birth_quit(); if (c == 'S') - return FALSE; + return false; init_dungeon_quests(creature_ptr); save_prev_data(creature_ptr, &previous_char); - previous_char.quick_ok = TRUE; - return TRUE; + previous_char.quick_ok = true; + return true; } diff --git a/src/birth/character-builder.cpp b/src/birth/character-builder.cpp index 7ab547c9e..489d16e8f 100644 --- a/src/birth/character-builder.cpp +++ b/src/birth/character-builder.cpp @@ -89,7 +89,7 @@ void player_birth(player_type *creature_ptr) player_wipe_without_name(creature_ptr); if (!ask_quick_start(creature_ptr)) { play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_NEW_GAME); - while (TRUE) { + while (true) { if (player_birth_wizard(creature_ptr)) break; @@ -106,9 +106,9 @@ void player_birth(player_type *creature_ptr) seed_wilderness(); if (creature_ptr->prace == RACE_BEASTMAN) - creature_ptr->hack_mutation = TRUE; + creature_ptr->hack_mutation = true; else - creature_ptr->hack_mutation = FALSE; + creature_ptr->hack_mutation = false; if (!window_flag[1]) window_flag[1] |= PW_MESSAGE; diff --git a/src/birth/game-play-initializer.cpp b/src/birth/game-play-initializer.cpp index 0c82b8679..951259418 100644 --- a/src/birth/game-play-initializer.cpp +++ b/src/birth/game-play-initializer.cpp @@ -30,8 +30,8 @@ static void k_info_reset(void) { for (int i = 0; i < max_k_idx; i++) { object_kind *k_ptr = &k_info[i]; - k_ptr->tried = FALSE; - k_ptr->aware = FALSE; + k_ptr->tried = false; + k_ptr->aware = false; } } @@ -116,24 +116,24 @@ void player_wipe_without_name(player_type *creature_ptr) creature_ptr->knowledge = 0; creature_ptr->mutant_regenerate_mod = 100; - cheat_peek = FALSE; - cheat_hear = FALSE; - cheat_room = FALSE; - cheat_xtra = FALSE; - cheat_know = FALSE; - cheat_live = FALSE; - cheat_save = FALSE; - cheat_diary_output = FALSE; - cheat_turn = FALSE; - cheat_immortal = FALSE; - - current_world_ptr->total_winner = FALSE; - creature_ptr->timewalk = FALSE; + cheat_peek = false; + cheat_hear = false; + cheat_room = false; + cheat_xtra = false; + cheat_know = false; + cheat_live = false; + cheat_save = false; + cheat_diary_output = false; + cheat_turn = false; + cheat_immortal = false; + + current_world_ptr->total_winner = false; + creature_ptr->timewalk = false; creature_ptr->panic_save = 0; current_world_ptr->noscore = 0; - current_world_ptr->wizard = FALSE; - creature_ptr->wait_report_score = FALSE; + current_world_ptr->wizard = false; + creature_ptr->wait_report_score = false; creature_ptr->pet_follow_distance = PET_FOLLOW_DIST; creature_ptr->pet_extra_flags = (PF_TELEPORT | PF_ATTACK_SPELL | PF_SUMMON_SPELL); @@ -141,7 +141,7 @@ void player_wipe_without_name(player_type *creature_ptr) max_dlv[i] = 0; creature_ptr->visit = 1; - creature_ptr->wild_mode = FALSE; + creature_ptr->wild_mode = false; for (int i = 0; i < MAX_SPELLS; i++) { creature_ptr->magic_num1[i] = 0; @@ -150,7 +150,7 @@ void player_wipe_without_name(player_type *creature_ptr) creature_ptr->max_plv = creature_ptr->lev = 1; creature_ptr->arena_number = 0; - creature_ptr->current_floor_ptr->inside_arena = FALSE; + creature_ptr->current_floor_ptr->inside_arena = false; creature_ptr->current_floor_ptr->inside_quest = 0; for (int i = 0; i < MAX_MANE; i++) { creature_ptr->mane_spell[i] = RF_ABILITY::MAX; @@ -158,7 +158,7 @@ void player_wipe_without_name(player_type *creature_ptr) } creature_ptr->mane_num = 0; - creature_ptr->exit_bldg = TRUE; + creature_ptr->exit_bldg = true; creature_ptr->today_mon = 0; update_gambling_monsters(creature_ptr); creature_ptr->muta.clear(); diff --git a/src/birth/history-editor.cpp b/src/birth/history-editor.cpp index 774a79087..954f8bae2 100644 --- a/src/birth/history-editor.cpp +++ b/src/birth/history-editor.cpp @@ -37,7 +37,7 @@ void edit_history(player_type *creature_ptr) put_str(_("[ カーソルキーで移動、Enterで終了、Ctrl-Aでファイル読み込み ]", "[ Cursor key for Move, Enter for End, Ctrl-A for Read pref ]"), 17, 10); TERM_LEN y = 0; TERM_LEN x = 0; - while (TRUE) { + while (true) { char c; for (int i = 0; i < 4; i++) { @@ -52,7 +52,7 @@ void edit_history(player_type *creature_ptr) c_put_str(TERM_L_BLUE, format("%c", creature_ptr->history[y][x]), y + 12, x + 10); term_gotoxy(x + 10, y + 12); - int skey = inkey_special(TRUE); + int skey = inkey_special(true); if (!(skey & SKEY_MASK)) c = (char)skey; else diff --git a/src/birth/inventory-initializer.cpp b/src/birth/inventory-initializer.cpp index 2a05957ae..fd2ad9eeb 100644 --- a/src/birth/inventory-initializer.cpp +++ b/src/birth/inventory-initializer.cpp @@ -267,5 +267,5 @@ void player_outfit(player_type *creature_ptr) add_outfit(creature_ptr, q_ptr); } - k_info[lookup_kind(TV_POTION, SV_POTION_WATER)].aware = TRUE; + k_info[lookup_kind(TV_POTION, SV_POTION_WATER)].aware = true; } diff --git a/src/birth/quick-start.cpp b/src/birth/quick-start.cpp index aacf7bcc6..e7f179d10 100644 --- a/src/birth/quick-start.cpp +++ b/src/birth/quick-start.cpp @@ -26,26 +26,26 @@ birther previous_char; bool ask_quick_start(player_type *creature_ptr) { if (!previous_char.quick_ok) - return FALSE; + return false; term_clear(); put_str(_("クイック・スタートを使うと以前と全く同じキャラクターで始められます。", "Do you want to use the quick start function (same character as your last one)."), 11, 2); - while (TRUE) { + while (true) { char c; put_str(_("クイック・スタートを使いますか？[y/N]", "Use quick start? [y/N]"), 14, 10); c = inkey(); if (c == 'Q') quit(NULL); else if (c == 'S') - return FALSE; + return false; else if (c == '?') show_help(creature_ptr, _("jbirth.txt#QuickStart", "birth.txt#QuickStart")); else if ((c == 'y') || (c == 'Y')) break; else - return FALSE; + return false; } load_prev_data(creature_ptr, FALSE); @@ -64,7 +64,7 @@ bool ask_quick_start(player_type *creature_ptr) creature_ptr->chp = creature_ptr->mhp; creature_ptr->csp = creature_ptr->msp; process_player_name(creature_ptr); - return TRUE; + return true; } /*! * @brief プレイヤーのクイックスタート情報をプレイヤー構造体から保存する / Save the current data for later diff --git a/src/blue-magic/blue-magic-ball-bolt.cpp b/src/blue-magic/blue-magic-ball-bolt.cpp index 1b38859f5..e72970b03 100644 --- a/src/blue-magic/blue-magic-ball-bolt.cpp +++ b/src/blue-magic/blue-magic-ball-bolt.cpp @@ -16,89 +16,89 @@ bool cast_blue_ball_acid(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("アシッド・ボールの呪文を唱えた。", "You cast an acid ball.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_ACID, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_ACID, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } bool cast_blue_ball_elec(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("サンダー・ボールの呪文を唱えた。", "You cast a lightning ball.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_ELEC, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_ELEC, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } bool cast_blue_ball_fire(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("ファイア・ボールの呪文を唱えた。", "You cast a fire ball.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_FIRE, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_FIRE, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } bool cast_blue_ball_cold(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("アイス・ボールの呪文を唱えた。", "You cast a frost ball.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_COLD, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_COLD, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } bool cast_blue_ball_pois(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("悪臭雲の呪文を唱えた。", "You cast a stinking cloud.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_POIS, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_POIS, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } bool cast_blue_ball_nuke(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("放射能球を放った。", "You cast a ball of radiation.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_NUKE, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_NUKE, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } bool cast_blue_ball_nether(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("地獄球の呪文を唱えた。", "You cast a nether ball.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_NETH, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_NETHER, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } bool cast_blue_ball_chaos(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("純ログルスを放った。", "You invoke a raw Logrus.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_CHAO, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_CHAOS, bmc_ptr->dir, bmc_ptr->damage, 4); - return TRUE; + return true; } /*! @@ -111,153 +111,153 @@ bool cast_blue_ball_chaos(player_type *caster_ptr, bmc_type *bmc_ptr) bool cast_blue_ball_water(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("流れるような身振りをした。", "You gesture fluidly.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_WATE, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_WATER, bmc_ptr->dir, bmc_ptr->damage, 4); - return TRUE; + return true; } bool cast_blue_ball_star_burst(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("スターバーストの呪文を念じた。", "You invoke a starburst.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_LITE, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_LITE, bmc_ptr->dir, bmc_ptr->damage, 4); - return TRUE; + return true; } bool cast_blue_ball_dark_storm(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("暗黒の嵐の呪文を念じた。", "You invoke a darkness storm.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_DARK, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_DARK, bmc_ptr->dir, bmc_ptr->damage, 4); - return TRUE; + return true; } bool cast_blue_ball_mana_storm(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("魔力の嵐の呪文を念じた。", "You invoke a mana storm.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BA_MANA, bmc_ptr->plev, DAM_ROLL); fire_ball(caster_ptr, GF_MANA, bmc_ptr->dir, bmc_ptr->damage, 4); - return TRUE; + return true; } bool cast_blue_bolt_acid(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("アシッド・ボルトの呪文を唱えた。", "You cast an acid bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_ACID, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_ACID, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_elec(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("サンダー・ボルトの呪文を唱えた。", "You cast a lightning bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_ELEC, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_ELEC, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_fire(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("ファイア・ボルトの呪文を唱えた。", "You cast a fire bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_FIRE, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_FIRE, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_cold(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("アイス・ボルトの呪文を唱えた。", "You cast a frost bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_COLD, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_COLD, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_nether(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("地獄の矢の呪文を唱えた。", "You cast a nether bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_NETH, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_NETHER, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_water(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("ウォーター・ボルトの呪文を唱えた。", "You cast a water bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_WATE, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_WATER, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_mana(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("魔力の矢の呪文を唱えた。", "You cast a mana bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_MANA, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_MANA, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_plasma(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("プラズマ・ボルトの呪文を唱えた。", "You cast a plasma bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_PLAS, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_PLASMA, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_icee(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("極寒の矢の呪文を唱えた。", "You cast a ice bolt.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BO_ICEE, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_ICE, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } bool cast_blue_bolt_missile(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("マジック・ミサイルの呪文を唱えた。", "You cast a magic missile.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::MISSILE, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_MISSILE, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } diff --git a/src/blue-magic/blue-magic-breath.cpp b/src/blue-magic/blue-magic-breath.cpp index 06c19a332..1edcfb237 100644 --- a/src/blue-magic/blue-magic-breath.cpp +++ b/src/blue-magic/blue-magic-breath.cpp @@ -17,232 +17,232 @@ bool cast_blue_breath_acid(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("酸のブレスを吐いた。", "You breathe acid.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_ACID, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_ACID, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_elec(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("稲妻のブレスを吐いた。", "You breathe lightning.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_ELEC, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_ELEC, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_fire(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("火炎のブレスを吐いた。", "You breathe fire.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_FIRE, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_FIRE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_cold(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("冷気のブレスを吐いた。", "You breathe frost.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_COLD, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_COLD, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_pois(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("ガスのブレスを吐いた。", "You breathe gas.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_POIS, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_POIS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_nether(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("地獄のブレスを吐いた。", "You breathe nether.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_NETH, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_NETHER, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_lite(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("閃光のブレスを吐いた。", "You breathe light.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_LITE, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_LITE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_dark(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("暗黒のブレスを吐いた。", "You breathe darkness.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_DARK, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_DARK, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_conf(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("混乱のブレスを吐いた。", "You breathe confusion.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_CONF, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_CONFUSION, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_sound(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("轟音のブレスを吐いた。", "You breathe sound.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_SOUN, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_SOUND, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_chaos(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("カオスのブレスを吐いた。", "You breathe chaos.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_CHAO, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_CHAOS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_disenchant(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("劣化のブレスを吐いた。", "You breathe disenchantment.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_DISE, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_DISENCHANT, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_nexus(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_NEXU, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_NEXUS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_time(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("時間逆転のブレスを吐いた。", "You breathe time.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_TIME, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_TIME, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_inertia(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_INER, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_INERTIAL, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_gravity(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("重力のブレスを吐いた。", "You breathe gravity.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_GRAV, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_GRAVITY, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_shards(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("破片のブレスを吐いた。", "You breathe shards.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_SHAR, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_SHARDS, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_plasma(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_PLAS, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_PLASMA, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_force(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("フォースのブレスを吐いた。", "You breathe force.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_FORC, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_FORCE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_mana(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("魔力のブレスを吐いた。", "You breathe mana.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_MANA, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_MANA, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } bool cast_blue_breath_nuke(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("放射性廃棄物のブレスを吐いた。", "You breathe toxic waste.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_NUKE, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_NUKE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } /*! @@ -254,10 +254,10 @@ bool cast_blue_breath_nuke(player_type *caster_ptr, bmc_type *bmc_ptr) bool cast_blue_breath_disintegration(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("分解のブレスを吐いた。", "You breathe disintegration.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BR_DISI, bmc_ptr->plev, DAM_ROLL); fire_breath(caster_ptr, GF_DISINTEGRATE, bmc_ptr->dir, bmc_ptr->damage, (bmc_ptr->plev > 40 ? 3 : 2)); - return TRUE; + return true; } diff --git a/src/blue-magic/blue-magic-caster.cpp b/src/blue-magic/blue-magic-caster.cpp index fb34e93b4..26a087158 100644 --- a/src/blue-magic/blue-magic-caster.cpp +++ b/src/blue-magic/blue-magic-caster.cpp @@ -47,47 +47,47 @@ static bool cast_blue_dispel(player_type *caster_ptr) { if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; MONSTER_IDX m_idx = caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx; if ((m_idx == 0) || !player_has_los_bold(caster_ptr, target_row, target_col) || !projectable(caster_ptr, caster_ptr->y, caster_ptr->x, target_row, target_col)) - return TRUE; + return true; dispel_monster_status(caster_ptr, m_idx); - return TRUE; + return true; } static bool cast_blue_rocket(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("ロケットを発射した。", "You fire a rocket.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::ROCKET, bmc_ptr->plev, DAM_ROLL); fire_rocket(caster_ptr, GF_ROCKET, bmc_ptr->dir, bmc_ptr->damage, 2); - return TRUE; + return true; } static bool cast_blue_shoot(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("矢を放った。", "You fire an arrow.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::SHOOT, bmc_ptr->plev, DAM_ROLL); fire_bolt(caster_ptr, GF_ARROW, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } static bool cast_blue_hand_doom(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("<破滅の手>を放った！", "You invoke the Hand of Doom!")); fire_ball_hide(caster_ptr, GF_HAND_DOOM, bmc_ptr->dir, bmc_ptr->plev * 3, 0); - return TRUE; + return true; } static bool exe_blue_teleport_back(player_type *caster_ptr, GAME_TEXT *m_name) @@ -97,75 +97,75 @@ static bool exe_blue_teleport_back(player_type *caster_ptr, GAME_TEXT *m_name) floor_type *floor_ptr = caster_ptr->current_floor_ptr; if ((floor_ptr->grid_array[target_row][target_col].m_idx == 0) || !player_has_los_bold(caster_ptr, target_row, target_col) || !projectable(caster_ptr, caster_ptr->y, caster_ptr->x, target_row, target_col)) - return TRUE; + return true; m_ptr = &floor_ptr->m_list[floor_ptr->grid_array[target_row][target_col].m_idx]; r_ptr = &r_info[m_ptr->r_idx]; monster_desc(caster_ptr, m_name, m_ptr, 0); if ((r_ptr->flagsr & RFR_RES_TELE) == 0) - return FALSE; + return false; if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flagsr & RFR_RES_ALL)) { if (is_original_ap_and_seen(caster_ptr, m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; msg_format(_("%sには効果がなかった！", "%s is unaffected!"), m_name); - return TRUE; + return true; } if (r_ptr->level <= randint1(100)) - return FALSE; + return false; if (is_original_ap_and_seen(caster_ptr, m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; msg_format(_("%sには耐性がある！", "%s resists!"), m_name); - return TRUE; + return true; } static bool cast_blue_teleport_back(player_type *caster_ptr) { if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; GAME_TEXT m_name[MAX_NLEN]; if (exe_blue_teleport_back(caster_ptr, m_name)) - return TRUE; + return true; msg_format(_("%sを引き戻した。", "You command %s to return."), m_name); teleport_monster_to( caster_ptr, caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx, caster_ptr->y, caster_ptr->x, 100, TELEPORT_PASSIVE); - return TRUE; + return true; } static bool cast_blue_teleport_away(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; (void)fire_beam(caster_ptr, GF_AWAY_ALL, bmc_ptr->dir, 100); - return TRUE; + return true; } static bool cast_blue_psy_spear(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("光の剣を放った。", "You throw a psycho-spear.")); bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::PSY_SPEAR, bmc_ptr->plev, DAM_ROLL); (void)fire_beam(caster_ptr, GF_PSY_SPEAR, bmc_ptr->dir, bmc_ptr->damage); - return TRUE; + return true; } static bool cast_blue_make_trap(player_type *caster_ptr) { if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("呪文を唱えて邪悪に微笑んだ。", "You cast a spell and cackle evilly.")); trap_creation(caster_ptr, target_row, target_col); - return TRUE; + return true; } static bool switch_cast_blue_magic(player_type *caster_ptr, bmc_type *bmc_ptr, RF_ABILITY spell) @@ -174,12 +174,12 @@ static bool switch_cast_blue_magic(player_type *caster_ptr, bmc_type *bmc_ptr, R case RF_ABILITY::SHRIEK: msg_print(_("かん高い金切り声をあげた。", "You make a high pitched shriek.")); aggravate_monsters(caster_ptr, 0); - return TRUE; + return true; case RF_ABILITY::XXX1: case RF_ABILITY::XXX2: case RF_ABILITY::XXX3: case RF_ABILITY::XXX4: - return TRUE; + return true; case RF_ABILITY::DISPEL: return cast_blue_dispel(caster_ptr); case RF_ABILITY::ROCKET: @@ -300,7 +300,7 @@ static bool switch_cast_blue_magic(player_type *caster_ptr, bmc_type *bmc_ptr, R return cast_blue_sleep(caster_ptr, bmc_ptr); case RF_ABILITY::HASTE: (void)set_fast(caster_ptr, randint1(20 + bmc_ptr->plev) + bmc_ptr->plev, FALSE); - return TRUE; + return true; case RF_ABILITY::HAND_DOOM: return cast_blue_hand_doom(caster_ptr, bmc_ptr); case RF_ABILITY::HEAL: @@ -308,22 +308,22 @@ static bool switch_cast_blue_magic(player_type *caster_ptr, bmc_type *bmc_ptr, R (void)hp_player(caster_ptr, bmc_ptr->plev * 4); (void)set_stun(caster_ptr, 0); (void)set_cut(caster_ptr, 0); - return TRUE; + return true; case RF_ABILITY::INVULNER: msg_print(_("無傷の球の呪文を唱えた。", "You cast a Globe of Invulnerability.")); (void)set_invuln(caster_ptr, randint1(4) + 4, FALSE); - return TRUE; + return true; case RF_ABILITY::BLINK: teleport_player(caster_ptr, 10, TELEPORT_SPONTANEOUS); - return TRUE; + return true; case RF_ABILITY::TPORT: teleport_player(caster_ptr, bmc_ptr->plev * 5, TELEPORT_SPONTANEOUS); - return TRUE; + return true; case RF_ABILITY::WORLD: (void)time_walk(caster_ptr); - return TRUE; + return true; case RF_ABILITY::SPECIAL: - return TRUE; + return true; case RF_ABILITY::TELE_TO: return cast_blue_teleport_back(caster_ptr); case RF_ABILITY::TELE_AWAY: @@ -335,16 +335,16 @@ static bool switch_cast_blue_magic(player_type *caster_ptr, bmc_type *bmc_ptr, R case RF_ABILITY::DARKNESS: msg_print(_("暗闇の中で手を振った。", "You gesture in shadow.")); (void)unlite_area(caster_ptr, 10, 3); - return TRUE; + return true; case RF_ABILITY::TRAPS: return cast_blue_make_trap(caster_ptr); case RF_ABILITY::FORGET: msg_print(_("しかし何も起きなかった。", "Nothing happens.")); - return TRUE; + return true; case RF_ABILITY::RAISE_DEAD: msg_print(_("死者復活の呪文を唱えた。", "You animate the dead.")); (void)animate_dead(caster_ptr, 0, caster_ptr->y, caster_ptr->x); - return TRUE; + return true; case RF_ABILITY::S_KIN: return cast_blue_summon_kin(caster_ptr, bmc_ptr); case RF_ABILITY::S_CYBER: @@ -379,7 +379,7 @@ static bool switch_cast_blue_magic(player_type *caster_ptr, bmc_type *bmc_ptr, R return cast_blue_summon_unique(caster_ptr, bmc_ptr); default: msg_print("hoge?"); - return TRUE; + return true; } } @@ -395,10 +395,10 @@ bool cast_learned_spell(player_type *caster_ptr, RF_ABILITY spell, const bool su bmc_type tmp_bm; bmc_type *bmc_ptr = initialize_blue_magic_type(caster_ptr, &tmp_bm, success, get_pseudo_monstetr_level); if (!switch_cast_blue_magic(caster_ptr, bmc_ptr, spell)) - return FALSE; + return false; if (bmc_ptr->no_trump) msg_print(_("何も現れなかった。", "No one appeared.")); - return TRUE; + return true; } diff --git a/src/blue-magic/blue-magic-checker.cpp b/src/blue-magic/blue-magic-checker.cpp index a281d2276..6e2d4295b 100644 --- a/src/blue-magic/blue-magic-checker.cpp +++ b/src/blue-magic/blue-magic-checker.cpp @@ -41,7 +41,7 @@ void learn_spell(player_type *learner_ptr, int monspell) msg_format(_("%sを学習した！", "You have learned %s!"), monster_powers[monspell].name); gain_exp(learner_ptr, monster_powers[monspell].level * monster_powers[monspell].smana); sound(SOUND_STUDY); - learner_ptr->new_mane = TRUE; + learner_ptr->new_mane = true; learner_ptr->redraw |= PR_STATE; } } diff --git a/src/blue-magic/blue-magic-spirit-curse.cpp b/src/blue-magic/blue-magic-spirit-curse.cpp index 0775a0acc..2c2265bc8 100644 --- a/src/blue-magic/blue-magic-spirit-curse.cpp +++ b/src/blue-magic/blue-magic-spirit-curse.cpp @@ -17,69 +17,69 @@ bool cast_blue_drain_mana(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::DRAIN_MANA, bmc_ptr->plev, DAM_ROLL); fire_ball_hide(caster_ptr, GF_DRAIN_MANA, bmc_ptr->dir, bmc_ptr->damage, 0); - return TRUE; + return true; } bool cast_blue_mind_blast(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::MIND_BLAST, bmc_ptr->plev, DAM_ROLL); fire_ball_hide(caster_ptr, GF_MIND_BLAST, bmc_ptr->dir, bmc_ptr->damage, 0); - return TRUE; + return true; } bool cast_blue_brain_smash(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::BRAIN_SMASH, bmc_ptr->plev, DAM_ROLL); fire_ball_hide(caster_ptr, GF_BRAIN_SMASH, bmc_ptr->dir, bmc_ptr->damage, 0); - return TRUE; + return true; } bool cast_blue_curse_1(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::CAUSE_1, bmc_ptr->plev, DAM_ROLL); fire_ball_hide(caster_ptr, GF_CAUSE_1, bmc_ptr->dir, bmc_ptr->damage, 0); - return TRUE; + return true; } bool cast_blue_curse_2(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::CAUSE_2, bmc_ptr->plev, DAM_ROLL); fire_ball_hide(caster_ptr, GF_CAUSE_2, bmc_ptr->dir, bmc_ptr->damage, 0); - return TRUE; + return true; } bool cast_blue_curse_3(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::CAUSE_3, bmc_ptr->plev, DAM_ROLL); fire_ball_hide(caster_ptr, GF_CAUSE_3, bmc_ptr->dir, bmc_ptr->damage, 0); - return TRUE; + return true; } bool cast_blue_curse_4(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; bmc_ptr->damage = monspell_bluemage_damage(caster_ptr, RF_ABILITY::CAUSE_4, bmc_ptr->plev, DAM_ROLL); fire_ball_hide(caster_ptr, GF_CAUSE_4, bmc_ptr->dir, bmc_ptr->damage, 0); - return TRUE; + return true; } diff --git a/src/blue-magic/blue-magic-status.cpp b/src/blue-magic/blue-magic-status.cpp index ba0423fe8..85eca96bc 100644 --- a/src/blue-magic/blue-magic-status.cpp +++ b/src/blue-magic/blue-magic-status.cpp @@ -13,46 +13,46 @@ bool cast_blue_scare(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("恐ろしげな幻覚を作り出した。", "You cast a fearful illusion.")); fear_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev + 10); - return TRUE; + return true; } bool cast_blue_blind(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; confuse_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev * 2); - return TRUE; + return true; } bool cast_blue_confusion(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; msg_print(_("誘惑的な幻覚をつくり出した。", "You cast a mesmerizing illusion.")); confuse_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev * 2); - return TRUE; + return true; } bool cast_blue_slow(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; slow_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev); - return TRUE; + return true; } bool cast_blue_sleep(player_type *caster_ptr, bmc_type *bmc_ptr) { if (!get_aim_dir(caster_ptr, &bmc_ptr->dir)) - return FALSE; + return false; sleep_monster(caster_ptr, bmc_ptr->dir, bmc_ptr->plev); - return TRUE; + return true; } diff --git a/src/blue-magic/blue-magic-summon.cpp b/src/blue-magic/blue-magic-summon.cpp index 9fe4d8c9e..44afaf865 100644 --- a/src/blue-magic/blue-magic-summon.cpp +++ b/src/blue-magic/blue-magic-summon.cpp @@ -20,11 +20,11 @@ bool cast_blue_summon_kin(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚された仲間は怒っている！", "The summoned companion is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } } - return TRUE; + return true; } bool cast_blue_summon_cyber(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -35,11 +35,11 @@ bool cast_blue_summon_cyber(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたサイバーデーモンは怒っている！", "The summoned Cyberdemon is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } } - return TRUE; + return true; } bool cast_blue_summon_monster(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -50,11 +50,11 @@ bool cast_blue_summon_monster(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたモンスターは怒っている！", "The summoned monster is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } } - return TRUE; + return true; } bool cast_blue_summon_monsters(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -65,11 +65,11 @@ bool cast_blue_summon_monsters(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたモンスターは怒っている！", "The summoned monsters are angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } } - return TRUE; + return true; } bool cast_blue_summon_ant(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -80,10 +80,10 @@ bool cast_blue_summon_ant(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたアリは怒っている！", "The summoned ants are angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_spider(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -94,10 +94,10 @@ bool cast_blue_summon_spider(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚された蜘蛛は怒っている！", "The summoned spiders are angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_hound(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -108,10 +108,10 @@ bool cast_blue_summon_hound(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたハウンドは怒っている！", "The summoned hounds are angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_hydra(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -122,10 +122,10 @@ bool cast_blue_summon_hydra(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたヒドラは怒っている！", "The summoned hydras are angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_angel(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -136,10 +136,10 @@ bool cast_blue_summon_angel(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚された天使は怒っている！", "The summoned angel is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_demon(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -150,10 +150,10 @@ bool cast_blue_summon_demon(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたデーモンは怒っている！", "The summoned demon is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_undead(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -164,10 +164,10 @@ bool cast_blue_summon_undead(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたアンデッドは怒っている！", "The summoned undead is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_dragon(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -178,10 +178,10 @@ bool cast_blue_summon_dragon(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたドラゴンは怒っている！", "The summoned dragon is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_high_undead(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -192,10 +192,10 @@ bool cast_blue_summon_high_undead(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚された上級アンデッドは怒っている！", "The summoned greater undead is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_high_dragon(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -206,10 +206,10 @@ bool cast_blue_summon_high_dragon(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚された古代ドラゴンは怒っている！", "The summoned ancient dragon is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_amberite(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -220,10 +220,10 @@ bool cast_blue_summon_amberite(player_type *caster_ptr, bmc_type *bmc_ptr) if (!bmc_ptr->pet) msg_print(_("召喚されたアンバーの王族は怒っている！", "The summoned Lord of Amber is angry!")); } else { - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; } - return TRUE; + return true; } bool cast_blue_summon_unique(player_type *caster_ptr, bmc_type *bmc_ptr) @@ -249,7 +249,7 @@ bool cast_blue_summon_unique(player_type *caster_ptr, bmc_type *bmc_ptr) } if (!count) - bmc_ptr->no_trump = TRUE; + bmc_ptr->no_trump = true; - return TRUE; + return true; } diff --git a/src/blue-magic/blue-magic-util.cpp b/src/blue-magic/blue-magic-util.cpp index 64bf6f1fa..0fb4d6c65 100644 --- a/src/blue-magic/blue-magic-util.cpp +++ b/src/blue-magic/blue-magic-util.cpp @@ -14,7 +14,7 @@ bmc_type *initialize_blue_magic_type( bmc_ptr->summon_lev = caster_ptr->lev * 2 / 3 + randint1(caster_ptr->lev / 2); bmc_ptr->damage = 0; bmc_ptr->pet = success; // read-only. - bmc_ptr->no_trump = FALSE; + bmc_ptr->no_trump = false; bmc_ptr->p_mode = bmc_ptr->pet ? PM_FORCE_PET : PM_NO_PET; bmc_ptr->u_mode = 0L; bmc_ptr->g_mode = bmc_ptr->pet ? 0 : PM_ALLOW_GROUP; diff --git a/src/blue-magic/learnt-power-getter.cpp b/src/blue-magic/learnt-power-getter.cpp index cfe43a3ec..49f081a9d 100644 --- a/src/blue-magic/learnt-power-getter.cpp +++ b/src/blue-magic/learnt-power-getter.cpp @@ -58,13 +58,13 @@ static learnt_magic_type *initialize_lenat_magic_type(player_type *caster_ptr, l lm_ptr->x = 18; lm_ptr->plev = caster_ptr->lev; lm_ptr->chance = 0; - lm_ptr->ask = TRUE; + lm_ptr->ask = true; lm_ptr->mode = 0; lm_ptr->blue_magics.clear(); lm_ptr->ability_flags.clear(); lm_ptr->menu_line = use_menu ? 1 : 0; - lm_ptr->flag = FALSE; - lm_ptr->redraw = FALSE; + lm_ptr->flag = false; + lm_ptr->redraw = false; return lm_ptr; } @@ -78,10 +78,10 @@ static bool check_blue_magic_cancel(SPELL_IDX *sn) *sn = -1; COMMAND_CODE code; if (!repeat_pull(&code)) - return FALSE; + return false; *sn = (SPELL_IDX)code; - return TRUE; + return true; } static bool select_blue_magic_kind_menu(learnt_magic_type *lm_ptr) @@ -100,7 +100,7 @@ static bool select_blue_magic_kind_menu(learnt_magic_type *lm_ptr) case 'z': case 'Z': screen_load(); - return FALSE; + return false; case '2': case 'j': case 'J': @@ -122,16 +122,16 @@ static bool select_blue_magic_kind_menu(learnt_magic_type *lm_ptr) lm_ptr->menu_line -= 5; } - return TRUE; + return true; } static bool select_blue_magic_kind_command(learnt_magic_type *lm_ptr) { sprintf(lm_ptr->comment, _("[A]ボルト, [B]ボール, [C]ブレス, [D]召喚, [E]その他:", "[A] bolt, [B] ball, [C] breath, [D] summoning, [E] others:")); - while (TRUE) { + while (true) { char ch; if (!get_com(lm_ptr->comment, &ch, TRUE)) - return FALSE; + return false; if (ch == 'A' || ch == 'a') { lm_ptr->mode = 1; @@ -159,7 +159,7 @@ static bool select_blue_magic_kind_command(learnt_magic_type *lm_ptr) } } - return TRUE; + return true; } static bool check_blue_magic_kind(learnt_magic_type *lm_ptr) @@ -169,10 +169,10 @@ static bool check_blue_magic_kind(learnt_magic_type *lm_ptr) screen_save(); if (!select_blue_magic_kind_menu(lm_ptr)) - return FALSE; + return false; screen_load(); - return TRUE; + return true; } static bool sweep_learnt_spells(player_type *caster_ptr, learnt_magic_type *lm_ptr) @@ -196,12 +196,12 @@ static bool sweep_learnt_spells(player_type *caster_ptr, learnt_magic_type *lm_p if (lm_ptr->blue_magic_num == lm_ptr->count) { msg_print(_("その種類の魔法は覚えていない！", "You don't know any spell of this type.")); - return FALSE; + return false; } (void)strnfmt(lm_ptr->out_val, 78, _("(%c-%c, '*'で一覧, ESC) どの%sを唱えますか？", "(%c-%c, *=List, ESC=exit) Use which %s? "), I2A(0), I2A(lm_ptr->count - 1), _("魔法", "magic")); - return TRUE; + return true; } static bool switch_blue_magic_choice(player_type *caster_ptr, learnt_magic_type *lm_ptr) @@ -209,7 +209,7 @@ static bool switch_blue_magic_choice(player_type *caster_ptr, learnt_magic_type switch (lm_ptr->choice) { case '0': screen_load(); - return FALSE; + return false; case '8': case 'k': case 'K': @@ -218,7 +218,7 @@ static bool switch_blue_magic_choice(player_type *caster_ptr, learnt_magic_type if (lm_ptr->menu_line > lm_ptr->count) lm_ptr->menu_line -= lm_ptr->count; } while (!caster_ptr->magic_num2[lm_ptr->blue_magics[lm_ptr->menu_line - 1]]); - return TRUE; + return true; case '2': case 'j': case 'J': @@ -227,7 +227,7 @@ static bool switch_blue_magic_choice(player_type *caster_ptr, learnt_magic_type if (lm_ptr->menu_line > lm_ptr->count) lm_ptr->menu_line -= lm_ptr->count; } while (!caster_ptr->magic_num2[lm_ptr->blue_magics[lm_ptr->menu_line - 1]]); - return TRUE; + return true; case '6': case 'l': case 'L': @@ -235,7 +235,7 @@ static bool switch_blue_magic_choice(player_type *caster_ptr, learnt_magic_type while (!caster_ptr->magic_num2[lm_ptr->blue_magics[lm_ptr->menu_line - 1]]) lm_ptr->menu_line--; - return TRUE; + return true; case '4': case 'h': case 'H': @@ -243,15 +243,15 @@ static bool switch_blue_magic_choice(player_type *caster_ptr, learnt_magic_type while (!caster_ptr->magic_num2[lm_ptr->blue_magics[lm_ptr->menu_line - 1]]) lm_ptr->menu_line++; - return TRUE; + return true; case 'x': case 'X': case '\r': lm_ptr->blue_magic_num = lm_ptr->menu_line - 1; - lm_ptr->ask = FALSE; - return TRUE; + lm_ptr->ask = false; + return true; default: - return TRUE; + return true; } } @@ -319,15 +319,15 @@ static void describe_blue_magic_name(player_type *caster_ptr, learnt_magic_type static bool blue_magic_key_input(player_type *caster_ptr, learnt_magic_type *lm_ptr) { if ((lm_ptr->choice != ' ') && (lm_ptr->choice != '*') && (lm_ptr->choice != '?') && (!use_menu || (lm_ptr->ask == 0))) - return FALSE; + return false; if (lm_ptr->redraw && !use_menu) { - lm_ptr->redraw = FALSE; + lm_ptr->redraw = false; screen_load(); - return TRUE; + return true; } - lm_ptr->redraw = TRUE; + lm_ptr->redraw = true; if (!use_menu) screen_save(); @@ -335,7 +335,7 @@ static bool blue_magic_key_input(player_type *caster_ptr, learnt_magic_type *lm_ if (lm_ptr->y < 22) prt("", lm_ptr->y + lm_ptr->blue_magic_num + 1, lm_ptr->x); - return TRUE; + return true; } static void convert_lower_blue_magic_selection(learnt_magic_type *lm_ptr) @@ -353,7 +353,7 @@ static void convert_lower_blue_magic_selection(learnt_magic_type *lm_ptr) static bool ask_cast_blue_magic(learnt_magic_type *lm_ptr) { if (lm_ptr->ask == 0) - return TRUE; + return true; char tmp_val[160]; (void)strnfmt(tmp_val, 78, _("%sの魔法を唱えますか？", "Use %s? "), monster_powers[static_cast(lm_ptr->blue_magics[lm_ptr->blue_magic_num])].name); @@ -369,7 +369,7 @@ static bool select_learnt_spells(player_type *caster_ptr, learnt_magic_type *lm_ break; if (use_menu && (lm_ptr->choice != ' ') && !switch_blue_magic_choice(caster_ptr, lm_ptr)) - return FALSE; + return false; if (blue_magic_key_input(caster_ptr, lm_ptr)) continue; @@ -384,10 +384,10 @@ static bool select_learnt_spells(player_type *caster_ptr, learnt_magic_type *lm_ if (!ask_cast_blue_magic(lm_ptr)) continue; - lm_ptr->flag = TRUE; + lm_ptr->flag = true; } - return TRUE; + return true; } /*! @@ -413,17 +413,17 @@ bool get_learned_power(player_type *caster_ptr, SPELL_IDX *sn) learnt_magic_type tmp_magic; learnt_magic_type *lm_ptr = initialize_lenat_magic_type(caster_ptr, &tmp_magic); if (check_blue_magic_cancel(sn)) - return TRUE; + return true; if (!check_blue_magic_kind(lm_ptr) || !sweep_learnt_spells(caster_ptr, lm_ptr)) - return FALSE; + return false; if (use_menu) screen_save(); lm_ptr->choice = (always_show_list || use_menu) ? ESCAPE : 1; if (!select_learnt_spells(caster_ptr, lm_ptr)) - return FALSE; + return false; if (lm_ptr->redraw) screen_load(); @@ -432,9 +432,9 @@ bool get_learned_power(player_type *caster_ptr, SPELL_IDX *sn) handle_stuff(caster_ptr); if (!lm_ptr->flag) - return FALSE; + return false; *sn = lm_ptr->blue_magics[lm_ptr->blue_magic_num]; repeat_push((COMMAND_CODE)lm_ptr->blue_magics[lm_ptr->blue_magic_num]); - return TRUE; + return true; } diff --git a/src/cmd-action/cmd-attack.cpp b/src/cmd-action/cmd-attack.cpp index 188c94cbe..6df3d3ac5 100644 --- a/src/cmd-action/cmd-attack.cpp +++ b/src/cmd-action/cmd-attack.cpp @@ -181,7 +181,7 @@ bool do_cmd_attack(player_type *attacker_ptr, POSITION y, POSITION x, combat_opt if (!can_attack_with_main_hand(attacker_ptr) && !can_attack_with_sub_hand(attacker_ptr) && attacker_ptr->muta.has_none_of(mutation_attack_methods)) { msg_format(_("%s攻撃できない。", "You cannot attack."), (empty_hands(attacker_ptr, FALSE) == EMPTY_HAND_NONE) ? _("両手がふさがって", "") : ""); - return FALSE; + return false; } monster_desc(attacker_ptr, m_name, m_ptr, 0); @@ -196,21 +196,21 @@ bool do_cmd_attack(player_type *attacker_ptr, POSITION y, POSITION x, combat_opt if ((r_ptr->flags1 & RF1_FEMALE) && !(attacker_ptr->stun || attacker_ptr->confused || attacker_ptr->image || !m_ptr->ml)) { if ((attacker_ptr->inventory_list[INVEN_MAIN_HAND].name1 == ART_ZANTETSU) || (attacker_ptr->inventory_list[INVEN_SUB_HAND].name1 == ART_ZANTETSU)) { msg_print(_("拙者、おなごは斬れぬ！", "I can not attack women!")); - return FALSE; + return false; } } if (d_info[attacker_ptr->dungeon_idx].flags.has(DF::NO_MELEE)) { msg_print(_("なぜか攻撃することができない。", "Something prevents you from attacking.")); - return FALSE; + return false; } - bool stormbringer = FALSE; + bool stormbringer = false; if (!is_hostile(m_ptr) && !(attacker_ptr->stun || attacker_ptr->confused || attacker_ptr->image || is_shero(attacker_ptr) || !m_ptr->ml)) { if (attacker_ptr->inventory_list[INVEN_MAIN_HAND].name1 == ART_STORMBRINGER) - stormbringer = TRUE; + stormbringer = true; if (attacker_ptr->inventory_list[INVEN_SUB_HAND].name1 == ART_STORMBRINGER) - stormbringer = TRUE; + stormbringer = true; if (stormbringer) { msg_format(_("黒い刃は強欲に%sを攻撃した！", "Your black blade greedily attacks %s!"), m_name); chg_virtue(attacker_ptr, V_INDIVIDUALISM, 1); @@ -225,7 +225,7 @@ bool do_cmd_attack(player_type *attacker_ptr, POSITION y, POSITION x, combat_opt chg_virtue(attacker_ptr, V_COMPASSION, -1); } else { msg_format(_("%sを攻撃するのを止めた。", "You stop to avoid hitting %s."), m_name); - return FALSE; + return false; } } } @@ -237,7 +237,7 @@ bool do_cmd_attack(player_type *attacker_ptr, POSITION y, POSITION x, combat_opt msg_format(_("そっちには何か恐いものがいる！", "There is something scary in your way!")); (void)set_monster_csleep(attacker_ptr, g_ptr->m_idx, 0); - return FALSE; + return false; } if (monster_csleep_remaining(m_ptr)) { @@ -288,8 +288,8 @@ bool do_cmd_attack(player_type *attacker_ptr, POSITION y, POSITION x, combat_opt } attacker_ptr->riding_t_m_idx = g_ptr->m_idx; - bool fear = FALSE; - bool mdeath = FALSE; + bool fear = false; + bool mdeath = false; if (can_attack_with_main_hand(attacker_ptr)) exe_player_attack_to_monster(attacker_ptr, y, x, &fear, &mdeath, 0, mode); if (can_attack_with_sub_hand(attacker_ptr) && !mdeath) diff --git a/src/cmd-action/cmd-hissatsu.cpp b/src/cmd-action/cmd-hissatsu.cpp index 8991e6c96..b0c9a3aba 100644 --- a/src/cmd-action/cmd-hissatsu.cpp +++ b/src/cmd-action/cmd-hissatsu.cpp @@ -66,7 +66,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) POSITION y = 1; POSITION x = 15; PLAYER_LEVEL plev = creature_ptr->lev; - int ask = TRUE; + int ask = true; char choice; char out_val[160]; SPELL_IDX sentaku[32]; @@ -85,12 +85,12 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) /* Verify the spell */ if (technic_info[TECHNIC_HISSATSU][*sn].slevel <= plev) { /* Success */ - return TRUE; + return true; } } - flag = FALSE; - redraw = FALSE; + flag = false; + redraw = false; for (i = 0; i < 32; i++) { if (technic_info[TECHNIC_HISSATSU][i].slevel <= PY_MAX_LEVEL) { @@ -117,7 +117,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) switch (choice) { case '0': { screen_load(); - return FALSE; + return false; } case '8': @@ -148,23 +148,23 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) case '6': case 'l': case 'L': { - bool reverse = FALSE; + bool reverse = false; if ((choice == '4') || (choice == 'h') || (choice == 'H')) - reverse = TRUE; + reverse = true; if (menu_line > 16) { menu_line -= 16; - reverse = TRUE; + reverse = true; } else menu_line += 16; while (!(creature_ptr->spell_learned1 & (1UL << (menu_line - 1)))) { if (reverse) { menu_line--; if (menu_line < 2) - reverse = FALSE; + reverse = false; } else { menu_line++; if (menu_line > 31) - reverse = TRUE; + reverse = true; } } break; @@ -175,7 +175,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) case '\r': case '\n': { i = menu_line - 1; - ask = FALSE; + ask = false; break; } } @@ -186,7 +186,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) if (!redraw || use_menu) { char psi_desc[80]; int line; - redraw = TRUE; + redraw = true; if (!use_menu) screen_save(); @@ -234,7 +234,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) /* Hide the list */ else { /* Hide list */ - redraw = FALSE; + redraw = false; screen_load(); } @@ -254,7 +254,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) /* Extract request */ i = (islower(choice) ? A2I(choice) : -1); } else { - ask = FALSE; /* Can't uppercase digits */ + ask = false; /* Can't uppercase digits */ i = choice - '0' + 26; } @@ -281,7 +281,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) } /* Stop the loop */ - flag = TRUE; + flag = true; } if (redraw) screen_load(); @@ -291,7 +291,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) /* Abort if needed */ if (!flag) - return FALSE; + return false; /* Save the choice */ (*sn) = j; @@ -299,7 +299,7 @@ static int get_hissatsu_power(player_type *creature_ptr, SPELL_IDX *sn) repeat_push((COMMAND_CODE)j); /* Success */ - return TRUE; + return true; } /*! @@ -370,7 +370,7 @@ void do_cmd_gain_hissatsu(player_type *creature_ptr) object_type *o_ptr; concptr q, s; - bool gain = FALSE; + bool gain = false; if (creature_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) { set_action(creature_ptr, ACTION_NONE); @@ -414,7 +414,7 @@ void do_cmd_gain_hissatsu(player_type *creature_ptr) break; } creature_ptr->spell_order[j] = i; - gain = TRUE; + gain = true; } if (!gain) { diff --git a/src/cmd-action/cmd-mane.cpp b/src/cmd-action/cmd-mane.cpp index 5e01d909e..15ed61d98 100644 --- a/src/cmd-action/cmd-mane.cpp +++ b/src/cmd-action/cmd-mane.cpp @@ -152,8 +152,8 @@ static int get_mane_power(player_type *caster_ptr, int *sn, bool baigaesi) /* Assume cancelled */ *sn = (-1); - flag = FALSE; - redraw = FALSE; + flag = false; + redraw = false; num = caster_ptr->mane_num; @@ -172,7 +172,7 @@ static int get_mane_power(player_type *caster_ptr, int *sn, bool baigaesi) /* Show the list */ if (!redraw) { char psi_desc[160]; - redraw = TRUE; + redraw = true; screen_save(); /* Display a list of spells */ @@ -235,7 +235,7 @@ static int get_mane_power(player_type *caster_ptr, int *sn, bool baigaesi) /* Hide the list */ else { /* Hide list */ - redraw = FALSE; + redraw = false; screen_load(); } @@ -275,7 +275,7 @@ static int get_mane_power(player_type *caster_ptr, int *sn, bool baigaesi) } /* Stop the loop */ - flag = TRUE; + flag = true; } if (redraw) screen_load(); @@ -285,7 +285,7 @@ static int get_mane_power(player_type *caster_ptr, int *sn, bool baigaesi) /* Abort if needed */ if (!flag) - return FALSE; + return false; /* Save the choice */ (*sn) = i; @@ -293,7 +293,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; } /*! @@ -327,7 +327,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) MONSTER_IDX m_idx; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; m_idx = caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx; if (!m_idx) break; @@ -341,7 +341,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::ROCKET: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("ロケットを発射した。", "You fire a rocket.")); fire_rocket(caster_ptr, GF_ROCKET, dir, damage, 2); @@ -349,7 +349,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::SHOOT: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("矢を放った。", "You fire an arrow.")); fire_bolt(caster_ptr, GF_ARROW, dir, damage); @@ -366,7 +366,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_ACID: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("酸のブレスを吐いた。", "You breathe acid.")); fire_breath(caster_ptr, GF_ACID, dir, damage, (plev > 35 ? 3 : 2)); @@ -374,7 +374,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_ELEC: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("稲妻のブレスを吐いた。", "You breathe lightning.")); fire_breath(caster_ptr, GF_ELEC, dir, damage, (plev > 35 ? 3 : 2)); @@ -382,7 +382,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_FIRE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("火炎のブレスを吐いた。", "You breathe fire.")); fire_breath(caster_ptr, GF_FIRE, dir, damage, (plev > 35 ? 3 : 2)); @@ -390,7 +390,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_COLD: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("冷気のブレスを吐いた。", "You breathe frost.")); fire_breath(caster_ptr, GF_COLD, dir, damage, (plev > 35 ? 3 : 2)); @@ -398,7 +398,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_POIS: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("ガスのブレスを吐いた。", "You breathe gas.")); fire_breath(caster_ptr, GF_POIS, dir, damage, (plev > 35 ? 3 : 2)); @@ -406,7 +406,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_NETH: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("地獄のブレスを吐いた。", "You breathe nether.")); fire_breath(caster_ptr, GF_NETHER, dir, damage, (plev > 35 ? 3 : 2)); @@ -414,7 +414,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_LITE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("閃光のブレスを吐いた。", "You breathe light.")); fire_breath(caster_ptr, GF_LITE, dir, damage, (plev > 35 ? 3 : 2)); @@ -422,7 +422,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_DARK: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("暗黒のブレスを吐いた。", "You breathe darkness.")); fire_breath(caster_ptr, GF_DARK, dir, damage, (plev > 35 ? 3 : 2)); @@ -430,7 +430,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_CONF: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("混乱のブレスを吐いた。", "You breathe confusion.")); fire_breath(caster_ptr, GF_CONFUSION, dir, damage, (plev > 35 ? 3 : 2)); @@ -438,7 +438,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_SOUN: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("轟音のブレスを吐いた。", "You breathe sound.")); fire_breath(caster_ptr, GF_SOUND, dir, damage, (plev > 35 ? 3 : 2)); @@ -446,7 +446,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_CHAO: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("カオスのブレスを吐いた。", "You breathe chaos.")); fire_breath(caster_ptr, GF_CHAOS, dir, damage, (plev > 35 ? 3 : 2)); @@ -454,7 +454,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_DISE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("劣化のブレスを吐いた。", "You breathe disenchantment.")); fire_breath(caster_ptr, GF_DISENCHANT, dir, damage, (plev > 35 ? 3 : 2)); @@ -462,7 +462,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_NEXU: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("因果混乱のブレスを吐いた。", "You breathe nexus.")); fire_breath(caster_ptr, GF_NEXUS, dir, damage, (plev > 35 ? 3 : 2)); @@ -470,7 +470,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_TIME: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("時間逆転のブレスを吐いた。", "You breathe time.")); fire_breath(caster_ptr, GF_TIME, dir, damage, (plev > 35 ? 3 : 2)); @@ -478,7 +478,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_INER: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("遅鈍のブレスを吐いた。", "You breathe inertia.")); fire_breath(caster_ptr, GF_INERTIAL, dir, damage, (plev > 35 ? 3 : 2)); @@ -486,7 +486,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_GRAV: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("重力のブレスを吐いた。", "You breathe gravity.")); fire_breath(caster_ptr, GF_GRAVITY, dir, damage, (plev > 35 ? 3 : 2)); @@ -494,7 +494,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_SHAR: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("破片のブレスを吐いた。", "You breathe shards.")); fire_breath(caster_ptr, GF_SHARDS, dir, damage, (plev > 35 ? 3 : 2)); @@ -502,7 +502,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_PLAS: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("プラズマのブレスを吐いた。", "You breathe plasma.")); @@ -511,7 +511,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_FORC: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("フォースのブレスを吐いた。", "You breathe force.")); @@ -520,7 +520,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_MANA: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("魔力のブレスを吐いた。", "You breathe mana.")); @@ -529,7 +529,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BA_NUKE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("放射能球を放った。", "You cast a ball of radiation.")); @@ -538,7 +538,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BR_NUKE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("放射性廃棄物のブレスを吐いた。", "You breathe toxic waste.")); @@ -547,7 +547,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::BA_CHAO: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("純ログルスを放った。", "You invoke a raw Logrus.")); @@ -555,7 +555,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BR_DISI: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("分解のブレスを吐いた。", "You breathe disintegration.")); @@ -563,7 +563,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_ACID: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("アシッド・ボールの呪文を唱えた。", "You cast an acid ball.")); @@ -571,7 +571,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_ELEC: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("サンダー・ボールの呪文を唱えた。", "You cast a lightning ball.")); @@ -579,7 +579,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_FIRE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("ファイア・ボールの呪文を唱えた。", "You cast a fire ball.")); @@ -587,7 +587,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_COLD: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("アイス・ボールの呪文を唱えた。", "You cast a frost ball.")); @@ -595,7 +595,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_POIS: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("悪臭雲の呪文を唱えた。", "You cast a stinking cloud.")); @@ -603,7 +603,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_NETH: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("地獄球の呪文を唱えた。", "You cast a nether ball.")); @@ -611,7 +611,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_WATE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("流れるような身振りをした。", "You gesture fluidly.")); @@ -619,7 +619,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_MANA: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("魔力の嵐の呪文を念じた。", "You invoke a mana storm.")); @@ -627,7 +627,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_DARK: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("暗黒の嵐の呪文を念じた。", "You invoke a darkness storm.")); @@ -635,42 +635,42 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::DRAIN_MANA: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_DRAIN_MANA, dir, randint1(plev * 3) + plev, 0); break; case RF_ABILITY::MIND_BLAST: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_MIND_BLAST, dir, damage, 0); break; case RF_ABILITY::BRAIN_SMASH: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_BRAIN_SMASH, dir, damage, 0); break; case RF_ABILITY::CAUSE_1: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_CAUSE_1, dir, damage, 0); break; case RF_ABILITY::CAUSE_2: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_CAUSE_2, dir, damage, 0); break; case RF_ABILITY::CAUSE_3: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_CAUSE_3, dir, damage, 0); break; case RF_ABILITY::CAUSE_4: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_CAUSE_4, dir, damage, 0); break; case RF_ABILITY::BO_ACID: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("アシッド・ボルトの呪文を唱えた。", "You cast an acid bolt.")); @@ -678,7 +678,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_ELEC: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("サンダー・ボルトの呪文を唱えた。", "You cast a lightning bolt.")); @@ -686,7 +686,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_FIRE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("ファイア・ボルトの呪文を唱えた。", "You cast a fire bolt.")); @@ -694,7 +694,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_COLD: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("アイス・ボルトの呪文を唱えた。", "You cast a frost bolt.")); @@ -702,7 +702,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BA_LITE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("スターバーストの呪文を念じた。", "You invoke a starburst.")); @@ -710,7 +710,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_NETH: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("地獄の矢の呪文を唱えた。", "You cast a nether bolt.")); @@ -718,7 +718,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_WATE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("ウォーター・ボルトの呪文を唱えた。", "You cast a water bolt.")); @@ -726,7 +726,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_MANA: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("魔力の矢の呪文を唱えた。", "You cast a mana bolt.")); @@ -734,7 +734,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_PLAS: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("プラズマ・ボルトの呪文を唱えた。", "You cast a plasma bolt.")); @@ -742,7 +742,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BO_ICEE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("極寒の矢の呪文を唱えた。", "You cast a ice bolt.")); @@ -750,7 +750,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::MISSILE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("マジック・ミサイルの呪文を唱えた。", "You cast a magic missile.")); @@ -758,7 +758,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::SCARE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("恐ろしげな幻覚を作り出した。", "You cast a fearful illusion.")); @@ -766,12 +766,12 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::BLIND: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; confuse_monster(caster_ptr, dir, plev * 2); break; case RF_ABILITY::CONF: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("誘惑的な幻覚をつくり出した。", "You cast a mesmerizing illusion.")); @@ -779,12 +779,12 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::SLOW: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; slow_monster(caster_ptr, dir, plev); break; case RF_ABILITY::HOLD: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; sleep_monster(caster_ptr, dir, plev); break; case RF_ABILITY::HASTE: @@ -792,7 +792,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) break; case RF_ABILITY::HAND_DOOM: { if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("<破滅の手>を放った！", "You invoke the Hand of Doom!")); @@ -826,7 +826,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) GAME_TEXT m_name[MAX_NLEN]; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; if (!caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx) break; if (!player_has_los_bold(caster_ptr, target_row, target_col)) @@ -859,7 +859,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) } case RF_ABILITY::TELE_AWAY: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; (void)fire_beam(caster_ptr, GF_AWAY_ALL, dir, plev); break; @@ -870,7 +870,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::PSY_SPEAR: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; else msg_print(_("光の剣を放った。", "You throw a psycho-spear.")); (void)fire_beam(caster_ptr, GF_PSY_SPEAR, dir, damage); @@ -883,7 +883,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::TRAPS: if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("呪文を唱えて邪悪に微笑んだ。", "You cast a spell and cackle evilly.")); trap_creation(caster_ptr, target_row, target_col); break; @@ -897,7 +897,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_KIN: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("援軍を召喚した。", "You summon minions.")); for (k = 0; k < 4; k++) { @@ -909,7 +909,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) int k; int max_cyber = (caster_ptr->current_floor_ptr->dun_level / 50) + randint1(3); if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("サイバーデーモンを召喚した！", "You summon Cyberdemons!")); if (max_cyber > 4) max_cyber = 4; @@ -920,7 +920,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_MONSTER: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("仲間を召喚した。", "You summon help.")); for (k = 0; k < 1; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_NONE, (mode | u_mode)); @@ -929,7 +929,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_MONSTERS: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("モンスターを召喚した！", "You summon monsters!")); for (k = 0; k < 6; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_NONE, (mode | u_mode)); @@ -938,7 +938,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_ANT: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("アリを召喚した。", "You summon ants.")); for (k = 0; k < 6; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_ANT, mode); @@ -947,7 +947,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_SPIDER: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("蜘蛛を召喚した。", "You summon spiders.")); for (k = 0; k < 6; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_SPIDER, mode); @@ -956,7 +956,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_HOUND: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("ハウンドを召喚した。", "You summon hounds.")); for (k = 0; k < 4; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_HOUND, mode); @@ -965,7 +965,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_HYDRA: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("ヒドラを召喚した。", "You summon hydras.")); for (k = 0; k < 4; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_HYDRA, mode); @@ -974,7 +974,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_ANGEL: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("天使を召喚した！", "You summon an angel!")); for (k = 0; k < 1; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_ANGEL, mode); @@ -983,7 +983,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_DEMON: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("混沌の宮廷から悪魔を召喚した！", "You summon a demon from the Courts of Chaos!")); for (k = 0; k < 1; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_DEMON, (mode | u_mode)); @@ -992,7 +992,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_UNDEAD: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("アンデッドの強敵を召喚した！", "You summon an undead adversary!")); for (k = 0; k < 1; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_UNDEAD, (mode | u_mode)); @@ -1001,7 +1001,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_DRAGON: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("ドラゴンを召喚した！", "You summon a dragon!")); for (k = 0; k < 1; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_DRAGON, (mode | u_mode)); @@ -1010,7 +1010,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_HI_UNDEAD: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("強力なアンデッドを召喚した！", "You summon greater undead!")); for (k = 0; k < 6; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode)); @@ -1019,7 +1019,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_HI_DRAGON: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("古代ドラゴンを召喚した！", "You summon ancient dragons!")); for (k = 0; k < 4; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_HI_DRAGON, (mode | u_mode)); @@ -1028,7 +1028,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_AMBERITES: { int k; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("アンバーの王族を召喚した！", "You summon Lords of Amber!")); for (k = 0; k < 4; k++) summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_AMBERITES, (mode | PM_ALLOW_UNIQUE)); @@ -1037,7 +1037,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) case RF_ABILITY::S_UNIQUE: { int k, count = 0; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; msg_print(_("特別な強敵を召喚した！", "You summon special opponents!")); for (k = 0; k < 4; k++) if (summon_specific(caster_ptr, -1, target_row, target_col, plev, SUMMON_UNIQUE, (mode | PM_ALLOW_UNIQUE))) @@ -1050,7 +1050,7 @@ static bool use_mane(player_type *caster_ptr, RF_ABILITY spell) msg_print("hoge?"); } - return TRUE; + return true; } /*! @@ -1080,15 +1080,15 @@ bool do_cmd_mane(player_type *creature_ptr, bool baigaesi) bool cast; if (cmd_limit_confused(creature_ptr)) - return FALSE; + return false; if (!creature_ptr->mane_num) { msg_print(_("まねられるものが何もない！", "You don't remember any action!")); - return FALSE; + return false; } if (!get_mane_power(creature_ptr, &n, baigaesi)) - return FALSE; + return false; spell = monster_powers[static_cast(creature_ptr->mane_spell[n])]; @@ -1134,7 +1134,7 @@ bool do_cmd_mane(player_type *creature_ptr, bool baigaesi) sound(SOUND_ZAP); cast = use_mane(creature_ptr, creature_ptr->mane_spell[n]); if (!cast) - return FALSE; + return false; } creature_ptr->mane_num--; @@ -1149,5 +1149,5 @@ bool do_cmd_mane(player_type *creature_ptr, bool baigaesi) creature_ptr->window_flags |= (PW_PLAYER); creature_ptr->window_flags |= (PW_SPELL); - return TRUE; + return true; } diff --git a/src/cmd-action/cmd-mind.cpp b/src/cmd-action/cmd-mind.cpp index 660342e14..6f798d236 100644 --- a/src/cmd-action/cmd-mind.cpp +++ b/src/cmd-action/cmd-mind.cpp @@ -77,7 +77,7 @@ static cm_type *initialize_cm_type(player_type *caster_ptr, cm_type *cm_ptr) cm_ptr->minfail = 0; cm_ptr->plev = caster_ptr->lev; cm_ptr->old_csp = caster_ptr->csp; - cm_ptr->on_mirror = FALSE; + cm_ptr->on_mirror = false; return cm_ptr; } @@ -142,18 +142,18 @@ static bool check_mind_hp_mp_sufficiency(player_type *caster_ptr, cm_type *cm_pt if ((cm_ptr->use_mind == MIND_BERSERKER) || (cm_ptr->use_mind == MIND_NINJUTSU)) { if (cm_ptr->mana_cost > caster_ptr->chp) { msg_print(_("ＨＰが足りません。", "You do not have enough hp to use this power.")); - return FALSE; + return false; } - return TRUE; + return true; } if (cm_ptr->mana_cost <= caster_ptr->csp) - return TRUE; + return true; msg_print(_("ＭＰが足りません。", "You do not have enough mana to use this power.")); if (!over_exert) - return FALSE; + return false; return get_check(_("それでも挑戦しますか? ", "Attempt it anyway? ")); } @@ -274,25 +274,25 @@ static bool switch_mind_class(player_type *caster_ptr, cm_type *cm_ptr) switch (cm_ptr->use_mind) { case MIND_MINDCRAFTER: cm_ptr->cast = cast_mindcrafter_spell(caster_ptr, static_cast(cm_ptr->n)); - return TRUE; + return true; case MIND_KI: cm_ptr->cast = cast_force_spell(caster_ptr, static_cast(cm_ptr->n)); - return TRUE; + return true; case MIND_BERSERKER: cm_ptr->cast = cast_berserk_spell(caster_ptr, static_cast(cm_ptr->n)); - return TRUE; + return true; case MIND_MIRROR_MASTER: if (is_mirror_grid(&caster_ptr->current_floor_ptr->grid_array[caster_ptr->y][caster_ptr->x])) - cm_ptr->on_mirror = TRUE; + cm_ptr->on_mirror = true; cm_ptr->cast = cast_mirror_spell(caster_ptr, static_cast(cm_ptr->n)); - return TRUE; + return true; case MIND_NINJUTSU: cm_ptr->cast = cast_ninja_spell(caster_ptr, static_cast(cm_ptr->n)); - return TRUE; + return true; default: msg_format(_("謎の能力:%d, %d", "Mystery power:%d, %d"), cm_ptr->use_mind, cm_ptr->n); - return FALSE; + return false; } } @@ -322,7 +322,7 @@ static bool judge_mind_chance(player_type *caster_ptr, cm_type *cm_ptr) msg_format(_("%sの集中に失敗した！", "You failed to concentrate hard enough for %s!"), cm_ptr->mind_explanation); sound(SOUND_FAIL); check_mind_class(caster_ptr, cm_ptr); - return TRUE; + return true; } static void mind_reflection(player_type *caster_ptr, cm_type *cm_ptr) @@ -424,7 +424,7 @@ void do_cmd_mind_browse(player_type *caster_ptr) char temp[62 * 5]; mind_kind_type use_mind = decide_use_mind_browse(caster_ptr); screen_save(); - while (TRUE) { + while (true) { if (!MindPowerGetter(caster_ptr).get_mind_power(&n, TRUE)) { screen_load(); return; diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp index 779e83436..4c53d2f09 100644 --- a/src/cmd-action/cmd-move.cpp +++ b/src/cmd-action/cmd-move.cpp @@ -55,7 +55,7 @@ static bool confirm_leave_level(player_type *creature_ptr, bool down_stair) return get_check(_("本当にこの階を去りますか？", "Really leave this floor? ")); } - return TRUE; + return true; } /*! @@ -63,7 +63,7 @@ static bool confirm_leave_level(player_type *creature_ptr, bool down_stair) */ void do_cmd_go_up(player_type *creature_ptr) { - bool go_up = FALSE; + bool go_up = false; grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x]; feature_type *f_ptr = &f_info[g_ptr->feat]; int up_num = 0; @@ -100,7 +100,7 @@ void do_cmd_go_up(player_type *creature_ptr) creature_ptr->word_recall = 0; } - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; creature_ptr->oldpx = 0; creature_ptr->oldpy = 0; PlayerEnergy(creature_ptr).set_player_turn_energy(100); @@ -108,7 +108,7 @@ void do_cmd_go_up(player_type *creature_ptr) } if (!is_in_dungeon(creature_ptr)) - go_up = TRUE; + go_up = true; else go_up = confirm_leave_level(creature_ptr, FALSE); @@ -155,7 +155,7 @@ void do_cmd_go_up(player_type *creature_ptr) else msg_print(_("階段を上って新たなる迷宮へと足を踏み入れた。", "You enter a maze of up staircases.")); - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } /*! @@ -164,7 +164,7 @@ void do_cmd_go_up(player_type *creature_ptr) */ void do_cmd_go_down(player_type *creature_ptr) { - bool fall_trap = FALSE; + bool fall_trap = false; int down_num = 0; if (creature_ptr->special_defense & KATA_MUSOU) set_action(creature_ptr, ACTION_NONE); @@ -177,7 +177,7 @@ void do_cmd_go_down(player_type *creature_ptr) } if (has_flag(f_ptr->flags, FF_TRAP)) - fall_trap = TRUE; + fall_trap = true; if (has_flag(f_ptr->flags, FF_QUEST_ENTER)) { do_cmd_quest(creature_ptr); @@ -210,7 +210,7 @@ void do_cmd_go_down(player_type *creature_ptr) creature_ptr->word_recall = 0; } - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; creature_ptr->oldpx = 0; creature_ptr->oldpy = 0; PlayerEnergy(creature_ptr).set_player_turn_energy(100); @@ -248,7 +248,7 @@ void do_cmd_go_down(player_type *creature_ptr) down_num += 1; if (!is_in_dungeon(creature_ptr)) { - creature_ptr->enter_dungeon = TRUE; + creature_ptr->enter_dungeon = true; down_num = d_info[creature_ptr->dungeon_idx].mindepth; } @@ -272,7 +272,7 @@ void do_cmd_go_down(player_type *creature_ptr) } } - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; if (fall_trap) { prepare_change_floor_mode(creature_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT); @@ -299,7 +299,7 @@ void do_cmd_walk(player_type *creature_ptr, bool pickup) command_arg = 0; } - bool more = FALSE; + bool more = false; DIRECTION dir; if (get_rep_dir(creature_ptr, &dir, FALSE)) { PlayerEnergy energy(creature_ptr); @@ -317,7 +317,7 @@ void do_cmd_walk(player_type *creature_ptr, bool pickup) } exe_movement(creature_ptr, dir, pickup, FALSE); - more = TRUE; + more = true; } if (creature_ptr->wild_mode && !cave_has_flag_bold(creature_ptr->current_floor_ptr, creature_ptr->y, creature_ptr->x, FF_TOWN)) { diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp index a0f98d823..40fe2f37c 100644 --- a/src/cmd-action/cmd-open-close.cpp +++ b/src/cmd-action/cmd-open-close.cpp @@ -38,12 +38,12 @@ */ static bool exe_open_chest(player_type *creature_ptr, POSITION y, POSITION x, OBJECT_IDX o_idx) { - bool flag = TRUE; - bool more = FALSE; + bool flag = true; + bool more = false; object_type *o_ptr = &creature_ptr->current_floor_ptr->o_list[o_idx]; PlayerEnergy(creature_ptr).set_player_turn_energy(100); if (o_ptr->pval > 0) { - flag = FALSE; + flag = false; int i = creature_ptr->skill_dis; if (creature_ptr->blind || no_lite(creature_ptr)) i = i / 10; @@ -58,9 +58,9 @@ static bool exe_open_chest(player_type *creature_ptr, POSITION y, POSITION x, OB if (randint0(100) < j) { msg_print(_("鍵をはずした。", "You have picked the lock.")); gain_exp(creature_ptr, 1); - flag = TRUE; + flag = true; } else { - more = TRUE; + more = true; if (flush_failure) flush(); @@ -87,7 +87,7 @@ void do_cmd_open(player_type *creature_ptr) POSITION y, x; DIRECTION dir; OBJECT_IDX o_idx; - bool more = FALSE; + bool more = false; if (creature_ptr->wild_mode) return; @@ -145,7 +145,7 @@ void do_cmd_close(player_type *creature_ptr) { POSITION y, x; DIRECTION dir; - bool more = FALSE; + bool more = false; if (creature_ptr->wild_mode) return; @@ -192,7 +192,7 @@ void do_cmd_disarm(player_type *creature_ptr) POSITION y, x; DIRECTION dir; OBJECT_IDX o_idx; - bool more = FALSE; + bool more = false; if (creature_ptr->wild_mode) return; @@ -261,7 +261,7 @@ void do_cmd_bash(player_type *creature_ptr) POSITION y, x; DIRECTION dir; grid_type *g_ptr; - bool more = FALSE; + bool more = false; if (creature_ptr->wild_mode) return; @@ -315,11 +315,11 @@ static bool get_spike(player_type *creature_ptr, INVENTORY_IDX *ip) if (o_ptr->tval == TV_SPIKE) { *ip = i; - return TRUE; + return true; } } - return FALSE; + return false; } /*! diff --git a/src/cmd-action/cmd-others.cpp b/src/cmd-action/cmd-others.cpp index 0a30eff18..c1a03e7d6 100644 --- a/src/cmd-action/cmd-others.cpp +++ b/src/cmd-action/cmd-others.cpp @@ -60,7 +60,7 @@ static bool exe_alter(player_type *creature_ptr) { DIRECTION dir; if (!get_rep_dir(creature_ptr, &dir, TRUE)) - return FALSE; + return false; POSITION y = creature_ptr->y + ddy[dir]; POSITION x = creature_ptr->x + ddx[dir]; @@ -72,7 +72,7 @@ static bool exe_alter(player_type *creature_ptr) PlayerEnergy(creature_ptr).set_player_turn_energy(100); if (g_ptr->m_idx) { do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE); - return FALSE; + return false; } if (has_flag(f_ptr->flags, FF_OPEN)) @@ -91,7 +91,7 @@ static bool exe_alter(player_type *creature_ptr) return exe_disarm(creature_ptr, y, x, dir); msg_print(_("何もない空中を攻撃した。", "You attack the empty air.")); - return FALSE; + return false; } /*! @@ -121,7 +121,7 @@ void do_cmd_alter(player_type *creature_ptr) static bool decide_suicide(void) { if (current_world_ptr->noscore) - return TRUE; + return true; prt(_("確認のため '@' を押して下さい。", "Please verify SUICIDE by typing the '@' sign: "), 0, 0); flush(); @@ -171,9 +171,9 @@ void do_cmd_suicide(player_type *creature_ptr) string_free(creature_ptr->last_message); creature_ptr->last_message = NULL; - creature_ptr->playing = FALSE; - creature_ptr->is_dead = TRUE; - creature_ptr->leaving = TRUE; + creature_ptr->playing = false; + creature_ptr->is_dead = true; + creature_ptr->leaving = true; if (current_world_ptr->total_winner) { accept_winner_message(creature_ptr); add_retired_class(creature_ptr->pclass); diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp index 32bbc2cf2..91289a8ea 100644 --- a/src/cmd-action/cmd-pet.cpp +++ b/src/cmd-action/cmd-pet.cpp @@ -70,7 +70,7 @@ void do_cmd_pet_dismiss(player_type *creature_ptr) { monster_type *m_ptr; - bool all_pets = FALSE; + bool all_pets = false; MONSTER_IDX pet_ctr; int i; int Dismissed = 0; @@ -105,7 +105,7 @@ void do_cmd_pet_dismiss(player_type *creature_ptr) pet_ctr = who[i]; m_ptr = &creature_ptr->current_floor_ptr->m_list[pet_ctr]; - delete_this = FALSE; + delete_this = false; kakunin = ((pet_ctr == creature_ptr->riding) || (m_ptr->nickname)); monster_desc(creature_ptr, friend_name, m_ptr, MD_ASSUME_VISIBLE); @@ -119,23 +119,23 @@ void do_cmd_pet_dismiss(player_type *creature_ptr) if (m_ptr->ml) move_cursor_relative(m_ptr->fy, m_ptr->fx); - while (TRUE) { + while (true) { char ch = inkey(); if (ch == 'Y' || ch == 'y') { - delete_this = TRUE; + delete_this = true; if (kakunin) { msg_format(_("本当によろしいですか？ (%s) ", "Are you sure? (%s) "), friend_name); ch = inkey(); if (ch != 'Y' && ch != 'y') - delete_this = FALSE; + delete_this = false; } break; } if (ch == 'U' || ch == 'u') { - all_pets = TRUE; + all_pets = true; break; } @@ -203,7 +203,7 @@ bool do_cmd_riding(player_type *creature_ptr, bool force) monster_type *m_ptr; if (!get_direction(creature_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; y = creature_ptr->y + ddy[dir]; x = creature_ptr->x + ddx[dir]; g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; @@ -215,11 +215,11 @@ bool do_cmd_riding(player_type *creature_ptr, bool force) /* Skip non-empty grids */ if (!can_player_ride_pet(creature_ptr, g_ptr, FALSE)) { msg_print(_("そちらには降りられません。", "You cannot go that direction.")); - return FALSE; + return false; } if (!pattern_seq(creature_ptr, creature_ptr->y, creature_ptr->x, y, x)) - return FALSE; + return false; if (g_ptr->m_idx) { PlayerEnergy(creature_ptr).set_player_turn_energy(100); @@ -227,33 +227,33 @@ bool do_cmd_riding(player_type *creature_ptr, bool force) msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE); - return FALSE; + return false; } creature_ptr->riding = 0; creature_ptr->pet_extra_flags &= ~(PF_TWO_HANDS); - creature_ptr->riding_ryoute = creature_ptr->old_riding_ryoute = FALSE; + creature_ptr->riding_ryoute = creature_ptr->old_riding_ryoute = false; } else { if (cmd_limit_confused(creature_ptr)) - return FALSE; + return false; m_ptr = &creature_ptr->current_floor_ptr->m_list[g_ptr->m_idx]; if (!g_ptr->m_idx || !m_ptr->ml) { msg_print(_("その場所にはモンスターはいません。", "There is no monster here.")); - return FALSE; + return false; } if (!is_pet(m_ptr) && !force) { msg_print(_("そのモンスターはペットではありません。", "That monster is not a pet.")); - return FALSE; + return false; } if (!(r_info[m_ptr->r_idx].flags7 & RF7_RIDING)) { msg_print(_("そのモンスターには乗れなさそうだ。", "This monster doesn't seem suitable for riding.")); - return FALSE; + return false; } if (!pattern_seq(creature_ptr, creature_ptr->y, creature_ptr->x, y, x)) - return FALSE; + return false; if (!can_player_ride_pet(creature_ptr, g_ptr, TRUE)) { /* Feature code (applying "mimic" field) */ @@ -273,12 +273,12 @@ bool do_cmd_riding(player_type *creature_ptr, bool force) f_ptr->name.c_str()); #endif - return FALSE; + return false; } if (r_info[m_ptr->r_idx].level > randint1((creature_ptr->skill_exp[SKILL_RIDING] / 50 + creature_ptr->lev / 2 + 20))) { msg_print(_("うまく乗れなかった。", "You failed to ride.")); PlayerEnergy(creature_ptr).set_player_turn_energy(100); - return FALSE; + return false; } if (monster_csleep_remaining(m_ptr)) { @@ -308,7 +308,7 @@ bool do_cmd_riding(player_type *creature_ptr, bool force) (void)move_player_effect(creature_ptr, y, x, MPE_HANDLE_STUFF | MPE_ENERGY_USE | MPE_DONT_PICKUP | MPE_DONT_SWAP_MON); - return TRUE; + return true; } /*! @@ -319,10 +319,10 @@ static void do_name_pet(player_type *creature_ptr) monster_type *m_ptr; char out_val[20]; GAME_TEXT m_name[MAX_NLEN]; - bool old_name = FALSE; + bool old_name = false; bool old_target_pet = target_pet; - target_pet = TRUE; + target_pet = true; if (!target_set(creature_ptr, TARGET_KILL)) { target_pet = old_target_pet; return; @@ -353,7 +353,7 @@ static void do_name_pet(player_type *creature_ptr) if (m_ptr->nickname) { /* Start with the old inscription */ strcpy(out_val, quark_str(m_ptr->nickname)); - old_name = TRUE; + old_name = true; } /* Get a new inscription (possibly empty) */ @@ -541,8 +541,8 @@ void do_cmd_pet(player_type *creature_ptr) } if (!(repeat_pull(&i) && (i >= 0) && (i < num))) { - flag = FALSE; - redraw = FALSE; + flag = false; + redraw = false; if (use_menu) { screen_save(); @@ -556,7 +556,7 @@ void do_cmd_pet(player_type *creature_ptr) /* Get a command from the user */ while (!flag) { - int ask = TRUE; + int ask = true; if (choice == ESCAPE) choice = ' '; @@ -598,7 +598,7 @@ void do_cmd_pet(player_type *creature_ptr) case '\r': case '\n': i = menu_line - 1; - ask = FALSE; + ask = false; break; } if (menu_line > num) @@ -611,7 +611,7 @@ void do_cmd_pet(player_type *creature_ptr) if (!redraw || use_menu) { byte y = 1, x = 0; PET_COMMAND_IDX ctr = 0; - redraw = TRUE; + redraw = true; if (!use_menu) screen_save(); @@ -636,7 +636,7 @@ void do_cmd_pet(player_type *creature_ptr) /* Hide the list */ else { /* Hide list */ - redraw = FALSE; + redraw = false; screen_load(); } @@ -673,7 +673,7 @@ void do_cmd_pet(player_type *creature_ptr) } /* Stop the loop */ - flag = TRUE; + flag = true; } if (redraw) screen_load(); diff --git a/src/cmd-action/cmd-racial.cpp b/src/cmd-action/cmd-racial.cpp index 7da28d2d6..ab340bc73 100644 --- a/src/cmd-action/cmd-racial.cpp +++ b/src/cmd-action/cmd-racial.cpp @@ -248,7 +248,7 @@ static void decide_racial_command(rc_type *rc_ptr) rc_ptr->choice = 'a'; if (!isalpha(rc_ptr->choice)) { - rc_ptr->ask = FALSE; + rc_ptr->ask = false; rc_ptr->command_code = rc_ptr->choice - '0' + 26; return; } diff --git a/src/cmd-action/cmd-shoot.cpp b/src/cmd-action/cmd-shoot.cpp index 715507bef..5f6f33c64 100644 --- a/src/cmd-action/cmd-shoot.cpp +++ b/src/cmd-action/cmd-shoot.cpp @@ -28,7 +28,7 @@ void do_cmd_fire(player_type *creature_ptr, SPELL_IDX snipe_type) if (creature_ptr->wild_mode) return; - creature_ptr->is_fired = FALSE; + creature_ptr->is_fired = false; j_ptr = &creature_ptr->inventory_list[INVEN_BOW]; if (!j_ptr->tval) { msg_print(_("射撃用の武器を持っていない。", "You have nothing to fire with.")); diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp index 346f1dbc5..3acf9c92b 100644 --- a/src/cmd-action/cmd-spell.cpp +++ b/src/cmd-action/cmd-spell.cpp @@ -228,18 +228,18 @@ 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; + return false; /* Spell is forgotten */ if ((use_realm == caster_ptr->realm2) ? (caster_ptr->spell_forgotten2 & (1UL << spell)) : (caster_ptr->spell_forgotten1 & (1UL << spell))) { /* Never okay */ - return FALSE; + return false; } if (caster_ptr->pclass == CLASS_SORCERER) - return TRUE; + return true; if (caster_ptr->pclass == CLASS_RED_MAGE) - return TRUE; + return true; /* Spell is learned */ if ((use_realm == caster_ptr->realm2) ? (caster_ptr->spell_learned2 & (1UL << spell)) : (caster_ptr->spell_learned1 & (1UL << spell))) { @@ -273,7 +273,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ int i; SPELL_IDX spell = -1; int num = 0; - int ask = TRUE; + int ask = true; MANA_POINT need_mana; SPELL_IDX spells[64]; bool flag, redraw, okay; @@ -293,7 +293,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ /* Verify the spell */ if (spell_okay(caster_ptr, *sn, learned, FALSE, use_realm)) { /* Success */ - return TRUE; + return true; } } @@ -309,7 +309,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ } /* Assume no usable spells */ - okay = FALSE; + okay = false; /* Assume no spells available */ (*sn) = -2; @@ -318,25 +318,25 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ for (i = 0; i < num; i++) { /* Look for "okay" spells */ if (spell_okay(caster_ptr, spells[i], learned, FALSE, use_realm)) - okay = TRUE; + okay = true; } /* No "okay" spells */ if (!okay) - return FALSE; + 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; + return false; if (((caster_ptr->pclass == CLASS_SORCERER) || (caster_ptr->pclass == CLASS_RED_MAGE)) && !is_magic(use_realm)) - return FALSE; + return false; if ((caster_ptr->pclass == CLASS_RED_MAGE) && ((use_realm) != REALM_ARCANE) && (sval > 1)) - return FALSE; + return false; /* Assume cancelled */ *sn = (-1); - flag = FALSE; - redraw = FALSE; + flag = false; + redraw = false; caster_ptr->window_flags |= (PW_SPELL); handle_stuff(caster_ptr); @@ -360,7 +360,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ switch (choice) { case '0': { screen_load(); - return FALSE; + return false; } case '8': @@ -382,7 +382,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ case '\r': case '\n': { i = menu_line - 1; - ask = FALSE; + ask = false; break; } } @@ -397,7 +397,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ if ((choice == ' ') || (choice == '*') || (choice == '?')) { /* Show the list */ if (!redraw) { - redraw = TRUE; + redraw = true; screen_save(); /* Display a list of spells */ @@ -410,7 +410,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ continue; /* Hide list */ - redraw = FALSE; + redraw = false; screen_load(); } @@ -485,7 +485,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ } /* Stop the loop */ - flag = TRUE; + flag = true; } if (redraw) @@ -496,7 +496,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ /* Abort if needed */ if (!flag) - return FALSE; + return false; /* Save the choice */ (*sn) = spell; @@ -504,7 +504,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ repeat_push((COMMAND_CODE)spell); /* Success */ - return TRUE; + return true; } /*! @@ -526,7 +526,7 @@ static void confirm_use_force(player_type *caster_ptr, bool browse_only) /* Show the prompt */ prt(_("('w'練気術, ESC) 'w'かESCを押してください。 ", "(w for the Force, ESC) Hit 'w' or ESC. "), 0, 0); - while (TRUE) { + while (true) { /* Get a key */ which = inkey(); @@ -634,7 +634,7 @@ void do_cmd_browse(player_type *caster_ptr) prt("", 0, 0); /* Keep browsing spells. Exit browsing on cancel. */ - while (TRUE) { + while (true) { /* Ask for a spell, allow cancel */ if (!get_spell(caster_ptr, &spell, _("読む", "browse"), o_ptr->sval, TRUE, use_realm)) { /* If cancelled, leave immediately. */ @@ -720,7 +720,7 @@ void do_cmd_study(player_type *caster_ptr) OBJECT_IDX item; OBJECT_SUBTYPE_VALUE sval; int increment = 0; - bool learned = FALSE; + bool learned = false; /* Spells of realm2 will have an increment of +32 */ SPELL_IDX spell = -1; @@ -837,12 +837,12 @@ void do_cmd_study(player_type *caster_ptr) /* Learn the spell */ if (spell < 32) { if (caster_ptr->spell_learned1 & (1UL << spell)) - learned = TRUE; + learned = true; else caster_ptr->spell_learned1 |= (1UL << spell); } else { if (caster_ptr->spell_learned2 & (1UL << (spell - 32))) - learned = TRUE; + learned = true; else caster_ptr->spell_learned2 |= (1UL << (spell - 32)); } @@ -957,7 +957,7 @@ bool do_cmd_cast(player_type *caster_ptr) const magic_type *s_ptr; concptr q, s; - bool over_exerted = FALSE; + bool over_exerted = false; /* Require spell ability */ if (!caster_ptr->realm1 && (caster_ptr->pclass != CLASS_SORCERER) && (caster_ptr->pclass != CLASS_RED_MAGE)) { @@ -980,7 +980,7 @@ bool do_cmd_cast(player_type *caster_ptr) if (caster_ptr->realm1 == REALM_HEX) { if (hex_spell_fully(caster_ptr)) { - bool flag = FALSE; + bool flag = false; msg_print(_("これ以上新しい呪文を詠唱することはできない。", "Can not cast more spells.")); flush(); if (caster_ptr->lev >= 35) @@ -1091,7 +1091,7 @@ bool do_cmd_cast(player_type *caster_ptr) /* Use some mana */ caster_ptr->csp -= need_mana; } else - over_exerted = TRUE; + over_exerted = true; caster_ptr->redraw |= (PR_MANA); /* Failed spell */ diff --git a/src/cmd-action/cmd-travel.cpp b/src/cmd-action/cmd-travel.cpp index b137d85ee..5bb3be0d5 100644 --- a/src/cmd-action/cmd-travel.cpp +++ b/src/cmd-action/cmd-travel.cpp @@ -112,10 +112,10 @@ static void travel_flow_aux(player_type *creature_ptr, POSITION y, POSITION x, i static void travel_flow(player_type *creature_ptr, POSITION ty, POSITION tx) { flow_head = flow_tail = 0; - bool wall = FALSE; + bool wall = false; feature_type *f_ptr = &f_info[creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].feat]; if (!has_flag(f_ptr->flags, FF_MOVE)) - wall = TRUE; + wall = true; travel_flow_aux(creature_ptr, ty, tx, 0, wall); POSITION x, y; diff --git a/src/cmd-action/cmd-tunnel.cpp b/src/cmd-action/cmd-tunnel.cpp index 1ad42c2f9..95176f96a 100644 --- a/src/cmd-action/cmd-tunnel.cpp +++ b/src/cmd-action/cmd-tunnel.cpp @@ -31,7 +31,7 @@ */ void do_cmd_tunnel(player_type *creature_ptr) { - bool more = FALSE; + bool more = false; if (creature_ptr->special_defense & KATA_MUSOU) set_action(creature_ptr, ACTION_NONE); diff --git a/src/cmd-building/cmd-building.cpp b/src/cmd-building/cmd-building.cpp index 2ed28f5f3..fb8ea2d52 100644 --- a/src/cmd-building/cmd-building.cpp +++ b/src/cmd-building/cmd-building.cpp @@ -74,7 +74,7 @@ int battle_odds; PRICE kakekin; int sel_monster; -bool reinit_wilderness = FALSE; +bool reinit_wilderness = false; /*! * @brief 町に関するヘルプを表示する / Display town history @@ -95,7 +95,7 @@ static void town_history(player_type *player_ptr) */ static void bldg_process_command(player_type *player_ptr, building_type *bldg, int i) { - msg_flag = FALSE; + msg_flag = false; msg_erase(); PRICE bcost; @@ -118,7 +118,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i return; } - bool paid = FALSE; + bool paid = false; switch (bact) { case BACT_NOTHING: /* Do nothing */ @@ -162,7 +162,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i paid = research_mon(player_ptr); break; case BACT_COMPARE_WEAPONS: - paid = TRUE; + paid = true; bcost = compare_weapons(player_ptr, bcost); break; case BACT_ENCHANT_WEAPON: @@ -184,7 +184,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i break; identify_pack(player_ptr); msg_print(_(" 持ち物全てが鑑定されました。", "Your possessions have been identified.")); - paid = TRUE; + paid = true; break; case BACT_IDENT_ONE: paid = ident_spell(player_ptr, FALSE, TV_NONE); @@ -208,7 +208,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i case BACT_RECALL: if (recall_player(player_ptr, 1)) - paid = TRUE; + paid = true; break; case BACT_TELEPORT_LEVEL: @@ -225,7 +225,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i if (muta.any()) { while (!lose_mutation(player_ptr, 0)) ; - paid = TRUE; + paid = true; break; } @@ -275,7 +275,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i set_virtue(player_ptr, V_VALOUR, 0); set_virtue(player_ptr, V_INDIVIDUALISM, 0); get_virtues(player_ptr); - paid = TRUE; + paid = true; break; case BACT_TELE_TOWN: @@ -287,7 +287,7 @@ static void bldg_process_command(player_type *player_ptr, building_type *bldg, i break; case BACT_BROKEN_WEAPON: - paid = TRUE; + paid = true; bcost = repair_broken_weapon(player_ptr, bcost); break; } @@ -318,7 +318,7 @@ void do_cmd_building(player_type *player_ptr) building_type *bldg; bldg = &building[which]; - reinit_wilderness = FALSE; + reinit_wilderness = false; if ((which == 2) && (player_ptr->arena_number < 0)) { msg_print(_("「敗者に用はない。」", "'There's no place here for a LOSER like you!'")); @@ -328,8 +328,8 @@ void do_cmd_building(player_type *player_ptr) prt(_("ゲートは閉まっている。モンスターがあなたを待っている！", "The gates are closed. The monster awaits!"), 0, 0); } else { prepare_change_floor_mode(player_ptr, CFM_SAVE_FLOORS | CFM_NO_RETURN); - player_ptr->current_floor_ptr->inside_arena = FALSE; - player_ptr->leaving = TRUE; + player_ptr->current_floor_ptr->inside_arena = false; + player_ptr->leaving = true; command_new = SPECIAL_KEY_BUILDING; energy.reset_player_turn(); } @@ -337,8 +337,8 @@ void do_cmd_building(player_type *player_ptr) return; } else if (player_ptr->phase_out) { prepare_change_floor_mode(player_ptr, CFM_SAVE_FLOORS | CFM_NO_RETURN); - player_ptr->leaving = TRUE; - player_ptr->phase_out = FALSE; + player_ptr->leaving = true; + player_ptr->phase_out = false; command_new = SPECIAL_KEY_BUILDING; energy.reset_player_turn(); return; @@ -356,12 +356,12 @@ void do_cmd_building(player_type *player_ptr) command_new = 0; display_buikding_service(player_ptr, bldg); - player_ptr->leave_bldg = FALSE; + player_ptr->leave_bldg = false; play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_BUILD); bool validcmd; while (!player_ptr->leave_bldg) { - validcmd = FALSE; + validcmd = false; prt("", 1, 0); building_prt_gold(player_ptr); @@ -369,16 +369,16 @@ void do_cmd_building(player_type *player_ptr) char command = inkey(); if (command == ESCAPE) { - player_ptr->leave_bldg = TRUE; - player_ptr->current_floor_ptr->inside_arena = FALSE; - player_ptr->phase_out = FALSE; + player_ptr->leave_bldg = true; + player_ptr->current_floor_ptr->inside_arena = false; + player_ptr->phase_out = false; break; } int i; for (i = 0; i < 8; i++) { if (bldg->letters[i] && (bldg->letters[i] == command)) { - validcmd = TRUE; + validcmd = true; break; } } @@ -391,11 +391,11 @@ void do_cmd_building(player_type *player_ptr) select_floor_music(player_ptr); - msg_flag = FALSE; + msg_flag = false; msg_erase(); if (reinit_wilderness) - player_ptr->leaving = TRUE; + player_ptr->leaving = true; current_world_ptr->character_icky_depth--; term_clear(); diff --git a/src/cmd-building/cmd-inn.cpp b/src/cmd-building/cmd-inn.cpp index b58a59fb3..4ca4fd46f 100644 --- a/src/cmd-building/cmd-inn.cpp +++ b/src/cmd-building/cmd-inn.cpp @@ -25,12 +25,12 @@ static bool buy_food(player_type *customer_ptr) if (customer_ptr->food >= PY_FOOD_FULL) { msg_print(_("今は満腹だ。", "You are full now.")); - return FALSE; + return false; } msg_print(_("バーテンはいくらかの食べ物とビールをくれた。", "The barkeep gives you some gruel and a beer.")); (void)set_food(customer_ptr, PY_FOOD_MAX - 1); - return TRUE; + return true; } @@ -41,12 +41,12 @@ static bool buy_food(player_type *customer_ptr) */ static bool is_healthy_stay(player_type *customer_ptr) { - if (!customer_ptr->poisoned && !customer_ptr->cut) return TRUE; + if (!customer_ptr->poisoned && !customer_ptr->cut) return true; msg_print(_("あなたに必要なのは部屋ではなく、治療者です。", "You need a healer, not a room.")); msg_print(NULL); msg_print(_("すみません、でもうちで誰かに死なれちゃ困りますんで。", "Sorry, but I don't want anyone dying in here.")); - return FALSE; + return false; } @@ -103,11 +103,11 @@ static void pass_game_turn_by_stay(void) */ static bool has_a_nightmare(player_type *customer_ptr) { - if (!ironman_nightmare) return FALSE; + if (!ironman_nightmare) return false; msg_print(_("眠りに就くと恐ろしい光景が心をよぎった。", "Horrible visions flit through your mind as you sleep.")); - while (TRUE) + while (true) { sanity_blast(customer_ptr, NULL, FALSE); if (!one_in_(3)) break; @@ -115,7 +115,7 @@ static bool has_a_nightmare(player_type *customer_ptr) msg_print(_("あなたは絶叫して目を覚ました。", "You awake screaming.")); exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("悪夢にうなされてよく眠れなかった。", "had a nightmare.")); - return TRUE; + return true; } @@ -189,7 +189,7 @@ static void display_stay_result(player_type *customer_ptr, int prev_hour) */ static bool stay_inn(player_type *customer_ptr) { - if (!is_healthy_stay(customer_ptr)) return FALSE; + if (!is_healthy_stay(customer_ptr)) return false; int prev_day, prev_hour, prev_min; extract_day_hour_min(customer_ptr, &prev_day, &prev_hour, &prev_min); @@ -204,13 +204,13 @@ static bool stay_inn(player_type *customer_ptr) } customer_ptr->chp = customer_ptr->mhp; - if (has_a_nightmare(customer_ptr)) return TRUE; + if (has_a_nightmare(customer_ptr)) return true; back_to_health(customer_ptr); charge_magic_eating_energy(customer_ptr); display_stay_result(customer_ptr, prev_hour); - return TRUE; + return true; } @@ -238,9 +238,9 @@ bool inn_comm(player_type *customer_ptr, int cmd) return stay_inn(customer_ptr); case BACT_RUMORS: display_rumor(customer_ptr, TRUE); - return TRUE; + return true; default: //!< @todo リファクタリング前のコードもTRUEだった、FALSEにすべきでは. - return TRUE; + return true; } } diff --git a/src/cmd-io/cmd-autopick.cpp b/src/cmd-io/cmd-autopick.cpp index 6de52a43e..4329b5fa1 100644 --- a/src/cmd-io/cmd-autopick.cpp +++ b/src/cmd-io/cmd-autopick.cpp @@ -93,7 +93,7 @@ void do_cmd_edit_autopick(player_type *player_ptr) text_body_type text_body; text_body_type *tb = &text_body; - tb->changed = FALSE; + tb->changed = false; tb->cx = cx_save; tb->cy = cy_save; tb->upper = tb->left = 0; @@ -165,7 +165,7 @@ void do_cmd_edit_autopick(player_type *player_ptr) tb->old_wid = tb->wid; tb->old_hgt = tb->hgt; - key = inkey_special(TRUE); + key = inkey_special(true); if (key & SKEY_MASK) { diff --git a/src/cmd-io/cmd-diary.cpp b/src/cmd-io/cmd-diary.cpp index 749f94a6f..e65294279 100644 --- a/src/cmd-io/cmd-diary.cpp +++ b/src/cmd-io/cmd-diary.cpp @@ -113,7 +113,7 @@ static void do_cmd_erase_diary(void) void do_cmd_diary(player_type *creature_ptr) { screen_save(); - while (TRUE) { + while (true) { term_clear(); prt(_("[ 記録の設定 ]", "[ Play Record ]"), 2, 0); prt(_("(1) 記録を見る", "(1) Display your record"), 4, 5); diff --git a/src/cmd-io/cmd-dump.cpp b/src/cmd-io/cmd-dump.cpp index dfba67833..b638915e9 100644 --- a/src/cmd-io/cmd-dump.cpp +++ b/src/cmd-io/cmd-dump.cpp @@ -66,7 +66,7 @@ void do_cmd_colors(player_type *creature_ptr) char buf[1024]; FILE *auto_dump_stream; screen_save(); - while (TRUE) { + while (true) { term_clear(); prt(_("[ カラーの設定 ]", "Interact with Colors"), 2, 0); prt(_("(1) ユーザー設定ファイルのロード", "(1) Load a user pref file"), 4, 5); @@ -122,7 +122,7 @@ void do_cmd_colors(player_type *creature_ptr) } else if (i == '3') { static byte a = 0; prt(_("コマンド: カラーの設定を変更します", "Command: Modify colors"), 8, 0); - while (TRUE) { + while (true) { concptr name; clear_from(10); for (byte j = 0; j < 16; j++) { diff --git a/src/cmd-io/cmd-floor.cpp b/src/cmd-io/cmd-floor.cpp index dcfa57996..e07fbf52e 100644 --- a/src/cmd-io/cmd-floor.cpp +++ b/src/cmd-io/cmd-floor.cpp @@ -58,7 +58,7 @@ void do_cmd_locate(player_type *creature_ptr) get_screen_size(&wid, &hgt); POSITION y2 = y1 = panel_row_min; POSITION x2 = x1 = panel_col_min; - while (TRUE) { + while (true) { if ((y2 == y1) && (x2 == x1)) strcpy(tmp_val, _("真上", "\0")); else diff --git a/src/cmd-io/cmd-gameoption.cpp b/src/cmd-io/cmd-gameoption.cpp index 3000f9924..7ba56e557 100644 --- a/src/cmd-io/cmd-gameoption.cpp +++ b/src/cmd-io/cmd-gameoption.cpp @@ -94,7 +94,7 @@ static void do_cmd_options_autosave(player_type *player_ptr, concptr info) int i, k = 0, n = 2; char buf[80]; term_clear(); - while (TRUE) { + while (true) { sprintf(buf, _("%s ( リターンで次へ, y/n でセット, F で頻度を入力, ESC で決定 ) ", "%s (RET to advance, y/n to set, 'F' for frequency, ESC to accept) "), info); prt(buf, 0, 0); @@ -134,7 +134,7 @@ static void do_cmd_options_autosave(player_type *player_ptr, concptr info) case 'Y': case '6': { - (*autosave_info[k].o_var) = TRUE; + (*autosave_info[k].o_var) = true; k = (k + 1) % n; break; } @@ -142,7 +142,7 @@ static void do_cmd_options_autosave(player_type *player_ptr, concptr info) case 'n': case 'N': case '4': { - (*autosave_info[k].o_var) = FALSE; + (*autosave_info[k].o_var) = false; k = (k + 1) % n; break; } @@ -218,7 +218,7 @@ static void do_cmd_options_win(player_type *player_ptr) TERM_LEN y = 0; TERM_LEN x = 0; char ch; - bool go = TRUE; + bool go = true; u32b old_flag[8]; for (j = 0; j < 8; j++) { @@ -265,7 +265,7 @@ static void do_cmd_options_win(player_type *player_ptr) ch = inkey(); switch (ch) { case ESCAPE: - go = FALSE; + go = false; break; case ' ': case 't': @@ -323,7 +323,7 @@ static void do_cmd_options_cheat(player_type *player_ptr, concptr info) int i, k = 0, n = MAX_CHEAT_OPTIONS; char buf[80]; term_clear(); - while (TRUE) { + while (true) { DIRECTION dir; sprintf(buf, _("%s ( リターンで次へ, y/n でセット, ESC で決定 )", "%s (RET to advance, y/n to set, ESC to accept) "), info); prt(buf, 0, 0); @@ -374,14 +374,14 @@ static void do_cmd_options_cheat(player_type *player_ptr, concptr info) _("詐欺オプションをONにして、スコアを残せなくなった。", "gave up sending score to use cheating options.")); current_world_ptr->noscore |= (cheat_info[k].o_set * 256 + cheat_info[k].o_bit); - (*cheat_info[k].o_var) = TRUE; + (*cheat_info[k].o_var) = true; k = (k + 1) % n; break; } case 'n': case 'N': case '4': { - (*cheat_info[k].o_var) = FALSE; + (*cheat_info[k].o_var) = false; k = (k + 1) % n; break; } @@ -409,9 +409,9 @@ void extract_option_vars(void) int ob = option_info[i].o_bit; if (option_info[i].o_var) { if (option_flag[os] & (1UL << ob)) { - (*option_info[i].o_var) = TRUE; + (*option_info[i].o_var) = true; } else { - (*option_info[i].o_var) = FALSE; + (*option_info[i].o_var) = false; } } } @@ -432,14 +432,14 @@ void do_cmd_options(player_type *player_ptr) int d, skey; TERM_LEN i, y = 0; screen_save(); - while (TRUE) { + while (true) { int n = OPT_NUM; if (!current_world_ptr->noscore && !allow_debug_opts) n--; term_clear(); prt(_("[ オプションの設定 ]", "Game options"), 1, 0); - while (TRUE) { + while (true) { for (i = 0; i < n; i++) { byte a = TERM_WHITE; if (i == y) @@ -448,7 +448,7 @@ void do_cmd_options(player_type *player_ptr) } prt(_("<方向>で移動, Enterで決定, ESCでキャンセル, ?でヘルプ: ", "Move to , Select to Enter, Cancel to ESC, ? to help: "), 21, 0); - skey = inkey_special(TRUE); + skey = inkey_special(true); if (!(skey & SKEY_MASK)) k = (char)skey; else @@ -552,7 +552,7 @@ void do_cmd_options(player_type *player_ptr) case 'd': { clear_from(18); prt(_("コマンド: 基本ウェイト量", "Command: Base Delay Factor"), 19, 0); - while (TRUE) { + while (true) { int msec = delay_factor * delay_factor * delay_factor; prt(format(_("現在のウェイト: %d (%dミリ秒)", "Current base delay factor: %d (%d msec)"), delay_factor, msec), 22, 0); prt(_("ウェイト (0-9) ESCで決定: ", "Delay Factor (0-9 or ESC to accept): "), 20, 0); @@ -574,7 +574,7 @@ void do_cmd_options(player_type *player_ptr) case 'h': { clear_from(18); prt(_("コマンド: 低ヒットポイント警告", "Command: Hitpoint Warning"), 19, 0); - while (TRUE) { + while (true) { prt(format(_("現在の低ヒットポイント警告: %d0%%", "Current hitpoint warning: %d0%%"), hitpoint_warn), 22, 0); prt(_("低ヒットポイント警告 (0-9) ESCで決定: ", "Hitpoint Warning (0-9 or ESC to accept): "), 20, 0); k = inkey(); @@ -595,7 +595,7 @@ void do_cmd_options(player_type *player_ptr) case 'm': { clear_from(18); prt(_("コマンド: 低魔力色閾値", "Command: Mana Color Threshold"), 19, 0); - while (TRUE) { + while (true) { prt(format(_("現在の低魔力色閾値: %d0%%", "Current mana color threshold: %d0%%"), mana_warn), 22, 0); prt(_("低魔力閾値 (0-9) ESCで決定: ", "Mana color Threshold (0-9 or ESC to accept): "), 20, 0); k = inkey(); @@ -652,7 +652,7 @@ void do_cmd_options_aux(player_type *player_ptr, game_option_types page, concptr } term_clear(); - while (TRUE) { + while (true) { DIRECTION dir; sprintf(buf, _("%s (リターン:次, %sESC:終了, ?:ヘルプ) ", "%s (RET:next, %s, ?:help) "), info, browse_only ? _("", "ESC:exit") : _("y/n:変更, ", "y/n:change, ESC:accept")); @@ -706,7 +706,7 @@ void do_cmd_options_aux(player_type *player_ptr, game_option_types page, concptr case '6': { if (browse_only) break; - (*option_info[opt[k]].o_var) = TRUE; + (*option_info[opt[k]].o_var) = true; k = (k + 1) % n; break; } @@ -715,7 +715,7 @@ void do_cmd_options_aux(player_type *player_ptr, game_option_types page, concptr case '4': { if (browse_only) break; - (*option_info[opt[k]].o_var) = FALSE; + (*option_info[opt[k]].o_var) = false; k = (k + 1) % n; break; } diff --git a/src/cmd-io/cmd-knowledge.cpp b/src/cmd-io/cmd-knowledge.cpp index 5e10f1b89..0122b85af 100644 --- a/src/cmd-io/cmd-knowledge.cpp +++ b/src/cmd-io/cmd-knowledge.cpp @@ -25,9 +25,9 @@ void do_cmd_knowledge(player_type *creature_ptr) { int i, p = 0; - bool need_redraw = FALSE; + bool need_redraw = false; screen_save(); - while (TRUE) { + while (true) { term_clear(); prt(format(_("%d/2 ページ", "page %d/2"), (p + 1)), 2, 65); prt(_("現在の知識を確認する", "Display current knowledge"), 3, 0); diff --git a/src/cmd-io/cmd-lore.cpp b/src/cmd-io/cmd-lore.cpp index f6315049b..88c9f9987 100644 --- a/src/cmd-io/cmd-lore.cpp +++ b/src/cmd-io/cmd-lore.cpp @@ -42,13 +42,13 @@ void do_cmd_query_symbol(player_type *creature_ptr) char sym, query; char buf[256]; - bool all = FALSE; - bool uniq = FALSE; - bool norm = FALSE; - bool ride = FALSE; + bool all = false; + bool uniq = false; + bool norm = false; + bool ride = false; char temp[MAX_MONSTER_NAME] = ""; - bool recall = FALSE; + bool recall = false; u16b why = 0; MONRACE_IDX *who; @@ -64,19 +64,19 @@ void do_cmd_query_symbol(player_type *creature_ptr) } if (sym == KTRL('A')) { - all = TRUE; + all = true; strcpy(buf, _("全モンスターのリスト", "Full monster list.")); } else if (sym == KTRL('U')) { - all = uniq = TRUE; + all = uniq = true; strcpy(buf, _("ユニーク・モンスターのリスト", "Unique monster list.")); } else if (sym == KTRL('N')) { - all = norm = TRUE; + all = norm = true; strcpy(buf, _("ユニーク外モンスターのリスト", "Non-unique monster list.")); } else if (sym == KTRL('R')) { - all = ride = TRUE; + all = ride = true; strcpy(buf, _("乗馬可能モンスターのリスト", "Ridable monster list.")); } else if (sym == KTRL('M')) { - all = TRUE; + all = true; if (!get_string(_("名前(英語の場合小文字で可)", "Enter name:"), temp, 70)) { temp[0] = 0; return; @@ -165,11 +165,11 @@ void do_cmd_query_symbol(player_type *creature_ptr) } i = n - 1; - while (TRUE) { + while (true) { r_idx = who[i]; monster_race_track(creature_ptr, r_idx); handle_stuff(creature_ptr); - while (TRUE) { + while (true) { if (recall) { screen_save(); screen_roff(creature_ptr, who[i], MONSTER_LORE_NORMAL); diff --git a/src/cmd-io/cmd-macro.cpp b/src/cmd-io/cmd-macro.cpp index 96b5ab2a1..e71bdb28f 100644 --- a/src/cmd-io/cmd-macro.cpp +++ b/src/cmd-io/cmd-macro.cpp @@ -55,13 +55,13 @@ static void macro_dump(FILE **fpp, concptr fname) static void do_cmd_macro_aux(char *buf) { flush(); - inkey_base = TRUE; + inkey_base = true; char i = inkey(); int n = 0; while (i) { buf[n++] = i; - inkey_base = TRUE; - inkey_scan = TRUE; + inkey_base = true; + inkey_scan = true; i = inkey(); } diff --git a/src/cmd-io/cmd-process-screen.cpp b/src/cmd-io/cmd-process-screen.cpp index a033e5e12..295c23251 100644 --- a/src/cmd-io/cmd-process-screen.cpp +++ b/src/cmd-io/cmd-process-screen.cpp @@ -38,14 +38,14 @@ static concptr html_foot[3] = { "\n", "\n\n", 0, }; */ static void read_temporary_file(FILE *fff, FILE *tmpfff, char buf[], size_t buf_size, int num_tag) { - bool is_first_line = TRUE; + bool is_first_line = true; int next_tag = num_tag + 1; while (!angband_fgets(tmpfff, buf, buf_size)) { if (is_first_line) { if (strncmp(buf, tags[num_tag], strlen(tags[num_tag])) == 0) - is_first_line = FALSE; + is_first_line = false; continue; } @@ -128,12 +128,12 @@ static void screen_dump_lines(int wid, int hgt, FILE *fff) */ static bool check_screen_html_can_open(FILE *fff, char *filename, int message) { - if (fff) return TRUE; - if (message == 0) return FALSE; + if (fff) return true; + if (message == 0) return false; msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), filename); msg_print(NULL); - return FALSE; + return false; } @@ -237,27 +237,27 @@ static void do_cmd_save_screen_html(void) */ static bool ask_html_dump(bool *html_dump) { - while (TRUE) + while (true) { char c = inkey(); if (c == 'Y' || c == 'y') { - *html_dump = FALSE; - return TRUE; + *html_dump = false; + return true; } if (c == 'H' || c == 'h') { - *html_dump = TRUE; - return TRUE; + *html_dump = true; + return true; } prt("", 0, 0); - return FALSE; + return false; } // コンパイル警告対応. - return FALSE; + return false; } @@ -269,11 +269,11 @@ static bool ask_html_dump(bool *html_dump) */ static bool check_screen_text_can_open(FILE *fff, char buf[]) { - if (fff) return TRUE; + if (fff) return true; msg_format(_("ファイル %s を開けませんでした。", "Failed to open file %s."), buf); msg_print(NULL); - return FALSE; + return false; } @@ -292,7 +292,7 @@ static bool do_cmd_save_screen_text(int wid, int hgt) char buf[1024]; path_build(buf, sizeof(buf), ANGBAND_DIR_USER, "dump.txt"); fff = angband_fopen(buf, "w"); - if (!check_screen_text_can_open(fff, buf)) return FALSE; + if (!check_screen_text_can_open(fff, buf)) return false; screen_save(); for (TERM_LEN y = 0; y < hgt; y++) @@ -327,7 +327,7 @@ static bool do_cmd_save_screen_text(int wid, int hgt) msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved.")); msg_print(NULL); screen_load(); - return TRUE; + return true; } @@ -338,13 +338,13 @@ static bool do_cmd_save_screen_text(int wid, int hgt) */ static bool update_use_graphics(player_type *creature_ptr) { - if (!use_graphics) return TRUE; + if (!use_graphics) return true; - use_graphics = FALSE; + use_graphics = false; reset_visuals(creature_ptr); creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY); handle_stuff(creature_ptr); - return FALSE; + return false; } @@ -375,7 +375,7 @@ void do_cmd_save_screen(player_type *creature_ptr) if (old_use_graphics) return; - use_graphics = TRUE; + use_graphics = true; reset_visuals(creature_ptr); creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY); handle_stuff(creature_ptr); @@ -393,10 +393,10 @@ void do_cmd_save_screen(player_type *creature_ptr) */ static bool draw_white_characters(char buf[], FILE *fff, int wid, int hgt) { - bool okay = TRUE; + bool okay = true; for (TERM_LEN y = 0; okay; y++) { - if (!fgets(buf, 1024, fff)) okay = FALSE; + if (!fgets(buf, 1024, fff)) okay = false; if (buf[0] == '\n' || buf[0] == '\0') break; if (y >= hgt) continue; @@ -428,7 +428,7 @@ static void draw_colored_characters(char buf[], FILE *fff, int wid, int hgt, boo SYMBOL_CODE c = ' '; for (TERM_LEN y = 0; okay; y++) { - if (!fgets(buf, 1024, fff)) okay = FALSE; + if (!fgets(buf, 1024, fff)) okay = false; if (buf[0] == '\n' || buf[0] == '\0') break; if (y >= hgt) continue; diff --git a/src/cmd-io/cmd-save.cpp b/src/cmd-io/cmd-save.cpp index 60e637a9c..9f672b391 100644 --- a/src/cmd-io/cmd-save.cpp +++ b/src/cmd-io/cmd-save.cpp @@ -48,7 +48,7 @@ void do_cmd_save_game(player_type *creature_ptr, int is_autosave) */ void do_cmd_save_and_exit(player_type *creature_ptr) { - creature_ptr->playing = FALSE; - creature_ptr->leaving = TRUE; + creature_ptr->playing = false; + creature_ptr->leaving = true; exe_write_diary(creature_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "--- Saved and Exited Game ---")); } diff --git a/src/cmd-io/macro-util.cpp b/src/cmd-io/macro-util.cpp index 897ad85ed..bfb20df16 100644 --- a/src/cmd-io/macro-util.cpp +++ b/src/cmd-io/macro-util.cpp @@ -16,7 +16,7 @@ concptr *macro__act; s16b macro__num; /* Expand macros in "get_com" or not */ -bool get_com_no_macros = FALSE; +bool get_com_no_macros = false; /* Determine if any macros have ever started with a given character */ static bool macro__use[256]; @@ -134,6 +134,6 @@ errr macro_add(concptr pat, concptr act) } macro__act[n] = string_make(act); - macro__use[(byte)(pat[0])] = TRUE; + macro__use[(byte)(pat[0])] = true; return 0; } diff --git a/src/cmd-item/cmd-destroy.cpp b/src/cmd-item/cmd-destroy.cpp index ef358da53..a957af486 100644 --- a/src/cmd-item/cmd-destroy.cpp +++ b/src/cmd-item/cmd-destroy.cpp @@ -47,7 +47,7 @@ typedef struct destroy_type { static destroy_type *initialize_destroy_type(destroy_type *destroy_ptr, object_type *o_ptr) { destroy_ptr->amt = 1; - destroy_ptr->force = FALSE; + destroy_ptr->force = false; destroy_ptr->q_ptr = o_ptr; return destroy_ptr; } @@ -55,7 +55,7 @@ static destroy_type *initialize_destroy_type(destroy_type *destroy_ptr, object_t static bool check_destory_item(player_type *creature_ptr, destroy_type *destroy_ptr) { if (destroy_ptr->force || (!confirm_destroy && (object_value(creature_ptr, destroy_ptr->o_ptr) <= 0))) - return TRUE; + return true; describe_flavor(creature_ptr, destroy_ptr->o_name, destroy_ptr->o_ptr, OD_OMIT_PREFIX); sprintf(destroy_ptr->out_val, _("本当に%sを壊しますか? [y/n/Auto]", "Really destroy %s? [y/n/Auto]"), destroy_ptr->o_name); @@ -63,15 +63,15 @@ static bool check_destory_item(player_type *creature_ptr, destroy_type *destroy_ message_add(destroy_ptr->out_val); creature_ptr->window_flags |= PW_MESSAGE; handle_stuff(creature_ptr); - while (TRUE) { + while (true) { prt(destroy_ptr->out_val, 0, 0); char i = inkey(); prt("", 0, 0); if (i == 'y' || i == 'Y') - return TRUE; + return true; if (i == ESCAPE || i == 'n' || i == 'N') - return FALSE; + return false; if (i != 'A') continue; @@ -79,7 +79,7 @@ static bool check_destory_item(player_type *creature_ptr, destroy_type *destroy_ if (autopick_autoregister(creature_ptr, destroy_ptr->o_ptr)) autopick_alter_item(creature_ptr, destroy_ptr->item, TRUE); - return FALSE; + return false; } } @@ -89,13 +89,13 @@ static bool select_destroying_item(player_type *creature_ptr, destroy_type *dest concptr s = _("壊せるアイテムを持っていない。", "You have nothing to destroy."); destroy_ptr->o_ptr = choose_object(creature_ptr, &destroy_ptr->item, q, s, USE_INVEN | USE_FLOOR, TV_NONE); if (destroy_ptr->o_ptr == NULL) - return FALSE; + return false; if (!check_destory_item(creature_ptr, destroy_ptr)) - return FALSE; + return false; if (destroy_ptr->o_ptr->number <= 1) - return TRUE; + return true; destroy_ptr->amt = get_quantity(NULL, destroy_ptr->o_ptr->number); return destroy_ptr->amt > 0; @@ -110,21 +110,21 @@ static bool select_destroying_item(player_type *creature_ptr, destroy_type *dest static bool decide_magic_book_exp(player_type *creature_ptr, destroy_type *destroy_ptr) { if (creature_ptr->prace == RACE_ANDROID) - return FALSE; + return false; if ((creature_ptr->pclass == CLASS_WARRIOR) || (creature_ptr->pclass == CLASS_BERSERKER)) - return TRUE; + return true; if (creature_ptr->pclass != CLASS_PALADIN) - return FALSE; + return false; - bool gain_expr = FALSE; + bool gain_expr = false; if (is_good_realm(creature_ptr->realm1)) { if (!is_good_realm(tval2realm(destroy_ptr->q_ptr->tval))) - gain_expr = TRUE; + gain_expr = true; } else { if (is_good_realm(tval2realm(destroy_ptr->q_ptr->tval))) - gain_expr = TRUE; + gain_expr = true; } return gain_expr; @@ -201,7 +201,7 @@ void do_cmd_destroy(player_type *creature_ptr) destroy_type tmp_destroy; destroy_type *destroy_ptr = initialize_destroy_type(&tmp_destroy, &forge); if (command_arg > 0) - destroy_ptr->force = TRUE; + destroy_ptr->force = true; if (!select_destroying_item(creature_ptr, destroy_ptr)) return; diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp index 43c926d30..85f5e3aa6 100644 --- a/src/cmd-item/cmd-eat.cpp +++ b/src/cmd-item/cmd-eat.cpp @@ -59,88 +59,88 @@ bool exe_eat_food_type_object(player_type *creature_ptr, object_type *o_ptr) { if (o_ptr->tval != TV_FOOD) - return FALSE; + return false; switch (o_ptr->sval) { case SV_FOOD_POISON: if (!(has_resist_pois(creature_ptr) || is_oppose_pois(creature_ptr))) if (set_poisoned(creature_ptr, creature_ptr->poisoned + randint0(10) + 10)) - return TRUE; + return true; break; case SV_FOOD_BLINDNESS: if (!has_resist_blind(creature_ptr)) if (set_blind(creature_ptr, creature_ptr->blind + randint0(200) + 200)) - return TRUE; + return true; break; case SV_FOOD_PARANOIA: if (!has_resist_fear(creature_ptr)) if (set_afraid(creature_ptr, creature_ptr->afraid + randint0(10) + 10)) - return TRUE; + return true; break; case SV_FOOD_CONFUSION: if (!has_resist_conf(creature_ptr)) if (set_confused(creature_ptr, creature_ptr->confused + randint0(10) + 10)) - return TRUE; + return true; break; case SV_FOOD_HALLUCINATION: if (!has_resist_chaos(creature_ptr)) if (set_image(creature_ptr, creature_ptr->image + randint0(250) + 250)) - return TRUE; + return true; break; case SV_FOOD_PARALYSIS: if (!creature_ptr->free_act) if (set_paralyzed(creature_ptr, creature_ptr->paralyzed + randint0(10) + 10)) - return TRUE; + return true; break; case SV_FOOD_WEAKNESS: take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(6, 6), _("毒入り食料", "poisonous food")); (void)do_dec_stat(creature_ptr, A_STR); - return TRUE; + return true; case SV_FOOD_SICKNESS: take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(6, 6), _("毒入り食料", "poisonous food")); (void)do_dec_stat(creature_ptr, A_CON); - return TRUE; + return true; case SV_FOOD_STUPIDITY: take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(8, 8), _("毒入り食料", "poisonous food")); (void)do_dec_stat(creature_ptr, A_INT); - return TRUE; + return true; case SV_FOOD_NAIVETY: take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(8, 8), _("毒入り食料", "poisonous food")); (void)do_dec_stat(creature_ptr, A_WIS); - return TRUE; + return true; case SV_FOOD_UNHEALTH: take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(10, 10), _("毒入り食料", "poisonous food")); (void)do_dec_stat(creature_ptr, A_CON); - return TRUE; + return true; case SV_FOOD_DISEASE: take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(10, 10), _("毒入り食料", "poisonous food")); (void)do_dec_stat(creature_ptr, A_STR); - return TRUE; + return true; case SV_FOOD_CURE_POISON: if (set_poisoned(creature_ptr, 0)) - return TRUE; + return true; break; case SV_FOOD_CURE_BLINDNESS: if (set_blind(creature_ptr, 0)) - return TRUE; + return true; break; case SV_FOOD_CURE_PARANOIA: if (set_afraid(creature_ptr, 0)) - return TRUE; + return true; break; case SV_FOOD_CURE_CONFUSION: if (set_confused(creature_ptr, 0)) - return TRUE; + return true; break; case SV_FOOD_CURE_SERIOUS: return cure_serious_wounds(creature_ptr, 4, 8); case SV_FOOD_RESTORE_STR: if (do_res_stat(creature_ptr, A_STR)) - return TRUE; + return true; break; case SV_FOOD_RESTORE_CON: if (do_res_stat(creature_ptr, A_CON)) - return TRUE; + return true; break; case SV_FOOD_RESTORING: return restore_all_status(creature_ptr); @@ -148,36 +148,36 @@ bool exe_eat_food_type_object(player_type *creature_ptr, object_type *o_ptr) /* それぞれの食べ物の感想をオリジナルより細かく表現 */ case SV_FOOD_BISCUIT: msg_print("甘くてサクサクしてとてもおいしい。"); - return TRUE; + return true; case SV_FOOD_JERKY: msg_print("歯ごたえがあっておいしい。"); - return TRUE; + return true; case SV_FOOD_SLIME_MOLD: msg_print("これはなんとも形容しがたい味だ。"); - return TRUE; + return true; case SV_FOOD_RATION: msg_print("これはおいしい。"); - return TRUE; + return true; #else case SV_FOOD_RATION: case SV_FOOD_BISCUIT: case SV_FOOD_JERKY: case SV_FOOD_SLIME_MOLD: msg_print("That tastes good."); - return TRUE; + return true; #endif case SV_FOOD_WAYBREAD: msg_print(_("これはひじょうに美味だ。", "That tastes good.")); (void)set_poisoned(creature_ptr, 0); (void)hp_player(creature_ptr, damroll(4, 8)); - return TRUE; + return true; case SV_FOOD_PINT_OF_ALE: case SV_FOOD_PINT_OF_WINE: msg_print(_("のどごし爽やかだ。", "That tastes good.")); - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -190,14 +190,14 @@ bool exe_eat_food_type_object(player_type *creature_ptr, object_type *o_ptr) bool exe_eat_charge_of_magic_device(player_type *creature_ptr, object_type *o_ptr, INVENTORY_IDX item) { if (o_ptr->tval != TV_STAFF && o_ptr->tval != TV_WAND) - return FALSE; + return false; if (player_race_food(creature_ptr) == PlayerRaceFood::MANA) { concptr staff; if (o_ptr->tval == TV_STAFF && (item < 0) && (o_ptr->number > 1)) { msg_print(_("まずは杖を拾わなければ。", "You must first pick up the staffs.")); - return TRUE; + return true; } staff = (o_ptr->tval == TV_STAFF) ? _("杖", "staff") : _("魔法棒", "wand"); @@ -207,7 +207,7 @@ bool exe_eat_charge_of_magic_device(player_type *creature_ptr, object_type *o_pt msg_format(_("この%sにはもう魔力が残っていない。", "The %s has no charges left."), staff); o_ptr->ident |= (IDENT_EMPTY); creature_ptr->window_flags |= (PW_INVEN); - return TRUE; + return true; } msg_format(_("あなたは%sの魔力をエネルギー源として吸収した。", "You absorb mana of the %s as your energy."), staff); @@ -245,10 +245,10 @@ bool exe_eat_charge_of_magic_device(player_type *creature_ptr, object_type *o_pt } creature_ptr->window_flags |= (PW_INVEN | PW_EQUIP); - return TRUE; + return true; } - return FALSE; + return false; } /*! diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp index a7fd0b23b..d40949f26 100644 --- a/src/cmd-item/cmd-equipment.cpp +++ b/src/cmd-item/cmd-equipment.cpp @@ -52,7 +52,7 @@ void do_cmd_equip(player_type *creature_ptr) { char out_val[160]; - command_wrk = TRUE; + command_wrk = true; if (easy_floor) command_wrk = USE_EQUIP; @@ -72,7 +72,7 @@ void do_cmd_equip(player_type *creature_ptr) screen_load(); if (command_new != ESCAPE) { - command_see = TRUE; + command_see = true; return; } @@ -161,13 +161,13 @@ void do_cmd_wield(player_type *creature_ptr) q = _("どちらの手に装備しますか?", "Equip which hand? "); s = _("おっと。", "Oops."); - creature_ptr->select_ring_slot = TRUE; + creature_ptr->select_ring_slot = true; if (!choose_object(creature_ptr, &slot, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), TV_NONE)) { - creature_ptr->select_ring_slot = FALSE; + creature_ptr->select_ring_slot = false; return; } - creature_ptr->select_ring_slot = FALSE; + creature_ptr->select_ring_slot = false; break; default: diff --git a/src/cmd-item/cmd-item.cpp b/src/cmd-item/cmd-item.cpp index 6297e2950..0ed29979c 100644 --- a/src/cmd-item/cmd-item.cpp +++ b/src/cmd-item/cmd-item.cpp @@ -71,7 +71,7 @@ void do_cmd_inven(player_type *creature_ptr) { char out_val[160]; - command_wrk = FALSE; + command_wrk = false; if (easy_floor) command_wrk = USE_INVEN; @@ -91,7 +91,7 @@ void do_cmd_inven(player_type *creature_ptr) command_new = inkey(); screen_load(); if (command_new != ESCAPE) { - command_see = TRUE; + command_see = true; return; } diff --git a/src/cmd-item/cmd-magiceat.cpp b/src/cmd-item/cmd-magiceat.cpp index 6e90e80f5..a1f68485c 100644 --- a/src/cmd-item/cmd-magiceat.cpp +++ b/src/cmd-item/cmd-magiceat.cpp @@ -92,7 +92,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o char choice; bool flag, request_list; tval_type tval = TV_NONE; - int ask = TRUE; + int ask = true; OBJECT_SUBTYPE_VALUE i = 0; char out_val[160]; @@ -171,7 +171,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o } screen_load(); } else { - while (TRUE) { + while (true) { if (!get_com(_("[A] 杖, [B] 魔法棒, [C] ロッド:", "[A] staff, [B] wand, [C] rod:"), &choice, TRUE)) { return -1; } @@ -205,7 +205,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o } /* Nothing chosen yet */ - flag = FALSE; + flag = false; if (only_browse) strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの魔力を見ますか？", "(*=List, ESC=exit) Browse which power? ")); @@ -351,23 +351,23 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o case '6': case 'l': case 'L': { - bool reverse = FALSE; + bool reverse = false; if ((choice == '4') || (choice == 'h') || (choice == 'H')) - reverse = TRUE; + reverse = true; if (menu_line > EATER_EXT / 2) { menu_line -= EATER_EXT / 2; - reverse = TRUE; + reverse = true; } else menu_line += EATER_EXT / 2; while (!creature_ptr->magic_num2[menu_line + ext - 1]) { if (reverse) { menu_line--; if (menu_line < 2) - reverse = FALSE; + reverse = false; } else { menu_line++; if (menu_line > EATER_EXT - 1) - reverse = TRUE; + reverse = true; } } break; @@ -377,7 +377,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o case 'X': case '\r': { i = menu_line - 1; - ask = FALSE; + ask = false; break; } } @@ -392,11 +392,11 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o /* Hide the list */ if (request_list) { /* Hide list */ - request_list = FALSE; + request_list = false; screen_load(); screen_save(); } else - request_list = TRUE; + request_list = true; /* Redo asking */ continue; @@ -414,7 +414,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o /* Extract request */ i = (islower(choice) ? A2I(choice) : -1); } else { - ask = FALSE; /* Can't uppercase digits */ + ask = false; /* Can't uppercase digits */ i = choice - '0' + 26; } @@ -443,7 +443,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o msg_print(_("その魔法はまだ充填している最中だ。", "The magic is still charging.")); msg_print(NULL); if (use_menu) - ask = TRUE; + ask = true; continue; } } else { @@ -451,7 +451,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o msg_print(_("その魔法は使用回数が切れている。", "The magic has no charges left.")); msg_print(NULL); if (use_menu) - ask = TRUE; + ask = true; continue; } } @@ -478,7 +478,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o } /* Stop the loop */ - flag = TRUE; + flag = true; } screen_load(); @@ -500,16 +500,16 @@ bool do_cmd_magic_eater(player_type *creature_ptr, bool only_browse, bool powerf { tval_type tval; OBJECT_SUBTYPE_VALUE sval; - bool use_charge = TRUE; + bool use_charge = true; if (cmd_limit_confused(creature_ptr)) - return FALSE; + return false; auto item = select_magic_eater(creature_ptr, only_browse); PlayerEnergy energy(creature_ptr); if (item == -1) { energy.reset_player_turn(); - return FALSE; + return false; } if (item >= EATER_EXT * 2) { tval = TV_ROD; @@ -553,25 +553,25 @@ bool do_cmd_magic_eater(player_type *creature_ptr, bool only_browse, bool powerf chg_virtue(creature_ptr, V_CHANCE, -1); energy.set_player_turn_energy(100); - return TRUE; + return true; } else { DIRECTION dir = 0; if (tval == TV_ROD) { if ((sval >= SV_ROD_MIN_DIRECTION) && (sval != SV_ROD_HAVOC) && (sval != SV_ROD_AGGRAVATE) && (sval != SV_ROD_PESTICIDE)) if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; rod_effect(creature_ptr, sval, dir, &use_charge, powerful, TRUE); if (!use_charge) - return FALSE; + return false; } else if (tval == TV_WAND) { if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; wand_effect(creature_ptr, sval, dir, powerful, TRUE); } else { staff_effect(creature_ptr, sval, &use_charge, powerful, TRUE, TRUE); if (!use_charge) - return FALSE; + return false; } if (randint1(100) < chance) chg_virtue(creature_ptr, V_CHANCE, 1); @@ -583,5 +583,5 @@ bool do_cmd_magic_eater(player_type *creature_ptr, bool only_browse, bool powerf else creature_ptr->magic_num1[item] -= EATER_CHARGE; - return TRUE; + return true; } diff --git a/src/cmd-item/cmd-smith.cpp b/src/cmd-item/cmd-smith.cpp index 84e13bc57..75bc96c3b 100644 --- a/src/cmd-item/cmd-smith.cpp +++ b/src/cmd-item/cmd-smith.cpp @@ -228,7 +228,7 @@ static void drain_essence(player_type *creature_ptr) size_t i; OBJECT_IDX item; int dec = 4; - bool observe = FALSE; + bool observe = false; int old_ds, old_dd, old_to_h, old_to_d, old_ac, old_to_a, old_pval, old_name2; TIME_EFFECT old_timeout; BIT_FLAGS old_flgs[TR_FLAG_SIZE], new_flgs[TR_FLAG_SIZE]; @@ -421,7 +421,7 @@ static void drain_essence(player_type *creature_ptr) if ((o_ptr->tval >= TV_SHOT) && (o_ptr->tval <= TV_BOLT)) drain_value[i] /= 10; if (drain_value[i]) { - observe = TRUE; + observe = true; } } if (!observe) { @@ -549,7 +549,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) char choice; concptr q, s; object_type *o_ptr; - int ask = TRUE; + int ask = true; char out_val[160]; int num[22]; GAME_TEXT o_name[MAX_NLEN]; @@ -568,8 +568,8 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) } if (!repeat_pull(&i) || i < 0 || i >= max_num) { - flag = FALSE; - redraw = FALSE; + flag = false; + redraw = false; (void)strnfmt(out_val, 78, _("('*'で一覧, ESCで中断) どの能力を付加しますか？", "(*=List, ESC=exit) Add which ability? ")); if (use_menu) @@ -621,7 +621,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) case '\r': case '\n': { i = menu_line - 1; - ask = FALSE; + ask = false; break; } } @@ -638,7 +638,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) byte col; strcpy(dummy, ""); - redraw = TRUE; + redraw = true; if (!use_menu) screen_save(); @@ -671,56 +671,56 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) strcat(dummy, es_ptr->add_name); col = TERM_WHITE; - able[ctr] = TRUE; + able[ctr] = true; if (es_ptr->essence != -1) { strcat(dummy, format("(%s)", essence_name[es_ptr->essence])); if (creature_ptr->magic_num1[es_ptr->essence] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; } else { switch (es_ptr->add) { case ESSENCE_SH_FIRE: strcat(dummy, _("(焼棄+耐火炎)", "(brand fire + res.fire)")); if (creature_ptr->magic_num1[TR_BRAND_FIRE] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_FIRE] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; break; case ESSENCE_SH_ELEC: strcat(dummy, _("(電撃+耐電撃)", "(brand elec. + res. elec.)")); if (creature_ptr->magic_num1[TR_BRAND_ELEC] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_ELEC] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; break; case ESSENCE_SH_COLD: strcat(dummy, _("(凍結+耐冷気)", "(brand cold + res. cold)")); if (creature_ptr->magic_num1[TR_BRAND_COLD] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_COLD] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; break; case ESSENCE_RESISTANCE: strcat(dummy, _("(耐火炎+耐冷気+耐電撃+耐酸)", "(r.fire+r.cold+r.elec+r.acid)")); if (creature_ptr->magic_num1[TR_RES_FIRE] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_COLD] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_ELEC] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_ACID] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; break; case ESSENCE_SUSTAIN: strcat(dummy, _("(耐火炎+耐冷気+耐電撃+耐酸)", "(r.fire+r.cold+r.elec+r.acid)")); if (creature_ptr->magic_num1[TR_RES_FIRE] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_COLD] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_ELEC] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; if (creature_ptr->magic_num1[TR_RES_ACID] < es_ptr->value) - able[ctr] = FALSE; + able[ctr] = false; break; } } @@ -741,7 +741,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) /* Hide the list */ else { /* Hide list */ - redraw = FALSE; + redraw = false; screen_load(); } @@ -780,7 +780,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) } /* Stop the loop */ - flag = TRUE; + flag = true; } if (redraw) screen_load(); @@ -922,12 +922,12 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) o_ptr->xtra3 = es_ptr->add + 1; } } else { - bool success = TRUE; + bool success = true; switch (es_ptr->add) { case ESSENCE_SH_FIRE: if ((creature_ptr->magic_num1[TR_BRAND_FIRE] < use_essence) || (creature_ptr->magic_num1[TR_RES_FIRE] < use_essence)) { - success = FALSE; + success = false; break; } creature_ptr->magic_num1[TR_BRAND_FIRE] -= use_essence; @@ -935,7 +935,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) break; case ESSENCE_SH_ELEC: if ((creature_ptr->magic_num1[TR_BRAND_ELEC] < use_essence) || (creature_ptr->magic_num1[TR_RES_ELEC] < use_essence)) { - success = FALSE; + success = false; break; } creature_ptr->magic_num1[TR_BRAND_ELEC] -= use_essence; @@ -943,7 +943,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) break; case ESSENCE_SH_COLD: if ((creature_ptr->magic_num1[TR_BRAND_COLD] < use_essence) || (creature_ptr->magic_num1[TR_RES_COLD] < use_essence)) { - success = FALSE; + success = false; break; } creature_ptr->magic_num1[TR_BRAND_COLD] -= use_essence; @@ -953,7 +953,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode) case ESSENCE_SUSTAIN: if ((creature_ptr->magic_num1[TR_RES_ACID] < use_essence) || (creature_ptr->magic_num1[TR_RES_ELEC] < use_essence) || (creature_ptr->magic_num1[TR_RES_FIRE] < use_essence) || (creature_ptr->magic_num1[TR_RES_COLD] < use_essence)) { - success = FALSE; + success = false; break; } creature_ptr->magic_num1[TR_RES_ACID] -= use_essence; diff --git a/src/cmd-item/cmd-throw.cpp b/src/cmd-item/cmd-throw.cpp index 4ea9716af..1a423200b 100644 --- a/src/cmd-item/cmd-throw.cpp +++ b/src/cmd-item/cmd-throw.cpp @@ -66,7 +66,7 @@ static bool check_throw_boomerang(player_type *creature_ptr, it_type *it_ptr, concptr *q, concptr *s) { if (!it_ptr->boomerang) - return TRUE; + return true; if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND) && has_melee_weapon(creature_ptr, INVEN_SUB_HAND)) { item_tester_hook = item_tester_hook_boomerang; @@ -75,21 +75,21 @@ static bool check_throw_boomerang(player_type *creature_ptr, it_type *it_ptr, co it_ptr->o_ptr = choose_object(creature_ptr, &it_ptr->item, *q, *s, USE_EQUIP, TV_NONE); if (!it_ptr->o_ptr) { flush(); - return FALSE; + return false; } - return TRUE; + return true; } if (has_melee_weapon(creature_ptr, INVEN_SUB_HAND)) { it_ptr->item = INVEN_SUB_HAND; it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item]; - return TRUE; + return true; } it_ptr->item = INVEN_MAIN_HAND; it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item]; - return TRUE; + return true; } static bool check_what_throw(player_type *creature_ptr, it_type *it_ptr) @@ -97,41 +97,41 @@ static bool check_what_throw(player_type *creature_ptr, it_type *it_ptr) if (it_ptr->shuriken >= 0) { it_ptr->item = it_ptr->shuriken; it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item]; - return TRUE; + return true; } concptr q, s; if (!check_throw_boomerang(creature_ptr, it_ptr, &q, &s)) - return FALSE; + return false; q = _("どのアイテムを投げますか? ", "Throw which item? "); s = _("投げるアイテムがない。", "You have nothing to throw."); it_ptr->o_ptr = choose_object(creature_ptr, &it_ptr->item, q, s, USE_INVEN | USE_FLOOR | USE_EQUIP, TV_NONE); if (!it_ptr->o_ptr) { flush(); - return FALSE; + return false; } - return TRUE; + return true; } static bool check_can_throw(player_type *creature_ptr, it_type *it_ptr) { if (!check_what_throw(creature_ptr, it_ptr)) - return FALSE; + return false; if (object_is_cursed(it_ptr->o_ptr) && (it_ptr->item >= INVEN_MAIN_HAND)) { msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed.")); - return FALSE; + return false; } if (creature_ptr->current_floor_ptr->inside_arena && !it_ptr->boomerang && (it_ptr->o_ptr->tval != TV_SPIKE)) { msg_print(_("アリーナではアイテムを使えない！", "You're in the arena now. This is hand-to-hand!")); msg_print(NULL); - return FALSE; + return false; } - return TRUE; + return true; } static void calc_throw_range(player_type *creature_ptr, it_type *it_ptr) @@ -160,13 +160,13 @@ static bool calc_throw_grid(player_type *creature_ptr, it_type *it_ptr) if (it_ptr->shuriken >= 0) { it_ptr->ty = randint0(101) - 50 + creature_ptr->y; it_ptr->tx = randint0(101) - 50 + creature_ptr->x; - return TRUE; + return true; } project_length = it_ptr->tdis + 1; DIRECTION dir; if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; it_ptr->tx = creature_ptr->x + 99 * ddx[dir]; it_ptr->ty = creature_ptr->y + 99 * ddy[dir]; @@ -176,13 +176,13 @@ static bool calc_throw_grid(player_type *creature_ptr, it_type *it_ptr) } project_length = 0; - return TRUE; + return true; } static void reflect_inventory_by_throw(player_type *creature_ptr, it_type *it_ptr) { if ((it_ptr->q_ptr->name1 == ART_MJOLLNIR) || (it_ptr->q_ptr->name1 == ART_AEGISFANG) || it_ptr->boomerang) - it_ptr->return_when_thrown = TRUE; + it_ptr->return_when_thrown = true; if (it_ptr->item < 0) { floor_item_increase(creature_ptr, 0 - it_ptr->item, -1); @@ -229,9 +229,9 @@ static bool check_racial_target_bold(player_type *creature_ptr, it_type *it_ptr) it_ptr->nx[it_ptr->cur_dis] = it_ptr->x; mmove2(&it_ptr->ny[it_ptr->cur_dis], &it_ptr->nx[it_ptr->cur_dis], creature_ptr->y, creature_ptr->x, it_ptr->ty, it_ptr->tx); if (cave_has_flag_bold(creature_ptr->current_floor_ptr, it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis], FF_PROJECT)) - return FALSE; + return false; - it_ptr->hit_wall = TRUE; + it_ptr->hit_wall = true; return (it_ptr->q_ptr->tval == TV_FIGURINE) || object_is_potion(it_ptr->q_ptr) || (creature_ptr->current_floor_ptr->grid_array[it_ptr->ny[it_ptr->cur_dis]][it_ptr->nx[it_ptr->cur_dis]].m_idx == 0); } @@ -325,7 +325,7 @@ static void attack_racial_power(player_type *creature_ptr, it_type *it_ptr) msg_format_wizard(creature_ptr, CHEAT_MONSTER, _("%dのダメージを与えた。(残りHP %d/%d(%d))", "You do %d damage. (left HP %d/%d(%d))"), it_ptr->tdam, it_ptr->m_ptr->hp - it_ptr->tdam, it_ptr->m_ptr->maxhp, it_ptr->m_ptr->max_maxhp); - bool fear = FALSE; + bool fear = false; if (mon_take_hit(creature_ptr, it_ptr->g_ptr->m_idx, it_ptr->tdam, &fear, extract_note_dies(real_r_idx(it_ptr->m_ptr)))) return; @@ -357,7 +357,7 @@ static void exe_throw(player_type *creature_ptr, it_type *it_ptr) it_ptr->m_ptr = &creature_ptr->current_floor_ptr->m_list[it_ptr->g_ptr->m_idx]; monster_name(creature_ptr, it_ptr->g_ptr->m_idx, it_ptr->m_name); it_ptr->visible = it_ptr->m_ptr->ml; - it_ptr->hit_body = TRUE; + it_ptr->hit_body = true; attack_racial_power(creature_ptr, it_ptr); break; } @@ -390,13 +390,13 @@ void display_potion_throw(player_type *creature_ptr, it_type *it_ptr) msg_format(_("%sは砕け散った！", "The %s shatters!"), it_ptr->o_name); if (!potion_smash_effect(creature_ptr, 0, it_ptr->y, it_ptr->x, it_ptr->q_ptr->k_idx)) { - it_ptr->do_drop = FALSE; + it_ptr->do_drop = false; return; } monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x].m_idx]; if ((creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x].m_idx == 0) || !is_friendly(m_ptr) || monster_invulner_remaining(m_ptr)) { - it_ptr->do_drop = FALSE; + it_ptr->do_drop = false; return; } @@ -404,14 +404,14 @@ void display_potion_throw(player_type *creature_ptr, it_type *it_ptr) monster_desc(creature_ptr, m_name, m_ptr, 0); msg_format(_("%sは怒った！", "%^s gets angry!"), m_name); set_hostile(creature_ptr, &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x].m_idx]); - it_ptr->do_drop = FALSE; + it_ptr->do_drop = false; } static void display_boomerang_throw(player_type *creature_ptr, it_type *it_ptr) { if ((it_ptr->back_chance > 37) && !creature_ptr->blind && (it_ptr->item >= 0)) { msg_format(_("%sが手元に返ってきた。", "%s comes back to you."), it_ptr->o2_name); - it_ptr->come_back = TRUE; + it_ptr->come_back = true; return; } @@ -476,7 +476,7 @@ static void process_boomerang_back(player_type *creature_ptr, it_type *it_ptr) if (it_ptr->come_back) { if ((it_ptr->item != INVEN_MAIN_HAND) && (it_ptr->item != INVEN_SUB_HAND)) { store_item_to_inventory(creature_ptr, it_ptr->q_ptr); - it_ptr->do_drop = FALSE; + it_ptr->do_drop = false; return; } @@ -485,7 +485,7 @@ static void process_boomerang_back(player_type *creature_ptr, it_type *it_ptr) creature_ptr->equip_cnt++; creature_ptr->update |= PU_BONUS | PU_TORCH | PU_MANA; creature_ptr->window_flags |= PW_EQUIP; - it_ptr->do_drop = FALSE; + it_ptr->do_drop = false; return; } @@ -526,7 +526,7 @@ static void drop_thrown_item(player_type *creature_ptr, it_type *it_ptr) bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_IDX shuriken) { if (creature_ptr->wild_mode) - return FALSE; + return false; if (creature_ptr->special_defense & KATA_MUSOU) set_action(creature_ptr, ACTION_NONE); @@ -535,15 +535,15 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID object_type tmp_object; it_type *it_ptr = initialize_it_type(&tmp_it, &tmp_object, delay_factor, mult, boomerang, shuriken); if (!check_can_throw(creature_ptr, it_ptr)) - return FALSE; + return false; calc_throw_range(creature_ptr, it_ptr); if (!calc_throw_grid(creature_ptr, it_ptr)) - return FALSE; + return false; reflect_inventory_by_throw(creature_ptr, it_ptr); if (it_ptr->item >= INVEN_MAIN_HAND) { - it_ptr->equiped_item = TRUE; + it_ptr->equiped_item = true; creature_ptr->redraw |= PR_EQUIPPY; } @@ -561,5 +561,5 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID check_boomerang_throw(creature_ptr, it_ptr); process_boomerang_back(creature_ptr, it_ptr); drop_thrown_item(creature_ptr, it_ptr); - return TRUE; + return true; } diff --git a/src/cmd-item/cmd-usestaff.cpp b/src/cmd-item/cmd-usestaff.cpp index 14f43c16b..5075e9297 100644 --- a/src/cmd-item/cmd-usestaff.cpp +++ b/src/cmd-item/cmd-usestaff.cpp @@ -66,7 +66,7 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known) { int k; - bool ident = FALSE; + bool ident = false; PLAYER_LEVEL lev = powerful ? creature_ptr->lev * 2 : creature_ptr->lev; POSITION detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT; @@ -75,22 +75,22 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use case SV_STAFF_DARKNESS: { if (!has_resist_blind(creature_ptr) && !has_resist_dark(creature_ptr)) { if (set_blind(creature_ptr, creature_ptr->blind + 3 + randint1(5))) - ident = TRUE; + ident = true; } if (unlite_area(creature_ptr, 10, (powerful ? 6 : 3))) - ident = TRUE; + ident = true; break; } case SV_STAFF_SLOWNESS: { if (set_slow(creature_ptr, creature_ptr->slow + randint1(30) + 15, FALSE)) - ident = TRUE; + ident = true; break; } case SV_STAFF_HASTE_MONSTERS: { if (speed_monsters(creature_ptr)) - ident = TRUE; + ident = true; break; } @@ -99,7 +99,7 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use for (k = 0; k < times; k++) { if (summon_specific(creature_ptr, 0, creature_ptr->y, creature_ptr->x, creature_ptr->current_floor_ptr->dun_level, SUMMON_NONE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET))) { - ident = TRUE; + ident = true; } } break; @@ -107,26 +107,26 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use case SV_STAFF_TELEPORTATION: { teleport_player(creature_ptr, (powerful ? 150 : 100), 0L); - ident = TRUE; + ident = true; break; } case SV_STAFF_IDENTIFY: { if (powerful) { if (!identify_fully(creature_ptr, FALSE, TV_NONE)) - *use_charge = FALSE; + *use_charge = false; } else { if (!ident_spell(creature_ptr, FALSE, TV_NONE)) - *use_charge = FALSE; + *use_charge = false; } - ident = TRUE; + ident = true; break; } case SV_STAFF_REMOVE_CURSE: { bool result = (powerful ? remove_all_curse(creature_ptr) : remove_curse(creature_ptr)) != 0; if (result) { - ident = TRUE; + ident = true; } break; } @@ -137,53 +137,53 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use case SV_STAFF_LITE: { if (lite_area(creature_ptr, damroll(2, 8), (powerful ? 4 : 2))) - ident = TRUE; + ident = true; break; } case SV_STAFF_MAPPING: { map_area(creature_ptr, powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP); - ident = TRUE; + ident = true; break; } case SV_STAFF_DETECT_GOLD: { if (detect_treasure(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; if (detect_objects_gold(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; break; } case SV_STAFF_DETECT_ITEM: { if (detect_objects_normal(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; break; } case SV_STAFF_DETECT_TRAP: { if (detect_traps(creature_ptr, detect_rad, known)) - ident = TRUE; + ident = true; break; } case SV_STAFF_DETECT_DOOR: { if (detect_doors(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; if (detect_stairs(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; break; } case SV_STAFF_DETECT_INVIS: { if (set_tim_invis(creature_ptr, creature_ptr->tim_invis + 12 + randint1(12), false)) - ident = TRUE; + ident = true; break; } case SV_STAFF_DETECT_EVIL: { if (detect_monsters_evil(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; break; } @@ -195,40 +195,40 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use case SV_STAFF_CURING: { ident = true_healing(creature_ptr, 0); if (set_shero(creature_ptr, 0, TRUE)) - ident = TRUE; + ident = true; break; } case SV_STAFF_HEALING: { if (cure_critical_wounds(creature_ptr, powerful ? 500 : 300)) - ident = TRUE; + ident = true; break; } case SV_STAFF_THE_MAGI: { if (do_res_stat(creature_ptr, A_INT)) - ident = TRUE; + ident = true; ident |= restore_mana(creature_ptr, FALSE); if (set_shero(creature_ptr, 0, TRUE)) - ident = TRUE; + ident = true; break; } case SV_STAFF_SLEEP_MONSTERS: { if (sleep_monsters(creature_ptr, lev)) - ident = TRUE; + ident = true; break; } case SV_STAFF_SLOW_MONSTERS: { if (slow_monsters(creature_ptr, lev)) - ident = TRUE; + ident = true; break; } case SV_STAFF_SPEED: { if (set_fast(creature_ptr, randint1(30) + (powerful ? 30 : 15), FALSE)) - ident = TRUE; + ident = true; break; } @@ -259,7 +259,7 @@ int staff_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use case SV_STAFF_EARTHQUAKES: { if (earthquake(creature_ptr, creature_ptr->y, creature_ptr->x, (powerful ? 15 : 10), 0)) - ident = TRUE; + ident = true; else msg_print(_("ダンジョンが揺れた。", "The dungeon trembles.")); @@ -305,7 +305,7 @@ void exe_use_staff(player_type *creature_ptr, INVENTORY_IDX item) object_type *o_ptr; /* Hack -- let staffs of identify get aborted */ - bool use_charge = TRUE; + bool use_charge = true; o_ptr = ref_item(creature_ptr, item); diff --git a/src/cmd-item/cmd-zaprod.cpp b/src/cmd-item/cmd-zaprod.cpp index 25d40f31f..9dc1f2f3d 100644 --- a/src/cmd-item/cmd-zaprod.cpp +++ b/src/cmd-item/cmd-zaprod.cpp @@ -55,7 +55,7 @@ */ int rod_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION dir, bool *use_charge, bool powerful, bool magic) { - int ident = FALSE; + int ident = false; PLAYER_LEVEL lev = powerful ? creature_ptr->lev * 2 : creature_ptr->lev; POSITION detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT; POSITION rad = powerful ? 3 : 2; @@ -67,107 +67,107 @@ int rod_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION d switch (sval) { case SV_ROD_DETECT_TRAP: { if (detect_traps(creature_ptr, detect_rad, (bool)(dir ? FALSE : TRUE))) - ident = TRUE; + ident = true; break; } case SV_ROD_DETECT_DOOR: { if (detect_doors(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; if (detect_stairs(creature_ptr, detect_rad)) - ident = TRUE; + ident = true; break; } case SV_ROD_IDENTIFY: { if (powerful) { if (!identify_fully(creature_ptr, FALSE, TV_NONE)) - *use_charge = FALSE; + *use_charge = false; } else { if (!ident_spell(creature_ptr, FALSE, TV_NONE)) - *use_charge = FALSE; + *use_charge = false; } - ident = TRUE; + ident = true; break; } case SV_ROD_RECALL: { if (!recall_player(creature_ptr, randint0(21) + 15)) - *use_charge = FALSE; - ident = TRUE; + *use_charge = false; + ident = true; break; } case SV_ROD_ILLUMINATION: { if (lite_area(creature_ptr, damroll(2, 8), (powerful ? 4 : 2))) - ident = TRUE; + ident = true; break; } case SV_ROD_MAPPING: { map_area(creature_ptr, powerful ? DETECT_RAD_MAP * 3 / 2 : DETECT_RAD_MAP); - ident = TRUE; + ident = true; break; } case SV_ROD_DETECTION: { detect_all(creature_ptr, detect_rad); - ident = TRUE; + ident = true; break; } case SV_ROD_PROBING: { probing(creature_ptr); - ident = TRUE; + ident = true; break; } case SV_ROD_CURING: { if (true_healing(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_shero(creature_ptr, 0, TRUE)) - ident = TRUE; + ident = true; break; } case SV_ROD_HEALING: { if (cure_critical_wounds(creature_ptr, powerful ? 750 : 500)) - ident = TRUE; + ident = true; break; } case SV_ROD_RESTORATION: { if (restore_level(creature_ptr)) - ident = TRUE; + ident = true; if (restore_all_status(creature_ptr)) - ident = TRUE; + ident = true; break; } case SV_ROD_SPEED: { if (set_fast(creature_ptr, randint1(30) + (powerful ? 30 : 15), FALSE)) - ident = TRUE; + ident = true; break; } case SV_ROD_PESTICIDE: { if (dispel_monsters(creature_ptr, powerful ? 8 : 4)) - ident = TRUE; + ident = true; break; } case SV_ROD_TELEPORT_AWAY: { int distance = MAX_SIGHT * (powerful ? 8 : 5); if (teleport_monster(creature_ptr, dir, distance)) - ident = TRUE; + ident = true; break; } case SV_ROD_DISARMING: { if (disarm_trap(creature_ptr, dir)) - ident = TRUE; + ident = true; if (powerful && disarm_traps_touch(creature_ptr)) - ident = TRUE; + ident = true; break; } @@ -175,98 +175,98 @@ int rod_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION d HIT_POINT dam = damroll((powerful ? 12 : 6), 8); msg_print(_("青く輝く光線が放たれた。", "A line of blue shimmering light appears.")); (void)lite_line(creature_ptr, dir, dam); - ident = TRUE; + ident = true; break; } case SV_ROD_SLEEP_MONSTER: { if (sleep_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_ROD_SLOW_MONSTER: { if (slow_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_ROD_HYPODYNAMIA: { if (hypodynamic_bolt(creature_ptr, dir, 70 + 3 * lev / 2)) - ident = TRUE; + ident = true; break; } case SV_ROD_POLYMORPH: { if (poly_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_ROD_ACID_BOLT: { fire_bolt_or_beam(creature_ptr, 10, GF_ACID, dir, damroll(6 + lev / 7, 8)); - ident = TRUE; + ident = true; break; } case SV_ROD_ELEC_BOLT: { fire_bolt_or_beam(creature_ptr, 10, GF_ELEC, dir, damroll(4 + lev / 9, 8)); - ident = TRUE; + ident = true; break; } case SV_ROD_FIRE_BOLT: { fire_bolt_or_beam(creature_ptr, 10, GF_FIRE, dir, damroll(7 + lev / 6, 8)); - ident = TRUE; + ident = true; break; } case SV_ROD_COLD_BOLT: { fire_bolt_or_beam(creature_ptr, 10, GF_COLD, dir, damroll(5 + lev / 8, 8)); - ident = TRUE; + ident = true; break; } case SV_ROD_ACID_BALL: { fire_ball(creature_ptr, GF_ACID, dir, 60 + lev, rad); - ident = TRUE; + ident = true; break; } case SV_ROD_ELEC_BALL: { fire_ball(creature_ptr, GF_ELEC, dir, 40 + lev, rad); - ident = TRUE; + ident = true; break; } case SV_ROD_FIRE_BALL: { fire_ball(creature_ptr, GF_FIRE, dir, 70 + lev, rad); - ident = TRUE; + ident = true; break; } case SV_ROD_COLD_BALL: { fire_ball(creature_ptr, GF_COLD, dir, 50 + lev, rad); - ident = TRUE; + ident = true; break; } case SV_ROD_HAVOC: { call_chaos(creature_ptr); - ident = TRUE; + ident = true; break; } case SV_ROD_STONE_TO_MUD: { HIT_POINT dam = powerful ? 40 + randint1(60) : 20 + randint1(30); if (wall_to_mud(creature_ptr, dir, dam)) - ident = TRUE; + ident = true; break; } case SV_ROD_AGGRAVATE: { aggravate_monsters(creature_ptr, 0); - ident = TRUE; + ident = true; break; } } @@ -294,7 +294,7 @@ void exe_zap_rod(player_type *creature_ptr, INVENTORY_IDX item) bool success; /* Hack -- let perception get aborted */ - bool use_charge = TRUE; + bool use_charge = true; object_kind *k_ptr; @@ -339,17 +339,17 @@ void exe_zap_rod(player_type *creature_ptr, INVENTORY_IDX item) return; if (creature_ptr->pclass == CLASS_BERSERKER) - success = FALSE; + success = false; else if (chance > fail) { if (randint0(chance * 2) < fail) - success = FALSE; + success = false; else - success = TRUE; + success = true; } else { if (randint0(fail * 2) < chance) - success = TRUE; + success = true; else - success = FALSE; + success = false; } /* Roll for usage */ diff --git a/src/cmd-item/cmd-zapwand.cpp b/src/cmd-item/cmd-zapwand.cpp index fb419cc2e..0dfb47669 100644 --- a/src/cmd-item/cmd-zapwand.cpp +++ b/src/cmd-item/cmd-zapwand.cpp @@ -49,7 +49,7 @@ */ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION dir, bool powerful, bool magic) { - bool ident = FALSE; + bool ident = false; PLAYER_LEVEL lev = powerful ? creature_ptr->lev * 2 : creature_ptr->lev; POSITION rad = powerful ? 3 : 2; @@ -80,49 +80,49 @@ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION case SV_WAND_HEAL_MONSTER: { HIT_POINT dam = damroll((powerful ? 20 : 10), 10); if (heal_monster(creature_ptr, dir, dam)) - ident = TRUE; + ident = true; break; } case SV_WAND_HASTE_MONSTER: { if (speed_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_WAND_CLONE_MONSTER: { if (clone_monster(creature_ptr, dir)) - ident = TRUE; + ident = true; break; } case SV_WAND_TELEPORT_AWAY: { int distance = MAX_SIGHT * (powerful ? 8 : 5); if (teleport_monster(creature_ptr, dir, distance)) - ident = TRUE; + ident = true; break; } case SV_WAND_DISARMING: { if (disarm_trap(creature_ptr, dir)) - ident = TRUE; + ident = true; if (powerful && disarm_traps_touch(creature_ptr)) - ident = TRUE; + ident = true; break; } case SV_WAND_TRAP_DOOR_DEST: { if (destroy_door(creature_ptr, dir)) - ident = TRUE; + ident = true; if (powerful && destroy_doors_touch(creature_ptr)) - ident = TRUE; + ident = true; break; } case SV_WAND_STONE_TO_MUD: { HIT_POINT dam = powerful ? 40 + randint1(60) : 20 + randint1(30); if (wall_to_mud(creature_ptr, dir, dam)) - ident = TRUE; + ident = true; break; } @@ -130,103 +130,103 @@ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION HIT_POINT dam = damroll((powerful ? 12 : 6), 8); msg_print(_("青く輝く光線が放たれた。", "A line of blue shimmering light appears.")); (void)lite_line(creature_ptr, dir, dam); - ident = TRUE; + ident = true; break; } case SV_WAND_SLEEP_MONSTER: { if (sleep_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_WAND_SLOW_MONSTER: { if (slow_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_WAND_CONFUSE_MONSTER: { if (confuse_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_WAND_FEAR_MONSTER: { if (fear_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_WAND_HYPODYNAMIA: { if (hypodynamic_bolt(creature_ptr, dir, 80 + lev)) - ident = TRUE; + ident = true; break; } case SV_WAND_POLYMORPH: { if (poly_monster(creature_ptr, dir, lev)) - ident = TRUE; + ident = true; break; } case SV_WAND_STINKING_CLOUD: { fire_ball(creature_ptr, GF_POIS, dir, 12 + lev / 4, rad); - ident = TRUE; + ident = true; break; } case SV_WAND_MAGIC_MISSILE: { fire_bolt_or_beam(creature_ptr, 20, GF_MISSILE, dir, damroll(2 + lev / 10, 6)); - ident = TRUE; + ident = true; break; } case SV_WAND_ACID_BOLT: { fire_bolt_or_beam(creature_ptr, 20, GF_ACID, dir, damroll(6 + lev / 7, 8)); - ident = TRUE; + ident = true; break; } case SV_WAND_CHARM_MONSTER: { if (charm_monster(creature_ptr, dir, MAX(20, lev))) - ident = TRUE; + ident = true; break; } case SV_WAND_FIRE_BOLT: { fire_bolt_or_beam(creature_ptr, 20, GF_FIRE, dir, damroll(7 + lev / 6, 8)); - ident = TRUE; + ident = true; break; } case SV_WAND_COLD_BOLT: { fire_bolt_or_beam(creature_ptr, 20, GF_COLD, dir, damroll(5 + lev / 8, 8)); - ident = TRUE; + ident = true; break; } case SV_WAND_ACID_BALL: { fire_ball(creature_ptr, GF_ACID, dir, 60 + 3 * lev / 4, rad); - ident = TRUE; + ident = true; break; } case SV_WAND_ELEC_BALL: { fire_ball(creature_ptr, GF_ELEC, dir, 40 + 3 * lev / 4, rad); - ident = TRUE; + ident = true; break; } case SV_WAND_FIRE_BALL: { fire_ball(creature_ptr, GF_FIRE, dir, 70 + 3 * lev / 4, rad); - ident = TRUE; + ident = true; break; } case SV_WAND_COLD_BALL: { fire_ball(creature_ptr, GF_COLD, dir, 50 + 3 * lev / 4, rad); - ident = TRUE; + ident = true; break; } @@ -237,13 +237,13 @@ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION case SV_WAND_DRAGON_FIRE: { fire_breath(creature_ptr, GF_FIRE, dir, (powerful ? 300 : 200), 3); - ident = TRUE; + ident = true; break; } case SV_WAND_DRAGON_COLD: { fire_breath(creature_ptr, GF_COLD, dir, (powerful ? 270 : 180), 3); - ident = TRUE; + ident = true; break; } @@ -279,32 +279,32 @@ bool wand_effect(player_type *creature_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION fire_breath(creature_ptr, typ, dir, dam, 3); - ident = TRUE; + ident = true; break; } case SV_WAND_DISINTEGRATE: { fire_ball(creature_ptr, GF_DISINTEGRATE, dir, 200 + randint1(lev * 2), rad); - ident = TRUE; + ident = true; break; } case SV_WAND_ROCKETS: { msg_print(_("ロケットを発射した！", "You launch a rocket!")); fire_rocket(creature_ptr, GF_ROCKET, dir, 250 + lev * 3, rad); - ident = TRUE; + ident = true; break; } case SV_WAND_STRIKING: { fire_bolt(creature_ptr, GF_METEOR, dir, damroll(15 + lev / 3, 13)); - ident = TRUE; + ident = true; break; } case SV_WAND_GENOCIDE: { fire_ball_hide(creature_ptr, GF_GENOCIDE, dir, magic ? lev + 50 : 250, 0); - ident = TRUE; + ident = true; break; } } @@ -349,7 +349,7 @@ void exe_aim_wand(player_type *creature_ptr, INVENTORY_IDX item) /* Allow direction to be cancelled for free */ if (object_is_aware(o_ptr) && (o_ptr->sval == SV_WAND_HEAL_MONSTER || o_ptr->sval == SV_WAND_HASTE_MONSTER)) - target_pet = TRUE; + target_pet = true; if (!get_aim_dir(creature_ptr, &dir)) { target_pet = old_target_pet; return; diff --git a/src/cmd-visual/cmd-draw.cpp b/src/cmd-visual/cmd-draw.cpp index ddfcffe2f..e6c23b62b 100644 --- a/src/cmd-visual/cmd-draw.cpp +++ b/src/cmd-visual/cmd-draw.cpp @@ -76,7 +76,7 @@ void do_cmd_player_status(player_type *creature_ptr) int mode = 0; char tmp[160]; screen_save(); - while (TRUE) + while (true) { update_playtime(); display_player(creature_ptr, mode); @@ -172,7 +172,7 @@ void do_cmd_messages(int num_now) int i = 0; screen_save(); term_clear(); - while (TRUE) + while (true) { int j; int skey; @@ -198,7 +198,7 @@ void do_cmd_messages(int num_now) i, i + j - 1, n), 0, 0); prt(_("[ 'p' で更に古いもの, 'n' で更に新しいもの, '/' で検索, ESC で中断 ]", "[Press 'p' for older, 'n' for newer, ..., or ESCAPE]"), hgt - 1, 0); - skey = inkey_special(TRUE); + skey = inkey_special(true); if (skey == ESCAPE) break; j = i; diff --git a/src/cmd-visual/cmd-map.cpp b/src/cmd-visual/cmd-map.cpp index 3f618491d..41cc918d9 100644 --- a/src/cmd-visual/cmd-map.cpp +++ b/src/cmd-visual/cmd-map.cpp @@ -31,7 +31,7 @@ void do_cmd_view_map(player_type *player_ptr) } display_autopick = ITEM_DISPLAY; - while (TRUE) { + while (true) { int wid, hgt; term_get_size(&wid, &hgt); int row_message = hgt - 1; diff --git a/src/cmd-visual/cmd-visuals.cpp b/src/cmd-visual/cmd-visuals.cpp index 6a1c7e240..d83356403 100644 --- a/src/cmd-visual/cmd-visuals.cpp +++ b/src/cmd-visual/cmd-visuals.cpp @@ -38,7 +38,7 @@ static bool cmd_visuals_aux(int i, IDX *num, IDX max) char str[10] = ""; sprintf(str, "%d", *num); if (!get_string(format("Input new number(0-%d): ", max - 1), str, 4)) - return FALSE; + return false; IDX tmp = (IDX)strtol(str, NULL, 0); if (tmp >= 0 && tmp < max) @@ -48,7 +48,7 @@ static bool cmd_visuals_aux(int i, IDX *num, IDX max) else *num = (*num + 1) % max; - return TRUE; + return true; } /*! @@ -80,13 +80,13 @@ void do_cmd_visuals(player_type *creature_ptr) FILE *auto_dump_stream; char tmp[160]; char buf[1024]; - bool need_redraw = FALSE; + bool need_redraw = false; concptr empty_symbol = "<< ? >>"; if (use_bigtile) empty_symbol = "<< ?? >>"; screen_save(); - while (TRUE) { + while (true) { term_clear(); print_visuals_menu(NULL); int i = inkey(); @@ -102,7 +102,7 @@ void do_cmd_visuals(player_type *creature_ptr) continue; (void)process_pref_file(creature_ptr, tmp, true); - need_redraw = TRUE; + need_redraw = true; break; } case '1': { @@ -200,7 +200,7 @@ void do_cmd_visuals(player_type *creature_ptr) static concptr choice_msg = _("モンスターの[色/文字]を変更します", "Change monster attr/chars"); static MONRACE_IDX r = 0; prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0); - while (TRUE) { + while (true) { monster_race *r_ptr = &r_info[r]; int c; IDX t; @@ -245,13 +245,13 @@ void do_cmd_visuals(player_type *creature_ptr) t = (int)r_ptr->x_attr; (void)cmd_visuals_aux(i, &t, 256); r_ptr->x_attr = (byte)t; - need_redraw = TRUE; + need_redraw = true; break; case 'c': t = (int)r_ptr->x_char; (void)cmd_visuals_aux(i, &t, 256); r_ptr->x_char = (byte)t; - need_redraw = TRUE; + need_redraw = true; break; case 'v': do_cmd_knowledge_monsters(creature_ptr, &need_redraw, TRUE, r); @@ -267,7 +267,7 @@ void do_cmd_visuals(player_type *creature_ptr) static concptr choice_msg = _("アイテムの[色/文字]を変更します", "Change object attr/chars"); static IDX k = 0; prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0); - while (TRUE) { + while (true) { object_kind *k_ptr = &k_info[k]; int c; IDX t; @@ -315,13 +315,13 @@ void do_cmd_visuals(player_type *creature_ptr) t = (int)k_ptr->x_attr; (void)cmd_visuals_aux(i, &t, 256); k_ptr->x_attr = (byte)t; - need_redraw = TRUE; + need_redraw = true; break; case 'c': t = (int)k_ptr->x_char; (void)cmd_visuals_aux(i, &t, 256); k_ptr->x_char = (byte)t; - need_redraw = TRUE; + need_redraw = true; break; case 'v': do_cmd_knowledge_objects(creature_ptr, &need_redraw, TRUE, k); @@ -338,7 +338,7 @@ void do_cmd_visuals(player_type *creature_ptr) static IDX f = 0; static IDX lighting_level = F_LIT_STANDARD; prt(format(_("コマンド: %s", "Command: %s"), choice_msg), 15, 0); - while (TRUE) { + while (true) { feature_type *f_ptr = &f_info[f]; int c; IDX t; @@ -388,20 +388,20 @@ void do_cmd_visuals(player_type *creature_ptr) t = (int)f_ptr->x_attr[lighting_level]; (void)cmd_visuals_aux(i, &t, 256); f_ptr->x_attr[lighting_level] = (byte)t; - need_redraw = TRUE; + need_redraw = true; break; case 'c': t = (int)f_ptr->x_char[lighting_level]; (void)cmd_visuals_aux(i, &t, 256); f_ptr->x_char[lighting_level] = (byte)t; - need_redraw = TRUE; + need_redraw = true; break; case 'l': (void)cmd_visuals_aux(i, &lighting_level, F_LIT_MAX); break; case 'd': apply_default_feat_lighting(f_ptr->x_attr, f_ptr->x_char); - need_redraw = TRUE; + need_redraw = true; break; case 'v': do_cmd_knowledge_features(&need_redraw, TRUE, f, &lighting_level); @@ -428,7 +428,7 @@ void do_cmd_visuals(player_type *creature_ptr) case 'r': reset_visuals(creature_ptr); msg_print(_("画面上の[色/文字]を初期値にリセットしました。", "Visual attr/char tables reset.")); - need_redraw = TRUE; + need_redraw = true; break; default: bell(); diff --git a/src/combat/attack-accuracy.cpp b/src/combat/attack-accuracy.cpp index dbe998376..b58c5db34 100644 --- a/src/combat/attack-accuracy.cpp +++ b/src/combat/attack-accuracy.cpp @@ -67,7 +67,7 @@ bool check_hit_from_monster_to_player(player_type *target_ptr, int power, DEPTH { int k = randint0(100); if (stun && one_in_(2)) - return FALSE; + return false; if (k < 10) return (k < 5); int i = (power + (level * 3)); @@ -77,8 +77,8 @@ bool check_hit_from_monster_to_player(player_type *target_ptr, int power, DEPTH ac += (target_ptr->lev * 2); if ((i > 0) && (randint1(i) > ((ac * 3) / 4))) - return TRUE; - return FALSE; + return true; + return false; } /*! @@ -93,14 +93,14 @@ bool check_hit_from_monster_to_monster(int power, DEPTH level, ARMOUR_CLASS ac, { int k = randint0(100); if (stun && one_in_(2)) - return FALSE; + return false; if (k < 10) return (k < 5); int i = (power + (level * 3)); if ((i > 0) && (randint1(i) > ((ac * 3) / 4))) - return TRUE; - return FALSE; + return true; + return false; } /*! @@ -111,7 +111,7 @@ bool check_hit_from_monster_to_monster(int power, DEPTH level, ARMOUR_CLASS ac, */ static bool decide_attack_hit(player_type *attacker_ptr, player_attack_type *pa_ptr, int chance) { - bool success_hit = FALSE; + bool success_hit = false; object_type *o_ptr = &attacker_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand]; monster_race *r_ptr = &r_info[pa_ptr->m_ptr->r_idx]; if (((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_POISON_NEEDLE)) || (pa_ptr->mode == HISSATSU_KYUSHO)) { @@ -125,12 +125,12 @@ static bool decide_attack_hit(player_type *attacker_ptr, player_attack_type *pa_ success_hit = one_in_(n); } else if ((attacker_ptr->pclass == CLASS_NINJA) && ((pa_ptr->backstab || pa_ptr->surprise_attack) && !(r_ptr->flagsr & RFR_RES_ALL))) - success_hit = TRUE; + success_hit = true; else success_hit = test_hit_norm(attacker_ptr, chance, r_ptr->ac, pa_ptr->m_ptr->ml); if ((pa_ptr->mode == HISSATSU_MAJIN) && one_in_(2)) - success_hit = FALSE; + success_hit = false; return success_hit; } @@ -146,10 +146,10 @@ bool process_attack_hit(player_type *attacker_ptr, player_attack_type *pa_ptr, i { object_type *o_ptr = &attacker_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand]; if (decide_attack_hit(attacker_ptr, pa_ptr, chance)) - return TRUE; + return true; - pa_ptr->backstab = FALSE; /* Clumsy! */ - pa_ptr->surprise_attack = FALSE; /* Clumsy! */ + pa_ptr->backstab = false; /* Clumsy! */ + pa_ptr->surprise_attack = false; /* Clumsy! */ if ((o_ptr->tval == TV_POLEARM) && (o_ptr->sval == SV_DEATH_SCYTHE) && one_in_(3)) { process_death_scythe_reflection(attacker_ptr, pa_ptr); @@ -158,5 +158,5 @@ bool process_attack_hit(player_type *attacker_ptr, player_attack_type *pa_ptr, i msg_format(_("ミス！ %sにかわされた。", "You miss %s."), pa_ptr->m_name); } - return FALSE; + return false; } diff --git a/src/combat/aura-counterattack.cpp b/src/combat/aura-counterattack.cpp index 341c79505..4831f46c0 100644 --- a/src/combat/aura-counterattack.cpp +++ b/src/combat/aura-counterattack.cpp @@ -46,8 +46,8 @@ static void aura_fire_by_monster_attack(player_type *target_ptr, monap_type *mon dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE); msg_format(_("%^sは突然熱くなった！", "%^s is suddenly very hot!"), monap_ptr->m_name); if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は灰の山になった。", " turns into a pile of ash."))) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; } } @@ -68,8 +68,8 @@ static void aura_elec_by_monster_attack(player_type *target_ptr, monap_type *mon dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE); msg_format(_("%^sは電撃をくらった！", "%^s gets zapped!"), monap_ptr->m_name); if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は燃え殻の山になった。", " turns into a pile of cinders."))) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; } } @@ -90,8 +90,8 @@ static void aura_cold_by_monster_attack(player_type *target_ptr, monap_type *mon dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE); msg_format(_("%^sは冷気をくらった！", "%^s is very cold!"), monap_ptr->m_name); if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は凍りついた。", " was frozen."))) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; } } @@ -109,8 +109,8 @@ static void aura_shards_by_monster_attack(player_type *target_ptr, monap_type *m dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE); msg_format(_("%^sは鏡の破片をくらった！", "%^s gets sliced!"), monap_ptr->m_name); if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("はズタズタになった。", " is torn to pieces."))) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; } } @@ -138,8 +138,8 @@ static void aura_holy_by_monster_attack(player_type *target_ptr, monap_type *mon dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE); msg_format(_("%^sは聖なるオーラで傷ついた！", "%^s is injured by holy power!"), monap_ptr->m_name); if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; } if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr)) @@ -163,8 +163,8 @@ static void aura_force_by_monster_attack(player_type *target_ptr, monap_type *mo dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE); msg_format(_("%^sが鋭い闘気のオーラで傷ついた！", "%^s is injured by the Force"), monap_ptr->m_name); if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; } } @@ -195,8 +195,8 @@ static void aura_shadow_by_monster_attack(player_type *target_ptr, monap_type *m dam = mon_damage_mod(target_ptr, monap_ptr->m_ptr, dam, FALSE); msg_format(_("影のオーラが%^sに反撃した！", "Enveloping shadows attack %^s."), monap_ptr->m_name); if (mon_take_hit(target_ptr, monap_ptr->m_idx, dam, &monap_ptr->fear, _("は倒れた。", " is destroyed."))) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; return; } diff --git a/src/combat/shoot.cpp b/src/combat/shoot.cpp index aad85ae4b..d9274e85d 100644 --- a/src/combat/shoot.cpp +++ b/src/combat/shoot.cpp @@ -393,7 +393,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, object_type *o_ptr; - bool hit_body = FALSE; + bool hit_body = false; GAME_TEXT o_name[MAX_NLEN]; @@ -402,7 +402,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, int msec = delay_factor * delay_factor * delay_factor; /* STICK TO */ - bool stick_to = FALSE; + bool stick_to = false; /* Access the item (if in the pack) */ if (item >= 0) { @@ -498,7 +498,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, /* Take a (partial) turn */ PlayerEnergy(shooter_ptr).div_player_turn_energy((ENERGY)thits); - shooter_ptr->is_fired = TRUE; + shooter_ptr->is_fired = true; /* Sniper - Difficult to shot twice at 1 turn */ if (snipe_type == SP_DOUBLE) @@ -524,7 +524,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, prev_x = x; /* The shot does not hit yet */ - hit_body = FALSE; + hit_body = false; /* Travel until stopped */ for (cur_dis = 0; cur_dis <= tdis;) { @@ -553,7 +553,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, /* Destroy the wall */ cave_alter_feat(shooter_ptr, ny, nx, FF_HURT_ROCK); - hit_body = TRUE; + hit_body = true; break; } } @@ -627,7 +627,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, visible = m_ptr->ml; /* Note the collision */ - hit_body = TRUE; + hit_body = true; if (monster_csleep_remaining(m_ptr)) { if (none_bits(r_ptr->flags3, RF3_EVIL) || one_in_(5)) @@ -665,7 +665,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, /* Did we hit it (penalize range) */ if (test_hit_fire(shooter_ptr, chance - cur_dis, m_ptr, m_ptr->ml, o_name)) { - bool fear = FALSE; + bool fear = false; auto tdam = tdam_base; //!< @note 実際に与えるダメージ auto base_dam = tdam; //!< @note 補正前の与えるダメージ(無傷、全ての耐性など) @@ -756,7 +756,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, monster_desc(shooter_ptr, m_name, m_ptr, 0); - stick_to = TRUE; + stick_to = true; msg_format(_("%sは%sに突き刺さった！", "%^s is stuck in %s!"), o_name, m_name); } @@ -909,17 +909,17 @@ bool test_hit_fire(player_type *shooter_ptr, int chance, monster_type *m_ptr, in /* Hack -- Instant miss or hit */ if (k <= 5) - return FALSE; + return false; if (k > 95) - return TRUE; + return true; if (shooter_ptr->pseikaku == PERSONALITY_LAZY) if (one_in_(20)) - return FALSE; + return false; /* Never hit */ if (chance <= 0) - return FALSE; + return false; ac = r_ptr->ac; if (shooter_ptr->concent) { @@ -941,11 +941,11 @@ bool test_hit_fire(player_type *shooter_ptr, int chance, monster_type *m_ptr, in monster_desc(shooter_ptr, 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/asking-player.cpp b/src/core/asking-player.cpp index 9d30f3ac5..e74e1e7f8 100644 --- a/src/core/asking-player.cpp +++ b/src/core/asking-player.cpp @@ -52,7 +52,7 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor) buf[len] = '\0'; int pos = 0; - while (TRUE) { + while (true) { term_erase(x, y, len); term_putstr(x, y, -1, color, buf); @@ -67,7 +67,7 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor) if (0 == pos) break; - while (TRUE) { + while (true) { int next_pos = i + 1; #ifdef JP if (iskanji(buf[i])) @@ -101,18 +101,18 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor) case ESCAPE: buf[0] = '\0'; - return FALSE; + return false; case '\n': case '\r': - return TRUE; + return true; case '\010': { int i = 0; color = TERM_WHITE; if (0 == pos) break; - while (TRUE) { + while (true) { int next_pos = i + 1; #ifdef JP if (iskanji(buf[i])) @@ -159,7 +159,7 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor) strcpy(tmp, buf + pos); #ifdef JP if (iskanji(c)) { - inkey_base = TRUE; + inkey_base = true; char next = inkey(); if (pos + 1 < len) { buf[pos++] = c; @@ -267,37 +267,37 @@ bool get_check_strict(player_type *player_ptr, concptr prompt, BIT_FLAGS mode) handle_stuff(player_ptr); } - bool flag = FALSE; - while (TRUE) { + bool flag = false; + while (true) { int i = inkey(); if (!(mode & CHECK_NO_ESCAPE)) { if (i == ESCAPE) { - flag = FALSE; + flag = false; break; } } if (mode & CHECK_OKAY_CANCEL) { if (i == 'o' || i == 'O') { - flag = TRUE; + flag = true; break; } else if (i == 'c' || i == 'C') { - flag = FALSE; + flag = false; break; } } else { if (i == 'y' || i == 'Y') { - flag = TRUE; + flag = true; break; } else if (i == 'n' || i == 'N') { - flag = FALSE; + flag = false; break; } } if (mode & CHECK_DEFAULT_Y) { - flag = TRUE; + flag = true; break; } @@ -326,11 +326,11 @@ bool get_com(concptr prompt, char *command, bool z_escape) prt("", 0, 0); if (*command == ESCAPE) - return FALSE; + return false; if (z_escape && ((*command == 'z') || (*command == 'Z'))) - return FALSE; + return false; - return TRUE; + return true; } /* diff --git a/src/core/game-closer.cpp b/src/core/game-closer.cpp index 4f1b73fc9..cdf60be37 100644 --- a/src/core/game-closer.cpp +++ b/src/core/game-closer.cpp @@ -49,8 +49,8 @@ static void send_world_score_on_closing(player_type *player_ptr, bool do_send) player_ptr, _("後でスコアを登録するために待機しますか？", "Stand by for later score registration? "), (CHECK_NO_ESCAPE | CHECK_NO_HISTORY))) return; - player_ptr->wait_report_score = TRUE; - player_ptr->is_dead = FALSE; + player_ptr->wait_report_score = true; + player_ptr->is_dead = false; if (!save_player(player_ptr, SAVE_TYPE_CLOSE_GAME)) msg_print(_("セーブ失敗！", "death save failed!")); } @@ -63,7 +63,7 @@ static void send_world_score_on_closing(player_type *player_ptr, bool do_send) static bool check_death(player_type *player_ptr) { if (player_ptr->is_dead) - return TRUE; + return true; do_cmd_save_game(player_ptr, FALSE); prt(_("リターンキーか ESC キーを押して下さい。", "Press Return (or Escape)."), 0, 40); @@ -72,7 +72,7 @@ static bool check_death(player_type *player_ptr) predict_score(player_ptr); clear_floor(player_ptr); - return FALSE; + return false; } /*! @@ -141,7 +141,7 @@ static void kingly(player_type *winner_ptr) */ void close_game(player_type *player_ptr) { - bool do_send = TRUE; + bool do_send = true; handle_stuff(player_ptr); msg_print(NULL); flush(); @@ -167,7 +167,7 @@ void close_game(player_type *player_ptr) if (!save_player(player_ptr, SAVE_TYPE_CLOSE_GAME)) msg_print(_("セーブ失敗！", "death save failed!")); } else - do_send = FALSE; + do_send = false; print_tomb(player_ptr); flush(); diff --git a/src/core/game-play.cpp b/src/core/game-play.cpp index d4f012177..b64ad3019 100644 --- a/src/core/game-play.cpp +++ b/src/core/game-play.cpp @@ -96,7 +96,7 @@ static void restore_windows(player_type *player_ptr) { - player_ptr->hack_mutation = FALSE; + player_ptr->hack_mutation = false; current_world_ptr->character_icky_depth = 1; term_activate(angband_term[0]); angband_term[0]->resize_hook = resize_map; @@ -118,7 +118,7 @@ static void send_waiting_record(player_type *player_ptr) player_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS); update_creature(player_ptr); - player_ptr->is_dead = TRUE; + player_ptr->is_dead = true; current_world_ptr->start_time = (u32b)time(NULL); signals_ignore_tstp(); current_world_ptr->character_icky_depth = 1; @@ -132,7 +132,7 @@ static void send_waiting_record(player_type *player_ptr) prt(_("引き続き待機します。", "standing by for future registration..."), 0, 0); (void)inkey(); } else { - player_ptr->wait_report_score = FALSE; + player_ptr->wait_report_score = false; top_twenty(player_ptr); if (!save_player(player_ptr, SAVE_TYPE_CLOSE_GAME)) msg_print(_("セーブ失敗！", "death save failed!")); @@ -146,11 +146,11 @@ static void send_waiting_record(player_type *player_ptr) static void init_random_seed(player_type *player_ptr, bool new_game) { - bool init_random_seed = FALSE; + bool init_random_seed = false; if (!current_world_ptr->character_loaded) { - new_game = TRUE; - current_world_ptr->character_dungeon = FALSE; - init_random_seed = TRUE; + new_game = true; + current_world_ptr->character_dungeon = false; + init_random_seed = true; init_saved_floors(player_ptr, FALSE); } else if (new_game) init_saved_floors(player_ptr, TRUE); @@ -164,19 +164,19 @@ static void init_random_seed(player_type *player_ptr, bool new_game) static void init_world_floor_info(player_type *player_ptr) { - current_world_ptr->character_dungeon = FALSE; + current_world_ptr->character_dungeon = false; floor_type *floor_ptr = player_ptr->current_floor_ptr; floor_ptr->dun_level = 0; floor_ptr->inside_quest = 0; - floor_ptr->inside_arena = FALSE; - player_ptr->phase_out = FALSE; - write_level = TRUE; + floor_ptr->inside_arena = false; + player_ptr->phase_out = false; + write_level = true; current_world_ptr->seed_flavor = randint0(0x10000000); current_world_ptr->seed_town = randint0(0x10000000); player_birth(player_ptr); counts_write(player_ptr, 2, 0); player_ptr->count = 0; - load = FALSE; + load = false; determine_bounty_uniques(player_ptr); determine_daily_bounty(player_ptr, FALSE); wipe_o_list(floor_ptr); @@ -190,7 +190,7 @@ static void init_world_floor_info(player_type *player_ptr) */ static void restore_world_floor_info(player_type *player_ptr) { - write_level = FALSE; + write_level = false; exe_write_diary(player_ptr, DIARY_GAMESTART, 1, _(" ----ゲーム再開----", " --- Restarted Game ---")); if (player_ptr->riding == -1) { @@ -207,11 +207,11 @@ static void restore_world_floor_info(player_type *player_ptr) static void reset_world_info(player_type *player_ptr) { - current_world_ptr->creating_savefile = FALSE; - player_ptr->teleport_town = FALSE; - player_ptr->sutemi = FALSE; + current_world_ptr->creating_savefile = false; + player_ptr->teleport_town = false; + player_ptr->sutemi = false; current_world_ptr->timewalk_m_idx = 0; - player_ptr->now_damaged = FALSE; + player_ptr->now_damaged = false; now_message = 0; current_world_ptr->start_time = time(NULL) - 1; record_o_name[0] = '\0'; @@ -223,7 +223,7 @@ static void set_wizard_mode_by_argument(player_type *player_ptr) return; if (enter_wizard_mode(player_ptr)) { - current_world_ptr->wizard = TRUE; + current_world_ptr->wizard = true; if (player_ptr->is_dead || !player_ptr->y || !player_ptr->x) { init_saved_floors(player_ptr, TRUE); player_ptr->current_floor_ptr->inside_quest = 0; @@ -293,7 +293,7 @@ static void generate_world(player_type *player_ptr, bool new_game) set_wizard_mode_by_argument(player_ptr); generate_wilderness(player_ptr); change_floor_if_error(player_ptr); - current_world_ptr->character_generated = TRUE; + current_world_ptr->character_generated = true; current_world_ptr->character_icky_depth = 0; if (!new_game) return; @@ -309,10 +309,10 @@ static void init_io(player_type *player_ptr) player_ptr->window_flags = PW_ALL; handle_stuff(player_ptr); if (arg_force_original) - rogue_like_commands = FALSE; + rogue_like_commands = false; if (arg_force_roguelike) - rogue_like_commands = TRUE; + rogue_like_commands = true; } static void init_riding_pet(player_type *player_ptr, bool new_game) @@ -345,16 +345,16 @@ static void decide_arena_death(player_type *player_ptr) return; } - floor_ptr->inside_arena = FALSE; + floor_ptr->inside_arena = false; if (player_ptr->arena_number > MAX_ARENA_MONS) player_ptr->arena_number++; else player_ptr->arena_number = -1 - player_ptr->arena_number; - player_ptr->is_dead = FALSE; + player_ptr->is_dead = false; player_ptr->chp = 0; player_ptr->chp_frac = 0; - player_ptr->exit_bldg = TRUE; + player_ptr->exit_bldg = true; reset_tim_flags(player_ptr); prepare_change_floor_mode(player_ptr, CFM_SAVE_FLOORS | CFM_RAND_CONNECT); leave_floor(player_ptr); @@ -362,13 +362,13 @@ static void decide_arena_death(player_type *player_ptr) static void process_game_turn(player_type *player_ptr) { - bool load_game = TRUE; + bool load_game = true; floor_type *floor_ptr = player_ptr->current_floor_ptr; - while (TRUE) { + while (true) { process_dungeon(player_ptr, load_game); - current_world_ptr->character_xtra = TRUE; + current_world_ptr->character_xtra = true; handle_stuff(player_ptr); - current_world_ptr->character_xtra = FALSE; + current_world_ptr->character_xtra = false; target_who = 0; health_track(player_ptr, 0); forget_lite(floor_ptr); @@ -382,7 +382,7 @@ static void process_game_turn(player_type *player_ptr) wipe_monsters_list(player_ptr); msg_print(NULL); - load_game = FALSE; + load_game = false; decide_arena_death(player_ptr); if (player_ptr->is_dead) break; @@ -423,7 +423,7 @@ void play_game(player_type *player_ptr, bool new_game, bool browsing_movie) restore_world_floor_info(player_ptr); generate_world(player_ptr, new_game); - player_ptr->playing = TRUE; + player_ptr->playing = true; reset_visuals(player_ptr); load_all_pref_files(player_ptr); if (new_game) @@ -431,7 +431,7 @@ void play_game(player_type *player_ptr, bool new_game, bool browsing_movie) init_io(player_ptr); if (player_ptr->chp < 0 && !cheat_immortal) - player_ptr->is_dead = TRUE; + player_ptr->is_dead = true; if (player_ptr->prace == RACE_ANDROID) calc_android_exp(player_ptr); diff --git a/src/core/magic-effects-timeout-reducer.cpp b/src/core/magic-effects-timeout-reducer.cpp index 4c09aaff0..8c9a4c6b9 100644 --- a/src/core/magic-effects-timeout-reducer.cpp +++ b/src/core/magic-effects-timeout-reducer.cpp @@ -42,7 +42,7 @@ void reduce_magic_effects_timeout(player_type *creature_ptr) } if (creature_ptr->suppress_multi_reward) { - creature_ptr->suppress_multi_reward = FALSE; + creature_ptr->suppress_multi_reward = false; } if (creature_ptr->tim_esp) { diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp index 3c9e3507a..5a5a31dee 100644 --- a/src/core/player-processor.cpp +++ b/src/core/player-processor.cpp @@ -55,15 +55,15 @@ #include "window/display-sub-windows.h" #include "world/world-turn-processor.h" -bool load = TRUE; -bool can_save = FALSE; +bool load = true; +bool can_save = false; static void process_fishing(player_type *creature_ptr) { term_xtra(TERM_XTRA_DELAY, 10); if (one_in_(1000)) { MONRACE_IDX r_idx; - bool success = FALSE; + bool success = false; get_mon_num_prep(creature_ptr, monster_is_fishing_target, NULL); r_idx = get_mon_num(creature_ptr, 0, is_in_dungeon(creature_ptr) ? creature_ptr->current_floor_ptr->dun_level @@ -78,7 +78,7 @@ static void process_fishing(player_type *creature_ptr) GAME_TEXT m_name[MAX_NLEN]; monster_desc(creature_ptr, m_name, &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[y][x].m_idx], 0); msg_format(_("%sが釣れた！", "You have a good catch!"), m_name); - success = TRUE; + success = true; } } @@ -107,13 +107,13 @@ void process_player(player_type *creature_ptr) if (creature_ptr->hack_mutation) { msg_print(_("何か変わった気がする！", "You feel different!")); (void)gain_mutation(creature_ptr, 0); - creature_ptr->hack_mutation = FALSE; + creature_ptr->hack_mutation = false; } if (creature_ptr->invoking_midnight_curse) { int count = 0; activate_ty_curse(creature_ptr, FALSE, &count); - creature_ptr->invoking_midnight_curse = FALSE; + creature_ptr->invoking_midnight_curse = false; } if (creature_ptr->phase_out) { @@ -160,7 +160,7 @@ void process_player(player_type *creature_ptr) if (check_abort) { if (continuous_action_running(creature_ptr)) { - inkey_scan = TRUE; + inkey_scan = true; if (inkey()) { flush(); disturb(creature_ptr, FALSE, TRUE); @@ -209,7 +209,7 @@ void process_player(player_type *creature_ptr) handle_stuff(creature_ptr); } - load = FALSE; + load = false; if (creature_ptr->lightspeed) set_lightspeed(creature_ptr, creature_ptr->lightspeed - 1, TRUE); @@ -250,9 +250,9 @@ void process_player(player_type *creature_ptr) /*** Handle actual user input ***/ while (creature_ptr->energy_need <= 0) { creature_ptr->window_flags |= PW_PLAYER; - creature_ptr->sutemi = FALSE; - creature_ptr->counter = FALSE; - creature_ptr->now_damaged = FALSE; + creature_ptr->sutemi = false; + creature_ptr->counter = false; + creature_ptr->now_damaged = false; update_monsters(creature_ptr, FALSE); handle_stuff(creature_ptr); @@ -262,7 +262,7 @@ void process_player(player_type *creature_ptr) pack_overflow(creature_ptr); if (!command_new) - command_see = FALSE; + command_see = false; PlayerEnergy energy(creature_ptr); energy.reset_player_turn(); @@ -291,7 +291,7 @@ void process_player(player_type *creature_ptr) command_rep--; creature_ptr->redraw |= (PR_STATE); handle_stuff(creature_ptr); - msg_flag = FALSE; + msg_flag = false; prt("", 0, 0); process_command(creature_ptr); } else { @@ -300,9 +300,9 @@ void process_player(player_type *creature_ptr) creature_ptr->window_flags |= PW_MONSTER_LIST; window_stuff(creature_ptr); - can_save = TRUE; + can_save = true; request_command(creature_ptr, FALSE); - can_save = FALSE; + can_save = false; process_command(creature_ptr); } @@ -348,7 +348,7 @@ void process_player(player_type *creature_ptr) m_ptr->mflag2.reset(MFLAG2::SHOW); } else { m_ptr->mflag2.reset(MFLAG2::MARK); - m_ptr->ml = FALSE; + m_ptr->ml = false; update_monster(creature_ptr, m_idx, FALSE); if (creature_ptr->health_who == m_idx) creature_ptr->redraw |= (PR_HEALTH); @@ -369,12 +369,12 @@ void process_player(player_type *creature_ptr) } } - creature_ptr->new_mane = FALSE; + creature_ptr->new_mane = false; creature_ptr->redraw |= (PR_IMITATION); } if (creature_ptr->action == ACTION_LEARN) { - creature_ptr->new_mane = FALSE; + creature_ptr->new_mane = false; creature_ptr->redraw |= (PR_STATE); } @@ -385,7 +385,7 @@ void process_player(player_type *creature_ptr) msg_print(_("「時は動きだす…」", "You feel time flowing around you once more.")); msg_print(NULL); - creature_ptr->timewalk = FALSE; + creature_ptr->timewalk = false; creature_ptr->energy_need = ENERGY_NEED(); handle_stuff(creature_ptr); @@ -393,7 +393,7 @@ void process_player(player_type *creature_ptr) } if (!creature_ptr->playing || creature_ptr->is_dead) { - creature_ptr->timewalk = FALSE; + creature_ptr->timewalk = false; break; } diff --git a/src/core/scores.cpp b/src/core/scores.cpp index 06a99f052..9e5884a27 100644 --- a/src/core/scores.cpp +++ b/src/core/scores.cpp @@ -106,14 +106,14 @@ static int highscore_add(high_score *score) high_score the_score = (*score); /* Slide all the scores down one */ - bool done = FALSE; + bool done = false; high_score tmpscore; for (int i = slot; !done && (i < MAX_HISCORES); i++) { /* Read the old guy, note errors */ if (highscore_seek(i)) return -1; if (highscore_read(&tmpscore)) - done = TRUE; + done = true; /* Back up and dump the score we were holding */ if (highscore_seek(i)) @@ -519,35 +519,35 @@ bool check_score(player_type *current_player_ptr) if (highscore_fd < 0) { msg_print(_("スコア・ファイルが使用できません。", "Score file unavailable.")); msg_print(NULL); - return FALSE; + return false; } /* Wizard-mode pre-empts scoring */ if (current_world_ptr->noscore & 0x000F) { msg_print(_("ウィザード・モードではスコアが記録されません。", "Score not registered for wizards.")); msg_print(NULL); - return FALSE; + return false; } /* Cheaters are not scored */ if (current_world_ptr->noscore & 0xFF00) { msg_print(_("詐欺をやった人はスコアが記録されません。", "Score not registered for cheaters.")); msg_print(NULL); - return FALSE; + return false; } /* Interupted */ if (!current_world_ptr->total_winner && streq(current_player_ptr->died_from, _("強制終了", "Interrupting"))) { msg_print(_("強制終了のためスコアが記録されません。", "Score not registered due to interruption.")); msg_print(NULL); - return FALSE; + return false; } /* Quitter */ if (!current_world_ptr->total_winner && streq(current_player_ptr->died_from, _("途中終了", "Quitting"))) { msg_print(_("途中終了のためスコアが記録されません。", "Score not registered due to quitting.")); msg_print(NULL); - return FALSE; + return false; } - return TRUE; + return true; } diff --git a/src/core/show-file.cpp b/src/core/show-file.cpp index 1cd8d26a0..d5346fe4f 100644 --- a/src/core/show-file.cpp +++ b/src/core/show-file.cpp @@ -193,17 +193,17 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp msg_format(_("'%s'をオープンできません。", "Cannot open '%s'."), name); msg_print(NULL); - return TRUE; + return true; } int skey; int next = 0; int size = 0; int back = 0; - bool menu = FALSE; + bool menu = false; char buf[1024]; bool reverse = (line < 0); - while (TRUE) { + while (true) { char *str = buf; if (angband_fgets(fff, buf, sizeof(buf))) break; @@ -214,7 +214,7 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp if ((str[6] == '[') && isalpha(str[7])) { int k = str[7] - 'A'; - menu = TRUE; + menu = true; if ((str[8] == ']') && (str[9] == ' ')) { memcpy(hook[k], str + 10, 31); hook[k][31] = '\0'; @@ -243,7 +243,7 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp concptr find = NULL; concptr shower = NULL; - while (TRUE) { + while (true) { if (line >= size - rows) line = size - rows; if (line < 0) @@ -253,7 +253,7 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp angband_fclose(fff); fff = angband_fopen(path, "r"); if (!fff) - return FALSE; + return false; next = 0; } @@ -326,7 +326,7 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp #endif } - skey = inkey_special(TRUE); + skey = inkey_special(true); switch (skey) { case '?': if (strcmp(name, _("jhelpinfo.txt", "helpinfo.txt")) != 0) diff --git a/src/core/stuff-handler.cpp b/src/core/stuff-handler.cpp index a68325000..65550ea2a 100644 --- a/src/core/stuff-handler.cpp +++ b/src/core/stuff-handler.cpp @@ -56,7 +56,7 @@ bool update_player(player_type *caster_ptr) { caster_ptr->update |= PU_COMBINE | PU_REORDER; caster_ptr->window_flags |= PW_INVEN; - return TRUE; + return true; } bool redraw_player(player_type *caster_ptr) @@ -68,5 +68,5 @@ bool redraw_player(player_type *caster_ptr) caster_ptr->redraw |= PR_MANA; caster_ptr->update |= PU_COMBINE | PU_REORDER; caster_ptr->window_flags |= PW_INVEN; - return TRUE; + return true; } diff --git a/src/dungeon/dungeon-processor.cpp b/src/dungeon/dungeon-processor.cpp index cf61efd33..0622884ce 100644 --- a/src/dungeon/dungeon-processor.cpp +++ b/src/dungeon/dungeon-processor.cpp @@ -60,8 +60,8 @@ void process_dungeon(player_type *player_ptr, bool load_game) { floor_type *floor_ptr = player_ptr->current_floor_ptr; floor_ptr->base_level = floor_ptr->dun_level; - current_world_ptr->is_loading_now = FALSE; - player_ptr->leaving = FALSE; + current_world_ptr->is_loading_now = false; + player_ptr->leaving = false; command_cmd = 0; command_rep = 0; @@ -71,7 +71,7 @@ void process_dungeon(player_type *player_ptr, bool load_game) target_who = 0; player_ptr->pet_t_m_idx = 0; player_ptr->riding_t_m_idx = 0; - player_ptr->ambush_flag = FALSE; + player_ptr->ambush_flag = false; health_track(player_ptr, 0); disturb(player_ptr, TRUE, TRUE); @@ -95,13 +95,13 @@ void process_dungeon(player_type *player_ptr, bool load_game) verify_panel(player_ptr); msg_erase(); - current_world_ptr->character_xtra = TRUE; + current_world_ptr->character_xtra = true; player_ptr->window_flags |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_MONSTER | PW_OVERHEAD | PW_DUNGEON); player_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_EQUIPPY | PR_MAP); player_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS | PU_VIEW | PU_LITE | PU_MON_LITE | PU_TORCH | PU_MONSTERS | PU_DISTANCE | PU_FLOW); handle_stuff(player_ptr); - current_world_ptr->character_xtra = FALSE; + current_world_ptr->character_xtra = false; player_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS); player_ptr->update |= (PU_COMBINE | PU_REORDER); handle_stuff(player_ptr); @@ -147,14 +147,14 @@ void process_dungeon(player_type *player_ptr, bool load_game) floor_ptr->monster_level = floor_ptr->base_level; floor_ptr->object_level = floor_ptr->base_level; - current_world_ptr->is_loading_now = TRUE; + current_world_ptr->is_loading_now = true; if (player_ptr->energy_need > 0 && !player_ptr->phase_out && (floor_ptr->dun_level || player_ptr->leaving_dungeon || floor_ptr->inside_arena)) player_ptr->energy_need = 0; - player_ptr->leaving_dungeon = FALSE; + player_ptr->leaving_dungeon = false; mproc_init(floor_ptr); - while (TRUE) { + while (true) { if ((floor_ptr->m_cnt + 32 > current_world_ptr->max_m_idx) && !player_ptr->phase_out) compact_monsters(player_ptr, 64); @@ -226,8 +226,8 @@ void process_dungeon(player_type *player_ptr, bool load_game) * floor, then prepare next floor */ leave_floor(player_ptr); - reinit_wilderness = FALSE; + reinit_wilderness = false; } - write_level = TRUE; + write_level = true; } diff --git a/src/dungeon/dungeon.cpp b/src/dungeon/dungeon.cpp index 05ffdfa78..f1cf5ade6 100644 --- a/src/dungeon/dungeon.cpp +++ b/src/dungeon/dungeon.cpp @@ -56,15 +56,15 @@ DUNGEON_IDX choose_dungeon(concptr note, POSITION y, POSITION x) for (i = 1; i < current_world_ptr->max_d_idx; i++) { char buf[80]; - bool seiha = FALSE; + bool seiha = false; if (!d_info[i].maxdepth) continue; if (!max_dlv[i]) continue; if (d_info[i].final_guardian) { - if (!r_info[d_info[i].final_guardian].max_num) seiha = TRUE; + if (!r_info[d_info[i].final_guardian].max_num) seiha = true; } - else if (max_dlv[i] == d_info[i].maxdepth) seiha = TRUE; + else if (max_dlv[i] == d_info[i].maxdepth) seiha = true; sprintf(buf, _(" %c) %c%-12s : 最大 %d 階", " %c) %c%-16s : Max level %d"), 'a' + num, seiha ? '!' : ' ', d_info[i].name.c_str(), (int)max_dlv[i]); @@ -78,7 +78,7 @@ DUNGEON_IDX choose_dungeon(concptr note, POSITION y, POSITION x) } prt(format(_("どのダンジョン%sしますか:", "Which dungeon do you %s?: "), note), 0, 0); - while (TRUE) + while (true) { i = inkey(); if ((i == ESCAPE) || !num) diff --git a/src/dungeon/quest-completion-checker.cpp b/src/dungeon/quest-completion-checker.cpp index eb5b527df..c64e02f70 100644 --- a/src/dungeon/quest-completion-checker.cpp +++ b/src/dungeon/quest-completion-checker.cpp @@ -73,8 +73,8 @@ void check_quest_completion(player_type *player_ptr, monster_type *m_ptr) quest_num = i; } - bool create_stairs = FALSE; - bool reward = FALSE; + bool create_stairs = false; + bool reward = false; if (quest_num && (quest[quest_num].status == QUEST_STATUS_TAKEN)) { quest_type *const q_ptr = &quest[quest_num]; switch (q_ptr->type) { @@ -110,7 +110,7 @@ void check_quest_completion(player_type *player_ptr, monster_type *m_ptr) complete_quest(player_ptr, quest_num); if (!(q_ptr->flags & QUEST_FLAG_PRESET)) { - create_stairs = TRUE; + create_stairs = true; floor_ptr->inside_quest = 0; } @@ -118,7 +118,7 @@ void check_quest_completion(player_type *player_ptr, monster_type *m_ptr) q_ptr->status = QUEST_STATUS_FINISHED; if (q_ptr->type == QUEST_TYPE_RANDOM) { - reward = TRUE; + reward = true; q_ptr->status = QUEST_STATUS_FINISHED; } diff --git a/src/dungeon/quest-monster-placer.cpp b/src/dungeon/quest-monster-placer.cpp index 4dd7fbac5..0f1455679 100644 --- a/src/dungeon/quest-monster-placer.cpp +++ b/src/dungeon/quest-monster-placer.cpp @@ -67,7 +67,7 @@ bool place_quest_monsters(player_type *creature_ptr) } if (l == 0) - return FALSE; + return false; if (place_monster_aux(creature_ptr, 0, y, x, quest[i].r_idx, mode)) break; @@ -76,9 +76,9 @@ bool place_quest_monsters(player_type *creature_ptr) } if (k == SAFE_MAX_ATTEMPTS) - return FALSE; + return false; } } - return TRUE; + return true; } diff --git a/src/dungeon/quest.cpp b/src/dungeon/quest.cpp index badd57fdf..e652b70ea 100644 --- a/src/dungeon/quest.cpp +++ b/src/dungeon/quest.cpp @@ -62,7 +62,7 @@ void determine_random_questor(player_type *player_ptr, quest_type *q_ptr) get_mon_num_prep(player_ptr, mon_hook_quest, NULL); MONRACE_IDX r_idx; - while (TRUE) { + while (true) { /* * Random monster 5 - 10 levels out of depth * (depending on level) @@ -341,5 +341,5 @@ void do_cmd_quest(player_type *player_ptr) player_ptr->current_floor_ptr->dun_level = 1; player_ptr->current_floor_ptr->inside_quest = player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x].special; - player_ptr->leaving = TRUE; + player_ptr->leaving = true; } diff --git a/src/effect/effect-feature.cpp b/src/effect/effect-feature.cpp index f38c05366..98a724ca9 100644 --- a/src/effect/effect-feature.cpp +++ b/src/effect/effect-feature.cpp @@ -68,7 +68,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI grid_type *g_ptr = &floor_ptr->grid_array[y][x]; feature_type *f_ptr = &f_info[g_ptr->feat]; - bool obvious = FALSE; + bool obvious = false; bool known = player_has_los_bold(caster_ptr, y, x); who = who ? who : 0; @@ -124,7 +124,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI /* Observe */ if (g_ptr->info & (CAVE_MARK)) - obvious = TRUE; + obvious = true; } } @@ -167,14 +167,14 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI if (is_hidden_door(caster_ptr, g_ptr)) { disclose_grid(caster_ptr, y, x); if (known) { - obvious = TRUE; + obvious = true; } } if (is_trap(caster_ptr, g_ptr->feat)) { if (known) { msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!")); - obvious = TRUE; + obvious = true; } cave_alter_feat(caster_ptr, y, x, FF_DISARM); @@ -185,7 +185,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI cave_alter_feat(caster_ptr, y, x, FF_DISARM); if (known && (old_feat != g_ptr->feat)) { msg_print(_("カチッと音がした！", "Click!")); - obvious = TRUE; + obvious = true; } } @@ -194,14 +194,14 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI g_ptr->info &= ~(CAVE_UNSAFE); lite_spot(caster_ptr, y, x); - obvious = TRUE; + obvious = true; break; } case GF_KILL_DOOR: { if (is_trap(caster_ptr, g_ptr->feat) || has_flag(f_ptr->flags, FF_DOOR)) { if (known) { msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!")); - obvious = TRUE; + obvious = true; } cave_alter_feat(caster_ptr, y, x, FF_TUNNEL); @@ -212,7 +212,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI g_ptr->info &= ~(CAVE_UNSAFE); lite_spot(caster_ptr, y, x); - obvious = TRUE; + obvious = true; break; } case GF_JAM_DOOR: { @@ -232,7 +232,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI break; msg_format(_("%sに何かがつっかえて開かなくなった。", "The %s seems stuck."), mimic_f_ptr->name.c_str()); - obvious = TRUE; + obvious = true; break; } case GF_KILL_WALL: { @@ -241,7 +241,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI if (known && (g_ptr->info & (CAVE_MARK))) { msg_format(_("%sが溶けて泥になった！", "The %s turns into mud!"), f_info[get_feat_mimic(g_ptr)].name.c_str()); - obvious = TRUE; + obvious = true; } cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK); @@ -255,7 +255,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI break; cave_set_feat(caster_ptr, y, x, feat_door[DOOR_DOOR].closed); if (g_ptr->info & (CAVE_MARK)) - obvious = TRUE; + obvious = true; break; } case GF_MAKE_TRAP: { @@ -269,7 +269,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI break; cave_set_feat(caster_ptr, y, x, feat_tree); if (g_ptr->info & (CAVE_MARK)) - obvious = TRUE; + obvious = true; break; } case GF_MAKE_RUNE_PROTECTION: { @@ -326,7 +326,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI update_local_illumination(caster_ptr, y, x); if (player_can_see_bold(caster_ptr, y, x)) - obvious = TRUE; + obvious = true; if (g_ptr->m_idx) update_monster(caster_ptr, g_ptr->m_idx, FALSE); @@ -354,7 +354,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI grid_type *cc_ptr = &floor_ptr->grid_array[by][bx]; if (has_flag(f_info[get_feat_mimic(cc_ptr)].flags, FF_GLOW)) { - do_dark = FALSE; + do_dark = false; break; } } @@ -377,7 +377,7 @@ bool affect_feature(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITI update_local_illumination(caster_ptr, y, x); if (player_can_see_bold(caster_ptr, y, x)) - obvious = TRUE; + obvious = true; if (g_ptr->m_idx) update_monster(caster_ptr, g_ptr->m_idx, FALSE); diff --git a/src/effect/effect-item.cpp b/src/effect/effect-item.cpp index 4f1053918..8a3d22239 100644 --- a/src/effect/effect-item.cpp +++ b/src/effect/effect-item.cpp @@ -44,7 +44,7 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION { grid_type *g_ptr = &caster_ptr->current_floor_ptr->grid_array[y][x]; - bool is_item_affected = FALSE; + bool is_item_affected = false; bool known = player_has_los_bold(caster_ptr, y, x); who = who ? who : 0; dam = (dam + r) / (r + 1); @@ -58,8 +58,8 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION processed_list.insert(this_o_idx); object_type *o_ptr = &caster_ptr->current_floor_ptr->o_list[this_o_idx]; - bool ignore = FALSE; - bool do_kill = FALSE; + bool ignore = false; + bool do_kill = false; concptr note_kill = NULL; #ifdef JP @@ -72,30 +72,30 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION switch (typ) { case GF_ACID: { if (hates_acid(o_ptr)) { - do_kill = TRUE; + do_kill = true; note_kill = _("融けてしまった！", (plural ? " melt!" : " melts!")); if (has_flag(flags, TR_IGNORE_ACID)) - ignore = TRUE; + ignore = true; } break; } case GF_ELEC: { if (hates_elec(o_ptr)) { - do_kill = TRUE; + do_kill = true; note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!")); if (has_flag(flags, TR_IGNORE_ELEC)) - ignore = TRUE; + ignore = true; } break; } case GF_FIRE: { if (hates_fire(o_ptr)) { - do_kill = TRUE; + do_kill = true; note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!")); if (has_flag(flags, TR_IGNORE_FIRE)) - ignore = TRUE; + ignore = true; } break; @@ -103,45 +103,45 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION case GF_COLD: { if (hates_cold(o_ptr)) { note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!")); - do_kill = TRUE; + do_kill = true; if (has_flag(flags, TR_IGNORE_COLD)) - ignore = TRUE; + ignore = true; } break; } case GF_PLASMA: { if (hates_fire(o_ptr)) { - do_kill = TRUE; + do_kill = true; note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!")); if (has_flag(flags, TR_IGNORE_FIRE)) - ignore = TRUE; + ignore = true; } if (hates_elec(o_ptr)) { - ignore = FALSE; - do_kill = TRUE; + ignore = false; + do_kill = true; note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!")); if (has_flag(flags, TR_IGNORE_ELEC)) - ignore = TRUE; + ignore = true; } break; } case GF_METEOR: { if (hates_fire(o_ptr)) { - do_kill = TRUE; + do_kill = true; note_kill = _("燃えてしまった！", (plural ? " burn up!" : " burns up!")); if (has_flag(flags, TR_IGNORE_FIRE)) - ignore = TRUE; + ignore = true; } if (hates_cold(o_ptr)) { - ignore = FALSE; - do_kill = TRUE; + ignore = false; + do_kill = true; note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!")); if (has_flag(flags, TR_IGNORE_COLD)) - ignore = TRUE; + ignore = true; } break; @@ -152,7 +152,7 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION case GF_SOUND: { if (hates_cold(o_ptr)) { note_kill = _("砕け散ってしまった！", (plural ? " shatter!" : " shatters!")); - do_kill = TRUE; + do_kill = true; } break; @@ -160,35 +160,35 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION case GF_MANA: case GF_SEEKER: case GF_SUPER_RAY: { - do_kill = TRUE; + do_kill = true; note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!")); break; } case GF_DISINTEGRATE: { - do_kill = TRUE; + do_kill = true; note_kill = _("蒸発してしまった！", (plural ? " evaporate!" : " evaporates!")); break; } case GF_CHAOS: { - do_kill = TRUE; + do_kill = true; note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!")); if (has_flag(flags, TR_RES_CHAOS)) - ignore = TRUE; + ignore = true; else if ((o_ptr->tval == TV_SCROLL) && (o_ptr->sval == SV_SCROLL_CHAOS)) - ignore = TRUE; + ignore = true; break; } case GF_HOLY_FIRE: case GF_HELL_FIRE: { if (object_is_cursed(o_ptr)) { - do_kill = TRUE; + do_kill = true; note_kill = _("壊れてしまった！", (plural ? " are destroyed!" : " is destroyed!")); } break; } case GF_VOID: { - do_kill = TRUE; + do_kill = true; note_kill = _("消滅してしまった！", (plural ? " vanish!" : " vanishes!")); break; } @@ -208,7 +208,7 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION object_known(o_ptr); if (known && (o_ptr->marked & OM_FOUND)) { msg_print(_("カチッと音がした！", "Click!")); - is_item_affected = TRUE; + is_item_affected = true; } break; @@ -235,8 +235,8 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION } } - do_kill = TRUE; - is_item_affected = TRUE; + do_kill = true; + is_item_affected = true; break; } } @@ -246,7 +246,7 @@ bool affect_item(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION GAME_TEXT o_name[MAX_NLEN]; if (known && (o_ptr->marked & OM_FOUND)) { - is_item_affected = TRUE; + is_item_affected = true; describe_flavor(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); } diff --git a/src/effect/effect-monster-charm.cpp b/src/effect/effect-monster-charm.cpp index fcfc40584..b4743842c 100644 --- a/src/effect/effect-monster-charm.cpp +++ b/src/effect/effect-monster-charm.cpp @@ -33,7 +33,7 @@ static void effect_monster_charm_resist(player_type *caster_ptr, effect_monster_ { if (common_saving_throw_charm(caster_ptr, em_ptr->dam, em_ptr->m_ptr)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; if (one_in_(4)) em_ptr->m_ptr->mflag2.set(MFLAG2::NOPET); @@ -64,7 +64,7 @@ process_result effect_monster_charm(player_type *caster_ptr, effect_monster_type } if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; effect_monster_charm_resist(caster_ptr, em_ptr); em_ptr->dam = 0; @@ -74,7 +74,7 @@ process_result effect_monster_charm(player_type *caster_ptr, effect_monster_type process_result effect_monster_control_undead(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; int vir = virtue_number(caster_ptr, V_UNLIFE); if (vir) { @@ -88,7 +88,7 @@ process_result effect_monster_control_undead(player_type *caster_ptr, effect_mon if (common_saving_throw_control(caster_ptr, em_ptr->dam, em_ptr->m_ptr) || !(em_ptr->r_ptr->flags3 & RF3_UNDEAD)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; if (one_in_(4)) em_ptr->m_ptr->mflag2.set(MFLAG2::NOPET); } else if (has_aggravate(caster_ptr)) { @@ -107,7 +107,7 @@ process_result effect_monster_control_undead(player_type *caster_ptr, effect_mon process_result effect_monster_control_demon(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; int vir = virtue_number(caster_ptr, V_UNLIFE); if (vir) { @@ -121,7 +121,7 @@ process_result effect_monster_control_demon(player_type *caster_ptr, effect_mons if (common_saving_throw_control(caster_ptr, em_ptr->dam, em_ptr->m_ptr) || !(em_ptr->r_ptr->flags3 & RF3_DEMON)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; if (one_in_(4)) em_ptr->m_ptr->mflag2.set(MFLAG2::NOPET); } else if (has_aggravate(caster_ptr)) { @@ -140,7 +140,7 @@ process_result effect_monster_control_demon(player_type *caster_ptr, effect_mons process_result effect_monster_control_animal(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; int vir = virtue_number(caster_ptr, V_NATURE); if (vir) { @@ -154,7 +154,7 @@ process_result effect_monster_control_animal(player_type *caster_ptr, effect_mon if (common_saving_throw_control(caster_ptr, em_ptr->dam, em_ptr->m_ptr) || !(em_ptr->r_ptr->flags3 & RF3_ANIMAL)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; if (one_in_(4)) em_ptr->m_ptr->mflag2.set(MFLAG2::NOPET); } else if (has_aggravate(caster_ptr)) { @@ -176,7 +176,7 @@ process_result effect_monster_charm_living(player_type *caster_ptr, effect_monst { int vir = virtue_number(caster_ptr, V_UNLIFE); if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; vir = virtue_number(caster_ptr, V_UNLIFE); if (vir) { @@ -192,7 +192,7 @@ process_result effect_monster_charm_living(player_type *caster_ptr, effect_monst if (common_saving_throw_charm(caster_ptr, em_ptr->dam, em_ptr->m_ptr) || !monster_living(em_ptr->m_ptr->r_idx)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; if (one_in_(4)) em_ptr->m_ptr->mflag2.set(MFLAG2::NOPET); } else if (has_aggravate(caster_ptr)) { @@ -234,7 +234,7 @@ static void effect_monster_domination_corrupted(player_type *caster_ptr, effect_ bool is_corrupted = ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD | RF3_DEMON)) != 0) && (em_ptr->r_ptr->level > caster_ptr->lev / 2) && (one_in_(2)); if (!is_corrupted) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; return; } @@ -270,7 +270,7 @@ process_result effect_monster_domination(player_type *caster_ptr, effect_monster return PROCESS_CONTINUE; if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (em_ptr->r_ptr->flags3 & RF3_NO_CONF) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { @@ -298,7 +298,7 @@ process_result effect_monster_domination(player_type *caster_ptr, effect_monster static bool effect_monster_crusade_domination(player_type *caster_ptr, effect_monster_type *em_ptr) { if (((em_ptr->r_ptr->flags3 & RF3_GOOD) == 0) || caster_ptr->current_floor_ptr->inside_arena) - return FALSE; + return false; if (em_ptr->r_ptr->flags3 & RF3_NO_CONF) em_ptr->dam -= 50; @@ -308,7 +308,7 @@ static bool effect_monster_crusade_domination(player_type *caster_ptr, effect_mo if (is_pet(em_ptr->m_ptr)) { em_ptr->note = _("の動きが速くなった。", " starts moving faster."); (void)set_monster_fast(caster_ptr, em_ptr->g_ptr->m_idx, monster_fast_remaining(em_ptr->m_ptr) + 100); - return TRUE; + return true; } if ((em_ptr->r_ptr->flags1 & RF1_QUESTOR) || (em_ptr->r_ptr->flags1 & RF1_UNIQUE) || em_ptr->m_ptr->mflag2.has(MFLAG2::NOPET) || has_aggravate(caster_ptr) @@ -316,7 +316,7 @@ static bool effect_monster_crusade_domination(player_type *caster_ptr, effect_mo if (one_in_(4)) em_ptr->m_ptr->mflag2.set(MFLAG2::NOPET); - return FALSE; + return false; } em_ptr->note = _("を支配した。", " is tamed!"); @@ -325,13 +325,13 @@ static bool effect_monster_crusade_domination(player_type *caster_ptr, effect_mo if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= RF3_GOOD; - return TRUE; + return true; } process_result effect_monster_crusade(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; bool success = effect_monster_crusade_domination(caster_ptr, em_ptr); if (success) { em_ptr->dam = 0; @@ -401,7 +401,7 @@ process_result effect_monster_capture(player_type *caster_ptr, effect_monster_ty || any_bits(em_ptr->r_ptr->flags1, RF1_UNIQUE | RF1_QUESTOR) || any_bits(em_ptr->r_ptr->flags7, RF7_NAZGUL | RF7_UNIQUE2) || em_ptr->m_ptr->parent_m_idx) { msg_format(_("%sには効果がなかった。", "%s is unaffected."), em_ptr->m_name); - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } @@ -411,7 +411,7 @@ process_result effect_monster_capture(player_type *caster_ptr, effect_monster_ty if (threshold_hp < 2 || em_ptr->m_ptr->hp >= capturable_hp) { msg_format(_("もっと弱らせないと。", "You need to weaken %s more."), em_ptr->m_name); - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } @@ -421,6 +421,6 @@ process_result effect_monster_capture(player_type *caster_ptr, effect_monster_ty } msg_format(_("うまく捕まえられなかった。", "You failed to capture %s."), em_ptr->m_name); - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } diff --git a/src/effect/effect-monster-curse.cpp b/src/effect/effect-monster-curse.cpp index bd4b0b3b8..51796ebd5 100644 --- a/src/effect/effect-monster-curse.cpp +++ b/src/effect/effect-monster-curse.cpp @@ -8,7 +8,7 @@ process_result effect_monster_curse_1(effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (!em_ptr->who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), em_ptr->m_name); if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35)) { @@ -22,7 +22,7 @@ process_result effect_monster_curse_1(effect_monster_type *em_ptr) process_result effect_monster_curse_2(effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (!em_ptr->who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), em_ptr->m_name); if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35)) @@ -37,7 +37,7 @@ process_result effect_monster_curse_2(effect_monster_type *em_ptr) process_result effect_monster_curse_3(effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (!em_ptr->who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた！", "You point at %s, incanting terribly!"), em_ptr->m_name); if (randint0(100 + (em_ptr->caster_lev / 2)) < (em_ptr->r_ptr->level + 35)) @@ -52,7 +52,7 @@ process_result effect_monster_curse_3(effect_monster_type *em_ptr) process_result effect_monster_curse_4(effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (!em_ptr->who) msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", "You point at %s, screaming the word, 'DIE!'."), em_ptr->m_name); diff --git a/src/effect/effect-monster-evil.cpp b/src/effect/effect-monster-evil.cpp index 025f73a70..2ee5e1ecd 100644 --- a/src/effect/effect-monster-evil.cpp +++ b/src/effect/effect-monster-evil.cpp @@ -12,23 +12,23 @@ static bool effect_monster_away_resist(player_type *caster_ptr, effect_monster_type *em_ptr) { - if ((em_ptr->r_ptr->flagsr & RFR_RES_TELE) == 0) return FALSE; + if ((em_ptr->r_ptr->flagsr & RFR_RES_TELE) == 0) return false; if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->flagsr & RFR_RES_ALL)) { if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE; em_ptr->note = _("には効果がなかった。", " is unaffected."); - return TRUE; + return true; } if (em_ptr->r_ptr->level > randint1(100)) { if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE; em_ptr->note = _("には耐性がある！", " resists!"); - return TRUE; + return true; } - return FALSE; + return false; } @@ -36,7 +36,7 @@ process_result effect_monster_away_undead(player_type *caster_ptr, effect_monste { if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } @@ -44,7 +44,7 @@ process_result effect_monster_away_undead(player_type *caster_ptr, effect_monste bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr); if (!resists_tele) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD); @@ -60,7 +60,7 @@ process_result effect_monster_away_evil(player_type *caster_ptr, effect_monster_ { if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } @@ -68,7 +68,7 @@ process_result effect_monster_away_evil(player_type *caster_ptr, effect_monster_ bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr); if (!resists_tele) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_EVIL); @@ -85,7 +85,7 @@ process_result effect_monster_away_all(player_type *caster_ptr, effect_monster_t bool resists_tele = effect_monster_away_resist(caster_ptr, em_ptr); if (!resists_tele) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; em_ptr->do_dist = em_ptr->dam; } @@ -99,12 +99,12 @@ process_result effect_monster_turn_undead(player_type *caster_ptr, effect_monste { if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD); @@ -112,7 +112,7 @@ process_result effect_monster_turn_undead(player_type *caster_ptr, effect_monste if (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->do_fear = 0; } @@ -125,12 +125,12 @@ process_result effect_monster_turn_evil(player_type *caster_ptr, effect_monster_ { if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_EVIL); @@ -138,7 +138,7 @@ process_result effect_monster_turn_evil(player_type *caster_ptr, effect_monster_ if (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->do_fear = 0; } @@ -149,7 +149,7 @@ process_result effect_monster_turn_evil(player_type *caster_ptr, effect_monster_ process_result effect_monster_turn_all(effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; em_ptr->do_fear = damroll(3, (em_ptr->dam / 2)) + 1; if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || @@ -157,7 +157,7 @@ process_result effect_monster_turn_all(effect_monster_type *em_ptr) (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->do_fear = 0; } @@ -170,12 +170,12 @@ process_result effect_monster_disp_undead(player_type *caster_ptr, effect_monste { if ((em_ptr->r_ptr->flags3 & (RF3_UNDEAD)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_UNDEAD); @@ -190,12 +190,12 @@ process_result effect_monster_disp_evil(player_type *caster_ptr, effect_monster_ { if ((em_ptr->r_ptr->flags3 & (RF3_EVIL)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_EVIL); @@ -209,12 +209,12 @@ process_result effect_monster_disp_good(player_type *caster_ptr, effect_monster_ { if ((em_ptr->r_ptr->flags3 & (RF3_GOOD)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_GOOD); @@ -228,12 +228,12 @@ process_result effect_monster_disp_living(effect_monster_type *em_ptr) { if (!monster_living(em_ptr->m_ptr->r_idx)) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; em_ptr->note = _("は身震いした。", " shudders."); em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!"); @@ -245,12 +245,12 @@ process_result effect_monster_disp_demon(player_type *caster_ptr, effect_monster { if ((em_ptr->r_ptr->flags3 & (RF3_DEMON)) == 0) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_DEMON); @@ -262,7 +262,7 @@ process_result effect_monster_disp_demon(player_type *caster_ptr, effect_monster process_result effect_monster_disp_all(effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; em_ptr->note = _("は身震いした。", " shudders."); em_ptr->note_dies = _("はドロドロに溶けた！", " dissolves!"); diff --git a/src/effect/effect-monster-lite-dark.cpp b/src/effect/effect-monster-lite-dark.cpp index f8e365ee2..7fe11de3a 100644 --- a/src/effect/effect-monster-lite-dark.cpp +++ b/src/effect/effect-monster-lite-dark.cpp @@ -11,7 +11,7 @@ process_result effect_monster_lite_weak(player_type *caster_ptr, effect_monster_ { if (!em_ptr->dam) { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } @@ -21,7 +21,7 @@ process_result effect_monster_lite_weak(player_type *caster_ptr, effect_monster_ return PROCESS_CONTINUE; } - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_HURT_LITE); @@ -34,7 +34,7 @@ process_result effect_monster_lite_weak(player_type *caster_ptr, effect_monster_ process_result effect_monster_lite(player_type *caster_ptr, effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if (em_ptr->r_ptr->flagsr & RFR_RES_LITE) { @@ -59,7 +59,7 @@ process_result effect_monster_lite(player_type *caster_ptr, effect_monster_type process_result effect_monster_dark(player_type *caster_ptr, effect_monster_type *em_ptr) { - if (em_ptr->seen) em_ptr->obvious = TRUE; + if (em_ptr->seen) em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_DARK) == 0) return PROCESS_CONTINUE; diff --git a/src/effect/effect-monster-oldies.cpp b/src/effect/effect-monster-oldies.cpp index a55a77583..2104e8b4a 100644 --- a/src/effect/effect-monster-oldies.cpp +++ b/src/effect/effect-monster-oldies.cpp @@ -22,14 +22,14 @@ process_result effect_monster_old_poly(effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; - em_ptr->do_polymorph = TRUE; + em_ptr->obvious = true; + em_ptr->do_polymorph = true; if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) || (em_ptr->r_ptr->flags1 & RF1_QUESTOR) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->do_polymorph = FALSE; - em_ptr->obvious = FALSE; + em_ptr->do_polymorph = false; + em_ptr->obvious = false; } em_ptr->dam = 0; @@ -39,7 +39,7 @@ process_result effect_monster_old_poly(effect_monster_type *em_ptr) process_result effect_monster_old_clone(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((caster_ptr->current_floor_ptr->inside_arena) || is_pet(em_ptr->m_ptr) || (em_ptr->r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (em_ptr->r_ptr->flags7 & (RF7_NAZGUL | RF7_UNIQUE2))) { @@ -59,7 +59,7 @@ process_result effect_monster_old_clone(player_type *caster_ptr, effect_monster_ process_result effect_monster_star_heal(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; (void)set_monster_csleep(caster_ptr, em_ptr->g_ptr->m_idx, 0); @@ -135,7 +135,7 @@ static void effect_monster_old_heal_recovery(player_type *caster_ptr, effect_mon process_result effect_monster_old_heal(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; /* Wake up */ (void)set_monster_csleep(caster_ptr, em_ptr->g_ptr->m_idx, 0); @@ -147,7 +147,7 @@ process_result effect_monster_old_heal(player_type *caster_ptr, effect_monster_t effect_monster_old_heal_check_player(caster_ptr, em_ptr); if (em_ptr->m_ptr->r_idx == MON_LEPER) { - em_ptr->heal_leper = TRUE; + em_ptr->heal_leper = true; if (!em_ptr->who) chg_virtue(caster_ptr, V_COMPASSION, 5); } @@ -165,7 +165,7 @@ process_result effect_monster_old_heal(player_type *caster_ptr, effect_monster_t process_result effect_monster_old_speed(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (set_monster_fast(caster_ptr, em_ptr->g_ptr->m_idx, monster_fast_remaining(em_ptr->m_ptr) + 100)) { em_ptr->note = _("の動きが速くなった。", " starts moving faster."); @@ -185,12 +185,12 @@ process_result effect_monster_old_speed(player_type *caster_ptr, effect_monster_ process_result effect_monster_old_slow(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; /* Powerful monsters can resist */ if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->dam = 0; return PROCESS_CONTINUE; } @@ -209,7 +209,7 @@ process_result effect_monster_old_slow(player_type *caster_ptr, effect_monster_t process_result effect_monster_old_sleep(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) || (em_ptr->r_ptr->flags3 & RF3_NO_SLEEP) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { @@ -219,7 +219,7 @@ process_result effect_monster_old_sleep(player_type *caster_ptr, effect_monster_ } em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; } else { em_ptr->note = _("は眠り込んでしまった！", " falls asleep!"); em_ptr->do_sleep = 500; @@ -236,7 +236,7 @@ process_result effect_monster_old_sleep(player_type *caster_ptr, effect_monster_ process_result effect_monster_old_conf(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; em_ptr->do_conf = damroll(3, (em_ptr->dam / 2)) + 1; if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->flags3 & (RF3_NO_CONF)) @@ -248,7 +248,7 @@ process_result effect_monster_old_conf(player_type *caster_ptr, effect_monster_t em_ptr->do_conf = 0; em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; } em_ptr->dam = 0; @@ -258,7 +258,7 @@ process_result effect_monster_old_conf(player_type *caster_ptr, effect_monster_t process_result effect_monster_stasis(effect_monster_type *em_ptr, bool to_evil) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; int stasis_damage = (em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10); bool has_resistance = (em_ptr->r_ptr->flags1 & RF1_UNIQUE) != 0; @@ -268,7 +268,7 @@ process_result effect_monster_stasis(effect_monster_type *em_ptr, bool to_evil) if (has_resistance) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; } else { em_ptr->note = _("は動けなくなった！", " is suspended!"); em_ptr->do_sleep = 500; @@ -281,13 +281,13 @@ process_result effect_monster_stasis(effect_monster_type *em_ptr, bool to_evil) process_result effect_monster_stun(effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; em_ptr->do_stun = damroll((em_ptr->caster_lev / 20) + 3, (em_ptr->dam)) + 1; if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { em_ptr->do_stun = 0; em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; } em_ptr->dam = 0; diff --git a/src/effect/effect-monster-psi.cpp b/src/effect/effect-monster-psi.cpp index 06c4bd812..3acb7ee1a 100644 --- a/src/effect/effect-monster-psi.cpp +++ b/src/effect/effect-monster-psi.cpp @@ -30,14 +30,14 @@ static bool resisted_psi_because_empty_mind(player_type *caster_ptr, effect_monster_type *em_ptr) { if (none_bits(em_ptr->r_ptr->flags2, RF2_EMPTY_MIND)) - return FALSE; + return false; em_ptr->dam = 0; em_ptr->note = _("には完全な耐性がある！", " is immune."); if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) set_bits(em_ptr->r_ptr->r_flags2, RF2_EMPTY_MIND); - return TRUE; + return true; } /*! @@ -55,11 +55,11 @@ static bool resisted_psi_because_weird_mind_or_powerful(effect_monster_type *em_ bool has_resistance = any_bits(em_ptr->r_ptr->flags2, RF2_STUPID | RF2_WEIRD_MIND) || any_bits(em_ptr->r_ptr->flags3, RF3_ANIMAL) || (em_ptr->r_ptr->level > randint1(3 * em_ptr->dam)); if (!has_resistance) - return FALSE; + return false; em_ptr->note = _("には耐性がある！", " resists!"); em_ptr->dam /= 3; - return TRUE; + return true; } /*! @@ -76,13 +76,13 @@ static bool reflects_psi_with_currupted_mind(player_type *caster_ptr, effect_mon { bool is_corrupted = any_bits(em_ptr->r_ptr->flags3, RF3_UNDEAD | RF3_DEMON) && (em_ptr->r_ptr->level > caster_ptr->lev / 2) && one_in_(2); if (!is_corrupted) - return FALSE; + return false; em_ptr->note = NULL; msg_format(_("%^sの堕落した精神は攻撃を跳ね返した！", (em_ptr->seen ? "%^s's corrupted mind backlashes your attack!" : "%^ss corrupted mind backlashes your attack!")), em_ptr->m_name); - return TRUE; + return true; } /*! @@ -193,12 +193,12 @@ static void effect_monster_psi_extra_effect(effect_monster_type *em_ptr) process_result effect_monster_psi(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (!(los(caster_ptr, em_ptr->m_ptr->fy, em_ptr->m_ptr->fx, caster_ptr->y, caster_ptr->x))) { if (em_ptr->seen_msg) msg_format(_("%sはあなたが見えないので影響されない！", "%^s can't see you, and isn't affected!"), em_ptr->m_name); - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } @@ -278,7 +278,7 @@ static void effect_monster_psi_drain_change_power(player_type *caster_ptr, effec process_result effect_monster_psi_drain(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; effect_monster_psi_drain_resist(caster_ptr, em_ptr); if (em_ptr->dam > 0) @@ -299,7 +299,7 @@ process_result effect_monster_psi_drain(player_type *caster_ptr, effect_monster_ process_result effect_monster_telekinesis(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (one_in_(4)) { if (caster_ptr->riding && (em_ptr->g_ptr->m_idx == caster_ptr->riding)) em_ptr->do_dist = 0; @@ -310,7 +310,7 @@ process_result effect_monster_telekinesis(player_type *caster_ptr, effect_monste em_ptr->do_stun = damroll((em_ptr->caster_lev / 20) + 3, em_ptr->dam) + 1; if (any_bits(em_ptr->r_ptr->flags1, RF1_UNIQUE) || (em_ptr->r_ptr->level > 5 + randint1(em_ptr->dam))) { em_ptr->do_stun = 0; - em_ptr->obvious = FALSE; + em_ptr->obvious = false; } return PROCESS_CONTINUE; diff --git a/src/effect/effect-monster-resist-hurt.cpp b/src/effect/effect-monster-resist-hurt.cpp index 580721ebd..e28e1d571 100644 --- a/src/effect/effect-monster-resist-hurt.cpp +++ b/src/effect/effect-monster-resist-hurt.cpp @@ -24,7 +24,7 @@ process_result effect_monster_nothing(effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; return PROCESS_CONTINUE; } @@ -32,7 +32,7 @@ process_result effect_monster_nothing(effect_monster_type *em_ptr) process_result effect_monster_acid(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_IM_ACID) == 0) return PROCESS_CONTINUE; @@ -48,7 +48,7 @@ process_result effect_monster_acid(player_type *caster_ptr, effect_monster_type process_result effect_monster_elec(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_IM_ELEC) == 0) return PROCESS_CONTINUE; @@ -64,7 +64,7 @@ process_result effect_monster_elec(player_type *caster_ptr, effect_monster_type process_result effect_monster_fire(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (em_ptr->r_ptr->flagsr & RFR_IM_FIRE) { em_ptr->note = _("にはかなり耐性がある！", " resists a lot."); @@ -89,7 +89,7 @@ process_result effect_monster_fire(player_type *caster_ptr, effect_monster_type process_result effect_monster_cold(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (em_ptr->r_ptr->flagsr & RFR_IM_COLD) { em_ptr->note = _("にはかなり耐性がある！", " resists a lot."); @@ -114,7 +114,7 @@ process_result effect_monster_cold(player_type *caster_ptr, effect_monster_type process_result effect_monster_pois(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_IM_POIS) == 0) return PROCESS_CONTINUE; @@ -130,7 +130,7 @@ process_result effect_monster_pois(player_type *caster_ptr, effect_monster_type process_result effect_monster_nuke(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (em_ptr->r_ptr->flagsr & RFR_IM_POIS) { em_ptr->note = _("には耐性がある。", " resists."); @@ -143,7 +143,7 @@ process_result effect_monster_nuke(player_type *caster_ptr, effect_monster_type } if (one_in_(3)) - em_ptr->do_polymorph = TRUE; + em_ptr->do_polymorph = true; return PROCESS_CONTINUE; } @@ -151,7 +151,7 @@ process_result effect_monster_nuke(player_type *caster_ptr, effect_monster_type process_result effect_monster_hell_fire(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flags3 & RF3_GOOD) == 0) return PROCESS_CONTINUE; @@ -167,7 +167,7 @@ process_result effect_monster_hell_fire(player_type *caster_ptr, effect_monster_ process_result effect_monster_holy_fire(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (any_bits(em_ptr->r_ptr->flags3, RF3_GOOD)) { em_ptr->note = _("には完全な耐性がある！", " is immune."); @@ -195,7 +195,7 @@ process_result effect_monster_holy_fire(player_type *caster_ptr, effect_monster_ process_result effect_monster_plasma(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_PLAS) == 0) return PROCESS_CONTINUE; @@ -212,7 +212,7 @@ process_result effect_monster_plasma(player_type *caster_ptr, effect_monster_typ static bool effect_monster_nether_resist(player_type *caster_ptr, effect_monster_type *em_ptr) { if ((em_ptr->r_ptr->flagsr & RFR_RES_NETH) == 0) - return FALSE; + return false; if (em_ptr->r_ptr->flags3 & RF3_UNDEAD) { em_ptr->note = _("には完全な耐性がある！", " is immune."); @@ -228,13 +228,13 @@ static bool effect_monster_nether_resist(player_type *caster_ptr, effect_monster if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= (RFR_RES_NETH); - return TRUE; + return true; } process_result effect_monster_nether(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (effect_monster_nether_resist(caster_ptr, em_ptr) || ((em_ptr->r_ptr->flags3 & RF3_EVIL) == 0)) return PROCESS_CONTINUE; @@ -250,7 +250,7 @@ process_result effect_monster_nether(player_type *caster_ptr, effect_monster_typ process_result effect_monster_water(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_WATE) == 0) return PROCESS_CONTINUE; @@ -273,7 +273,7 @@ process_result effect_monster_water(player_type *caster_ptr, effect_monster_type process_result effect_monster_chaos(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (em_ptr->r_ptr->flagsr & RFR_RES_CHAO) { em_ptr->note = _("には耐性がある。", " resists."); @@ -288,7 +288,7 @@ process_result effect_monster_chaos(player_type *caster_ptr, effect_monster_type if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_DEMON); } else { - em_ptr->do_polymorph = TRUE; + em_ptr->do_polymorph = true; em_ptr->do_conf = (5 + randint1(11) + em_ptr->r) / (em_ptr->r + 1); } @@ -298,7 +298,7 @@ process_result effect_monster_chaos(player_type *caster_ptr, effect_monster_type process_result effect_monster_shards(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_SHAR) == 0) return PROCESS_CONTINUE; @@ -315,7 +315,7 @@ process_result effect_monster_shards(player_type *caster_ptr, effect_monster_typ process_result effect_monster_rocket(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_SHAR) == 0) return PROCESS_CONTINUE; @@ -331,7 +331,7 @@ process_result effect_monster_rocket(player_type *caster_ptr, effect_monster_typ process_result effect_monster_sound(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_SOUN) == 0) { em_ptr->do_stun = (10 + randint1(15) + em_ptr->r) / (em_ptr->r + 1); @@ -350,7 +350,7 @@ process_result effect_monster_sound(player_type *caster_ptr, effect_monster_type process_result effect_monster_confusion(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flags3 & RF3_NO_CONF) == 0) { em_ptr->do_conf = (10 + randint1(15) + em_ptr->r) / (em_ptr->r + 1); @@ -369,7 +369,7 @@ process_result effect_monster_confusion(player_type *caster_ptr, effect_monster_ process_result effect_monster_disenchant(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_DISE) == 0) return PROCESS_CONTINUE; @@ -386,7 +386,7 @@ process_result effect_monster_disenchant(player_type *caster_ptr, effect_monster process_result effect_monster_nexus(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_NEXU) == 0) return PROCESS_CONTINUE; @@ -403,7 +403,7 @@ process_result effect_monster_nexus(player_type *caster_ptr, effect_monster_type process_result effect_monster_force(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_WALL) == 0) { em_ptr->do_stun = (randint1(15) + em_ptr->r) / (em_ptr->r + 1); @@ -423,7 +423,7 @@ process_result effect_monster_force(player_type *caster_ptr, effect_monster_type process_result effect_monster_inertial(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (em_ptr->r_ptr->flagsr & RFR_RES_INER) { em_ptr->note = _("には耐性がある。", " resists."); @@ -436,7 +436,7 @@ process_result effect_monster_inertial(player_type *caster_ptr, effect_monster_t } if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { - em_ptr->obvious = FALSE; + em_ptr->obvious = false; return PROCESS_CONTINUE; } @@ -449,7 +449,7 @@ process_result effect_monster_inertial(player_type *caster_ptr, effect_monster_t process_result effect_monster_time(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_TIME) == 0) { em_ptr->do_time = (em_ptr->dam + 1) / 2; @@ -468,33 +468,33 @@ process_result effect_monster_time(player_type *caster_ptr, effect_monster_type static bool effect_monster_gravity_resist_teleport(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flagsr & RFR_RES_TELE) == 0) - return FALSE; + return false; if (em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) { if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE; em_ptr->note = _("には効果がなかった。", " is unaffected!"); - return TRUE; + return true; } if (em_ptr->r_ptr->level <= randint1(100)) - return FALSE; + return false; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flagsr |= RFR_RES_TELE; em_ptr->note = _("には耐性がある！", " resists!"); - return TRUE; + return true; } static void effect_monster_gravity_slow(player_type *caster_ptr, effect_monster_type *em_ptr) { if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) - em_ptr->obvious = FALSE; + em_ptr->obvious = false; if (set_monster_slow(caster_ptr, em_ptr->g_ptr->m_idx, monster_slow_remaining(em_ptr->m_ptr) + 50)) em_ptr->note = _("の動きが遅くなった。", " starts moving slower."); @@ -506,7 +506,7 @@ static void effect_monster_gravity_stun(effect_monster_type *em_ptr) if ((em_ptr->r_ptr->flags1 & (RF1_UNIQUE)) || (em_ptr->r_ptr->level > randint1((em_ptr->dam - 10) < 1 ? 1 : (em_ptr->dam - 10)) + 10)) { em_ptr->do_stun = 0; em_ptr->note = _("には効果がなかった。", " is unaffected!"); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; } } @@ -539,7 +539,7 @@ process_result effect_monster_gravity(player_type *caster_ptr, effect_monster_ty process_result effect_monster_disintegration(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if ((em_ptr->r_ptr->flags3 & RF3_HURT_ROCK) == 0) return PROCESS_CONTINUE; @@ -556,7 +556,7 @@ process_result effect_monster_disintegration(player_type *caster_ptr, effect_mon process_result effect_monster_icee_bolt(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; em_ptr->do_stun = (randint1(15) + 1) / (em_ptr->r + 1); if (em_ptr->r_ptr->flagsr & RFR_IM_COLD) { @@ -585,7 +585,7 @@ process_result effect_monster_icee_bolt(player_type *caster_ptr, effect_monster_ process_result effect_monster_void(player_type* caster_ptr, effect_monster_type* em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (any_bits(em_ptr->r_ptr->flags2, RF2_QUANTUM)) { em_ptr->note = _("の存在確率が減少した。", "'s wave function is reduced."); @@ -630,7 +630,7 @@ process_result effect_monster_void(player_type* caster_ptr, effect_monster_type* process_result effect_monster_abyss(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; BIT_FLAGS dark = RF7_SELF_DARK_1 | RF7_SELF_DARK_2 | RF7_HAS_DARK_1 | RF7_HAS_DARK_2; diff --git a/src/effect/effect-monster-spirit.cpp b/src/effect/effect-monster-spirit.cpp index 5555f2e95..4c8d59e77 100644 --- a/src/effect/effect-monster-spirit.cpp +++ b/src/effect/effect-monster-spirit.cpp @@ -20,7 +20,7 @@ process_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; auto ability_flags = em_ptr->r_ptr->ability_flags; bool has_mana = ability_flags.reset(RF_ABILITY_NOMAGIC_MASK).any(); if (!has_mana) { @@ -65,7 +65,7 @@ process_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster process_result effect_monster_mind_blast(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name); @@ -104,7 +104,7 @@ process_result effect_monster_mind_blast(player_type *caster_ptr, effect_monster process_result effect_monster_brain_smash(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (!em_ptr->who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), em_ptr->m_name); diff --git a/src/effect/effect-monster-switcher.cpp b/src/effect/effect-monster-switcher.cpp index b51d9b8c6..d1d15c0f6 100644 --- a/src/effect/effect-monster-switcher.cpp +++ b/src/effect/effect-monster-switcher.cpp @@ -41,7 +41,7 @@ process_result effect_monster_hypodynamia(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (monster_living(em_ptr->m_ptr->r_idx)) { em_ptr->do_time = (em_ptr->dam + 7) / 8; @@ -58,7 +58,7 @@ process_result effect_monster_hypodynamia(player_type *caster_ptr, effect_monste } em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->dam = 0; return PROCESS_CONTINUE; } @@ -69,7 +69,7 @@ process_result effect_monster_hypodynamia(player_type *caster_ptr, effect_monste process_result effect_monster_death_ray(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (!monster_living(em_ptr->m_ptr->r_idx)) { if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) { @@ -82,7 +82,7 @@ process_result effect_monster_death_ray(player_type *caster_ptr, effect_monster_ } em_ptr->note = _("には完全な耐性がある！", " is immune."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->dam = 0; return PROCESS_CONTINUE; } @@ -90,7 +90,7 @@ process_result effect_monster_death_ray(player_type *caster_ptr, effect_monster_ if (((em_ptr->r_ptr->flags1 & RF1_UNIQUE) && (randint1(888) != 666)) || (((em_ptr->r_ptr->level + randint1(20)) > randint1((em_ptr->caster_lev / 2) + randint1(10))) && randint1(100) != 66)) { em_ptr->note = _("には耐性がある！", " resists!"); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->dam = 0; } @@ -105,7 +105,7 @@ process_result effect_monster_kill_wall(player_type *caster_ptr, effect_monster_ } if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_HURT_ROCK); @@ -118,7 +118,7 @@ process_result effect_monster_kill_wall(player_type *caster_ptr, effect_monster_ process_result effect_monster_hand_doom(effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (em_ptr->r_ptr->flags1 & RF1_UNIQUE) { em_ptr->note = _("には効果がなかった。", " is unaffected."); @@ -152,12 +152,12 @@ process_result effect_monster_hand_doom(effect_monster_type *em_ptr) process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (any_bits(em_ptr->r_ptr->flags2, RF2_EMPTY_MIND)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); em_ptr->dam = 0; - em_ptr->skipped = TRUE; + em_ptr->skipped = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) set_bits(em_ptr->r_ptr->r_flags2, RF2_EMPTY_MIND); return PROCESS_CONTINUE; @@ -166,11 +166,11 @@ process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_ty if (monster_csleep_remaining(em_ptr->m_ptr)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); em_ptr->dam = 0; - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } - bool done = FALSE; + bool done = false; for (int i = 0; i < 3; i++) { if (randint0(5) < 2) continue; @@ -185,7 +185,7 @@ process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_ty if (set_monster_slow(caster_ptr, em_ptr->g_ptr->m_idx, monster_slow_remaining(em_ptr->m_ptr) + 50)) { em_ptr->note = _("の動きが遅くなった。", " starts moving slower."); } - done = TRUE; + done = true; } break; case 1: @@ -193,7 +193,7 @@ process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_ty em_ptr->do_stun = 0; } else { em_ptr->do_stun = damroll((caster_ptr->lev / 10) + 3, (em_ptr->dam)) + 1; - done = TRUE; + done = true; } break; case 2: @@ -207,7 +207,7 @@ process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_ty /* Go to sleep (much) later */ em_ptr->note = _("は混乱したようだ。", " looks confused."); em_ptr->do_conf = 10 + randint1(15); - done = TRUE; + done = true; } break; default: @@ -221,7 +221,7 @@ process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_ty /* Go to sleep (much) later */ em_ptr->note = _("は眠り込んでしまった！", " falls asleep!"); em_ptr->do_sleep = 500; - done = TRUE; + done = true; } break; } @@ -232,7 +232,7 @@ process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_ty if (!done) { em_ptr->note = _("には効果がなかった。", " is unaffected."); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; } em_ptr->dam = 0; @@ -242,7 +242,7 @@ process_result effect_monster_engetsu(player_type *caster_ptr, effect_monster_ty process_result effect_monster_genocide(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (genocide_aux(caster_ptr, em_ptr->g_ptr->m_idx, em_ptr->dam, !em_ptr->who, (em_ptr->r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One"))) { if (em_ptr->seen_msg) msg_format(_("%sは消滅した！", "%^s disappeared!"), em_ptr->m_name); @@ -250,7 +250,7 @@ process_result effect_monster_genocide(player_type *caster_ptr, effect_monster_t return PROCESS_TRUE; } - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } @@ -261,7 +261,7 @@ process_result effect_monster_photo(player_type *caster_ptr, effect_monster_type if (em_ptr->r_ptr->flags3 & (RF3_HURT_LITE)) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (is_original_ap_and_seen(caster_ptr, em_ptr->m_ptr)) em_ptr->r_ptr->r_flags3 |= (RF3_HURT_LITE); @@ -279,7 +279,7 @@ process_result effect_monster_photo(player_type *caster_ptr, effect_monster_type process_result effect_monster_wounds(effect_monster_type *em_ptr) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (randint0(100 + em_ptr->dam) < (em_ptr->r_ptr->level + 50)) { em_ptr->note = _("には効果がなかった。", " is unaffected."); @@ -467,7 +467,7 @@ process_result switch_effects_monster(player_type *caster_ptr, effect_monster_ty case GF_ABYSS: return effect_monster_abyss(caster_ptr, em_ptr); default: { - em_ptr->skipped = TRUE; + em_ptr->skipped = true; em_ptr->dam = 0; return PROCESS_CONTINUE; } diff --git a/src/effect/effect-monster-util.cpp b/src/effect/effect-monster-util.cpp index 61f5a4324..a9e4b7b91 100644 --- a/src/effect/effect-monster-util.cpp +++ b/src/effect/effect-monster-util.cpp @@ -66,18 +66,18 @@ effect_monster_type *initialize_effect_monster(player_type *caster_ptr, effect_m em_ptr->seen = em_ptr->m_ptr->ml; em_ptr->seen_msg = is_seen(caster_ptr, em_ptr->m_ptr); em_ptr->slept = (bool)monster_csleep_remaining(em_ptr->m_ptr); - em_ptr->obvious = FALSE; + em_ptr->obvious = false; em_ptr->known = ((em_ptr->m_ptr->cdis <= MAX_SIGHT) || caster_ptr->phase_out); - em_ptr->skipped = FALSE; - em_ptr->get_angry = FALSE; - em_ptr->do_polymorph = FALSE; + em_ptr->skipped = false; + em_ptr->get_angry = false; + em_ptr->do_polymorph = false; em_ptr->do_dist = 0; em_ptr->do_conf = 0; em_ptr->do_stun = 0; em_ptr->do_sleep = 0; em_ptr->do_fear = 0; em_ptr->do_time = 0; - em_ptr->heal_leper = FALSE; + em_ptr->heal_leper = false; em_ptr->photo = 0; em_ptr->note = NULL; em_ptr->note_dies = extract_note_dies(real_r_idx(em_ptr->m_ptr)); diff --git a/src/effect/effect-monster.cpp b/src/effect/effect-monster.cpp index d91044007..a10b00511 100644 --- a/src/effect/effect-monster.cpp +++ b/src/effect/effect-monster.cpp @@ -135,7 +135,7 @@ static process_result exe_affect_monster_by_effect(player_type *caster_ptr, effe em_ptr->r_ptr->r_flagsr |= (RFR_RES_ALL); if (em_ptr->effect_type == GF_LITE_WEAK || em_ptr->effect_type == GF_KILL_WALL) - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } @@ -153,7 +153,7 @@ static void effect_damage_killed_pet(player_type *caster_ptr, effect_monster_typ if (em_ptr->see_s_msg) msg_format("%^s%s", em_ptr->m_name, em_ptr->note); else - caster_ptr->current_floor_ptr->monster_noise = TRUE; + caster_ptr->current_floor_ptr->monster_noise = true; } if (em_ptr->who > 0) @@ -177,7 +177,7 @@ static void effect_damage_makes_sleep(player_type *caster_ptr, effect_monster_ty else if (em_ptr->see_s_msg) message_pain(caster_ptr, em_ptr->g_ptr->m_idx, em_ptr->dam); else - caster_ptr->current_floor_ptr->monster_noise = TRUE; + caster_ptr->current_floor_ptr->monster_noise = true; if (em_ptr->do_sleep) (void)set_monster_csleep(caster_ptr, em_ptr->g_ptr->m_idx, em_ptr->do_sleep); @@ -194,7 +194,7 @@ static void effect_damage_makes_sleep(player_type *caster_ptr, effect_monster_ty static bool deal_effect_damage_from_monster(player_type *caster_ptr, effect_monster_type *em_ptr) { if (em_ptr->who <= 0) - return FALSE; + return false; if (caster_ptr->health_who == em_ptr->g_ptr->m_idx) caster_ptr->redraw |= (PR_HEALTH); @@ -208,7 +208,7 @@ static bool deal_effect_damage_from_monster(player_type *caster_ptr, effect_mons else effect_damage_makes_sleep(caster_ptr, em_ptr); - return TRUE; + return true; } /*! @@ -220,7 +220,7 @@ static bool deal_effect_damage_from_monster(player_type *caster_ptr, effect_mons static bool heal_leaper(player_type *caster_ptr, effect_monster_type *em_ptr) { if (!em_ptr->heal_leper) - return FALSE; + return false; if (em_ptr->seen_msg) msg_print(_("不潔な病人は病気が治った！", "The Mangy looking leper is healed!")); @@ -232,7 +232,7 @@ static bool heal_leaper(player_type *caster_ptr, effect_monster_type *em_ptr) } delete_monster_idx(caster_ptr, em_ptr->g_ptr->m_idx); - return TRUE; + return true; } /*! @@ -245,9 +245,9 @@ static bool heal_leaper(player_type *caster_ptr, effect_monster_type *em_ptr) */ static bool deal_effect_damage_from_player(player_type *caster_ptr, effect_monster_type *em_ptr) { - bool fear = FALSE; + bool fear = false; if (mon_take_hit(caster_ptr, em_ptr->g_ptr->m_idx, em_ptr->dam, &fear, em_ptr->note_dies)) - return TRUE; + return true; if (em_ptr->do_sleep) anger_monster(caster_ptr, em_ptr->m_ptr); @@ -265,7 +265,7 @@ static bool deal_effect_damage_from_player(player_type *caster_ptr, effect_monst msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), em_ptr->m_name); } - return FALSE; + return false; } /*! @@ -322,7 +322,7 @@ static void effect_makes_change_virtues(player_type *caster_ptr, effect_monster_ static void affected_monster_prevents_bad_status(player_type *caster_ptr, effect_monster_type *em_ptr) { if ((em_ptr->r_ptr->flags1 & RF1_UNIQUE) || (em_ptr->r_ptr->flags1 & RF1_QUESTOR) || (caster_ptr->riding && (em_ptr->g_ptr->m_idx == caster_ptr->riding))) - em_ptr->do_polymorph = FALSE; + em_ptr->do_polymorph = false; if (((em_ptr->r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (em_ptr->r_ptr->flags7 & RF7_NAZGUL)) && !caster_ptr->phase_out && (em_ptr->who > 0) && (em_ptr->dam > em_ptr->m_ptr->hp)) @@ -341,7 +341,7 @@ static void effect_damage_piles_stun(player_type *caster_ptr, effect_monster_typ return; if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; int turns = 0; if (monster_stunned_remaining(em_ptr->m_ptr)) { @@ -353,7 +353,7 @@ static void effect_damage_piles_stun(player_type *caster_ptr, effect_monster_typ } (void)set_monster_stunned(caster_ptr, em_ptr->g_ptr->m_idx, turns); - em_ptr->get_angry = TRUE; + em_ptr->get_angry = true; } /*! @@ -368,7 +368,7 @@ static void effect_damage_piles_confusion(player_type *caster_ptr, effect_monste return; if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; int turns = 0; if (monster_confused_remaining(em_ptr->m_ptr)) { @@ -380,7 +380,7 @@ static void effect_damage_piles_confusion(player_type *caster_ptr, effect_monste } (void)set_monster_confused(caster_ptr, em_ptr->g_ptr->m_idx, turns); - em_ptr->get_angry = TRUE; + em_ptr->get_angry = true; } /*! @@ -397,7 +397,7 @@ static void effect_damage_piles_fear(player_type *caster_ptr, effect_monster_typ return; (void)set_monster_monfear(caster_ptr, em_ptr->g_ptr->m_idx, monster_fear_remaining(em_ptr->m_ptr) + em_ptr->do_fear); - em_ptr->get_angry = TRUE; + em_ptr->get_angry = true; } /*! @@ -410,7 +410,7 @@ static void effect_damage_makes_weak(effect_monster_type *em_ptr) return; if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (em_ptr->do_time >= em_ptr->m_ptr->maxhp) em_ptr->do_time = em_ptr->m_ptr->maxhp - 1; @@ -422,7 +422,7 @@ static void effect_damage_makes_weak(effect_monster_type *em_ptr) em_ptr->dam = em_ptr->m_ptr->hp - em_ptr->m_ptr->maxhp; } - em_ptr->get_angry = TRUE; + em_ptr->get_angry = true; } /*! @@ -437,7 +437,7 @@ static void effect_damage_makes_polymorph(player_type *caster_ptr, effect_monste if (polymorph_monster(caster_ptr, em_ptr->y, em_ptr->x)) { if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; em_ptr->note = _("が変身した！", " changes!"); em_ptr->dam = 0; @@ -458,7 +458,7 @@ static void effect_damage_makes_teleport(player_type *caster_ptr, effect_monster return; if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; em_ptr->note = _("が消え去った！", " disappears!"); @@ -645,7 +645,7 @@ bool affect_monster( return (bool)result; if (em_ptr->skipped) - return FALSE; + return false; exe_affect_monster_by_damage(caster_ptr, em_ptr); diff --git a/src/effect/effect-player.cpp b/src/effect/effect-player.cpp index e5406b494..8385c266f 100644 --- a/src/effect/effect-player.cpp +++ b/src/effect/effect-player.cpp @@ -186,7 +186,7 @@ static bool process_bolt_reflection(player_type *target_ptr, effect_player_type can_bolt_hit &= (ep_ptr->flag & PROJECT_REFLECTABLE) != 0; can_bolt_hit &= !one_in_(10); if (!can_bolt_hit) - return FALSE; + return false; POSITION t_y, t_x; int max_attempts = 10; @@ -219,7 +219,7 @@ static bool process_bolt_reflection(player_type *target_ptr, effect_player_type (*project)(target_ptr, 0, 0, t_y, t_x, ep_ptr->dam, ep_ptr->effect_type, (PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE)); disturb(target_ptr, TRUE, TRUE); - return TRUE; + return true; } /*! @@ -327,5 +327,5 @@ bool affect_player(MONSTER_IDX who, player_type *target_ptr, concptr who_name, i (void)kawarimi(target_ptr, FALSE); } - return TRUE; + return true; } diff --git a/src/effect/effect-processor.cpp b/src/effect/effect-processor.cpp index 6abb645fb..3aa25fba3 100644 --- a/src/effect/effect-processor.cpp +++ b/src/effect/effect-processor.cpp @@ -97,11 +97,11 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r POSITION y_saver; POSITION x_saver; int msec = delay_factor * delay_factor * delay_factor; - bool visual = FALSE; - bool drawn = FALSE; - bool breath = FALSE; + bool visual = false; + bool drawn = false; + bool breath = false; bool blind = caster_ptr->blind != 0; - bool old_hide = FALSE; + bool old_hide = false; int path_n = 0; u16b path_g[512]; int grids = 0; @@ -109,9 +109,9 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r POSITION gy[1024]; POSITION gm[32]; POSITION gm_rad = rad; - bool jump = FALSE; + bool jump = false; GAME_TEXT who_name[MAX_NLEN]; - bool see_s_msg = TRUE; + bool see_s_msg = true; who_name[0] = '\0'; rakubadam_p = 0; rakubadam_m = 0; @@ -124,7 +124,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r x1 = x; y1 = y; flag &= ~(PROJECT_JUMP); - jump = TRUE; + jump = true; } else if (who <= 0) { x1 = caster_ptr->x; y1 = caster_ptr->y; @@ -150,9 +150,9 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r if (rad < 0) { rad = 0 - rad; - breath = TRUE; + breath = true; if (flag & PROJECT_HIDE) - old_hide = TRUE; + old_hide = true; flag |= PROJECT_HIDE; } @@ -221,7 +221,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r print_rel(caster_ptr, c, a, y, x); } - visual = TRUE; + visual = true; } else if (visual) { term_xtra(TERM_XTRA_DELAY, msec); } @@ -229,7 +229,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r } if (affect_item(caster_ptr, 0, 0, y, x, dam, GF_SEEKER)) - res.notice = TRUE; + res.notice = true; if (!is_mirror_grid(&caster_ptr->current_floor_ptr->grid_array[y][x])) continue; @@ -242,7 +242,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r y = get_grid_y(path_g[j]); x = get_grid_x(path_g[j]); if (affect_monster(caster_ptr, 0, 0, y, x, dam, GF_SEEKER, flag, TRUE)) - res.notice = TRUE; + res.notice = true; if (!who && (project_m_n == 1) && !jump && (caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx > 0)) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx]; if (m_ptr->ml) { @@ -263,7 +263,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r py = get_grid_y(path_g[i]); px = get_grid_x(path_g[i]); if (affect_monster(caster_ptr, 0, 0, py, px, dam, GF_SEEKER, flag, TRUE)) - res.notice = TRUE; + res.notice = true; if (!who && (project_m_n == 1) && !jump) { if (caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx > 0) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx]; @@ -318,7 +318,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r print_rel(caster_ptr, c, a, y, x); } - visual = TRUE; + visual = true; } else if (visual) { term_xtra(TERM_XTRA_DELAY, msec); } @@ -326,7 +326,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r } if (affect_item(caster_ptr, 0, 0, y, x, dam, GF_SUPER_RAY)) - res.notice = TRUE; + res.notice = true; if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT)) { if (second_step) continue; @@ -433,7 +433,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r print_rel(caster_ptr, c, a, y, x); } - visual = TRUE; + visual = true; } else if (visual) { term_xtra(TERM_XTRA_DELAY, msec); } @@ -445,7 +445,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r POSITION by = y; POSITION bx = x; if (breath && !path_n) { - breath = FALSE; + breath = false; gm_rad = rad; if (!old_hide) { flag &= ~(PROJECT_HIDE); @@ -523,7 +523,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r u16b p; TERM_COLOR a; SYMBOL_CODE c; - drawn = TRUE; + drawn = true; p = bolt_pict(y, x, y, x, typ); a = PICT_A(p); c = PICT_C(p); @@ -569,10 +569,10 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r if (breath) { int d = dist_to_line(y, x, y1, x1, by, bx); if (affect_feature(caster_ptr, who, d, y, x, dam, typ)) - res.notice = TRUE; + res.notice = true; } else { if (affect_feature(caster_ptr, who, dist, y, x, dam, typ)) - res.notice = TRUE; + res.notice = true; } } } @@ -589,10 +589,10 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r if (breath) { int d = dist_to_line(y, x, y1, x1, by, bx); if (affect_item(caster_ptr, who, d, y, x, dam, typ)) - res.notice = TRUE; + res.notice = true; } else { if (affect_item(caster_ptr, who, dist, y, x, dam, typ)) - res.notice = TRUE; + res.notice = true; } } } @@ -714,7 +714,7 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r } if (affect_monster(caster_ptr, who, effective_dist, y, x, dam, typ, flag, see_s_msg)) - res.notice = TRUE; + res.notice = true; } /* Player affected one monster (without "jumping") */ @@ -785,8 +785,8 @@ ProjectResult project(player_type *caster_ptr, const MONSTER_IDX who, POSITION r } if (affect_player(who, caster_ptr, who_name, effective_dist, y, x, dam, typ, flag, project)) { - res.notice = TRUE; - res.affected_player = TRUE; + res.notice = true; + res.affected_player = true; } } } diff --git a/src/flavor/flavor-describer.cpp b/src/flavor/flavor-describer.cpp index f1bed8d51..ce33749d0 100644 --- a/src/flavor/flavor-describer.cpp +++ b/src/flavor/flavor-describer.cpp @@ -105,16 +105,16 @@ static void describe_chest(flavor_type *flavor_ptr) static void decide_tval_show(player_type *player_ptr, flavor_type *flavor_ptr) { if (has_flag(flavor_ptr->tr_flags, TR_SHOW_MODS)) - flavor_ptr->show_weapon = TRUE; + flavor_ptr->show_weapon = true; if (object_is_smith(player_ptr, flavor_ptr->o_ptr) && (flavor_ptr->o_ptr->xtra3 == 1 + ESSENCE_SLAY_GLOVE)) - flavor_ptr->show_weapon = TRUE; + flavor_ptr->show_weapon = true; if (flavor_ptr->o_ptr->to_h && flavor_ptr->o_ptr->to_d) - flavor_ptr->show_weapon = TRUE; + flavor_ptr->show_weapon = true; if (flavor_ptr->o_ptr->ac) - flavor_ptr->show_armour = TRUE; + flavor_ptr->show_armour = true; } static void describe_weapon_dice(player_type *player_ptr, flavor_type *flavor_ptr) diff --git a/src/flavor/flavor-util.cpp b/src/flavor/flavor-util.cpp index dfd4f36c6..7ae858230 100644 --- a/src/flavor/flavor-util.cpp +++ b/src/flavor/flavor-util.cpp @@ -20,11 +20,11 @@ flavor_type *initialize_flavor_type(flavor_type *flavor_ptr, char *buf, object_t flavor_ptr->kindname = k_info[o_ptr->k_idx].name.c_str(); flavor_ptr->basenm = flavor_ptr->kindname; flavor_ptr->modstr = ""; - flavor_ptr->aware = FALSE; - flavor_ptr->known = FALSE; - flavor_ptr->flavor = TRUE; - flavor_ptr->show_weapon = FALSE; - flavor_ptr->show_armour = FALSE; + flavor_ptr->aware = false; + flavor_ptr->known = false; + flavor_ptr->flavor = true; + flavor_ptr->show_weapon = false; + flavor_ptr->show_armour = false; flavor_ptr->p1 = '('; flavor_ptr->p2 = ')'; flavor_ptr->b1 = '['; @@ -166,9 +166,9 @@ static bool has_flag_of(std::vector& fi_vec, BIT_FLAGS flgs[TR_ { for (flag_insc_table &fi : fi_vec) if (has_flag(flgs, fi.flag) && (fi.except_flag == -1 || !has_flag(flgs, fi.except_flag))) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -340,7 +340,7 @@ void get_inscription(player_type *player_ptr, char *buff, object_type *o_ptr) if (*insc == '#') break; else if ('%' == *insc) { - bool kanji = FALSE; + bool kanji = false; bool all; concptr start = ptr; if (ptr >= buff + MAX_NLEN) @@ -349,16 +349,16 @@ void get_inscription(player_type *player_ptr, char *buff, object_type *o_ptr) #ifdef JP if ('%' == insc[1]) { insc++; - kanji = FALSE; + kanji = false; } else - kanji = TRUE; + kanji = true; #endif if ('a' == insc[1] && 'l' == insc[2] && 'l' == insc[3]) { - all = TRUE; + all = true; insc += 3; } else - all = FALSE; + all = false; ptr = get_ability_abbreviation(player_ptr, ptr, o_ptr, kanji, all); if (ptr == start) diff --git a/src/flavor/named-item-describer.cpp b/src/flavor/named-item-describer.cpp index 013adb284..e15f93fee 100644 --- a/src/flavor/named-item-describer.cpp +++ b/src/flavor/named-item-describer.cpp @@ -27,24 +27,24 @@ static void check_object_known_aware(player_type *player_ptr, flavor_type *flavo { object_flags(player_ptr, flavor_ptr->o_ptr, flavor_ptr->tr_flags); if (object_is_aware(flavor_ptr->o_ptr)) - flavor_ptr->aware = TRUE; + flavor_ptr->aware = true; if (object_is_known(flavor_ptr->o_ptr)) - flavor_ptr->known = TRUE; + flavor_ptr->known = true; if (flavor_ptr->aware && ((flavor_ptr->mode & OD_NO_FLAVOR) || plain_descriptions)) - flavor_ptr->flavor = FALSE; + flavor_ptr->flavor = false; if ((flavor_ptr->mode & OD_STORE) || (flavor_ptr->o_ptr->ident & IDENT_STORE)) { - flavor_ptr->flavor = FALSE; - flavor_ptr->aware = TRUE; - flavor_ptr->known = TRUE; + flavor_ptr->flavor = false; + flavor_ptr->aware = true; + flavor_ptr->known = true; } if (flavor_ptr->mode & OD_FORCE_FLAVOR) { - flavor_ptr->aware = FALSE; - flavor_ptr->flavor = TRUE; - flavor_ptr->known = FALSE; + flavor_ptr->aware = false; + flavor_ptr->flavor = true; + flavor_ptr->known = false; flavor_ptr->flavor_k_ptr = flavor_ptr->k_ptr; } } @@ -134,25 +134,25 @@ static void describe_artifact_ja(flavor_type *flavor_ptr) static bool describe_random_artifact_body_ja(flavor_type *flavor_ptr) { if (flavor_ptr->o_ptr->art_name == 0) - return FALSE; + return false; char temp[256]; int itemp; strcpy(temp, quark_str(flavor_ptr->o_ptr->art_name)); if (strncmp(temp, "『", 2) == 0 || strncmp(temp, "《", 2) == 0) { flavor_ptr->t = object_desc_str(flavor_ptr->t, temp); - return TRUE; + return true; } if (temp[0] != '\'') - return TRUE; + return true; itemp = strlen(temp); temp[itemp - 1] = 0; flavor_ptr->t = object_desc_str(flavor_ptr->t, "『"); flavor_ptr->t = object_desc_str(flavor_ptr->t, &temp[1]); flavor_ptr->t = object_desc_str(flavor_ptr->t, "』"); - return TRUE; + return true; } static void describe_ego_body_ja(flavor_type *flavor_ptr) @@ -238,15 +238,15 @@ static bool describe_prefix_en(flavor_type *flavor_ptr) { if (flavor_ptr->o_ptr->number <= 0) { flavor_ptr->t = object_desc_str(flavor_ptr->t, "no more "); - return TRUE; + return true; } if (flavor_ptr->o_ptr->number == 1) - return FALSE; + return false; flavor_ptr->t = object_desc_num(flavor_ptr->t, flavor_ptr->o_ptr->number); flavor_ptr->t = object_desc_chr(flavor_ptr->t, ' '); - return TRUE; + return true; } static void describe_artifact_prefix_en(flavor_type *flavor_ptr) diff --git a/src/flavor/object-flavor.cpp b/src/flavor/object-flavor.cpp index 352553d68..0531fcd14 100644 --- a/src/flavor/object-flavor.cpp +++ b/src/flavor/object-flavor.cpp @@ -72,25 +72,25 @@ static bool object_easy_know(int i) case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: case TV_HEX_BOOK: - return TRUE; + return true; case TV_FLASK: case TV_JUNK: case TV_BOTTLE: case TV_SKELETON: case TV_SPIKE: case TV_WHISTLE: - return TRUE; + return true; case TV_FOOD: case TV_POTION: case TV_SCROLL: case TV_ROD: - return TRUE; + return true; default: break; } - return FALSE; + return false; } /*! @@ -253,7 +253,7 @@ void flavor_init(void) continue; if (!k_ptr->flavor) - k_ptr->aware = TRUE; + k_ptr->aware = true; k_ptr->easy_know = object_easy_know(i); } diff --git a/src/flavor/tval-description-switcher.cpp b/src/flavor/tval-description-switcher.cpp index 8755245ef..db3a84d5e 100644 --- a/src/flavor/tval-description-switcher.cpp +++ b/src/flavor/tval-description-switcher.cpp @@ -102,7 +102,7 @@ static void describe_ring(flavor_type *flavor_ptr) flavor_ptr->basenm = _("#指輪", "& # Ring~"); if (!flavor_ptr->k_ptr->to_h && !flavor_ptr->k_ptr->to_d && (flavor_ptr->o_ptr->to_h || flavor_ptr->o_ptr->to_d)) - flavor_ptr->show_weapon = TRUE; + flavor_ptr->show_weapon = true; } static void describe_staff(flavor_type *flavor_ptr) @@ -338,7 +338,7 @@ void switch_tval_description(flavor_type *flavor_ptr) case TV_POLEARM: case TV_SWORD: case TV_DIGGING: - flavor_ptr->show_weapon = TRUE; + flavor_ptr->show_weapon = true; break; case TV_BOOTS: case TV_GLOVES: @@ -349,7 +349,7 @@ void switch_tval_description(flavor_type *flavor_ptr) case TV_SOFT_ARMOR: case TV_HARD_ARMOR: case TV_DRAG_ARMOR: - flavor_ptr->show_armour = TRUE; + flavor_ptr->show_armour = true; break; case TV_LITE: break; diff --git a/src/floor/cave-generator.cpp b/src/floor/cave-generator.cpp index 3fc6f1a43..ba7236ec2 100644 --- a/src/floor/cave-generator.cpp +++ b/src/floor/cave-generator.cpp @@ -39,9 +39,9 @@ static void reset_lite_area(floor_type *floor_ptr) static dun_data_type *initialize_dun_data_type(dun_data_type *dd_ptr, concptr *why) { - dd_ptr->destroyed = FALSE; - dd_ptr->empty_level = FALSE; - dd_ptr->cavern = FALSE; + dd_ptr->destroyed = false; + dd_ptr->empty_level = false; + dd_ptr->cavern = false; dd_ptr->laketype = 0; dd_ptr->why = why; return dd_ptr; @@ -109,10 +109,10 @@ static bool decide_tunnel_planned_site(player_type *player_ptr, dun_data_type *d if (dd_ptr->tunnel_fail_count >= 2) { *dd_ptr->why = _("トンネル接続に失敗", "Failed to generate tunnels"); - return FALSE; + return false; } - return TRUE; + return true; } static void make_tunnels(player_type *player_ptr, dun_data_type *dd_ptr) @@ -153,7 +153,7 @@ static bool make_centers(player_type *player_ptr, dun_data_type *dd_ptr, dungeon dd_ptr->tunnel_x = dd_ptr->cent[dd_ptr->cent_n - 1].x; for (int i = 0; i < dd_ptr->cent_n; i++) { if (!decide_tunnel_planned_site(player_ptr, dd_ptr, d_ptr, dt_ptr, i)) - return FALSE; + return false; make_tunnels(player_ptr, dd_ptr); make_walls(player_ptr, dd_ptr, d_ptr, dt_ptr); @@ -161,7 +161,7 @@ static bool make_centers(player_type *player_ptr, dun_data_type *dd_ptr, dungeon dd_ptr->tunnel_x = dd_ptr->cent[i].x; } - return TRUE; + return true; } static void make_doors(player_type *player_ptr, dun_data_type *dd_ptr, dt_type *dt_ptr) @@ -195,7 +195,7 @@ static bool make_one_floor(player_type *player_ptr, dun_data_type *dd_ptr, dunge } else { if (!generate_rooms(player_ptr, dd_ptr)) { *dd_ptr->why = _("部屋群の生成に失敗", "Failed to generate rooms"); - return FALSE; + return false; } } @@ -203,20 +203,20 @@ static bool make_one_floor(player_type *player_ptr, dun_data_type *dd_ptr, dunge dt_type tmp_dt; dt_type *dt_ptr = initialize_dt_type(&tmp_dt); if (!make_centers(player_ptr, dd_ptr, d_ptr, dt_ptr)) - return FALSE; + return false; make_doors(player_ptr, dd_ptr, dt_ptr); if (!alloc_stairs(player_ptr, feat_down_stair, rand_range(3, 4), 3)) { *dd_ptr->why = _("下り階段生成に失敗", "Failed to generate down stairs."); - return FALSE; + return false; } if (!alloc_stairs(player_ptr, feat_up_stair, rand_range(1, 2), 3)) { *dd_ptr->why = _("上り階段生成に失敗", "Failed to generate up stairs."); - return FALSE; + return false; } - return TRUE; + return true; } static bool switch_making_floor(player_type *player_ptr, dun_data_type *dd_ptr, dungeon_type *d_ptr) @@ -226,21 +226,21 @@ static bool switch_making_floor(player_type *player_ptr, dun_data_type *dd_ptr, build_maze_vault(player_ptr, floor_ptr->width / 2 - 1, floor_ptr->height / 2 - 1, floor_ptr->width - 4, floor_ptr->height - 4, FALSE); if (!alloc_stairs(player_ptr, feat_down_stair, rand_range(2, 3), 3)) { *dd_ptr->why = _("迷宮ダンジョンの下り階段生成に失敗", "Failed to alloc up stairs in maze dungeon."); - return FALSE; + return false; } if (!alloc_stairs(player_ptr, feat_up_stair, 1, 3)) { *dd_ptr->why = _("迷宮ダンジョンの上り階段生成に失敗", "Failed to alloc down stairs in maze dungeon."); - return FALSE; + return false; } - return TRUE; + return true; } if (!make_one_floor(player_ptr, dd_ptr, d_ptr)) - return FALSE; + return false; - return TRUE; + return true; } static void make_aqua_streams(player_type *player_ptr, dun_data_type *dd_ptr, dungeon_type *d_ptr) @@ -275,15 +275,15 @@ static bool check_place_necessary_objects(player_type *player_ptr, dun_data_type { if (!new_player_spot(player_ptr)) { *dd_ptr->why = _("プレイヤー配置に失敗", "Failed to place a player"); - return FALSE; + return false; } if (!place_quest_monsters(player_ptr)) { *dd_ptr->why = _("クエストモンスター配置に失敗", "Failed to place a quest monster"); - return FALSE; + return false; } - return TRUE; + return true; } static void decide_dungeon_data_allocation(player_type *player_ptr, dun_data_type *dd_ptr, dungeon_type *d_ptr) @@ -330,10 +330,10 @@ static bool allocate_dungeon_data(player_type *player_ptr, dun_data_type *dd_ptr alloc_object(player_ptr, ALLOC_SET_BOTH, ALLOC_TYP_GOLD, randnor(DUN_AMT_GOLD, 3)); floor_ptr->object_level = floor_ptr->base_level; if (alloc_guardian(player_ptr, TRUE)) - return TRUE; + return true; *dd_ptr->why = _("ダンジョンの主配置に失敗", "Failed to place a dungeon guardian"); - return FALSE; + return false; } static void decide_grid_glowing(floor_type *floor_ptr, dun_data_type *dd_ptr, dungeon_type *d_ptr) @@ -369,29 +369,29 @@ bool cave_gen(player_type *player_ptr, concptr *why) dd_ptr->col_rooms = floor_ptr->width / BLOCK_WID; for (POSITION y = 0; y < dd_ptr->row_rooms; y++) for (POSITION x = 0; x < dd_ptr->col_rooms; x++) - dd_ptr->room_map[y][x] = FALSE; + dd_ptr->room_map[y][x] = false; dd_ptr->cent_n = 0; dungeon_type *d_ptr = &d_info[floor_ptr->dungeon_idx]; if (ironman_empty_levels || (d_ptr->flags.has(DF::ARENA) && (empty_levels && one_in_(EMPTY_LEVEL)))) { - dd_ptr->empty_level = TRUE; + dd_ptr->empty_level = true; msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("アリーナレベルを生成。", "Arena level.")); } check_arena_floor(player_ptr, dd_ptr); gen_caverns_and_lakes(player_ptr, d_ptr, dd_ptr); if (!switch_making_floor(player_ptr, dd_ptr, d_ptr)) - return FALSE; + return false; make_aqua_streams(player_ptr, dd_ptr, d_ptr); make_perm_walls(player_ptr); if (!check_place_necessary_objects(player_ptr, dd_ptr)) - return FALSE; + return false; decide_dungeon_data_allocation(player_ptr, dd_ptr, d_ptr); if (!allocate_dungeon_data(player_ptr, dd_ptr, d_ptr)) - return FALSE; + return false; decide_grid_glowing(floor_ptr, dd_ptr, d_ptr); - return TRUE; + return true; } diff --git a/src/floor/fixed-map-generator.cpp b/src/floor/fixed-map-generator.cpp index 5e85125fe..aad494337 100644 --- a/src/floor/fixed-map-generator.cpp +++ b/src/floor/fixed-map-generator.cpp @@ -115,11 +115,11 @@ static void parse_qtw_D(player_type *player_ptr, qtwg_type *qtwg_ptr, char *s) floor_ptr->monster_level = floor_ptr->base_level; } else if (monster_index) { int old_cur_num, old_max_num; - bool clone = FALSE; + bool clone = false; if (monster_index < 0) { monster_index = -monster_index; - clone = TRUE; + clone = true; } old_cur_num = r_info[monster_index].cur_num; @@ -193,16 +193,16 @@ static void parse_qtw_D(player_type *player_ptr, qtwg_type *qtwg_ptr, char *s) static bool parse_qtw_QQ(quest_type *q_ptr, char **zz, int num) { if (zz[1][0] != 'Q') - return FALSE; + return false; if ((init_flags & INIT_ASSIGN) == 0) - return TRUE; + return true; monster_race *r_ptr; artifact_type *a_ptr; if (num < 9) - return TRUE; + return true; q_ptr->type = (QUEST_TYPE)atoi(zz[2]); q_ptr->num_mon = (MONSTER_NUMBER)atoi(zz[3]); @@ -222,7 +222,7 @@ static bool parse_qtw_QQ(quest_type *q_ptr, char **zz, int num) a_ptr = &a_info[q_ptr->k_idx]; a_ptr->gen_flags.set(TRG::QUESTITEM); - return TRUE; + return true; } /*! @@ -231,10 +231,10 @@ static bool parse_qtw_QQ(quest_type *q_ptr, char **zz, int num) static bool parse_qtw_QR(quest_type *q_ptr, char **zz, int num) { if (zz[1][0] != 'R') - return FALSE; + return false; if ((init_flags & INIT_ASSIGN) == 0) - return TRUE; + return true; int count = 0; ARTIFACT_IDX idx, reward_idx = 0; @@ -256,7 +256,7 @@ static bool parse_qtw_QR(quest_type *q_ptr, char **zz, int num) q_ptr->type = QUEST_TYPE_KILL_ALL; } - return TRUE; + return true; } /*! @@ -313,13 +313,13 @@ static int parse_qtw_Q(qtwg_type *qtwg_ptr, char **zz) static bool parse_qtw_P(player_type *player_ptr, qtwg_type *qtwg_ptr, char **zz) { if (qtwg_ptr->buf[0] != 'P') - return FALSE; + return false; if ((init_flags & INIT_CREATE_DUNGEON) == 0) - return TRUE; + return true; if (tokenize(qtwg_ptr->buf + 2, 2, zz, 0) != 2) - return TRUE; + return true; int panels_y = (*qtwg_ptr->y / SCREEN_HGT); if (*qtwg_ptr->y % SCREEN_HGT) @@ -340,7 +340,7 @@ static bool parse_qtw_P(player_type *player_ptr, qtwg_type *qtwg_ptr, char **zz) player_ptr->y = py; player_ptr->x = px; delete_monster(player_ptr, player_ptr->y, player_ptr->x); - return TRUE; + return true; } if (!player_ptr->oldpx && !player_ptr->oldpy) { @@ -348,16 +348,16 @@ static bool parse_qtw_P(player_type *player_ptr, qtwg_type *qtwg_ptr, char **zz) player_ptr->oldpx = atoi(zz[1]); } - return TRUE; + return true; } static bool parse_qtw_M(qtwg_type *qtwg_ptr, char **zz) { if (qtwg_ptr->buf[0] != 'M') - return FALSE; + return false; if ((tokenize(qtwg_ptr->buf + 2, 2, zz, 0) == 2) == 0) - return TRUE; + return true; if (zz[0][0] == 'T') { max_towns = (TOWN_IDX)atoi(zz[1]); @@ -389,7 +389,7 @@ static bool parse_qtw_M(qtwg_type *qtwg_ptr, char **zz) current_world_ptr->max_wild_y = (POSITION)atoi(zz[1]); } - return TRUE; + return true; } /*! diff --git a/src/floor/floor-changer.cpp b/src/floor/floor-changer.cpp index 68fab5dd2..158e143f0 100644 --- a/src/floor/floor-changer.cpp +++ b/src/floor/floor-changer.cpp @@ -105,7 +105,7 @@ static void set_pet_params(player_type *master_ptr, monster_race **r_ptr, const m_ptr->fy = cy; m_ptr->fx = cx; m_ptr->current_floor_ptr = master_ptr->current_floor_ptr; - m_ptr->ml = TRUE; + m_ptr->ml = true; m_ptr->mtimed[MTIMED_CSLEEP] = 0; m_ptr->hold_o_idx_list.clear(); m_ptr->target_y = 0; @@ -190,7 +190,7 @@ static void check_visited_floor(player_type *creature_ptr, saved_floor_type *sf_ if ((sf_ptr->last_visit == 0) || !load_floor(creature_ptr, sf_ptr, 0)) return; - *loaded = TRUE; + *loaded = true; if ((creature_ptr->change_floor_mode & CFM_NO_RETURN) == 0) return; @@ -350,7 +350,7 @@ static void update_floor(player_type *creature_ptr) new_floor_id = get_new_floor_id(creature_ptr); saved_floor_type *sf_ptr; - bool loaded = FALSE; + bool loaded = false; sf_ptr = get_sf_ptr(new_floor_id); check_visited_floor(creature_ptr, sf_ptr, &loaded); update_floor_id(creature_ptr, sf_ptr); @@ -369,19 +369,19 @@ static void update_floor(player_type *creature_ptr) */ void change_floor(player_type *creature_ptr) { - current_world_ptr->character_dungeon = FALSE; - creature_ptr->dtrap = FALSE; + current_world_ptr->character_dungeon = false; + creature_ptr->dtrap = false; panel_row_min = 0; panel_row_max = 0; panel_col_min = 0; panel_col_max = 0; - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; update_floor(creature_ptr); place_pet(creature_ptr); forget_travel_flow(creature_ptr->current_floor_ptr); update_unique_artifact(creature_ptr->current_floor_ptr, new_floor_id); creature_ptr->floor_id = new_floor_id; - current_world_ptr->character_dungeon = TRUE; + current_world_ptr->character_dungeon = true; if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) wiz_lite(creature_ptr, (bool)(creature_ptr->pclass == CLASS_NINJA)); diff --git a/src/floor/floor-generator.cpp b/src/floor/floor-generator.cpp index af9dbc044..3732429ce 100644 --- a/src/floor/floor-generator.cpp +++ b/src/floor/floor-generator.cpp @@ -134,7 +134,7 @@ static void generate_challenge_arena(player_type *challanger_ptr) if (place_monster_aux(challanger_ptr, 0, challanger_ptr->y + 5, challanger_ptr->x, arena_info[challanger_ptr->arena_number].r_idx, PM_NO_KAGE | PM_NO_PET)) return; - challanger_ptr->exit_bldg = TRUE; + challanger_ptr->exit_bldg = true; challanger_ptr->arena_number++; msg_print(_("相手は欠場した。あなたの不戦勝だ。", "The enemy is unable to appear. You won by default.")); } @@ -282,12 +282,12 @@ static bool level_gen(player_type *player_ptr, concptr *why) } else { level_height = randint1(MAX_HGT / SCREEN_HGT); level_width = randint1(MAX_WID / SCREEN_WID); - bool is_first_level_area = TRUE; + bool is_first_level_area = true; bool is_max_area = (level_height == MAX_HGT / SCREEN_HGT) && (level_width == MAX_WID / SCREEN_WID); while (is_first_level_area || is_max_area) { level_height = randint1(MAX_HGT / SCREEN_HGT); level_width = randint1(MAX_WID / SCREEN_WID); - is_first_level_area = FALSE; + is_first_level_area = false; is_max_area = (level_height == MAX_HGT / SCREEN_HGT) && (level_width == MAX_WID / SCREEN_WID); } } @@ -391,7 +391,7 @@ static void floor_is_connected_dfs(const floor_type *const floor_ptr, const IsWa std::stack stk; stk.emplace(start); - visited[start] = TRUE; + visited[start] = true; while (!stk.empty()) { const int cur = stk.top(); @@ -411,7 +411,7 @@ static void floor_is_connected_dfs(const floor_type *const floor_ptr, const IsWa continue; stk.emplace(nxt); - visited[nxt] = TRUE; + visited[nxt] = true; } } } @@ -458,8 +458,8 @@ void generate_floor(player_type *player_ptr) floor_type *floor_ptr = player_ptr->current_floor_ptr; floor_ptr->dungeon_idx = player_ptr->dungeon_idx; set_floor_and_wall(floor_ptr->dungeon_idx); - for (int num = 0; TRUE; num++) { - bool okay = TRUE; + for (int num = 0; true; num++) { + bool okay = true; concptr why = NULL; clear_cave(player_ptr); player_ptr->x = player_ptr->y = 0; @@ -479,10 +479,10 @@ void generate_floor(player_type *player_ptr) if (floor_ptr->o_max >= current_world_ptr->max_o_idx) { why = _("アイテムが多すぎる", "too many objects"); - okay = FALSE; + okay = false; } else if (floor_ptr->m_max >= current_world_ptr->max_m_idx) { why = _("モンスターが多すぎる", "too many monsters"); - okay = FALSE; + okay = false; } // ダンジョン内フロアが連結でない(永久壁で区切られた孤立部屋がある)場合、 @@ -496,7 +496,7 @@ void generate_floor(player_type *player_ptr) plog("cannot generate connected floor. giving up..."); } else { why = _("フロアが連結でない", "floor is not connected"); - okay = FALSE; + okay = false; } } @@ -511,6 +511,6 @@ void generate_floor(player_type *player_ptr) } glow_deep_lava_and_bldg(player_ptr); - player_ptr->enter_dungeon = FALSE; + player_ptr->enter_dungeon = false; wipe_generate_random_floor_flags(floor_ptr); } diff --git a/src/floor/floor-leaver.cpp b/src/floor/floor-leaver.cpp index 4aad5e47c..ef5ffcb34 100644 --- a/src/floor/floor-leaver.cpp +++ b/src/floor/floor-leaver.cpp @@ -51,7 +51,7 @@ static void check_riding_preservation(player_type *master_ptr) if (m_ptr->parent_m_idx) { master_ptr->riding = 0; master_ptr->pet_extra_flags &= ~(PF_TWO_HANDS); - master_ptr->riding_ryoute = master_ptr->old_riding_ryoute = FALSE; + master_ptr->riding_ryoute = master_ptr->old_riding_ryoute = false; } else { (void)COPY(&party_mon[0], m_ptr, monster_type); delete_monster_idx(master_ptr, master_ptr->riding); @@ -61,22 +61,22 @@ static void check_riding_preservation(player_type *master_ptr) static bool check_pet_preservation_conditions(player_type *master_ptr, monster_type *m_ptr) { if (reinit_wilderness) - return FALSE; + return false; POSITION dis = distance(master_ptr->y, master_ptr->x, m_ptr->fy, m_ptr->fx); if (monster_confused_remaining(m_ptr) || monster_stunned_remaining(m_ptr) || monster_csleep_remaining(m_ptr) || (m_ptr->parent_m_idx != 0)) - return TRUE; + return true; if (m_ptr->nickname && ((player_has_los_bold(master_ptr, m_ptr->fy, m_ptr->fx) && projectable(master_ptr, master_ptr->y, master_ptr->x, m_ptr->fy, m_ptr->fx)) || (los(master_ptr, m_ptr->fy, m_ptr->fx, master_ptr->y, master_ptr->x) && projectable(master_ptr, m_ptr->fy, m_ptr->fx, master_ptr->y, master_ptr->x)))) { if (dis > 3) - return TRUE; + return true; } else if (dis > 1) - return TRUE; + return true; - return FALSE; + return false; } static void sweep_preserving_pet(player_type *master_ptr) @@ -153,10 +153,10 @@ static void locate_connected_stairs(player_type *creature_ptr, floor_type *floor for (POSITION x = 0; x < floor_ptr->width; x++) { grid_type *g_ptr = &floor_ptr->grid_array[y][x]; feature_type *f_ptr = &f_info[g_ptr->feat]; - bool ok = FALSE; + bool ok = false; if (floor_mode & CFM_UP) { if (has_flag(f_ptr->flags, FF_LESS) && has_flag(f_ptr->flags, FF_STAIRS) && !has_flag(f_ptr->flags, FF_SPECIAL)) { - ok = TRUE; + ok = true; if (g_ptr->special && g_ptr->special == sf_ptr->upper_floor_id) { sx = x; sy = y; @@ -164,7 +164,7 @@ static void locate_connected_stairs(player_type *creature_ptr, floor_type *floor } } else if (floor_mode & CFM_DOWN) { if (has_flag(f_ptr->flags, FF_MORE) && has_flag(f_ptr->flags, FF_STAIRS) && !has_flag(f_ptr->flags, FF_SPECIAL)) { - ok = TRUE; + ok = true; if (g_ptr->special && g_ptr->special == sf_ptr->lower_floor_id) { sx = x; sy = y; @@ -172,7 +172,7 @@ static void locate_connected_stairs(player_type *creature_ptr, floor_type *floor } } else { if (has_flag(f_ptr->flags, FF_BLDG)) { - ok = TRUE; + ok = true; } } @@ -217,7 +217,7 @@ static void get_out_monster(player_type *protected_ptr) if (m_idx == 0) return; - while (TRUE) { + while (true) { monster_type *m_ptr; POSITION ny = rand_spread(oy, dis); POSITION nx = rand_spread(ox, dis); @@ -323,7 +323,7 @@ static void exit_to_wilderness(player_type *creature_ptr) if (is_in_dungeon(creature_ptr) || (creature_ptr->dungeon_idx == 0)) return; - creature_ptr->leaving_dungeon = TRUE; + creature_ptr->leaving_dungeon = true; if (!vanilla_town && !lite_town) { creature_ptr->wilderness_y = d_info[creature_ptr->dungeon_idx].dy; creature_ptr->wilderness_x = d_info[creature_ptr->dungeon_idx].dx; diff --git a/src/floor/floor-object.cpp b/src/floor/floor-object.cpp index d5927e0d3..f4697cb5f 100644 --- a/src/floor/floor-object.cpp +++ b/src/floor/floor-object.cpp @@ -115,7 +115,7 @@ bool make_object(player_type *owner_ptr, object_type *j_ptr, BIT_FLAGS mode) } if (!k_idx) - return FALSE; + return false; j_ptr->prep(owner_ptr, k_idx); } @@ -138,7 +138,7 @@ bool make_object(player_type *owner_ptr, object_type *j_ptr, BIT_FLAGS mode) if (cheat_peek) object_mention(owner_ptr, j_ptr); - return TRUE; + return true; } /*! @@ -167,7 +167,7 @@ bool make_gold(player_type *player_ptr, object_type *j_ptr) s32b base = k_info[OBJ_GOLD_LIST + i].cost; j_ptr->pval = (base + (8L * randint1(base)) + randint1(8)); - return TRUE; + return true; } /*! @@ -325,8 +325,8 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan OBJECT_IDX o_idx = 0; grid_type *g_ptr; GAME_TEXT o_name[MAX_NLEN]; - bool flag = FALSE; - bool done = FALSE; + bool flag = false; + bool done = false; #ifdef JP #else bool plural = (j_ptr->number != 1); @@ -352,7 +352,7 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan floor_type *floor_ptr = owner_ptr->current_floor_ptr; for (dy = -3; dy <= 3; dy++) { for (dx = -3; dx <= 3; dx++) { - bool comb = FALSE; + bool comb = false; d = (dy * dy) + (dx * dx); if (d > 10) continue; @@ -373,7 +373,7 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan object_type *o_ptr; o_ptr = &floor_ptr->o_list[this_o_idx]; if (object_similar(o_ptr, j_ptr)) - comb = TRUE; + comb = true; k++; } @@ -397,7 +397,7 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan by = ty; bx = tx; - flag = TRUE; + flag = true; } } @@ -426,7 +426,7 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan if (!cave_drop_bold(floor_ptr, by, bx)) continue; - flag = TRUE; + flag = true; } if (!flag) { @@ -481,7 +481,7 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan o_ptr = &floor_ptr->o_list[this_o_idx]; if (object_similar(o_ptr, j_ptr)) { object_absorb(o_ptr, j_ptr); - done = TRUE; + done = true; break; } } @@ -512,7 +512,7 @@ OBJECT_IDX drop_near(player_type *owner_ptr, object_type *j_ptr, PERCENTAGE chan j_ptr->ix = bx; j_ptr->held_m_idx = 0; g_ptr->o_idx_list.add(floor_ptr, o_idx); - done = TRUE; + done = true; } note_spot(owner_ptr, by, bx); diff --git a/src/floor/floor-save.cpp b/src/floor/floor-save.cpp index 161121df6..26f991a93 100644 --- a/src/floor/floor-save.cpp +++ b/src/floor/floor-save.cpp @@ -41,7 +41,7 @@ static void check_saved_tmp_files(const int fd, bool *force) if (!get_check(_("強制的に削除してもよろしいですか？", "Do you delete the old temporary files? "))) quit(_("実行中止", "Aborted.")); - *force = TRUE; + *force = true; } /*! diff --git a/src/floor/floor-streams.cpp b/src/floor/floor-streams.cpp index 8537ede95..5a089ff5a 100644 --- a/src/floor/floor-streams.cpp +++ b/src/floor/floor-streams.cpp @@ -104,7 +104,7 @@ static void recursive_river(floor_type *floor_ptr, POSITION x1, POSITION y1, POS x = x1 + l * (x2 - x1) / length; y = y1 + l * (y2 - y1) / length; - done = FALSE; + done = false; while (!done) { for (ty = y - width - 1; ty <= y + width + 1; ty++) { @@ -149,7 +149,7 @@ static void recursive_river(floor_type *floor_ptr, POSITION x1, POSITION y1, POS } } - done = TRUE; + done = true; } } } @@ -304,7 +304,7 @@ void build_streamer(player_type *player_ptr, FEAT_IDX feat, int chance) int d = DUN_STR_RNG; /* Pick a nearby grid */ - while (TRUE) { + while (true) { ty = rand_spread(y, d); tx = rand_spread(x, d); if (!in_bounds2(floor_ptr, ty, tx)) diff --git a/src/floor/floor-util.cpp b/src/floor/floor-util.cpp index f374434cb..7cca5dacb 100644 --- a/src/floor/floor-util.cpp +++ b/src/floor/floor-util.cpp @@ -155,7 +155,7 @@ void scatter(player_type *player_ptr, POSITION *yp, POSITION *xp, POSITION y, PO { floor_type *floor_ptr = player_ptr->current_floor_ptr; POSITION nx, ny; - while (TRUE) { + while (true) { ny = rand_spread(y, d); nx = rand_spread(x, d); diff --git a/src/floor/geometry.cpp b/src/floor/geometry.cpp index 7dd78a553..18ad3c56c 100644 --- a/src/floor/geometry.cpp +++ b/src/floor/geometry.cpp @@ -74,7 +74,7 @@ POSITION distance(POSITION y1, POSITION x1, POSITION y2, POSITION x2) if (!dy || !dx) return d; - while (TRUE) { + while (true) { /* Approximate error */ err = (target - d * d) / (2 * d); @@ -150,30 +150,30 @@ bool player_can_see_bold(player_type *creature_ptr, POSITION y, POSITION x) /* Blind players see nothing */ if (creature_ptr->blind) - return FALSE; + return false; g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; /* Note that "torch-lite" yields "illumination" */ if (g_ptr->info & (CAVE_LITE | CAVE_MNLT)) - return TRUE; + return true; /* Require line of sight to the grid */ if (!player_has_los_bold(creature_ptr, y, x)) - return FALSE; + return false; /* Noctovision of Ninja */ if (creature_ptr->see_nocto) - return TRUE; + return true; /* Require "perma-lite" of the grid */ if ((g_ptr->info & (CAVE_GLOW | CAVE_MNDK)) != CAVE_GLOW) - return FALSE; + return false; /* Feature code (applying "mimic" field) */ /* Floors are simple */ if (feat_supports_los(get_feat_mimic(g_ptr))) - return TRUE; + return true; /* Check for "local" illumination */ return check_local_illumination(creature_ptr, y, x); diff --git a/src/floor/line-of-sight.cpp b/src/floor/line-of-sight.cpp index abc190a49..419c3d98d 100644 --- a/src/floor/line-of-sight.cpp +++ b/src/floor/line-of-sight.cpp @@ -53,7 +53,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO POSITION ay = ABS(dy); POSITION ax = ABS(dx); if ((ax < 2) && (ay < 2)) - return TRUE; + return true; /* Directly South/North */ floor_type *floor_ptr = player_ptr->current_floor_ptr; @@ -63,7 +63,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO if (dy > 0) { for (ty = y1 + 1; ty < y2; ty++) { if (!cave_los_bold(floor_ptr, ty, x1)) - return FALSE; + return false; } } @@ -71,12 +71,12 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO else { for (ty = y1 - 1; ty > y2; ty--) { if (!cave_los_bold(floor_ptr, ty, x1)) - return FALSE; + return false; } } /* Assume los */ - return TRUE; + return true; } /* Directly East/West */ @@ -85,7 +85,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO if (dx > 0) { for (tx = x1 + 1; tx < x2; tx++) { if (!cave_los_bold(floor_ptr, y1, tx)) - return FALSE; + return false; } } @@ -93,11 +93,11 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO else { for (tx = x1 - 1; tx > x2; tx--) { if (!cave_los_bold(floor_ptr, y1, tx)) - return FALSE; + return false; } } - return TRUE; + return true; } POSITION sx = (dx < 0) ? -1 : 1; @@ -106,12 +106,12 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO if (ax == 1) { if (ay == 2) { if (cave_los_bold(floor_ptr, y1 + sy, x1)) - return TRUE; + return true; } } else if (ay == 1) { if (ax == 2) { if (cave_los_bold(floor_ptr, y1, x1 + sx)) - return TRUE; + return true; } } @@ -134,7 +134,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO /* the LOS exactly meets the corner of a tile. */ while (x2 - tx) { if (!cave_los_bold(floor_ptr, ty, tx)) - return FALSE; + return false; qy += m; @@ -146,7 +146,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO if (qy > f2) { ty += sy; if (!cave_los_bold(floor_ptr, ty, tx)) - return FALSE; + return false; qy -= f1; tx += sx; continue; @@ -157,7 +157,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO tx += sx; } - return TRUE; + return true; } /* Travel vertically */ @@ -175,7 +175,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO /* the LOS exactly meets the corner of a tile. */ while (y2 - ty) { if (!cave_los_bold(floor_ptr, ty, tx)) - return FALSE; + return false; qx += m; @@ -187,7 +187,7 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO if (qx > f2) { tx += sx; if (!cave_los_bold(floor_ptr, ty, tx)) - return FALSE; + return false; qx -= f1; ty += sy; continue; @@ -198,5 +198,5 @@ bool los(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, POSITIO ty += sy; } - return TRUE; + return true; } diff --git a/src/floor/object-allocator.cpp b/src/floor/object-allocator.cpp index 57f75ae11..b442ca3b7 100644 --- a/src/floor/object-allocator.cpp +++ b/src/floor/object-allocator.cpp @@ -58,9 +58,9 @@ static bool alloc_stairs_aux(player_type *player_ptr, POSITION y, POSITION x, in floor_type *floor_ptr = player_ptr->current_floor_ptr; grid_type *g_ptr = &floor_ptr->grid_array[y][x]; if (!is_floor_grid(g_ptr) || pattern_tile(floor_ptr, y, x) || !g_ptr->o_idx_list.empty() || (g_ptr->m_idx != 0) || next_to_walls(floor_ptr, y, x) < walls) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -78,7 +78,7 @@ bool alloc_stairs(player_type *owner_ptr, FEAT_IDX feat, int num, int walls) floor_type *floor_ptr = owner_ptr->current_floor_ptr; if (has_flag(f_ptr->flags, FF_LESS)) { if (ironman_downward || !floor_ptr->dun_level) - return TRUE; + return true; if (floor_ptr->dun_level > d_info[floor_ptr->dungeon_idx].mindepth) shaft_num = (randint1(num + 1)) / 2; @@ -87,19 +87,19 @@ bool alloc_stairs(player_type *owner_ptr, FEAT_IDX feat, int num, int walls) if (floor_ptr->dun_level > 1 && q_idx) { monster_race *r_ptr = &r_info[quest[q_idx].r_idx]; if (!(r_ptr->flags1 & RF1_UNIQUE) || 0 < r_ptr->max_num) - return TRUE; + return true; } if (floor_ptr->dun_level >= d_info[floor_ptr->dungeon_idx].maxdepth) - return TRUE; + return true; if ((floor_ptr->dun_level < d_info[floor_ptr->dungeon_idx].maxdepth - 1) && !quest_number(owner_ptr, floor_ptr->dun_level + 1)) shaft_num = (randint1(num) + 1) / 2; } else - return FALSE; + return false; for (int i = 0; i < num; i++) { - while (TRUE) { + while (true) { grid_type *g_ptr; int candidates = 0; const POSITION max_x = floor_ptr->width - 1; @@ -110,7 +110,7 @@ bool alloc_stairs(player_type *owner_ptr, FEAT_IDX feat, int num, int walls) if (!candidates) { if (walls <= 0) - return FALSE; + return false; walls--; continue; @@ -140,7 +140,7 @@ bool alloc_stairs(player_type *owner_ptr, FEAT_IDX feat, int num, int walls) } } - return TRUE; + return true; } /*! @@ -170,7 +170,7 @@ void alloc_object(player_type *owner_ptr, dap_type set, EFFECT_ID typ, int num) if (player_bold(owner_ptr, y, x)) continue; - bool room = (floor_ptr->grid_array[y][x].info & CAVE_ROOM) ? TRUE : FALSE; + bool room = (floor_ptr->grid_array[y][x].info & CAVE_ROOM) ? TRUE : false; if (((set == ALLOC_SET_CORR) && room) || ((set == ALLOC_SET_ROOM) && !room)) continue; diff --git a/src/floor/object-scanner.cpp b/src/floor/object-scanner.cpp index 94f5ee09f..cb5e077b3 100644 --- a/src/floor/object-scanner.cpp +++ b/src/floor/object-scanner.cpp @@ -105,7 +105,7 @@ COMMAND_CODE show_floor_items(player_type *owner_ptr, int target_item, POSITION ITEM_NUMBER floor_num; TERM_LEN wid, hgt; char floor_label[52 + 1]; - bool dont_need_to_show_weights = TRUE; + bool dont_need_to_show_weights = true; term_get_size(&wid, &hgt); int len = MAX((*min_width), 20); floor_num = scan_floor_items(owner_ptr, floor_list, y, x, SCAN_FLOOR_ITEM_TESTER | SCAN_FLOOR_ONLY_MARKED, item_tester_tval); @@ -121,7 +121,7 @@ COMMAND_CODE show_floor_items(player_type *owner_ptr, int target_item, POSITION l += 9; if (o_ptr->tval != TV_GOLD) - dont_need_to_show_weights = FALSE; + dont_need_to_show_weights = false; if (l > len) len = l; diff --git a/src/floor/pattern-walk.cpp b/src/floor/pattern-walk.cpp index fe7393fc0..890b0afdc 100644 --- a/src/floor/pattern-walk.cpp +++ b/src/floor/pattern-walk.cpp @@ -89,7 +89,7 @@ static void pattern_teleport(player_type *creature_ptr) * and create a first saved floor */ prepare_change_floor_mode(creature_ptr, CFM_FIRST_FLOOR); - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } /*! @@ -100,7 +100,7 @@ bool pattern_effect(player_type *creature_ptr) { floor_type *floor_ptr = creature_ptr->current_floor_ptr; if (!pattern_tile(floor_ptr, creature_ptr->y, creature_ptr->x)) - return FALSE; + return false; if ((is_specific_player_race(creature_ptr, RACE_AMBERITE)) && (creature_ptr->cut > 0) && one_in_(10)) { wreck_the_pattern(creature_ptr); @@ -140,13 +140,13 @@ bool pattern_effect(player_type *creature_ptr) default: if (is_specific_player_race(creature_ptr, RACE_AMBERITE) && !one_in_(2)) - return TRUE; + return true; else if (!is_invuln(creature_ptr)) take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(1, 3), _("「パターン」を歩いたダメージ", "walking the Pattern")); break; } - return TRUE; + return true; } /*! @@ -165,7 +165,7 @@ bool pattern_seq(player_type *creature_ptr, POSITION c_y, POSITION c_x, POSITION bool is_pattern_tile_cur = has_flag(cur_f_ptr->flags, FF_PATTERN); bool is_pattern_tile_new = has_flag(new_f_ptr->flags, FF_PATTERN); if (!is_pattern_tile_cur && !is_pattern_tile_new) - return TRUE; + return true; int pattern_type_cur = is_pattern_tile_cur ? cur_f_ptr->subtype : NOT_PATTERN_TILE; int pattern_type_new = is_pattern_tile_new ? new_f_ptr->subtype : NOT_PATTERN_TILE; @@ -173,47 +173,47 @@ bool pattern_seq(player_type *creature_ptr, POSITION c_y, POSITION c_x, POSITION if (!is_pattern_tile_cur && !creature_ptr->confused && !creature_ptr->stun && !creature_ptr->image) { if (get_check(_("パターンの上を歩き始めると、全てを歩かなければなりません。いいですか？", "If you start walking the Pattern, you must walk the whole way. Ok? "))) - return TRUE; + return true; else - return FALSE; + return false; } else - return TRUE; + return true; } if ((pattern_type_new == PATTERN_TILE_OLD) || (pattern_type_new == PATTERN_TILE_END) || (pattern_type_new == PATTERN_TILE_WRECKED)) { if (is_pattern_tile_cur) { - return TRUE; + return true; } else { msg_print(_("パターンの上を歩くにはスタート地点から歩き始めなくてはなりません。", "You must start walking the Pattern from the startpoint.")); - return FALSE; + return false; } } if ((pattern_type_new == PATTERN_TILE_TELEPORT) || (pattern_type_cur == PATTERN_TILE_TELEPORT)) - return TRUE; + return true; if (pattern_type_cur == PATTERN_TILE_START) { if (is_pattern_tile_new) - return TRUE; + return true; else { msg_print(_("パターンの上は正しい順序で歩かねばなりません。", "You must walk the Pattern in correct order.")); - return FALSE; + return false; } } if ((pattern_type_cur == PATTERN_TILE_OLD) || (pattern_type_cur == PATTERN_TILE_END) || (pattern_type_cur == PATTERN_TILE_WRECKED)) { if (!is_pattern_tile_new) { msg_print(_("パターンを踏み外してはいけません。", "You may not step off from the Pattern.")); - return FALSE; + return false; } else { - return TRUE; + return true; } } if (!is_pattern_tile_cur) { msg_print(_("パターンの上を歩くにはスタート地点から歩き始めなくてはなりません。", "You must start walking the Pattern from the startpoint.")); - return FALSE; + return false; } byte ok_move = PATTERN_TILE_START; @@ -233,16 +233,16 @@ bool pattern_seq(player_type *creature_ptr, POSITION c_y, POSITION c_x, POSITION default: if (current_world_ptr->wizard) msg_format(_("おかしなパターン歩行、%d。", "Funny Pattern walking, %d."), pattern_type_cur); - return TRUE; + return true; } if ((pattern_type_new == ok_move) || (pattern_type_new == pattern_type_cur)) - return TRUE; + return true; if (!is_pattern_tile_new) msg_print(_("パターンを踏み外してはいけません。", "You may not step off from the Pattern.")); else msg_print(_("パターンの上は正しい順序で歩かねばなりません。", "You must walk the Pattern in correct order.")); - return FALSE; + return false; } diff --git a/src/floor/tunnel-generator.cpp b/src/floor/tunnel-generator.cpp index 6b262f069..1b5db2e8c 100644 --- a/src/floor/tunnel-generator.cpp +++ b/src/floor/tunnel-generator.cpp @@ -55,7 +55,7 @@ bool build_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, dt_type *dt_pt POSITION row_dir, col_dir; POSITION start_row, start_col; int main_loop_count = 0; - bool door_flag = FALSE; + bool door_flag = false; grid_type *g_ptr; start_row = row1; start_col = col1; @@ -63,7 +63,7 @@ bool build_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, dt_type *dt_pt floor_type *floor_ptr = player_ptr->current_floor_ptr; while ((row1 != row2) || (col1 != col2)) { if (main_loop_count++ > 2000) - return FALSE; + return false; if (randint0(100) < dt_ptr->dun_tun_chg) { correct_dir(&row_dir, &col_dir, row1, col1, row2, col2); @@ -95,7 +95,7 @@ bool build_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, dt_type *dt_pt row1 = tmp_row; col1 = tmp_col; if (dd_ptr->wall_n >= WALL_MAX) - return FALSE; + return false; dd_ptr->wall[dd_ptr->wall_n].y = row1; dd_ptr->wall[dd_ptr->wall_n].x = col1; @@ -112,23 +112,23 @@ bool build_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, dt_type *dt_pt row1 = tmp_row; col1 = tmp_col; if (dd_ptr->tunn_n >= TUNN_MAX) - return FALSE; + return false; dd_ptr->tunn[dd_ptr->tunn_n].y = row1; dd_ptr->tunn[dd_ptr->tunn_n].x = col1; dd_ptr->tunn_n++; - door_flag = FALSE; + door_flag = false; } else { row1 = tmp_row; col1 = tmp_col; if (!door_flag) { if (dd_ptr->door_n >= DOOR_MAX) - return FALSE; + return false; dd_ptr->door[dd_ptr->door_n].y = row1; dd_ptr->door[dd_ptr->door_n].x = col1; dd_ptr->door_n++; - door_flag = TRUE; + door_flag = true; } if (randint0(100) >= dt_ptr->dun_tun_con) { @@ -146,7 +146,7 @@ bool build_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, dt_type *dt_pt } } - return TRUE; + return true; } /*! @@ -162,24 +162,24 @@ static bool set_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, POSITION floor_type *floor_ptr = player_ptr->current_floor_ptr; grid_type *g_ptr = &floor_ptr->grid_array[*y][*x]; if (!in_bounds(floor_ptr, *y, *x) || is_inner_grid(g_ptr)) - return TRUE; + return true; if (is_extra_bold(floor_ptr, *y, *x)) { if (dd_ptr->tunn_n >= TUNN_MAX) - return FALSE; + return false; dd_ptr->tunn[dd_ptr->tunn_n].y = *y; dd_ptr->tunn[dd_ptr->tunn_n].x = *x; dd_ptr->tunn_n++; - return TRUE; + return true; } if (is_floor_bold(floor_ptr, *y, *x)) - return TRUE; + return true; if (is_outer_grid(g_ptr) && affectwall) { if (dd_ptr->wall_n >= WALL_MAX) - return FALSE; + return false; dd_ptr->wall[dd_ptr->wall_n].y = *y; dd_ptr->wall[dd_ptr->wall_n].x = *x; @@ -191,7 +191,7 @@ static bool set_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, POSITION floor_ptr->grid_array[*y][*x].mimic = 0; place_bold(player_ptr, *y, *x, GB_FLOOR); - return TRUE; + return true; } if (is_solid_grid(g_ptr) && affectwall) { @@ -217,10 +217,10 @@ static bool set_tunnel(player_type *player_ptr, dun_data_type *dd_ptr, POSITION *x = *x + dx; *y = *y + dy; - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -268,7 +268,7 @@ static void short_seg_hack( y = y1 + i * (y2 - y1) / length; if (!set_tunnel(player_ptr, dd_ptr, &x, &y, TRUE)) { if (count > 50) { - *fail = FALSE; + *fail = false; return; } @@ -350,9 +350,9 @@ bool build_tunnel2(player_type *player_ptr, dun_data_type *dd_ptr, POSITION x1, int length = distance(x1, y1, x2, y2); floor_type *floor_ptr = player_ptr->current_floor_ptr; if (length <= cutoff) { - retval = TRUE; + retval = true; short_seg_hack(player_ptr, dd_ptr, x1, y1, x2, y2, type, 0, &retval); - return TRUE; + return true; } dx = (x2 - x1) / 2; @@ -397,27 +397,27 @@ bool build_tunnel2(player_type *player_ptr, dun_data_type *dd_ptr, POSITION x1, if ((floor_ptr->grid_array[y3][x3].info & CAVE_ROOM) || (randint1(100) > 95)) { retval = build_tunnel2(player_ptr, dd_ptr, x3, y3, x2, y2, type, cutoff); } else { - retval = FALSE; + retval = false; if (dd_ptr->door_n >= DOOR_MAX) - return FALSE; + return false; dd_ptr->door[dd_ptr->door_n].y = y3; dd_ptr->door[dd_ptr->door_n].x = x3; dd_ptr->door_n++; } - firstsuccede = TRUE; + firstsuccede = true; } else { - retval = FALSE; - firstsuccede = FALSE; + retval = false; + firstsuccede = false; } } else { if (build_tunnel2(player_ptr, dd_ptr, x1, y1, x3, y3, type, cutoff)) { retval = build_tunnel2(player_ptr, dd_ptr, x3, y3, x2, y2, type, cutoff); - firstsuccede = TRUE; + firstsuccede = true; } else { - retval = FALSE; - firstsuccede = FALSE; + retval = false; + firstsuccede = false; } } diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp index 6445e24bd..a11f754a3 100644 --- a/src/floor/wild.cpp +++ b/src/floor/wild.cpp @@ -505,7 +505,7 @@ void wilderness_gen(player_type *creature_ptr) } } - creature_ptr->teleport_town = FALSE; + creature_ptr->teleport_town = false; } else if (creature_ptr->leaving_dungeon) { for (y = 0; y < floor_ptr->height; y++) { for (x = 0; x < floor_ptr->width; x++) { @@ -522,7 +522,7 @@ void wilderness_gen(player_type *creature_ptr) } } - creature_ptr->teleport_town = FALSE; + creature_ptr->teleport_town = false; } player_place(creature_ptr, creature_ptr->oldpy, creature_ptr->oldpx); @@ -536,9 +536,9 @@ void wilderness_gen(player_type *creature_ptr) } if (generate_encounter) - creature_ptr->ambush_flag = TRUE; + creature_ptr->ambush_flag = true; - generate_encounter = FALSE; + generate_encounter = false; set_floor_and_wall(0); for (int i = 0; i < max_q_idx; i++) if (quest[i].status == QUEST_STATUS_REWARDED) @@ -763,7 +763,7 @@ errr init_wilderness(void) for (int i = 1; i < current_world_ptr->max_wild_y; i++) wilderness[i] = wilderness[0] + i * current_world_ptr->max_wild_x; - generate_encounter = FALSE; + generate_encounter = false; return 0; } @@ -841,23 +841,23 @@ bool change_wild_mode(player_type *creature_ptr, bool encount) { generate_encounter = encount; if (creature_ptr->leaving) - return FALSE; + return false; if (lite_town || vanilla_town) { msg_print(_("荒野なんてない。", "No global map.")); - return FALSE; + return false; } if (creature_ptr->wild_mode) { creature_ptr->wilderness_x = creature_ptr->x; creature_ptr->wilderness_y = creature_ptr->y; creature_ptr->energy_need = 0; - creature_ptr->wild_mode = FALSE; - creature_ptr->leaving = TRUE; - return TRUE; + creature_ptr->wild_mode = false; + creature_ptr->leaving = true; + return true; } - bool has_pet = FALSE; + bool has_pet = false; PlayerEnergy energy(creature_ptr); for (int i = 1; i < creature_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[i]; @@ -865,21 +865,21 @@ bool change_wild_mode(player_type *creature_ptr, bool encount) continue; if (is_pet(m_ptr) && i != creature_ptr->riding) - has_pet = TRUE; + has_pet = true; if (monster_csleep_remaining(m_ptr) || (m_ptr->cdis > MAX_SIGHT) || !is_hostile(m_ptr)) continue; msg_print(_("敵がすぐ近くにいるときは広域マップに入れない！", "You cannot enter global map, since there are some monsters nearby!")); energy.reset_player_turn(); - return FALSE; + return false; } if (has_pet) { concptr msg = _("ペットを置いて広域マップに入りますか？", "Do you leave your pets behind? "); if (!get_check_strict(creature_ptr, msg, CHECK_OKAY_CANCEL)) { energy.reset_player_turn(); - return FALSE; + return false; } } @@ -890,7 +890,7 @@ bool change_wild_mode(player_type *creature_ptr, bool encount) stop_hex_spell_all(creature_ptr); set_action(creature_ptr, ACTION_NONE); - creature_ptr->wild_mode = TRUE; - creature_ptr->leaving = TRUE; - return TRUE; + creature_ptr->wild_mode = true; + creature_ptr->leaving = true; + return true; } diff --git a/src/game-option/runtime-arguments.cpp b/src/game-option/runtime-arguments.cpp index 75016c703..d3a48bb2f 100644 --- a/src/game-option/runtime-arguments.cpp +++ b/src/game-option/runtime-arguments.cpp @@ -8,4 +8,4 @@ byte arg_graphics; /* Command arg -- Request graphics mode */ bool arg_monochrome; /* Command arg -- Request monochrome mode */ bool arg_force_original; /* Command arg -- Request original keyset */ bool arg_force_roguelike; /* Command arg -- Request roguelike keyset */ -bool arg_bigtile = FALSE; /* Command arg -- Request big tile mode */ +bool arg_bigtile = false; /* Command arg -- Request big tile mode */ diff --git a/src/game-option/special-options.cpp b/src/game-option/special-options.cpp index b2cb3e731..a718bf6b8 100644 --- a/src/game-option/special-options.cpp +++ b/src/game-option/special-options.cpp @@ -9,4 +9,4 @@ s16b autosave_freq; /* Autosave frequency */ bool use_sound; /* The "sound" mode is enabled */ bool use_music; /* The "music" mode is enabled */ bool use_graphics; /* The "graphics" mode is enabled */ -bool use_bigtile = FALSE; +bool use_bigtile = false; diff --git a/src/grid/feature-generator.cpp b/src/grid/feature-generator.cpp index aa80530d3..7db4cafdb 100644 --- a/src/grid/feature-generator.cpp +++ b/src/grid/feature-generator.cpp @@ -26,7 +26,7 @@ void gen_caverns_and_lakes(player_type *owner_ptr, dungeon_type *dungeon_ptr, du { floor_type *floor_ptr = owner_ptr->current_floor_ptr; if ((floor_ptr->dun_level > 30) && one_in_(DUN_DEST * 2) && small_levels && dungeon_ptr->flags.has(DF::DESTROY)) { - dd_ptr->destroyed = TRUE; + dd_ptr->destroyed = true; build_lake(owner_ptr, one_in_(2) ? LAKE_T_CAVE : LAKE_T_EARTH_VAULT); } @@ -88,13 +88,13 @@ void gen_caverns_and_lakes(player_type *owner_ptr, dungeon_type *dungeon_ptr, du if ((floor_ptr->dun_level > DUN_CAVERN) && !dd_ptr->empty_level && dungeon_ptr->flags.has(DF::CAVERN) && !dd_ptr->laketype && !dd_ptr->destroyed && (randint1(1000) < floor_ptr->dun_level)) { - dd_ptr->cavern = TRUE; + dd_ptr->cavern = true; msg_print_wizard(owner_ptr, CHEAT_DUNGEON, _("洞窟を生成。", "Cavern on level.")); build_cavern(owner_ptr); } if (quest_number(owner_ptr, floor_ptr->dun_level)) - dd_ptr->destroyed = FALSE; + dd_ptr->destroyed = false; } bool has_river_flag(dungeon_type *dungeon_ptr) @@ -140,15 +140,15 @@ static int next_to_corr(floor_type *floor_ptr, POSITION y1, POSITION x1) static bool possible_doorway(floor_type *floor_ptr, POSITION y, POSITION x) { if (next_to_corr(floor_ptr, y, x) < 2) - return FALSE; + return false; if (cave_has_flag_bold(floor_ptr, y - 1, x, FF_WALL) && cave_has_flag_bold(floor_ptr, y + 1, x, FF_WALL)) - return TRUE; + return true; if (cave_has_flag_bold(floor_ptr, y, x - 1, FF_WALL) && cave_has_flag_bold(floor_ptr, y, x + 1, FF_WALL)) - return TRUE; + return true; - return FALSE; + return false; } /*! diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp index 316e14d86..1f30ee84c 100644 --- a/src/grid/grid.cpp +++ b/src/grid/grid.cpp @@ -248,13 +248,13 @@ bool new_player_spot(player_type *creature_ptr) } if (max_attempts < 1) /* Should be -1, actually if we failed... */ - return FALSE; + return false; /* Save the new player grid */ creature_ptr->y = y; creature_ptr->x = x; - return TRUE; + return true; } /*! @@ -290,9 +290,9 @@ void place_bound_perm_wall(player_type *player_ptr, grid_type *g_ptr) bool is_known_trap(player_type *player_ptr, grid_type *g_ptr) { if (!g_ptr->mimic && !cave_has_flag_grid(g_ptr, FF_SECRET) && is_trap(player_ptr, g_ptr->feat)) - return TRUE; + return true; else - return FALSE; + return false; } /*! @@ -304,9 +304,9 @@ bool is_known_trap(player_type *player_ptr, grid_type *g_ptr) bool is_hidden_door(player_type *player_ptr, grid_type *g_ptr) { if ((g_ptr->mimic || cave_has_flag_grid(g_ptr, FF_SECRET)) && is_closed_door(player_ptr, g_ptr->feat)) - return TRUE; + return true; else - return FALSE; + return false; } /*! @@ -330,9 +330,9 @@ bool check_local_illumination(player_type *creature_ptr, POSITION y, POSITION x) && (creature_ptr->current_floor_ptr->grid_array[y][xx].info & CAVE_GLOW)) || (feat_supports_los(get_feat_mimic(&creature_ptr->current_floor_ptr->grid_array[yy][x])) && (creature_ptr->current_floor_ptr->grid_array[yy][x].info & CAVE_GLOW))) { - return TRUE; + return true; } else - return FALSE; + return false; } /*! 対象座標のマスの照明状態を更新する際の補助処理マクロ */ @@ -953,20 +953,20 @@ void cave_alter_feat(player_type *player_ptr, POSITION y, POSITION x, int action if (!(feature_action_flags[action] & FAF_NO_DROP)) { feature_type *old_f_ptr = &f_info[oldfeat]; feature_type *f_ptr = &f_info[newfeat]; - bool found = FALSE; + bool found = false; /* Handle gold */ if (has_flag(old_f_ptr->flags, FF_HAS_GOLD) && !has_flag(f_ptr->flags, FF_HAS_GOLD)) { /* Place some gold */ place_gold(player_ptr, y, x); - found = TRUE; + found = true; } /* Handle item */ if (has_flag(old_f_ptr->flags, FF_HAS_ITEM) && !has_flag(f_ptr->flags, FF_HAS_ITEM) && (randint0(100) < (15 - floor_ptr->dun_level / 2))) { /* Place object */ place_object(player_ptr, y, x, 0L); - found = TRUE; + found = true; } if (found && current_world_ptr->character_dungeon && player_can_see_bold(player_ptr, y, x)) { @@ -1014,9 +1014,9 @@ void remove_mirror(player_type *caster_ptr, POSITION y, POSITION x) bool is_mirror_grid(grid_type *g_ptr) { if ((g_ptr->info & CAVE_OBJECT) && has_flag(f_info[g_ptr->mimic].flags, FF_MIRROR)) - return TRUE; + return true; else - return FALSE; + return false; } /* @@ -1025,9 +1025,9 @@ bool is_mirror_grid(grid_type *g_ptr) bool is_rune_protection_grid(grid_type *g_ptr) { if ((g_ptr->info & CAVE_OBJECT) && has_flag(f_info[g_ptr->mimic].flags, FF_RUNE_PROTECTION)) - return TRUE; + return true; else - return FALSE; + return false; } /* @@ -1036,9 +1036,9 @@ bool is_rune_protection_grid(grid_type *g_ptr) bool is_rune_explosion_grid(grid_type *g_ptr) { if ((g_ptr->info & CAVE_OBJECT) && has_flag(f_info[g_ptr->mimic].flags, FF_RUNE_EXPLOSION)) - return TRUE; + return true; else - return FALSE; + return false; } /*! @@ -1058,25 +1058,25 @@ bool cave_monster_teleportable_bold(player_type *player_ptr, MONSTER_IDX m_idx, /* Require "teleportable" space */ if (!has_flag(f_ptr->flags, FF_TELEPORTABLE)) - return FALSE; + return false; if (g_ptr->m_idx && (g_ptr->m_idx != m_idx)) - return FALSE; + return false; if (player_bold(player_ptr, y, x)) - return FALSE; + return false; /* Hack -- no teleport onto rune of protection */ if (is_rune_protection_grid(g_ptr)) - return FALSE; + return false; if (is_rune_explosion_grid(g_ptr)) - return FALSE; + return false; if (!(mode & TELEPORT_PASSIVE)) { if (!monster_can_cross_terrain(player_ptr, g_ptr->feat, &r_info[m_ptr->r_idx], 0)) - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -1094,40 +1094,40 @@ bool cave_player_teleportable_bold(player_type *player_ptr, POSITION y, POSITION /* Require "teleportable" space */ if (!has_flag(f_ptr->flags, FF_TELEPORTABLE)) - return FALSE; + return false; /* No magical teleporting into vaults and such */ if (!(mode & TELEPORT_NONMAGICAL) && (g_ptr->info & CAVE_ICKY)) - return FALSE; + return false; if (g_ptr->m_idx && (g_ptr->m_idx != player_ptr->riding)) - return FALSE; + return false; /* don't teleport on a trap. */ if (has_flag(f_ptr->flags, FF_HIT_TRAP)) - return FALSE; + return false; if (!(mode & TELEPORT_PASSIVE)) { if (!player_can_enter(player_ptr, g_ptr->feat, 0)) - return FALSE; + return false; if (has_flag(f_ptr->flags, FF_WATER) && has_flag(f_ptr->flags, FF_DEEP)) { if (!player_ptr->levitation && !player_ptr->can_swim) - return FALSE; + return false; } if (has_flag(f_ptr->flags, FF_LAVA) && !has_immune_fire(player_ptr) && !is_invuln(player_ptr)) { /* Always forbid deep lava */ if (has_flag(f_ptr->flags, FF_DEEP)) - return FALSE; + return false; /* Forbid shallow lava when the player don't have levitation */ if (!player_ptr->levitation) - return FALSE; + return false; } } - return TRUE; + return true; } /*! @@ -1157,20 +1157,20 @@ bool player_can_enter(player_type *creature_ptr, FEAT_IDX feature, BIT_FLAGS16 m if (has_flag(f_ptr->flags, FF_PATTERN)) { if (!(mode & CEM_P_CAN_ENTER_PATTERN)) - return FALSE; + return false; } if (has_flag(f_ptr->flags, FF_CAN_FLY) && creature_ptr->levitation) - return TRUE; + return true; if (has_flag(f_ptr->flags, FF_CAN_SWIM) && creature_ptr->can_swim) - return TRUE; + return true; if (has_flag(f_ptr->flags, FF_CAN_PASS) && has_pass_wall(creature_ptr)) - return TRUE; + return true; if (!has_flag(f_ptr->flags, FF_MOVE)) - return FALSE; + return false; - return TRUE; + return true; } void place_grid(player_type *player_ptr, grid_type *g_ptr, grid_bold_type gb_type) diff --git a/src/grid/stair.cpp b/src/grid/stair.cpp index 5b8a5b0ad..71ddd7a88 100644 --- a/src/grid/stair.cpp +++ b/src/grid/stair.cpp @@ -18,8 +18,8 @@ */ void place_random_stairs(player_type *player_ptr, POSITION y, POSITION x) { - bool up_stairs = TRUE; - bool down_stairs = TRUE; + bool up_stairs = true; + bool down_stairs = true; grid_type *g_ptr; floor_type *floor_ptr = player_ptr->current_floor_ptr; g_ptr = &floor_ptr->grid_array[y][x]; @@ -27,22 +27,22 @@ void place_random_stairs(player_type *player_ptr, POSITION y, POSITION x) return; if (!floor_ptr->dun_level) - up_stairs = FALSE; + up_stairs = false; if (ironman_downward) - up_stairs = FALSE; + up_stairs = false; if (floor_ptr->dun_level >= d_info[player_ptr->dungeon_idx].maxdepth) - down_stairs = FALSE; + down_stairs = false; if (quest_number(player_ptr, floor_ptr->dun_level) && (floor_ptr->dun_level > 1)) - down_stairs = FALSE; + down_stairs = false; if (down_stairs && up_stairs) { if (randint0(100) < 50) - up_stairs = FALSE; + up_stairs = false; else - down_stairs = FALSE; + down_stairs = false; } if (up_stairs) @@ -64,14 +64,14 @@ bool cave_valid_bold(floor_type *floor_ptr, POSITION y, POSITION x) { grid_type *g_ptr = &floor_ptr->grid_array[y][x]; if (cave_has_flag_grid(g_ptr, FF_PERMANENT)) - return FALSE; + return false; for (const auto this_o_idx : g_ptr->o_idx_list) { object_type *o_ptr; o_ptr = &floor_ptr->o_list[this_o_idx]; if (object_is_artifact(o_ptr)) - return FALSE; + return false; } - return TRUE; + return true; } diff --git a/src/grid/trap.cpp b/src/grid/trap.cpp index 811911e1e..8acac7020 100644 --- a/src/grid/trap.cpp +++ b/src/grid/trap.cpp @@ -167,7 +167,7 @@ FEAT_IDX choose_random_trap(player_type *trapped_ptr) /* Pick a trap */ floor_type *floor_ptr = trapped_ptr->current_floor_ptr; - while (TRUE) { + while (true) { /* Hack -- pick a trap */ feat = normal_traps[randint0(MAX_NORMAL_TRAPS)]; @@ -263,21 +263,21 @@ static int check_hit_from_monster_to_player(player_type *target_ptr, int power) if (target_ptr->pseikaku == PERSONALITY_LAZY) if (one_in_(20)) - return TRUE; + return true; /* Paranoia -- No power */ if (power <= 0) - return FALSE; + return false; /* Total armor */ ac = target_ptr->ac + target_ptr->to_a; /* Power competes against Armor */ if (randint1(power) > ((ac * 3) / 4)) - return TRUE; + return true; /* Assume miss */ - return FALSE; + return false; } /*! @@ -342,13 +342,13 @@ static void hit_trap_pit(player_type *trapped_ptr, enum trap_type trap_feat_type */ static bool hit_trap_dart(player_type *target_ptr) { - bool hit = FALSE; + bool hit = false; if (check_hit_from_monster_to_player(target_ptr, 125)) { msg_print(_("小さなダーツが飛んできて刺さった！", "A small dart hits you!")); take_hit(target_ptr, DAMAGE_ATTACK, damroll(1, 4), _("ダーツの罠", "a dart trap")); if (!check_multishadow(target_ptr)) - hit = TRUE; + hit = true; } else { msg_print(_("小さなダーツが飛んできた！が、運良く当たらなかった。", "A small dart barely misses you.")); } @@ -435,7 +435,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap) exe_write_diary(trapped_ptr, DIARY_DESCRIPTION, 0, _("落とし戸に落ちた", "fell through a trap door!")); prepare_change_floor_mode(trapped_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT); - trapped_ptr->leaving = TRUE; + trapped_ptr->leaving = true; } break; } @@ -456,7 +456,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap) if (trapped_ptr->current_floor_ptr->dun_level > randint1(100)) /* No nasty effect for low levels */ { - bool stop_ty = FALSE; + bool stop_ty = false; int count = 0; do { diff --git a/src/hpmp/hp-mp-processor.cpp b/src/hpmp/hp-mp-processor.cpp index f16a1188c..b6964305e 100644 --- a/src/hpmp/hp-mp-processor.cpp +++ b/src/hpmp/hp-mp-processor.cpp @@ -71,7 +71,7 @@ static bool deal_damege_by_feat(player_type *creature_ptr, grid_type *g_ptr, con damage = damage / 100 + (randint0(100) < (damage % 100)); if (damage == 0) - return FALSE; + return false; if (creature_ptr->levitation) { msg_print(msg_levitation); @@ -89,7 +89,7 @@ static bool deal_damege_by_feat(player_type *creature_ptr, grid_type *g_ptr, con additional_effect(creature_ptr, damage); } - return TRUE; + return true; } /*! @@ -100,7 +100,7 @@ void process_player_hp_mp(player_type *creature_ptr) { grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x]; feature_type *f_ptr = &f_info[g_ptr->feat]; - bool cave_no_regen = FALSE; + bool cave_no_regen = false; int upkeep_factor = 0; int regen_amount = PY_REGEN_NORMAL; if (creature_ptr->poisoned && !is_invuln(creature_ptr)) { @@ -133,7 +133,7 @@ void process_player_hp_mp(player_type *creature_ptr) if ((creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & (CAVE_GLOW | CAVE_MNDK)) == CAVE_GLOW) { msg_print(_("日光があなたのアンデッドの肉体を焼き焦がした！", "The sun's rays scorch your undead flesh!")); take_hit(creature_ptr, DAMAGE_NOESCAPE, 1, _("日光", "sunlight")); - cave_no_regen = TRUE; + cave_no_regen = true; } } @@ -148,7 +148,7 @@ void process_player_hp_mp(player_type *creature_ptr) describe_flavor(creature_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); msg_format(_("%sがあなたのアンデッドの肉体を焼き焦がした！", "The %s scorches your undead flesh!"), o_name); - cave_no_regen = TRUE; + cave_no_regen = true; describe_flavor(creature_ptr, o_name, o_ptr, OD_NAME_ONLY); sprintf(ouch, _("%sを装備したダメージ", "wielding %s"), o_name); @@ -190,7 +190,7 @@ void process_player_hp_mp(player_type *creature_ptr) if (calc_inventory_weight(creature_ptr) > calc_weight_limit(creature_ptr)) { msg_print(_("溺れている！", "You are drowning!")); take_hit(creature_ptr, DAMAGE_NOESCAPE, randint1(creature_ptr->lev), _("溺れ", "drowning")); - cave_no_regen = TRUE; + cave_no_regen = true; } } @@ -242,7 +242,7 @@ void process_player_hp_mp(player_type *creature_ptr) if (!is_invuln(creature_ptr) && !creature_ptr->wraith_form && !creature_ptr->tim_pass_wall && ((creature_ptr->chp > (creature_ptr->lev / 5)) || !has_pass_wall(creature_ptr))) { concptr dam_desc; - cave_no_regen = TRUE; + cave_no_regen = true; if (has_pass_wall(creature_ptr)) { msg_print(_("体の分子が分解した気がする！", "Your molecules feel disrupted!")); @@ -267,7 +267,7 @@ void process_player_hp_mp(player_type *creature_ptr) } if (pattern_effect(creature_ptr)) { - cave_no_regen = TRUE; + cave_no_regen = true; } else { if (creature_ptr->regenerate) { regen_amount = regen_amount * 2; @@ -329,7 +329,7 @@ bool hp_player(player_type *creature_ptr, int num) vir = virtue_number(creature_ptr, V_VITALITY); if (num <= 0) - return FALSE; + return false; if (vir) { num = num * (creature_ptr->virtues[vir - 1] + 1250) / 1250; @@ -357,8 +357,8 @@ bool hp_player(player_type *creature_ptr, int num) msg_print(_("ひじょうに気分が良くなった。", "You feel very good.")); } - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/src/hpmp/hp-mp-regenerator.cpp b/src/hpmp/hp-mp-regenerator.cpp index b44152b75..b11c261a3 100644 --- a/src/hpmp/hp-mp-regenerator.cpp +++ b/src/hpmp/hp-mp-regenerator.cpp @@ -197,7 +197,7 @@ void regenerate_monsters(player_type *player_ptr) */ void regenerate_captured_monsters(player_type *creature_ptr) { - bool heal = FALSE; + bool heal = false; for (int i = 0; i < INVEN_TOTAL; i++) { monster_race *r_ptr; object_type *o_ptr = &creature_ptr->inventory_list[i]; @@ -208,7 +208,7 @@ void regenerate_captured_monsters(player_type *creature_ptr) if (!o_ptr->pval) continue; - heal = TRUE; + heal = true; r_ptr = &r_info[o_ptr->pval]; if (o_ptr->xtra4 < o_ptr->xtra5) { int frac = o_ptr->xtra5 / 100; diff --git a/src/info-reader/feature-reader.cpp b/src/info-reader/feature-reader.cpp index 877d42276..2d6fba9b8 100644 --- a/src/info-reader/feature-reader.cpp +++ b/src/info-reader/feature-reader.cpp @@ -396,7 +396,7 @@ s16b f_tag_to_index_in_init(concptr str) FEAT_IDX feat = f_tag_to_index(str); if (feat < 0) - feat_tag_is_not_found = TRUE; + feat_tag_is_not_found = true; return feat; } diff --git a/src/info-reader/fixed-map-parser.cpp b/src/info-reader/fixed-map-parser.cpp index eaff6b0de..1882eb400 100644 --- a/src/info-reader/fixed-map-parser.cpp +++ b/src/info-reader/fixed-map-parser.cpp @@ -242,7 +242,7 @@ parse_error_type parse_fixed_map(player_type *player_ptr, concptr name, int ymin int num = -1; parse_error_type err = PARSE_ERROR_NONE; - bool bypass = FALSE; + bool bypass = false; int x = xmin; int y = ymin; qtwg_type tmp_qg; diff --git a/src/inventory/floor-item-getter.cpp b/src/inventory/floor-item-getter.cpp index 8a54637c5..073360d5c 100644 --- a/src/inventory/floor-item-getter.cpp +++ b/src/inventory/floor-item-getter.cpp @@ -45,7 +45,7 @@ static bool check_floor_item_tag_aux(player_type *owner_ptr, fis_type *fis_ptr, char *prev_tag) { if (!fis_ptr->floor || (*fis_ptr->cp >= 0)) - return FALSE; + return false; if (*prev_tag && command_cmd) { fis_ptr->floor_num @@ -55,20 +55,20 @@ static bool check_floor_item_tag_aux(player_type *owner_ptr, fis_type *fis_ptr, fis_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } *prev_tag = '\0'; - return FALSE; + return false; } if (!item_tester_okay(owner_ptr, &owner_ptr->current_floor_ptr->o_list[0 - (*fis_ptr->cp)], fis_ptr->tval) && ((fis_ptr->mode & USE_FULL) == 0)) - return FALSE; + return false; fis_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } /*! @@ -80,7 +80,7 @@ static bool check_floor_item_tag_aux(player_type *owner_ptr, fis_type *fis_ptr, */ static bool get_floor_item_tag_inventory(player_type *owner_ptr, fis_type *fis_ptr, char *prev_tag) { - bool flag = FALSE; + bool flag = false; item_use_flag use_flag = (*fis_ptr->cp >= INVEN_MAIN_HAND) ? USE_EQUIP : USE_INVEN; flag |= !get_tag(owner_ptr, &fis_ptr->k, *prev_tag, use_flag, fis_ptr->tval); @@ -93,14 +93,14 @@ static bool get_floor_item_tag_inventory(player_type *owner_ptr, fis_type *fis_p if (flag) { *prev_tag = '\0'; - return FALSE; + return false; } *fis_ptr->cp = fis_ptr->k; fis_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } /*! @@ -114,7 +114,7 @@ static bool check_floor_item_tag_inventory(player_type *owner_ptr, fis_type *fis { if ((!fis_ptr->inven || (*fis_ptr->cp < 0) || (*fis_ptr->cp >= INVEN_PACK)) && (!fis_ptr->equip || (*fis_ptr->cp < INVEN_MAIN_HAND) || (*fis_ptr->cp >= INVEN_TOTAL))) - return FALSE; + return false; if ((*prev_tag != '\0') && command_cmd) return get_floor_item_tag_inventory(owner_ptr, fis_ptr, prev_tag); @@ -123,10 +123,10 @@ static bool check_floor_item_tag_inventory(player_type *owner_ptr, fis_type *fis fis_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -139,17 +139,17 @@ static bool check_floor_item_tag_inventory(player_type *owner_ptr, fis_type *fis static bool check_floor_item_tag(player_type *owner_ptr, fis_type *fis_ptr, char *prev_tag) { if (!repeat_pull(fis_ptr->cp)) - return FALSE; + return false; if (fis_ptr->force && (*fis_ptr->cp == INVEN_FORCE)) { fis_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } if (check_floor_item_tag_aux(owner_ptr, fis_ptr, prev_tag)) - return TRUE; + return true; return check_floor_item_tag_inventory(owner_ptr, fis_ptr, prev_tag); } @@ -210,13 +210,13 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp fis_type *fis_ptr = initialize_fis_type(&tmp_fis, cp, mode, tval); static char prev_tag = '\0'; if (check_floor_item_tag(owner_ptr, fis_ptr, &prev_tag)) - return TRUE; + return true; msg_print(NULL); handle_stuff(owner_ptr); test_inventory_floor(owner_ptr, fis_ptr); - fis_ptr->done = FALSE; - fis_ptr->item = FALSE; + fis_ptr->done = false; + fis_ptr->item = false; fis_ptr->i1 = 0; fis_ptr->i2 = INVEN_PACK - 1; while ((fis_ptr->i1 <= fis_ptr->i2) && (!get_item_okay(owner_ptr, fis_ptr->i1, fis_ptr->tval))) @@ -251,22 +251,22 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp = scan_floor_items(owner_ptr, fis_ptr->floor_list, owner_ptr->y, owner_ptr->x, SCAN_FLOOR_ITEM_TESTER | SCAN_FLOOR_ONLY_MARKED, fis_ptr->tval); if ((mode & USE_INVEN) && (fis_ptr->i1 <= fis_ptr->i2)) - fis_ptr->allow_inven = TRUE; + fis_ptr->allow_inven = true; if ((mode & USE_EQUIP) && (fis_ptr->e1 <= fis_ptr->e2)) - fis_ptr->allow_equip = TRUE; + fis_ptr->allow_equip = true; if ((mode & USE_FLOOR) && (fis_ptr->floor_num)) - fis_ptr->allow_floor = TRUE; + fis_ptr->allow_floor = true; if (!fis_ptr->allow_inven && !fis_ptr->allow_equip && !fis_ptr->allow_floor) { - command_see = FALSE; - fis_ptr->oops = TRUE; - fis_ptr->done = TRUE; + command_see = false; + fis_ptr->oops = true; + fis_ptr->done = true; if (fis_ptr->force) { *cp = INVEN_FORCE; - fis_ptr->item = TRUE; + fis_ptr->item = true; } } else { if (command_see && (command_wrk == USE_EQUIP) && fis_ptr->allow_equip) @@ -281,7 +281,7 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp /* 追加オプション(always_show_list)が設定されている場合は常に一覧を表示する */ if ((always_show_list == TRUE) || use_menu) - command_see = TRUE; + command_see = true; if (command_see) screen_save(); @@ -433,7 +433,7 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp case 'z': case 'Z': case '0': { - fis_ptr->done = TRUE; + fis_ptr->done = true; break; } case '8': @@ -565,22 +565,22 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp } if (!get_item_allow(owner_ptr, get_item_label)) { - fis_ptr->done = TRUE; + fis_ptr->done = true; break; } *cp = get_item_label; } - fis_ptr->item = TRUE; - fis_ptr->done = TRUE; + fis_ptr->item = true; + fis_ptr->done = true; break; } case 'w': { if (fis_ptr->force) { *cp = INVEN_FORCE; - fis_ptr->item = TRUE; - fis_ptr->done = TRUE; + fis_ptr->item = true; + fis_ptr->done = true; break; } } @@ -594,18 +594,18 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp switch (fis_ptr->which) { case ESCAPE: { - fis_ptr->done = TRUE; + fis_ptr->done = true; break; } case '*': case '?': case ' ': { if (command_see) { - command_see = FALSE; + command_see = false; screen_load(); } else { screen_save(); - command_see = TRUE; + command_see = true; } break; @@ -677,13 +677,13 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp if ((command_wrk == (USE_FLOOR)) || (!carry_query_flag)) { fis_ptr->k = 0 - fis_ptr->floor_list[0]; if (!get_item_allow(owner_ptr, fis_ptr->k)) { - fis_ptr->done = TRUE; + fis_ptr->done = true; break; } *cp = fis_ptr->k; - fis_ptr->item = TRUE; - fis_ptr->done = TRUE; + fis_ptr->item = true; + fis_ptr->done = true; break; } } @@ -731,33 +731,33 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp } if (!get_item_allow(owner_ptr, fis_ptr->k)) { - fis_ptr->done = TRUE; + fis_ptr->done = true; break; } *cp = fis_ptr->k; - fis_ptr->item = TRUE; - fis_ptr->done = TRUE; + fis_ptr->item = true; + fis_ptr->done = true; fis_ptr->cur_tag = fis_ptr->which; break; } case 'w': { if (fis_ptr->force) { *cp = INVEN_FORCE; - fis_ptr->item = TRUE; - fis_ptr->done = TRUE; + fis_ptr->item = true; + fis_ptr->done = true; break; } } /* Fall through */ default: { - bool tag_not_found = FALSE; + bool tag_not_found = false; if (command_wrk != USE_FLOOR) { if (!get_tag(owner_ptr, &fis_ptr->k, fis_ptr->which, command_wrk, fis_ptr->tval)) - tag_not_found = TRUE; + tag_not_found = true; else if ((fis_ptr->k < INVEN_MAIN_HAND) ? !fis_ptr->inven : !fis_ptr->equip) - tag_not_found = TRUE; + tag_not_found = true; if (!tag_not_found) fis_ptr->cur_tag = fis_ptr->which; @@ -766,7 +766,7 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp fis_ptr->k = 0 - fis_ptr->floor_list[fis_ptr->k]; fis_ptr->cur_tag = fis_ptr->which; } else - tag_not_found = TRUE; + tag_not_found = true; } if (tag_not_found) { @@ -809,18 +809,18 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp auto ver = tag_not_found && isupper(fis_ptr->which); if (ver && !verify(owner_ptr, _("本当に", "Try"), fis_ptr->k)) { - fis_ptr->done = TRUE; + fis_ptr->done = true; break; } if (!get_item_allow(owner_ptr, fis_ptr->k)) { - fis_ptr->done = TRUE; + fis_ptr->done = true; break; } *cp = fis_ptr->k; - fis_ptr->item = TRUE; - fis_ptr->done = TRUE; + fis_ptr->item = true; + fis_ptr->done = true; break; } } @@ -828,7 +828,7 @@ bool get_item_floor(player_type *owner_ptr, COMMAND_CODE *cp, concptr pmt, concp if (command_see) { screen_load(); - command_see = FALSE; + command_see = false; } fis_ptr->tval = TV_NONE; diff --git a/src/inventory/inventory-object.cpp b/src/inventory/inventory-object.cpp index c502fff19..55348833a 100644 --- a/src/inventory/inventory-object.cpp +++ b/src/inventory/inventory-object.cpp @@ -150,12 +150,12 @@ void drop_from_inventory(player_type *owner_ptr, INVENTORY_IDX item, ITEM_NUMBER */ void combine_pack(player_type *owner_ptr) { - bool flag = FALSE; - bool is_first_combination = TRUE; - bool combined = TRUE; + bool flag = false; + bool is_first_combination = true; + bool combined = true; while (is_first_combination || combined) { - is_first_combination = FALSE; - combined = FALSE; + is_first_combination = false; + combined = false; for (int i = INVEN_PACK; i > 0; i--) { object_type *o_ptr; @@ -179,7 +179,7 @@ void combine_pack(player_type *owner_ptr) continue; if (o_ptr->number + j_ptr->number <= max_num) { - flag = TRUE; + flag = true; object_absorb(j_ptr, o_ptr); owner_ptr->inven_cnt--; int k; @@ -204,7 +204,7 @@ void combine_pack(player_type *owner_ptr) } owner_ptr->window_flags |= (PW_INVEN); - combined = TRUE; + combined = true; break; } } @@ -228,7 +228,7 @@ void reorder_pack(player_type *owner_ptr) object_type forge; object_type *q_ptr; object_type *o_ptr; - bool flag = FALSE; + bool flag = false; for (i = 0; i < INVEN_PACK; i++) { if ((i == INVEN_PACK) && (owner_ptr->inven_cnt == INVEN_PACK)) @@ -247,7 +247,7 @@ void reorder_pack(player_type *owner_ptr) if (j >= i) continue; - flag = TRUE; + flag = true; q_ptr = &forge; q_ptr->copy_from(&owner_ptr->inventory_list[i]); for (k = i; k > j; k--) { @@ -354,7 +354,7 @@ bool check_store_item_to_inventory(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if (player_ptr->inven_cnt < INVEN_PACK) - return TRUE; + return true; for (int j = 0; j < INVEN_PACK; j++) { object_type *j_ptr = &player_ptr->inventory_list[j]; @@ -362,10 +362,10 @@ bool check_store_item_to_inventory(player_type *player_ptr, object_type *o_ptr) continue; if (object_similar(j_ptr, o_ptr)) - return TRUE; + return true; } - return FALSE; + return false; } /*! diff --git a/src/inventory/inventory-util.cpp b/src/inventory/inventory-util.cpp index 1cdad1730..ea75313ee 100644 --- a/src/inventory/inventory-util.cpp +++ b/src/inventory/inventory-util.cpp @@ -53,7 +53,7 @@ bool get_tag_floor(floor_type *floor_ptr, COMMAND_CODE *cp, char tag, FLOOR_IDX while (s) { if ((s[1] == command_cmd) && (s[2] == tag)) { *cp = i; - return TRUE; + return true; } s = angband_strchr(s + 1, '@'); @@ -61,7 +61,7 @@ bool get_tag_floor(floor_type *floor_ptr, COMMAND_CODE *cp, char tag, FLOOR_IDX } if (tag < '0' || '9' < tag) { - return FALSE; + return false; } for (COMMAND_CODE i = 0; i < floor_num && i < 23; i++) { @@ -73,14 +73,14 @@ bool get_tag_floor(floor_type *floor_ptr, COMMAND_CODE *cp, char tag, FLOOR_IDX while (s) { if (s[1] == tag) { *cp = i; - return TRUE; + return true; } s = angband_strchr(s + 1, '@'); } } - return FALSE; + return false; } /*! @@ -114,7 +114,7 @@ bool get_tag(player_type *owner_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode, break; default: - return FALSE; + return false; } for (COMMAND_CODE i = start; i <= end; i++) { @@ -129,7 +129,7 @@ bool get_tag(player_type *owner_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode, while (s) { if ((s[1] == command_cmd) && (s[2] == tag)) { *cp = i; - return TRUE; + return true; } s = angband_strchr(s + 1, '@'); @@ -137,7 +137,7 @@ bool get_tag(player_type *owner_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode, } if (tag < '0' || '9' < tag) - return FALSE; + return false; for (COMMAND_CODE i = start; i <= end; i++) { object_type *o_ptr = &owner_ptr->inventory_list[i]; @@ -151,14 +151,14 @@ bool get_tag(player_type *owner_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode, while (s) { if (s[1] == tag) { *cp = i; - return TRUE; + return true; } s = angband_strchr(s + 1, '@'); } } - return FALSE; + return false; } /*! @@ -170,7 +170,7 @@ bool get_tag(player_type *owner_ptr, COMMAND_CODE *cp, char tag, BIT_FLAGS mode, bool get_item_okay(player_type *owner_ptr, OBJECT_IDX i, tval_type item_tester_tval) { if ((i < 0) || (i >= INVEN_TOTAL)) - return FALSE; + return false; if (owner_ptr->select_ring_slot) return is_ring_slot(i); @@ -189,7 +189,7 @@ bool get_item_okay(player_type *owner_ptr, OBJECT_IDX i, tval_type item_tester_t bool get_item_allow(player_type *owner_ptr, INVENTORY_IDX item) { if (!command_cmd) - return TRUE; + return true; object_type *o_ptr; if (item >= 0) @@ -198,18 +198,18 @@ bool get_item_allow(player_type *owner_ptr, INVENTORY_IDX item) o_ptr = &owner_ptr->current_floor_ptr->o_list[0 - item]; if (!o_ptr->inscription) - return TRUE; + return true; concptr s = angband_strchr(quark_str(o_ptr->inscription), '!'); while (s) { if ((s[1] == command_cmd) || (s[1] == '*')) if (!verify(owner_ptr, _("本当に", "Really try"), item)) - return FALSE; + return false; s = angband_strchr(s + 1, '!'); } - return TRUE; + return true; } /*! diff --git a/src/inventory/item-getter.cpp b/src/inventory/item-getter.cpp index 83a1bcce1..0017ede76 100644 --- a/src/inventory/item-getter.cpp +++ b/src/inventory/item-getter.cpp @@ -35,13 +35,13 @@ static void check_item_selection_mode(item_selection_type *item_selection_ptr) { if (item_selection_ptr->mode & USE_EQUIP) - item_selection_ptr->equip = TRUE; + item_selection_ptr->equip = true; if (item_selection_ptr->mode & USE_INVEN) - item_selection_ptr->inven = TRUE; + item_selection_ptr->inven = true; if (item_selection_ptr->mode & USE_FLOOR) - item_selection_ptr->floor = TRUE; + item_selection_ptr->floor = true; } /*! @@ -54,18 +54,18 @@ static void check_item_selection_mode(item_selection_type *item_selection_ptr) static bool check_item_tag_aux(player_type *owner_ptr, item_selection_type *item_selection_ptr) { if (!item_selection_ptr->floor || (*item_selection_ptr->cp >= 0)) - return FALSE; + return false; object_type *o_ptr; item_selection_ptr->k = 0 - (*item_selection_ptr->cp); o_ptr = &owner_ptr->current_floor_ptr->o_list[item_selection_ptr->k]; if (!item_tester_okay(owner_ptr, o_ptr, item_selection_ptr->tval) && ((item_selection_ptr->mode & USE_FULL) == 0)) - return FALSE; + return false; item_selection_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } /*! @@ -79,11 +79,11 @@ static bool check_item_tag_inventory(player_type *owner_ptr, item_selection_type { if ((!item_selection_ptr->inven || (*item_selection_ptr->cp < 0) || (*item_selection_ptr->cp >= INVEN_PACK)) && (!item_selection_ptr->equip || (*item_selection_ptr->cp < INVEN_MAIN_HAND) || (*item_selection_ptr->cp >= INVEN_TOTAL))) - return FALSE; + return false; if (*prev_tag && command_cmd) { - bool flag = FALSE; + bool flag = false; item_use_flag use_flag = (*item_selection_ptr->cp >= INVEN_MAIN_HAND) ? USE_EQUIP : USE_INVEN; flag |= !get_tag(owner_ptr, &item_selection_ptr->k, *prev_tag, use_flag, item_selection_ptr->tval); @@ -96,23 +96,23 @@ static bool check_item_tag_inventory(player_type *owner_ptr, item_selection_type if (flag) { *prev_tag = '\0'; - return FALSE; + return false; } *item_selection_ptr->cp = item_selection_ptr->k; item_selection_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } if (!get_item_okay(owner_ptr, *item_selection_ptr->cp, item_selection_ptr->tval)) - return FALSE; + return false; item_selection_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } /*! @@ -125,17 +125,17 @@ static bool check_item_tag_inventory(player_type *owner_ptr, item_selection_type static bool check_item_tag(player_type *owner_ptr, item_selection_type *item_selection_ptr, char *prev_tag) { if (!repeat_pull(item_selection_ptr->cp)) - return FALSE; + return false; if (item_selection_ptr->mode & USE_FORCE && (*item_selection_ptr->cp == INVEN_FORCE)) { item_selection_ptr->tval = TV_NONE; item_tester_hook = NULL; command_cmd = 0; - return TRUE; + return true; } if (check_item_tag_aux(owner_ptr, item_selection_ptr)) - return TRUE; + return true; return check_item_tag_inventory(owner_ptr, item_selection_ptr, prev_tag); } @@ -205,11 +205,11 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, item_selection_type *item_selection_ptr = initialize_item_selection_type(&tmp_selection, cp, mode, tval); check_item_selection_mode(item_selection_ptr); if (check_item_tag(owner_ptr, item_selection_ptr, &prev_tag)) - return TRUE; + return true; msg_print(NULL); - item_selection_ptr->done = FALSE; - item_selection_ptr->item = FALSE; + item_selection_ptr->done = false; + item_selection_ptr->item = false; item_selection_ptr->i1 = 0; item_selection_ptr->i2 = INVEN_PACK - 1; test_inventory(owner_ptr, item_selection_ptr); @@ -241,33 +241,33 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, object_type *o_ptr; o_ptr = &owner_ptr->current_floor_ptr->o_list[this_o_idx]; if ((item_tester_okay(owner_ptr, o_ptr, item_selection_ptr->tval) || (item_selection_ptr->mode & USE_FULL)) && (o_ptr->marked & OM_FOUND)) - item_selection_ptr->allow_floor = TRUE; + item_selection_ptr->allow_floor = true; } } if (!item_selection_ptr->allow_floor && (item_selection_ptr->i1 > item_selection_ptr->i2) && (item_selection_ptr->e1 > item_selection_ptr->e2)) { - command_see = FALSE; - item_selection_ptr->oops = TRUE; - item_selection_ptr->done = TRUE; + command_see = false; + item_selection_ptr->oops = true; + item_selection_ptr->done = true; if (item_selection_ptr->mode & USE_FORCE) { *item_selection_ptr->cp = INVEN_FORCE; - item_selection_ptr->item = TRUE; + item_selection_ptr->item = true; } } else { if (command_see && command_wrk && item_selection_ptr->equip) - command_wrk = TRUE; + command_wrk = true; else if (item_selection_ptr->inven) - command_wrk = FALSE; + command_wrk = false; else if (item_selection_ptr->equip) - command_wrk = TRUE; + command_wrk = true; else - command_wrk = FALSE; + command_wrk = false; } /* 追加オプション(always_show_list)が設定されている場合は常に一覧を表示する */ if ((always_show_list == TRUE) || use_menu) - command_see = TRUE; + command_see = true; if (command_see) screen_save(); @@ -350,7 +350,7 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, case 'z': case 'Z': case '0': { - item_selection_ptr->done = TRUE; + item_selection_ptr->done = true; break; } @@ -405,22 +405,22 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, } if (!get_item_allow(owner_ptr, get_item_label)) { - item_selection_ptr->done = TRUE; + item_selection_ptr->done = true; break; } *item_selection_ptr->cp = get_item_label; } - item_selection_ptr->item = TRUE; - item_selection_ptr->done = TRUE; + item_selection_ptr->item = true; + item_selection_ptr->done = true; break; } case 'w': { if (item_selection_ptr->mode & USE_FORCE) { *item_selection_ptr->cp = INVEN_FORCE; - item_selection_ptr->item = TRUE; - item_selection_ptr->done = TRUE; + item_selection_ptr->item = true; + item_selection_ptr->done = true; break; } } @@ -434,18 +434,18 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, switch (item_selection_ptr->which) { case ESCAPE: { - item_selection_ptr->done = TRUE; + item_selection_ptr->done = true; break; } case '*': case '?': case ' ': { if (command_see) { - command_see = FALSE; + command_see = false; screen_load(); } else { screen_save(); - command_see = TRUE; + command_see = true; } break; @@ -478,8 +478,8 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, continue; *item_selection_ptr->cp = item_selection_ptr->k; - item_selection_ptr->item = TRUE; - item_selection_ptr->done = TRUE; + item_selection_ptr->item = true; + item_selection_ptr->done = true; break; } @@ -516,32 +516,32 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, } if (!get_item_allow(owner_ptr, item_selection_ptr->k)) { - item_selection_ptr->done = TRUE; + item_selection_ptr->done = true; break; } *item_selection_ptr->cp = item_selection_ptr->k; - item_selection_ptr->item = TRUE; - item_selection_ptr->done = TRUE; + item_selection_ptr->item = true; + item_selection_ptr->done = true; item_selection_ptr->cur_tag = item_selection_ptr->which; break; } case 'w': { if (item_selection_ptr->mode & USE_FORCE) { *item_selection_ptr->cp = INVEN_FORCE; - item_selection_ptr->item = TRUE; - item_selection_ptr->done = TRUE; + item_selection_ptr->item = true; + item_selection_ptr->done = true; break; } } /* Fall through */ default: { - bool tag_not_found = FALSE; + bool tag_not_found = false; if (!get_tag(owner_ptr, &item_selection_ptr->k, item_selection_ptr->which, command_wrk ? USE_EQUIP : USE_INVEN, item_selection_ptr->tval)) { - tag_not_found = TRUE; + tag_not_found = true; } else if ((item_selection_ptr->k < INVEN_MAIN_HAND) ? !item_selection_ptr->inven : !item_selection_ptr->equip) { - tag_not_found = TRUE; + tag_not_found = true; } if (!tag_not_found) @@ -573,18 +573,18 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, auto ver = tag_not_found && isupper(item_selection_ptr->which); if (ver && !verify(owner_ptr, _("本当に", "Try"), item_selection_ptr->k)) { - item_selection_ptr->done = TRUE; + item_selection_ptr->done = true; break; } if (!get_item_allow(owner_ptr, item_selection_ptr->k)) { - item_selection_ptr->done = TRUE; + item_selection_ptr->done = true; break; } *item_selection_ptr->cp = item_selection_ptr->k; - item_selection_ptr->item = TRUE; - item_selection_ptr->done = TRUE; + item_selection_ptr->item = true; + item_selection_ptr->done = true; break; } } @@ -592,7 +592,7 @@ bool get_item(player_type *owner_ptr, OBJECT_IDX *cp, concptr pmt, concptr str, if (command_see) { screen_load(); - command_see = FALSE; + command_see = false; } item_selection_ptr->tval = TV_NONE; diff --git a/src/inventory/item-selection-util.cpp b/src/inventory/item-selection-util.cpp index b2c14c89a..99f7dc6e7 100644 --- a/src/inventory/item-selection-util.cpp +++ b/src/inventory/item-selection-util.cpp @@ -10,15 +10,15 @@ fis_type *initialize_fis_type(fis_type *fis_ptr, COMMAND_CODE *cp, BIT_FLAGS mod fis_ptr->n1 = ' '; fis_ptr->n2 = ' '; fis_ptr->which = ' '; - fis_ptr->oops = FALSE; + fis_ptr->oops = false; fis_ptr->equip = (fis_ptr->mode & USE_EQUIP) != 0; fis_ptr->inven = (fis_ptr->mode & USE_INVEN) != 0; fis_ptr->floor = (fis_ptr->mode & USE_FLOOR) != 0; fis_ptr->force = (fis_ptr->mode & USE_FORCE) != 0; - fis_ptr->allow_equip = FALSE; - fis_ptr->allow_inven = FALSE; - fis_ptr->allow_floor = FALSE; - fis_ptr->toggle = FALSE; + fis_ptr->allow_equip = false; + fis_ptr->allow_inven = false; + fis_ptr->allow_floor = false; + fis_ptr->toggle = false; fis_ptr->floor_top = 0; fis_ptr->min_width = 0; fis_ptr->menu_line = use_menu ? 1 : 0; @@ -34,12 +34,12 @@ item_selection_type *initialize_item_selection_type(item_selection_type *item_se item_selection_ptr->mode = mode; item_selection_ptr->tval = tval; item_selection_ptr->which = ' '; - item_selection_ptr->oops = FALSE; - item_selection_ptr->equip = FALSE; - item_selection_ptr->inven = FALSE; - item_selection_ptr->floor = FALSE; - item_selection_ptr->allow_floor = FALSE; - item_selection_ptr->toggle = FALSE; + item_selection_ptr->oops = false; + item_selection_ptr->equip = false; + item_selection_ptr->inven = false; + item_selection_ptr->floor = false; + item_selection_ptr->allow_floor = false; + item_selection_ptr->toggle = false; item_selection_ptr->menu_line = (use_menu ? 1 : 0); item_selection_ptr->max_inven = 0; item_selection_ptr->max_equip = 0; diff --git a/src/inventory/player-inventory.cpp b/src/inventory/player-inventory.cpp index d0981d385..b46be513b 100644 --- a/src/inventory/player-inventory.cpp +++ b/src/inventory/player-inventory.cpp @@ -48,7 +48,7 @@ bool can_get_item(player_type *owner_ptr, tval_type tval) { for (int j = 0; j < INVEN_TOTAL; j++) if (item_tester_okay(owner_ptr, &owner_ptr->inventory_list[j], tval)) - return TRUE; + return true; OBJECT_IDX floor_list[23]; ITEM_NUMBER floor_num = scan_floor_items(owner_ptr, floor_list, owner_ptr->y, owner_ptr->x, SCAN_FLOOR_ITEM_TESTER | SCAN_FLOOR_ONLY_MARKED, tval); @@ -69,10 +69,10 @@ static bool py_pickup_floor_aux(player_type *owner_ptr) if (choose_object(owner_ptr, &item, q, s, (USE_FLOOR), TV_NONE)) this_o_idx = 0 - item; else - return FALSE; + return false; describe_pickup_item(owner_ptr, this_o_idx); - return TRUE; + return true; } /*! @@ -283,7 +283,7 @@ void carry(player_type *creature_ptr, bool pickup) continue; } - int is_pickup_successful = TRUE; + int is_pickup_successful = true; if (carry_query_flag) { char out_val[MAX_NLEN + 20]; sprintf(out_val, _("%sを拾いますか? ", "Pick up %s? "), o_name); diff --git a/src/inventory/recharge-processor.cpp b/src/inventory/recharge-processor.cpp index a8a219282..df8c04b26 100644 --- a/src/inventory/recharge-processor.cpp +++ b/src/inventory/recharge-processor.cpp @@ -64,7 +64,7 @@ void recharge_magic_items(player_type *creature_ptr) o_ptr->timeout--; if (!o_ptr->timeout) { recharged_notice(creature_ptr, o_ptr); - changed = TRUE; + changed = true; } } } @@ -96,9 +96,9 @@ void recharge_magic_items(player_type *creature_ptr) if (!(o_ptr->timeout)) { recharged_notice(creature_ptr, o_ptr); - changed = TRUE; + changed = true; } else if (o_ptr->timeout % k_ptr->pval) { - changed = TRUE; + changed = true; } } } diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp index b9fed9f2d..885945385 100644 --- a/src/io-dump/character-dump.cpp +++ b/src/io-dump/character-dump.cpp @@ -53,8 +53,8 @@ */ static void dump_aux_pet(player_type *master_ptr, FILE *fff) { - bool pet = FALSE; - bool pet_settings = FALSE; + bool pet = false; + bool pet_settings = false; for (int i = master_ptr->current_floor_ptr->m_max - 1; i >= 1; i--) { monster_type *m_ptr = &master_ptr->current_floor_ptr->m_list[i]; @@ -62,12 +62,12 @@ static void dump_aux_pet(player_type *master_ptr, FILE *fff) continue; if (!is_pet(m_ptr)) continue; - pet_settings = TRUE; + pet_settings = true; if (!m_ptr->nickname && (master_ptr->riding != i)) continue; if (!pet) { fprintf(fff, _("\n\n [主なペット]\n\n", "\n\n [Leading Pets]\n\n")); - pet = TRUE; + pet = true; } GAME_TEXT pet_name[MAX_NLEN]; @@ -161,7 +161,7 @@ static void dump_aux_recall(FILE *fff) { fprintf(fff, _("\n [帰還場所]\n\n", "\n [Recall Depth]\n\n")); for (int y = 1; y < current_world_ptr->max_d_idx; y++) { - bool seiha = FALSE; + bool seiha = false; if (!d_info[y].maxdepth) continue; @@ -169,9 +169,9 @@ static void dump_aux_recall(FILE *fff) continue; if (d_info[y].final_guardian) { if (!r_info[d_info[y].final_guardian].max_num) - seiha = TRUE; + seiha = true; } else if (max_dlv[y] == d_info[y].maxdepth) - seiha = TRUE; + seiha = true; fprintf(fff, _(" %c%-12s: %3d 階\n", " %c%-16s: level %3d\n"), seiha ? '!' : ' ', d_info[y].name.c_str(), (int)max_dlv[y]); } diff --git a/src/io-dump/dump-remover.cpp b/src/io-dump/dump-remover.cpp index c9fd2688f..af88305d7 100644 --- a/src/io-dump/dump-remover.cpp +++ b/src/io-dump/dump-remover.cpp @@ -13,8 +13,8 @@ void remove_auto_dump(concptr orig_file, concptr auto_dump_mark) { char buf[1024]; - bool between_mark = FALSE; - bool changed = FALSE; + bool between_mark = false; + bool changed = false; int line_num = 0; long header_location = 0; char header_mark_str[80]; @@ -32,14 +32,14 @@ void remove_auto_dump(concptr orig_file, concptr auto_dump_mark) char tmp_file[FILE_NAME_SIZE]; if (!open_temporary_file(&tmp_fff, tmp_file)) return; - while (TRUE) + while (true) { if (angband_fgets(orig_fff, buf, sizeof(buf))) { if (between_mark) { fseek(orig_fff, header_location, SEEK_SET); - between_mark = FALSE; + between_mark = false; continue; } else @@ -54,8 +54,8 @@ void remove_auto_dump(concptr orig_file, concptr auto_dump_mark) { header_location = ftell(orig_fff); line_num = 0; - between_mark = TRUE; - changed = TRUE; + between_mark = true; + changed = true; } else { @@ -74,7 +74,7 @@ void remove_auto_dump(concptr orig_file, concptr auto_dump_mark) fseek(orig_fff, header_location, SEEK_SET); } - between_mark = FALSE; + between_mark = false; continue; } diff --git a/src/io-dump/dump-util.cpp b/src/io-dump/dump-util.cpp index a1b1a5485..04d56951a 100644 --- a/src/io-dump/dump-util.cpp +++ b/src/io-dump/dump-util.cpp @@ -39,33 +39,33 @@ bool visual_mode_command(char ch, bool *visual_list_ptr, { case ESCAPE: { - if (!*visual_list_ptr) return FALSE; + if (!*visual_list_ptr) return false; *cur_attr_ptr = attr_old; *cur_char_ptr = char_old; - *visual_list_ptr = FALSE; - return TRUE; + *visual_list_ptr = false; + return true; } case '\n': case '\r': { - if (!*visual_list_ptr) return FALSE; + if (!*visual_list_ptr) return false; - *visual_list_ptr = FALSE; - *need_redraw = TRUE; - return TRUE; + *visual_list_ptr = false; + *need_redraw = true; + return true; } case 'V': case 'v': { - if (*visual_list_ptr) return FALSE; + if (*visual_list_ptr) return false; - *visual_list_ptr = TRUE; + *visual_list_ptr = true; *attr_top_ptr = MAX(0, (*cur_attr_ptr & 0x7f) - 5); *char_left_ptr = MAX(0, *cur_char_ptr - 10); attr_old = *cur_attr_ptr; char_old = *cur_char_ptr; - return TRUE; + return true; } case 'C': case 'c': @@ -78,7 +78,7 @@ bool visual_mode_command(char ch, bool *visual_list_ptr, char_idx_feat[i] = 0; } - return TRUE; + return true; } case 'P': case 'p': @@ -87,7 +87,7 @@ bool visual_mode_command(char ch, bool *visual_list_ptr, { *cur_attr_ptr = attr_idx; *attr_top_ptr = MAX(0, (*cur_attr_ptr & 0x7f) - 5); - if (!*visual_list_ptr) *need_redraw = TRUE; + if (!*visual_list_ptr) *need_redraw = true; } if (char_idx) @@ -95,14 +95,14 @@ bool visual_mode_command(char ch, bool *visual_list_ptr, /* Set the char */ *cur_char_ptr = char_idx; *char_left_ptr = MAX(0, *cur_char_ptr - 10); - if (!*visual_list_ptr) *need_redraw = TRUE; + if (!*visual_list_ptr) *need_redraw = true; } - return TRUE; + return true; } default: { - if (!*visual_list_ptr) return FALSE; + if (!*visual_list_ptr) return false; int eff_width; int d = get_keymap_dir(ch); @@ -128,7 +128,7 @@ bool visual_mode_command(char ch, bool *visual_list_ptr, if ((ddy[d] < 0) && *attr_top_ptr > MAX(0, (int)(a & 0x7f) - 4)) (*attr_top_ptr)--; if ((ddy[d] > 0) && *attr_top_ptr + height < MIN(0x7f, (a & 0x7f) + 4)) (*attr_top_ptr)++; - return TRUE; + return true; } } } @@ -144,11 +144,11 @@ bool visual_mode_command(char ch, bool *visual_list_ptr, bool open_temporary_file(FILE **fff, char *file_name) { *fff = angband_fopen_temp(file_name, FILE_NAME_SIZE); - if (*fff != NULL) return TRUE; + if (*fff != NULL) return true; msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), file_name); msg_print(NULL); - return FALSE; + return false; } diff --git a/src/io-dump/special-class-dump.cpp b/src/io-dump/special-class-dump.cpp index f02f6edc6..c8298325e 100644 --- a/src/io-dump/special-class-dump.cpp +++ b/src/io-dump/special-class-dump.cpp @@ -170,7 +170,7 @@ static void dump_blue_mage(player_type *creature_ptr, FILE *fff) EnumClassFlagGroup::get_flags(learnt_magic.ability_flags, std::back_inserter(learnt_spells)); col++; - bool pcol = FALSE; + bool pcol = false; strcat(p[col], " "); for (auto spell : learnt_spells) { @@ -178,7 +178,7 @@ static void dump_blue_mage(player_type *creature_ptr, FILE *fff) if (creature_ptr->magic_num2[spellnum] == 0) continue; - pcol = TRUE; + pcol = true; int l1 = strlen(p[col]); int l2 = strlen(monster_powers_short[spellnum]); if ((l1 + l2) >= 75) { diff --git a/src/io/command-repeater.cpp b/src/io/command-repeater.cpp index c81ec0682..594817a60 100644 --- a/src/io/command-repeater.cpp +++ b/src/io/command-repeater.cpp @@ -25,10 +25,10 @@ void repeat_push(COMMAND_CODE what) bool repeat_pull(COMMAND_CODE *what) { if (repeat__idx == repeat__cnt) - return FALSE; + return false; *what = repeat__key[repeat__idx++]; - return TRUE; + return true; } void repeat_check(void) diff --git a/src/io/cursor.cpp b/src/io/cursor.cpp index e66eccfd0..9b91d3d9b 100644 --- a/src/io/cursor.cpp +++ b/src/io/cursor.cpp @@ -121,7 +121,7 @@ bool change_panel(player_type *player_ptr, POSITION dy, POSITION dx) x = 0; if ((y == panel_row_min) && (x == panel_col_min)) - return FALSE; + return false; panel_row_min = y; panel_col_min = x; @@ -130,7 +130,7 @@ bool change_panel(player_type *player_ptr, POSITION dy, POSITION dx) player_ptr->update |= (PU_MONSTERS); player_ptr->redraw |= (PR_MAP); handle_stuff(player_ptr); - return TRUE; + return true; } /*! diff --git a/src/io/files-util.cpp b/src/io/files-util.cpp index 1f49a56fa..4946f277b 100644 --- a/src/io/files-util.cpp +++ b/src/io/files-util.cpp @@ -110,7 +110,7 @@ errr get_rnd_line(concptr file_name, int entry, char *output) int test; int line_num = 0; - while (TRUE) { + while (true) { if (angband_fgets(fp, buf, sizeof(buf)) != 0) { angband_fclose(fp); return -1; @@ -140,7 +140,7 @@ errr get_rnd_line(concptr file_name, int entry, char *output) int counter; for (counter = 0;; counter++) { - while (TRUE) { + while (true) { test = angband_fgets(fp, buf, sizeof(buf)); if (!test) { /* Ignore lines starting with 'N:' */ @@ -181,7 +181,7 @@ errr get_rnd_line_jonly(concptr file_name, int entry, char *output, int count) result = get_rnd_line(file_name, entry, output); if (result) break; - bool kanji = FALSE; + bool kanji = false; for (int j = 0; output[j]; j++) kanji |= iskanji(output[j]); if (kanji) @@ -214,7 +214,7 @@ static errr counts_seek(player_type *creature_ptr, int fd, u32b where, bool flag int seekpoint = 0; u32b zero_header[3] = { 0L, 0L, 0L }; - while (TRUE) { + while (true) { if (fd_seek(fd, seekpoint + 3 * sizeof(u32b))) return 1; if (fd_read(fd, (char *)(temp2), sizeof(temp2))) { diff --git a/src/io/input-key-acceptor.cpp b/src/io/input-key-acceptor.cpp index 81ad61453..8d041ae99 100644 --- a/src/io/input-key-acceptor.cpp +++ b/src/io/input-key-acceptor.cpp @@ -33,14 +33,14 @@ static char inkey_macro_trigger_string[1024]; * * Do not match any macros until "ascii 30" is found. */ -static bool parse_macro = FALSE; +static bool parse_macro = false; /* * Local variable -- we are inside a "macro trigger" * * Strip all keypresses until a low ascii value is found. */ -static bool parse_under = FALSE; +static bool parse_under = false; /*! * @brief 全てのウィンドウの再描画を行う @@ -65,7 +65,7 @@ static void forget_macro_action(void) if (!parse_macro) return; - while (TRUE) { + while (true) { char ch; if (term_inkey(&ch, FALSE, TRUE)) break; @@ -75,7 +75,7 @@ static void forget_macro_action(void) break; } - parse_macro = FALSE; + parse_macro = false; } /* @@ -105,14 +105,14 @@ static char inkey_aux(void) if (parse_macro) { if (term_inkey(&ch, FALSE, TRUE)) { - parse_macro = FALSE; + parse_macro = false; } } else { (void)(term_inkey(&ch, TRUE, TRUE)); } if (ch == 30) - parse_macro = FALSE; + parse_macro = false; if (ch == 30) return (ch); @@ -127,7 +127,7 @@ static char inkey_aux(void) if (k < 0) return (ch); - while (TRUE) { + while (true) { k = macro_find_maybe(buf); if (k < 0) @@ -164,7 +164,7 @@ static char inkey_aux(void) return 0; } - parse_macro = TRUE; + parse_macro = true; if (term_key_push(30)) return 0; @@ -187,19 +187,19 @@ static char inkey_aux(void) char inkey(bool do_all_term_refresh) { char ch = 0; - bool done = FALSE; + bool done = false; term_type *old = Term; if (inkey_next && *inkey_next && !inkey_xtra) { ch = *inkey_next++; - inkey_base = inkey_xtra = inkey_flag = inkey_scan = FALSE; + inkey_base = inkey_xtra = inkey_flag = inkey_scan = false; return (ch); } inkey_next = NULL; if (inkey_xtra) { - parse_macro = FALSE; - parse_under = FALSE; + parse_macro = false; + parse_under = false; term_flush(); } @@ -226,10 +226,10 @@ char inkey(bool do_all_term_refresh) all_term_fresh(x, y); else term_fresh(); - current_world_ptr->character_saved = FALSE; + current_world_ptr->character_saved = false; signal_count = 0; - done = TRUE; + done = true; } if (inkey_base) { @@ -242,7 +242,7 @@ char inkey(bool do_all_term_refresh) break; } - while (TRUE) { + while (true) { if (0 == term_inkey(&ch, FALSE, TRUE)) { break; } else { @@ -265,14 +265,14 @@ char inkey(bool do_all_term_refresh) if (parse_under && (ch <= 32)) { ch = 0; - parse_under = FALSE; + parse_under = false; } if (ch == 30) { ch = 0; } else if (ch == 31) { ch = 0; - parse_under = TRUE; + parse_under = true; } else if (parse_under) { ch = 0; } @@ -280,7 +280,7 @@ char inkey(bool do_all_term_refresh) term_activate(old); term_set_cursor(v); - inkey_base = inkey_xtra = inkey_flag = inkey_scan = FALSE; + inkey_base = inkey_xtra = inkey_flag = inkey_scan = false; return (ch); } @@ -376,7 +376,7 @@ int inkey_special(bool numpad_cursor) ascii_to_text(buf, inkey_macro_trigger_string); if (prefix(str, "\\[")) { str += 2; - while (TRUE) { + while (true) { for (i = 0; modifier_key_list[i].keyname; i++) { if (prefix(str, modifier_key_list[i].keyname)) { str += strlen(modifier_key_list[i].keyname); @@ -389,7 +389,7 @@ int inkey_special(bool numpad_cursor) } if (!numpad_as_cursorkey) - numpad_cursor = FALSE; + numpad_cursor = false; for (i = 0; special_key_list[i].keyname; i++) { if ((!special_key_list[i].numpad || numpad_cursor) && streq(str, special_key_list[i].keyname)) { @@ -425,7 +425,7 @@ void stop_term_fresh(void) { for (int j = 0; j < 8; j++) { if (angband_term[j]) - angband_term[j]->never_fresh = TRUE; + angband_term[j]->never_fresh = true; } } @@ -436,7 +436,7 @@ void start_term_fresh(void) { for (int j = 0; j < 8; j++) { if (angband_term[j]) - angband_term[j]->never_fresh = FALSE; + angband_term[j]->never_fresh = false; } } diff --git a/src/io/input-key-processor.cpp b/src/io/input-key-processor.cpp index 31f41760b..a1a776374 100644 --- a/src/io/input-key-processor.cpp +++ b/src/io/input-key-processor.cpp @@ -105,14 +105,14 @@ bool enter_wizard_mode(player_type *player_ptr) if (!current_world_ptr->noscore) { if (!allow_debug_opts || arg_wizard) { msg_print(_("ウィザードモードは許可されていません。 ", "Wizard mode is not permitted.")); - return FALSE; + return false; } msg_print(_("ウィザードモードはデバッグと実験のためのモードです。 ", "Wizard mode is for debugging and experimenting.")); msg_print(_("一度ウィザードモードに入るとスコアは記録されません。", "The game will not be scored if you enter wizard mode.")); msg_print(NULL); if (!get_check(_("本当にウィザードモードに入りたいのですか? ", "Are you sure you want to enter wizard mode? "))) { - return FALSE; + return false; } exe_write_diary( @@ -120,7 +120,7 @@ bool enter_wizard_mode(player_type *player_ptr) current_world_ptr->noscore |= 0x0002; } - return TRUE; + return true; } /*! @@ -134,14 +134,14 @@ static bool enter_debug_mode(player_type *player_ptr) if (!current_world_ptr->noscore) { if (!allow_debug_opts) { msg_print(_("デバッグコマンドは許可されていません。 ", "Use of debug command is not permitted.")); - return FALSE; + return false; } msg_print(_("デバッグ・コマンドはデバッグと実験のためのコマンドです。 ", "The debug commands are for debugging and experimenting.")); msg_print(_("デバッグ・コマンドを使うとスコアは記録されません。", "The game will not be scored if you use debug commands.")); msg_print(NULL); if (!get_check(_("本当にデバッグ・コマンドを使いますか? ", "Are you sure you want to use debug commands? "))) { - return FALSE; + return false; } exe_write_diary( @@ -149,7 +149,7 @@ static bool enter_debug_mode(player_type *player_ptr) current_world_ptr->noscore |= 0x0008; } - return TRUE; + return true; } /*! @@ -163,7 +163,7 @@ void process_command(player_type *creature_ptr) repeat_check(); now_message = 0; if ((creature_ptr->pclass == CLASS_SNIPER) && (creature_ptr->concent)) - creature_ptr->reset_concent = TRUE; + creature_ptr->reset_concent = true; floor_type *floor_ptr = creature_ptr->current_floor_ptr; switch (command_cmd) { @@ -176,10 +176,10 @@ void process_command(player_type *creature_ptr) } case KTRL('W'): { if (current_world_ptr->wizard) { - current_world_ptr->wizard = FALSE; + current_world_ptr->wizard = false; msg_print(_("ウィザードモード解除。", "Wizard mode off.")); } else if (enter_wizard_mode(creature_ptr)) { - current_world_ptr->wizard = TRUE; + current_world_ptr->wizard = true; msg_print(_("ウィザードモード突入。", "Wizard mode on.")); } diff --git a/src/io/input-key-requester.cpp b/src/io/input-key-requester.cpp index c26fe3fa8..48c3c5559 100644 --- a/src/io/input-key-requester.cpp +++ b/src/io/input-key-requester.cpp @@ -64,7 +64,7 @@ static char inkey_from_menu(player_type *player_ptr) screen_save(); floor_type *floor_ptr = player_ptr->current_floor_ptr; - while (TRUE) { + while (true) { int i; char sub_cmd; concptr menu_name; @@ -116,7 +116,7 @@ static char inkey_from_menu(player_type *player_ptr) if ((sub_cmd == ' ') || (sub_cmd == 'x') || (sub_cmd == 'X') || (sub_cmd == '\r') || (sub_cmd == '\n')) { if (menu_info[menu][num].fin) { cmd = menu_info[menu][num].cmd; - use_menu = TRUE; + use_menu = true; break; } else { menu = menu_info[menu][num].cmd; @@ -206,9 +206,9 @@ void request_command(player_type *player_ptr, int shopping) command_cmd = 0; command_arg = 0; command_dir = 0; - use_menu = FALSE; + use_menu = false; - while (TRUE) { + while (true) { if (!macro_running() && !command_new && auto_debug_save && (!inkey_next || *inkey_next == '\0')) { save_player(player_ptr, SAVE_TYPE_DEBUG); } @@ -221,9 +221,9 @@ void request_command(player_type *player_ptr, int shopping) cmd = command_new; command_new = 0; } else { - msg_flag = FALSE; + msg_flag = false; num_more = 0; - inkey_flag = TRUE; + inkey_flag = true; term_fresh(); cmd = inkey(true); if (!shopping && command_menu && ((cmd == '\r') || (cmd == '\n') || (cmd == 'x') || (cmd == 'X')) && !keymap_act[mode][(byte)(cmd)]) @@ -235,7 +235,7 @@ void request_command(player_type *player_ptr, int shopping) COMMAND_ARG old_arg = command_arg; command_arg = 0; prt(_("回数: ", "Count: "), 0, 0); - while (TRUE) { + while (true) { cmd = inkey(); if ((cmd == 0x7F) || (cmd == KTRL('H'))) { command_arg = command_arg / 10; diff --git a/src/io/interpret-pref-file.cpp b/src/io/interpret-pref-file.cpp index 61bd2812c..f495c1343 100644 --- a/src/io/interpret-pref-file.cpp +++ b/src/io/interpret-pref-file.cpp @@ -307,12 +307,12 @@ static errr interpret_xy_token(player_type *creature_ptr, char *buf) if (buf[0] == 'X') { option_flag[os] &= ~(1UL << ob); - (*option_info[i].o_var) = FALSE; + (*option_info[i].o_var) = false; return 0; } option_flag[os] |= (1UL << ob); - (*option_info[i].o_var) = TRUE; + (*option_info[i].o_var) = true; return 0; } diff --git a/src/io/read-pref-file.cpp b/src/io/read-pref-file.cpp index b2cc3f938..dc93e4e4a 100644 --- a/src/io/read-pref-file.cpp +++ b/src/io/read-pref-file.cpp @@ -61,7 +61,7 @@ static errr process_pref_file_aux(player_type *creature_ptr, concptr name, int p int line = -1; errr err = 0; - bool bypass = FALSE; + bool bypass = false; while (angband_fgets(fp, file_read__buf, FILE_READ_BUFF_SIZE) == 0) { line++; if (!file_read__buf[0]) @@ -198,7 +198,7 @@ errr process_histpref_file(player_type *creature_ptr, concptr name) path_build(buf, sizeof(buf), ANGBAND_DIR_USER, name); /* Hack -- prevent modification birth options in this file */ - current_world_ptr->character_xtra = TRUE; + current_world_ptr->character_xtra = true; errr err = process_pref_file_aux(creature_ptr, buf, PREF_TYPE_HISTPREF); current_world_ptr->character_xtra = old_character_xtra; return err; @@ -241,7 +241,7 @@ bool open_auto_dump(FILE **fpp, concptr buf, concptr mark) if (!fpp) { msg_format(_("%s を開くことができませんでした。", "Failed to open %s."), buf); msg_print(NULL); - return FALSE; + return false; } fprintf(*fpp, "%s\n", header_mark_str); @@ -249,7 +249,7 @@ bool open_auto_dump(FILE **fpp, concptr buf, concptr mark) auto_dump_printf(*fpp, _("# *警告!!* 以降の行は自動生成されたものです。\n", "# *Warning!* The lines below are an automatic dump.\n")); auto_dump_printf( *fpp, _("# *警告!!* 後で自動的に削除されるので編集しないでください。\n", "# Don't edit them; changes will be deleted and replaced automatically.\n")); - return TRUE; + return true; } /*! @@ -313,7 +313,7 @@ bool read_histpref(player_type *creature_ptr) char histbuf[HISTPREF_LIMIT]; if (!get_check(_("生い立ち設定ファイルをロードしますか? ", "Load background history preference file? "))) - return FALSE; + return false; histbuf[0] = '\0'; histpref_buf = histbuf; @@ -330,12 +330,12 @@ bool read_histpref(player_type *creature_ptr) msg_print(_("生い立ち設定ファイルの読み込みに失敗しました。", "Failed to load background history preference.")); msg_print(NULL); histpref_buf = NULL; - return FALSE; + return false; } else if (!histpref_buf[0]) { msg_print(_("有効な生い立ち設定はこのファイルにありません。", "There does not exist valid background history preference.")); msg_print(NULL); histpref_buf = NULL; - return FALSE; + return false; } for (i = 0; i < 4; i++) @@ -371,5 +371,5 @@ bool read_histpref(player_type *creature_ptr) } histpref_buf = NULL; - return TRUE; + return true; } diff --git a/src/io/record-play-movie.cpp b/src/io/record-play-movie.cpp index 2aca47637..7fb416654 100644 --- a/src/io/record-play-movie.cpp +++ b/src/io/record-play-movie.cpp @@ -146,23 +146,23 @@ static bool string_is_repeat(char *str, int len) int i; if (len < 2) - return FALSE; + return false; #ifdef JP if (iskanji(c)) - return FALSE; + return false; #endif for (i = 1; i < len; i++) { #ifdef JP if (c != str[i] || iskanji(str[i])) - return FALSE; + return false; #else if (c != str[i]) - return FALSE; + 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) @@ -322,7 +322,7 @@ void prepare_movie_hooks(player_type *player_ptr) static int handle_movie_timestamp_data(int timestamp) { - static int initialized = FALSE; + static int initialized = false; /* 描画キューは空かどうか？ */ if (!initialized) { @@ -331,7 +331,7 @@ static int handle_movie_timestamp_data(int timestamp) epoch_time += browse_delay; epoch_time -= timestamp; // time_diff = current_time - timestamp; - initialized = TRUE; + initialized = true; } /* 描画キューに保存し、保存位置を進める */ @@ -413,7 +413,7 @@ static bool get_nextbuf(char *buf) { char *ptr = buf; - while (TRUE) { + while (true) { *ptr = ring.buf[ring.rptr++]; ring.inlen--; if (ring.rptr == RINGBUF_SIZE) @@ -423,9 +423,9 @@ static bool get_nextbuf(char *buf) } if (buf[0] == 'd') - return FALSE; + return false; - return TRUE; + return true; } /* プレイホストのマップが大きいときクライアントのマップもリサイズする */ @@ -454,11 +454,11 @@ static bool flush_ringbuf_client(void) /* 書くデータなし */ if (fresh_queue.next == fresh_queue.tail) - return FALSE; + return false; /* まだ書くべき時でない */ if (fresh_queue.time[fresh_queue.next] > get_current_time() - epoch_time) - return FALSE; + return false; /* 時間情報(区切り)が得られるまで書く */ while (get_nextbuf(buf)) { @@ -541,7 +541,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; } void prepare_browse_movie_without_path_build(concptr filename) diff --git a/src/io/report.cpp b/src/io/report.cpp index 1121af7aa..9787427ee 100644 --- a/src/io/report.cpp +++ b/src/io/report.cpp @@ -170,10 +170,10 @@ size_t read_callback(char *buffer, size_t size, size_t nitems, void *userdata) */ static bool http_post(concptr url, BUF *buf) { - bool succeeded = FALSE; + bool succeeded = false; CURL *curl = curl_easy_init(); if (curl == NULL) { - return FALSE; + return false; } struct curl_slist *slist = NULL; @@ -219,7 +219,7 @@ static bool http_post(concptr url, BUF *buf) long response_code; curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response_code); if (response_code == 200) { - succeeded = TRUE; + succeeded = true; } } @@ -301,7 +301,7 @@ concptr make_screen_dump(player_type *creature_ptr) /* Clear -more- prompt first */ msg_print(NULL); - use_graphics = FALSE; + use_graphics = false; reset_visuals(creature_ptr); creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY); @@ -390,7 +390,7 @@ concptr make_screen_dump(player_type *creature_ptr) if (!old_use_graphics) return ret; - use_graphics = TRUE; + use_graphics = true; reset_visuals(creature_ptr); creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY); @@ -451,7 +451,7 @@ errr report_score(player_type *creature_ptr, display_player_pf display_player) term_clear(); - bool succeeded = FALSE; + bool succeeded = false; while (!succeeded) { term_fresh(); @@ -459,7 +459,7 @@ errr report_score(player_type *creature_ptr, display_player_pf display_player) term_fresh(); if (http_post(SCORE_PATH, score)) { - succeeded = TRUE; + succeeded = true; } else { prt(_("スコア・サーバへの送信に失敗しました。", "Failed to send to the score server."), 0, 0); (void)inkey(); diff --git a/src/io/signal-handlers.cpp b/src/io/signal-handlers.cpp index 733580f36..375a8f155 100644 --- a/src/io/signal-handlers.cpp +++ b/src/io/signal-handlers.cpp @@ -79,10 +79,10 @@ static void handle_signal_simple(int sig) forget_lite(p_ptr->current_floor_ptr); forget_view(p_ptr->current_floor_ptr); clear_mon_lite(p_ptr->current_floor_ptr); - p_ptr->playing = FALSE; + p_ptr->playing = false; if (!cheat_immortal) - p_ptr->is_dead = TRUE; - p_ptr->leaving = TRUE; + p_ptr->is_dead = true; + p_ptr->leaving = true; close_game(p_ptr); quit(_("強制終了", "interrupt")); } else if (signal_count >= 4) { diff --git a/src/io/write-diary.cpp b/src/io/write-diary.cpp index 3bc6a1e6c..b98eb050d 100644 --- a/src/io/write-diary.cpp +++ b/src/io/write-diary.cpp @@ -60,12 +60,12 @@ static bool open_diary_file(FILE **fff, bool *disable_diary) char buf[1024]; path_build(buf, sizeof(buf), ANGBAND_DIR_USER, file_name); *fff = angband_fopen(buf, "a"); - if (*fff) return TRUE; + if (*fff) return true; msg_format(_("%s を開くことができませんでした。プレイ記録を一時停止します。", "Failed to open %s. Play-Record is disabled temporarily."), buf); msg_format(NULL); - *disable_diary = TRUE; - return FALSE; + *disable_diary = true; + return false; } @@ -172,7 +172,7 @@ static void write_diary_pet(FILE *fff, int num, concptr note) */ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) { - static bool disable_diary = FALSE; + static bool disable_diary = false; int day, hour, min; extract_day_hour_min(creature_ptr, &day, &hour, &min); @@ -199,7 +199,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) char note_level_buf[40]; QUEST_IDX q_idx = write_floor(creature_ptr, ¬e_level, note_level_buf); - bool do_level = TRUE; + bool do_level = true; switch (type) { case DIARY_DIALY: @@ -209,7 +209,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) else fputs(_("*****日目\n", "Day *****\n"), fff); - do_level = FALSE; + do_level = false; break; } case DIARY_DESCRIPTION: @@ -217,7 +217,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) if (num) { fprintf(fff, "%s\n", note); - do_level = FALSE; + do_level = false; } else fprintf(fff, " %2d:%02d %20s %s\n", hour, min, note_level, note); @@ -350,7 +350,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) { fprintf(fff, _(" 闘技場のすべての敵に勝利し、チャンピオンとなった。\n", " won all fights to become a Champion.\n")); - do_level = FALSE; + do_level = false; } break; @@ -386,7 +386,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) case DIARY_GAMESTART: { time_t ct = time((time_t*)0); - do_level = FALSE; + do_level = false; if (num) fprintf(fff, "%s %s", note, ctime(&ct)); else @@ -408,7 +408,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) } angband_fclose(fff); - if (do_level) write_level = FALSE; + if (do_level) write_level = false; return 0; } diff --git a/src/knowledge/knowledge-features.cpp b/src/knowledge/knowledge-features.cpp index c8aaec61f..7654600ee 100644 --- a/src/knowledge/knowledge-features.cpp +++ b/src/knowledge/knowledge-features.cpp @@ -113,7 +113,7 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f int feat_cnt; FEAT_IDX grp_idx[100]; TERM_COLOR attr_top = 0; - bool visual_list = FALSE; + bool visual_list = false; byte char_left = 0; TERM_LEN browser_rows = hgt - 8; if (direct_f_idx < 0) { @@ -152,8 +152,8 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f FEAT_IDX feat_cur = 0; FEAT_IDX feat_top = 0; TERM_LEN column = 0; - bool flag = FALSE; - bool redraw = TRUE; + bool flag = false; + bool redraw = true; TERM_COLOR *cur_attr_ptr; SYMBOL_CODE *cur_char_ptr; while (!flag) { @@ -187,7 +187,7 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f } } - redraw = FALSE; + redraw = false; } if (direct_f_idx < 0) { @@ -270,7 +270,7 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f if (prev_x_char != f_ptr->x_char[*lighting_level]) char_left = MAX(0, f_ptr->x_char[*lighting_level] - 10); } else - *need_redraw = TRUE; + *need_redraw = true; continue; } else if (visual_mode_command(ch, &visual_list, browser_rows - 1, wid - (max + 3), &attr_top, &char_left, cur_attr_ptr, cur_char_ptr, need_redraw)) { @@ -285,7 +285,7 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f case '\n': case '\r': if (direct_f_idx >= 0) - flag = TRUE; + flag = true; else *lighting_level = F_LIT_STANDARD; break; @@ -325,7 +325,7 @@ void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX direct_f switch (ch) { case ESCAPE: { - flag = TRUE; + flag = true; break; } @@ -350,7 +350,7 @@ void do_cmd_knowledge_dungeon(player_type *creature_ptr) return; for (int i = 1; i < current_world_ptr->max_d_idx; i++) { - bool seiha = FALSE; + bool seiha = false; if (!d_info[i].maxdepth) continue; @@ -358,9 +358,9 @@ void do_cmd_knowledge_dungeon(player_type *creature_ptr) continue; if (d_info[i].final_guardian) { if (!r_info[d_info[i].final_guardian].max_num) - seiha = TRUE; + seiha = true; } else if (max_dlv[i] == d_info[i].maxdepth) - seiha = TRUE; + seiha = true; fprintf(fff, _("%c%-12s : %3d 階\n", "%c%-16s : level %3d\n"), seiha ? '!' : ' ', d_info[i].name.c_str(), (int)max_dlv[i]); } diff --git a/src/knowledge/knowledge-inventory.cpp b/src/knowledge/knowledge-inventory.cpp index 073d399a6..0018cd817 100644 --- a/src/knowledge/knowledge-inventory.cpp +++ b/src/knowledge/knowledge-inventory.cpp @@ -80,15 +80,15 @@ static bool determine_spcial_item_type(object_type *o_ptr, tval_type tval) static bool check_item_knowledge(object_type *o_ptr, tval_type tval) { if (o_ptr->k_idx == 0) - return FALSE; + return false; if (o_ptr->tval != tval) - return FALSE; + return false; if (!object_is_known(o_ptr)) - return FALSE; + return false; if (!determine_spcial_item_type(o_ptr, tval)) - return FALSE; + return false; - return TRUE; + return true; } /*! diff --git a/src/knowledge/knowledge-items.cpp b/src/knowledge/knowledge-items.cpp index 01fff847a..dfdfd2c2c 100644 --- a/src/knowledge/knowledge-items.cpp +++ b/src/knowledge/knowledge-items.cpp @@ -52,13 +52,13 @@ void do_cmd_knowledge_artifacts(player_type *player_ptr) for (ARTIFACT_IDX k = 0; k < max_a_idx; k++) { artifact_type *a_ptr = &a_info[k]; - okay[k] = FALSE; + okay[k] = false; if (a_ptr->name.empty()) continue; if (!a_ptr->cur_num) continue; - okay[k] = TRUE; + okay[k] = true; } for (POSITION y = 0; y < player_ptr->current_floor_ptr->height; y++) { @@ -72,7 +72,7 @@ void do_cmd_knowledge_artifacts(player_type *player_ptr) if (object_is_known(o_ptr)) continue; - okay[o_ptr->name1] = FALSE; + okay[o_ptr->name1] = false; } } } @@ -86,7 +86,7 @@ void do_cmd_knowledge_artifacts(player_type *player_ptr) if (object_is_known(o_ptr)) continue; - okay[o_ptr->name1] = FALSE; + okay[o_ptr->name1] = false; } int n = 0; @@ -250,7 +250,7 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool int object_cnt; OBJECT_IDX *object_idx; - bool visual_list = FALSE; + bool visual_list = false; TERM_COLOR attr_top = 0; byte char_left = 0; byte mode; @@ -302,8 +302,8 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool IDX grp_cur = 0; IDX grp_top = 0; IDX object_cur = object_top = 0; - bool flag = FALSE; - bool redraw = TRUE; + bool flag = false; + bool redraw = true; int column = 0; while (!flag) { object_kind *k_ptr, *flavor_k_ptr; @@ -339,7 +339,7 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool } } - redraw = FALSE; + redraw = false; } if (direct_k_idx < 0) { @@ -412,7 +412,7 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool case '\n': case '\r': case ESCAPE: - flag = TRUE; + flag = true; break; } } @@ -421,7 +421,7 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool switch (ch) { case ESCAPE: { - flag = TRUE; + flag = true; break; } @@ -429,7 +429,7 @@ void do_cmd_knowledge_objects(player_type *creature_ptr, bool *need_redraw, bool case 'r': { if (!visual_list && !visual_only && (grp_cnt > 0)) { desc_obj_fake(creature_ptr, object_idx[object_cur]); - redraw = TRUE; + redraw = true; } break; diff --git a/src/knowledge/knowledge-monsters.cpp b/src/knowledge/knowledge-monsters.cpp index a9597c95a..c673a41b0 100644 --- a/src/knowledge/knowledge-monsters.cpp +++ b/src/knowledge/knowledge-monsters.cpp @@ -72,11 +72,11 @@ static IDX collect_monsters(player_type *creature_ptr, IDX grp_cur, IDX mon_idx[ if (none_bits(r_ptr->flags7, RF7_RIDING)) continue; } else if (grp_wanted) { - bool wanted = FALSE; + bool wanted = false; for (int j = 0; j < MAX_BOUNTY; j++) { if (current_world_ptr->bounty_r_idx[j] == i || current_world_ptr->bounty_r_idx[j] - 10000 == i || (creature_ptr->today_mon && creature_ptr->today_mon == i)) { - wanted = TRUE; + wanted = true; break; } } @@ -305,7 +305,7 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo IDX grp_cnt = 0; IDX grp_idx[100]; IDX mon_cnt; - bool visual_list = FALSE; + bool visual_list = false; TERM_COLOR attr_top = 0; byte char_left = 0; monster_lore_mode mode; @@ -341,8 +341,8 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo IDX mon_cur = 0; IDX mon_top = 0; int column = 0; - bool flag = FALSE; - bool redraw = TRUE; + bool flag = false; + bool redraw = true; while (!flag) { if (redraw) { clear_from(0); @@ -366,7 +366,7 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo } } - redraw = FALSE; + redraw = false; } if (direct_r_idx < 0) { @@ -431,7 +431,7 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo case '\n': case '\r': case ESCAPE: - flag = TRUE; + flag = true; break; } } @@ -441,7 +441,7 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo switch (ch) { case ESCAPE: { - flag = TRUE; + flag = true; break; } @@ -452,7 +452,7 @@ void do_cmd_knowledge_monsters(player_type *creature_ptr, bool *need_redraw, boo (void)inkey(); - redraw = TRUE; + redraw = true; } break; @@ -486,11 +486,11 @@ void do_cmd_knowledge_bounty(player_type *creature_ptr) fprintf(fff, _("賞金首リスト\n", "List of wanted monsters\n")); fprintf(fff, "----------------------------------------------\n"); - bool listed = FALSE; + bool listed = false; for (int i = 0; i < MAX_BOUNTY; i++) { if (current_world_ptr->bounty_r_idx[i] <= 10000) { fprintf(fff, "%s\n", r_info[current_world_ptr->bounty_r_idx[i]].name.c_str()); - listed = TRUE; + listed = true; } } diff --git a/src/knowledge/knowledge-quests.cpp b/src/knowledge/knowledge-quests.cpp index d6c99d3c7..7e47531aa 100644 --- a/src/knowledge/knowledge-quests.cpp +++ b/src/knowledge/knowledge-quests.cpp @@ -187,7 +187,7 @@ static bool do_cmd_knowledge_quests_aux(player_type *player_ptr, FILE *fff, IDX parse_fixed_map(player_ptr, "q_info.txt", 0, 0, 0, 0); floor_ptr->inside_quest = old_quest; if (q_ptr->flags & QUEST_FLAG_SILENT) - return FALSE; + return false; } strnfmt(playtime_str, sizeof(playtime_str), "%02d:%02d:%02d", q_ptr->comptime / (60 * 60), (q_ptr->comptime / 60) % 60, q_ptr->comptime % 60); @@ -196,20 +196,20 @@ static bool do_cmd_knowledge_quests_aux(player_type *player_ptr, FILE *fff, IDX sprintf(tmp_str, _(" %-35s (危険度:%3d階相当) - レベル%2d - %s\n", " %-35s (Danger level: %3d) - level %2d - %s\n"), q_ptr->name, (int)q_ptr->level, q_ptr->complev, playtime_str); fputs(tmp_str, fff); - return TRUE; + return true; } if (q_ptr->complev == 0) { sprintf(tmp_str, _(" %-35s (%3d階) - 不戦勝 - %s\n", " %-35s (Dungeon level: %3d) - Unearned - %s\n"), r_info[q_ptr->r_idx].name.c_str(), (int)q_ptr->level, playtime_str); fputs(tmp_str, fff); - return TRUE; + return true; } sprintf(tmp_str, _(" %-35s (%3d階) - レベル%2d - %s\n", " %-35s (Dungeon level: %3d) - level %2d - %s\n"), r_info[q_ptr->r_idx].name.c_str(), (int)q_ptr->level, q_ptr->complev, playtime_str); fputs(tmp_str, fff); - return TRUE; + return true; } /* diff --git a/src/knowledge/knowledge-uniques.cpp b/src/knowledge/knowledge-uniques.cpp index 6cbe24ccf..06a2554d2 100644 --- a/src/knowledge/knowledge-uniques.cpp +++ b/src/knowledge/knowledge-uniques.cpp @@ -52,28 +52,28 @@ unique_list_type *initialize_unique_lsit_type(unique_list_type *unique_list_ptr, static bool sweep_uniques(monster_race *r_ptr, bool is_alive) { if (r_ptr->name.empty()) - return FALSE; + return false; if (!(r_ptr->flags1 & RF1_UNIQUE)) - return FALSE; + return false; if (!cheat_know && !r_ptr->r_sights) - return FALSE; + return false; - bool is_except_arena = is_alive ? (r_ptr->rarity > 100) && ((r_ptr->flags1 & RF1_QUESTOR) == 0) : FALSE; + bool is_except_arena = is_alive ? (r_ptr->rarity > 100) && ((r_ptr->flags1 & RF1_QUESTOR) == 0) : false; if (!r_ptr->rarity || is_except_arena) - return FALSE; + return false; if (is_alive) { if (r_ptr->max_num == 0) - return FALSE; + return false; } else { if (r_ptr->max_num > 0) - return FALSE; + return false; } - return TRUE; + return true; } static void display_uniques(unique_list_type *unique_list_ptr, FILE *fff) diff --git a/src/load/angband-version-comparer.cpp b/src/load/angband-version-comparer.cpp index 30adf5da5..13de13e30 100644 --- a/src/load/angband-version-comparer.cpp +++ b/src/load/angband-version-comparer.cpp @@ -13,26 +13,26 @@ bool h_older_than(byte major, byte minor, byte patch, byte extra) { if (current_world_ptr->h_ver_major < major) - return TRUE; + return true; if (current_world_ptr->h_ver_major > major) - return FALSE; + return false; if (current_world_ptr->h_ver_minor < minor) - return TRUE; + return true; if (current_world_ptr->h_ver_minor > minor) - return FALSE; + return false; if (current_world_ptr->h_ver_patch < patch) - return TRUE; + return true; if (current_world_ptr->h_ver_patch > patch) - return FALSE; + return false; if (current_world_ptr->h_ver_extra < extra) - return TRUE; + return true; if (current_world_ptr->h_ver_extra > extra) - return FALSE; + return false; - return FALSE; + return false; } /*! @@ -47,19 +47,19 @@ bool h_older_than(byte major, byte minor, byte patch, byte extra) bool h_older_than(byte major, byte minor, byte patch) { if (current_world_ptr->h_ver_major < major) - return TRUE; + return true; if (current_world_ptr->h_ver_major > major) - return FALSE; + return false; if (current_world_ptr->h_ver_minor < minor) - return TRUE; + return true; if (current_world_ptr->h_ver_minor > minor) - return FALSE; + return false; if (current_world_ptr->h_ver_patch < patch) - return TRUE; + return true; if (current_world_ptr->h_ver_patch > patch) - return FALSE; + return false; - return FALSE; + return false; } diff --git a/src/load/birth-loader.cpp b/src/load/birth-loader.cpp index 421b4d011..d340d79b6 100644 --- a/src/load/birth-loader.cpp +++ b/src/load/birth-loader.cpp @@ -12,7 +12,7 @@ void load_quick_start(void) { if (h_older_than(1, 0, 13)) { - previous_char.quick_ok = FALSE; + previous_char.quick_ok = false; return; } diff --git a/src/load/dungeon-loader.cpp b/src/load/dungeon-loader.cpp index 16815d7d9..7b30d482f 100644 --- a/src/load/dungeon-loader.cpp +++ b/src/load/dungeon-loader.cpp @@ -126,7 +126,7 @@ static errr rd_dungeon(player_type *player_ptr) break; } - current_world_ptr->character_dungeon = TRUE; + current_world_ptr->character_dungeon = true; return err; } diff --git a/src/load/floor-loader.cpp b/src/load/floor-loader.cpp index f8537d6fc..dc7317b10 100644 --- a/src/load/floor-loader.cpp +++ b/src/load/floor-loader.cpp @@ -247,23 +247,23 @@ static bool load_floor_aux(player_type *player_ptr, saved_floor_type *sf_ptr) u32b tmp32u; rd_u32b(&tmp32u); if (saved_floor_file_sign != tmp32u) - return FALSE; + return false; if (rd_saved_floor(player_ptr, sf_ptr)) - return FALSE; + return false; n_v_check = v_check; rd_u32b(&o_v_check); if (o_v_check != n_v_check) - return FALSE; + return false; n_x_check = x_check; rd_u32b(&o_x_check); if (o_x_check != n_x_check) - return FALSE; - return TRUE; + return false; + return true; } /*! @@ -318,14 +318,14 @@ bool load_floor(player_type *player_ptr, saved_floor_type *sf_ptr, BIT_FLAGS mod loading_savefile = angband_fopen(floor_savefile, "rb"); safe_setuid_drop(); - bool is_save_successful = TRUE; + bool is_save_successful = true; if (!loading_savefile) - is_save_successful = FALSE; + is_save_successful = false; if (is_save_successful) { is_save_successful = load_floor_aux(player_ptr, sf_ptr); if (ferror(loading_savefile)) - is_save_successful = FALSE; + is_save_successful = false; angband_fclose(loading_savefile); safe_setuid_grab(player_ptr); diff --git a/src/load/inventory-loader.cpp b/src/load/inventory-loader.cpp index 9e9feec2b..b46c74745 100644 --- a/src/load/inventory-loader.cpp +++ b/src/load/inventory-loader.cpp @@ -28,7 +28,7 @@ static errr rd_inventory(player_type *player_ptr) C_MAKE(player_ptr->inventory_list, INVEN_TOTAL, object_type); int slot = 0; - while (TRUE) { + while (true) { u16b n; rd_u16b(&n); diff --git a/src/load/item-loader.cpp b/src/load/item-loader.cpp index 6d2646392..0521a10fe 100644 --- a/src/load/item-loader.cpp +++ b/src/load/item-loader.cpp @@ -307,8 +307,8 @@ errr load_item(void) k_ptr = &dummy; rd_byte(&tmp8u); - k_ptr->aware = (tmp8u & 0x01) ? TRUE : FALSE; - k_ptr->tried = (tmp8u & 0x02) ? TRUE : FALSE; + k_ptr->aware = (tmp8u & 0x01) ? TRUE : false; + k_ptr->tried = (tmp8u & 0x02) ? TRUE : false; } if (arg_fiddle) diff --git a/src/load/load-util.cpp b/src/load/load-util.cpp index ca9d02329..67122910a 100644 --- a/src/load/load-util.cpp +++ b/src/load/load-util.cpp @@ -100,7 +100,7 @@ void rd_s32b(s32b *ip) { rd_u32b((u32b *)ip); } */ void rd_string(char *str, int max) { - for (int i = 0; TRUE; i++) { + for (int i = 0; true; i++) { byte tmp8u; rd_byte(&tmp8u); if (i < max) diff --git a/src/load/load-v1-5-0.cpp b/src/load/load-v1-5-0.cpp index b87332d1c..9cf2f159e 100644 --- a/src/load/load-v1-5-0.cpp +++ b/src/load/load-v1-5-0.cpp @@ -786,9 +786,9 @@ errr rd_dungeon_old(player_type *player_ptr) } if (h_older_than(0, 3, 13) && !floor_ptr->dun_level && !floor_ptr->inside_arena) - current_world_ptr->character_dungeon = FALSE; + current_world_ptr->character_dungeon = false; else - current_world_ptr->character_dungeon = TRUE; + current_world_ptr->character_dungeon = true; return 0; } diff --git a/src/load/load.cpp b/src/load/load.cpp index f968636c5..880b43b9b 100644 --- a/src/load/load.cpp +++ b/src/load/load.cpp @@ -113,7 +113,7 @@ static void load_player_world(player_type *creature_ptr) rd_extra(creature_ptr); if (creature_ptr->energy_need < -999) - creature_ptr->timewalk = TRUE; + creature_ptr->timewalk = true; if (arg_fiddle) load_note(_("特別情報をロードしました", "Loaded extra information")); @@ -296,16 +296,16 @@ bool load_savedata(player_type *player_ptr, bool *new_game) { concptr what = "generic"; current_world_ptr->game_turn = 0; - player_ptr->is_dead = FALSE; + player_ptr->is_dead = false; if (!savefile[0]) - return TRUE; + return true; #ifndef WINDOWS if (access(savefile, 0) < 0) { msg_print(_("セーブファイルがありません。", "Savefile does not exist.")); msg_print(NULL); - *new_game = TRUE; - return TRUE; + *new_game = true; + return true; } #endif @@ -341,7 +341,7 @@ bool load_savedata(player_type *player_ptr, bool *new_game) if (err) { msg_format("%s: %s", what, savefile); msg_print(NULL); - return FALSE; + return false; } current_world_ptr->sf_extra = fake_ver[3]; @@ -367,22 +367,22 @@ bool load_savedata(player_type *player_ptr, bool *new_game) current_world_ptr->h_ver_major, current_world_ptr->h_ver_minor, current_world_ptr->h_ver_patch, current_world_ptr->h_ver_extra); msg_print(NULL); - return FALSE; + return false; } if (player_ptr->is_dead) { - *new_game = TRUE; + *new_game = true; if (arg_wizard) { - current_world_ptr->character_loaded = TRUE; - return TRUE; + current_world_ptr->character_loaded = true; + return true; } - player_ptr->is_dead = FALSE; + player_ptr->is_dead = false; current_world_ptr->sf_lives++; - return TRUE; + return true; } - current_world_ptr->character_loaded = TRUE; + current_world_ptr->character_loaded = true; u32b tmp = counts_read(player_ptr, 2); if (tmp > player_ptr->count) player_ptr->count = tmp; @@ -391,5 +391,5 @@ bool load_savedata(player_type *player_ptr, bool *new_game) counts_write(player_ptr, 2, ++player_ptr->count); counts_write(player_ptr, 1, current_world_ptr->play_time); - return TRUE; + return true; } diff --git a/src/load/option-loader.cpp b/src/load/option-loader.cpp index caf88f737..822b15aef 100644 --- a/src/load/option-loader.cpp +++ b/src/load/option-loader.cpp @@ -43,19 +43,19 @@ void rd_options(void) rd_u16b(&c); if (c & 0x0002) - current_world_ptr->wizard = TRUE; - - cheat_peek = (c & 0x0100) ? TRUE : FALSE; - cheat_hear = (c & 0x0200) ? TRUE : FALSE; - cheat_room = (c & 0x0400) ? TRUE : FALSE; - cheat_xtra = (c & 0x0800) ? TRUE : FALSE; - cheat_know = (c & 0x1000) ? TRUE : FALSE; - cheat_live = (c & 0x2000) ? TRUE : FALSE; - cheat_save = (c & 0x4000) ? TRUE : FALSE; - cheat_diary_output = (c & 0x8000) ? TRUE : FALSE; - cheat_turn = (c & 0x0080) ? TRUE : FALSE; - cheat_sight = (c & 0x0040) ? TRUE : FALSE; - cheat_immortal = (c & 0x0020) ? TRUE : FALSE; + current_world_ptr->wizard = true; + + cheat_peek = (c & 0x0100) ? TRUE : false; + cheat_hear = (c & 0x0200) ? TRUE : false; + cheat_room = (c & 0x0400) ? TRUE : false; + cheat_xtra = (c & 0x0800) ? TRUE : false; + cheat_know = (c & 0x1000) ? TRUE : false; + cheat_live = (c & 0x2000) ? TRUE : false; + cheat_save = (c & 0x4000) ? TRUE : false; + cheat_diary_output = (c & 0x8000) ? TRUE : false; + cheat_turn = (c & 0x0080) ? TRUE : false; + cheat_sight = (c & 0x0040) ? TRUE : false; + cheat_immortal = (c & 0x0020) ? TRUE : false; rd_byte((byte *)&autosave_l); rd_byte((byte *)&autosave_t); diff --git a/src/load/player-info-loader.cpp b/src/load/player-info-loader.cpp index fd68d1293..89cdb70f6 100644 --- a/src/load/player-info-loader.cpp +++ b/src/load/player-info-loader.cpp @@ -242,7 +242,7 @@ static void rd_phase_out(player_type *creature_ptr) creature_ptr->current_floor_ptr->inside_arena = (bool)tmp16s; rd_s16b(&creature_ptr->current_floor_ptr->inside_quest); if (h_older_than(0, 3, 5)) - creature_ptr->phase_out = FALSE; + creature_ptr->phase_out = false; else { rd_s16b(&tmp16s); creature_ptr->phase_out = (bool)tmp16s; diff --git a/src/load/quest-loader.cpp b/src/load/quest-loader.cpp index 963b107be..0f6f8969c 100644 --- a/src/load/quest-loader.cpp +++ b/src/load/quest-loader.cpp @@ -61,11 +61,11 @@ errr load_quest_info(u16b *max_quests_load, byte *max_rquests_load) static bool check_quest_index(int loading_quest_index) { if (loading_quest_index < max_q_idx) - return FALSE; + return false; strip_bytes(2); strip_bytes(2); - return TRUE; + return true; } static void load_quest_completion(quest_type *q_ptr) diff --git a/src/load/store-loader.cpp b/src/load/store-loader.cpp index 9504e174a..f6a0e6e3a 100644 --- a/src/load/store-loader.cpp +++ b/src/load/store-loader.cpp @@ -65,11 +65,11 @@ static void home_carry_load(player_type *player_ptr, store_type *store_ptr, obje static errr rd_store(player_type *player_ptr, int town_number, int store_number) { store_type *store_ptr; - bool sort = FALSE; + bool sort = false; if (h_older_than(0, 3, 3) && (store_number == STORE_HOME)) { store_ptr = &town_info[1].store[store_number]; if (store_ptr->stock_num) - sort = TRUE; + sort = true; } else { store_ptr = &town_info[town_number].store[store_number]; } diff --git a/src/load/world-loader.cpp b/src/load/world-loader.cpp index 7cdedcaec..4c6dec694 100644 --- a/src/load/world-loader.cpp +++ b/src/load/world-loader.cpp @@ -168,12 +168,12 @@ void load_wilderness_info(player_type *creature_ptr) } if (h_older_than(0, 3, 7)) - creature_ptr->wild_mode = FALSE; + creature_ptr->wild_mode = false; else rd_byte((byte *)&creature_ptr->wild_mode); if (h_older_than(0, 3, 7)) - creature_ptr->ambush_flag = FALSE; + creature_ptr->ambush_flag = false; else rd_byte((byte *)&creature_ptr->ambush_flag); } diff --git a/src/locale/english.cpp b/src/locale/english.cpp index 6f0c9547e..55763170d 100644 --- a/src/locale/english.cpp +++ b/src/locale/english.cpp @@ -141,8 +141,8 @@ bool is_a_vowel(int ch) case 'I': case 'O': case 'U': - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/src/locale/japanese.cpp b/src/locale/japanese.cpp index 42aa846f3..fa2cdf6c9 100644 --- a/src/locale/japanese.cpp +++ b/src/locale/japanese.cpp @@ -327,9 +327,9 @@ bool iskanji2(concptr s, int x) i++; } if ((x == i) && iskanji(s[x])) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -342,9 +342,9 @@ static bool is_ascii_str(concptr str) for (; *str; str++) { int ch = *str; if (!(0x00 < ch && ch <= 0x7f)) - return FALSE; + return false; } - return TRUE; + return true; } #if defined(EUC) @@ -489,17 +489,17 @@ static bool utf8_to_sys(char *utf8_str, char *sys_str_buffer, size_t sys_str_buf /* UTF-8 -> UTF-16 */ if (MultiByteToWideChar(CP_UTF8, 0, utf8_str, input_len, utf16buf, input_len) == 0) { C_KILL(utf16buf, input_len, WCHAR); - return FALSE; + return false; } /* UTF-8 -> SJIS(CP932) */ if (WideCharToMultiByte(932, 0, utf16buf, -1, sys_str_buffer, sys_str_buflen, NULL, NULL) == 0) { C_KILL(utf16buf, input_len, WCHAR); - return FALSE; + return false; } C_KILL(utf16buf, input_len, WCHAR); - return TRUE; + return true; #endif } diff --git a/src/locale/utf-8.cpp b/src/locale/utf-8.cpp index 438b95b7b..ab447d3e9 100644 --- a/src/locale/utf-8.cpp +++ b/src/locale/utf-8.cpp @@ -59,11 +59,11 @@ bool is_utf8_str(concptr str) const int byte_length = utf8_next_char_byte_length(str); if (byte_length == 0) { - return FALSE; + return false; } str += byte_length; } - return TRUE; + return true; } diff --git a/src/lore/lore-calculator.cpp b/src/lore/lore-calculator.cpp index 59d3ea1cb..bf53c10c3 100644 --- a/src/lore/lore-calculator.cpp +++ b/src/lore/lore-calculator.cpp @@ -58,17 +58,17 @@ bool know_armour(MONRACE_IDX r_idx, const bool know_everything) DEPTH level = r_ptr->level; MONSTER_NUMBER kills = r_ptr->r_tkills; - bool known = (r_ptr->r_cast_spell == MAX_UCHAR) ? TRUE : FALSE; + bool known = (r_ptr->r_cast_spell == MAX_UCHAR) ? TRUE : false; if (know_everything || known) - return TRUE; + return true; if (kills > 304 / (4 + level)) - return TRUE; + return true; if (!(r_ptr->flags1 & RF1_UNIQUE)) - return FALSE; + return false; if (kills > 304 / (38 + (5 * level) / 4)) - return TRUE; - return FALSE; + return true; + return false; } /*! @@ -96,13 +96,13 @@ bool know_damage(MONRACE_IDX r_idx, int i) if (d >= ((4 + level) * MAX_UCHAR) / 80) d = ((4 + level) * MAX_UCHAR - 1) / 80; if ((4 + level) * a > 80 * d) - return TRUE; + return true; if (!(r_ptr->flags1 & RF1_UNIQUE)) - return FALSE; + return false; if ((4 + level) * (2 * a) > 80 * d) - return TRUE; + return true; - return FALSE; + return false; } /*! diff --git a/src/lore/lore-util.cpp b/src/lore/lore-util.cpp index 26175380c..358e2456e 100644 --- a/src/lore/lore-util.cpp +++ b/src/lore/lore-util.cpp @@ -33,7 +33,7 @@ lore_type *initialize_lore_type(lore_type *lore_ptr, MONRACE_IDX r_idx, monster_ { #ifdef JP #else - lore_ptr->sin = FALSE; + lore_ptr->sin = false; #endif lore_ptr->r_idx = r_idx; lore_ptr->nightmare = ironman_nightmare && (mode != MONSTER_LORE_DEBUG); @@ -47,10 +47,10 @@ lore_type *initialize_lore_type(lore_type *lore_ptr, MONRACE_IDX r_idx, monster_ lore_ptr->ability_flags = (lore_ptr->r_ptr->ability_flags & lore_ptr->r_ptr->r_ability_flags); lore_ptr->flags7 = (lore_ptr->r_ptr->flags7 & lore_ptr->r_ptr->flags7); lore_ptr->flagsr = (lore_ptr->r_ptr->flagsr & lore_ptr->r_ptr->r_flagsr); - lore_ptr->reinforce = FALSE; - lore_ptr->know_everything = FALSE; + lore_ptr->reinforce = false; + lore_ptr->know_everything = false; lore_ptr->mode = mode; - lore_ptr->old = FALSE; + lore_ptr->old = false; lore_ptr->count = 0; return lore_ptr; } diff --git a/src/lore/monster-lore.cpp b/src/lore/monster-lore.cpp index 695796275..cac3e666e 100644 --- a/src/lore/monster-lore.cpp +++ b/src/lore/monster-lore.cpp @@ -124,11 +124,11 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, monster_lo lore_type *lore_ptr = initialize_lore_type(&tmp_lore, r_idx, mode); for (int n = 0; n < A_MAX; n++) { if (lore_ptr->r_ptr->reinforce_id[n] > 0) - lore_ptr->reinforce = TRUE; + lore_ptr->reinforce = true; } if (cheat_know || (mode == MONSTER_LORE_RESEARCH) || (mode == MONSTER_LORE_DEBUG)) - lore_ptr->know_everything = TRUE; + lore_ptr->know_everything = true; set_drop_flags(lore_ptr); set_msex_flags(lore_ptr); @@ -153,7 +153,7 @@ void process_monster_lore(player_type *player_ptr, MONRACE_IDX r_idx, monster_lo display_monster_never_move(lore_ptr); if (lore_ptr->old) { hooked_roff(_("。", ". ")); - lore_ptr->old = FALSE; + lore_ptr->old = false; } display_lore_this(player_ptr, lore_ptr); diff --git a/src/main-win.cpp b/src/main-win.cpp index bd4035511..94e7166a0 100644 --- a/src/main-win.cpp +++ b/src/main-win.cpp @@ -153,7 +153,7 @@ POINT normsize; //!< Remember normal size of main window when maxmized /* * was main window maximized on previous playing */ -bool win_maximized = FALSE; +bool win_maximized = false; /* * game in progress @@ -168,7 +168,7 @@ bool movie_in_progress = false; /* * note when "open"/"new" become valid */ -bool initialized = FALSE; +bool initialized = false; /* * Saved instance handle @@ -193,7 +193,7 @@ char wallpaper_file[MAIN_WIN_MAX_PATH] = ""; //!< 壁紙ファイル名。 /* * Show sub-windows even when Hengband is not in focus */ -static bool keep_subwindows = TRUE; +static bool keep_subwindows = true; /* * Full path to ANGBAND.INI @@ -218,13 +218,13 @@ static COLORREF win_clr[256]; /* * Flag for macro trigger with dump ASCII */ -static bool term_no_press = FALSE; +static bool term_no_press = false; /* * Copy and paste */ -static bool mouse_down = FALSE; -static bool paint_rect = FALSE; +static bool mouse_down = false; +static bool paint_rect = false; static TERM_LEN mousex = 0, mousey = 0; static TERM_LEN oldx, oldy; @@ -435,7 +435,7 @@ BOOL CALLBACK monitorenumproc([[maybe_unused]] HMONITOR hMon, [[maybe_unused]] H { bool *result = (bool *)dwDate; *result = true; - return FALSE; + return false; } /*! @@ -526,11 +526,11 @@ static void load_prefs(void) static void init_music(void) { // Flag set once "music" has been initialized - static bool can_use_music = FALSE; + static bool can_use_music = false; if (!can_use_music) { main_win_music::load_music_prefs(); - can_use_music = TRUE; + can_use_music = true; } } @@ -540,11 +540,11 @@ static void init_music(void) static void init_sound(void) { // Flag set once "sound" has been initialized - static bool can_use_sound = FALSE; + static bool can_use_sound = false; if (!can_use_sound) { load_sound_prefs(); - can_use_sound = TRUE; + can_use_sound = true; } } @@ -566,11 +566,11 @@ static void change_sound_mode(bool new_mode) static void init_background(void) { // Flag set once "background" has been initialized - static bool can_use_background = FALSE; + static bool can_use_background = false; if (!can_use_background) { load_bg_prefs(); - can_use_background = TRUE; + can_use_background = true; } } @@ -1073,12 +1073,12 @@ static errr term_text_win(int x, int y, int n, TERM_COLOR a, concptr s) static HBITMAP WALL; static HBRUSH myBrush, oldBrush; static HPEN oldPen; - static bool init_done = FALSE; + static bool init_done = false; if (!init_done) { WALL = LoadBitmapW(hInstance, AppName); myBrush = CreatePatternBrush(WALL); - init_done = TRUE; + init_done = true; } RECT rc{ static_cast(x * td->tile_wid + td->size_ow1), static_cast(y * td->tile_hgt + td->size_oh1), @@ -1269,8 +1269,8 @@ static void term_data_link(term_data *td) { term_type *t = &td->t; term_init(t, td->cols, td->rows, FILE_READ_BUFF_SIZE); - t->soft_cursor = TRUE; - t->higher_pict = TRUE; + t->soft_cursor = true; + t->higher_pict = true; t->attr_blank = TERM_WHITE; t->char_blank = ' '; t->user_hook = term_user_win; @@ -1301,14 +1301,14 @@ static void init_windows(void) td->rows = 24; td->cols = 80; - td->visible = TRUE; + td->visible = true; td->size_ow1 = 2; td->size_ow2 = 2; td->size_oh1 = 2; td->size_oh2 = 2; td->pos_x = 7 * 30; td->pos_y = 7 * 20; - td->posfix = FALSE; + td->posfix = false; for (int i = 1; i < MAX_TERM_DATA; i++) { td = &data[i]; @@ -1316,14 +1316,14 @@ static void init_windows(void) td->name = win_term_name[i]; td->rows = 24; td->cols = 80; - td->visible = FALSE; + td->visible = false; td->size_ow1 = 1; td->size_ow2 = 1; td->size_oh1 = 1; td->size_oh2 = 1; td->pos_x = (7 - i) * 30; td->pos_y = (7 - i) * 20; - td->posfix = FALSE; + td->posfix = false; } load_prefs(); @@ -1332,7 +1332,7 @@ static void init_windows(void) td = &data[0]; td->dwStyle = (WS_OVERLAPPED | WS_THICKFRAME | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION | WS_VISIBLE); td->dwExStyle = 0; - td->visible = TRUE; + td->visible = true; /* Attributes of sub windows */ for (int i = 1; i < MAX_TERM_DATA; i++) { @@ -1368,14 +1368,14 @@ static void init_windows(void) if (!td->w) quit(_("サブウィンドウに作成に失敗しました", "Failed to create sub-window")); - td->size_hack = TRUE; + td->size_hack = true; term_getsize(td); term_window_resize(td); if (td->visible) { ShowWindow(td->w, SW_SHOW); } - td->size_hack = FALSE; + td->size_hack = false; term_data_link(td); angband_term[i] = &td->t; @@ -1403,10 +1403,10 @@ static void init_windows(void) quit(_("メインウィンドウの作成に失敗しました", "Failed to create Angband window")); /* Resize */ - td->size_hack = TRUE; + td->size_hack = true; term_getsize(td); term_window_resize(td); - td->size_hack = FALSE; + td->size_hack = false; term_data_link(td); angband_term[0] = &td->t; @@ -1574,7 +1574,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) break; } - msg_flag = FALSE; + msg_flag = false; do_cmd_save_game(player_ptr, FALSE); } else { plog(_("今、セーブすることは出来ません。", "You may not do that right now.")); @@ -1589,7 +1589,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd) break; } - msg_flag = FALSE; + msg_flag = false; forget_lite(player_ptr->current_floor_ptr); forget_view(player_ptr->current_floor_ptr); clear_mon_lite(player_ptr->current_floor_ptr); @@ -1655,12 +1655,12 @@ static void process_menus(player_type *player_ptr, WORD wCmd) td = &data[i]; if (!td->visible) { - td->visible = TRUE; + td->visible = true; ShowWindow(td->w, SW_SHOW); term_data_redraw(td); } else { - td->visible = FALSE; - td->posfix = FALSE; + td->visible = false; + td->posfix = false; ShowWindow(td->w, SW_HIDE); } @@ -1695,10 +1695,10 @@ static void process_menus(player_type *player_ptr, WORD wCmd) td = &data[i]; if (!td->posfix && td->visible) { - td->posfix = TRUE; + td->posfix = true; term_window_pos(td, HWND_TOPMOST); } else { - td->posfix = FALSE; + td->posfix = false; term_window_pos(td, data[0].w); } @@ -1932,21 +1932,21 @@ static void term_keypress(char *str) */ static bool process_keydown(WPARAM wParam, LPARAM lParam) { - bool mc = FALSE; - bool ms = FALSE; - bool ma = FALSE; + bool mc = false; + bool ms = false; + bool ma = false; if (GetKeyState(VK_CONTROL) & 0x8000) - mc = TRUE; + mc = true; if (GetKeyState(VK_SHIFT) & 0x8000) - ms = TRUE; + ms = true; if (GetKeyState(VK_MENU) & 0x8000) - ma = TRUE; + ma = true; - term_no_press = (ma) ? TRUE : FALSE; + term_no_press = (ma) ? TRUE : false; if (special_key[(byte)(wParam)] || (ma && !ignore_key[(byte)(wParam)])) { - bool ext_key = (lParam & 0x1000000L) ? TRUE : FALSE; - bool numpad = FALSE; + bool ext_key = (lParam & 0x1000000L) ? TRUE : false; + bool numpad = false; term_keypress(31); if (mc) @@ -1960,7 +1960,7 @@ static bool process_keydown(WPARAM wParam, LPARAM lParam) term_keypress('x'); switch (wParam) { case VK_DIVIDE: - term_no_press = TRUE; + term_no_press = true; [[fallthrough]]; /* Fall through */ case VK_RETURN: numpad = ext_key; @@ -1980,7 +1980,7 @@ static bool process_keydown(WPARAM wParam, LPARAM lParam) case VK_SUBTRACT: case VK_SEPARATOR: case VK_DECIMAL: - term_no_press = TRUE; + term_no_press = true; [[fallthrough]]; /* Fall through */ case VK_CLEAR: case VK_HOME: @@ -2125,13 +2125,13 @@ static bool handle_window_resize(term_data *td, UINT uMsg, WPARAM wParam, LPARAM case SIZE_RESTORED: { fit_term_size_to_window(td); - td->size_hack = TRUE; + td->size_hack = true; for (int i = 1; i < MAX_TERM_DATA; i++) { if (data[i].visible) ShowWindow(data[i].w, SW_SHOWNA); } - td->size_hack = FALSE; + td->size_hack = false; return true; } @@ -2193,7 +2193,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WM_CHAR: { // wParam is WCHAR because using RegisterClassW if (term_no_press) - term_no_press = FALSE; + term_no_press = false; else { WCHAR wc[2] = { (WCHAR)wParam, '\0' }; term_keypress(to_multibyte(wc).c_str()); @@ -2205,7 +2205,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam return 0; mousex = MIN(LOWORD(lParam) / td->tile_wid, td->cols - 1); mousey = MIN(HIWORD(lParam) / td->tile_hgt, td->rows - 1); - mouse_down = TRUE; + mouse_down = true; oldx = mousex; oldy = mousey; return 0; @@ -2220,8 +2220,8 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam TERM_LEN ox = (oldx > mousex) ? mousex : oldx; TERM_LEN oy = (oldy > mousey) ? mousey : oldy; - mouse_down = FALSE; - paint_rect = FALSE; + mouse_down = false; + paint_rect = false; #ifdef JP int sz = (dx + 3) * dy; @@ -2295,7 +2295,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam oy = (oldy > mousey) ? mousey : oldy; term_inversed_area(hWnd, ox, oy, dx, dy); } else { - paint_rect = TRUE; + paint_rect = true; } dx = abs(cx - mousex) + 1; @@ -2323,7 +2323,7 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam return 0; } - msg_flag = FALSE; + msg_flag = false; forget_lite(p_ptr->current_floor_ptr); forget_view(p_ptr->current_floor_ptr); clear_mon_lite(p_ptr->current_floor_ptr); @@ -2336,9 +2336,9 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam return 0; } - msg_flag = FALSE; + msg_flag = false; if (p_ptr->chp < 0) - p_ptr->is_dead = FALSE; + p_ptr->is_dead = false; exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----")); p_ptr->panic_save = 1; @@ -2438,7 +2438,7 @@ LRESULT PASCAL AngbandListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_CHAR: { // wParam is WCHAR because using RegisterClassW if (term_no_press) - term_no_press = FALSE; + term_no_press = false; else { WCHAR wc[2] = { (WCHAR)wParam, '\0' }; term_keypress(to_multibyte(wc).c_str()); @@ -2451,7 +2451,7 @@ LRESULT PASCAL AngbandListProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara if (wParam == HTSYSMENU) { if (td->visible) { - td->visible = FALSE; + td->visible = false; ShowWindow(td->w, SW_HIDE); } @@ -2557,11 +2557,11 @@ static void init_stuff(void) validate_dir(ANGBAND_DIR_XTRA_MUSIC, FALSE); for (i = 0; special_key_list[i]; ++i) { - special_key[special_key_list[i]] = TRUE; + special_key[special_key_list[i]] = true; } for (i = 0; ignore_key_list[i]; ++i) { - ignore_key[ignore_key_list[i]] = TRUE; + ignore_key[ignore_key_list[i]] = true; } ANGBAND_SYS = "win"; @@ -2648,7 +2648,7 @@ int WINAPI WinMain( if (is_already_running()) { MessageBoxW( NULL, _(L"変愚蛮怒はすでに起動しています。", L"Hengband is already running."), _(L"エラー！", L"Error"), MB_ICONEXCLAMATION | MB_OK | MB_ICONSTOP); - return FALSE; + return false; } command_line.handle(); @@ -2693,7 +2693,7 @@ int WINAPI WinMain( signals_init(); term_activate(term_screen); init_angband(p_ptr, FALSE); - initialized = TRUE; + initialized = true; check_for_save_file(command_line.get_savefile_option()); prt(_("[ファイル] メニューの [新規] または [開く] を選択してください。", "[Choose 'New' or 'Open' from the 'File' menu]"), 23, _(8, 17)); diff --git a/src/main-win/main-win-file-utils.cpp b/src/main-win/main-win-file-utils.cpp index 3d0a25f3c..e9e7b5b0d 100644 --- a/src/main-win/main-win-file-utils.cpp +++ b/src/main-win/main-win-file-utils.cpp @@ -20,11 +20,11 @@ bool check_file(concptr s) { DWORD attrib = GetFileAttributesW(to_wchar(s).wc_str()); if (attrib == INVALID_FILE_NAME) - return FALSE; + return false; if (attrib & FILE_ATTRIBUTE_DIRECTORY) - return FALSE; + return false; - return TRUE; + return true; } /* @@ -43,11 +43,11 @@ bool check_dir(concptr s) DWORD attrib = GetFileAttributesW(to_wchar(path).wc_str()); if (attrib == INVALID_FILE_NAME) - return FALSE; + return false; if (!(attrib & FILE_ATTRIBUTE_DIRECTORY)) - return FALSE; + return false; - return TRUE; + return true; } /*! diff --git a/src/market/arena.cpp b/src/market/arena.cpp index 198d00ce6..af5a33143 100644 --- a/src/market/arena.cpp +++ b/src/market/arena.cpp @@ -36,7 +36,7 @@ static bool process_ostensible_arena_victory(player_type *player_ptr) { if (player_ptr->arena_number != MAX_ARENA_MONS) - return FALSE; + return false; clear_bldg(5, 19); prt(_("アリーナの優勝者！", " Arena Victor!"), 5, 0); @@ -49,7 +49,7 @@ static bool process_ostensible_arena_victory(player_type *player_ptr) msg_print(_("スペースキーで続行", "Press the space bar to continue")); msg_print(NULL); player_ptr->arena_number++; - return TRUE; + return true; } /*! @@ -60,34 +60,34 @@ static bool process_ostensible_arena_victory(player_type *player_ptr) static bool battle_metal_babble(player_type *player_ptr) { if (player_ptr->arena_number <= MAX_ARENA_MONS) - return FALSE; + return false; if (player_ptr->arena_number >= MAX_ARENA_MONS + 2) { msg_print(_("あなたはアリーナに入り、しばらくの間栄光にひたった。", "You enter the arena briefly and bask in your glory.")); msg_print(NULL); - return TRUE; + return true; } msg_print(_("君のために最強の挑戦者を用意しておいた。", "The strongest challenger is waiting for you.")); msg_print(NULL); if (!get_check(_("挑戦するかね？", "Do you fight? "))) { msg_print(_("残念だ。", "We are disappointed.")); - return TRUE; + return true; } msg_print(_("死ぬがよい。", "Die, maggots.")); msg_print(NULL); - player_ptr->exit_bldg = FALSE; + player_ptr->exit_bldg = false; reset_tim_flags(player_ptr); /* Save the surface floor as saved floor */ prepare_change_floor_mode(player_ptr, CFM_SAVE_FLOORS); - player_ptr->current_floor_ptr->inside_arena = TRUE; - player_ptr->leaving = TRUE; - player_ptr->leave_bldg = TRUE; - return TRUE; + player_ptr->current_floor_ptr->inside_arena = true; + player_ptr->leaving = true; + player_ptr->leave_bldg = true; + return true; } static void go_to_arena(player_type *player_ptr) @@ -104,13 +104,13 @@ static void go_to_arena(player_type *player_ptr) return; } - player_ptr->exit_bldg = FALSE; + player_ptr->exit_bldg = false; reset_tim_flags(player_ptr); prepare_change_floor_mode(player_ptr, CFM_SAVE_FLOORS); - player_ptr->current_floor_ptr->inside_arena = TRUE; - player_ptr->leaving = TRUE; - player_ptr->leave_bldg = TRUE; + player_ptr->current_floor_ptr->inside_arena = true; + player_ptr->leaving = true; + player_ptr->leave_bldg = true; } static void see_arena_poster(player_type *player_ptr) @@ -187,13 +187,13 @@ void update_gambling_monsters(player_type *player_ptr) mon_level = MAX(i, mon_level); } - while (TRUE) { + while (true) { total = 0; - tekitou = FALSE; + tekitou = false; for (i = 0; i < 4; i++) { MONRACE_IDX r_idx; int j; - while (TRUE) { + while (true) { get_mon_num_prep(player_ptr, monster_can_entry_arena, NULL); r_idx = get_mon_num(player_ptr, 0, mon_level, GMN_ARENA); if (!r_idx) @@ -214,7 +214,7 @@ void update_gambling_monsters(player_type *player_ptr) } battle_mon[i] = r_idx; if (r_info[r_idx].level < 45) - tekitou = TRUE; + tekitou = true; } for (i = 0; i < 4; i++) { @@ -291,7 +291,7 @@ bool monster_arena_comm(player_type *player_ptr) msg_print(_("おい！おまえ一文なしじゃないか！こっから出ていけ！", "Hey! You don't have gold - get out of here!")); msg_print(NULL); screen_load(); - return FALSE; + return false; } clear_bldg(4, 10); @@ -309,12 +309,12 @@ bool monster_arena_comm(player_type *player_ptr) } prt(_("どれに賭けますか:", "Which monster: "), 0, 0); - while (TRUE) { + while (true) { int i = inkey(); if (i == ESCAPE) { screen_load(); - return FALSE; + return false; } if (i >= '1' && i <= '4') { @@ -347,7 +347,7 @@ bool monster_arena_comm(player_type *player_ptr) */ if (!get_string(tmp_str, out_val, 32)) { screen_load(); - return FALSE; + return false; } for (p = out_val; *p == ' '; p++) @@ -359,7 +359,7 @@ bool monster_arena_comm(player_type *player_ptr) msg_print(NULL); screen_load(); - return FALSE; + return false; } else if (wager > maxbet) { msg_format(_("%ldゴールドだけ受けよう。残りは取っときな。", "I'll take %ld gold of that. Keep the rest."), (long int)maxbet); @@ -377,10 +377,10 @@ bool monster_arena_comm(player_type *player_ptr) prepare_change_floor_mode(player_ptr, CFM_SAVE_FLOORS); - player_ptr->phase_out = TRUE; - player_ptr->leaving = TRUE; - player_ptr->leave_bldg = TRUE; + player_ptr->phase_out = true; + player_ptr->leaving = true; + player_ptr->leave_bldg = true; screen_load(); - return TRUE; + return true; } diff --git a/src/market/bounty.cpp b/src/market/bounty.cpp index b9fd63ddd..0b9a12426 100644 --- a/src/market/bounty.cpp +++ b/src/market/bounty.cpp @@ -44,7 +44,7 @@ */ bool exchange_cash(player_type *player_ptr) { - bool change = FALSE; + bool change = false; GAME_TEXT o_name[MAX_NLEN]; object_type *o_ptr; @@ -61,7 +61,7 @@ bool exchange_cash(player_type *player_ptr) vary_item(player_ptr, i, -o_ptr->number); } - change = TRUE; + change = true; } } @@ -78,7 +78,7 @@ bool exchange_cash(player_type *player_ptr) vary_item(player_ptr, i, -o_ptr->number); } - change = TRUE; + change = true; } } @@ -95,7 +95,7 @@ bool exchange_cash(player_type *player_ptr) vary_item(player_ptr, i, -o_ptr->number); } - change = TRUE; + change = true; } } @@ -113,7 +113,7 @@ bool exchange_cash(player_type *player_ptr) vary_item(player_ptr, i, -o_ptr->number); } - change = TRUE; + change = true; } } @@ -132,7 +132,7 @@ bool exchange_cash(player_type *player_ptr) vary_item(player_ptr, i, -o_ptr->number); } - change = TRUE; + change = true; } } @@ -180,16 +180,16 @@ bool exchange_cash(player_type *player_ptr) autopick_alter_item(player_ptr, item_new, FALSE); handle_stuff(player_ptr); - change = TRUE; + change = true; } } if (change) - return TRUE; + return true; msg_print(_("賞金を得られそうなものは持っていなかった。", "You have nothing.")); msg_print(NULL); - return FALSE; + return false; } /*! @@ -283,7 +283,7 @@ void determine_daily_bounty(player_type *player_ptr, bool conv_old) get_mon_num_prep_bounty(player_ptr); - while (TRUE) { + while (true) { current_world_ptr->today_mon = get_mon_num(player_ptr, MIN(max_dl / 2, 40), max_dl, GMN_ARENA); monster_race *r_ptr; r_ptr = &r_info[current_world_ptr->today_mon]; @@ -318,7 +318,7 @@ void determine_bounty_uniques(player_type *player_ptr) get_mon_num_prep_bounty(player_ptr); for (int i = 0; i < MAX_BOUNTY; i++) { - while (TRUE) { + while (true) { current_world_ptr->bounty_r_idx[i] = get_mon_num(player_ptr, 0, MAX_DEPTH - 1, GMN_ARENA); monster_race *r_ptr; r_ptr = &r_info[current_world_ptr->bounty_r_idx[i]]; diff --git a/src/market/building-craft-armor.cpp b/src/market/building-craft-armor.cpp index b75c8bd66..ebcc1edb7 100644 --- a/src/market/building-craft-armor.cpp +++ b/src/market/building-craft-armor.cpp @@ -79,5 +79,5 @@ bool eval_ac(ARMOUR_CLASS iAC) (void)inkey(); screen_load(); - return TRUE; + return true; } diff --git a/src/market/building-craft-fix.cpp b/src/market/building-craft-fix.cpp index b26254f1b..79c48c1b5 100644 --- a/src/market/building-craft-fix.cpp +++ b/src/market/building-craft-fix.cpp @@ -168,7 +168,7 @@ static PRICE repair_broken_weapon_aux(player_type *player_ptr, PRICE bcost) } } else { tval_type tval = (one_in_(5) ? mo_ptr->tval : TV_SWORD); - while (TRUE) { + while (true) { object_kind *ck_ptr; k_idx = lookup_kind(tval, SV_ANY); ck_ptr = &k_info[k_idx]; diff --git a/src/market/building-craft-weapon.cpp b/src/market/building-craft-weapon.cpp index 508cdb1df..af568d851 100644 --- a/src/market/building-craft-weapon.cpp +++ b/src/market/building-craft-weapon.cpp @@ -120,8 +120,8 @@ static void compare_weapon_aux(player_type *owner_ptr, object_type *o_ptr, int c { BIT_FLAGS flgs[TR_FLAG_SIZE]; int blow = owner_ptr->num_blow[0]; - bool force = FALSE; - bool dokubari = FALSE; + bool force = false; + bool dokubari = false; int eff_dd = o_ptr->dd + owner_ptr->to_dd[0]; int eff_ds = o_ptr->ds + owner_ptr->to_ds[0]; @@ -136,7 +136,7 @@ static void compare_weapon_aux(player_type *owner_ptr, object_type *o_ptr, int c object_flags(owner_ptr, o_ptr, flgs); if ((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_POISON_NEEDLE)) - dokubari = TRUE; + dokubari = true; bool impact = has_flag(flgs, TR_IMPACT) || (owner_ptr->impact != 0); mindam = calc_expect_crit(owner_ptr, o_ptr->weight, o_ptr->to_h, mindice, owner_ptr->to_h[0], dokubari, impact); @@ -157,7 +157,7 @@ static void compare_weapon_aux(player_type *owner_ptr, object_type *o_ptr, int c } if ((owner_ptr->pclass != CLASS_SAMURAI) && has_flag(flgs, TR_FORCE_WEAPON) && (owner_ptr->csp > (o_ptr->dd * o_ptr->ds / 5))) { - force = TRUE; + force = true; mindam = calc_expect_dice(owner_ptr, mindice, 1, 1, force, o_ptr->weight, o_ptr->to_h, owner_ptr->to_h[0], dokubari, impact, vorpal_mult, vorpal_div); maxdam = calc_expect_dice(owner_ptr, maxdice, 1, 1, force, o_ptr->weight, o_ptr->to_h, owner_ptr->to_h[0], dokubari, impact, vorpal_mult, vorpal_div); @@ -377,9 +377,9 @@ PRICE compare_weapons(player_type *customer_ptr, PRICE bcost) int n = 1; total = bcost; - while (TRUE) { + while (true) { clear_bldg(0, 22); - current_world_ptr->character_xtra = TRUE; + current_world_ptr->character_xtra = true; for (int i = 0; i < n; i++) { int col = (wid * i + mgn); if (o_ptr[i] != i_ptr) diff --git a/src/market/building-enchanter.cpp b/src/market/building-enchanter.cpp index f80f8472e..d82027ad4 100644 --- a/src/market/building-enchanter.cpp +++ b/src/market/building-enchanter.cpp @@ -36,33 +36,33 @@ bool enchant_item(player_type *player_ptr, PRICE cost, HIT_PROB to_hit, HIT_POIN object_type *o_ptr; o_ptr = choose_object(player_ptr, &item, q, s, (USE_INVEN | USE_EQUIP | IGNORE_BOTHHAND_SLOT), item_tester_tval); if (!o_ptr) - return FALSE; + return false; char tmp_str[MAX_NLEN]; if (player_ptr->au < (cost * o_ptr->number)) { describe_flavor(player_ptr, 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; } - bool okay = FALSE; + bool okay = false; for (int i = 0; i < to_hit; i++) { if ((o_ptr->to_h < maxenchant) && enchant_equipment(player_ptr, o_ptr, 1, (ENCH_TOHIT | ENCH_FORCE))) { - okay = TRUE; + okay = true; break; } } for (int i = 0; i < to_dam; i++) { if ((o_ptr->to_d < maxenchant) && enchant_equipment(player_ptr, o_ptr, 1, (ENCH_TODAM | ENCH_FORCE))) { - okay = TRUE; + okay = true; break; } } for (int i = 0; i < to_ac; i++) { if ((o_ptr->to_a < maxenchant) && enchant_equipment(player_ptr, o_ptr, 1, (ENCH_TOAC | ENCH_FORCE))) { - okay = TRUE; + okay = true; break; } } @@ -71,7 +71,7 @@ bool enchant_item(player_type *player_ptr, PRICE cost, HIT_PROB to_hit, HIT_POIN if (flush_failure) flush(); msg_print(_("改良に失敗した。", "The improvement failed.")); - return FALSE; + return false; } describe_flavor(player_ptr, tmp_str, o_ptr, OD_NAME_AND_ENCHANT); @@ -84,5 +84,5 @@ bool enchant_item(player_type *player_ptr, PRICE cost, HIT_PROB to_hit, HIT_POIN player_ptr->au -= (cost * o_ptr->number); if (item >= INVEN_MAIN_HAND) calc_android_exp(player_ptr); - return TRUE; + return true; } diff --git a/src/market/building-monster.cpp b/src/market/building-monster.cpp index fbd6b90a5..2afb27a2f 100644 --- a/src/market/building-monster.cpp +++ b/src/market/building-monster.cpp @@ -26,13 +26,13 @@ bool research_mon(player_type *player_ptr) { char buf[256]; bool notpicked; - bool recall = FALSE; + bool recall = false; u16b why = 0; MONSTER_IDX *who; - bool all = FALSE; - bool uniq = FALSE; - bool norm = FALSE; + bool all = false; + bool uniq = false; + bool norm = false; char temp[MAX_MONSTER_NAME] = ""; static int old_sym = '\0'; @@ -46,7 +46,7 @@ bool research_mon(player_type *player_ptr) { screen_load(); - return FALSE; + return false; } IDX i; @@ -57,21 +57,21 @@ bool research_mon(player_type *player_ptr) /* XTRA HACK WHATSEARCH */ if (sym == KTRL('A')) { - all = TRUE; + all = true; strcpy(buf, _("全モンスターのリスト", "Full monster list.")); } else if (sym == KTRL('U')) { - all = uniq = TRUE; + all = uniq = true; strcpy(buf, _("ユニーク・モンスターのリスト", "Unique monster list.")); } else if (sym == KTRL('N')) { - all = norm = TRUE; + all = norm = true; strcpy(buf, _("ユニーク外モンスターのリスト", "Non-unique monster list.")); } else if (sym == KTRL('M')) { - all = TRUE; + all = true; if (!get_string(_("名前(英語の場合小文字で可)", "Enter name:"), temp, 70)) { temp[0] = 0; screen_load(); - return FALSE; + return false; } sprintf(buf, _("名前:%sにマッチ", "Monsters' names with \"%s\""), temp); @@ -144,7 +144,7 @@ bool research_mon(player_type *player_ptr) C_KILL(who, max_r_idx, MONRACE_IDX); screen_load(); - return FALSE; + return false; } why = 2; @@ -159,19 +159,19 @@ bool research_mon(player_type *player_ptr) else i = n - 1; - notpicked = TRUE; + notpicked = true; MONRACE_IDX r_idx; while (notpicked) { r_idx = who[i]; roff_top(r_idx); term_addstr(-1, TERM_WHITE, _(" ['r'思い出, ' 'で続行, ESC]", " [(r)ecall, ESC, space to continue]")); - while (TRUE) { + while (true) { if (recall) { lore_do_probe(player_ptr, r_idx); monster_race_track(player_ptr, r_idx); handle_stuff(player_ptr); screen_roff(player_ptr, r_idx, MONSTER_LORE_RESEARCH); - notpicked = FALSE; + notpicked = false; old_sym = sym; old_i = i; } diff --git a/src/market/building-quest.cpp b/src/market/building-quest.cpp index 19d4fcb5e..65cf83ea3 100644 --- a/src/market/building-quest.cpp +++ b/src/market/building-quest.cpp @@ -19,7 +19,7 @@ * @brief クエスト情報を処理しつつ取得する。/ Process and get quest information * @param player_ptr プレーヤーへの参照ポインタ * @param questnum クエストのID - * @param do_init クエストの開始処理か(TRUE)、結果処理か(FALSE) + * @param do_init クエストの開始処理か(true)、結果処理か(FALSE) */ static void get_questinfo(player_type *player_ptr, IDX questnum, bool do_init) { @@ -45,7 +45,7 @@ static void get_questinfo(player_type *player_ptr, IDX questnum, bool do_init) * @brief クエスト情報を処理しつつ表示する。/ Process and display quest information * @param player_ptr プレーヤーへの参照ポインタ * @param questnum クエストのID - * @param do_init クエストの開始処理か(TRUE)、結果処理か(FALSE) + * @param do_init クエストの開始処理か(true)、結果処理か(FALSE) */ void print_questinfo(player_type *player_ptr, IDX questnum, bool do_init) { @@ -80,7 +80,7 @@ void castle_quest(player_type *player_ptr) if (q_ptr->status == QUEST_STATUS_COMPLETED) { q_ptr->status = QUEST_STATUS_REWARDED; print_questinfo(player_ptr, q_index, FALSE); - reinit_wilderness = TRUE; + reinit_wilderness = true; return; } @@ -110,7 +110,7 @@ void castle_quest(player_type *player_ptr) if (q_ptr->status == QUEST_STATUS_FAILED) { print_questinfo(player_ptr, q_index, FALSE); q_ptr->status = QUEST_STATUS_FAILED_DONE; - reinit_wilderness = TRUE; + reinit_wilderness = true; return; } @@ -118,7 +118,7 @@ void castle_quest(player_type *player_ptr) return; q_ptr->status = QUEST_STATUS_TAKEN; - reinit_wilderness = TRUE; + reinit_wilderness = true; if (q_ptr->type != QUEST_TYPE_KILL_ANY_LEVEL) { print_questinfo(player_ptr, q_index, TRUE); return; diff --git a/src/market/building-recharger.cpp b/src/market/building-recharger.cpp index e749b404f..78d49e3e6 100644 --- a/src/market/building-recharger.cpp +++ b/src/market/building-recharger.cpp @@ -33,7 +33,7 @@ */ void building_recharge(player_type *player_ptr) { - msg_flag = FALSE; + msg_flag = false; clear_bldg(4, 18); prt(_(" 再充填の費用はアイテムの種類によります。", " The prices of recharge depend on the type."), 6, 0); item_tester_hook = item_tester_hook_recharge; @@ -176,7 +176,7 @@ void building_recharge(player_type *player_ptr) */ void building_recharge_all(player_type *player_ptr) { - msg_flag = FALSE; + msg_flag = false; clear_bldg(4, 18); prt(_(" 再充填の費用はアイテムの種類によります。", " The prices of recharge depend on the type."), 6, 0); diff --git a/src/market/building-service.cpp b/src/market/building-service.cpp index 60b84065b..bca5d8993 100644 --- a/src/market/building-service.cpp +++ b/src/market/building-service.cpp @@ -17,20 +17,20 @@ bool is_owner(player_type *player_ptr, building_type *bldg) { if (bldg->member_class[player_ptr->pclass] == BUILDING_OWNER) { - return TRUE; + return true; } if (bldg->member_race[player_ptr->prace] == BUILDING_OWNER) { - return TRUE; + return true; } REALM_IDX realm1 = player_ptr->realm1; REALM_IDX realm2 = player_ptr->realm2; if ((is_magic(realm1) && (bldg->member_realm[realm1] == BUILDING_OWNER)) || (is_magic(realm2) && (bldg->member_realm[realm2] == BUILDING_OWNER))) { - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -46,28 +46,28 @@ bool is_owner(player_type *player_ptr, building_type *bldg) bool is_member(player_type *player_ptr, building_type *bldg) { if (bldg->member_class[player_ptr->pclass]) { - return TRUE; + return true; } if (bldg->member_race[player_ptr->prace]) { - return TRUE; + return true; } REALM_IDX realm1 = player_ptr->realm1; REALM_IDX realm2 = player_ptr->realm2; if ((is_magic(realm1) && bldg->member_realm[realm1]) || (is_magic(realm2) && bldg->member_realm[realm2])) { - return TRUE; + return true; } if (player_ptr->pclass != CLASS_SORCERER) - return FALSE; + return false; for (int i = 0; i < MAX_MAGIC; i++) { if (bldg->member_realm[i + 1]) - return TRUE; + return true; } - return FALSE; + return false; } /*! diff --git a/src/market/play-gamble.cpp b/src/market/play-gamble.cpp index a1f53345f..1aa78812e 100644 --- a/src/market/play-gamble.cpp +++ b/src/market/play-gamble.cpp @@ -35,7 +35,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) { (void)show_file(player_ptr, TRUE, _("jgambling.txt", "gambling.txt"), NULL, 0, 0); screen_load(); - return TRUE; + return true; } if (player_ptr->au < 1) @@ -44,7 +44,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) "Hey! You don't have gold - get out of here!")); msg_print(NULL); screen_load(); - return FALSE; + return false; } clear_bldg(5, 23); @@ -63,7 +63,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) { msg_print(NULL); screen_load(); - return TRUE; + return true; } for (p = out_val; *p == ' '; p++); @@ -74,7 +74,7 @@ bool gamble_comm(player_type *player_ptr, 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) { @@ -88,7 +88,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) wager = 1; } msg_print(NULL); - win = FALSE; + win = false; odds = 0; oldgold = player_ptr->au; @@ -106,7 +106,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) c_put_str(TERM_GREEN, _("イン・ビトイーン", "In Between"), 5, 2); odds = 4; - win = FALSE; + win = false; roll1 = randint1(10); roll2 = randint1(10); choice = randint1(10); @@ -118,7 +118,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) prt(tmp_str, 11, 14); if (((choice > roll1) && (choice < roll2)) || ((choice < roll1) && (choice > roll2))) - win = TRUE; + win = true; break; case BACT_CRAPS: /* Game of Craps */ c_put_str(TERM_GREEN, _("クラップス", "Craps"), 5, 2); @@ -133,9 +133,9 @@ bool gamble_comm(player_type *player_ptr, int cmd) "First roll: %d %d Total: %d"), roll1, roll2, roll3); prt(tmp_str, 7, 5); if ((roll3 == 7) || (roll3 == 11)) - win = TRUE; + win = true; else if ((roll3 == 2) || (roll3 == 3) || (roll3 == 12)) - win = FALSE; + win = false; else { do @@ -150,16 +150,16 @@ bool gamble_comm(player_type *player_ptr, int cmd) "Roll result: %d %d Total: %d"), roll1, roll2, roll3); prt(tmp_str, 8, 5); if (roll3 == choice) - win = TRUE; + win = true; else if (roll3 == 7) - win = FALSE; + win = false; } while ((win != TRUE) && (win != FALSE)); } break; case BACT_SPIN_WHEEL: /* Spin the Wheel Game */ - win = FALSE; + win = false; odds = 9; c_put_str(TERM_GREEN, _("ルーレット", "Wheel"), 5, 2); @@ -188,7 +188,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) prt("", 9, 0); prt("*", 9, (3 * roll1 + 5)); if (roll1 == choice) - win = TRUE; + win = true; break; case BACT_DICE_SLOTS: /* The Dice Slots */ @@ -201,7 +201,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) c_put_str(TERM_VIOLET, _("プラム プラム プラム 200", "Plum Plum Plum 200"), 11, 37); c_put_str(TERM_RED, _("チェリー チェリー チェリー 1000", "Cherry Cherry Cherry 1000"), 12, 37); - win = FALSE; + win = false; roll1 = randint1(21); for (i = 6; i > 0; i--) { @@ -239,7 +239,7 @@ bool gamble_comm(player_type *player_ptr, int cmd) display_fruit(8, 21, choice - 1); if ((roll1 == roll2) && (roll2 == choice)) { - win = TRUE; + win = true; switch (roll1) { case 1: @@ -258,14 +258,14 @@ bool gamble_comm(player_type *player_ptr, int cmd) } else if ((roll1 == 1) && (roll2 == 1)) { - win = TRUE; + win = true; odds = 2; } break; case BACT_POKER: - win = FALSE; + win = false; odds = do_poker(); - if (odds) win = TRUE; + if (odds) win = true; break; } @@ -320,5 +320,5 @@ bool gamble_comm(player_type *player_ptr, int cmd) msg_print(NULL); screen_load(); - return TRUE; + return true; } diff --git a/src/market/poker.cpp b/src/market/poker.cpp index 28e745e07..498439294 100644 --- a/src/market/poker.cpp +++ b/src/market/poker.cpp @@ -70,9 +70,9 @@ static bool has_joker(void) { for (int i = 0; i < 5; i++) { - if (IS_JOKER(cards[i])) return TRUE; + if (IS_JOKER(cards[i])) return true; } - return FALSE; + return false; } @@ -85,10 +85,10 @@ static bool find_card_num(int num) { for (int i = 0; i < 5; i++) { - if (NUM_OF(cards[i]) == num && !IS_JOKER(cards[i])) return TRUE; + if (NUM_OF(cards[i]) == num && !IS_JOKER(cards[i])) return true; } - return FALSE; + return false; } @@ -99,19 +99,19 @@ static bool find_card_num(int num) */ static bool poker_hand_check_flush(void) { - bool joker_is_used = FALSE; + bool joker_is_used = false; int suit = IS_JOKER(cards[0]) ? SUIT_OF(cards[1]) : SUIT_OF(cards[0]); for (int i = 0; i < 5; i++) { if (SUIT_OF(cards[i]) == suit) continue; if (has_joker() && !joker_is_used) - joker_is_used = TRUE; + joker_is_used = true; else - return FALSE; + return false; } - return TRUE; + return true; } @@ -123,8 +123,8 @@ static bool poker_hand_check_flush(void) static int poker_hand_check_straight(void) { int lowest = 99; - bool joker_is_used = FALSE; - bool straight = FALSE; + bool joker_is_used = false; + bool straight = false; for (int i = 0; i < 5; i++) { @@ -141,7 +141,7 @@ static int poker_hand_check_straight(void) { if (!find_card_num(9 + i)) { if (has_joker() && !joker_is_used) - joker_is_used = TRUE; + joker_is_used = true; else break; } @@ -162,7 +162,7 @@ static int poker_hand_check_straight(void) } } - joker_is_used = FALSE; + joker_is_used = false; if (lowest == 0) { @@ -171,16 +171,16 @@ static int poker_hand_check_straight(void) { if (!find_card_num(9 + i)) { if (has_joker() && !joker_is_used) - joker_is_used = TRUE; + joker_is_used = true; else break; } } - if (i == 4) straight = TRUE; + if (i == 4) straight = true; } - joker_is_used = FALSE; + joker_is_used = false; int i; for (i = 0; i < 5; i++) @@ -188,13 +188,13 @@ static int poker_hand_check_straight(void) if (!find_card_num(lowest + i)) { if (has_joker() && !joker_is_used) - joker_is_used = TRUE; + joker_is_used = true; else break; /* None */ } } - if (i == 5) straight = TRUE; + if (i == 5) straight = true; if (straight && poker_hand_check_flush()) return 2; /* Straight Flush */ else if (straight) return 1; /* Only Straight */ @@ -588,9 +588,9 @@ int do_poker(void) { int is_put[5]; - bool done = FALSE; - bool decision = TRUE; - bool draw = TRUE; + bool done = false; + bool decision = true; + bool draw = true; int deck[53]; reset_deck(deck); @@ -616,7 +616,7 @@ int do_poker(void) display_kaeruka(k + decision * 5, is_put); } - draw = FALSE; + draw = false; cmd = inkey(); switch (cmd) { @@ -628,10 +628,10 @@ int do_poker(void) else { k = 0; - decision = FALSE; + decision = false; } - draw = TRUE; + draw = true; break; case '4': case 'h': case 'H': case KTRL('B'): if (!decision) @@ -641,33 +641,33 @@ int do_poker(void) else { k = 4; - decision = FALSE; + decision = false; } - draw = TRUE; + draw = true; break; case '2': case 'j': case 'J': case KTRL('N'): if (!decision) { - decision = TRUE; draw = TRUE; + decision = true; draw = true; } break; case '8': case 'k': case 'K': case KTRL('P'): if (decision) { - decision = FALSE; draw = TRUE; + decision = false; draw = true; } break; case ' ': case '\r': if (decision) { - done = TRUE; + done = true; } else { - is_put[k] = !is_put[k]; draw = TRUE; + is_put[k] = !is_put[k]; draw = true; } break; diff --git a/src/melee/melee-postprocess.cpp b/src/melee/melee-postprocess.cpp index e1f86a37c..87444162c 100644 --- a/src/melee/melee-postprocess.cpp +++ b/src/melee/melee-postprocess.cpp @@ -92,12 +92,12 @@ static void prepare_redraw(player_type *player_ptr, mam_pp_type *mam_pp_ptr) static bool process_invulnerability(mam_pp_type *mam_pp_ptr) { if (monster_invulner_remaining(mam_pp_ptr->m_ptr) && randint0(PENETRATE_INVULNERABILITY)) - return FALSE; + return false; if (mam_pp_ptr->seen) msg_format(_("%^sはダメージを受けない。", "%^s is unharmed."), mam_pp_ptr->m_name); - return TRUE; + return true; } /*! @@ -109,7 +109,7 @@ static bool process_all_resistances(mam_pp_type *mam_pp_ptr) { monster_race *r_ptr = &r_info[mam_pp_ptr->m_ptr->r_idx]; if ((r_ptr->flagsr & RFR_RES_ALL) == 0) - return FALSE; + return false; if (mam_pp_ptr->dam > 0) { mam_pp_ptr->dam /= 100; @@ -118,12 +118,12 @@ static bool process_all_resistances(mam_pp_type *mam_pp_ptr) } if (mam_pp_ptr->dam != 0) - return FALSE; + return false; if (mam_pp_ptr->seen) msg_format(_("%^sはダメージを受けない。", "%^s is unharmed."), mam_pp_ptr->m_name); - return TRUE; + return true; } /*! @@ -141,7 +141,7 @@ static void print_monster_dead_by_monster(player_type *player_ptr, mam_pp_type * monster_desc(player_ptr, mam_pp_ptr->m_name, mam_pp_ptr->m_ptr, MD_TRUE_NAME); if (!mam_pp_ptr->seen) { - player_ptr->current_floor_ptr->monster_noise = TRUE; + player_ptr->current_floor_ptr->monster_noise = true; return; } @@ -168,22 +168,22 @@ static bool check_monster_hp(player_type *player_ptr, mam_pp_type *mam_pp_ptr) { monster_race *r_ptr = &r_info[mam_pp_ptr->m_ptr->r_idx]; if (mam_pp_ptr->m_ptr->hp < 0) - return FALSE; + return false; if (((r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) || (r_ptr->flags7 & RF7_NAZGUL)) && !player_ptr->phase_out) { mam_pp_ptr->m_ptr->hp = 1; - return FALSE; + return false; } sound_type kill_sound = monster_living(mam_pp_ptr->m_ptr->r_idx) ? SOUND_KILL : SOUND_N_KILL; sound(kill_sound); - *(mam_pp_ptr->dead) = TRUE; + *(mam_pp_ptr->dead) = true; print_monster_dead_by_monster(player_ptr, mam_pp_ptr); monster_gain_exp(player_ptr, mam_pp_ptr->who, mam_pp_ptr->m_ptr->r_idx); monster_death(player_ptr, mam_pp_ptr->m_idx, FALSE); delete_monster_idx(player_ptr, mam_pp_ptr->m_idx); - *(mam_pp_ptr->fear) = FALSE; - return TRUE; + *(mam_pp_ptr->fear) = false; + return true; } /*! @@ -197,7 +197,7 @@ static void cancel_fear_by_pain(player_type *player_ptr, mam_pp_type *mam_pp_ptr || !set_monster_monfear(player_ptr, mam_pp_ptr->m_idx, monster_fear_remaining(mam_pp_ptr->m_ptr) - randint1(mam_pp_ptr->dam / 4))) return; - *(mam_pp_ptr->fear) = FALSE; + *(mam_pp_ptr->fear) = false; } /*! @@ -216,7 +216,7 @@ static void make_monster_fear(player_type *player_ptr, mam_pp_type *mam_pp_ptr) if (!can_make_fear) return; - *(mam_pp_ptr->fear) = TRUE; + *(mam_pp_ptr->fear) = true; (void)set_monster_monfear( player_ptr, mam_pp_ptr->m_idx, (randint1(10) + (((mam_pp_ptr->dam >= mam_pp_ptr->m_ptr->hp) && (percentage > 7)) ? 20 : ((11 - percentage) * 5)))); } @@ -270,7 +270,7 @@ void mon_take_hit_mon(player_type *player_ptr, MONSTER_IDX m_idx, HIT_POINT dam, if (check_monster_hp(player_ptr, mam_pp_ptr)) return; - *dead = FALSE; + *dead = false; cancel_fear_by_pain(player_ptr, mam_pp_ptr); make_monster_fear(player_ptr, mam_pp_ptr); if ((dam > 0) && !is_pet(m_ptr) && !is_friendly(m_ptr) && (mam_pp_ptr->who != m_idx)) { diff --git a/src/melee/melee-spell-flags-checker.cpp b/src/melee/melee-spell-flags-checker.cpp index 661c741fe..201940308 100644 --- a/src/melee/melee-spell-flags-checker.cpp +++ b/src/melee/melee-spell-flags-checker.cpp @@ -63,7 +63,7 @@ static void decide_indirection_melee_spell(player_type *target_ptr, melee_spell_ static bool check_melee_spell_projection(player_type *target_ptr, melee_spell_type *ms_ptr) { if (ms_ptr->target_idx != 0) - return TRUE; + return true; int start; int plus = 1; @@ -86,10 +86,10 @@ static bool check_melee_spell_projection(player_type *target_ptr, melee_spell_ty || !projectable(target_ptr, ms_ptr->m_ptr->fy, ms_ptr->m_ptr->fx, ms_ptr->t_ptr->fy, ms_ptr->t_ptr->fx)) continue; - return TRUE; + return true; } - return FALSE; + return false; } static void check_darkness(player_type *target_ptr, melee_spell_type *ms_ptr) @@ -301,7 +301,7 @@ static void check_smart(player_type *target_ptr, melee_spell_type *ms_ptr) static bool set_melee_spell_set(player_type *target_ptr, melee_spell_type *ms_ptr) { if (ms_ptr->ability_flags.none()) - return FALSE; + return false; EnumClassFlagGroup::get_flags(ms_ptr->ability_flags, std::back_inserter(ms_ptr->spells)); @@ -311,13 +311,13 @@ static bool set_melee_spell_set(player_type *target_ptr, melee_spell_type *ms_pt bool check_melee_spell_set(player_type *target_ptr, melee_spell_type *ms_ptr) { if (monster_confused_remaining(ms_ptr->m_ptr)) - return FALSE; + return false; ms_ptr->ability_flags = ms_ptr->r_ptr->ability_flags; decide_melee_spell_target(target_ptr, ms_ptr); decide_indirection_melee_spell(target_ptr, ms_ptr); if (!check_melee_spell_projection(target_ptr, ms_ptr)) - return FALSE; + return false; ms_ptr->y = ms_ptr->t_ptr->fy; ms_ptr->x = ms_ptr->t_ptr->fx; diff --git a/src/melee/melee-spell.cpp b/src/melee/melee-spell.cpp index aea50893a..8d08fa5e6 100644 --- a/src/melee/melee-spell.cpp +++ b/src/melee/melee-spell.cpp @@ -30,24 +30,24 @@ static bool try_melee_spell(player_type *target_ptr, melee_spell_type *ms_ptr) { if (spell_is_inate(ms_ptr->thrown_spell) || (!ms_ptr->in_no_magic_dungeon && (!monster_stunned_remaining(ms_ptr->m_ptr) || one_in_(2)))) - return FALSE; + return false; disturb(target_ptr, TRUE, TRUE); if (ms_ptr->see_m) msg_format(_("%^sは呪文を唱えようとしたが失敗した。", "%^s tries to cast a spell, but fails."), ms_ptr->m_name); - return TRUE; + return true; } static bool disturb_melee_spell(player_type *target_ptr, melee_spell_type *ms_ptr) { if (spell_is_inate(ms_ptr->thrown_spell) || !magic_barrier(target_ptr, ms_ptr->m_idx)) - return FALSE; + return false; if (ms_ptr->see_m) msg_format(_("反魔法バリアが%^sの呪文をかき消した。", "Anti magic barrier cancels the spell which %^s casts."), ms_ptr->m_name); - return TRUE; + return true; } static void process_special_melee_spell(player_type *target_ptr, melee_spell_type *ms_ptr) @@ -72,7 +72,7 @@ static void process_special_melee_spell(player_type *target_ptr, melee_spell_typ target_ptr->mane_spell[target_ptr->mane_num] = ms_ptr->thrown_spell; target_ptr->mane_dam[target_ptr->mane_num] = ms_ptr->dam; target_ptr->mane_num++; - target_ptr->new_mane = TRUE; + target_ptr->new_mane = true; target_ptr->redraw |= PR_IMITATION; } @@ -117,7 +117,7 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx) melee_spell_type tmp_ms; melee_spell_type *ms_ptr = initialize_melee_spell_type(target_ptr, &tmp_ms, m_idx); if (!check_melee_spell_set(target_ptr, ms_ptr)) - return FALSE; + return false; describe_melee_spell(target_ptr, ms_ptr); ms_ptr->thrown_spell = ms_ptr->spells[randint0(ms_ptr->spells.size())]; @@ -125,12 +125,12 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx) disturb(target_ptr, TRUE, TRUE); if (try_melee_spell(target_ptr, ms_ptr) || disturb_melee_spell(target_ptr, ms_ptr)) - return TRUE; + return true; ms_ptr->can_remember = is_original_ap_and_seen(target_ptr, ms_ptr->m_ptr); const auto res = monspell_to_monster(target_ptr, ms_ptr->thrown_spell, ms_ptr->y, ms_ptr->x, m_idx, ms_ptr->target_idx, FALSE); if (!res.valid) - return FALSE; + return false; ms_ptr->dam = res.dam; process_special_melee_spell(target_ptr, ms_ptr); @@ -138,5 +138,5 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx) if (target_ptr->is_dead && (ms_ptr->r_ptr->r_deaths < MAX_SHORT) && !target_ptr->current_floor_ptr->inside_arena) ms_ptr->r_ptr->r_deaths++; - return TRUE; + return true; } diff --git a/src/melee/melee-switcher.cpp b/src/melee/melee-switcher.cpp index f25c5bb97..1c6e4ce90 100644 --- a/src/melee/melee-switcher.cpp +++ b/src/melee/melee-switcher.cpp @@ -19,37 +19,37 @@ void describe_melee_method(player_type *subject_ptr, mam_type *mam_ptr) switch (mam_ptr->method) { case RBM_HIT: { mam_ptr->act = _("%sを殴った。", "hits %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_TOUCH: { mam_ptr->act = _("%sを触った。", "touches %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_PUNCH: { mam_ptr->act = _("%sをパンチした。", "punches %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_KICK: { mam_ptr->act = _("%sを蹴った。", "kicks %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_CLAW: { mam_ptr->act = _("%sをひっかいた。", "claws %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_BITE: { mam_ptr->act = _("%sを噛んだ。", "bites %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_STING: { mam_ptr->act = _("%sを刺した。", "stings %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_SLASH: { @@ -58,37 +58,37 @@ void describe_melee_method(player_type *subject_ptr, mam_type *mam_ptr) } case RBM_BUTT: { mam_ptr->act = _("%sを角で突いた。", "butts %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_CRUSH: { mam_ptr->act = _("%sに体当りした。", "crushes %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_ENGULF: { mam_ptr->act = _("%sを飲み込んだ。", "engulfs %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_CHARGE: { mam_ptr->act = _("%sに請求書をよこした。", "charges %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_CRAWL: { mam_ptr->act = _("%sの体の上を這い回った。", "crawls on %s."); - mam_ptr->touched = TRUE; + mam_ptr->touched = true; break; } case RBM_DROOL: { mam_ptr->act = _("%sによだれをたらした。", "drools on %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_SPIT: { mam_ptr->act = _("%sに唾を吐いた。", "spits on %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_EXPLODE: { @@ -96,48 +96,48 @@ void describe_melee_method(player_type *subject_ptr, mam_type *mam_ptr) disturb(subject_ptr, TRUE, TRUE); mam_ptr->act = _("爆発した。", "explodes."); - mam_ptr->explode = TRUE; - mam_ptr->touched = FALSE; + mam_ptr->explode = true; + mam_ptr->touched = false; break; } case RBM_GAZE: { mam_ptr->act = _("%sをにらんだ。", "gazes at %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_WAIL: { mam_ptr->act = _("%sに泣きついた。", "wails at %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_SPORE: { mam_ptr->act = _("%sに胞子を飛ばした。", "releases spores at %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_XXX4: { mam_ptr->act = _("%sにXXX4を飛ばした。", "projects XXX4's at %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_BEG: { mam_ptr->act = _("%sに金をせがんだ。", "begs %s for money."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_INSULT: { mam_ptr->act = _("%sを侮辱した。", "insults %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_MOAN: { mam_ptr->act = _("%sにむかってうめいた。", "moans at %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } case RBM_SHOW: { mam_ptr->act = _("%sにむかって歌った。", "sings to %s."); - mam_ptr->touched = FALSE; + mam_ptr->touched = false; break; } @@ -178,7 +178,7 @@ void decide_monster_attack_effect(player_type *subject_ptr, mam_type *mam_ptr) case RBE_EAT_ITEM: case RBE_EAT_GOLD: if ((subject_ptr->riding != mam_ptr->m_idx) && one_in_(2)) - mam_ptr->blinked = TRUE; + mam_ptr->blinked = true; break; case RBE_EAT_FOOD: diff --git a/src/melee/melee-util.cpp b/src/melee/melee-util.cpp index d7fedc3be..20f27805e 100644 --- a/src/melee/melee-util.cpp +++ b/src/melee/melee-util.cpp @@ -20,19 +20,19 @@ mam_type *initialize_mam_type(player_type *subject_ptr, mam_type *mam_ptr, MONRA mam_ptr->see_either = mam_ptr->see_m || mam_ptr->see_t; mam_ptr->y_saver = mam_ptr->t_ptr->fy; mam_ptr->x_saver = mam_ptr->t_ptr->fx; - mam_ptr->explode = FALSE; - mam_ptr->touched = FALSE; + mam_ptr->explode = false; + mam_ptr->touched = false; monster_race *r_ptr = &r_info[mam_ptr->m_ptr->r_idx]; monster_race *tr_ptr = &r_info[mam_ptr->t_ptr->r_idx]; mam_ptr->ac = tr_ptr->ac; mam_ptr->rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1); - mam_ptr->blinked = FALSE; + mam_ptr->blinked = false; mam_ptr->do_silly_attack = (one_in_(2) && subject_ptr->image); mam_ptr->power = 0; - mam_ptr->obvious = FALSE; + mam_ptr->obvious = false; mam_ptr->known = (mam_ptr->m_ptr->cdis <= MAX_SIGHT) || (mam_ptr->t_ptr->cdis <= MAX_SIGHT); - mam_ptr->fear = FALSE; - mam_ptr->dead = FALSE; + mam_ptr->fear = false; + mam_ptr->dead = false; return mam_ptr; } diff --git a/src/melee/monster-attack-monster.cpp b/src/melee/monster-attack-monster.cpp index 9ee9417cb..5c1c4cb23 100644 --- a/src/melee/monster-attack-monster.cpp +++ b/src/melee/monster-attack-monster.cpp @@ -144,16 +144,16 @@ static void aura_elec_by_melee(player_type *subject_ptr, mam_type *mam_ptr) static bool check_same_monster(player_type *subject_ptr, mam_type *mam_ptr) { if (mam_ptr->m_idx == mam_ptr->t_idx) - return FALSE; + return false; monster_race *r_ptr = &r_info[mam_ptr->m_ptr->r_idx]; if (r_ptr->flags1 & RF1_NEVER_BLOW) - return FALSE; + return false; if (d_info[subject_ptr->dungeon_idx].flags.has(DF::NO_MELEE)) - return FALSE; + return false; - return TRUE; + return true; } static void redraw_health_bar(player_type *subject_ptr, mam_type *mam_ptr) @@ -220,7 +220,7 @@ static void process_melee(player_type *subject_ptr, mam_type *mam_ptr) redraw_health_bar(subject_ptr, mam_ptr); describe_melee_method(subject_ptr, mam_ptr); describe_silly_melee(mam_ptr); - mam_ptr->obvious = TRUE; + mam_ptr->obvious = true; mam_ptr->damage = damroll(mam_ptr->d_dice, mam_ptr->d_side); mam_ptr->effect_type = BLOW_EFFECT_TYPE_NONE; mam_ptr->pt = GF_MISSILE; @@ -234,13 +234,13 @@ static void thief_runaway_by_melee(player_type *subject_ptr, mam_type *mam_ptr) if (mam_ptr->see_m) { msg_print(_("泥棒は笑って逃げ...ようとしたがバリアに防がれた。", "The thief flees laughing...? But a magic barrier obstructs it.")); } else if (mam_ptr->known) { - subject_ptr->current_floor_ptr->monster_noise = TRUE; + subject_ptr->current_floor_ptr->monster_noise = true; } } else { if (mam_ptr->see_m) { msg_print(_("泥棒は笑って逃げた！", "The thief flees laughing!")); } else if (mam_ptr->known) { - subject_ptr->current_floor_ptr->monster_noise = TRUE; + subject_ptr->current_floor_ptr->monster_noise = true; } teleport_away(subject_ptr, mam_ptr->m_idx, MAX_SIGHT * 2 + 5, TELEPORT_SPONTANEOUS); @@ -256,7 +256,7 @@ static void explode_monster_by_melee(player_type *subject_ptr, mam_type *mam_ptr (void)set_monster_invulner(subject_ptr, mam_ptr->m_idx, 0, FALSE); mon_take_hit_mon(subject_ptr, mam_ptr->m_idx, mam_ptr->m_ptr->hp + 1, &mam_ptr->dead, &mam_ptr->fear, _("は爆発して粉々になった。", " explodes into tiny shreds."), mam_ptr->m_idx); - mam_ptr->blinked = FALSE; + mam_ptr->blinked = false; } /*! @@ -304,12 +304,12 @@ bool monst_attack_monst(player_type *subject_ptr, MONSTER_IDX m_idx, MONSTER_IDX mam_type *mam_ptr = initialize_mam_type(subject_ptr, &tmp_mam, m_idx, t_idx); if (!check_same_monster(subject_ptr, mam_ptr)) - return FALSE; + return false; monster_desc(subject_ptr, mam_ptr->m_name, mam_ptr->m_ptr, 0); monster_desc(subject_ptr, mam_ptr->t_name, mam_ptr->t_ptr, 0); if (!mam_ptr->see_either && mam_ptr->known) - subject_ptr->current_floor_ptr->monster_noise = TRUE; + subject_ptr->current_floor_ptr->monster_noise = true; if (subject_ptr->riding && (m_idx == subject_ptr->riding)) disturb(subject_ptr, TRUE, TRUE); @@ -317,8 +317,8 @@ bool monst_attack_monst(player_type *subject_ptr, MONSTER_IDX m_idx, MONSTER_IDX repeat_melee(subject_ptr, mam_ptr); explode_monster_by_melee(subject_ptr, mam_ptr); if (!mam_ptr->blinked || mam_ptr->m_ptr->r_idx == 0) - return TRUE; + return true; thief_runaway_by_melee(subject_ptr, mam_ptr); - return TRUE; + return true; } diff --git a/src/mind/mind-archer.cpp b/src/mind/mind-archer.cpp index 119640286..9b6b94a89 100644 --- a/src/mind/mind-archer.cpp +++ b/src/mind/mind-archer.cpp @@ -92,7 +92,7 @@ static bool select_ammo_creation_type(ammo_creation_type &type, PLAYER_LEVEL ple bool create_ammo(player_type *creature_ptr) { if (cmd_limit_confused(creature_ptr) || cmd_limit_blind(creature_ptr)) - return FALSE; + return false; ammo_creation_type ext = AMMO_NONE; @@ -103,19 +103,19 @@ bool create_ammo(player_type *creature_ptr) case AMMO_SHOT: { DIRECTION dir; if (!get_rep_dir(creature_ptr, &dir, FALSE)) - return FALSE; + return false; POSITION y = creature_ptr->y + ddy[dir]; POSITION x = creature_ptr->x + ddx[dir]; grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; if (!has_flag(f_info[get_feat_mimic(g_ptr)].flags, FF_CAN_DIG)) { msg_print(_("そこには岩石がない。", "You need a pile of rubble.")); - return FALSE; + return false; } if (!cave_has_flag_grid(g_ptr, FF_CAN_DIG) || !cave_has_flag_grid(g_ptr, FF_HURT_ROCK)) { msg_print(_("硬すぎて崩せなかった。", "You failed to make ammo.")); - return TRUE; + return true; } object_type forge; @@ -135,7 +135,7 @@ bool create_ammo(player_type *creature_ptr) cave_alter_feat(creature_ptr, y, x, FF_HURT_ROCK); creature_ptr->update |= PU_FLOW; - return TRUE; + return true; } case AMMO_ARROW: { item_tester_hook = item_tester_hook_convertible; @@ -144,7 +144,7 @@ bool create_ammo(player_type *creature_ptr) OBJECT_IDX item; object_type *q_ptr = choose_object(creature_ptr, &item, q, s, USE_INVEN | USE_FLOOR, TV_NONE); if (!q_ptr) - return FALSE; + return false; object_type forge; q_ptr = &forge; @@ -162,7 +162,7 @@ bool create_ammo(player_type *creature_ptr) if (slot >= 0) autopick_alter_item(creature_ptr, slot, FALSE); - return TRUE; + return true; } case AMMO_BOLT: { item_tester_hook = item_tester_hook_convertible; @@ -171,7 +171,7 @@ bool create_ammo(player_type *creature_ptr) OBJECT_IDX item; object_type *q_ptr = choose_object(creature_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_NONE); if (!q_ptr) - return FALSE; + return false; object_type forge; q_ptr = &forge; @@ -189,9 +189,9 @@ bool create_ammo(player_type *creature_ptr) if (slot >= 0) autopick_alter_item(creature_ptr, slot, FALSE); - return TRUE; + return true; } default: - return TRUE; + return true; } } diff --git a/src/mind/mind-berserker.cpp b/src/mind/mind-berserker.cpp index a31dd8328..0f765c60f 100644 --- a/src/mind/mind-berserker.cpp +++ b/src/mind/mind-berserker.cpp @@ -32,17 +32,17 @@ bool cast_berserk_spell(player_type *caster_ptr, mind_berserker_type spell) case CHARGE: { if (caster_ptr->riding) { msg_print(_("乗馬中には無理だ。", "You cannot do it when riding.")); - return FALSE; + return false; } if (!get_direction(caster_ptr, &dir, FALSE, FALSE) || (dir == 5)) - return FALSE; + return false; y = caster_ptr->y + ddy[dir]; x = caster_ptr->x + ddx[dir]; if (!caster_ptr->current_floor_ptr->grid_array[y][x].m_idx) { msg_print(_("その方向にはモンスターはいません。", "There is no monster.")); - return FALSE; + return false; } do_cmd_attack(caster_ptr, y, x, HISSATSU_NONE); @@ -62,7 +62,7 @@ bool cast_berserk_spell(player_type *caster_ptr, mind_berserker_type spell) } case SMASH_TRAP: { if (!get_direction(caster_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; y = caster_ptr->y + ddy[dir]; x = caster_ptr->x + ddx[dir]; @@ -80,5 +80,5 @@ bool cast_berserk_spell(player_type *caster_ptr, mind_berserker_type spell) break; } - return TRUE; + return true; } diff --git a/src/mind/mind-blue-mage.cpp b/src/mind/mind-blue-mage.cpp index 62e99a3c6..354d084ca 100644 --- a/src/mind/mind-blue-mage.cpp +++ b/src/mind/mind-blue-mage.cpp @@ -38,20 +38,20 @@ bool do_cmd_cast_learned(player_type *caster_ptr) MANA_POINT need_mana; if (cmd_limit_confused(caster_ptr)) - return FALSE; + return false; if (!get_learned_power(caster_ptr, &n)) - return FALSE; + return false; spell = monster_powers[n]; need_mana = mod_need_mana(caster_ptr, spell.smana, 0, REALM_NONE); if (need_mana > caster_ptr->csp) { msg_print(_("ＭＰが足りません。", "You do not have enough mana to use this power.")); if (!over_exert) - return FALSE; + return false; if (!get_check(_("それでも挑戦しますか? ", "Attempt it anyway? "))) - return FALSE; + return false; } chance = spell.fail; @@ -92,7 +92,7 @@ bool do_cmd_cast_learned(player_type *caster_ptr) sound(SOUND_ZAP); cast = cast_learned_spell(caster_ptr, spell_type, TRUE); if (!cast) - return FALSE; + return false; } if (need_mana <= caster_ptr->csp) { @@ -114,5 +114,5 @@ bool do_cmd_cast_learned(player_type *caster_ptr) PlayerEnergy(caster_ptr).set_player_turn_energy(100); caster_ptr->redraw |= PR_MANA; caster_ptr->window_flags |= PW_PLAYER | PW_SPELL; - return TRUE; + return true; } diff --git a/src/mind/mind-cavalry.cpp b/src/mind/mind-cavalry.cpp index beaedc937..dd25d6bb1 100644 --- a/src/mind/mind-cavalry.cpp +++ b/src/mind/mind-cavalry.cpp @@ -35,11 +35,11 @@ bool rodeo(player_type *creature_ptr) if (creature_ptr->riding) { msg_print(_("今は乗馬中だ。", "You ARE riding.")); - return FALSE; + return false; } if (!do_cmd_riding(creature_ptr, TRUE)) - return TRUE; + return true; m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding]; r_ptr = &r_info[m_ptr->r_idx]; @@ -47,7 +47,7 @@ bool rodeo(player_type *creature_ptr) msg_format(_("%sに乗った。", "You ride on %s."), m_name); if (is_pet(m_ptr)) - return TRUE; + return true; rlev = r_ptr->level; @@ -68,5 +68,5 @@ bool rodeo(player_type *creature_ptr) creature_ptr->riding = 0; } - return TRUE; + return true; } diff --git a/src/mind/mind-elementalist.cpp b/src/mind/mind-elementalist.cpp index 67da2ce13..cc14d3983 100644 --- a/src/mind/mind-elementalist.cpp +++ b/src/mind/mind-elementalist.cpp @@ -480,7 +480,7 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) switch (spell) { case ElementSpells::BOLT_1ST: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = damroll(3 + ((plev - 1) / 5), 4); typ = get_element_spells_type(caster_ptr, power.elem); (void)fire_bolt(caster_ptr, typ, dir, dam); @@ -497,7 +497,7 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) break; case ElementSpells::BOLT_2ND: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = damroll(8 + ((plev - 5) / 4), 8); typ = get_element_spells_type(caster_ptr, power.elem); if (fire_bolt_or_beam(caster_ptr, plev, typ, dir, dam)) { @@ -512,7 +512,7 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) case ElementSpells::BALL_3RD: project_length = 4; if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; typ = get_element_spells_type(caster_ptr, power.elem); dam = 50 + plev * 2; (void)fire_ball(caster_ptr, typ, dir, dam, 1); @@ -520,14 +520,14 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) break; case ElementSpells::BALL_1ST: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = 55 + plev; typ = get_element_spells_type(caster_ptr, power.elem); (void)fire_ball(caster_ptr, typ, dir, dam, 2); break; case ElementSpells::BREATH_2ND: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = MIN(150, caster_ptr->chp / 2); typ = get_element_spells_type(caster_ptr, power.elem); if (fire_breath(caster_ptr, typ, dir, dam, 3)) { @@ -538,12 +538,12 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) break; case ElementSpells::ANNIHILATE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball_hide(caster_ptr, GF_E_GENOCIDE, dir, plev + 50, 0); break; case ElementSpells::BOLT_3RD: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = damroll(12 + ((plev - 5) / 4), 8); typ = get_element_spells_type(caster_ptr, power.elem); fire_bolt_or_beam(caster_ptr, plev, typ, dir, dam); @@ -555,7 +555,7 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) break; case ElementSpells::BALL_2ND: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = 75 + plev * 3 / 2; typ = get_element_spells_type(caster_ptr, power.elem); if (fire_ball(caster_ptr, typ, dir, dam, 3)) { @@ -583,7 +583,7 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) break; case ElementSpells::STORM_2ND: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = 115 + plev * 5 / 2; typ = get_element_spells_type(caster_ptr, power.elem); if (fire_ball(caster_ptr, typ, dir, dam, 4)) { @@ -594,23 +594,23 @@ static bool cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx) break; case ElementSpells::BREATH_1ST: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = caster_ptr->chp * 2 / 3; typ = get_element_spells_type(caster_ptr, power.elem); (void)fire_breath(caster_ptr, typ, dir, dam, 3); break; case ElementSpells::STORM_3ND: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = 300 + plev * 5; typ = get_element_spells_type(caster_ptr, power.elem); (void)fire_ball(caster_ptr, typ, dir, dam, 5); break; default: - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -677,7 +677,7 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) TERM_LEN y = 1; TERM_LEN x = 10; PLAYER_LEVEL plev = caster_ptr->lev; - int ask = TRUE; + int ask = true; char choice; char out_val[160]; char comment[80]; @@ -689,12 +689,12 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) if (repeat_pull(&code)) { *sn = (SPELL_IDX)code; if (get_elemental_info(caster_ptr, *sn).min_lev <= plev) - return TRUE; + return true; } concptr p = _("元素魔法", "magic"); - flag = FALSE; - redraw = FALSE; + flag = false; + redraw = false; for (i = 0; i < static_cast(ElementSpells::MAX); i++) { if (get_elemental_info(caster_ptr, i).min_lev <= plev) @@ -725,7 +725,7 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) case '0': if (!only_browse) screen_load(); - return FALSE; + return false; case '8': case 'k': case 'K': @@ -741,7 +741,7 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) case '\r': case '\n': i = menu_line - 1; - ask = FALSE; + ask = false; break; } @@ -754,7 +754,7 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) if (!redraw || use_menu) { char desc[80]; char name[80]; - redraw = TRUE; + redraw = true; if (!only_browse && !use_menu) screen_save(); @@ -788,7 +788,7 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) prt("", y + i + 1, x); } else if (!only_browse) { - redraw = FALSE; + redraw = false; screen_load(); } @@ -819,7 +819,7 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) continue; } - flag = TRUE; + flag = true; } if (redraw && !only_browse) @@ -828,11 +828,11 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) set_bits(caster_ptr->window_flags, PW_SPELL); handle_stuff(caster_ptr); if (!flag) - return FALSE; + return false; *sn = i; repeat_push((COMMAND_CODE)i); - return TRUE; + return true; } /*! @@ -844,11 +844,11 @@ bool get_element_power(player_type *caster_ptr, SPELL_IDX *sn, bool only_browse) static bool check_element_mp_sufficiency(player_type *caster_ptr, int mana_cost) { if (mana_cost <= caster_ptr->csp) - return TRUE; + return true; msg_print(_("ＭＰが足りません。", "You do not have enough mana to use this power.")); if (!over_exert) - return FALSE; + return false; return get_check(_("それでも挑戦しますか? ", "Attempt it anyway? ")); } @@ -884,10 +884,10 @@ static bool try_cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx, set_bits(caster_ptr->redraw, PR_MANA); set_bits(caster_ptr->window_flags, PW_PLAYER | PW_SPELL); - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -941,7 +941,7 @@ void do_cmd_element_browse(player_type *caster_ptr) char temp[62 * 5]; screen_save(); - while (TRUE) { + while (true) { if (!get_element_power(caster_ptr, &n, TRUE)) { screen_load(); return; @@ -975,41 +975,41 @@ bool is_elemental_genocide_effective(monster_race *r_ptr, spells_type type) switch (type) { case GF_FIRE: if (any_bits(r_ptr->flagsr, RFR_IM_FIRE)) - return FALSE; + return false; break; case GF_COLD: if (any_bits(r_ptr->flagsr, RFR_IM_COLD)) - return FALSE; + return false; break; case GF_ELEC: if (any_bits(r_ptr->flagsr, RFR_IM_ELEC)) - return FALSE; + return false; break; case GF_ACID: if (any_bits(r_ptr->flagsr, RFR_IM_ACID)) - return FALSE; + return false; break; case GF_DARK: if (any_bits(r_ptr->flagsr, RFR_RES_DARK) || any_bits(r_ptr->r_flags3, RF3_HURT_LITE)) - return FALSE; + return false; break; case GF_CONFUSION: if (any_bits(r_ptr->flags3, RF3_NO_CONF)) - return FALSE; + return false; break; case GF_SHARDS: if (any_bits(r_ptr->flagsr, RFR_RES_SHAR)) - return FALSE; + return false; break; case GF_POIS: if (any_bits(r_ptr->flagsr, RFR_IM_POIS)) - return FALSE; + return false; break; default: - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -1028,7 +1028,7 @@ process_result effect_monster_elemental_genocide(player_type *caster_ptr, effect msg_format(_("%sが%sを包み込んだ。", "The %s surrounds %s."), name, em_ptr->m_name); if (em_ptr->seen) - em_ptr->obvious = TRUE; + em_ptr->obvious = true; if (!b) { if (em_ptr->seen_msg) @@ -1045,7 +1045,7 @@ process_result effect_monster_elemental_genocide(player_type *caster_ptr, effect return PROCESS_TRUE; } - em_ptr->skipped = TRUE; + em_ptr->skipped = true; return PROCESS_CONTINUE; } @@ -1061,7 +1061,7 @@ process_result effect_monster_elemental_genocide(player_type *caster_ptr, effect bool has_element_resist(player_type *creature_ptr, ElementRealm realm, PLAYER_LEVEL lev) { if (creature_ptr->pclass != CLASS_ELEMENTALIST) - return FALSE; + return false; auto prealm = static_cast(creature_ptr->element); return (prealm == realm && creature_ptr->lev >= lev); @@ -1136,7 +1136,7 @@ static int get_element_realm(player_type *creature_ptr, int is, int n) char buf[80]; sprintf(buf, _("領域を選んで下さい(%c-%c) ('='初期オプション設定): ", "Choose a realm (%c-%c) ('=' for options): "), I2A(0), I2A(n - 1)); - while (TRUE) { + while (true) { display_realm_cursor(os, n, TERM_WHITE); display_realm_cursor(cs, n, TERM_YELLOW); put_str(buf, 10, 10); @@ -1355,7 +1355,7 @@ bool switch_element_execution(player_type *creature_ptr) break; case ElementRealm::SEA: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; (void)wall_to_mud(creature_ptr, dir, plev * 3 / 2); break; case ElementRealm::DARKNESS: @@ -1372,10 +1372,10 @@ bool switch_element_execution(player_type *creature_ptr) creature_ptr->current_floor_ptr->num_repro += MAX_REPRO; break; default: - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -1388,9 +1388,9 @@ bool switch_element_execution(player_type *creature_ptr) static bool is_target_grid_dark(floor_type *f_ptr, POSITION y, POSITION x) { if (any_bits(f_ptr->grid_array[y][x].info, CAVE_MNLT)) - return FALSE; + return false; - bool is_dark = FALSE; + bool is_dark = false; bool is_lite = any_bits(f_ptr->grid_array[y][x].info, CAVE_GLOW | CAVE_LITE); for (int dx = x - 2; dx <= x + 2; dx++) @@ -1407,13 +1407,13 @@ static bool is_target_grid_dark(floor_type *f_ptr, POSITION y, POSITION x) POSITION d = distance(dy, dx, y, x); monster_race *r_ptr = &r_info[f_ptr->m_list[m_idx].r_idx]; if (d <= 1 && any_bits(r_ptr->flags7, RF7_HAS_LITE_1 | RF7_SELF_LITE_1)) - return FALSE; + return false; if (d <= 2 && any_bits(r_ptr->flags7, RF7_HAS_LITE_2 | RF7_SELF_LITE_2)) - return FALSE; + return false; if (d <= 1 && any_bits(r_ptr->flags7, RF7_HAS_DARK_1 | RF7_SELF_DARK_1)) - is_dark = TRUE; + is_dark = true; if (d <= 2 && any_bits(r_ptr->flags7, RF7_HAS_DARK_2 | RF7_SELF_DARK_2)) - is_dark = TRUE; + is_dark = true; } return !is_lite || is_dark; @@ -1431,7 +1431,7 @@ static bool door_to_darkness(player_type *caster_ptr, POSITION dist) for (int i = 0; i < 3; i++) { if (!tgt_pt(caster_ptr, &x, &y)) - return FALSE; + return false; f_ptr = caster_ptr->current_floor_ptr; @@ -1454,5 +1454,5 @@ static bool door_to_darkness(player_type *caster_ptr, POSITION dist) } else { msg_print(_("闇の扉は開かなかった！", "Door to darkness does not open!")); } - return TRUE; + return true; } diff --git a/src/mind/mind-force-trainer.cpp b/src/mind/mind-force-trainer.cpp index 022118c2b..50674a83b 100644 --- a/src/mind/mind-force-trainer.cpp +++ b/src/mind/mind-force-trainer.cpp @@ -67,7 +67,7 @@ bool clear_mind(player_type *creature_ptr) { if (total_friends) { msg_print(_("今はペットを操ることに集中していないと。", "Your pets demand all of your attention.")); - return FALSE; + return false; } msg_print(_("少し頭がハッキリした。", "You feel your head clear a little.")); @@ -79,7 +79,7 @@ bool clear_mind(player_type *creature_ptr) } creature_ptr->redraw |= (PR_MANA); - return TRUE; + return true; } /*! @@ -89,7 +89,7 @@ bool clear_mind(player_type *creature_ptr) */ void set_lightspeed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) @@ -104,14 +104,14 @@ void set_lightspeed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) return; } else if (!creature_ptr->lightspeed) { msg_print(_("非常に素早く動けるようになった！", "You feel yourself moving extremely fast!")); - notice = TRUE; + notice = true; chg_virtue(creature_ptr, V_PATIENCE, -1); chg_virtue(creature_ptr, V_DILIGENCE, 1); } } else { if (creature_ptr->lightspeed) { msg_print(_("動きの素早さがなくなったようだ。", "You feel yourself slow down.")); - notice = TRUE; + notice = true; } } @@ -134,24 +134,24 @@ void set_lightspeed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_tim_sh_force(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_sh_touki && !do_dec) { if (creature_ptr->tim_sh_touki > v) - return FALSE; + return false; } else if (!creature_ptr->tim_sh_touki) { msg_print(_("体が闘気のオーラで覆われた。", "You are enveloped by an aura of the Force!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_sh_touki) { msg_print(_("闘気が消えた。", "The aura of the Force disappeared.")); - notice = TRUE; + notice = true; } } @@ -159,12 +159,12 @@ bool set_tim_sh_force(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -181,7 +181,7 @@ bool shock_power(player_type *caster_ptr) project_length = 1; DIRECTION dir; if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; POSITION y = caster_ptr->y + ddy[dir]; POSITION x = caster_ptr->x + ddx[dir]; @@ -189,7 +189,7 @@ bool shock_power(player_type *caster_ptr) HIT_POINT dam = damroll(8 + ((plev - 5) / 4) + boost / 12, 8); fire_beam(caster_ptr, GF_MISSILE, dir, dam); if (!caster_ptr->current_floor_ptr->grid_array[y][x].m_idx) - return TRUE; + return true; POSITION ty = y, tx = x; POSITION oy = y, ox = x; @@ -201,7 +201,7 @@ bool shock_power(player_type *caster_ptr) if (randint1(r_ptr->level * 3 / 2) > randint0(dam / 2) + dam / 2) { msg_format(_("%sは飛ばされなかった。", "%^s was not blown away."), m_name); - return TRUE; + return true; } for (int i = 0; i < 5; i++) { @@ -218,7 +218,7 @@ bool shock_power(player_type *caster_ptr) bool is_shock_successful = ty != oy; is_shock_successful |= tx != ox; if (is_shock_successful) - return TRUE; + return true; msg_format(_("%sを吹き飛ばした！", "You blow %s away!"), m_name); caster_ptr->current_floor_ptr->grid_array[oy][ox].m_idx = 0; @@ -233,7 +233,7 @@ bool shock_power(player_type *caster_ptr) if (r_ptr->flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)) caster_ptr->update |= (PU_MON_LITE); - return TRUE; + return true; } /*! @@ -253,7 +253,7 @@ bool cast_force_spell(player_type *caster_ptr, mind_force_trainer_type spell) switch (spell) { case SMALL_FORCE_BALL: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball(caster_ptr, GF_MISSILE, dir, damroll(3 + ((plev - 1) / 5) + boost / 12, 4), 0); break; @@ -266,7 +266,7 @@ bool cast_force_spell(player_type *caster_ptr, mind_force_trainer_type spell) case KAMEHAMEHA: project_length = plev / 8 + 3; if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_beam(caster_ptr, GF_MISSILE, dir, damroll(5 + ((plev - 1) / 5) + boost / 10, 5)); break; @@ -282,7 +282,7 @@ bool cast_force_spell(player_type *caster_ptr, mind_force_trainer_type spell) fire_ball(caster_ptr, GF_MANA, 0, get_current_ki(caster_ptr) / 2, 10); take_hit(caster_ptr, DAMAGE_LOSELIFE, caster_ptr->magic_num1[0] / 2, _("気の暴走", "Explosion of the Force")); } else - return TRUE; + return true; break; case AURA_OF_FORCE: @@ -293,13 +293,13 @@ bool cast_force_spell(player_type *caster_ptr, mind_force_trainer_type spell) break; case LARGE_FORCE_BALL: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball(caster_ptr, GF_MISSILE, dir, damroll(10, 6) + plev * 3 / 2 + boost * 3 / 5, (plev < 30) ? 2 : 3); break; case DISPEL_MAGIC: { if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; MONSTER_IDX m_idx = caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx; if ((m_idx == 0) || !player_has_los_bold(caster_ptr, target_row, target_col) @@ -310,10 +310,10 @@ bool cast_force_spell(player_type *caster_ptr, mind_force_trainer_type spell) break; } case SUMMON_GHOST: { - bool success = FALSE; + bool success = false; for (int i = 0; i < 1 + boost / 100; i++) if (summon_specific(caster_ptr, -1, caster_ptr->y, caster_ptr->x, plev, SUMMON_PHANTOM, PM_FORCE_PET)) - success = TRUE; + success = true; if (success) msg_print(_("御用でございますが、御主人様？", "'Your wish, master?'")); @@ -327,7 +327,7 @@ bool cast_force_spell(player_type *caster_ptr, mind_force_trainer_type spell) break; case SUPER_KAMEHAMEHA: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_beam(caster_ptr, GF_MANA, dir, damroll(10 + (plev / 2) + boost * 3 / 10, 15)); break; @@ -340,5 +340,5 @@ bool cast_force_spell(player_type *caster_ptr, mind_force_trainer_type spell) set_current_ki(caster_ptr, TRUE, 0); caster_ptr->update |= PU_BONUS; - return TRUE; + return true; } diff --git a/src/mind/mind-hobbit.cpp b/src/mind/mind-hobbit.cpp index c082095d7..3d0fdbe19 100644 --- a/src/mind/mind-hobbit.cpp +++ b/src/mind/mind-hobbit.cpp @@ -13,5 +13,5 @@ bool create_ration(player_type *creature_ptr) q_ptr->prep(creature_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION)); (void)drop_near(creature_ptr, q_ptr, -1, creature_ptr->y, creature_ptr->x); msg_print(_("食事を料理して作った。", "You cook some food.")); - return TRUE; + return true; } diff --git a/src/mind/mind-mage.cpp b/src/mind/mind-mage.cpp index a7607d09b..c265a2635 100644 --- a/src/mind/mind-mage.cpp +++ b/src/mind/mind-mage.cpp @@ -41,18 +41,18 @@ bool eat_magic(player_type *caster_ptr, int power) OBJECT_IDX item; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_NONE); if (!o_ptr) - return FALSE; + return false; object_kind *k_ptr; k_ptr = &k_info[o_ptr->k_idx]; DEPTH lev = k_info[o_ptr->k_idx].level; int recharge_strength = 0; - bool is_eating_successful = TRUE; + bool is_eating_successful = true; if (o_ptr->tval == TV_ROD) { recharge_strength = ((power > lev / 2) ? (power - lev / 2) : 0) / 5; if (one_in_(recharge_strength)) { - is_eating_successful = FALSE; + is_eating_successful = false; } else { if (o_ptr->timeout > (o_ptr->number - 1) * k_ptr->pval) { msg_print(_("充填中のロッドから魔力を吸収することはできません。", "You can't absorb energy from a discharged rod.")); @@ -67,7 +67,7 @@ bool eat_magic(player_type *caster_ptr, int power) recharge_strength = 0; if (one_in_(recharge_strength)) { - is_eating_successful = FALSE; + is_eating_successful = false; } else { if (o_ptr->pval > 0) { caster_ptr->csp += lev / 2; diff --git a/src/mind/mind-magic-eater.cpp b/src/mind/mind-magic-eater.cpp index 4abd54993..dd3509b72 100644 --- a/src/mind/mind-magic-eater.cpp +++ b/src/mind/mind-magic-eater.cpp @@ -25,21 +25,21 @@ bool import_magic_device(player_type *user_ptr) OBJECT_IDX item; object_type *o_ptr = choose_object(user_ptr, &item, q, s, USE_INVEN | USE_FLOOR, TV_NONE); if (!o_ptr) - return FALSE; + return false; if (o_ptr->tval == TV_STAFF && o_ptr->sval == SV_STAFF_NOTHING) { msg_print(_("この杖には発動の為の能力は何も備わっていないようだ。", "This staff doesn't have any magical ability.")); - return FALSE; + return false; } if (!object_is_known(o_ptr)) { msg_print(_("鑑定されていないと取り込めない。", "You need to identify before absorbing.")); - return FALSE; + return false; } if (o_ptr->timeout) { msg_print(_("充填中のアイテムは取り込めない。", "This item is still charging.")); - return FALSE; + return false; } PARAMETER_VALUE pval = o_ptr->pval; @@ -84,5 +84,5 @@ bool import_magic_device(player_type *user_ptr) vary_item(user_ptr, item, -999); PlayerEnergy(user_ptr).set_player_turn_energy(100); - return TRUE; + return true; } diff --git a/src/mind/mind-magic-resistance.cpp b/src/mind/mind-magic-resistance.cpp index 3520fbdee..06fa03c2e 100644 --- a/src/mind/mind-magic-resistance.cpp +++ b/src/mind/mind-magic-resistance.cpp @@ -15,24 +15,24 @@ */ bool set_resist_magic(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->resist_magic && !do_dec) { if (creature_ptr->resist_magic > v) - return FALSE; + return false; } else if (!creature_ptr->resist_magic) { msg_print(_("魔法への耐性がついた。", "You have been protected from magic!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->resist_magic) { msg_print(_("魔法に弱くなった。", "You are no longer protected from magic.")); - notice = TRUE; + notice = true; } } @@ -40,11 +40,11 @@ bool set_resist_magic(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/mind/mind-mindcrafter.cpp b/src/mind/mind-mindcrafter.cpp index c09f0f308..b341f6b5b 100644 --- a/src/mind/mind-mindcrafter.cpp +++ b/src/mind/mind-mindcrafter.cpp @@ -59,11 +59,11 @@ bool psychometry(player_type *caster_ptr) OBJECT_IDX item; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_NONE); if (!o_ptr) - return FALSE; + return false; if (object_is_known(o_ptr)) { msg_print(_("何も新しいことは判らなかった。", "You cannot find out anything more about that.")); - return TRUE; + return true; } item_feel_type feel = pseudo_value_check_heavy(o_ptr); @@ -72,7 +72,7 @@ bool psychometry(player_type *caster_ptr) if (!feel) { msg_format(_("%sからは特に変わった事は感じとれなかった。", "You do not perceive anything unusual about the %s."), o_name); - return TRUE; + return true; } #ifdef JP @@ -88,7 +88,7 @@ bool psychometry(player_type *caster_ptr) set_bits(caster_ptr->update, PU_COMBINE | PU_REORDER); set_bits(caster_ptr->window_flags, PW_INVEN | PW_EQUIP | PW_PLAYER | PW_FLOOR_ITEM_LIST); - bool okay = FALSE; + bool okay = false; switch (o_ptr->tval) { case TV_SHOT: case TV_ARROW: @@ -112,7 +112,7 @@ bool psychometry(player_type *caster_ptr) case TV_AMULET: case TV_LITE: case TV_FIGURINE: - okay = TRUE; + okay = true; break; default: @@ -120,7 +120,7 @@ bool psychometry(player_type *caster_ptr) } autopick_alter_item(caster_ptr, item, (bool)(okay && destroy_feeling)); - return TRUE; + return true; } /*! @@ -131,7 +131,7 @@ bool psychometry(player_type *caster_ptr) */ bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell) { - bool b = FALSE; + bool b = false; int dam = 0; DIRECTION dir; TIME_EFFECT t; @@ -166,7 +166,7 @@ bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell break; case NEURAL_BLAST: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; if (randint1(100) < plev * 2) fire_beam(caster_ptr, GF_PSI, dir, damroll(3 + ((plev - 1) / 4), (3 + plev / 15))); @@ -182,7 +182,7 @@ bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell case DOMINATION: if (plev < 30) { if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball(caster_ptr, GF_DOMINATION, dir, plev, 0); } else { @@ -192,7 +192,7 @@ bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell break; case PLUVERISE: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball(caster_ptr, GF_TELEKINESIS, dir, damroll(8 + ((plev - 5) / 4), 8), (plev > 20 ? (plev - 20) / 8 + 1 : 0)); break; @@ -235,13 +235,13 @@ bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell break; case TELEKINESIS: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fetch_item(caster_ptr, dir, plev * 15, FALSE); break; case PSYCHIC_DRAIN: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; dam = damroll(plev / 2, 6); if (fire_ball(caster_ptr, GF_PSI_DRAIN, dir, dam, 0)) @@ -250,7 +250,7 @@ bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell break; case PSYCHO_SPEAR: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_beam(caster_ptr, GF_PSY_SPEAR, dir, randint1(plev * 3) + plev * 3); break; @@ -261,5 +261,5 @@ bool cast_mindcrafter_spell(player_type *caster_ptr, mind_mindcrafter_type spell msg_print(_("なに？", "Zap?")); } - return TRUE; + return true; } diff --git a/src/mind/mind-mirror-master.cpp b/src/mind/mind-mirror-master.cpp index 271711e64..5a428de75 100644 --- a/src/mind/mind-mirror-master.cpp +++ b/src/mind/mind-mirror-master.cpp @@ -56,12 +56,12 @@ bool mirror_concentration(player_type *creature_ptr) { if (total_friends) { msg_print(_("今はペットを操ることに集中していないと。", "Your pets demand all of your attention.")); - return FALSE; + return false; } if (!is_mirror_grid(&creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x])) { msg_print(_("鏡の上でないと集中できない！", "There's no mirror here!")); - return TRUE; + return true; } msg_print(_("少し頭がハッキリした。", "You feel your head clear a little.")); @@ -73,7 +73,7 @@ bool mirror_concentration(player_type *creature_ptr) } creature_ptr->redraw |= PR_MANA; - return TRUE; + return true; } /*! @@ -130,7 +130,7 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam) } if (mirror_num < 2) - return FALSE; + return false; point_x[0] = randint0(mirror_num); do { @@ -149,7 +149,7 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam) POSITION centersign = (point_x[0] * 3 - x) * (point_y[1] * 3 - y) - (point_y[0] * 3 - y) * (point_x[1] * 3 - x); if (centersign == 0) - return FALSE; + return false; POSITION x1 = point_x[0] < point_x[1] ? point_x[0] : point_x[1]; x1 = x1 < point_x[2] ? x1 : point_x[2]; @@ -220,7 +220,7 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam) remove_mirror(caster_ptr, point_y[0], point_x[0]); } - return TRUE; + return true; } /*! @@ -258,7 +258,7 @@ bool confusing_light(player_type *creature_ptr) confuse_monsters(creature_ptr, creature_ptr->lev * 4); turn_monsters(creature_ptr, creature_ptr->lev * 4); stasis_monsters(creature_ptr, creature_ptr->lev * 4); - return TRUE; + return true; } /*! @@ -269,7 +269,7 @@ bool place_mirror(player_type *caster_ptr) { if (!cave_clean_bold(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x)) { msg_print(_("床上のアイテムが呪文を跳ね返した。", "The object resists the spell.")); - return FALSE; + return false; } /* Create a mirror */ @@ -283,7 +283,7 @@ bool place_mirror(player_type *caster_ptr) lite_spot(caster_ptr, caster_ptr->y, caster_ptr->x); update_local_illumination(caster_ptr, caster_ptr->y, caster_ptr->x); - return TRUE; + return true; } /*! @@ -296,12 +296,12 @@ bool mirror_tunnel(player_type *caster_ptr) { POSITION x = 0, y = 0; if (!tgt_pt(caster_ptr, &x, &y)) - return FALSE; + return false; if (exe_dimension_door(caster_ptr, x, y)) - return TRUE; + return true; msg_print(_("鏡の世界をうまく通れなかった！", "You could not enter the mirror!")); - return TRUE; + return true; } /* @@ -309,24 +309,24 @@ bool mirror_tunnel(player_type *caster_ptr) */ bool set_multishadow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->multishadow && !do_dec) { if (creature_ptr->multishadow > v) - return FALSE; + return false; } else if (!creature_ptr->multishadow) { msg_print(_("あなたの周りに幻影が生まれた。", "Your Shadow enveloped you.")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->multishadow) { msg_print(_("幻影が消えた。", "Your Shadow disappears.")); - notice = TRUE; + notice = true; } } @@ -334,13 +334,13 @@ bool set_multishadow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -351,24 +351,24 @@ bool set_multishadow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_dustrobe(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->dustrobe && !do_dec) { if (creature_ptr->dustrobe > v) - return FALSE; + return false; } else if (!creature_ptr->dustrobe) { msg_print(_("体が鏡のオーラで覆われた。", "You are enveloped by mirror shards.")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->dustrobe) { msg_print(_("鏡のオーラが消えた。", "The mirror shards disappear.")); - notice = TRUE; + notice = true; } } @@ -376,13 +376,13 @@ bool set_dustrobe(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -439,7 +439,7 @@ bool cast_mirror_spell(player_type *caster_ptr, mind_mirror_master_type spell) break; case DRIP_LIGHT: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; if (plev > 9 && is_mirror_grid(&caster_ptr->current_floor_ptr->grid_array[caster_ptr->y][caster_ptr->x])) fire_beam(caster_ptr, GF_LITE, dir, damroll(3 + ((plev - 1) / 5), 4)); @@ -461,13 +461,13 @@ bool cast_mirror_spell(player_type *caster_ptr, mind_mirror_master_type spell) break; case BANISHING_MIRROR: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; (void)fire_beam(caster_ptr, GF_AWAY_ALL, dir, plev); break; case MIRROR_CRASHING: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball(caster_ptr, GF_SHARDS, dir, damroll(8 + ((plev - 5) / 4), 8), (plev > 20 ? (plev - 20) / 8 + 1 : 0)); break; @@ -481,7 +481,7 @@ bool cast_mirror_spell(player_type *caster_ptr, mind_mirror_master_type spell) break; case SEEKER_RAY: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_beam(caster_ptr, GF_SEEKER, dir, damroll(11 + (plev - 5) / 4, 8)); break; @@ -500,7 +500,7 @@ bool cast_mirror_spell(player_type *caster_ptr, mind_mirror_master_type spell) break; case SUPER_RAY: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_beam(caster_ptr, GF_SUPER_RAY, dir, 150 + randint1(2 * plev)); break; @@ -542,5 +542,5 @@ bool cast_mirror_spell(player_type *caster_ptr, mind_mirror_master_type spell) } caster_ptr->magic_num1[0] = 0; - return TRUE; + return true; } diff --git a/src/mind/mind-monk.cpp b/src/mind/mind-monk.cpp index 1029bb177..4770acd6d 100644 --- a/src/mind/mind-monk.cpp +++ b/src/mind/mind-monk.cpp @@ -34,7 +34,7 @@ static void set_stance(player_type *creature_ptr, const int new_stance) bool choose_monk_stance(player_type *creature_ptr) { if (cmd_limit_confused(creature_ptr)) - return FALSE; + return false; screen_save(); prt(_(" a) 構えをとく", " a) No form"), 2, 20); @@ -50,11 +50,11 @@ bool choose_monk_stance(player_type *creature_ptr) prt(_(" どの構えをとりますか？", " Choose Stance: "), 1, 14); int new_stance = 0; - while (TRUE) { + while (true) { char choice = inkey(); if (choice == ESCAPE) { screen_load(); - return FALSE; + return false; } if ((choice == 'a') || (choice == 'A')) { @@ -63,7 +63,7 @@ bool choose_monk_stance(player_type *creature_ptr) } else msg_print(_("もともと構えていない。", "You are not in a special stance.")); screen_load(); - return TRUE; + return true; } if ((choice == 'b') || (choice == 'B')) { @@ -84,5 +84,5 @@ bool choose_monk_stance(player_type *creature_ptr) set_stance(creature_ptr, new_stance); creature_ptr->redraw |= PR_STATE; screen_load(); - return TRUE; + return true; } diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp index 897a56266..0deaca6fc 100644 --- a/src/mind/mind-ninja.cpp +++ b/src/mind/mind-ninja.cpp @@ -69,17 +69,17 @@ bool kawarimi(player_type *caster_ptr, bool success) object_type *q_ptr = &forge; if (caster_ptr->is_dead) - return FALSE; + return false; if (caster_ptr->confused || caster_ptr->blind || caster_ptr->paralyzed || caster_ptr->image) - return FALSE; + return false; if (randint0(200) < caster_ptr->stun) - return FALSE; + return false; if (!success && one_in_(3)) { msg_print(_("変わり身失敗！逃げられなかった。", "Kawarimi failed! You couldn't run away.")); caster_ptr->special_defense &= ~(NINJA_KAWARIMI); caster_ptr->redraw |= (PR_STATUS); - return FALSE; + return false; } POSITION y = caster_ptr->y; @@ -100,7 +100,7 @@ bool kawarimi(player_type *caster_ptr, bool success) caster_ptr->special_defense &= ~(NINJA_KAWARIMI); caster_ptr->redraw |= (PR_STATUS); - return TRUE; + return true; } /*! @@ -112,12 +112,12 @@ bool kawarimi(player_type *caster_ptr, bool success) bool rush_attack(player_type *attacker_ptr, bool *mdeath) { if (mdeath) - *mdeath = FALSE; + *mdeath = false; project_length = 5; DIRECTION dir; if (!get_aim_dir(attacker_ptr, &dir)) - return FALSE; + return false; int tx = attacker_ptr->x + project_length * ddx[dir]; int ty = attacker_ptr->y + project_length * ddy[dir]; @@ -136,12 +136,12 @@ bool rush_attack(player_type *attacker_ptr, bool *mdeath) int path_n = projection_path(attacker_ptr, path_g, project_length, attacker_ptr->y, attacker_ptr->x, ty, tx, PROJECT_STOP | PROJECT_KILL); project_length = 0; if (!path_n) - return TRUE; + return true; ty = attacker_ptr->y; tx = attacker_ptr->x; - bool tmp_mdeath = FALSE; - bool moved = FALSE; + bool tmp_mdeath = false; + bool moved = false; for (int i = 0; i < path_n; i++) { monster_type *m_ptr; @@ -183,7 +183,7 @@ bool rush_attack(player_type *attacker_ptr, bool *mdeath) if (!player_bold(attacker_ptr, ty, tx)) teleport_player_to(attacker_ptr, ty, tx, TELEPORT_NONMAGICAL); - moved = TRUE; + moved = true; tmp_mdeath = do_cmd_attack(attacker_ptr, ny, nx, HISSATSU_NYUSIN); break; @@ -194,7 +194,7 @@ bool rush_attack(player_type *attacker_ptr, bool *mdeath) if (mdeath) *mdeath = tmp_mdeath; - return TRUE; + return true; } /*! @@ -217,12 +217,12 @@ void process_surprise_attack(player_type *attacker_ptr, player_attack_type *pa_p tmp /= 3; if (monster_csleep_remaining(pa_ptr->m_ptr) && pa_ptr->m_ptr->ml) { /* Can't backstab creatures that we can't see, right? */ - pa_ptr->backstab = TRUE; + pa_ptr->backstab = true; } else if ((attacker_ptr->special_defense & NINJA_S_STEALTH) && (randint0(tmp) > (r_ptr->level + 20)) && pa_ptr->m_ptr->ml && !(r_ptr->flagsr & RFR_RES_ALL)) { - pa_ptr->surprise_attack = TRUE; + pa_ptr->surprise_attack = true; } else if (monster_fear_remaining(pa_ptr->m_ptr) && pa_ptr->m_ptr->ml) { - pa_ptr->stab_fleeing = TRUE; + pa_ptr->stab_fleeing = true; } } @@ -270,7 +270,7 @@ bool hayagake(player_type *creature_ptr) if (creature_ptr->action == ACTION_HAYAGAKE) { set_action(creature_ptr, ACTION_NONE); energy.reset_player_turn(); - return TRUE; + return true; } grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x]; @@ -283,7 +283,7 @@ bool hayagake(player_type *creature_ptr) } energy.reset_player_turn(); - return TRUE; + return true; } /*! @@ -293,39 +293,39 @@ bool hayagake(player_type *creature_ptr) */ bool set_superstealth(player_type *creature_ptr, bool set) { - bool notice = FALSE; + bool notice = false; if (creature_ptr->is_dead) - return FALSE; + return false; if (set) { if (!(creature_ptr->special_defense & NINJA_S_STEALTH)) { if (creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].info & CAVE_MNLT) { msg_print(_("敵の目から薄い影の中に覆い隠された。", "You are mantled in weak shadow from ordinary eyes.")); - creature_ptr->monlite = creature_ptr->old_monlite = TRUE; + creature_ptr->monlite = creature_ptr->old_monlite = true; } else { msg_print(_("敵の目から影の中に覆い隠された！", "You are mantled in shadow from ordinary eyes!")); - creature_ptr->monlite = creature_ptr->old_monlite = FALSE; + creature_ptr->monlite = creature_ptr->old_monlite = false; } - notice = TRUE; + notice = true; creature_ptr->special_defense |= NINJA_S_STEALTH; } } else { if (creature_ptr->special_defense & NINJA_S_STEALTH) { msg_print(_("再び敵の目にさらされるようになった。", "You are exposed to common sight once more.")); - notice = TRUE; + notice = true; creature_ptr->special_defense &= ~(NINJA_S_STEALTH); } } if (!notice) - return FALSE; + return false; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); - return TRUE; + return true; } /*! @@ -375,12 +375,12 @@ bool cast_ninja_spell(player_type *caster_ptr, mind_ninja_type spell) break; case HIT_AND_AWAY: if (!hit_and_away(caster_ptr)) - return FALSE; + return false; break; case BIND_MONSTER: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; (void)stasis_monster(caster_ptr, dir); break; @@ -411,7 +411,7 @@ bool cast_ninja_spell(player_type *caster_ptr, mind_ninja_type spell) else msg_print(_("くさびがなくなった。", "You have no more Iron Spikes.")); - return FALSE; + return false; } do_cmd_throw(caster_ptr, 1, FALSE, slot); @@ -425,7 +425,7 @@ bool cast_ninja_spell(player_type *caster_ptr, mind_ninja_type spell) break; case SMOKE_BALL: if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; fire_ball(caster_ptr, GF_OLD_CONF, dir, plev * 3, 3); break; @@ -433,7 +433,7 @@ bool cast_ninja_spell(player_type *caster_ptr, mind_ninja_type spell) project_length = -1; if (!get_aim_dir(caster_ptr, &dir)) { project_length = 0; - return FALSE; + return false; } project_length = 0; @@ -475,5 +475,5 @@ bool cast_ninja_spell(player_type *caster_ptr, mind_ninja_type spell) msg_print(_("なに？", "Zap?")); break; } - return TRUE; + return true; } diff --git a/src/mind/mind-priest.cpp b/src/mind/mind-priest.cpp index ab9f628f7..290f9808f 100644 --- a/src/mind/mind-priest.cpp +++ b/src/mind/mind-priest.cpp @@ -35,7 +35,7 @@ bool bless_weapon(player_type *caster_ptr) OBJECT_IDX item; object_type *o_ptr = choose_object(caster_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, TV_NONE); if (!o_ptr) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(caster_ptr, o_name, o_ptr, OD_OMIT_PREFIX | OD_NAME_ONLY); @@ -51,7 +51,7 @@ bool bless_weapon(player_type *caster_ptr) msg_format("The black aura on %s %s disrupts the blessing!", ((item >= 0) ? "your" : "the"), o_name); #endif - return TRUE; + return true; } #ifdef JP @@ -80,7 +80,7 @@ bool bless_weapon(player_type *caster_ptr) #else msg_format("%s %s %s blessed already.", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "were" : "was")); #endif - return TRUE; + return true; } if (!(object_is_artifact(o_ptr) || object_is_ego(o_ptr)) || one_in_(3)) { @@ -92,13 +92,13 @@ bool bless_weapon(player_type *caster_ptr) add_flag(o_ptr->art_flags, TR_BLESSED); o_ptr->discount = 99; } else { - bool dis_happened = FALSE; + bool dis_happened = false; msg_print(_("その武器は祝福を嫌っている！", "The weapon resists your blessing!")); /* Disenchant tohit */ if (o_ptr->to_h > 0) { o_ptr->to_h--; - dis_happened = TRUE; + dis_happened = true; } if ((o_ptr->to_h > 5) && (randint0(100) < 33)) @@ -107,7 +107,7 @@ bool bless_weapon(player_type *caster_ptr) /* Disenchant todam */ if (o_ptr->to_d > 0) { o_ptr->to_d--; - dis_happened = TRUE; + dis_happened = true; } if ((o_ptr->to_d > 5) && (randint0(100) < 33)) @@ -116,7 +116,7 @@ bool bless_weapon(player_type *caster_ptr) /* Disenchant toac */ if (o_ptr->to_a > 0) { o_ptr->to_a--; - dis_happened = TRUE; + dis_happened = true; } if ((o_ptr->to_a > 5) && (randint0(100) < 33)) @@ -136,5 +136,5 @@ bool bless_weapon(player_type *caster_ptr) set_bits(caster_ptr->update, PU_BONUS); set_bits(caster_ptr->window_flags, PW_EQUIP | PW_PLAYER | PW_FLOOR_ITEM_LIST); calc_android_exp(caster_ptr); - return TRUE; + return true; } diff --git a/src/mind/mind-samurai.cpp b/src/mind/mind-samurai.cpp index ca0906da5..66ab45585 100644 --- a/src/mind/mind-samurai.cpp +++ b/src/mind/mind-samurai.cpp @@ -337,16 +337,16 @@ bool choose_kata(player_type *creature_ptr) char buf[80]; if (cmd_limit_confused(creature_ptr)) - return FALSE; + return false; if (creature_ptr->stun) { msg_print(_("意識がはっきりとしない。", "You are not clear-headed")); - return FALSE; + return false; } if (creature_ptr->afraid) { msg_print(_("体が震えて構えられない！", "You are trembling with fear!")); - return FALSE; + return false; } screen_save(); @@ -361,19 +361,19 @@ bool choose_kata(player_type *creature_ptr) prt("", 1, 0); prt(_(" どの型で構えますか？", " Choose Stance: "), 1, 14); - while (TRUE) { + while (true) { choice = inkey(); if (choice == ESCAPE) { screen_load(); - return FALSE; + return false; } else if ((choice == 'a') || (choice == 'A')) { if (creature_ptr->action == ACTION_KATA) { set_action(creature_ptr, ACTION_NONE); } else msg_print(_("もともと構えていない。", "You are not in a special stance.")); screen_load(); - return TRUE; + return true; } else if ((choice == 'b') || (choice == 'B')) { new_kata = 0; break; @@ -401,7 +401,7 @@ bool choose_kata(player_type *creature_ptr) creature_ptr->redraw |= (PR_STATE | PR_STATUS); screen_load(); - return TRUE; + return true; } /*! @@ -476,6 +476,6 @@ void musou_counterattack(player_type *attacker_ptr, monap_type *monap_ptr) attacker_ptr->csp -= 7; msg_format(_("%^sに反撃した！", "You counterattacked %s!"), m_target_name); do_cmd_attack(attacker_ptr, monap_ptr->m_ptr->fy, monap_ptr->m_ptr->fx, HISSATSU_COUNTER); - monap_ptr->fear = FALSE; + monap_ptr->fear = false; attacker_ptr->redraw |= (PR_MANA); } diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp index 8c838e63f..1fa01d06e 100644 --- a/src/mind/mind-sniper.cpp +++ b/src/mind/mind-sniper.cpp @@ -134,11 +134,11 @@ static bool snipe_concentrate(player_type *creature_ptr) creature_ptr->concent++; msg_format(_("集中した。(集中度 %d)", "You concentrate deeply. (lvl %d)"), creature_ptr->concent); - creature_ptr->reset_concent = FALSE; + creature_ptr->reset_concent = false; creature_ptr->update |= (PU_BONUS | PU_MONSTERS); creature_ptr->redraw |= (PR_STATUS); - return TRUE; + return true; } /*! @@ -152,7 +152,7 @@ void reset_concentration(player_type *creature_ptr, bool msg) } creature_ptr->concent = 0; - creature_ptr->reset_concent = FALSE; + creature_ptr->reset_concent = false; creature_ptr->update |= (PU_BONUS | PU_MONSTERS); creature_ptr->redraw |= (PR_STATUS); @@ -247,12 +247,12 @@ static int get_snipe_power(player_type *sniper_ptr, COMMAND_CODE *sn, bool only_ /* Verify the spell */ if ((snipe_powers[*sn].min_lev <= plev) && (snipe_powers[*sn].mana_cost <= (int)sniper_ptr->concent)) { /* Success */ - return TRUE; + return true; } } - flag = FALSE; - redraw = FALSE; + flag = false; + redraw = false; for (i = 0; i < MAX_SNIPE_POWERS; i++) { if ((snipe_powers[i].min_lev <= plev) && ((only_browse) || (snipe_powers[i].mana_cost <= (int)sniper_ptr->concent))) { @@ -282,7 +282,7 @@ static int get_snipe_power(player_type *sniper_ptr, COMMAND_CODE *sn, bool only_ if (!redraw) { char psi_index[6]; char psi_desc[75]; - redraw = TRUE; + redraw = true; if (!only_browse) screen_save(); @@ -323,7 +323,7 @@ static int get_snipe_power(player_type *sniper_ptr, COMMAND_CODE *sn, bool only_ /* Hide the list */ else { /* Hide list */ - redraw = FALSE; + redraw = false; if (!only_browse) screen_load(); } @@ -364,7 +364,7 @@ static int get_snipe_power(player_type *sniper_ptr, COMMAND_CODE *sn, bool only_ } /* Stop the loop */ - flag = TRUE; + flag = true; } if (redraw && !only_browse) screen_load(); @@ -374,7 +374,7 @@ static int get_snipe_power(player_type *sniper_ptr, COMMAND_CODE *sn, bool only_ /* Abort if needed */ if (!flag) - return FALSE; + return false; /* Save the choice */ (*sn) = i; @@ -382,7 +382,7 @@ static int get_snipe_power(player_type *sniper_ptr, COMMAND_CODE *sn, bool only_ repeat_push(*sn); /* Success */ - return TRUE; + return true; } /*! @@ -497,7 +497,7 @@ static bool cast_sniper_spell(player_type *sniper_ptr, int spell) if (o_ptr->tval != TV_BOW) { msg_print(_("弓を装備していない！", "You wield no bow!")); - return FALSE; + return false; } /* spell code */ @@ -505,9 +505,9 @@ static bool cast_sniper_spell(player_type *sniper_ptr, int spell) case 0: /* Concentration */ sound(SOUND_ZAP); if (!snipe_concentrate(sniper_ptr)) - return FALSE; + return false; PlayerEnergy(sniper_ptr).set_player_turn_energy(100); - return TRUE; + return true; case 1: snipe_type = SP_LITE; break; @@ -601,7 +601,7 @@ void do_cmd_snipe_browse(player_type *sniper_ptr) screen_save(); - while (TRUE) { + while (true) { if (!get_snipe_power(sniper_ptr, &n, TRUE)) { screen_load(); return; diff --git a/src/mind/mind-warrior-mage.cpp b/src/mind/mind-warrior-mage.cpp index 25dee43f5..770c5e07f 100644 --- a/src/mind/mind-warrior-mage.cpp +++ b/src/mind/mind-warrior-mage.cpp @@ -11,7 +11,7 @@ bool comvert_hp_to_mp(player_type *creature_ptr) if (!gain_sp) { msg_print(_("変換に失敗した。", "You failed to convert.")); creature_ptr->redraw |= (PR_HP | PR_MANA); - return TRUE; + return true; } creature_ptr->csp += gain_sp; @@ -21,7 +21,7 @@ bool comvert_hp_to_mp(player_type *creature_ptr) } creature_ptr->redraw |= (PR_HP | PR_MANA); - return TRUE; + return true; } bool comvert_mp_to_hp(player_type *creature_ptr) @@ -34,5 +34,5 @@ bool comvert_mp_to_hp(player_type *creature_ptr) } creature_ptr->redraw |= (PR_HP | PR_MANA); - return TRUE; + return true; } diff --git a/src/mind/mind-warrior.cpp b/src/mind/mind-warrior.cpp index e288f9e37..bf797dbac 100644 --- a/src/mind/mind-warrior.cpp +++ b/src/mind/mind-warrior.cpp @@ -17,7 +17,7 @@ bool hit_and_away(player_type *caster_ptr) { DIRECTION dir; if (!get_direction(caster_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; POSITION y = caster_ptr->y + ddy[dir]; POSITION x = caster_ptr->x + ddx[dir]; if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx) { @@ -26,12 +26,12 @@ bool hit_and_away(player_type *caster_ptr) msg_print(_("うまく逃げられなかった。", "You failed to run away.")); else teleport_player(caster_ptr, 30, TELEPORT_SPONTANEOUS); - return TRUE; + return true; } msg_print(_("その方向にはモンスターはいません。", "You don't see any monster in this direction")); msg_print(NULL); - return FALSE; + return false; } /*! @@ -58,5 +58,5 @@ bool sword_dancing(player_type *creature_ptr) } } - return TRUE; + return true; } diff --git a/src/mind/mind-weaponsmith.cpp b/src/mind/mind-weaponsmith.cpp index c6d739025..cbd247b28 100644 --- a/src/mind/mind-weaponsmith.cpp +++ b/src/mind/mind-weaponsmith.cpp @@ -20,18 +20,18 @@ bool item_tester_hook_melee_ammo(player_type *player_ptr, object_type *o_ptr) case TV_BOLT: case TV_ARROW: case TV_SHOT: { - return TRUE; + return true; } case TV_SWORD: { if (o_ptr->sval != SV_POISON_NEEDLE) - return TRUE; + return true; } default: break; } - return FALSE; + return false; } /*! @@ -46,7 +46,7 @@ bool object_is_smith(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if (object_is_weapon_armour_ammo(player_ptr, o_ptr) && o_ptr->xtra3) - return TRUE; + return true; - return FALSE; + return false; } diff --git a/src/mind/monk-attack.cpp b/src/mind/monk-attack.cpp index 7f40a58f3..b87de79c2 100644 --- a/src/mind/monk-attack.cpp +++ b/src/mind/monk-attack.cpp @@ -243,13 +243,13 @@ bool double_attack(player_type *creature_ptr) { DIRECTION dir; if (!get_rep_dir(creature_ptr, &dir, FALSE)) - return FALSE; + return false; POSITION y = creature_ptr->y + ddy[dir]; POSITION x = creature_ptr->x + ddx[dir]; if (!creature_ptr->current_floor_ptr->grid_array[y][x].m_idx) { msg_print(_("その方向にはモンスターはいません。", "You don't see any monster in this direction")); msg_print(NULL); - return TRUE; + return true; } if (one_in_(3)) @@ -266,5 +266,5 @@ bool double_attack(player_type *creature_ptr) } creature_ptr->energy_need += ENERGY_NEED(); - return TRUE; + return true; } diff --git a/src/monster-attack/monster-attack-describer.cpp b/src/monster-attack/monster-attack-describer.cpp index 5e6a2f933..eac927950 100644 --- a/src/monster-attack/monster-attack-describer.cpp +++ b/src/monster-attack/monster-attack-describer.cpp @@ -87,33 +87,33 @@ void describe_monster_attack_method(monap_type *monap_ptr) case RBM_HIT: { monap_ptr->act = _("殴られた。", "hits you."); monap_ptr->do_cut = monap_ptr->do_stun = 1; - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_HIT); break; } case RBM_TOUCH: { monap_ptr->act = _("触られた。", "touches you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_TOUCH); break; } case RBM_PUNCH: { monap_ptr->act = _("パンチされた。", "punches you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; monap_ptr->do_stun = 1; sound(SOUND_HIT); break; } case RBM_KICK: { monap_ptr->act = _("蹴られた。", "kicks you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; monap_ptr->do_stun = 1; sound(SOUND_HIT); break; } case RBM_CLAW: { monap_ptr->act = _("ひっかかれた。", "claws you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; monap_ptr->do_cut = 1; sound(SOUND_CLAW); break; @@ -121,19 +121,19 @@ void describe_monster_attack_method(monap_type *monap_ptr) case RBM_BITE: { monap_ptr->act = _("噛まれた。", "bites you."); monap_ptr->do_cut = 1; - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_BITE); break; } case RBM_STING: { monap_ptr->act = _("刺された。", "stings you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_STING); break; } case RBM_SLASH: { monap_ptr->act = _("斬られた。", "slashes you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; monap_ptr->do_cut = 1; sound(SOUND_CLAW); break; @@ -141,20 +141,20 @@ void describe_monster_attack_method(monap_type *monap_ptr) case RBM_BUTT: { monap_ptr->act = _("角で突かれた。", "butts you."); monap_ptr->do_stun = 1; - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_HIT); break; } case RBM_CRUSH: { monap_ptr->act = _("体当たりされた。", "crushes you."); monap_ptr->do_stun = 1; - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_CRUSH); break; } case RBM_ENGULF: { monap_ptr->act = _("飲み込まれた。", "engulfs you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_CRUSH); break; } @@ -163,7 +163,7 @@ void describe_monster_attack_method(monap_type *monap_ptr) monap_ptr->abbreviate = -1; #endif monap_ptr->act = _("は請求書をよこした。", "charges you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; /* このコメントはジョークが効いているので残しておく / Note! This is "charges", not "charges at". */ sound(SOUND_BUY); @@ -174,7 +174,7 @@ void describe_monster_attack_method(monap_type *monap_ptr) monap_ptr->abbreviate = -1; #endif monap_ptr->act = _("が体の上を這い回った。", "crawls on you."); - monap_ptr->touched = TRUE; + monap_ptr->touched = true; sound(SOUND_SLIME); break; } @@ -193,7 +193,7 @@ void describe_monster_attack_method(monap_type *monap_ptr) monap_ptr->abbreviate = -1; #endif monap_ptr->act = _("は爆発した。", "explodes."); - monap_ptr->explode = TRUE; + monap_ptr->explode = true; break; } case RBM_GAZE: { diff --git a/src/monster-attack/monster-attack-lose.cpp b/src/monster-attack/monster-attack-lose.cpp index c6ec63acc..98142fdf3 100644 --- a/src/monster-attack/monster-attack-lose.cpp +++ b/src/monster-attack/monster-attack-lose.cpp @@ -30,7 +30,7 @@ void calc_blow_disease(player_type *target_ptr, monap_type *monap_ptr) return; if (!(has_resist_pois(target_ptr) || is_oppose_pois(target_ptr)) && set_poisoned(target_ptr, target_ptr->poisoned + randint1(monap_ptr->rlev) + 5)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; bool disease_possibility = randint1(100) > calc_nuke_damage_rate(target_ptr); if (disease_possibility || (randint1(100) > 10) || (target_ptr->prace == RACE_ANDROID)) @@ -39,7 +39,7 @@ void calc_blow_disease(player_type *target_ptr, monap_type *monap_ptr) bool perm = one_in_(10); if (dec_stat(target_ptr, A_CON, randint1(10), perm)) { msg_print(_("病があなたを蝕んでいる気がする。", "You feel sickly.")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } } @@ -58,7 +58,7 @@ void calc_blow_lose_strength(player_type *target_ptr, monap_type *monap_ptr) return; if (do_dec_stat(target_ptr, A_STR)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } /*! @@ -76,7 +76,7 @@ void calc_blow_lose_intelligence(player_type *target_ptr, monap_type *monap_ptr) return; if (do_dec_stat(target_ptr, A_INT)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } /*! @@ -94,7 +94,7 @@ void calc_blow_lose_wisdom(player_type *target_ptr, monap_type *monap_ptr) return; if (do_dec_stat(target_ptr, A_WIS)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } /*! @@ -112,7 +112,7 @@ void calc_blow_lose_dexterity(player_type *target_ptr, monap_type *monap_ptr) return; if (do_dec_stat(target_ptr, A_DEX)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } /*! @@ -130,7 +130,7 @@ void calc_blow_lose_constitution(player_type *target_ptr, monap_type *monap_ptr) return; if (do_dec_stat(target_ptr, A_CON)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } /*! @@ -148,7 +148,7 @@ void calc_blow_lose_charisma(player_type *target_ptr, monap_type *monap_ptr) return; if (do_dec_stat(target_ptr, A_CHR)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } /*! diff --git a/src/monster-attack/monster-attack-player.cpp b/src/monster-attack/monster-attack-player.cpp index e97a82c79..6571e26ba 100644 --- a/src/monster-attack/monster-attack-player.cpp +++ b/src/monster-attack/monster-attack-player.cpp @@ -61,15 +61,15 @@ static bool check_no_blow(player_type *target_ptr, monap_type *monap_ptr) { monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; if (r_ptr->flags1 & (RF1_NEVER_BLOW)) - return FALSE; + return false; if (d_info[target_ptr->dungeon_idx].flags.has(DF::NO_MELEE)) - return FALSE; + return false; if (!is_hostile(monap_ptr->m_ptr)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -81,10 +81,10 @@ static bool check_no_blow(player_type *target_ptr, monap_type *monap_ptr) static bool check_monster_continuous_attack(player_type *target_ptr, monap_type *monap_ptr) { if (!monster_is_valid(monap_ptr->m_ptr)) - return FALSE; + return false; if (monap_ptr->method == RBM_NONE) - return FALSE; + return false; monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; if (is_pet(monap_ptr->m_ptr) && (r_ptr->flags1 & RF1_UNIQUE) && (monap_ptr->method == RBM_EXPLODE)) { @@ -94,9 +94,9 @@ static bool check_monster_continuous_attack(player_type *target_ptr, monap_type if (!target_ptr->playing || target_ptr->is_dead || (distance(target_ptr->y, target_ptr->x, monap_ptr->m_ptr->fy, monap_ptr->m_ptr->fx) > 1) || target_ptr->leaving) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -109,7 +109,7 @@ static bool effect_protecion_from_evil(player_type *target_ptr, monap_type *mona { monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; if ((target_ptr->protevil <= 0) || ((r_ptr->flags3 & RF3_EVIL) == 0) || (target_ptr->lev < monap_ptr->rlev) || ((randint0(100) + target_ptr->lev) <= 50)) - return FALSE; + return false; if (is_original_ap_and_seen(target_ptr, monap_ptr->m_ptr)) r_ptr->r_flags3 |= RF3_EVIL; @@ -125,7 +125,7 @@ static bool effect_protecion_from_evil(player_type *target_ptr, monap_type *mona msg_format("%^s is repelled.", monap_ptr->m_name); #endif - return TRUE; + return true; } static void describe_silly_attacks(monap_type *monap_ptr) @@ -252,8 +252,8 @@ static void monster_explode(player_type *target_ptr, monap_type *monap_ptr) sound(SOUND_EXPLODE); if (mon_take_hit(target_ptr, monap_ptr->m_idx, monap_ptr->m_ptr->hp + 1, &monap_ptr->fear, NULL)) { - monap_ptr->blinked = FALSE; - monap_ptr->alive = FALSE; + monap_ptr->blinked = false; + monap_ptr->alive = false; } } @@ -310,13 +310,13 @@ static bool process_monster_attack_hit(player_type *target_ptr, monap_type *mona { disturb(target_ptr, TRUE, TRUE); if (effect_protecion_from_evil(target_ptr, monap_ptr)) - return FALSE; + return false; monap_ptr->do_cut = 0; monap_ptr->do_stun = 0; describe_monster_attack_method(monap_ptr); describe_silly_attacks(monap_ptr); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; monap_ptr->damage = damroll(monap_ptr->d_dice, monap_ptr->d_side); if (monap_ptr->explode) monap_ptr->damage = 0; @@ -327,7 +327,7 @@ static bool process_monster_attack_hit(player_type *target_ptr, monap_type *mona calc_player_stun(target_ptr, monap_ptr); monster_explode(target_ptr, monap_ptr); process_aura_counterattack(target_ptr, monap_ptr); - return TRUE; + return true; } /*! @@ -391,7 +391,7 @@ static bool process_monster_blows(player_type *target_ptr, monap_type *monap_ptr monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; for (int ap_cnt = 0; ap_cnt < MAX_NUM_BLOWS; ap_cnt++) { - monap_ptr->obvious = FALSE; + monap_ptr->obvious = false; monap_ptr->damage = 0; monap_ptr->act = NULL; monap_ptr->effect = r_ptr->blow[ap_cnt].effect; @@ -417,7 +417,7 @@ static bool process_monster_blows(player_type *target_ptr, monap_type *monap_ptr monap_ptr->ac = target_ptr->ac + target_ptr->to_a; bool hit; if (monap_ptr->effect == RBE_FLAVOR) { - hit = TRUE; + hit = true; } else { const int power = mbe_info[monap_ptr->effect].power; hit = check_hit_from_monster_to_player(target_ptr, power, monap_ptr->rlev, monster_stunned_remaining(monap_ptr->m_ptr)); @@ -438,7 +438,7 @@ static bool process_monster_blows(player_type *target_ptr, monap_type *monap_ptr if (target_ptr->special_defense & NINJA_KAWARIMI) { // 変わり身のテレポートが成功したら攻撃を打ち切り、プレイヤーが離脱した旨を返す。 if (kawarimi(target_ptr, FALSE)) - return TRUE; + return true; } } else { // 命中しなかった。回避時の処理、思い出処理を行う。 @@ -448,7 +448,7 @@ static bool process_monster_blows(player_type *target_ptr, monap_type *monap_ptr } // 通常はプレイヤーはその場にとどまる。 - return FALSE; + return false; } /*! @@ -515,7 +515,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) monap_type tmp_monap; monap_type *monap_ptr = initialize_monap_type(target_ptr, &tmp_monap, m_idx); if (!check_no_blow(target_ptr, monap_ptr)) - return FALSE; + return false; monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; monap_ptr->rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1); @@ -524,18 +524,18 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) if (target_ptr->special_defense & KATA_IAI) { msg_format(_("相手が襲いかかる前に素早く武器を振るった。", "You took sen, drew and cut in one motion before %s moved."), monap_ptr->m_name); if (do_cmd_attack(target_ptr, monap_ptr->m_ptr->fy, monap_ptr->m_ptr->fx, HISSATSU_IAI)) - return TRUE; + return true; } if ((target_ptr->special_defense & NINJA_KAWARIMI) && (randint0(55) < (target_ptr->lev * 3 / 5 + 20))) { if (kawarimi(target_ptr, TRUE)) - return TRUE; + return true; } - monap_ptr->blinked = FALSE; + monap_ptr->blinked = false; if (process_monster_blows(target_ptr, monap_ptr)) - return TRUE; + return true; postprocess_monster_blows(target_ptr, monap_ptr); - return TRUE; + return true; } diff --git a/src/monster-attack/monster-attack-processor.cpp b/src/monster-attack/monster-attack-processor.cpp index c863d2626..cc8e8c40c 100644 --- a/src/monster-attack/monster-attack-processor.cpp +++ b/src/monster-attack/monster-attack-processor.cpp @@ -44,12 +44,12 @@ void exe_monster_attack_to_player(player_type *target_ptr, turn_flags *turn_flag if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags1 |= (RF1_NEVER_BLOW); - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; } if (turn_flags_ptr->do_move && d_info[target_ptr->dungeon_idx].flags.has(DF::NO_MELEE) && !monster_confused_remaining(m_ptr)) { if (!(r_ptr->flags2 & RF2_STUPID)) - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; else if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags2 |= (RF2_STUPID); } @@ -59,8 +59,8 @@ void exe_monster_attack_to_player(player_type *target_ptr, turn_flags *turn_flag if (!target_ptr->riding || one_in_(2)) { (void)make_attack_normal(target_ptr, m_idx); - turn_flags_ptr->do_move = FALSE; - turn_flags_ptr->do_turn = TRUE; + turn_flags_ptr->do_move = false; + turn_flags_ptr->do_turn = true; } } @@ -77,26 +77,26 @@ static bool exe_monster_attack_to_monster(player_type *target_ptr, MONSTER_IDX m monster_type *y_ptr; y_ptr = &target_ptr->current_floor_ptr->m_list[g_ptr->m_idx]; if ((r_ptr->flags1 & RF1_NEVER_BLOW) != 0) - return FALSE; + return false; if (((r_ptr->flags2 & RF2_KILL_BODY) == 0) && is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags2 |= (RF2_KILL_BODY); if ((y_ptr->r_idx == 0) || (y_ptr->hp < 0)) - return FALSE; + return false; if (monst_attack_monst(target_ptr, m_idx, g_ptr->m_idx)) - return TRUE; + return true; if (d_info[target_ptr->dungeon_idx].flags.has_not(DF::NO_MELEE)) - return FALSE; + return false; if (monster_confused_remaining(m_ptr)) - return TRUE; + return true; if ((r_ptr->flags2 & RF2_STUPID) == 0) - return FALSE; + return false; if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags2 |= (RF2_STUPID); - return TRUE; + return true; } /*! @@ -115,10 +115,10 @@ bool process_monster_attack_to_monster(player_type *target_ptr, turn_flags *turn monster_type *y_ptr; y_ptr = &target_ptr->current_floor_ptr->m_list[g_ptr->m_idx]; if (!turn_flags_ptr->do_move || (g_ptr->m_idx == 0)) - return FALSE; + return false; monster_race *z_ptr = &r_info[y_ptr->r_idx]; - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; if ((((r_ptr->flags2 & RF2_KILL_BODY) != 0) && ((r_ptr->flags1 & RF1_NEVER_BLOW) == 0) && (r_ptr->mexp * r_ptr->level > z_ptr->mexp * z_ptr->level) && can_cross && (g_ptr->m_idx != target_ptr->riding)) || are_enemies(target_ptr, m_ptr, y_ptr) || monster_confused_remaining(m_ptr)) { @@ -128,10 +128,10 @@ bool process_monster_attack_to_monster(player_type *target_ptr, turn_flags *turn if (((r_ptr->flags2 & RF2_MOVE_BODY) != 0) && ((r_ptr->flags1 & RF1_NEVER_MOVE) == 0) && (r_ptr->mexp > z_ptr->mexp) && can_cross && (g_ptr->m_idx != target_ptr->riding) && monster_can_cross_terrain(target_ptr, target_ptr->current_floor_ptr->grid_array[m_ptr->fy][m_ptr->fx].feat, z_ptr, 0)) { - turn_flags_ptr->do_move = TRUE; - turn_flags_ptr->did_move_body = TRUE; + turn_flags_ptr->do_move = true; + turn_flags_ptr->did_move_body = true; (void)set_monster_csleep(target_ptr, g_ptr->m_idx, 0); } - return FALSE; + return false; } diff --git a/src/monster-attack/monster-attack-status.cpp b/src/monster-attack/monster-attack-status.cpp index 159c11dc5..eed9e0dc1 100644 --- a/src/monster-attack/monster-attack-status.cpp +++ b/src/monster-attack/monster-attack-status.cpp @@ -30,7 +30,7 @@ void process_blind_attack(player_type *target_ptr, monap_type *monap_ptr) if (monap_ptr->m_ptr->r_idx == MON_DIO) msg_print(_("どうだッ！この血の目潰しはッ！", "How is it! This blood-blinding!")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } void process_terrify_attack(player_type *target_ptr, monap_type *monap_ptr) @@ -41,18 +41,18 @@ void process_terrify_attack(player_type *target_ptr, monap_type *monap_ptr) monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; if (has_resist_fear(target_ptr)) { msg_print(_("しかし恐怖に侵されなかった！", "You stand your ground!")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; return; } if (randint0(100 + r_ptr->level / 2) < target_ptr->skill_sav) { msg_print(_("しかし恐怖に侵されなかった！", "You stand your ground!")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; return; } if (set_afraid(target_ptr, target_ptr->afraid + 3 + randint1(monap_ptr->rlev))) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } void process_paralyze_attack(player_type *target_ptr, monap_type *monap_ptr) @@ -63,39 +63,39 @@ void process_paralyze_attack(player_type *target_ptr, monap_type *monap_ptr) monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; if (target_ptr->free_act) { msg_print(_("しかし効果がなかった！", "You are unaffected!")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; return; } if (randint0(100 + r_ptr->level / 2) < target_ptr->skill_sav) { msg_print(_("しかし効力を跳ね返した！", "You resist the effects!")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; return; } if (!target_ptr->paralyzed && set_paralyzed(target_ptr, 3 + randint1(monap_ptr->rlev))) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } void process_lose_all_attack(player_type *target_ptr, monap_type *monap_ptr) { if (do_dec_stat(target_ptr, A_STR)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; if (do_dec_stat(target_ptr, A_DEX)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; if (do_dec_stat(target_ptr, A_CON)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; if (do_dec_stat(target_ptr, A_INT)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; if (do_dec_stat(target_ptr, A_WIS)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; if (do_dec_stat(target_ptr, A_CHR)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } void process_stun_attack(player_type *target_ptr, monap_type *monap_ptr) @@ -105,7 +105,7 @@ void process_stun_attack(player_type *target_ptr, monap_type *monap_ptr) monster_race *r_ptr = &r_info[monap_ptr->m_ptr->r_idx]; if (set_stun(target_ptr, target_ptr->stun + 10 + randint1(r_ptr->level / 4))) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } /*! diff --git a/src/monster-attack/monster-attack-switcher.cpp b/src/monster-attack/monster-attack-switcher.cpp index 22b595404..836e29a72 100644 --- a/src/monster-attack/monster-attack-switcher.cpp +++ b/src/monster-attack/monster-attack-switcher.cpp @@ -43,7 +43,7 @@ static void calc_blow_poison(player_type *target_ptr, monap_type *monap_ptr) if (!(has_resist_pois(target_ptr) || is_oppose_pois(target_ptr)) && !check_multishadow(target_ptr) && set_poisoned(target_ptr, target_ptr->poisoned + randint1(monap_ptr->rlev) + 5)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; monap_ptr->damage = monap_ptr->damage * calc_nuke_damage_rate(target_ptr) / 100; monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc); @@ -62,7 +62,7 @@ static void calc_blow_disenchant(player_type *target_ptr, monap_type *monap_ptr) if (!has_resist_disen(target_ptr) && !check_multishadow(target_ptr) && apply_disenchant(target_ptr, 0)) { update_creature(target_ptr); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } if (has_resist_disen(target_ptr)) @@ -144,7 +144,7 @@ static void calc_blow_confusion(player_type *target_ptr, monap_type *monap_ptr) return; if (!has_resist_conf(target_ptr) && !check_multishadow(target_ptr) && set_confused(target_ptr, target_ptr->confused + 3 + randint1(monap_ptr->rlev))) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; update_smart_learn(target_ptr, monap_ptr->m_idx, DRS_CONF); } @@ -193,7 +193,7 @@ static void calc_blow_paralysis(player_type *target_ptr, monap_type *monap_ptr) static void calc_blow_drain_exp(player_type *target_ptr, monap_type *monap_ptr, const int drain_value, const int hold_exp_prob) { s32b d = damroll(drain_value, 6) + (target_ptr->exp / 100) * MON_DRAIN_LIFE; - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; int damage_ratio = 1000; if (has_hold_exp(target_ptr)) damage_ratio -= 75; @@ -234,7 +234,7 @@ static void calc_blow_time(player_type *target_ptr, monap_type *monap_ptr) static void calc_blow_drain_life(player_type *target_ptr, monap_type *monap_ptr) { s32b d = damroll(60, 6) + (target_ptr->exp / 100) * MON_DRAIN_LIFE; - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; if (target_ptr->hold_exp) monap_ptr->damage = monap_ptr->damage * 9 / 10; @@ -253,7 +253,7 @@ static void calc_blow_drain_life(player_type *target_ptr, monap_type *monap_ptr) */ static void calc_blow_drain_mana(player_type *target_ptr, monap_type *monap_ptr) { - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; int damage_ratio = 100; if (has_dec_mana(target_ptr)) damage_ratio -= 5; @@ -279,7 +279,7 @@ static void calc_blow_inertia(player_type *target_ptr, monap_type *monap_ptr) return; if (set_slow(target_ptr, (target_ptr->slow + 4 + randint0(monap_ptr->rlev / 10)), FALSE)) - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_ptr) @@ -301,7 +301,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt } /* Fall through */ case RBE_HURT: { /* AC軽減あり / Player armor reduces total damage */ - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; monap_ptr->damage -= (monap_ptr->damage * ((monap_ptr->ac < 150) ? monap_ptr->ac : 150) / 250); monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc); break; @@ -320,7 +320,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt if (monster_confused_remaining(monap_ptr->m_ptr) || target_ptr->is_dead || check_multishadow(target_ptr)) break; - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; process_eat_gold(target_ptr, monap_ptr); break; case RBE_EAT_ITEM: { @@ -353,7 +353,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt if (monap_ptr->explode) break; - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; msg_print(_("酸を浴びせられた！", "You are covered in acid!")); monap_ptr->get_damage += acid_dam(target_ptr, monap_ptr->damage, monap_ptr->ddesc, FALSE); update_creature(target_ptr); @@ -364,7 +364,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt if (monap_ptr->explode) break; - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; msg_print(_("電撃を浴びせられた！", "You are struck by electricity!")); monap_ptr->get_damage += elec_dam(target_ptr, monap_ptr->damage, monap_ptr->ddesc, FALSE); update_smart_learn(target_ptr, monap_ptr->m_idx, DRS_ELEC); @@ -374,7 +374,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt if (monap_ptr->explode) break; - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; msg_print(_("全身が炎に包まれた！", "You are enveloped in flames!")); monap_ptr->get_damage += fire_dam(target_ptr, monap_ptr->damage, monap_ptr->ddesc, FALSE); update_smart_learn(target_ptr, monap_ptr->m_idx, DRS_FIRE); @@ -384,7 +384,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt if (monap_ptr->explode) break; - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; msg_print(_("全身が冷気で覆われた！", "You are covered with frost!")); monap_ptr->get_damage += cold_dam(target_ptr, monap_ptr->damage, monap_ptr->ddesc, FALSE); update_smart_learn(target_ptr, monap_ptr->m_idx, DRS_COLD); @@ -424,7 +424,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt calc_blow_lose_all(target_ptr, monap_ptr); break; case RBE_SHATTER: { /* AC軽減あり / Player armor reduces total damage */ - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; monap_ptr->damage -= (monap_ptr->damage * ((monap_ptr->ac < 150) ? monap_ptr->ac : 150) / 250); monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc); if (monap_ptr->damage > 23 || monap_ptr->explode) @@ -468,7 +468,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt break; case RBE_FLAVOR: // フレーバー打撃は自明かつダメージ 0。 - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; monap_ptr->damage = 0; break; diff --git a/src/monster-attack/monster-attack-util.cpp b/src/monster-attack/monster-attack-util.cpp index e746f7927..97fc4727d 100644 --- a/src/monster-attack/monster-attack-util.cpp +++ b/src/monster-attack/monster-attack-util.cpp @@ -18,12 +18,12 @@ monap_type *initialize_monap_type(player_type *target_ptr, monap_type *monap_ptr floor_type *floor_ptr = target_ptr->current_floor_ptr; monap_ptr->m_ptr = &floor_ptr->m_list[m_idx]; monap_ptr->act = NULL; - monap_ptr->touched = FALSE; - monap_ptr->explode = FALSE; + monap_ptr->touched = false; + monap_ptr->explode = false; monap_ptr->do_silly_attack = one_in_(2) && target_ptr->image; - monap_ptr->obvious = FALSE; + monap_ptr->obvious = false; monap_ptr->get_damage = 0; - monap_ptr->alive = TRUE; - monap_ptr->fear = FALSE; + monap_ptr->alive = true; + monap_ptr->fear = false; return monap_ptr; } diff --git a/src/monster-attack/monster-eating.cpp b/src/monster-attack/monster-eating.cpp index cff423328..2eeeb2d6e 100644 --- a/src/monster-attack/monster-eating.cpp +++ b/src/monster-attack/monster-eating.cpp @@ -36,7 +36,7 @@ void process_eat_gold(player_type *target_ptr, monap_type *monap_ptr) if (!target_ptr->paralyzed && (randint0(100) < (adj_dex_safe[target_ptr->stat_index[A_DEX]] + target_ptr->lev))) { msg_print(_("しかし素早く財布を守った！", "You quickly protect your money pouch!")); if (randint0(3)) - monap_ptr->blinked = TRUE; + monap_ptr->blinked = true; return; } @@ -66,7 +66,7 @@ void process_eat_gold(player_type *target_ptr, monap_type *monap_ptr) target_ptr->redraw |= (PR_GOLD); target_ptr->window_flags |= (PW_PLAYER); - monap_ptr->blinked = TRUE; + monap_ptr->blinked = true; } /*! @@ -78,19 +78,19 @@ void process_eat_gold(player_type *target_ptr, monap_type *monap_ptr) bool check_eat_item(player_type *target_ptr, monap_type *monap_ptr) { if (monster_confused_remaining(monap_ptr->m_ptr)) - return FALSE; + return false; if (target_ptr->is_dead || check_multishadow(target_ptr)) - return FALSE; + return false; if (!target_ptr->paralyzed && (randint0(100) < (adj_dex_safe[target_ptr->stat_index[A_DEX]] + target_ptr->lev))) { msg_print(_("しかしあわててザックを取り返した！", "You grab hold of your backpack!")); - monap_ptr->blinked = TRUE; - monap_ptr->obvious = TRUE; - return FALSE; + monap_ptr->blinked = true; + monap_ptr->obvious = true; + return false; } - return TRUE; + return true; } /*! @@ -146,8 +146,8 @@ void process_eat_item(player_type *target_ptr, monap_type *monap_ptr) move_item_to_monster(target_ptr, monap_ptr, o_idx); inven_item_increase(target_ptr, i_idx, -1); inven_item_optimize(target_ptr, i_idx); - monap_ptr->obvious = TRUE; - monap_ptr->blinked = TRUE; + monap_ptr->obvious = true; + monap_ptr->blinked = true; break; } } @@ -171,7 +171,7 @@ void process_eat_food(player_type *target_ptr, monap_type *monap_ptr) #endif inven_item_increase(target_ptr, i_idx, -1); inven_item_optimize(target_ptr, i_idx); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; break; } } @@ -187,7 +187,7 @@ void process_eat_lite(player_type *target_ptr, monap_type *monap_ptr) if (!target_ptr->blind) { msg_print(_("明かりが暗くなってしまった。", "Your light dims.")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; } target_ptr->window_flags |= (PW_EQUIP); @@ -204,7 +204,7 @@ void process_eat_lite(player_type *target_ptr, monap_type *monap_ptr) bool process_un_power(player_type *target_ptr, monap_type *monap_ptr) { if (((monap_ptr->o_ptr->tval != TV_STAFF) && (monap_ptr->o_ptr->tval != TV_WAND)) || (monap_ptr->o_ptr->pval == 0)) - return FALSE; + return false; bool is_magic_mastery = has_magic_mastery(target_ptr) != 0; object_kind *kind_ptr = &k_info[monap_ptr->o_ptr->k_idx]; @@ -212,13 +212,13 @@ bool process_un_power(player_type *target_ptr, monap_type *monap_ptr) DEPTH level = monap_ptr->rlev; HIT_POINT drain = is_magic_mastery ? MIN(pval, pval * level / 400 + pval * randint1(level) / 400) : pval; if (drain <= 0) - return FALSE; + return false; msg_print(_("ザックからエネルギーが吸い取られた！", "Energy was drained from your pack!")); if (is_magic_mastery) msg_print(_("しかし、あなたの魔法を操る力がその一部を取り返した！", "However, your skill of magic mastery got back the part of energy!")); - monap_ptr->obvious = TRUE; + monap_ptr->obvious = true; HIT_POINT recovery = drain * kind_ptr->level; if (monap_ptr->o_ptr->tval == TV_STAFF) @@ -236,7 +236,7 @@ bool process_un_power(player_type *target_ptr, monap_type *monap_ptr) monap_ptr->o_ptr->pval = !is_magic_mastery || (monap_ptr->o_ptr->pval == 1) ? 0 : monap_ptr->o_ptr->pval - drain; target_ptr->update |= PU_COMBINE | PU_REORDER; target_ptr->window_flags |= PW_INVEN; - return TRUE; + return true; } bool check_drain_hp(player_type *target_ptr, const s32b d) @@ -253,7 +253,7 @@ bool check_drain_hp(player_type *target_ptr, const s32b d) case RACE_BALROG: case RACE_GOLEM: case RACE_ANDROID: - return TRUE; + return true; default: return resist_drain; } diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp index d822c6b30..fff4c2c1c 100644 --- a/src/monster-floor/monster-death.cpp +++ b/src/monster-floor/monster-death.cpp @@ -81,7 +81,7 @@ static void on_defeat_arena_monster(player_type *player_ptr, monster_death_type if (!floor_ptr->inside_arena || is_pet(md_ptr->m_ptr)) return; - player_ptr->exit_bldg = TRUE; + player_ptr->exit_bldg = true; if (player_ptr->arena_number > MAX_ARENA_MONS) msg_print(_("素晴らしい！君こそ真の勝利者だ。", "You are a Genuine Champion!")); else @@ -117,18 +117,18 @@ static void drop_corpse(player_type *player_ptr, monster_death_type *md_ptr) if (!is_drop_corpse) return; - bool corpse = FALSE; + bool corpse = false; if (!(md_ptr->r_ptr->flags9 & RF9_DROP_SKELETON)) - corpse = TRUE; + corpse = true; else if ((md_ptr->r_ptr->flags9 & RF9_DROP_CORPSE) && (md_ptr->r_ptr->flags1 & RF1_UNIQUE)) - corpse = TRUE; + corpse = true; else if (md_ptr->r_ptr->flags9 & RF9_DROP_CORPSE) { if ((0 - ((md_ptr->m_ptr->maxhp) / 4)) > md_ptr->m_ptr->hp) { if (one_in_(5)) - corpse = TRUE; + corpse = true; } else { if (!one_in_(5)) - corpse = TRUE; + corpse = true; } } @@ -306,7 +306,7 @@ static void drop_items_golds(player_type *player_ptr, monster_death_type *md_ptr */ static void on_defeat_last_boss(player_type *player_ptr) { - current_world_ptr->total_winner = TRUE; + current_world_ptr->total_winner = true; add_winner_class(player_ptr->pclass); player_ptr->redraw |= PR_TITLE; play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR); diff --git a/src/monster-floor/monster-direction.cpp b/src/monster-floor/monster-direction.cpp index f54d51df8..ac40e6f89 100644 --- a/src/monster-floor/monster-direction.cpp +++ b/src/monster-floor/monster-direction.cpp @@ -33,18 +33,18 @@ static bool decide_pet_approch_direction(player_type *target_ptr, monster_type *m_ptr, monster_type *t_ptr) { monster_race *r_ptr = &r_info[m_ptr->r_idx]; - if (!is_pet(m_ptr)) return FALSE; + if (!is_pet(m_ptr)) return false; if (target_ptr->pet_follow_distance < 0) { if (t_ptr->cdis <= (0 - target_ptr->pet_follow_distance)) { - return TRUE; + return true; } } else if ((m_ptr->cdis < t_ptr->cdis) && (t_ptr->cdis > target_ptr->pet_follow_distance)) { - return TRUE; + return true; } return (r_ptr->aaf < t_ptr->cdis); @@ -135,14 +135,14 @@ bool get_enemy_dir(player_type *target_ptr, MONSTER_IDX m_idx, int *mm) decide_enemy_approch_direction(target_ptr, m_idx, start, plus, &y, &x); - if ((x == 0) && (y == 0)) return FALSE; + if ((x == 0) && (y == 0)) return false; } x -= m_ptr->fx; y -= m_ptr->fy; store_enemy_approch_direction(mm, y, x); - return TRUE; + return true; } @@ -162,7 +162,7 @@ static bool random_walk(player_type *target_ptr, DIRECTION *mm, monster_type *m_ if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags1 |= (RF1_RAND_50 | RF1_RAND_25); mm[0] = mm[1] = mm[2] = mm[3] = 5; - return TRUE; + return true; } if ((r_ptr->flags1 & RF1_RAND_50) && (randint0(100) < 50)) @@ -170,7 +170,7 @@ static bool random_walk(player_type *target_ptr, DIRECTION *mm, monster_type *m_ if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags1 |= RF1_RAND_50; mm[0] = mm[1] = mm[2] = mm[3] = 5; - return TRUE; + return true; } if ((r_ptr->flags1 & RF1_RAND_25) && (randint0(100) < 25)) @@ -178,10 +178,10 @@ static bool random_walk(player_type *target_ptr, DIRECTION *mm, monster_type *m_ if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags1 |= RF1_RAND_25; mm[0] = mm[1] = mm[2] = mm[3] = 5; - return TRUE; + return true; } - return FALSE; + return false; } @@ -195,14 +195,14 @@ static bool random_walk(player_type *target_ptr, DIRECTION *mm, monster_type *m_ static bool decide_pet_movement_direction(player_type *target_ptr, DIRECTION *mm, MONSTER_IDX m_idx) { monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; - if (!is_pet(m_ptr)) return FALSE; + if (!is_pet(m_ptr)) return false; bool avoid = ((target_ptr->pet_follow_distance < 0) && (m_ptr->cdis <= (0 - target_ptr->pet_follow_distance))); bool lonely = (!avoid && (m_ptr->cdis > target_ptr->pet_follow_distance)); bool distant = (m_ptr->cdis > PET_SEEK_DIST); mm[0] = mm[1] = mm[2] = mm[3] = 5; - if (get_enemy_dir(target_ptr, m_idx, mm)) return TRUE; - if (!avoid && !lonely && !distant) return TRUE; + if (get_enemy_dir(target_ptr, m_idx, mm)) return true; + if (!avoid && !lonely && !distant) return true; POSITION dis = target_ptr->pet_follow_distance; if (target_ptr->pet_follow_distance > PET_SEEK_DIST) @@ -212,7 +212,7 @@ static bool decide_pet_movement_direction(player_type *target_ptr, DIRECTION *mm (void)get_movable_grid(target_ptr, m_idx, mm); target_ptr->pet_follow_distance = (s16b)dis; - return TRUE; + return true; } @@ -232,27 +232,27 @@ bool decide_monster_movement_direction(player_type *target_ptr, DIRECTION *mm, M if (monster_confused_remaining(m_ptr) || !aware) { mm[0] = mm[1] = mm[2] = mm[3] = 5; - return TRUE; + return true; } - if (random_walk(target_ptr, mm, m_ptr)) return TRUE; + if (random_walk(target_ptr, mm, m_ptr)) return true; if ((r_ptr->flags1 & RF1_NEVER_MOVE) && (m_ptr->cdis > 1)) { mm[0] = mm[1] = mm[2] = mm[3] = 5; - return TRUE; + return true; } - if (decide_pet_movement_direction(target_ptr, mm, m_idx)) return TRUE; + if (decide_pet_movement_direction(target_ptr, mm, m_idx)) return true; if (!is_hostile(m_ptr)) { mm[0] = mm[1] = mm[2] = mm[3] = 5; get_enemy_dir(target_ptr, m_idx, mm); - return TRUE; + return true; } - if (!get_movable_grid(target_ptr, m_idx, mm)) return FALSE; + if (!get_movable_grid(target_ptr, m_idx, mm)) return false; - return TRUE; + return true; } diff --git a/src/monster-floor/monster-generator.cpp b/src/monster-floor/monster-generator.cpp index 36923fefb..b59e6ffef 100644 --- a/src/monster-floor/monster-generator.cpp +++ b/src/monster-floor/monster-generator.cpp @@ -70,7 +70,7 @@ bool mon_scatter(player_type *player_ptr, MONRACE_IDX r_idx, POSITION *yp, POSIT int num[MON_SCAT_MAXD]; if (max_dist >= MON_SCAT_MAXD) - return FALSE; + return false; int i; for (i = 0; i < MON_SCAT_MAXD; i++) @@ -110,12 +110,12 @@ bool mon_scatter(player_type *player_ptr, MONRACE_IDX r_idx, POSITION *yp, POSIT while (i < MON_SCAT_MAXD && 0 == num[i]) i++; if (i >= MON_SCAT_MAXD) - return FALSE; + return false; *xp = place_x[i]; *yp = place_y[i]; - return TRUE; + return true; } /*! @@ -134,19 +134,19 @@ bool multiply_monster(player_type *player_ptr, MONSTER_IDX m_idx, bool clone, BI monster_type *m_ptr = &floor_ptr->m_list[m_idx]; POSITION y, x; if (!mon_scatter(player_ptr, m_ptr->r_idx, &y, &x, m_ptr->fy, m_ptr->fx, 1)) - return FALSE; + return false; if (m_ptr->mflag2.has(MFLAG2::NOPET)) mode |= PM_NO_PET; if (!place_monster_aux(player_ptr, m_idx, y, x, m_ptr->r_idx, (mode | PM_NO_KAGE | PM_MULTIPLY))) - return FALSE; + return false; if (clone || m_ptr->mflag2.has(MFLAG2::CLONED)) { floor_ptr->m_list[hack_m_idx_ii].mflag2.set({MFLAG2::CLONED, MFLAG2::NOPET}); } - return TRUE; + return true; } /*! @@ -206,7 +206,7 @@ static bool place_monster_group(player_type *player_ptr, MONSTER_IDX who, POSITI } } - return TRUE; + return true; } /*! @@ -221,32 +221,32 @@ static bool place_monster_can_escort(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *z_ptr = &r_info[r_idx]; if (mon_hook_dungeon(player_ptr, place_monster_idx) != mon_hook_dungeon(player_ptr, r_idx)) - return FALSE; + return false; if (z_ptr->d_char != r_ptr->d_char) - return FALSE; + return false; if (z_ptr->level > r_ptr->level) - return FALSE; + return false; if (z_ptr->flags1 & RF1_UNIQUE) - return FALSE; + return false; if (place_monster_idx == r_idx) - return FALSE; + return false; if (monster_has_hostile_align(player_ptr, m_ptr, 0, 0, z_ptr)) - return FALSE; + return false; if (r_ptr->flags7 & RF7_FRIENDLY) { if (monster_has_hostile_align(player_ptr, NULL, 1, -1, z_ptr)) - return FALSE; + return false; } if ((r_ptr->flags7 & RF7_CHAMELEON) && !(z_ptr->flags7 & RF7_CHAMELEON)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -267,9 +267,9 @@ bool place_monster_aux(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS mode |= PM_KAGE; if (!place_monster_one(player_ptr, who, y, x, r_idx, mode)) - return FALSE; + return false; if (!(mode & PM_ALLOW_GROUP)) - return TRUE; + return true; place_monster_m_idx = hack_m_idx_ii; @@ -290,7 +290,7 @@ bool place_monster_aux(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS } if (!(r_ptr->flags1 & (RF1_ESCORT))) - return TRUE; + return true; place_monster_idx = r_idx; for (int i = 0; i < 32; i++) { @@ -311,7 +311,7 @@ bool place_monster_aux(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS } } - return TRUE; + return true; } /*! @@ -327,7 +327,7 @@ bool place_monster(player_type *player_ptr, POSITION y, POSITION x, BIT_FLAGS mo get_mon_num_prep(player_ptr, get_monster_hook(player_ptr), get_monster_hook2(player_ptr, y, x)); MONRACE_IDX r_idx = get_mon_num(player_ptr, 0, player_ptr->current_floor_ptr->monster_level, 0); if (r_idx == 0) - return FALSE; + return false; if ((one_in_(5) || (player_ptr->current_floor_ptr->dun_level == 0)) && !(r_info[r_idx].flags1 & RF1_UNIQUE) && angband_strchr("hkoptuyAHLOPTUVY", r_info[r_idx].d_char)) { @@ -355,7 +355,7 @@ bool alloc_horde(player_type *player_ptr, POSITION y, POSITION x, summon_specifi while (--attempts) { r_idx = get_mon_num(player_ptr, 0, floor_ptr->monster_level, 0); if (!r_idx) - return FALSE; + return false; r_ptr = &r_info[r_idx]; if (r_ptr->flags1 & RF1_UNIQUE) @@ -367,7 +367,7 @@ bool alloc_horde(player_type *player_ptr, POSITION y, POSITION x, summon_specifi } if (attempts < 1) - return FALSE; + return false; attempts = 1000; @@ -377,7 +377,7 @@ bool alloc_horde(player_type *player_ptr, POSITION y, POSITION x, summon_specifi } if (attempts < 1) - return FALSE; + return false; MONSTER_IDX m_idx = floor_ptr->grid_array[y][x].m_idx; if (floor_ptr->m_list[m_idx].mflag2.has(MFLAG2::CHAMELEON)) @@ -394,7 +394,7 @@ bool alloc_horde(player_type *player_ptr, POSITION y, POSITION x, summon_specifi if (cheat_hear) msg_format(_("モンスターの大群(%c)", "Monster horde (%c)."), r_ptr->d_char); - return TRUE; + return true; } /*! @@ -428,12 +428,12 @@ bool alloc_guardian(player_type *player_ptr, bool def_val) } if (place_monster_aux(player_ptr, 0, oy, ox, guardian, (PM_ALLOW_GROUP | PM_NO_KAGE | PM_NO_PET))) - return TRUE; + return true; try_count--; } - return FALSE; + return false; } /*! @@ -449,7 +449,7 @@ bool alloc_guardian(player_type *player_ptr, bool def_val) bool alloc_monster(player_type *player_ptr, POSITION dis, BIT_FLAGS mode, summon_specific_pf summon_specific) { if (alloc_guardian(player_ptr, FALSE)) - return TRUE; + return true; floor_type *floor_ptr = player_ptr->current_floor_ptr; POSITION y = 0, x = 0; @@ -475,17 +475,17 @@ bool alloc_monster(player_type *player_ptr, POSITION dis, BIT_FLAGS mode, summon msg_print(_("警告！新たなモンスターを配置できません。小さい階ですか？", "Warning! Could not allocate a new monster. Small level?")); } - return FALSE; + return false; } if (randint1(5000) <= floor_ptr->dun_level) { if (alloc_horde(player_ptr, y, x, summon_specific)) { - return TRUE; + return true; } } else { if (place_monster(player_ptr, y, x, (mode | PM_ALLOW_GROUP))) - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/src/monster-floor/monster-move.cpp b/src/monster-floor/monster-move.cpp index e2db511b3..544d2f4b3 100644 --- a/src/monster-floor/monster-move.cpp +++ b/src/monster-floor/monster-move.cpp @@ -64,34 +64,34 @@ static bool process_wall(player_type *target_ptr, turn_flags *turn_flags_ptr, mo feature_type *f_ptr; f_ptr = &f_info[g_ptr->feat]; if (player_bold(target_ptr, ny, nx)) { - turn_flags_ptr->do_move = TRUE; - return TRUE; + turn_flags_ptr->do_move = true; + return true; } if (g_ptr->m_idx > 0) { - turn_flags_ptr->do_move = TRUE; - return TRUE; + turn_flags_ptr->do_move = true; + return true; } if (((r_ptr->flags2 & RF2_KILL_WALL) != 0) && (can_cross ? !has_flag(f_ptr->flags, FF_LOS) : !turn_flags_ptr->is_riding_mon) && has_flag(f_ptr->flags, FF_HURT_DISI) && !has_flag(f_ptr->flags, FF_PERMANENT) && check_hp_for_feat_destruction(f_ptr, m_ptr)) { - turn_flags_ptr->do_move = TRUE; + turn_flags_ptr->do_move = true; if (!can_cross) - turn_flags_ptr->must_alter_to_move = TRUE; + turn_flags_ptr->must_alter_to_move = true; - turn_flags_ptr->did_kill_wall = TRUE; - return TRUE; + turn_flags_ptr->did_kill_wall = true; + return true; } if (!can_cross) - return FALSE; + return false; - turn_flags_ptr->do_move = TRUE; + turn_flags_ptr->do_move = true; if (((r_ptr->flags2 & RF2_PASS_WALL) != 0) && (!turn_flags_ptr->is_riding_mon || has_pass_wall(target_ptr)) && has_flag(f_ptr->flags, FF_CAN_PASS)) { - turn_flags_ptr->did_pass_wall = TRUE; + turn_flags_ptr->did_pass_wall = true; } - return TRUE; + return true; } /*! @@ -110,23 +110,23 @@ static bool bash_normal_door(player_type *target_ptr, turn_flags *turn_flags_ptr g_ptr = &target_ptr->current_floor_ptr->grid_array[ny][nx]; feature_type *f_ptr; f_ptr = &f_info[g_ptr->feat]; - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; if (((r_ptr->flags2 & RF2_OPEN_DOOR) == 0) || !has_flag(f_ptr->flags, FF_OPEN) || (is_pet(m_ptr) && ((target_ptr->pet_extra_flags & PF_OPEN_DOORS) == 0))) - return TRUE; + return true; if (f_ptr->power == 0) { - turn_flags_ptr->did_open_door = TRUE; - turn_flags_ptr->do_turn = TRUE; - return FALSE; + turn_flags_ptr->did_open_door = true; + turn_flags_ptr->do_turn = true; + return false; } if (randint0(m_ptr->hp / 10) > f_ptr->power) { cave_alter_feat(target_ptr, ny, nx, FF_DISARM); - turn_flags_ptr->do_turn = TRUE; - return FALSE; + turn_flags_ptr->do_turn = true; + return false; } - return TRUE; + return true; } /*! @@ -155,9 +155,9 @@ static void bash_glass_door(player_type *target_ptr, turn_flags *turn_flags_ptr, if (disturb_minor) disturb(target_ptr, FALSE, FALSE); - turn_flags_ptr->did_bash_door = TRUE; - turn_flags_ptr->do_move = TRUE; - turn_flags_ptr->must_alter_to_move = TRUE; + turn_flags_ptr->did_bash_door = true; + turn_flags_ptr->do_move = true; + turn_flags_ptr->must_alter_to_move = true; } /*! @@ -175,7 +175,7 @@ static bool process_door(player_type *target_ptr, turn_flags *turn_flags_ptr, mo grid_type *g_ptr; g_ptr = &target_ptr->current_floor_ptr->grid_array[ny][nx]; if (!is_closed_door(target_ptr, g_ptr->feat)) - return TRUE; + return true; feature_type *f_ptr; f_ptr = &f_info[g_ptr->feat]; @@ -183,7 +183,7 @@ static bool process_door(player_type *target_ptr, turn_flags *turn_flags_ptr, mo bash_glass_door(target_ptr, turn_flags_ptr, m_ptr, f_ptr, may_bash); if (!turn_flags_ptr->did_open_door && !turn_flags_ptr->did_bash_door) - return TRUE; + return true; if (turn_flags_ptr->did_bash_door && ((randint0(100) < 50) || (feat_state(target_ptr->current_floor_ptr, g_ptr->feat, FF_OPEN) == g_ptr->feat) || has_flag(f_ptr->flags, FF_GLASS))) { @@ -194,15 +194,15 @@ static bool process_door(player_type *target_ptr, turn_flags *turn_flags_ptr, mo if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags2 |= (RF2_BASH_DOOR); - return FALSE; + return false; } } else { cave_alter_feat(target_ptr, ny, nx, FF_OPEN); } f_ptr = &f_info[g_ptr->feat]; - turn_flags_ptr->do_view = TRUE; - return TRUE; + turn_flags_ptr->do_view = true; + return true; } /*! @@ -220,11 +220,11 @@ static bool process_protection_rune(player_type *target_ptr, turn_flags *turn_fl g_ptr = &target_ptr->current_floor_ptr->grid_array[ny][nx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!turn_flags_ptr->do_move || !is_rune_protection_grid(g_ptr) || (((r_ptr->flags1 & RF1_NEVER_BLOW) != 0) && player_bold(target_ptr, ny, nx))) - return FALSE; + return false; - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; if (is_pet(m_ptr) || (randint1(BREAK_RUNE_PROTECTION) >= r_ptr->level)) - return TRUE; + return true; if (g_ptr->info & CAVE_MARK) { msg_print(_("守りのルーンが壊れた！", "The rune of protection is broken!")); @@ -233,9 +233,9 @@ static bool process_protection_rune(player_type *target_ptr, turn_flags *turn_fl g_ptr->info &= ~(CAVE_MARK); g_ptr->info &= ~(CAVE_OBJECT); g_ptr->mimic = 0; - turn_flags_ptr->do_move = TRUE; + turn_flags_ptr->do_move = true; note_spot(target_ptr, ny, nx); - return TRUE; + return true; } /*! @@ -253,11 +253,11 @@ static bool process_explosive_rune(player_type *target_ptr, turn_flags *turn_fla g_ptr = &target_ptr->current_floor_ptr->grid_array[ny][nx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!turn_flags_ptr->do_move || !is_rune_explosion_grid(g_ptr) || (((r_ptr->flags1 & RF1_NEVER_BLOW) != 0) && player_bold(target_ptr, ny, nx))) - return TRUE; + return true; - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; if (is_pet(m_ptr)) - return TRUE; + return true; if (randint1(BREAK_RUNE_EXPLOSION) > r_ptr->level) { if (g_ptr->info & CAVE_MARK) { @@ -277,10 +277,10 @@ static bool process_explosive_rune(player_type *target_ptr, turn_flags *turn_fla lite_spot(target_ptr, ny, nx); if (!monster_is_valid(m_ptr)) - return FALSE; + return false; - turn_flags_ptr->do_move = TRUE; - return TRUE; + turn_flags_ptr->do_move = true; + return true; } /*! @@ -300,7 +300,7 @@ static bool process_post_dig_wall(player_type *target_ptr, turn_flags *turn_flag feature_type *f_ptr; f_ptr = &f_info[g_ptr->feat]; if (!turn_flags_ptr->did_kill_wall || !turn_flags_ptr->do_move) - return TRUE; + return true; if (one_in_(GRINDNOISE)) { if (has_flag(f_ptr->flags, FF_GLASS)) @@ -317,13 +317,13 @@ static bool process_post_dig_wall(player_type *target_ptr, turn_flags *turn_flag if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags2 |= (RF2_KILL_WALL); - return FALSE; + return false; } f_ptr = &f_info[g_ptr->feat]; - turn_flags_ptr->do_view = TRUE; - turn_flags_ptr->do_turn = TRUE; - return TRUE; + turn_flags_ptr->do_view = true; + turn_flags_ptr->do_turn = true; + return true; } /*! @@ -358,39 +358,39 @@ bool process_monster_movement(player_type *target_ptr, turn_flags *turn_flags_pt if (!process_wall(target_ptr, turn_flags_ptr, m_ptr, ny, nx, can_cross)) { if (!process_door(target_ptr, turn_flags_ptr, m_ptr, ny, nx)) - return FALSE; + return false; } if (!process_protection_rune(target_ptr, turn_flags_ptr, m_ptr, ny, nx)) { if (!process_explosive_rune(target_ptr, turn_flags_ptr, m_ptr, ny, nx)) - return FALSE; + return false; } exe_monster_attack_to_player(target_ptr, turn_flags_ptr, m_idx, ny, nx); if (process_monster_attack_to_monster(target_ptr, turn_flags_ptr, m_idx, g_ptr, can_cross)) - return FALSE; + return false; if (turn_flags_ptr->is_riding_mon) { if (!target_ptr->riding_ryoute && !monster_fear_remaining(&target_ptr->current_floor_ptr->m_list[target_ptr->riding])) - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; } if (!process_post_dig_wall(target_ptr, turn_flags_ptr, m_ptr, ny, nx)) - return FALSE; + return false; if (turn_flags_ptr->must_alter_to_move && (r_ptr->flags7 & RF7_AQUATIC)) { if (!monster_can_cross_terrain(target_ptr, g_ptr->feat, r_ptr, turn_flags_ptr->is_riding_mon ? CEM_RIDING : 0)) - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; } if (turn_flags_ptr->do_move && !can_cross && !turn_flags_ptr->did_kill_wall && !turn_flags_ptr->did_bash_door) - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; if (turn_flags_ptr->do_move && (r_ptr->flags1 & RF1_NEVER_MOVE)) { if (is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags1 |= (RF1_NEVER_MOVE); - turn_flags_ptr->do_move = FALSE; + turn_flags_ptr->do_move = false; } if (!turn_flags_ptr->do_move) { @@ -400,7 +400,7 @@ bool process_monster_movement(player_type *target_ptr, turn_flags *turn_flags_pt continue; } - turn_flags_ptr->do_turn = TRUE; + turn_flags_ptr->do_turn = true; feature_type *f_ptr; f_ptr = &f_info[g_ptr->feat]; if (has_flag(f_ptr->flags, FF_TREE) && ((r_ptr->flags7 & RF7_CAN_FLY) == 0) && ((r_ptr->flags8 & RF8_WILD_WOOD) == 0)) @@ -438,7 +438,7 @@ bool process_monster_movement(player_type *target_ptr, turn_flags *turn_flags_pt (*count)++; } - return TRUE; + return true; } /*! diff --git a/src/monster-floor/monster-object.cpp b/src/monster-floor/monster-object.cpp index 769d71e1d..656ce1596 100644 --- a/src/monster-floor/monster-object.cpp +++ b/src/monster-floor/monster-object.cpp @@ -108,7 +108,7 @@ static void monster_pickup_object(player_type *target_ptr, turn_flags *turn_flag monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (is_special_object) { if (turn_flags_ptr->do_take && (r_ptr->flags2 & RF2_STUPID)) { - turn_flags_ptr->did_take_item = TRUE; + turn_flags_ptr->did_take_item = true; if (m_ptr->ml && player_can_see_bold(target_ptr, ny, nx)) { msg_format(_("%^sは%sを拾おうとしたが、だめだった。", "%^s tries to pick up %s, but fails."), m_name, o_name); } @@ -118,7 +118,7 @@ static void monster_pickup_object(player_type *target_ptr, turn_flags *turn_flag } if (turn_flags_ptr->do_take) { - turn_flags_ptr->did_take_item = TRUE; + turn_flags_ptr->did_take_item = true; if (player_can_see_bold(target_ptr, ny, nx)) { msg_format(_("%^sが%sを拾った。", "%^s picks up %s."), m_name, o_name); } @@ -134,7 +134,7 @@ static void monster_pickup_object(player_type *target_ptr, turn_flags *turn_flag if (is_pet(m_ptr)) return; - turn_flags_ptr->did_kill_item = TRUE; + turn_flags_ptr->did_kill_item = true; if (player_has_los_bold(target_ptr, ny, nx)) { msg_format(_("%^sが%sを破壊した。", "%^s destroys %s."), m_name, o_name); } diff --git a/src/monster-floor/monster-runaway.cpp b/src/monster-floor/monster-runaway.cpp index f0d747b86..1cceb30d9 100644 --- a/src/monster-floor/monster-runaway.cpp +++ b/src/monster-floor/monster-runaway.cpp @@ -75,7 +75,7 @@ bool runaway_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTE can_runaway &= ((r_ptr->flags1 & RF1_UNIQUE) != 0) || ((r_ptr->flags7 & RF7_NAZGUL) != 0); can_runaway &= !target_ptr->phase_out; if (!can_runaway) - return FALSE; + return false; static int riding_pinch = 0; @@ -84,7 +84,7 @@ bool runaway_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTE if (turn_flags_ptr->is_riding_mon) riding_pinch = 0; - return FALSE; + return false; } GAME_TEXT m_name[MAX_NLEN]; @@ -94,11 +94,11 @@ bool runaway_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTE _("%sは傷の痛さの余りあなたの束縛から逃れようとしている。", "%^s seems to be in so much pain and tries to escape from your restriction."), m_name); riding_pinch++; disturb(target_ptr, TRUE, TRUE); - return FALSE; + return false; } escape_monster(target_ptr, turn_flags_ptr, m_ptr, m_name); check_quest_completion(target_ptr, m_ptr); delete_monster_idx(target_ptr, m_idx); - return TRUE; + return true; } diff --git a/src/monster-floor/monster-safety-hiding.cpp b/src/monster-floor/monster-safety-hiding.cpp index f99e85c46..3f1a70c65 100644 --- a/src/monster-floor/monster-safety-hiding.cpp +++ b/src/monster-floor/monster-safety-hiding.cpp @@ -108,10 +108,10 @@ bool find_safety(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSIT *yp = m_ptr->fy - candidate.gy; *xp = m_ptr->fx - candidate.gx; - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -178,8 +178,8 @@ bool find_hiding(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSIT *yp = m_ptr->fy - candidate.gy; *xp = m_ptr->fx - candidate.gx; - return TRUE; + return true; } - return FALSE; + return false; } diff --git a/src/monster-floor/monster-summon.cpp b/src/monster-floor/monster-summon.cpp index 5e686b5d4..735ef6435 100644 --- a/src/monster-floor/monster-summon.cpp +++ b/src/monster-floor/monster-summon.cpp @@ -32,7 +32,7 @@ int summon_specific_who = -1; * @brief 召喚対象にユニークを含めるかを示すグローバル変数 / summoning unique enable * @todo summon_unique_okay グローバル変数の除去と関数引数への代替を行う */ -bool summon_unique_okay = FALSE; +bool summon_unique_okay = false; /*! * @brief モンスターが召喚の基本条件に合っているかをチェックする / Hack -- help decide if a monster race is "okay" to summon @@ -43,29 +43,29 @@ static bool summon_specific_okay(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!mon_hook_dungeon(player_ptr, r_idx)) - return FALSE; + return false; if (summon_specific_who > 0) { monster_type *m_ptr = &player_ptr->current_floor_ptr->m_list[summon_specific_who]; if (monster_has_hostile_align(player_ptr, m_ptr, 0, 0, r_ptr)) - return FALSE; + return false; } else if (summon_specific_who < 0) { if (monster_has_hostile_align(player_ptr, NULL, 10, -10, r_ptr) && !one_in_(ABS(player_ptr->alignment) / 2 + 1)) - return FALSE; + return false; } if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) - return FALSE; + return false; if (!summon_specific_type) - return TRUE; + return true; if ((summon_specific_who < 0) && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) && monster_has_hostile_align(player_ptr, NULL, 10, -10, r_ptr)) - return FALSE; + return false; if ((r_ptr->flags7 & RF7_CHAMELEON) && d_info[player_ptr->dungeon_idx].flags.has(DF::CHAMELEON)) - return TRUE; + return true; if (summon_specific_who > 0) { monster_type *m_ptr = &player_ptr->current_floor_ptr->m_list[summon_specific_who]; @@ -120,11 +120,11 @@ bool summon_specific(player_type *player_ptr, MONSTER_IDX who, POSITION y1, POSI { floor_type *floor_ptr = player_ptr->current_floor_ptr; if (floor_ptr->inside_arena) - return FALSE; + return false; POSITION x, y; if (!mon_scatter(player_ptr, 0, &y, &x, y1, x1, 2)) - return FALSE; + return false; summon_specific_who = who; summon_specific_type = type; @@ -135,7 +135,7 @@ bool summon_specific(player_type *player_ptr, MONSTER_IDX who, POSITION y1, POSI MONRACE_IDX r_idx = get_mon_num(player_ptr, 0, (dlev + lev) / 2 + 5, 0); if (!r_idx) { summon_specific_type = SUMMON_NONE; - return FALSE; + return false; } if (is_dead_summoning(type)) @@ -143,12 +143,12 @@ bool summon_specific(player_type *player_ptr, MONSTER_IDX who, POSITION y1, POSI if (!place_monster_aux(player_ptr, who, y, x, r_idx, mode)) { summon_specific_type = SUMMON_NONE; - return FALSE; + return false; } summon_specific_type = SUMMON_NONE; sound(SOUND_SUMMON); - return TRUE; + return true; } /*! @@ -164,11 +164,11 @@ bool summon_specific(player_type *player_ptr, MONSTER_IDX who, POSITION y1, POSI bool summon_named_creature(player_type *player_ptr, MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode) { if (r_idx >= max_r_idx) - return FALSE; + return false; POSITION x, y; if (player_ptr->current_floor_ptr->inside_arena || !mon_scatter(player_ptr, r_idx, &y, &x, oy, ox, 2)) - return FALSE; + return false; return place_monster_aux(player_ptr, who, y, x, r_idx, (mode | PM_NO_KAGE)); } diff --git a/src/monster-floor/monster-sweep-grid.cpp b/src/monster-floor/monster-sweep-grid.cpp index e13d5e434..a6f3c2bf2 100644 --- a/src/monster-floor/monster-sweep-grid.cpp +++ b/src/monster-floor/monster-sweep-grid.cpp @@ -53,18 +53,18 @@ static bool mon_will_run(player_type *target_ptr, MONSTER_IDX m_idx) } if (m_ptr->cdis > MAX_SIGHT + 5) - return FALSE; + return false; if (monster_fear_remaining(m_ptr)) - return TRUE; + return true; if (m_ptr->cdis <= 5) - return FALSE; + return false; PLAYER_LEVEL p_lev = target_ptr->lev; DEPTH m_lev = r_ptr->level + (m_idx & 0x08) + 25; if (m_lev > p_lev + 4) - return FALSE; + return false; if (m_lev + 4 <= p_lev) - return TRUE; + return true; HIT_POINT p_chp = target_ptr->chp; HIT_POINT p_mhp = target_ptr->mhp; @@ -73,9 +73,9 @@ static bool mon_will_run(player_type *target_ptr, MONSTER_IDX m_idx) u32b p_val = (p_lev * p_mhp) + (p_chp << 2); u32b m_val = (m_lev * m_mhp) + (m_chp << 2); if (p_val * m_mhp > m_val * p_mhp) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -97,15 +97,15 @@ static bool sweep_ranged_attack_grid(player_type *target_ptr, MONSTER_IDX m_idx, POSITION x1 = m_ptr->fx; if (projectable(target_ptr, y1, x1, target_ptr->y, target_ptr->x)) - return FALSE; + return false; int now_cost = grid_cost(&floor_ptr->grid_array[y1][x1], r_ptr); if (now_cost == 0) now_cost = 999; - bool can_open_door = FALSE; + bool can_open_door = false; if (r_ptr->flags2 & (RF2_BASH_DOOR | RF2_OPEN_DOOR)) { - can_open_door = TRUE; + can_open_door = true; } int best = 999; @@ -115,7 +115,7 @@ static bool sweep_ranged_attack_grid(player_type *target_ptr, MONSTER_IDX m_idx, if (!in_bounds2(floor_ptr, y, x)) continue; if (player_bold(target_ptr, y, x)) - return FALSE; + return false; grid_type *g_ptr; g_ptr = &floor_ptr->grid_array[y][x]; @@ -144,9 +144,9 @@ static bool sweep_ranged_attack_grid(player_type *target_ptr, MONSTER_IDX m_idx, } if (best == 999) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -208,14 +208,14 @@ static void sweep_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, POSIT } int best; - bool use_scent = FALSE; + bool use_scent = false; if (grid_cost(g_ptr, r_ptr)) { best = 999; } else if (g_ptr->when) { if (floor_ptr->grid_array[target_ptr->y][target_ptr->x].when - g_ptr->when > 127) return; - use_scent = TRUE; + use_scent = true; best = 0; } else { return; @@ -299,12 +299,12 @@ static bool sweep_runnable_away_grid(floor_type *floor_ptr, MONSTER_IDX m_idx, P } if (score == -1) - return FALSE; + return false; (*yp) = fy - gy; (*xp) = fx - gx; - return TRUE; + return true; } /*! @@ -324,7 +324,7 @@ bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm) POSITION y = 0, x = 0; POSITION y2 = target_ptr->y; POSITION x2 = target_ptr->x; - bool done = FALSE; + bool done = false; bool will_run = mon_will_run(target_ptr, m_idx); grid_type *g_ptr; bool no_flow = m_ptr->mflag2.has(MFLAG2::NOFLOW) && grid_cost(&floor_ptr->grid_array[m_ptr->fy][m_ptr->fx], r_ptr) > 2; @@ -337,7 +337,7 @@ bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm) && projectable(target_ptr, m_ptr->fy, m_ptr->fx, m_ptr->target_y, m_ptr->target_x)) { y = m_ptr->fy - m_ptr->target_y; x = m_ptr->fx - m_ptr->target_x; - done = TRUE; + done = true; } } @@ -366,7 +366,7 @@ bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm) if (room < (8 * (target_ptr->chp + target_ptr->csp)) / (target_ptr->mhp + target_ptr->msp)) { if (find_hiding(target_ptr, m_idx, &y, &x)) - done = TRUE; + done = true; } } @@ -390,7 +390,7 @@ bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm) y = m_ptr->fy - y2; x = m_ptr->fx - x2; - done = TRUE; + done = true; } } @@ -408,7 +408,7 @@ bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm) int tmp_y = (-y); if (find_safety(target_ptr, m_idx, &y, &x) && !no_flow) { if (sweep_runnable_away_grid(target_ptr->current_floor_ptr, m_idx, &y, &x)) - done = TRUE; + done = true; } if (!done) { @@ -419,8 +419,8 @@ bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm) } if (!x && !y) - return FALSE; + return false; store_moves_val(mm, y, x); - return TRUE; + return true; } diff --git a/src/monster-floor/one-monster-placer.cpp b/src/monster-floor/one-monster-placer.cpp index e5be54c38..8c65ee6b3 100644 --- a/src/monster-floor/one-monster-placer.cpp +++ b/src/monster-floor/one-monster-placer.cpp @@ -59,11 +59,11 @@ static bool monster_hook_tanuki(player_type *player_ptr, MONRACE_IDX r_idx) unselectable |= (r_ptr->flags7 & (RF7_FRIENDLY | RF7_CHAMELEON)) != 0; unselectable |= (r_ptr->flags7 & RF7_AQUATIC) != 0; if (unselectable) - return FALSE; + return false; for (int i = 0; i < 4; i++) if (r_ptr->blow[i].method == RBM_EXPLODE) - return FALSE; + return false; return (*(get_monster_hook(player_ptr)))(player_ptr, r_idx); } @@ -104,30 +104,30 @@ static MONRACE_IDX initial_r_appearance(player_type *player_ptr, MONRACE_IDX r_i static bool check_unique_placeable(player_type *player_ptr, MONRACE_IDX r_idx) { if (player_ptr->phase_out) - return TRUE; + return true; monster_race *r_ptr = &r_info[r_idx]; if (((r_ptr->flags1 & (RF1_UNIQUE)) || (r_ptr->flags7 & (RF7_NAZGUL))) && (r_ptr->cur_num >= r_ptr->max_num)) { - return FALSE; + return false; } if ((r_ptr->flags7 & (RF7_UNIQUE2)) && (r_ptr->cur_num >= 1)) { - return FALSE; + return false; } if (r_idx == MON_BANORLUPART) { if (r_info[MON_BANOR].cur_num > 0) - return FALSE; + return false; if (r_info[MON_LUPART].cur_num > 0) - return FALSE; + return false; } if ((r_ptr->flags1 & (RF1_FORCE_DEPTH)) && (player_ptr->current_floor_ptr->dun_level < r_ptr->level) && (!ironman_nightmare || (r_ptr->flags1 & (RF1_QUESTOR)))) { - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -140,14 +140,14 @@ static bool check_quest_placeable(player_type *player_ptr, MONRACE_IDX r_idx) { floor_type *floor_ptr = player_ptr->current_floor_ptr; if (quest_number(player_ptr, floor_ptr->dun_level) == 0) - return TRUE; + return true; int hoge = quest_number(player_ptr, floor_ptr->dun_level); if ((quest[hoge].type != QUEST_TYPE_KILL_LEVEL) && (quest[hoge].type != QUEST_TYPE_RANDOM)) - return TRUE; + return true; if (r_idx != quest[hoge].r_idx) - return TRUE; + return true; int number_mon = 0; for (int i2 = 0; i2 < floor_ptr->width; ++i2) @@ -156,9 +156,9 @@ static bool check_quest_placeable(player_type *player_ptr, MONRACE_IDX r_idx) number_mon++; if (number_mon + quest[hoge].cur_num >= quest[hoge].max_num) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -173,11 +173,11 @@ static bool check_procection_rune(player_type *player_ptr, MONRACE_IDX r_idx, PO { grid_type *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x]; if (!is_rune_protection_grid(g_ptr)) - return TRUE; + return true; monster_race *r_ptr = &r_info[r_idx]; if (randint1(BREAK_RUNE_PROTECTION) >= (r_ptr->level + 20)) - return FALSE; + return false; if (g_ptr->info & CAVE_MARK) msg_print(_("守りのルーンが壊れた！", "The rune of protection is broken!")); @@ -186,7 +186,7 @@ static bool check_procection_rune(player_type *player_ptr, MONRACE_IDX r_idx, PO g_ptr->info &= ~(CAVE_OBJECT); g_ptr->mimic = 0; note_spot(player_ptr, y, x); - return TRUE; + return true; } static void warn_unique_generation(player_type *player_ptr, MONRACE_IDX r_idx) @@ -241,13 +241,13 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS concptr name = r_ptr->name.c_str(); if (player_ptr->wild_mode || !in_bounds(floor_ptr, y, x) || (r_idx == 0) || r_ptr->name.empty()) - return FALSE; + return false; if (((mode & PM_IGNORE_TERRAIN) == 0) && (pattern_tile(floor_ptr, y, x) || !monster_can_enter(player_ptr, y, x, r_ptr, 0))) - return FALSE; + return false; if (!check_unique_placeable(player_ptr, r_idx) || !check_quest_placeable(player_ptr, r_idx) || !check_procection_rune(player_ptr, r_idx, y, x)) - return FALSE; + return false; msg_format_wizard(player_ptr, CHEAT_MONSTER, _("%s(Lv%d)を生成しました。", "%s(Lv%d) was generated."), name, r_ptr->level); if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL) || (r_ptr->level < 10)) @@ -256,7 +256,7 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS g_ptr->m_idx = m_pop(floor_ptr); hack_m_idx_ii = g_ptr->m_idx; if (!g_ptr->m_idx) - return FALSE; + return false; monster_type *m_ptr; m_ptr = &floor_ptr->m_list[g_ptr->m_idx]; @@ -314,7 +314,7 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS if (mode & PM_NO_PET) m_ptr->mflag2.set(MFLAG2::NOPET); - m_ptr->ml = FALSE; + m_ptr->ml = false; if (mode & PM_FORCE_PET) { set_pet(player_ptr, m_ptr); } else if ((r_ptr->flags7 & RF7_FRIENDLY) || (mode & PM_FORCE_FRIENDLY) || is_friendly_idx(player_ptr, who)) { @@ -387,7 +387,7 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS warn_unique_generation(player_ptr, r_idx); if (!is_rune_explosion_grid(g_ptr)) - return TRUE; + return true; if (randint1(BREAK_RUNE_EXPLOSION) > r_ptr->level) { if (g_ptr->info & CAVE_MARK) { @@ -406,5 +406,5 @@ bool place_monster_one(player_type *player_ptr, MONSTER_IDX who, POSITION y, POS note_spot(player_ptr, y, x); lite_spot(player_ptr, y, x); - return TRUE; + return true; } diff --git a/src/monster-floor/quantum-effect.cpp b/src/monster-floor/quantum-effect.cpp index 863bf6d44..9b666c21c 100644 --- a/src/monster-floor/quantum-effect.cpp +++ b/src/monster-floor/quantum-effect.cpp @@ -84,19 +84,19 @@ bool process_quantum_effect(player_type *target_ptr, MONSTER_IDX m_idx, bool see monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if ((r_ptr->flags2 & RF2_QUANTUM) == 0) - return FALSE; + return false; if (!randint0(2)) - return FALSE; + return false; if (randint0((m_idx % 100) + 10)) - return FALSE; + return false; bool can_disappear = (r_ptr->flags1 & RF1_UNIQUE) == 0; can_disappear &= (r_ptr->flags1 & RF1_QUESTOR) == 0; if (can_disappear) { vanish_nonunique(target_ptr, m_idx, see_m); - return TRUE; + return true; } produce_quantum_effect(target_ptr, m_idx, see_m); - return FALSE; + return false; } diff --git a/src/monster-floor/special-death-switcher.cpp b/src/monster-floor/special-death-switcher.cpp index b5a47406a..80e4265c8 100644 --- a/src/monster-floor/special-death-switcher.cpp +++ b/src/monster-floor/special-death-switcher.cpp @@ -80,7 +80,7 @@ static void on_dead_pink_horror(player_type *player_ptr, monster_death_type *md_ if (player_ptr->current_floor_ptr->inside_arena || player_ptr->phase_out) return; - bool notice = FALSE; + bool notice = false; const int blue_horrors = 2; for (int i = 0; i < blue_horrors; i++) { POSITION wy = md_ptr->md_y; @@ -88,7 +88,7 @@ static void on_dead_pink_horror(player_type *player_ptr, monster_death_type *md_ bool pet = is_pet(md_ptr->m_ptr); BIT_FLAGS mode = pet ? PM_FORCE_PET : PM_NONE; if (summon_specific(player_ptr, (pet ? -1 : md_ptr->m_idx), wy, wx, 100, SUMMON_BLUE_HORROR, mode) && player_can_see_bold(player_ptr, wy, wx)) - notice = TRUE; + notice = true; } if (notice) @@ -242,7 +242,7 @@ static void on_dead_aqua_illusion(player_type *player_ptr, monster_death_type *m if (player_ptr->current_floor_ptr->inside_arena || player_ptr->phase_out) return; - bool notice = FALSE; + bool notice = false; const int popped_bubbles = 4; for (int i = 0; i < popped_bubbles; i++) { POSITION wy = md_ptr->md_y; @@ -251,7 +251,7 @@ static void on_dead_aqua_illusion(player_type *player_ptr, monster_death_type *m BIT_FLAGS mode = pet ? PM_FORCE_PET : PM_NONE; MONSTER_IDX smaller_bubble = md_ptr->m_ptr->r_idx - 1; if (summon_named_creature(player_ptr, (pet ? -1 : md_ptr->m_idx), wy, wx, smaller_bubble, mode) && player_can_see_bold(player_ptr, wy, wx)) - notice = TRUE; + notice = true; } if (notice) { @@ -295,7 +295,7 @@ static void on_dead_dragon_centipede(player_type *player_ptr, monster_death_type if (player_ptr->current_floor_ptr->inside_arena || player_ptr->phase_out) return; - bool notice = FALSE; + bool notice = false; const int reproduced_centipede = 2; for (int i = 0; i < reproduced_centipede; i++) { POSITION wy = md_ptr->md_y; @@ -304,7 +304,7 @@ static void on_dead_dragon_centipede(player_type *player_ptr, monster_death_type BIT_FLAGS mode = pet ? PM_FORCE_PET : PM_NONE; MONSTER_IDX smaller_centipede = md_ptr->m_ptr->r_idx - 1; if (summon_named_creature(player_ptr, (pet ? -1 : md_ptr->m_idx), wy, wx, smaller_centipede, mode) && player_can_see_bold(player_ptr, wy, wx)) - notice = TRUE; + notice = true; } GAME_TEXT m_name[MAX_NLEN]; diff --git a/src/monster-race/monster-race-hook.cpp b/src/monster-race/monster-race-hook.cpp index 5f7bc5369..2da3dc7f4 100644 --- a/src/monster-race/monster-race-hook.cpp +++ b/src/monster-race/monster-race-hook.cpp @@ -96,18 +96,18 @@ bool mon_hook_quest(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (any_bits(r_ptr->flags8, RF8_WILD_ONLY)) - return FALSE; + return false; if (any_bits(r_ptr->flags7, RF7_AQUATIC)) - return FALSE; + return false; if (any_bits(r_ptr->flags2, RF2_MULTIPLY)) - return FALSE; + return false; if (any_bits(r_ptr->flags7, RF7_FRIENDLY)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -126,7 +126,7 @@ bool mon_hook_quest(player_type *player_ptr, MONRACE_IDX r_idx) bool mon_hook_dungeon(player_type *player_ptr, MONRACE_IDX r_idx) { if (!is_in_dungeon(player_ptr) && !player_ptr->current_floor_ptr->inside_quest) - return TRUE; + return true; monster_race *r_ptr = &r_info[r_idx]; dungeon_type *d_ptr = &d_info[player_ptr->dungeon_idx]; @@ -261,7 +261,7 @@ bool mon_hook_deep_water(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!mon_hook_dungeon(player_ptr, r_idx)) - return FALSE; + return false; return any_bits(r_ptr->flags7, RF7_AQUATIC); } @@ -275,7 +275,7 @@ bool mon_hook_shallow_water(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!mon_hook_dungeon(player_ptr, r_idx)) - return FALSE; + return false; return none_bits(r_ptr->flags2, RF2_AURA_FIRE); } @@ -289,7 +289,7 @@ bool mon_hook_lava(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!mon_hook_dungeon(player_ptr, r_idx)) - return FALSE; + return false; return (any_bits(r_ptr->flagsr, RFR_EFF_IM_FIRE_MASK) || any_bits(r_ptr->flags7, RF7_CAN_FLY)) && none_bits(r_ptr->flags3, RF3_AURA_COLD); } @@ -306,9 +306,9 @@ bool mon_hook_floor(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (none_bits(r_ptr->flags7, RF7_AQUATIC) || any_bits(r_ptr->flags7, RF7_CAN_FLY)) - return TRUE; + return true; else - return FALSE; + return false; } /* @@ -321,18 +321,18 @@ bool vault_aux_lite(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (r_ptr->ability_flags.has_none_of({ RF_ABILITY::BR_LITE, RF_ABILITY::BA_LITE })) - return FALSE; + return false; if (any_bits(r_ptr->flags2, (RF2_PASS_WALL | RF2_KILL_WALL))) - return FALSE; + return false; if (r_ptr->ability_flags.has(RF_ABILITY::BR_DISI)) - return FALSE; + return false; - return TRUE; + return true; } /* @@ -342,12 +342,12 @@ bool vault_aux_shards(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (r_ptr->ability_flags.has_not(RF_ABILITY::BR_SHAR)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -374,18 +374,18 @@ bool vault_aux_jelly(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (any_bits(r_ptr->flags2, RF2_KILL_BODY) && none_bits(r_ptr->flags1, RF1_NEVER_BLOW)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_EVIL)) - return FALSE; + return false; if (!angband_strchr("ijm,", r_ptr->d_char)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -398,12 +398,12 @@ bool vault_aux_animal(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (none_bits(r_ptr->flags3, RF3_ANIMAL)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -416,12 +416,12 @@ bool vault_aux_undead(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (none_bits(r_ptr->flags3, RF3_UNDEAD)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -437,22 +437,22 @@ bool vault_aux_chapel_g(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_EVIL)) - return FALSE; + return false; if ((r_idx == MON_A_GOLD) || (r_idx == MON_A_SILVER)) - return FALSE; + return false; if (r_ptr->d_char == 'A') - return TRUE; + return true; for (int i = 0; chapel_list[i]; i++) if (r_idx == chapel_list[i]) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -465,12 +465,12 @@ bool vault_aux_kennel(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (!angband_strchr("CZ", r_ptr->d_char)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -483,12 +483,12 @@ bool vault_aux_mimic(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (!angband_strchr("!$&(/=?[\\|][`~>+", r_ptr->d_char)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -500,7 +500,7 @@ bool vault_aux_mimic(player_type *player_ptr, MONRACE_IDX r_idx) bool vault_aux_clone(player_type *player_ptr, MONRACE_IDX r_idx) { if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; return (r_idx == vault_aux_race); } @@ -515,18 +515,18 @@ bool vault_aux_symbol_e(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (any_bits(r_ptr->flags2, RF2_KILL_BODY) && none_bits(r_ptr->flags1, RF1_NEVER_BLOW)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_GOOD)) - return FALSE; + return false; if (r_ptr->d_char != vault_aux_char) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -539,18 +539,18 @@ bool vault_aux_symbol_g(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (any_bits(r_ptr->flags2, RF2_KILL_BODY) && none_bits(r_ptr->flags1, RF1_NEVER_BLOW)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_EVIL)) - return FALSE; + return false; if (r_ptr->d_char != vault_aux_char) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -563,15 +563,15 @@ bool vault_aux_orc(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (none_bits(r_ptr->flags3, RF3_ORC)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_UNDEAD)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -584,15 +584,15 @@ bool vault_aux_troll(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (none_bits(r_ptr->flags3, RF3_TROLL)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_UNDEAD)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -605,18 +605,18 @@ bool vault_aux_giant(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (none_bits(r_ptr->flags3, RF3_GIANT)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_GOOD)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_UNDEAD)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -629,21 +629,21 @@ bool vault_aux_dragon(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (none_bits(r_ptr->flags3, RF3_DRAGON)) - return FALSE; + return false; if (any_bits(r_ptr->flags3, RF3_UNDEAD)) - return FALSE; + return false; auto flags = RF_ABILITY_BREATH_MASK; flags.reset(vault_aux_dragon_mask4); if (r_ptr->ability_flags.has_any_of(flags) || !r_ptr->ability_flags.has_all_of(vault_aux_dragon_mask4)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -656,15 +656,15 @@ bool vault_aux_demon(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if (any_bits(r_ptr->flags2, RF2_KILL_BODY) && none_bits(r_ptr->flags1, RF1_NEVER_BLOW)) - return FALSE; + return false; if (none_bits(r_ptr->flags3, RF3_DEMON)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -677,15 +677,15 @@ bool vault_aux_cthulhu(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; if ((r_ptr->flags2 & RF2_KILL_BODY) && !(r_ptr->flags1 & RF1_NEVER_BLOW)) - return FALSE; + return false; if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -711,13 +711,13 @@ bool vault_aux_dark_elf(player_type *player_ptr, MONRACE_IDX r_idx) }; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; for (int i = 0; dark_elf_list[i]; i++) if (r_idx == dark_elf_list[i]) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -753,9 +753,9 @@ bool no_questor_or_bounty_uniques(MONRACE_IDX r_idx) case MON_BANORLUPART: case MON_BANOR: case MON_LUPART: - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -771,12 +771,12 @@ bool monster_hook_human(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (any_bits(r_ptr->flags1, RF1_UNIQUE)) - return FALSE; + return false; if (angband_strchr("pht", r_ptr->d_char)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -788,12 +788,12 @@ bool get_nightmare(player_type *player_ptr, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; if (none_bits(r_ptr->flags2, RF2_ELDRITCH_HORROR)) - return FALSE; + return false; if (r_ptr->level <= player_ptr->lev) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -808,9 +808,9 @@ bool monster_is_fishing_target(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (any_bits(r_ptr->flags7, RF7_AQUATIC) && none_bits(r_ptr->flags1, RF1_UNIQUE) && angband_strchr("Jjlw", r_ptr->d_char)) - return TRUE; + return true; else - return FALSE; + return false; } /*! @@ -833,20 +833,20 @@ bool monster_can_entry_arena(player_type *player_ptr, MONRACE_IDX r_idx) unselectable |= any_bits(r_ptr->flags7, RF7_AQUATIC); unselectable |= any_bits(r_ptr->flags7, RF7_CHAMELEON); if (unselectable) - return FALSE; + return false; for (int i = 0; i < 4; i++) { if (r_ptr->blow[i].method == RBM_EXPLODE) - return FALSE; + return false; if (r_ptr->blow[i].effect != RBE_DR_MANA) dam += r_ptr->blow[i].d_dice; } if (!dam && r_ptr->ability_flags.has_none_of(RF_ABILITY_BOLT_MASK | RF_ABILITY_BEAM_MASK | RF_ABILITY_BALL_MASK | RF_ABILITY_BREATH_MASK)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -861,24 +861,24 @@ bool item_monster_okay(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (any_bits(r_ptr->flags1, RF1_UNIQUE)) - return FALSE; + return false; if (any_bits(r_ptr->flags7, RF7_KAGE)) - return FALSE; + return false; if (any_bits(r_ptr->flagsr, RFR_RES_ALL)) - return FALSE; + return false; if (any_bits(r_ptr->flags7, RF7_NAZGUL)) - return FALSE; + return false; if (any_bits(r_ptr->flags1, RF1_FORCE_DEPTH)) - return FALSE; + return false; if (any_bits(r_ptr->flags7, RF7_UNIQUE2)) - return FALSE; + return false; - return TRUE; + return true; } /*! diff --git a/src/monster/monster-describer.cpp b/src/monster/monster-describer.cpp index 71113768b..5d631924e 100644 --- a/src/monster/monster-describer.cpp +++ b/src/monster/monster-describer.cpp @@ -29,11 +29,11 @@ void monster_desc(player_type *player_ptr, char *desc, monster_type *m_ptr, BIT_ r_ptr = &r_info[m_ptr->ap_r_idx]; concptr name = (mode & MD_TRUE_NAME) ? real_r_ptr(m_ptr)->name.c_str() : r_ptr->name.c_str(); GAME_TEXT silly_name[1024]; - bool named = FALSE; + bool named = false; if (player_ptr->image && !(mode & MD_IGNORE_HALLU)) { if (one_in_(2)) { if (!get_rnd_line(_("silly_j.txt", "silly.txt"), m_ptr->r_idx, silly_name)) - named = TRUE; + named = true; } if (!named) { diff --git a/src/monster/monster-info.cpp b/src/monster/monster-info.cpp index be727a188..7a42145d5 100644 --- a/src/monster/monster-info.cpp +++ b/src/monster/monster-info.cpp @@ -56,64 +56,64 @@ bool monster_can_cross_terrain(player_type *player_ptr, FEAT_IDX feat, monster_r if (has_flag(f_ptr->flags, FF_PATTERN)) { if (!(mode & CEM_RIDING)) { if (!(r_ptr->flags7 & RF7_CAN_FLY)) - return FALSE; + return false; } else { if (!(mode & CEM_P_CAN_ENTER_PATTERN)) - return FALSE; + return false; } } if (has_flag(f_ptr->flags, FF_CAN_FLY) && (r_ptr->flags7 & RF7_CAN_FLY)) - return TRUE; + return true; if (has_flag(f_ptr->flags, FF_CAN_SWIM) && (r_ptr->flags7 & RF7_CAN_SWIM)) - return TRUE; + return true; if (has_flag(f_ptr->flags, FF_CAN_PASS)) { if ((r_ptr->flags2 & RF2_PASS_WALL) && (!(mode & CEM_RIDING) || has_pass_wall(player_ptr))) - return TRUE; + return true; } if (!has_flag(f_ptr->flags, FF_MOVE)) - return FALSE; + return false; if (has_flag(f_ptr->flags, FF_MOUNTAIN) && (r_ptr->flags8 & RF8_WILD_MOUNTAIN)) - return TRUE; + return true; if (has_flag(f_ptr->flags, FF_WATER)) { if (!(r_ptr->flags7 & RF7_AQUATIC)) { if (has_flag(f_ptr->flags, FF_DEEP)) - return FALSE; + return false; else if (r_ptr->flags2 & RF2_AURA_FIRE) - return FALSE; + return false; } } else if (r_ptr->flags7 & RF7_AQUATIC) - return FALSE; + return false; if (has_flag(f_ptr->flags, FF_LAVA)) { if (!(r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)) - return FALSE; + return false; } if (has_flag(f_ptr->flags, FF_COLD_PUDDLE)) { if (!(r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)) - return FALSE; + return false; } if (has_flag(f_ptr->flags, FF_ELEC_PUDDLE)) { if (!(r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK)) - return FALSE; + return false; } if (has_flag(f_ptr->flags, FF_ACID_PUDDLE)) { if (!(r_ptr->flagsr & RFR_EFF_IM_ACID_MASK)) - return FALSE; + return false; } if (has_flag(f_ptr->flags, FF_POISON_PUDDLE)) { if (!(r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)) - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -130,9 +130,9 @@ bool monster_can_enter(player_type *player_ptr, POSITION y, POSITION x, monster_ { grid_type *g_ptr = &player_ptr->current_floor_ptr->grid_array[y][x]; if (player_bold(player_ptr, y, x)) - return FALSE; + return false; if (g_ptr->m_idx) - return FALSE; + return false; return monster_can_cross_terrain(player_ptr, g_ptr->feat, r_ptr, mode); } @@ -148,10 +148,10 @@ static bool check_hostile_align(byte sub_align1, byte sub_align2) { if (sub_align1 != sub_align2) { if (((sub_align1 & SUB_ALIGN_EVIL) && (sub_align2 & SUB_ALIGN_GOOD)) || ((sub_align1 & SUB_ALIGN_GOOD) && (sub_align2 & SUB_ALIGN_EVIL))) - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -168,25 +168,25 @@ bool are_enemies(player_type *player_ptr, monster_type *m_ptr, monster_type *n_p if (player_ptr->phase_out) { if (is_pet(m_ptr) || is_pet(n_ptr)) - return FALSE; - return TRUE; + return false; + return true; } if ((r_ptr->flags8 & (RF8_WILD_TOWN | RF8_WILD_ALL)) && (s_ptr->flags8 & (RF8_WILD_TOWN | RF8_WILD_ALL))) { if (!is_pet(m_ptr) && !is_pet(n_ptr)) - return FALSE; + return false; } if (check_hostile_align(m_ptr->sub_align, n_ptr->sub_align)) { if (m_ptr->mflag2.has_not(MFLAG2::CHAMELEON) || n_ptr->mflag2.has_not(MFLAG2::CHAMELEON)) - return TRUE; + return true; } if (is_hostile(m_ptr) != is_hostile(n_ptr)) { - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -224,9 +224,9 @@ bool monster_has_hostile_align(player_type *player_ptr, monster_type *m_ptr, int sub_align2 |= SUB_ALIGN_GOOD; if (check_hostile_align(sub_align1, sub_align2)) - return TRUE; + return true; - return FALSE; + return false; } bool is_original_ap_and_seen(player_type *player_ptr, monster_type *m_ptr) { return m_ptr->ml && !player_ptr->image && (m_ptr->ap_r_idx == m_ptr->r_idx); } @@ -257,18 +257,18 @@ bool is_hostile(monster_type *m_ptr) { return !is_friendly(m_ptr) && !is_pet(m_p bool is_mimicry(monster_type *m_ptr) { if (m_ptr->ap_r_idx == MON_IT || m_ptr->ap_r_idx == MON_NULL || m_ptr->ap_r_idx == MON_BEHINDER) - return TRUE; + return true; monster_race *r_ptr = &r_info[m_ptr->ap_r_idx]; if (angband_strchr("/|\\()[]=$,.!?&`#%<>+~", r_ptr->d_char) == NULL) - return FALSE; + return false; if (none_bits(r_ptr->flags1, RF1_NEVER_MOVE) && !monster_csleep_remaining(m_ptr)) { - return FALSE; + return false; } - return TRUE; + return true; } /*! diff --git a/src/monster/monster-list.cpp b/src/monster/monster-list.cpp index cc3e8f7ea..c2265e1e8 100644 --- a/src/monster/monster-list.cpp +++ b/src/monster/monster-list.cpp @@ -202,29 +202,29 @@ static bool monster_hook_chameleon_lord(player_type *player_ptr, MONRACE_IDX r_i monster_race *old_r_ptr = &r_info[m_ptr->r_idx]; if (!(r_ptr->flags1 & (RF1_UNIQUE))) - return FALSE; + return false; if (r_ptr->flags7 & (RF7_FRIENDLY | RF7_CHAMELEON)) - return FALSE; + return false; if (ABS(r_ptr->level - r_info[MON_CHAMELEON_K].level) > 5) - return FALSE; + return false; if ((r_ptr->blow[0].method == RBM_EXPLODE) || (r_ptr->blow[1].method == RBM_EXPLODE) || (r_ptr->blow[2].method == RBM_EXPLODE) || (r_ptr->blow[3].method == RBM_EXPLODE)) - return FALSE; + return false; if (!monster_can_cross_terrain(player_ptr, floor_ptr->grid_array[m_ptr->fy][m_ptr->fx].feat, r_ptr, 0)) - return FALSE; + return false; if (!(old_r_ptr->flags7 & RF7_CHAMELEON)) { if (monster_has_hostile_align(player_ptr, m_ptr, 0, 0, r_ptr)) - return FALSE; + return false; } else if (summon_specific_who > 0) { if (monster_has_hostile_align(player_ptr, &floor_ptr->m_list[summon_specific_who], 0, 0, r_ptr)) - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -241,29 +241,29 @@ static bool monster_hook_chameleon(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *old_r_ptr = &r_info[m_ptr->r_idx]; if (r_ptr->flags1 & (RF1_UNIQUE)) - return FALSE; + return false; if (r_ptr->flags2 & RF2_MULTIPLY) - return FALSE; + return false; if (r_ptr->flags7 & (RF7_FRIENDLY | RF7_CHAMELEON)) - return FALSE; + return false; if ((r_ptr->blow[0].method == RBM_EXPLODE) || (r_ptr->blow[1].method == RBM_EXPLODE) || (r_ptr->blow[2].method == RBM_EXPLODE) || (r_ptr->blow[3].method == RBM_EXPLODE)) - return FALSE; + return false; if (!monster_can_cross_terrain(player_ptr, floor_ptr->grid_array[m_ptr->fy][m_ptr->fx].feat, r_ptr, 0)) - return FALSE; + return false; if (!(old_r_ptr->flags7 & RF7_CHAMELEON)) { if ((old_r_ptr->flags3 & RF3_GOOD) && !(r_ptr->flags3 & RF3_GOOD)) - return FALSE; + return false; if ((old_r_ptr->flags3 & RF3_EVIL) && !(r_ptr->flags3 & RF3_EVIL)) - return FALSE; + return false; if (!(old_r_ptr->flags3 & (RF3_GOOD | RF3_EVIL)) && (r_ptr->flags3 & (RF3_GOOD | RF3_EVIL))) - return FALSE; + return false; } else if (summon_specific_who > 0) { if (monster_has_hostile_align(player_ptr, &floor_ptr->m_list[summon_specific_who], 0, 0, r_ptr)) - return FALSE; + return false; } return (*(get_monster_hook(player_ptr)))(player_ptr, r_idx); @@ -282,9 +282,9 @@ void choose_new_monster(player_type *player_ptr, MONSTER_IDX m_idx, bool born, M monster_type *m_ptr = &floor_ptr->m_list[m_idx]; monster_race *r_ptr; - bool old_unique = FALSE; + bool old_unique = false; if (r_info[m_ptr->r_idx].flags1 & RF1_UNIQUE) - old_unique = TRUE; + old_unique = true; if (old_unique && (r_idx == MON_CHAMELEON)) r_idx = MON_CHAMELEON_K; r_ptr = &r_info[r_idx]; diff --git a/src/monster/monster-processor-util.cpp b/src/monster/monster-processor-util.cpp index 01f2ded5c..16810f3ec 100644 --- a/src/monster/monster-processor-util.cpp +++ b/src/monster/monster-processor-util.cpp @@ -23,17 +23,17 @@ turn_flags *init_turn_flags(MONSTER_IDX riding_idx, MONSTER_IDX m_idx, turn_flags *turn_flags_ptr) { turn_flags_ptr->is_riding_mon = (m_idx == riding_idx); - turn_flags_ptr->do_turn = FALSE; - turn_flags_ptr->do_move = FALSE; - turn_flags_ptr->do_view = FALSE; - turn_flags_ptr->must_alter_to_move = FALSE; - turn_flags_ptr->did_open_door = FALSE; - turn_flags_ptr->did_bash_door = FALSE; - turn_flags_ptr->did_take_item = FALSE; - turn_flags_ptr->did_kill_item = FALSE; - turn_flags_ptr->did_move_body = FALSE; - turn_flags_ptr->did_pass_wall = FALSE; - turn_flags_ptr->did_kill_wall = FALSE; + turn_flags_ptr->do_turn = false; + turn_flags_ptr->do_move = false; + turn_flags_ptr->do_view = false; + turn_flags_ptr->must_alter_to_move = false; + turn_flags_ptr->did_open_door = false; + turn_flags_ptr->did_bash_door = false; + turn_flags_ptr->did_take_item = false; + turn_flags_ptr->did_kill_item = false; + turn_flags_ptr->did_move_body = false; + turn_flags_ptr->did_pass_wall = false; + turn_flags_ptr->did_kill_wall = false; return turn_flags_ptr; } diff --git a/src/monster/monster-processor.cpp b/src/monster/monster-processor.cpp index 437d4b056..f2c1c32f2 100644 --- a/src/monster/monster-processor.cpp +++ b/src/monster/monster-processor.cpp @@ -191,7 +191,7 @@ void process_monster(player_type *target_ptr, MONSTER_IDX m_idx) bool process_stealth(player_type *target_ptr, MONSTER_IDX m_idx) { if ((target_ptr->special_defense & NINJA_S_STEALTH) == 0) - return TRUE; + return true; monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -244,11 +244,11 @@ bool vanish_summoned_children(player_type *target_ptr, MONSTER_IDX m_idx, bool s monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; if (m_ptr->parent_m_idx == 0) - return FALSE; + return false; // parent_m_idxが自分自身を指している場合は召喚主は消滅している if (m_ptr->parent_m_idx != m_idx && (target_ptr->current_floor_ptr->m_list[m_ptr->parent_m_idx].r_idx > 0)) - return FALSE; + return false; if (see_m) { GAME_TEXT m_name[MAX_NLEN]; @@ -263,7 +263,7 @@ bool vanish_summoned_children(player_type *target_ptr, MONSTER_IDX m_idx, bool s } delete_monster_idx(target_ptr, m_idx); - return TRUE; + return true; } /*! @@ -277,10 +277,10 @@ bool awake_monster(player_type *target_ptr, MONSTER_IDX m_idx) monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!monster_csleep_remaining(m_ptr)) - return TRUE; + return true; if (!has_aggravate(target_ptr)) - return FALSE; + return false; (void)set_monster_csleep(target_ptr, m_idx, 0); if (m_ptr->ml) { @@ -292,7 +292,7 @@ bool awake_monster(player_type *target_ptr, MONSTER_IDX m_idx) if (is_original_ap_and_seen(target_ptr, m_ptr) && (r_ptr->r_wake < MAX_UCHAR)) r_ptr->r_wake++; - return TRUE; + return true; } /*! @@ -305,14 +305,14 @@ void process_angar(player_type *target_ptr, MONSTER_IDX m_idx, bool see_m) { monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - bool gets_angry = FALSE; + bool gets_angry = false; if (is_friendly(m_ptr) && has_aggravate(target_ptr)) - gets_angry = TRUE; + gets_angry = true; if (is_pet(m_ptr) && ((((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) && monster_has_hostile_align(target_ptr, NULL, 10, -10, r_ptr)) || (r_ptr->flagsr & RFR_RES_ALL))) - gets_angry = TRUE; + gets_angry = true; if (target_ptr->phase_out || !gets_angry) return; @@ -349,7 +349,7 @@ bool explode_grenade(player_type *target_ptr, MONSTER_IDX m_idx) { monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; if (m_ptr->r_idx != MON_GRENADE) - return FALSE; + return false; bool fear, dead; mon_take_hit_mon(target_ptr, m_idx, 1, &dead, &fear, _("は爆発して粉々になった。", " explodes into tiny shreds."), m_idx); @@ -397,7 +397,7 @@ bool decide_monster_multiplication(player_type *target_ptr, MONSTER_IDX m_idx, P monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (((r_ptr->flags2 & RF2_MULTIPLY) == 0) || (target_ptr->current_floor_ptr->num_repro >= MAX_REPRO)) - return FALSE; + return false; int k = 0; for (POSITION y = oy - 1; y <= oy + 1; y++) { @@ -418,11 +418,11 @@ bool decide_monster_multiplication(player_type *target_ptr, MONSTER_IDX m_idx, P if (target_ptr->current_floor_ptr->m_list[hack_m_idx_ii].ml && is_original_ap_and_seen(target_ptr, m_ptr)) r_ptr->r_flags2 |= RF2_MULTIPLY; - return TRUE; + return true; } } - return FALSE; + return false; } /*! @@ -437,26 +437,26 @@ bool cast_spell(player_type *target_ptr, MONSTER_IDX m_idx, bool aware) monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if ((r_ptr->freq_spell == 0) || (randint1(100) > r_ptr->freq_spell)) - return FALSE; + return false; - bool counterattack = FALSE; + bool counterattack = false; if (m_ptr->target_y) { MONSTER_IDX t_m_idx = target_ptr->current_floor_ptr->grid_array[m_ptr->target_y][m_ptr->target_x].m_idx; if (t_m_idx && are_enemies(target_ptr, m_ptr, &target_ptr->current_floor_ptr->m_list[t_m_idx]) && projectable(target_ptr, m_ptr->fy, m_ptr->fx, m_ptr->target_y, m_ptr->target_x)) { - counterattack = TRUE; + counterattack = true; } } if (counterattack) { if (monst_spell_monst(target_ptr, m_idx) || (aware && make_attack_spell(target_ptr, m_idx))) - return TRUE; + return true; } else { if ((aware && make_attack_spell(target_ptr, m_idx)) || monst_spell_monst(target_ptr, m_idx)) - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -472,16 +472,16 @@ bool process_monster_fear(player_type *target_ptr, turn_flags *turn_flags_ptr, M monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx]; bool is_battle_determined = !turn_flags_ptr->do_turn && !turn_flags_ptr->do_move && monster_fear_remaining(m_ptr) && turn_flags_ptr->aware; if (!is_battle_determined) - return FALSE; + return false; (void)set_monster_monfear(target_ptr, m_idx, 0); if (!turn_flags_ptr->see_m) - return TRUE; + return true; GAME_TEXT m_name[MAX_NLEN]; monster_desc(target_ptr, m_name, m_ptr, 0); msg_format(_("%^sは戦いを決意した！", "%^s turns to fight!"), m_name); - return TRUE; + return true; } /*! @@ -521,7 +521,7 @@ void process_monsters(player_type *target_ptr) { old_race_flags tmp_flags; old_race_flags *old_race_flags_ptr = init_old_race_flags(&tmp_flags); - target_ptr->current_floor_ptr->monster_noise = FALSE; + target_ptr->current_floor_ptr->monster_noise = false; MONRACE_IDX old_monster_race_idx = target_ptr->monster_race_idx; save_old_race_flags(target_ptr->monster_race_idx, old_race_flags_ptr); sweep_monster_process(target_ptr); @@ -589,13 +589,13 @@ bool decide_process_continue(player_type *target_ptr, monster_type *m_ptr) } if (m_ptr->cdis <= (is_pet(m_ptr) ? (r_ptr->aaf > MAX_SIGHT ? MAX_SIGHT : r_ptr->aaf) : r_ptr->aaf)) - return TRUE; + return true; if ((m_ptr->cdis <= MAX_SIGHT || target_ptr->phase_out) && (player_has_los_bold(target_ptr, m_ptr->fy, m_ptr->fx) || has_aggravate(target_ptr))) - return TRUE; + return true; if (m_ptr->target_y) - return TRUE; + return true; - return FALSE; + return false; } diff --git a/src/monster/monster-status-setter.cpp b/src/monster/monster-status-setter.cpp index a2abbffb8..b1ee0efd1 100644 --- a/src/monster/monster-status-setter.cpp +++ b/src/monster/monster-status-setter.cpp @@ -98,23 +98,23 @@ bool set_monster_csleep(player_type *target_ptr, MONSTER_IDX m_idx, int v) { floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (v) { if (!monster_csleep_remaining(m_ptr)) { mproc_add(floor_ptr, m_idx, MTIMED_CSLEEP); - notice = TRUE; + notice = true; } } else { if (monster_csleep_remaining(m_ptr)) { mproc_remove(floor_ptr, m_idx, MTIMED_CSLEEP); - notice = TRUE; + notice = true; } } m_ptr->mtimed[MTIMED_CSLEEP] = (s16b)v; if (!notice) - return FALSE; + return false; if (m_ptr->ml) { if (target_ptr->health_who == m_idx) @@ -127,7 +127,7 @@ bool set_monster_csleep(player_type *target_ptr, MONSTER_IDX m_idx, int v) if (r_info[m_ptr->r_idx].flags7 & RF7_HAS_LD_MASK) target_ptr->update |= PU_MON_LITE; - return TRUE; + return true; } /*! @@ -142,28 +142,28 @@ bool set_monster_fast(player_type *target_ptr, MONSTER_IDX m_idx, int v) { floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; - bool notice = FALSE; + bool notice = false; v = (v > 200) ? 200 : (v < 0) ? 0 : v; if (v) { if (!monster_fast_remaining(m_ptr)) { mproc_add(floor_ptr, m_idx, MTIMED_FAST); - notice = TRUE; + notice = true; } } else { if (monster_fast_remaining(m_ptr)) { mproc_remove(floor_ptr, m_idx, MTIMED_FAST); - notice = TRUE; + notice = true; } } m_ptr->mtimed[MTIMED_FAST] = (s16b)v; if (!notice) - return FALSE; + return false; if ((target_ptr->riding == m_idx) && !target_ptr->leaving) target_ptr->update |= PU_BONUS; - return TRUE; + return true; } /* @@ -173,28 +173,28 @@ bool set_monster_slow(player_type *target_ptr, MONSTER_IDX m_idx, int v) { floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; - bool notice = FALSE; + bool notice = false; v = (v > 200) ? 200 : (v < 0) ? 0 : v; if (v) { if (!monster_slow_remaining(m_ptr)) { mproc_add(floor_ptr, m_idx, MTIMED_SLOW); - notice = TRUE; + notice = true; } } else { if (monster_slow_remaining(m_ptr)) { mproc_remove(floor_ptr, m_idx, MTIMED_SLOW); - notice = TRUE; + notice = true; } } m_ptr->mtimed[MTIMED_SLOW] = (s16b)v; if (!notice) - return FALSE; + return false; if ((target_ptr->riding == m_idx) && !target_ptr->leaving) target_ptr->update |= PU_BONUS; - return TRUE; + return true; } /*! @@ -209,17 +209,17 @@ bool set_monster_stunned(player_type *target_ptr, MONSTER_IDX m_idx, int v) { floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; - bool notice = FALSE; + bool notice = false; v = (v > 200) ? 200 : (v < 0) ? 0 : v; if (v) { if (!monster_stunned_remaining(m_ptr)) { mproc_add(floor_ptr, m_idx, MTIMED_STUNNED); - notice = TRUE; + notice = true; } } else { if (monster_stunned_remaining(m_ptr)) { mproc_remove(floor_ptr, m_idx, MTIMED_STUNNED); - notice = TRUE; + notice = true; } } @@ -239,17 +239,17 @@ bool set_monster_confused(player_type *target_ptr, MONSTER_IDX m_idx, int v) { floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; - bool notice = FALSE; + bool notice = false; v = (v > 200) ? 200 : (v < 0) ? 0 : v; if (v) { if (!monster_confused_remaining(m_ptr)) { mproc_add(floor_ptr, m_idx, MTIMED_CONFUSED); - notice = TRUE; + notice = true; } } else { if (monster_confused_remaining(m_ptr)) { mproc_remove(floor_ptr, m_idx, MTIMED_CONFUSED); - notice = TRUE; + notice = true; } } @@ -269,24 +269,24 @@ bool set_monster_monfear(player_type *target_ptr, MONSTER_IDX m_idx, int v) { floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; - bool notice = FALSE; + bool notice = false; v = (v > 200) ? 200 : (v < 0) ? 0 : v; if (v) { if (!monster_fear_remaining(m_ptr)) { mproc_add(floor_ptr, m_idx, MTIMED_MONFEAR); - notice = TRUE; + notice = true; } } else { if (monster_fear_remaining(m_ptr)) { mproc_remove(floor_ptr, m_idx, MTIMED_MONFEAR); - notice = TRUE; + notice = true; } } m_ptr->mtimed[MTIMED_MONFEAR] = (s16b)v; if (!notice) - return FALSE; + return false; if (m_ptr->ml) { if (target_ptr->health_who == m_idx) @@ -296,7 +296,7 @@ bool set_monster_monfear(player_type *target_ptr, MONSTER_IDX m_idx, int v) target_ptr->redraw |= PR_UHEALTH; } - return TRUE; + return true; } /*! @@ -312,25 +312,25 @@ bool set_monster_invulner(player_type *target_ptr, MONSTER_IDX m_idx, int v, boo { floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; - bool notice = FALSE; + bool notice = false; v = (v > 200) ? 200 : (v < 0) ? 0 : v; if (v) { if (!monster_invulner_remaining(m_ptr)) { mproc_add(floor_ptr, m_idx, MTIMED_INVULNER); - notice = TRUE; + notice = true; } } else { if (monster_invulner_remaining(m_ptr)) { mproc_remove(floor_ptr, m_idx, MTIMED_INVULNER); if (energy_need && !target_ptr->wild_mode) m_ptr->energy_need += ENERGY_NEED(); - notice = TRUE; + notice = true; } } m_ptr->mtimed[MTIMED_INVULNER] = (s16b)v; if (!notice) - return FALSE; + return false; if (m_ptr->ml) { if (target_ptr->health_who == m_idx) @@ -340,7 +340,7 @@ bool set_monster_invulner(player_type *target_ptr, MONSTER_IDX m_idx, int v, boo target_ptr->redraw |= PR_UHEALTH; } - return TRUE; + return true; } /*! @@ -355,7 +355,7 @@ bool set_monster_timewalk(player_type *target_ptr, int num, MONRACE_IDX who, boo { monster_type *m_ptr = &target_ptr->current_floor_ptr->m_list[hack_m_idx]; if (current_world_ptr->timewalk_m_idx) - return FALSE; + return false; if (vs_player) { GAME_TEXT m_name[MAX_NLEN]; @@ -417,5 +417,5 @@ bool set_monster_timewalk(player_type *target_ptr, int num, MONRACE_IDX who, boo } handle_stuff(target_ptr); - return TRUE; + return true; } diff --git a/src/monster/monster-status.cpp b/src/monster/monster-status.cpp index 08d2fc9db..b4092bf5c 100644 --- a/src/monster/monster-status.cpp +++ b/src/monster/monster-status.cpp @@ -68,7 +68,7 @@ bool monster_is_powerful(floor_type *floor_ptr, MONSTER_IDX m_idx) { monster_type *m_ptr = &floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - bool powerful = r_ptr->flags2 & RF2_POWERFUL ? TRUE : FALSE; + bool powerful = r_ptr->flags2 & RF2_POWERFUL ? TRUE : false; return powerful; } @@ -282,20 +282,20 @@ static void process_monsters_mtimed_aux(player_type *target_ptr, MONSTER_IDX m_i monster_race *r_ptr = &r_info[m_ptr->r_idx]; /* Assume does not wake up */ - bool test = FALSE; + bool test = false; /* Hack -- Require proximity */ if (m_ptr->cdis < AAF_LIMIT) { /* Handle "sensing radius" */ if (m_ptr->cdis <= (is_pet(m_ptr) ? ((r_ptr->aaf > MAX_SIGHT) ? MAX_SIGHT : r_ptr->aaf) : r_ptr->aaf)) { /* We may wake up */ - test = TRUE; + test = true; } /* Handle "sight" and "aggravation" */ else if ((m_ptr->cdis <= MAX_SIGHT) && (player_has_los_bold(target_ptr, m_ptr->fy, m_ptr->fx))) { /* We may wake up */ - test = TRUE; + test = true; } } @@ -654,7 +654,7 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo monster_type exp_mon; /* Innocent until proven otherwise */ - bool innocent = TRUE, thief = FALSE; + bool innocent = TRUE, thief = false; int i; HIT_POINT expdam; @@ -683,7 +683,7 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo /* Genocided by chaos patron */ if (!m_idx) - return TRUE; + return true; m_ptr->hp -= dam; m_ptr->dealt_damage += dam; @@ -772,7 +772,7 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo /* Don't kill Amberites */ if ((r_ptr->flags3 & RF3_AMBERITE) && one_in_(2)) { int curses = 1 + randint1(3); - bool stop_ty = FALSE; + bool stop_ty = false; int count = 0; msg_format(_("%^sは恐ろしい血の呪いをあなたにかけた！", "%^s puts a terrible blood curse on you!"), m_name); @@ -862,16 +862,16 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo for (i = 0; i < 4; i++) { if (r_ptr->blow[i].d_dice != 0) - innocent = FALSE; /* Murderer! */ + innocent = false; /* Murderer! */ if ((r_ptr->blow[i].effect == RBE_EAT_ITEM) || (r_ptr->blow[i].effect == RBE_EAT_GOLD)) - thief = TRUE; /* Thief! */ + thief = true; /* Thief! */ } /* The new law says it is illegal to live in the dungeon */ if (r_ptr->level != 0) - innocent = FALSE; + innocent = false; if (thief) { if (r_ptr->flags1 & RF1_UNIQUE) @@ -918,11 +918,11 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo /* Death by Physical attack -- non-living monster */ else if (!monster_living(m_ptr->r_idx)) { - bool explode = FALSE; + bool explode = false; for (i = 0; i < 4; i++) { if (r_ptr->blow[i].method == RBM_EXPLODE) - explode = TRUE; + explode = true; } /* Special note at death */ @@ -1001,10 +1001,10 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo get_exp_from_mon(target_ptr, (long)exp_mon.max_maxhp * 2, &exp_mon); /* Not afraid */ - (*fear) = FALSE; + (*fear) = false; /* Monster is dead */ - return TRUE; + return true; } /* Mega-Hack -- Pain cancels fear */ @@ -1012,7 +1012,7 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo /* Cure fear */ if (set_monster_monfear(target_ptr, m_idx, monster_fear_remaining(m_ptr) - randint1(dam))) { /* No more fear */ - (*fear) = FALSE; + (*fear) = false; } } @@ -1027,7 +1027,7 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo */ if ((randint1(10) >= percentage) || ((dam >= m_ptr->hp) && (randint0(100) < 80))) { /* Hack -- note fear */ - (*fear) = TRUE; + (*fear) = true; /* Hack -- Add some timed fear */ (void)set_monster_monfear(target_ptr, m_idx, (randint1(10) + (((dam >= m_ptr->hp) && (percentage > 7)) ? 20 : ((11 - percentage) * 5)))); @@ -1035,7 +1035,7 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo } /* Not dead yet */ - return FALSE; + return false; } bool monster_is_valid(monster_type *m_ptr) { return (m_ptr->r_idx != 0); } diff --git a/src/monster/monster-update.cpp b/src/monster/monster-update.cpp index 129953598..6442cca1d 100644 --- a/src/monster/monster-update.cpp +++ b/src/monster/monster-update.cpp @@ -85,7 +85,7 @@ bool update_riding_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, lite_spot(target_ptr, oy, ox); lite_spot(target_ptr, ny, nx); - return TRUE; + return true; } /*! @@ -166,8 +166,8 @@ static um_type *initialize_um_type(player_type *subject_ptr, um_type *um_ptr, MO um_ptr->do_disturb = disturb_move; um_ptr->fy = um_ptr->m_ptr->fy; um_ptr->fx = um_ptr->m_ptr->fx; - um_ptr->flag = FALSE; - um_ptr->easy = FALSE; + um_ptr->flag = false; + um_ptr->easy = false; um_ptr->in_darkness = d_info[subject_ptr->dungeon_idx].flags.has(DF::DARKNESS) && !subject_ptr->see_nocto; um_ptr->full = full; return um_ptr; @@ -211,26 +211,26 @@ static bool update_weird_telepathy(player_type *subject_ptr, um_type *um_ptr, MO { monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx]; if ((r_ptr->flags2 & RF2_WEIRD_MIND) == 0) - return FALSE; + return false; if ((m_idx % 10) != (current_world_ptr->game_turn % 10)) - return TRUE; + return true; - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) { r_ptr->r_flags2 |= RF2_WEIRD_MIND; update_smart_stupid_flags(r_ptr); } - return TRUE; + return true; } static void update_telepathy_sight(player_type *subject_ptr, um_type *um_ptr, MONSTER_IDX m_idx) { monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx]; if (subject_ptr->special_defense & KATA_MUSOU) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) update_smart_stupid_flags(r_ptr); @@ -251,7 +251,7 @@ static void update_telepathy_sight(player_type *subject_ptr, um_type *um_ptr, MO if (update_weird_telepathy(subject_ptr, um_ptr, m_idx)) return; - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) update_smart_stupid_flags(r_ptr); @@ -261,84 +261,84 @@ static void update_specific_race_telepathy(player_type *subject_ptr, um_type *um { monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx]; if ((subject_ptr->esp_animal) && (r_ptr->flags3 & RF3_ANIMAL)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_ANIMAL; } if ((subject_ptr->esp_undead) && (r_ptr->flags3 & RF3_UNDEAD)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_UNDEAD; } if ((subject_ptr->esp_demon) && (r_ptr->flags3 & RF3_DEMON)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_DEMON; } if ((subject_ptr->esp_orc) && (r_ptr->flags3 & RF3_ORC)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_ORC; } if ((subject_ptr->esp_troll) && (r_ptr->flags3 & RF3_TROLL)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_TROLL; } if ((subject_ptr->esp_giant) && (r_ptr->flags3 & RF3_GIANT)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_GIANT; } if ((subject_ptr->esp_dragon) && (r_ptr->flags3 & RF3_DRAGON)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_DRAGON; } if ((subject_ptr->esp_human) && (r_ptr->flags2 & RF2_HUMAN)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags2 |= RF2_HUMAN; } if ((subject_ptr->esp_evil) && (r_ptr->flags3 & RF3_EVIL)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_EVIL; } if ((subject_ptr->esp_good) && (r_ptr->flags3 & RF3_GOOD)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_GOOD; } if ((subject_ptr->esp_nonliving) && ((r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)) == RF3_NONLIVING)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags3 |= RF3_NONLIVING; } if ((subject_ptr->esp_unique) && (r_ptr->flags1 & RF1_UNIQUE)) { - um_ptr->flag = TRUE; + um_ptr->flag = true; um_ptr->m_ptr->mflag.set(MFLAG::ESP); if (is_original_ap(um_ptr->m_ptr) && !subject_ptr->image) r_ptr->r_flags1 |= RF1_UNIQUE; @@ -348,34 +348,34 @@ static void update_specific_race_telepathy(player_type *subject_ptr, um_type *um static bool check_cold_blood(player_type *subject_ptr, um_type *um_ptr, const POSITION distance) { if (distance > subject_ptr->see_infra) - return FALSE; + return false; monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx]; if ((r_ptr->flags2 & (RF2_COLD_BLOOD | RF2_AURA_FIRE)) == RF2_COLD_BLOOD) - return FALSE; + return false; - um_ptr->easy = TRUE; - um_ptr->flag = TRUE; - return TRUE; + um_ptr->easy = true; + um_ptr->flag = true; + return true; } static bool check_invisible(player_type *subject_ptr, um_type *um_ptr) { if (!player_can_see_bold(subject_ptr, um_ptr->fy, um_ptr->fx)) - return FALSE; + return false; monster_race *r_ptr = &r_info[um_ptr->m_ptr->r_idx]; if (r_ptr->flags2 & RF2_INVISIBLE) { if (subject_ptr->see_inv) { - um_ptr->easy = TRUE; - um_ptr->flag = TRUE; + um_ptr->easy = true; + um_ptr->flag = true; } } else { - um_ptr->easy = TRUE; - um_ptr->flag = TRUE; + um_ptr->easy = true; + um_ptr->flag = true; } - return TRUE; + return true; } /*! @@ -402,8 +402,8 @@ static void decide_sight_invisible_monster(player_type *subject_ptr, um_type *um return; if (subject_ptr->concent >= CONCENT_RADAR_THRESHOLD) { - um_ptr->easy = TRUE; - um_ptr->flag = TRUE; + um_ptr->easy = true; + um_ptr->flag = true; } bool do_cold_blood = check_cold_blood(subject_ptr, um_ptr, distance); @@ -431,7 +431,7 @@ static void update_invisible_monster(player_type *subject_ptr, um_type *um_ptr, if (um_ptr->m_ptr->ml) return; - um_ptr->m_ptr->ml = TRUE; + um_ptr->m_ptr->ml = true; lite_spot(subject_ptr, um_ptr->fy, um_ptr->fx); if (subject_ptr->health_who == m_idx) @@ -465,7 +465,7 @@ static void update_visible_monster(player_type *subject_ptr, um_type *um_ptr, MO if (!um_ptr->m_ptr->ml) return; - um_ptr->m_ptr->ml = FALSE; + um_ptr->m_ptr->ml = false; lite_spot(subject_ptr, um_ptr->fy, um_ptr->fx); if (subject_ptr->health_who == m_idx) @@ -481,7 +481,7 @@ static void update_visible_monster(player_type *subject_ptr, um_type *um_ptr, MO static bool update_clear_monster(player_type *subject_ptr, um_type *um_ptr) { if (!um_ptr->easy) - return FALSE; + return false; if (um_ptr->m_ptr->mflag.has_not(MFLAG::VIEW)) { um_ptr->m_ptr->mflag.set(MFLAG::VIEW); @@ -489,7 +489,7 @@ static bool update_clear_monster(player_type *subject_ptr, um_type *um_ptr) disturb(subject_ptr, TRUE, TRUE); } - return TRUE; + return true; } /*! @@ -504,11 +504,11 @@ void update_monster(player_type *subject_ptr, MONSTER_IDX m_idx, bool full) if (disturb_high) { monster_race *ap_r_ptr = &r_info[um_ptr->m_ptr->ap_r_idx]; if (ap_r_ptr->r_tkills && ap_r_ptr->level >= subject_ptr->lev) - um_ptr->do_disturb = TRUE; + um_ptr->do_disturb = true; } if (um_ptr->m_ptr->mflag2.has(MFLAG2::MARK)) - um_ptr->flag = TRUE; + um_ptr->flag = true; decide_sight_invisible_monster(subject_ptr, um_ptr, m_idx); if (um_ptr->flag) diff --git a/src/monster/monster-util.cpp b/src/monster/monster-util.cpp index adbe913e8..965ceefcc 100644 --- a/src/monster/monster-util.cpp +++ b/src/monster/monster-util.cpp @@ -59,179 +59,179 @@ static bool restrict_monster_to_dungeon(player_type *player_ptr, MONRACE_IDX r_i if (d_ptr->flags.has(DF::CHAMELEON)) { if (chameleon_change_m_idx) - return TRUE; + return true; } if (d_ptr->flags.has(DF::NO_MAGIC)) { if (r_idx != MON_CHAMELEON && r_ptr->freq_spell && r_ptr->ability_flags.has_none_of(RF_ABILITY_NOMAGIC_MASK)) - return FALSE; + return false; } if (d_ptr->flags.has(DF::NO_MELEE)) { if (r_idx == MON_CHAMELEON) - return TRUE; + return true; if (r_ptr->ability_flags.has_none_of(RF_ABILITY_BOLT_MASK | RF_ABILITY_BEAM_MASK | RF_ABILITY_BALL_MASK) && r_ptr->ability_flags.has_none_of( { RF_ABILITY::CAUSE_1, RF_ABILITY::CAUSE_2, RF_ABILITY::CAUSE_3, RF_ABILITY::CAUSE_4, RF_ABILITY::MIND_BLAST, RF_ABILITY::BRAIN_SMASH })) - return FALSE; + return false; } floor_type *floor_ptr = player_ptr->current_floor_ptr; if (d_ptr->flags.has(DF::BEGINNER)) { if (r_ptr->level > floor_ptr->dun_level) - return FALSE; + return false; } if (d_ptr->special_div >= 64) - return TRUE; + return true; if (summon_specific_type && d_ptr->flags.has_not(DF::CHAMELEON)) - return TRUE; + return true; byte a; switch (d_ptr->mode) { case DUNGEON_MODE_AND: { if (d_ptr->mflags1) { if ((d_ptr->mflags1 & r_ptr->flags1) != d_ptr->mflags1) - return FALSE; + return false; } if (d_ptr->mflags2) { if ((d_ptr->mflags2 & r_ptr->flags2) != d_ptr->mflags2) - return FALSE; + return false; } if (d_ptr->mflags3) { if ((d_ptr->mflags3 & r_ptr->flags3) != d_ptr->mflags3) - return FALSE; + return false; } if (d_ptr->m_ability_flags.any()) { if (!r_ptr->ability_flags.has_all_of(d_ptr->m_ability_flags)) - return FALSE; + return false; } if (d_ptr->mflags7) { if ((d_ptr->mflags7 & r_ptr->flags7) != d_ptr->mflags7) - return FALSE; + return false; } if (d_ptr->mflags8) { if ((d_ptr->mflags8 & r_ptr->flags8) != d_ptr->mflags8) - return FALSE; + return false; } if (d_ptr->mflags9) { if ((d_ptr->mflags9 & r_ptr->flags9) != d_ptr->mflags9) - return FALSE; + return false; } if (d_ptr->mflagsr) { if ((d_ptr->mflagsr & r_ptr->flagsr) != d_ptr->mflagsr) - return FALSE; + return false; } for (a = 0; a < 5; a++) if (d_ptr->r_char[a] && (d_ptr->r_char[a] != r_ptr->d_char)) - return FALSE; + return false; - return TRUE; + return true; } case DUNGEON_MODE_NAND: { if (d_ptr->mflags1) { if ((d_ptr->mflags1 & r_ptr->flags1) != d_ptr->mflags1) - return TRUE; + return true; } if (d_ptr->mflags2) { if ((d_ptr->mflags2 & r_ptr->flags2) != d_ptr->mflags2) - return TRUE; + return true; } if (d_ptr->mflags3) { if ((d_ptr->mflags3 & r_ptr->flags3) != d_ptr->mflags3) - return TRUE; + return true; } if (d_ptr->m_ability_flags.any()) { if (!r_ptr->ability_flags.has_all_of(d_ptr->m_ability_flags)) - return TRUE; + return true; } if (d_ptr->mflags7) { if ((d_ptr->mflags7 & r_ptr->flags7) != d_ptr->mflags7) - return TRUE; + return true; } if (d_ptr->mflags8) { if ((d_ptr->mflags8 & r_ptr->flags8) != d_ptr->mflags8) - return TRUE; + return true; } if (d_ptr->mflags9) { if ((d_ptr->mflags9 & r_ptr->flags9) != d_ptr->mflags9) - return TRUE; + return true; } if (d_ptr->mflagsr) { if ((d_ptr->mflagsr & r_ptr->flagsr) != d_ptr->mflagsr) - return TRUE; + return true; } for (a = 0; a < 5; a++) if (d_ptr->r_char[a] && (d_ptr->r_char[a] != r_ptr->d_char)) - return TRUE; + return true; - return FALSE; + return false; } case DUNGEON_MODE_OR: { if (r_ptr->flags1 & d_ptr->mflags1) - return TRUE; + return true; if (r_ptr->flags2 & d_ptr->mflags2) - return TRUE; + return true; if (r_ptr->flags3 & d_ptr->mflags3) - return TRUE; + return true; if (r_ptr->ability_flags.has_any_of(d_ptr->m_ability_flags)) - return TRUE; + return true; if (r_ptr->flags7 & d_ptr->mflags7) - return TRUE; + return true; if (r_ptr->flags8 & d_ptr->mflags8) - return TRUE; + return true; if (r_ptr->flags9 & d_ptr->mflags9) - return TRUE; + return true; if (r_ptr->flagsr & d_ptr->mflagsr) - return TRUE; + return true; for (a = 0; a < 5; a++) if (d_ptr->r_char[a] == r_ptr->d_char) - return TRUE; + return true; - return FALSE; + return false; } case DUNGEON_MODE_NOR: { if (r_ptr->flags1 & d_ptr->mflags1) - return FALSE; + return false; if (r_ptr->flags2 & d_ptr->mflags2) - return FALSE; + return false; if (r_ptr->flags3 & d_ptr->mflags3) - return FALSE; + return false; if (r_ptr->ability_flags.has_any_of(d_ptr->m_ability_flags)) - return FALSE; + return false; if (r_ptr->flags7 & d_ptr->mflags7) - return FALSE; + return false; if (r_ptr->flags8 & d_ptr->mflags8) - return FALSE; + return false; if (r_ptr->flags9 & d_ptr->mflags9) - return FALSE; + return false; if (r_ptr->flagsr & d_ptr->mflagsr) - return FALSE; + return false; for (a = 0; a < 5; a++) if (d_ptr->r_char[a] == r_ptr->d_char) - return FALSE; + return false; - return TRUE; + return true; } } - return TRUE; + return true; } /*! diff --git a/src/mspell/mspell-attack.cpp b/src/mspell/mspell-attack.cpp index 656af9dce..004a76f0b 100644 --- a/src/mspell/mspell-attack.cpp +++ b/src/mspell/mspell-attack.cpp @@ -86,7 +86,7 @@ static void check_mspell_arena(player_type *target_ptr, msa_type *msa_ptr) static bool check_mspell_non_stupid(player_type *target_ptr, msa_type *msa_ptr) { if ((msa_ptr->r_ptr->flags2 & RF2_STUPID) != 0) - return TRUE; + return true; if (!target_ptr->csp) msa_ptr->ability_flags.reset(RF_ABILITY::DRAIN_MANA); @@ -138,41 +138,41 @@ static bool switch_do_spell(player_type *target_ptr, msa_type *msa_ptr) break; } - return TRUE; + return true; } case DO_SPELL_BR_LITE: msa_ptr->thrown_spell = RF_ABILITY::BR_LITE; - return TRUE; + return true; case DO_SPELL_BR_DISI: msa_ptr->thrown_spell = RF_ABILITY::BR_DISI; - return TRUE; + return true; case DO_SPELL_BA_LITE: msa_ptr->thrown_spell = RF_ABILITY::BA_LITE; - return TRUE; + return true; default: - return FALSE; + return false; } } static bool check_mspell_continuation(player_type *target_ptr, msa_type *msa_ptr) { if (msa_ptr->ability_flags.none()) - return FALSE; + return false; remove_bad_spells(msa_ptr->m_idx, target_ptr, msa_ptr->ability_flags); check_mspell_arena(target_ptr, msa_ptr); if (msa_ptr->ability_flags.none() || !check_mspell_non_stupid(target_ptr, msa_ptr)) - return FALSE; + return false; set_mspell_list(msa_ptr); if (msa_ptr->mspells.empty() || !target_ptr->playing || target_ptr->is_dead || target_ptr->leaving) - return FALSE; + return false; describe_mspell_monster(target_ptr, msa_ptr); if (!switch_do_spell(target_ptr, msa_ptr) || (msa_ptr->thrown_spell == RF_ABILITY::MAX)) - return FALSE; + return false; - return TRUE; + return true; } static bool check_mspell_unexploded(player_type *target_ptr, msa_type *msa_ptr) @@ -185,15 +185,15 @@ static bool check_mspell_unexploded(player_type *target_ptr, msa_type *msa_ptr) && (msa_ptr->in_no_magic_dungeon || (monster_stunned_remaining(msa_ptr->m_ptr) && one_in_(2)) || (randint0(100) < fail_rate))) { disturb(target_ptr, TRUE, TRUE); msg_format(_("%^sは呪文を唱えようとしたが失敗した。", "%^s tries to cast a spell, but fails."), msa_ptr->m_name); - return TRUE; + return true; } if (!spell_is_inate(msa_ptr->thrown_spell) && magic_barrier(target_ptr, msa_ptr->m_idx)) { msg_format(_("反魔法バリアが%^sの呪文をかき消した。", "Anti magic barrier cancels the spell which %^s casts."), msa_ptr->m_name); - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -210,7 +210,7 @@ static bool check_thrown_mspell(player_type *target_ptr, msa_type *msa_ptr) // ターゲットがプレイヤー位置なら直接射線が通っているので常に届く。 bool direct = player_bold(target_ptr, msa_ptr->y, msa_ptr->x); if (direct) - return TRUE; + return true; // ターゲットがプレイヤー位置からずれているとき、直接の射線を必要とする特技 // (ボルト系など)は届かないものとみなす。 @@ -246,9 +246,9 @@ static bool check_thrown_mspell(player_type *target_ptr, msa_type *msa_ptr) case RF_ABILITY::PSY_SPEAR: case RF_ABILITY::DARKNESS: case RF_ABILITY::FORGET: - return FALSE; + return false; default: - return TRUE; + return true; } } @@ -274,7 +274,7 @@ static void check_mspell_imitation(player_type *target_ptr, msa_type *msa_ptr) target_ptr->mane_spell[target_ptr->mane_num] = msa_ptr->thrown_spell; target_ptr->mane_dam[target_ptr->mane_num] = msa_ptr->dam; target_ptr->mane_num++; - target_ptr->new_mane = TRUE; + target_ptr->new_mane = true; target_ptr->redraw |= PR_IMITATION; } @@ -301,16 +301,16 @@ bool make_attack_spell(player_type *target_ptr, MONSTER_IDX m_idx) msa_type *msa_ptr = initialize_msa_type(target_ptr, &tmp_msa, m_idx); if (monster_confused_remaining(msa_ptr->m_ptr)) { reset_target(msa_ptr->m_ptr); - return FALSE; + return false; } if (msa_ptr->m_ptr->mflag.has(MFLAG::PREVENT_MAGIC) || !is_hostile(msa_ptr->m_ptr) || ((msa_ptr->m_ptr->cdis > get_max_range(target_ptr)) && !msa_ptr->m_ptr->target_y)) - return FALSE; + return false; decide_lite_range(target_ptr, msa_ptr); if (!decide_lite_projection(target_ptr, msa_ptr)) - return FALSE; + return false; reset_target(msa_ptr->m_ptr); msa_ptr->rlev = ((msa_ptr->r_ptr->level >= 1) ? msa_ptr->r_ptr->level : 1); @@ -319,19 +319,19 @@ bool make_attack_spell(player_type *target_ptr, MONSTER_IDX m_idx) check_mspell_stupid(target_ptr, msa_ptr); check_mspell_smart(target_ptr, msa_ptr); if (!check_mspell_continuation(target_ptr, msa_ptr)) - return FALSE; + return false; if (check_mspell_unexploded(target_ptr, msa_ptr)) - return TRUE; + return true; // 特技がプレイヤーに届かないなら使わない。 if (!check_thrown_mspell(target_ptr, msa_ptr)) - return FALSE; + return false; // 特技を使う。 const auto monspell_res = monspell_to_player(target_ptr, msa_ptr->thrown_spell, msa_ptr->y, msa_ptr->x, m_idx); if (!monspell_res.valid) - return FALSE; + return false; msa_ptr->dam = monspell_res.dam; check_mspell_imitation(target_ptr, msa_ptr); @@ -339,5 +339,5 @@ bool make_attack_spell(player_type *target_ptr, MONSTER_IDX m_idx) if (target_ptr->is_dead && (msa_ptr->r_ptr->r_deaths < MAX_SHORT) && !target_ptr->current_floor_ptr->inside_arena) msa_ptr->r_ptr->r_deaths++; - return TRUE; + return true; } diff --git a/src/mspell/mspell-breath.cpp b/src/mspell/mspell-breath.cpp index 74d255352..e985fe6f8 100644 --- a/src/mspell/mspell-breath.cpp +++ b/src/mspell/mspell-breath.cpp @@ -28,20 +28,20 @@ static bool spell_RF4_BREATH_special_message(MONSTER_IDX r_idx, int GF_TYPE, con { if (r_idx == MON_JAIAN && GF_TYPE == GF_SOUND) { msg_format(_("%^s「ボォエ～～～～～～」", "%^s sings, 'Booooeeeeee'"), m_name); - return TRUE; + return true; } if (r_idx == MON_BOTEI && GF_TYPE == GF_SHARDS) { msg_format(_("%^s「ボ帝ビルカッター！！！」", "%^s shouts, 'Boty-Build cutter!!!'"), m_name); - return TRUE; + return true; } if (r_idx == MON_RAOU &&GF_TYPE == GF_FORCE) { if (one_in_(2)) msg_format(_("%^s「北斗剛掌波！！」", "%^s says, 'Hokuto Goh-Sho-Ha!!'"), m_name); else msg_format(_("%^s「受けてみい！！天将奔烈！！！」", "%^s says, 'Tensho-Honretsu!!'"), m_name); - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -60,7 +60,7 @@ MonsterSpellResult spell_RF4_BREATH(player_type *target_ptr, int GF_TYPE, POSITI { HIT_POINT dam, drs_type = 0; concptr type_s; - bool smart_learn_aux = TRUE; + bool smart_learn_aux = true; floor_type *floor_ptr = target_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; bool known = monster_near_player(floor_ptr, m_idx, t_idx); @@ -140,17 +140,17 @@ MonsterSpellResult spell_RF4_BREATH(player_type *target_ptr, int GF_TYPE, POSITI case GF_TIME: dam = monspell_damage(target_ptr, RF_ABILITY::BR_TIME, m_idx, DAM_ROLL); type_s = _("時間逆転", "time"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; case GF_INERTIAL: dam = monspell_damage(target_ptr, RF_ABILITY::BR_INER, m_idx, DAM_ROLL); type_s = _("遅鈍", "inertia"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; case GF_GRAVITY: dam = monspell_damage(target_ptr, RF_ABILITY::BR_GRAV, m_idx, DAM_ROLL); type_s = _("重力", "gravity"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; case GF_SHARDS: dam = monspell_damage(target_ptr, RF_ABILITY::BR_SHAR, m_idx, DAM_ROLL); @@ -160,17 +160,17 @@ MonsterSpellResult spell_RF4_BREATH(player_type *target_ptr, int GF_TYPE, POSITI case GF_PLASMA: dam = monspell_damage(target_ptr, RF_ABILITY::BR_PLAS, m_idx, DAM_ROLL); type_s = _("プラズマ", "plasma"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; case GF_FORCE: dam = monspell_damage(target_ptr, RF_ABILITY::BR_FORC, m_idx, DAM_ROLL); type_s = _("フォース", "force"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; case GF_MANA: dam = monspell_damage(target_ptr, RF_ABILITY::BR_MANA, m_idx, DAM_ROLL); type_s = _("魔力", "mana"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; case GF_NUKE: dam = monspell_damage(target_ptr, RF_ABILITY::BR_NUKE, m_idx, DAM_ROLL); @@ -180,13 +180,13 @@ MonsterSpellResult spell_RF4_BREATH(player_type *target_ptr, int GF_TYPE, POSITI case GF_DISINTEGRATE: dam = monspell_damage(target_ptr, RF_ABILITY::BR_DISI, m_idx, DAM_ROLL); type_s = _("分解", "disintegration"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; default: /* Do not reach here */ dam = 0; type_s = _("不明", "Unknown"); - smart_learn_aux = FALSE; + smart_learn_aux = false; break; } @@ -207,7 +207,7 @@ MonsterSpellResult spell_RF4_BREATH(player_type *target_ptr, int GF_TYPE, POSITI } if (mon_to_mon && known && !see_either) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; sound(SOUND_BREATH); const auto proj_res = breath(target_ptr, y, x, m_idx, GF_TYPE, dam, 0, TRUE, TARGET_TYPE); diff --git a/src/mspell/mspell-checker.cpp b/src/mspell/mspell-checker.cpp index 4b7b20d53..bcd0f1674 100644 --- a/src/mspell/mspell-checker.cpp +++ b/src/mspell/mspell-checker.cpp @@ -81,11 +81,11 @@ bool summon_possible(player_type *target_ptr, POSITION y1, POSITION x1) continue; if (is_cave_empty_bold(target_ptr, y, x) && projectable(target_ptr, y1, x1, y, x) && projectable(target_ptr, y, x, y1, x1)) - return TRUE; + return true; } } - return FALSE; + return false; } /*! @@ -115,13 +115,13 @@ bool raise_possible(player_type *target_ptr, monster_type *m_ptr) object_type *o_ptr = &floor_ptr->o_list[this_o_idx]; if (o_ptr->tval == TV_CORPSE) { if (!monster_has_hostile_align(target_ptr, m_ptr, 0, 0, &r_info[o_ptr->pval])) - return TRUE; + return true; } } } } - return FALSE; + return false; } /*! @@ -150,12 +150,12 @@ bool clean_shot(player_type *target_ptr, POSITION y1, POSITION x1, POSITION y2, u16b grid_g[512]; int grid_n = projection_path(target_ptr, grid_g, get_max_range(target_ptr), y1, x1, y2, x2, 0); if (!grid_n) - return FALSE; + return false; POSITION y = get_grid_y(grid_g[grid_n - 1]); POSITION x = get_grid_x(grid_g[grid_n - 1]); if ((y != y2) || (x != x2)) - return FALSE; + return false; for (int i = 0; i < grid_n; i++) { y = get_grid_y(grid_g[i]); @@ -164,15 +164,15 @@ bool clean_shot(player_type *target_ptr, POSITION y1, POSITION x1, POSITION y2, if ((floor_ptr->grid_array[y][x].m_idx > 0) && !((y == y2) && (x == x2))) { monster_type *m_ptr = &floor_ptr->m_list[floor_ptr->grid_array[y][x].m_idx]; if (is_friend == is_pet(m_ptr)) { - return FALSE; + return false; } } if (player_bold(target_ptr, y, x) && is_friend) - return FALSE; + return false; } - return TRUE; + return true; } /*! diff --git a/src/mspell/mspell-curse.cpp b/src/mspell/mspell-curse.cpp index e2ece00e1..a7e08f7c9 100644 --- a/src/mspell/mspell-curse.cpp +++ b/src/mspell/mspell-curse.cpp @@ -52,7 +52,7 @@ static MonsterSpellResult spell_RF5_CAUSE(player_type *target_ptr, int GF_TYPE, if (see_monster(target_ptr, m_idx)) { msg_format(msg3, m_name, t_name); } else { - target_ptr->current_floor_ptr->monster_noise = TRUE; + target_ptr->current_floor_ptr->monster_noise = true; } } diff --git a/src/mspell/mspell-damage-calculator.cpp b/src/mspell/mspell-damage-calculator.cpp index b93ae9a13..8c8790f43 100644 --- a/src/mspell/mspell-damage-calculator.cpp +++ b/src/mspell/mspell-damage-calculator.cpp @@ -474,7 +474,7 @@ HIT_POINT monspell_race_damage(player_type *target_ptr, RF_ABILITY ms_type, MONR { monster_race *r_ptr = &r_info[r_idx]; DEPTH rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1); - bool powerful = r_ptr->flags2 & RF2_POWERFUL ? TRUE : FALSE; + bool powerful = r_ptr->flags2 & RF2_POWERFUL ? TRUE : false; HIT_POINT hp = r_ptr->hdice * (ironman_nightmare ? 2 : 1) * r_ptr->hside; int shoot_dd, shoot_ds; diff --git a/src/mspell/mspell-floor.cpp b/src/mspell/mspell-floor.cpp index fb31e6acf..073e56951 100644 --- a/src/mspell/mspell-floor.cpp +++ b/src/mspell/mspell-floor.cpp @@ -179,7 +179,7 @@ MonsterSpellResult spell_RF6_TELE_TO(player_type *target_ptr, MONSTER_IDX m_idx, if (TARGET_TYPE != MONSTER_TO_MONSTER) return res; - bool resists_tele = FALSE; + bool resists_tele = false; GAME_TEXT t_name[MAX_NLEN]; monster_name(target_ptr, t_idx, t_name); @@ -190,14 +190,14 @@ MonsterSpellResult spell_RF6_TELE_TO(player_type *target_ptr, MONSTER_IDX m_idx, if (see_monster(target_ptr, t_idx)) { msg_format(_("%^sには効果がなかった。", "%^s is unaffected!"), t_name); } - resists_tele = TRUE; + resists_tele = true; } else if (tr_ptr->level > randint1(100)) { if (is_original_ap_and_seen(target_ptr, t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; if (see_monster(target_ptr, t_idx)) { msg_format(_("%^sは耐性を持っている！", "%^s resists!"), t_name); } - resists_tele = TRUE; + resists_tele = true; } } @@ -253,7 +253,7 @@ MonsterSpellResult spell_RF6_TELE_AWAY(player_type *target_ptr, MONSTER_IDX m_id if (TARGET_TYPE != MONSTER_TO_MONSTER) return res; - bool resists_tele = FALSE; + bool resists_tele = false; GAME_TEXT t_name[MAX_NLEN]; monster_name(target_ptr, t_idx, t_name); @@ -264,14 +264,14 @@ MonsterSpellResult spell_RF6_TELE_AWAY(player_type *target_ptr, MONSTER_IDX m_id if (see_monster(target_ptr, t_idx)) { msg_format(_("%^sには効果がなかった。", "%^s is unaffected!"), t_name); } - resists_tele = TRUE; + resists_tele = true; } else if (tr_ptr->level > randint1(100)) { if (is_original_ap_and_seen(target_ptr, t_ptr)) tr_ptr->r_flagsr |= RFR_RES_TELE; if (see_monster(target_ptr, t_idx)) { msg_format(_("%^sは耐性を持っている！", "%^s resists!"), t_name); } - resists_tele = TRUE; + resists_tele = true; } } @@ -356,17 +356,17 @@ MonsterSpellResult spell_RF6_DARKNESS(player_type *target_ptr, POSITION y, POSIT monster_type *m_ptr = &floor_ptr->m_list[m_idx]; monster_type *t_ptr = &floor_ptr->m_list[t_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - bool can_use_lite_area = FALSE; + bool can_use_lite_area = false; bool monster_to_monster = TARGET_TYPE == MONSTER_TO_MONSTER; bool monster_to_player = TARGET_TYPE == MONSTER_TO_PLAYER; GAME_TEXT t_name[MAX_NLEN]; monster_name(target_ptr, t_idx, t_name); if ((target_ptr->pclass == CLASS_NINJA) && !(r_ptr->flags3 & (RF3_UNDEAD | RF3_HURT_LITE)) && !(r_ptr->flags7 & RF7_DARK_MASK)) - can_use_lite_area = TRUE; + can_use_lite_area = true; if (monster_to_monster && !is_hostile(t_ptr)) - can_use_lite_area = FALSE; + can_use_lite_area = false; auto res = MonsterSpellResult::make_valid(); res.learnable = monster_to_player && !can_use_lite_area; diff --git a/src/mspell/mspell-judgement.cpp b/src/mspell/mspell-judgement.cpp index 075a576e5..8975001e3 100644 --- a/src/mspell/mspell-judgement.cpp +++ b/src/mspell/mspell-judgement.cpp @@ -54,9 +54,9 @@ bool direct_beam(player_type *target_ptr, POSITION y1, POSITION x1, POSITION y2, u16b grid_g[512]; int grid_n = projection_path(target_ptr, grid_g, get_max_range(target_ptr), y1, x1, y2, x2, PROJECT_THRU); if (!grid_n) - return FALSE; + return false; - bool hit2 = FALSE; + bool hit2 = false; POSITION y, x; bool is_friend = is_pet(m_ptr); for (int i = 0; i < grid_n; i++) { @@ -64,18 +64,18 @@ bool direct_beam(player_type *target_ptr, POSITION y1, POSITION x1, POSITION y2, x = get_grid_x(grid_g[i]); if (y == y2 && x == x2) - hit2 = TRUE; + hit2 = true; else if (is_friend && floor_ptr->grid_array[y][x].m_idx > 0 && !are_enemies(target_ptr, m_ptr, &floor_ptr->m_list[floor_ptr->grid_array[y][x].m_idx])) { - return FALSE; + return false; } if (is_friend && player_bold(target_ptr, y, x)) - return FALSE; + return false; } if (!hit2) - return FALSE; - return TRUE; + return false; + return true; } /*! @@ -131,25 +131,25 @@ bool breath_direct(player_type *master_ptr, POSITION y1, POSITION x1, POSITION y } grid_n = i; - bool hit2 = FALSE; - bool hityou = FALSE; + bool hit2 = false; + bool hityou = false; if (!grid_n) { if (flg & PROJECT_DISI) { if (in_disintegration_range(master_ptr->current_floor_ptr, y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) - hit2 = TRUE; + hit2 = true; if (in_disintegration_range(master_ptr->current_floor_ptr, y1, x1, master_ptr->y, master_ptr->x) && (distance(y1, x1, master_ptr->y, master_ptr->x) <= rad)) - hityou = TRUE; + hityou = true; } else if (flg & PROJECT_LOS) { if (los(master_ptr, y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) - hit2 = TRUE; + hit2 = true; if (los(master_ptr, y1, x1, master_ptr->y, master_ptr->x) && (distance(y1, x1, master_ptr->y, master_ptr->x) <= rad)) - hityou = TRUE; + hityou = true; } else { if (projectable(master_ptr, y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) - hit2 = TRUE; + hit2 = true; if (projectable(master_ptr, y1, x1, master_ptr->y, master_ptr->x) && (distance(y1, x1, master_ptr->y, master_ptr->x) <= rad)) - hityou = TRUE; + hityou = true; } } else { int grids = 0; @@ -161,18 +161,18 @@ bool breath_direct(player_type *master_ptr, POSITION y1, POSITION x1, POSITION y y = gy[i]; x = gx[i]; if ((y == y2) && (x == x2)) - hit2 = TRUE; + hit2 = true; if (player_bold(master_ptr, y, x)) - hityou = TRUE; + hityou = true; } } if (!hit2) - return FALSE; + return false; if (is_friend && hityou) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -214,15 +214,15 @@ bool dispel_check_monster(player_type *target_ptr, MONSTER_IDX m_idx, MONSTER_ID { monster_type *t_ptr = &target_ptr->current_floor_ptr->m_list[t_idx]; if (monster_invulner_remaining(t_ptr)) - return TRUE; + return true; if ((t_ptr->mspeed < 135) && monster_fast_remaining(t_ptr)) - return TRUE; + return true; if ((t_idx == target_ptr->riding) && dispel_check(target_ptr, m_idx)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -234,103 +234,103 @@ bool dispel_check_monster(player_type *target_ptr, MONSTER_IDX m_idx, MONSTER_ID bool dispel_check(player_type *creature_ptr, MONSTER_IDX m_idx) { if (is_invuln(creature_ptr)) - return TRUE; + return true; if (creature_ptr->wraith_form) - return TRUE; + return true; if (creature_ptr->shield) - return TRUE; + return true; if (creature_ptr->magicdef) - return TRUE; + return true; if (creature_ptr->multishadow) - return TRUE; + return true; if (creature_ptr->dustrobe) - return TRUE; + return true; if (creature_ptr->shero && (creature_ptr->pclass != CLASS_BERSERKER)) - return TRUE; + return true; if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) - return TRUE; + return true; monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (r_ptr->ability_flags.has(RF_ABILITY::BR_ACID)) { if (!has_immune_acid(creature_ptr) && (creature_ptr->oppose_acid || music_singing(creature_ptr, MUSIC_RESIST))) - return TRUE; + return true; if (creature_ptr->special_defense & DEFENSE_ACID) - return TRUE; + return true; } if (r_ptr->ability_flags.has(RF_ABILITY::BR_FIRE)) { if (!((creature_ptr->prace == RACE_BALROG) && creature_ptr->lev > 44)) { if (!has_immune_fire(creature_ptr) && (creature_ptr->oppose_fire || music_singing(creature_ptr, MUSIC_RESIST))) - return TRUE; + return true; if (creature_ptr->special_defense & DEFENSE_FIRE) - return TRUE; + return true; } } if (r_ptr->ability_flags.has(RF_ABILITY::BR_ELEC)) { if (!has_immune_elec(creature_ptr) && (creature_ptr->oppose_elec || music_singing(creature_ptr, MUSIC_RESIST))) - return TRUE; + return true; if (creature_ptr->special_defense & DEFENSE_ELEC) - return TRUE; + return true; } if (r_ptr->ability_flags.has(RF_ABILITY::BR_COLD)) { if (!has_immune_cold(creature_ptr) && (creature_ptr->oppose_cold || music_singing(creature_ptr, MUSIC_RESIST))) - return TRUE; + return true; if (creature_ptr->special_defense & DEFENSE_COLD) - return TRUE; + return true; } if (r_ptr->ability_flags.has_any_of({ RF_ABILITY::BR_POIS, RF_ABILITY::BR_NUKE }) && !((creature_ptr->pclass == CLASS_NINJA) && (creature_ptr->lev > 44))) { if (creature_ptr->oppose_pois || music_singing(creature_ptr, MUSIC_RESIST)) - return TRUE; + return true; if (creature_ptr->special_defense & DEFENSE_POIS) - return TRUE; + return true; } if (creature_ptr->ult_res) - return TRUE; + return true; if (creature_ptr->tsuyoshi) - return TRUE; + return true; if ((creature_ptr->special_attack & ATTACK_ACID) && !(r_ptr->flagsr & RFR_EFF_IM_ACID_MASK)) - return TRUE; + return true; if ((creature_ptr->special_attack & ATTACK_FIRE) && !(r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK)) - return TRUE; + return true; if ((creature_ptr->special_attack & ATTACK_ELEC) && !(r_ptr->flagsr & RFR_EFF_IM_ELEC_MASK)) - return TRUE; + return true; if ((creature_ptr->special_attack & ATTACK_COLD) && !(r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)) - return TRUE; + return true; if ((creature_ptr->special_attack & ATTACK_POIS) && !(r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)) - return TRUE; + return true; if ((creature_ptr->pspeed < 145) && is_fast(creature_ptr)) - return TRUE; + return true; if (creature_ptr->lightspeed && (m_ptr->mspeed < 136)) - return TRUE; + return true; if (creature_ptr->riding && (creature_ptr->current_floor_ptr->m_list[creature_ptr->riding].mspeed < 135) && monster_fast_remaining(&creature_ptr->current_floor_ptr->m_list[creature_ptr->riding])) - return TRUE; + return true; - return FALSE; + return false; } diff --git a/src/mspell/mspell-lite.cpp b/src/mspell/mspell-lite.cpp index a7a09c1f3..e4fc53dfb 100644 --- a/src/mspell/mspell-lite.cpp +++ b/src/mspell/mspell-lite.cpp @@ -63,11 +63,11 @@ bool adjacent_grid_check(player_type *target_ptr, monster_type *m_ptr, POSITION if (path_check(target_ptr, m_ptr->fy, m_ptr->fx, next_y, next_x)) { *yp = next_y; *xp = next_x; - return TRUE; + return true; } } - return FALSE; + return false; } void decide_lite_range(player_type *target_ptr, msa_type *msa_ptr) @@ -112,14 +112,14 @@ static void check_lite_area_by_mspell(player_type *target_ptr, msa_type *msa_ptr && in_disintegration_range(target_ptr->current_floor_ptr, msa_ptr->m_ptr->fy, msa_ptr->m_ptr->fx, msa_ptr->y, msa_ptr->x) && (one_in_(10) || (projectable(target_ptr, msa_ptr->y, msa_ptr->x, msa_ptr->m_ptr->fy, msa_ptr->m_ptr->fx) && one_in_(2)))) { msa_ptr->do_spell = DO_SPELL_BR_DISI; - msa_ptr->success = TRUE; + msa_ptr->success = true; return; } if (msa_ptr->ability_flags.has(RF_ABILITY::BR_LITE) && (msa_ptr->m_ptr->cdis < get_max_range(target_ptr) / 2) && los(target_ptr, msa_ptr->m_ptr->fy, msa_ptr->m_ptr->fx, msa_ptr->y, msa_ptr->x) && one_in_(5)) { msa_ptr->do_spell = DO_SPELL_BR_LITE; - msa_ptr->success = TRUE; + msa_ptr->success = true; return; } @@ -130,7 +130,7 @@ static void check_lite_area_by_mspell(player_type *target_ptr, msa_type *msa_ptr get_project_point(target_ptr, msa_ptr->m_ptr->fy, msa_ptr->m_ptr->fx, &by, &bx, 0L); if ((distance(by, bx, msa_ptr->y, msa_ptr->x) <= 3) && los(target_ptr, by, bx, msa_ptr->y, msa_ptr->x) && one_in_(5)) { msa_ptr->do_spell = DO_SPELL_BA_LITE; - msa_ptr->success = TRUE; + msa_ptr->success = true; } } @@ -143,7 +143,7 @@ static void decide_lite_breath(player_type *target_ptr, msa_type *msa_ptr) msa_ptr->y = msa_ptr->m_ptr->target_y; msa_ptr->x = msa_ptr->m_ptr->target_x; msa_ptr->ability_flags &= RF_ABILITY_INDIRECT_MASK; - msa_ptr->success = TRUE; + msa_ptr->success = true; } if ((msa_ptr->y_br_lite == 0) || (msa_ptr->x_br_lite == 0) || (msa_ptr->m_ptr->cdis > get_max_range(target_ptr) / 2) || !one_in_(5)) @@ -157,17 +157,17 @@ static void decide_lite_breath(player_type *target_ptr, msa_type *msa_ptr) msa_ptr->y = msa_ptr->y_br_lite; msa_ptr->x = msa_ptr->x_br_lite; msa_ptr->do_spell = DO_SPELL_BR_LITE; - msa_ptr->success = TRUE; + msa_ptr->success = true; } bool decide_lite_projection(player_type *target_ptr, msa_type *msa_ptr) { if (projectable(target_ptr, msa_ptr->m_ptr->fy, msa_ptr->m_ptr->fx, msa_ptr->y, msa_ptr->x)) { feature_projection(target_ptr->current_floor_ptr, msa_ptr); - return TRUE; + return true; } - msa_ptr->success = FALSE; + msa_ptr->success = false; check_lite_area_by_mspell(target_ptr, msa_ptr); if (!msa_ptr->success) msa_ptr->success = adjacent_grid_check(target_ptr, msa_ptr->m_ptr, &msa_ptr->y, &msa_ptr->x, FF_PROJECT, projectable); diff --git a/src/mspell/mspell-selector.cpp b/src/mspell/mspell-selector.cpp index d20e9979f..b50fbbced 100644 --- a/src/mspell/mspell-selector.cpp +++ b/src/mspell/mspell-selector.cpp @@ -46,26 +46,26 @@ static bool spell_attack(RF_ABILITY spell) { /* All RF4 spells hurt (except for shriek and dispel) */ if (spell_in_between(spell, RF_ABILITY::ROCKET, RF_ABILITY::BR_DISI)) - return TRUE; + return true; /* Various "ball" spells */ if (spell_in_between(spell, RF_ABILITY::BA_ACID, RF_ABILITY::BA_DARK)) - return TRUE; + return true; /* "Cause wounds" and "bolt" spells */ if (spell_in_between(spell, RF_ABILITY::CAUSE_1, RF_ABILITY::MISSILE)) - return TRUE; + return true; /* Hand of Doom */ if (spell == RF_ABILITY::HAND_DOOM) - return TRUE; + return true; /* Psycho-Spear */ if (spell == RF_ABILITY::PSY_SPEAR) - return TRUE; + return true; /* Doesn't hurt */ - return FALSE; + return false; } /*! @@ -78,14 +78,14 @@ static bool spell_escape(RF_ABILITY spell) { /* Blink or Teleport */ if (spell == RF_ABILITY::BLINK || spell == RF_ABILITY::TPORT) - return TRUE; + return true; /* Teleport the player away */ if (spell == RF_ABILITY::TELE_AWAY || spell == RF_ABILITY::TELE_LEVEL) - return TRUE; + return true; /* Isn't good for escaping */ - return FALSE; + return false; } /*! @@ -98,30 +98,30 @@ static bool spell_annoy(RF_ABILITY spell) { /* Shriek */ if (spell == RF_ABILITY::SHRIEK) - return TRUE; + return true; /* Brain smash, et al (added curses) */ if (spell_in_between(spell, RF_ABILITY::DRAIN_MANA, RF_ABILITY::CAUSE_4)) - return TRUE; + return true; /* Scare, confuse, blind, slow, paralyze */ if (spell_in_between(spell, RF_ABILITY::SCARE, RF_ABILITY::HOLD)) - return TRUE; + return true; /* Teleport to */ if (spell == RF_ABILITY::TELE_TO) - return TRUE; + return true; /* Teleport level */ if (spell == RF_ABILITY::TELE_LEVEL) - return TRUE; + return true; /* Darkness, make traps, cause amnesia */ if (spell_in_between(spell, RF_ABILITY::TRAPS, RF_ABILITY::RAISE_DEAD)) - return TRUE; + return true; /* Doesn't annoy */ - return FALSE; + return false; } /*! @@ -200,7 +200,7 @@ static bool spell_world(RF_ABILITY spell) static bool spell_special(player_type *target_ptr, RF_ABILITY spell) { if (target_ptr->phase_out) - return FALSE; + return false; return spell == RF_ABILITY::SPECIAL; } @@ -325,12 +325,12 @@ RF_ABILITY choose_attack_spell(player_type *target_ptr, msa_type *msa_ptr) return (world[randint0(world.size())]); if (!special.empty()) { - bool success = FALSE; + bool success = false; switch (m_ptr->r_idx) { case MON_BANOR: case MON_LUPART: if ((m_ptr->hp < m_ptr->maxhp / 2) && r_info[MON_BANOR].max_num && r_info[MON_LUPART].max_num) - success = TRUE; + success = true; break; default: break; @@ -351,7 +351,7 @@ RF_ABILITY choose_attack_spell(player_type *target_ptr, msa_type *msa_ptr) } if (!special.empty()) { - bool success = FALSE; + bool success = false; switch (m_ptr->r_idx) { case MON_OHMU: case MON_BANOR: @@ -359,15 +359,15 @@ RF_ABILITY choose_attack_spell(player_type *target_ptr, msa_type *msa_ptr) break; case MON_BANORLUPART: if (randint0(100) < 70) - success = TRUE; + success = true; break; case MON_ROLENTO: if (randint0(100) < 40) - success = TRUE; + success = true; break; default: if (randint0(100) < 50) - success = TRUE; + success = true; break; } if (success) diff --git a/src/mspell/mspell-status.cpp b/src/mspell/mspell-status.cpp index ac5b68e48..eafc464f6 100644 --- a/src/mspell/mspell-status.cpp +++ b/src/mspell/mspell-status.cpp @@ -84,7 +84,7 @@ void spell_badstatus_message(player_type *target_ptr, MONSTER_IDX m_idx, MONSTER if (see_either) { msg_format(msg1, m_name, t_name); } else { - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; } } diff --git a/src/mspell/mspell-summon.cpp b/src/mspell/mspell-summon.cpp index 0001bca7d..2e02f8ce5 100644 --- a/src/mspell/mspell-summon.cpp +++ b/src/mspell/mspell-summon.cpp @@ -96,7 +96,7 @@ static void decide_summon_kin_caster( } if (mon_to_mon && known && !see_either) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; } /*! @@ -188,7 +188,7 @@ MonsterSpellResult spell_RF6_S_KIN(player_type *target_ptr, POSITION y, POSITION msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby.")); if (known && !see_monster(target_ptr, t_idx) && count && (target_type == MONSTER_TO_MONSTER)) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = target_type == MONSTER_TO_PLAYER; @@ -230,7 +230,7 @@ MonsterSpellResult spell_RF6_S_CYBER(player_type *target_ptr, POSITION y, POSITI msg_print(_("重厚な足音が近くで聞こえる。", "You hear heavy steps nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -271,7 +271,7 @@ MonsterSpellResult spell_RF6_S_MONSTER(player_type *target_ptr, POSITION y, POSI msg_print(_("何かが間近に現れた音がする。", "You hear something appear nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -313,7 +313,7 @@ MonsterSpellResult spell_RF6_S_MONSTERS(player_type *target_ptr, POSITION y, POS msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -350,7 +350,7 @@ MonsterSpellResult spell_RF6_S_ANT(player_type *target_ptr, POSITION y, POSITION msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -387,7 +387,7 @@ MonsterSpellResult spell_RF6_S_SPIDER(player_type *target_ptr, POSITION y, POSIT msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -425,7 +425,7 @@ MonsterSpellResult spell_RF6_S_HOUND(player_type *target_ptr, POSITION y, POSITI msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -462,7 +462,7 @@ MonsterSpellResult spell_RF6_S_HYDRA(player_type *target_ptr, POSITION y, POSITI msg_print(_("多くのものが間近に現れた音がする。", "You hear many things appear nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -510,7 +510,7 @@ MonsterSpellResult spell_RF6_S_ANGEL(player_type *target_ptr, POSITION y, POSITI bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -547,7 +547,7 @@ MonsterSpellResult spell_RF6_S_DEMON(player_type *target_ptr, POSITION y, POSITI bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -584,7 +584,7 @@ MonsterSpellResult spell_RF6_S_UNDEAD(player_type *target_ptr, POSITION y, POSIT bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -624,7 +624,7 @@ MonsterSpellResult spell_RF6_S_DRAGON(player_type *target_ptr, POSITION y, POSIT msg_print(_("何かが間近に現れた音がする。", "You hear something appear nearby.")); if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -678,7 +678,7 @@ MonsterSpellResult spell_RF6_S_HI_UNDEAD(player_type *target_ptr, POSITION y, PO } if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -721,7 +721,7 @@ MonsterSpellResult spell_RF6_S_HI_DRAGON(player_type *target_ptr, POSITION y, PO } if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -760,7 +760,7 @@ MonsterSpellResult spell_RF6_S_AMBERITES(player_type *target_ptr, POSITION y, PO } if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; @@ -790,14 +790,14 @@ MonsterSpellResult spell_RF6_S_UNIQUE(player_type *target_ptr, POSITION y, POSIT DEPTH rlev = monster_level_idx(floor_ptr, m_idx); bool mon_to_mon = (TARGET_TYPE == MONSTER_TO_MONSTER); bool mon_to_player = (TARGET_TYPE == MONSTER_TO_PLAYER); - bool uniques_are_summoned = FALSE; + bool uniques_are_summoned = false; int count = 0; for (int k = 0; k < S_NUM_4; k++) { count += summon_specific(target_ptr, m_idx, y, x, rlev, SUMMON_UNIQUE, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE)); } if (count) - uniques_are_summoned = TRUE; + uniques_are_summoned = true; summon_type non_unique_type = SUMMON_HI_UNDEAD; if ((m_ptr->sub_align & (SUB_ALIGN_GOOD | SUB_ALIGN_EVIL)) == (SUB_ALIGN_GOOD | SUB_ALIGN_EVIL)) @@ -815,7 +815,7 @@ MonsterSpellResult spell_RF6_S_UNIQUE(player_type *target_ptr, POSITION y, POSIT } if (monster_near_player(floor_ptr, m_idx, t_idx) && !see_monster(target_ptr, t_idx) && count && mon_to_mon) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; auto res = MonsterSpellResult::make_valid(); res.learnable = TARGET_TYPE == MONSTER_TO_PLAYER; diff --git a/src/mspell/mspell-util.cpp b/src/mspell/mspell-util.cpp index 5733c5090..8fb7a908f 100644 --- a/src/mspell/mspell-util.cpp +++ b/src/mspell/mspell-util.cpp @@ -74,7 +74,7 @@ void monspell_message_base(player_type* target_ptr, MONSTER_IDX m_idx, MONSTER_I } if (mon_to_mon && known && !see_either) - floor_ptr->monster_noise = TRUE; + floor_ptr->monster_noise = true; } /*! diff --git a/src/mspell/summon-checker.cpp b/src/mspell/summon-checker.cpp index aa454a1e3..35559147c 100644 --- a/src/mspell/summon-checker.cpp +++ b/src/mspell/summon-checker.cpp @@ -24,7 +24,7 @@ bool check_summon_specific(player_type *player_ptr, MONRACE_IDX summoner_idx, MONRACE_IDX r_idx) { monster_race *r_ptr = &r_info[r_idx]; - bool is_match = FALSE; + bool is_match = false; switch (summon_specific_type) { case SUMMON_ANT: is_match = r_ptr->d_char == 'a'; @@ -138,13 +138,13 @@ bool check_summon_specific(player_type *player_ptr, MONRACE_IDX summoner_idx, MO case SUMMON_KAMIKAZE: for (int i = 0; i < 4; i++) if (r_ptr->blow[i].method == RBM_EXPLODE) - is_match = TRUE; + is_match = true; break; case SUMMON_KAMIKAZE_LIVING: for (int i = 0; i < 4; i++) if (r_ptr->blow[i].method == RBM_EXPLODE) - is_match = TRUE; + is_match = true; is_match &= monster_living(r_idx); break; diff --git a/src/mutation/mutation-investor-remover.cpp b/src/mutation/mutation-investor-remover.cpp index 4668c73e9..f4c046000 100644 --- a/src/mutation/mutation-investor-remover.cpp +++ b/src/mutation/mutation-investor-remover.cpp @@ -20,7 +20,7 @@ static void sweep_gain_mutation(player_type *creature_ptr, glm_type *gm_ptr) while (attempts_left--) { switch_gain_mutation(creature_ptr, gm_ptr); if (gm_ptr->muta_which != MUTA::MAX && creature_ptr->muta.has_not(gm_ptr->muta_which)) - gm_ptr->muta_chosen = TRUE; + gm_ptr->muta_chosen = true; if (gm_ptr->muta_chosen) break; @@ -209,7 +209,7 @@ bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) sweep_gain_mutation(creature_ptr, gm_ptr); if (!gm_ptr->muta_chosen) { msg_print(_("普通になった気がする。", "You feel normal.")); - return FALSE; + return false; } chg_virtue(creature_ptr, V_CHANCE, 1); @@ -225,7 +225,7 @@ bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) creature_ptr->mutant_regenerate_mod = calc_mutant_regenerate_mod(creature_ptr); set_bits(creature_ptr->update, PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } static void sweep_lose_mutation(player_type *creature_ptr, glm_type *glm_ptr) @@ -238,7 +238,7 @@ static void sweep_lose_mutation(player_type *creature_ptr, glm_type *glm_ptr) switch_lose_mutation(creature_ptr, glm_ptr); if (glm_ptr->muta_which != MUTA::MAX) { if (creature_ptr->muta.has(glm_ptr->muta_which)) { - glm_ptr->muta_chosen = TRUE; + glm_ptr->muta_chosen = true; } } @@ -257,7 +257,7 @@ bool lose_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) glm_type *glm_ptr = initialize_glm_type(&tmp_glm, choose_mut); sweep_lose_mutation(creature_ptr, glm_ptr); if (!glm_ptr->muta_chosen) - return FALSE; + return false; msg_print(glm_ptr->muta_desc); if (glm_ptr->muta_which != MUTA::MAX) @@ -266,7 +266,7 @@ bool lose_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) set_bits(creature_ptr->update, PU_BONUS); handle_stuff(creature_ptr); creature_ptr->mutant_regenerate_mod = calc_mutant_regenerate_mod(creature_ptr); - return TRUE; + return true; } void lose_all_mutations(player_type *creature_ptr) diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp index fd54a5505..6ad04be9b 100644 --- a/src/mutation/mutation-processor.cpp +++ b/src/mutation/mutation-processor.cpp @@ -96,7 +96,7 @@ static bool get_hack_dir(player_type *creature_ptr, DIRECTION *dp) } if (!dir) - return FALSE; + return false; command_dir = dir; if (creature_ptr->confused) @@ -106,7 +106,7 @@ static bool get_hack_dir(player_type *creature_ptr, DIRECTION *dp) msg_print(_("あなたは混乱している。", "You are confused.")); *dp = dir; - return TRUE; + return true; } /*! @@ -323,36 +323,36 @@ void process_world_aux_mutation(player_type *creature_ptr) if (creature_ptr->muta.has(MUTA::WASTING) && one_in_(3000)) { int which_stat = randint0(A_MAX); - int sustained = FALSE; + int sustained = false; switch (which_stat) { case A_STR: if (has_sustain_str(creature_ptr)) - sustained = TRUE; + sustained = true; break; case A_INT: if (has_sustain_int(creature_ptr)) - sustained = TRUE; + sustained = true; break; case A_WIS: if (has_sustain_wis(creature_ptr)) - sustained = TRUE; + sustained = true; break; case A_DEX: if (has_sustain_dex(creature_ptr)) - sustained = TRUE; + sustained = true; break; case A_CON: if (has_sustain_con(creature_ptr)) - sustained = TRUE; + sustained = true; break; case A_CHR: if (has_sustain_chr(creature_ptr)) - sustained = TRUE; + sustained = true; break; default: msg_print(_("不正な状態！", "Invalid stat chosen!")); - sustained = TRUE; + sustained = true; } if (!sustained) { @@ -476,7 +476,7 @@ bool drop_weapons(player_type *creature_ptr) object_type *o_ptr = NULL; if (creature_ptr->wild_mode) - return FALSE; + return false; msg_print(NULL); if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND)) { @@ -493,9 +493,9 @@ bool drop_weapons(player_type *creature_ptr) } if ((slot == 0) || object_is_cursed(o_ptr)) - return FALSE; + return false; msg_print(_("武器を落としてしまった！", "You drop your weapon!")); drop_from_inventory(creature_ptr, slot, 1); - return TRUE; + return true; } diff --git a/src/mutation/mutation-techniques.cpp b/src/mutation/mutation-techniques.cpp index ba7497861..397e7770e 100644 --- a/src/mutation/mutation-techniques.cpp +++ b/src/mutation/mutation-techniques.cpp @@ -29,7 +29,7 @@ bool eat_rock(player_type *caster_ptr) { DIRECTION dir; if (!get_direction(caster_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; POSITION y = caster_ptr->y + ddy[dir]; POSITION x = caster_ptr->x + ddx[dir]; @@ -65,5 +65,5 @@ bool eat_rock(player_type *caster_ptr) cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK); (void)move_player_effect(caster_ptr, y, x, MPE_DONT_PICKUP); - return TRUE; + return true; } diff --git a/src/mutation/mutation-util.cpp b/src/mutation/mutation-util.cpp index c1875909a..cc3d1b4be 100644 --- a/src/mutation/mutation-util.cpp +++ b/src/mutation/mutation-util.cpp @@ -5,7 +5,7 @@ glm_type *initialize_glm_type(glm_type *gm_ptr, MUTATION_IDX choose_mut) { gm_ptr->muta_which = MUTA::MAX; gm_ptr->muta_desc = ""; - gm_ptr->muta_chosen = FALSE; + gm_ptr->muta_chosen = false; gm_ptr->choose_mut = choose_mut; return gm_ptr; } diff --git a/src/object-activation/activation-bolt-ball.cpp b/src/object-activation/activation-bolt-ball.cpp index c4745cd4f..9c5c9cebf 100644 --- a/src/object-activation/activation-bolt-ball.cpp +++ b/src/object-activation/activation-bolt-ball.cpp @@ -17,10 +17,10 @@ bool activate_missile_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは眩しいくらいに明るく輝いている...", "It glows extremely brightly...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_bolt(user_ptr, GF_MISSILE, dir, damroll(2, 6)); - return TRUE; + return true; } bool activate_missile_2(player_type *user_ptr) @@ -28,21 +28,21 @@ bool activate_missile_2(player_type *user_ptr) DIRECTION dir; msg_print(_("魔法のトゲが現れた...", "It grows magical spikes...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_bolt(user_ptr, GF_ARROW, dir, 150); - return TRUE; + return true; } bool activate_missile_3(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; msg_print(_("あなたはエレメントのブレスを吐いた。", "You breathe the elements.")); fire_breath(user_ptr, GF_MISSILE, dir, 300, 4); - return TRUE; + return true; } bool activate_bolt_acid_1(player_type *user_ptr) @@ -50,10 +50,10 @@ bool activate_bolt_acid_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは酸に覆われた...", "It is covered in acid...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_bolt(user_ptr, GF_ACID, dir, damroll(5, 8)); - return TRUE; + return true; } bool activate_bolt_elec_1(player_type *user_ptr) @@ -61,10 +61,10 @@ bool activate_bolt_elec_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは火花に覆われた...", "It is covered in sparks...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_bolt(user_ptr, GF_ELEC, dir, damroll(4, 8)); - return TRUE; + return true; } bool activate_bolt_fire_1(player_type *user_ptr) @@ -72,10 +72,10 @@ bool activate_bolt_fire_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは炎に覆われた...", "It is covered in fire...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_bolt(user_ptr, GF_FIRE, dir, damroll(9, 8)); - return TRUE; + return true; } bool activate_bolt_cold_1(player_type *user_ptr) @@ -83,10 +83,10 @@ bool activate_bolt_cold_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは霜に覆われた...", "It is covered in frost...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_bolt(user_ptr, GF_COLD, dir, damroll(6, 8)); - return TRUE; + return true; } bool activate_bolt_hypodynamia_1(player_type *user_ptr, concptr name) @@ -94,10 +94,10 @@ bool activate_bolt_hypodynamia_1(player_type *user_ptr, concptr name) DIRECTION dir; msg_format(_("あなたは%sに敵を締め殺すよう命じた。", "You order the %s to strangle your opponent."), name); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; hypodynamic_bolt(user_ptr, dir, 100); - return TRUE; + return true; } bool activate_bolt_hypodynamia_2(player_type *user_ptr) @@ -105,36 +105,36 @@ bool activate_bolt_hypodynamia_2(player_type *user_ptr) DIRECTION dir; msg_print(_("黒く輝いている...", "It glows black...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; hypodynamic_bolt(user_ptr, dir, 120); - return TRUE; + return true; } bool activate_bolt_drain_1(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; for (int dummy = 0; dummy < 3; dummy++) if (hypodynamic_bolt(user_ptr, dir, 50)) hp_player(user_ptr, 50); - return TRUE; + return true; } bool activate_bolt_drain_2(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; for (int dummy = 0; dummy < 3; dummy++) if (hypodynamic_bolt(user_ptr, dir, 100)) hp_player(user_ptr, 100); - return TRUE; + return true; } bool activate_bolt_mana(player_type *user_ptr, concptr name) @@ -142,10 +142,10 @@ bool activate_bolt_mana(player_type *user_ptr, concptr name) DIRECTION dir; msg_format(_("%sに魔法のトゲが現れた...", "The %s grows magical spikes..."), name); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_bolt(user_ptr, GF_ARROW, dir, 150); - return TRUE; + return true; } bool activate_ball_pois_1(player_type *user_ptr) @@ -153,10 +153,10 @@ bool activate_ball_pois_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは濃緑色に脈動している...", "It throbs deep green...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_POIS, dir, 12, 3); - return TRUE; + return true; } bool activate_ball_cold_1(player_type *user_ptr) @@ -164,10 +164,10 @@ bool activate_ball_cold_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは霜に覆われた...", "It is covered in frost...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_COLD, dir, 48, 2); - return TRUE; + return true; } bool activate_ball_cold_2(player_type *user_ptr) @@ -175,10 +175,10 @@ bool activate_ball_cold_2(player_type *user_ptr) DIRECTION dir; msg_print(_("それは青く激しく輝いた...", "It glows an intense blue...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_COLD, dir, 100, 2); - return TRUE; + return true; } bool activate_ball_cold_3(player_type *user_ptr) @@ -186,10 +186,10 @@ bool activate_ball_cold_3(player_type *user_ptr) DIRECTION dir; msg_print(_("明るく白色に輝いている...", "It glows bright white...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_COLD, dir, 400, 3); - return TRUE; + return true; } bool activate_ball_fire_1(player_type *user_ptr) @@ -197,10 +197,10 @@ bool activate_ball_fire_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは赤く激しく輝いた...", "It glows an intense red...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_FIRE, dir, 72, 2); - return TRUE; + return true; } bool activate_ball_fire_2(player_type *user_ptr, concptr name) @@ -208,10 +208,10 @@ bool activate_ball_fire_2(player_type *user_ptr, concptr name) DIRECTION dir; msg_format(_("%sから炎が吹き出した...", "The %s rages in fire..."), name); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_FIRE, dir, 120, 3); - return TRUE; + return true; } bool activate_ball_fire_3(player_type *user_ptr) @@ -219,10 +219,10 @@ bool activate_ball_fire_3(player_type *user_ptr) DIRECTION dir; msg_print(_("深赤色に輝いている...", "It glows deep red...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_FIRE, dir, 300, 3); - return TRUE; + return true; } bool activate_ball_fire_4(player_type *user_ptr) @@ -230,10 +230,10 @@ bool activate_ball_fire_4(player_type *user_ptr) DIRECTION dir; msg_print(_("それは赤く激しく輝いた...", "It glows an intense red...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_FIRE, dir, 100, 2); - return TRUE; + return true; } bool activate_ball_elec_2(player_type *user_ptr) @@ -241,10 +241,10 @@ bool activate_ball_elec_2(player_type *user_ptr) DIRECTION dir; msg_print(_("電気がパチパチ音を立てた...", "It crackles with electricity...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_ELEC, dir, 100, 3); - return TRUE; + return true; } bool activate_ball_elec_3(player_type *user_ptr) @@ -252,10 +252,10 @@ bool activate_ball_elec_3(player_type *user_ptr) DIRECTION dir; msg_print(_("深青色に輝いている...", "It glows deep blue...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_ELEC, dir, 500, 3); - return TRUE; + return true; } bool activate_ball_acid_1(player_type *user_ptr) @@ -263,10 +263,10 @@ bool activate_ball_acid_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは黒く激しく輝いた...", "It glows an intense black...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_ACID, dir, 100, 2); - return TRUE; + return true; } bool activate_ball_nuke_1(player_type *user_ptr) @@ -274,21 +274,21 @@ bool activate_ball_nuke_1(player_type *user_ptr) DIRECTION dir; msg_print(_("それは緑に激しく輝いた...", "It glows an intense green...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_NUKE, dir, 100, 2); - return TRUE; + return true; } bool activate_rocket(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; msg_print(_("ロケットを発射した！", "You launch a rocket!")); (void)fire_ball(user_ptr, GF_ROCKET, dir, 250 + user_ptr->lev * 3, 2); - return TRUE; + return true; } bool activate_ball_water(player_type *user_ptr, concptr name) @@ -296,10 +296,10 @@ bool activate_ball_water(player_type *user_ptr, concptr name) DIRECTION dir; msg_format(_("%sが深い青色に鼓動している...", "The %s throbs deep blue..."), name); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_WATER, dir, 200, 3); - return TRUE; + return true; } bool activate_ball_lite(player_type *user_ptr, concptr name) @@ -321,7 +321,7 @@ bool activate_ball_lite(player_type *user_ptr, concptr name) project(user_ptr, 0, 3, y, x, 150, GF_ELEC, PROJECT_THRU | PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL); } - return TRUE; + return true; } bool activate_ball_dark(player_type *user_ptr, concptr name) @@ -329,10 +329,10 @@ bool activate_ball_dark(player_type *user_ptr, concptr name) DIRECTION dir; msg_format(_("%sが深い闇に覆われた...", "The %s is covered in pitch-darkness..."), name); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_DARK, dir, 250, 4); - return TRUE; + return true; } bool activate_ball_mana(player_type *user_ptr, concptr name) @@ -340,8 +340,8 @@ bool activate_ball_mana(player_type *user_ptr, concptr name) DIRECTION dir; msg_format(_("%sが青白く光った．．．", "The %s becomes pale..."), name); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_MANA, dir, 250, 4); - return TRUE; + return true; } diff --git a/src/object-activation/activation-breath.cpp b/src/object-activation/activation-breath.cpp index bb64bb96c..148a11b81 100644 --- a/src/object-activation/activation-breath.cpp +++ b/src/object-activation/activation-breath.cpp @@ -25,7 +25,7 @@ bool activate_dragon_breath(player_type *user_ptr, object_type *o_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; BIT_FLAGS resistance_flags[TR_FLAG_SIZE]; object_flags(user_ptr, o_ptr, resistance_flags); @@ -42,7 +42,7 @@ bool activate_dragon_breath(player_type *user_ptr, object_type *o_ptr) } if (n == 0) - return FALSE; + return false; if (music_singing_any(user_ptr)) stop_singing(user_ptr); @@ -53,31 +53,31 @@ bool activate_dragon_breath(player_type *user_ptr, object_type *o_ptr) int t = randint0(n); msg_format(_("あなたは%sのブレスを吐いた。", "You breathe %s."), name[t]); fire_breath(user_ptr, type[t], dir, 250, 4); - return TRUE; + return true; } bool activate_breath_fire(player_type *user_ptr, object_type *o_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; fire_breath(user_ptr, GF_FIRE, dir, 200, 2); if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) (void)set_oppose_fire(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } bool activate_breath_cold(player_type *user_ptr, object_type *o_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; fire_breath(user_ptr, GF_COLD, dir, 200, 2); if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) (void)set_oppose_cold(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } diff --git a/src/object-activation/activation-charm.cpp b/src/object-activation/activation-charm.cpp index 46f63a8fe..9c33226b9 100644 --- a/src/object-activation/activation-charm.cpp +++ b/src/object-activation/activation-charm.cpp @@ -8,40 +8,40 @@ bool activate_charm_animal(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)charm_animal(user_ptr, dir, user_ptr->lev); - return TRUE; + return true; } bool activate_charm_undead(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)control_one_undead(user_ptr, dir, user_ptr->lev); - return TRUE; + return true; } bool activate_charm_other(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)charm_monster(user_ptr, dir, user_ptr->lev * 2); - return TRUE; + return true; } bool activate_charm_animals(player_type *user_ptr) { (void)charm_animals(user_ptr, user_ptr->lev * 2); - return TRUE; + return true; } bool activate_charm_others(player_type *user_ptr) { (void)charm_monsters(user_ptr, user_ptr->lev * 2); - return TRUE; + return true; } diff --git a/src/object-activation/activation-genocide.cpp b/src/object-activation/activation-genocide.cpp index 4f8dd7629..2906c2ee9 100644 --- a/src/object-activation/activation-genocide.cpp +++ b/src/object-activation/activation-genocide.cpp @@ -7,12 +7,12 @@ bool activate_genocide(player_type *user_ptr) { msg_print(_("深青色に輝いている...", "It glows deep blue...")); (void)symbol_genocide(user_ptr, 200, TRUE); - return TRUE; + return true; } bool activate_mass_genocide(player_type *user_ptr) { msg_print(_("ひどく鋭い音が流れ出た...", "It lets out a long, shrill note...")); (void)mass_genocide(user_ptr, 200, TRUE); - return TRUE; + return true; } diff --git a/src/object-activation/activation-others.cpp b/src/object-activation/activation-others.cpp index 883bc22a1..3c3d878f2 100644 --- a/src/object-activation/activation-others.cpp +++ b/src/object-activation/activation-others.cpp @@ -58,11 +58,11 @@ bool activate_sunlight(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; msg_print(_("太陽光線が放たれた。", "A line of sunlight appears.")); (void)lite_line(user_ptr, dir, damroll(6, 8)); - return TRUE; + return true; } bool activate_confusion(player_type *user_ptr) @@ -70,10 +70,10 @@ bool activate_confusion(player_type *user_ptr) DIRECTION dir; msg_print(_("様々な色の火花を発している...", "It glows in scintillating colours...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; confuse_monster(user_ptr, dir, 20); - return TRUE; + return true; } bool activate_banish_evil(player_type *user_ptr) @@ -81,7 +81,7 @@ bool activate_banish_evil(player_type *user_ptr) if (banish_evil(user_ptr, 100)) msg_print(_("アーティファクトの力が邪悪を打ち払った！", "The power of the artifact banishes evil!")); - return TRUE; + return true; } bool activate_scare(player_type *user_ptr) @@ -94,7 +94,7 @@ bool activate_scare(player_type *user_ptr) msg_print(_("あなたは力強い突風を吹き鳴らした。周囲の敵が震え上っている!", "You wind a mighty blast; your enemies tremble!")); (void)turn_monsters(user_ptr, (3 * user_ptr->lev / 2) + 10); - return TRUE; + return true; } bool activate_aggravation(player_type *user_ptr, object_type *o_ptr, concptr name) @@ -105,7 +105,7 @@ bool activate_aggravation(player_type *user_ptr, object_type *o_ptr, concptr nam msg_format(_("%sは不快な物音を立てた。", "The %s sounds an unpleasant noise."), name); aggravate_monsters(user_ptr, 0); - return TRUE; + return true; } bool activate_stone_mud(player_type *user_ptr) @@ -113,10 +113,10 @@ bool activate_stone_mud(player_type *user_ptr) DIRECTION dir; msg_print(_("鼓動している...", "It pulsates...")); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; wall_to_mud(user_ptr, dir, 20 + randint1(30)); - return TRUE; + return true; } bool activate_judgement(player_type *user_ptr, concptr name) @@ -136,18 +136,18 @@ bool activate_judgement(player_type *user_ptr, concptr name) if (get_check(_("帰還の力を使いますか？", "Activate recall? "))) (void)recall_player(user_ptr, randint0(21) + 15); - return TRUE; + return true; } bool activate_telekinesis(player_type *user_ptr, concptr name) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; msg_format(_("%sを伸ばした。", "You stretched your %s."), name); fetch_item(user_ptr, dir, 500, TRUE); - return TRUE; + return true; } bool activate_unique_detection(player_type *user_ptr) @@ -168,7 +168,7 @@ bool activate_unique_detection(player_type *user_ptr) msg_print(_("きさま！　見ているなッ！", "You bastard! You're watching me, well watch this!")); } - return TRUE; + return true; } bool activate_dispel_curse(player_type *user_ptr, concptr name) @@ -176,49 +176,49 @@ bool activate_dispel_curse(player_type *user_ptr, concptr name) msg_format(_("%sが真実を照らし出す...", "The %s exhibits the truth..."), name); (void)remove_all_curse(user_ptr); (void)probing(user_ptr); - return TRUE; + return true; } bool activate_cure_lw(player_type *user_ptr) { (void)set_afraid(user_ptr, 0); (void)hp_player(user_ptr, 30); - return TRUE; + return true; } bool activate_grand_cross(player_type *user_ptr) { msg_print(_("「闇に還れ！」", "You say, 'Return to darkness!'")); (void)project(user_ptr, 0, 8, user_ptr->y, user_ptr->x, (randint1(100) + 200) * 2, GF_HOLY_FIRE, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID); - return TRUE; + return true; } bool activate_call_chaos(player_type *user_ptr) { msg_print(_("様々な色の火花を発している...", "It glows in scintillating colours...")); call_chaos(user_ptr); - return TRUE; + return true; } bool activate_dispel_evil(player_type *user_ptr) { msg_print(_("神聖な雰囲気が充満した...", "It floods the area with goodness...")); dispel_evil(user_ptr, user_ptr->lev * 5); - return TRUE; + return true; } bool activate_dispel_good(player_type *user_ptr) { msg_print(_("邪悪な雰囲気が充満した...", "It floods the area with evil...")); dispel_good(user_ptr, user_ptr->lev * 5); - return TRUE; + return true; } bool activate_all_monsters_detection(player_type *user_ptr) { (void)detect_monsters_invis(user_ptr, 255); (void)detect_monsters_normal(user_ptr, 255); - return TRUE; + return true; } bool activate_all_detection(player_type *user_ptr) @@ -226,7 +226,7 @@ bool activate_all_detection(player_type *user_ptr) msg_print(_("白く明るく輝いている...", "It glows bright white...")); msg_print(_("心にイメージが浮かんできた...", "An image forms in your mind...")); detect_all(user_ptr, DETECT_RAD_DEFAULT); - return TRUE; + return true; } bool activate_extra_detection(player_type *user_ptr) @@ -235,14 +235,14 @@ bool activate_extra_detection(player_type *user_ptr) detect_all(user_ptr, DETECT_RAD_DEFAULT); probing(user_ptr); identify_fully(user_ptr, FALSE, TV_NONE); - return TRUE; + return true; } bool activate_fully_identification(player_type *user_ptr) { msg_print(_("黄色く輝いている...", "It glows yellow...")); identify_fully(user_ptr, FALSE, TV_NONE); - return TRUE; + return true; } /*! @@ -259,7 +259,7 @@ bool activate_pesticide(player_type *user_ptr) { msg_print(_("あなたは害虫を一掃した。", "You exterminate some pests.")); (void)dispel_monsters(user_ptr, 4); - return TRUE; + return true; } /*! @@ -270,7 +270,7 @@ bool activate_pesticide(player_type *user_ptr) bool activate_whirlwind(player_type *user_ptr) { massacre(user_ptr); - return TRUE; + return true; } bool activate_blinding_light(player_type *user_ptr, concptr name) @@ -278,33 +278,33 @@ bool activate_blinding_light(player_type *user_ptr, concptr name) msg_format(_("%sが眩しい光で輝いた...", "The %s gleams with blinding light..."), name); (void)fire_ball(user_ptr, GF_LITE, 0, 300, 6); confuse_monsters(user_ptr, 3 * user_ptr->lev / 2); - return TRUE; + return true; } bool activate_sleep(player_type *user_ptr) { msg_print(_("深青色に輝いている...", "It glows deep blue...")); sleep_monsters_touch(user_ptr); - return TRUE; + return true; } bool activate_door_destroy(player_type *user_ptr) { msg_print(_("明るい赤色に輝いている...", "It glows bright red...")); destroy_doors_touch(user_ptr); - return TRUE; + return true; } bool activate_earthquake(player_type *user_ptr) { earthquake(user_ptr, user_ptr->y, user_ptr->x, 5, 0); - return TRUE; + return true; } bool activate_recharge(player_type *user_ptr) { recharge(user_ptr, 130); - return TRUE; + return true; } bool activate_recharge_extra(player_type *user_ptr, concptr name) @@ -319,13 +319,13 @@ bool activate_shikofumi(player_type *user_ptr) (void)set_afraid(user_ptr, 0); (void)set_hero(user_ptr, randint1(20) + 20, FALSE); (void)dispel_evil(user_ptr, user_ptr->lev * 3); - return TRUE; + return true; } bool activate_terror(player_type *user_ptr) { turn_monsters(user_ptr, 40 + user_ptr->lev); - return TRUE; + return true; } bool activate_map_light(player_type *user_ptr) @@ -333,21 +333,21 @@ bool activate_map_light(player_type *user_ptr) msg_print(_("眩しく輝いた...", "It shines brightly...")); map_area(user_ptr, DETECT_RAD_MAP); lite_area(user_ptr, damroll(2, 15), 3); - return TRUE; + return true; } bool activate_exploding_rune(player_type *user_ptr) { msg_print(_("明るい赤色に輝いている...", "It glows bright red...")); create_rune_explosion(user_ptr, user_ptr->y, user_ptr->x); - return TRUE; + return true; } bool activate_protection_rune(player_type *user_ptr) { msg_print(_("ブルーに明るく輝いている...", "It glows light blue...")); create_rune_protection_one(user_ptr); - return TRUE; + return true; } bool activate_protection_elbereth(player_type *user_ptr) @@ -359,14 +359,14 @@ bool activate_protection_elbereth(player_type *user_ptr) set_image(user_ptr, 0); set_blessed(user_ptr, randint0(25) + 25, true); set_bits(user_ptr->redraw, PR_STATS); - return TRUE; + return true; } bool activate_light(player_type *user_ptr, concptr name) { msg_format(_("%sから澄んだ光があふれ出た...", "The %s wells with clear light..."), name); (void)lite_area(user_ptr, damroll(2, 15), 3); - return TRUE; + return true; } bool activate_recall(player_type *user_ptr) diff --git a/src/object-activation/activation-resistance.cpp b/src/object-activation/activation-resistance.cpp index acf9849cc..af9f14aa0 100644 --- a/src/object-activation/activation-resistance.cpp +++ b/src/object-activation/activation-resistance.cpp @@ -20,7 +20,7 @@ bool activate_resistance_elements(player_type *user_ptr) (void)set_oppose_fire(user_ptr, randint1(40) + 40, FALSE); (void)set_oppose_cold(user_ptr, randint1(40) + 40, FALSE); (void)set_oppose_pois(user_ptr, randint1(40) + 40, FALSE); - return TRUE; + return true; } /*! @@ -35,12 +35,12 @@ bool activate_acid_ball_and_resistance(player_type *user_ptr, concptr name) DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_ACID, dir, 100, 2); (void)set_oppose_acid(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -55,12 +55,12 @@ bool activate_elec_ball_and_resistance(player_type *user_ptr, concptr name) DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_ELEC, dir, 100, 2); (void)set_oppose_elec(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -75,12 +75,12 @@ bool activate_fire_ball_and_resistance(player_type *user_ptr, concptr name) DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_FIRE, dir, 100, 2); (void)set_oppose_fire(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -95,12 +95,12 @@ bool activate_cold_ball_and_resistance(player_type *user_ptr, concptr name) DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_COLD, dir, 100, 2); (void)set_oppose_cold(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -115,12 +115,12 @@ bool activate_pois_ball_and_resistance(player_type *user_ptr, concptr name) DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_ball(user_ptr, GF_POIS, dir, 100, 2); (void)set_oppose_pois(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -133,7 +133,7 @@ bool activate_resistance_acid(player_type *user_ptr, concptr name) { msg_format(_("%sが黒く輝いた...", "The %s grows black."), name); (void)set_oppose_acid(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -146,7 +146,7 @@ bool activate_resistance_elec(player_type *user_ptr, concptr name) { msg_format(_("%sが青く輝いた...", "The %s grows blue."), name); (void)set_oppose_elec(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -159,7 +159,7 @@ bool activate_resistance_fire(player_type *user_ptr, concptr name) { msg_format(_("%sが赤く輝いた...", "The %s grows red."), name); (void)set_oppose_fire(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -172,7 +172,7 @@ bool activate_resistance_cold(player_type *user_ptr, concptr name) { msg_format(_("%sが白く輝いた...", "The %s grows white."), name); (void)set_oppose_cold(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } /*! @@ -185,7 +185,7 @@ bool activate_resistance_pois(player_type *user_ptr, concptr name) { msg_format(_("%sが緑に輝いた...", "The %s grows green."), name); (void)set_oppose_pois(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; } bool activate_ultimate_resistance(player_type *user_ptr) @@ -201,5 +201,5 @@ bool activate_ultimate_resistance(player_type *user_ptr) (void)set_oppose_cold(user_ptr, v, FALSE); (void)set_oppose_pois(user_ptr, v, FALSE); (void)set_ultimate_res(user_ptr, v, FALSE); - return TRUE; + return true; } diff --git a/src/object-activation/activation-switcher.cpp b/src/object-activation/activation-switcher.cpp index 674628d59..d957c3273 100644 --- a/src/object-activation/activation-switcher.cpp +++ b/src/object-activation/activation-switcher.cpp @@ -162,16 +162,16 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act return activate_charm_others(user_ptr); case ACT_SUMMON_ANIMAL: (void)summon_specific(user_ptr, -1, user_ptr->y, user_ptr->x, user_ptr->lev, SUMMON_ANIMAL_RANGER, PM_ALLOW_GROUP | PM_FORCE_PET); - return TRUE; + return true; case ACT_SUMMON_PHANTOM: msg_print(_("幻霊を召喚した。", "You summon a phantasmal servant.")); (void)summon_specific(user_ptr, -1, user_ptr->y, user_ptr->x, user_ptr->current_floor_ptr->dun_level, SUMMON_PHANTOM, PM_ALLOW_GROUP | PM_FORCE_PET); - return TRUE; + return true; case ACT_SUMMON_ELEMENTAL: return cast_summon_elemental(user_ptr, (user_ptr->lev * 3) / 2); case ACT_SUMMON_DEMON: cast_summon_demon(user_ptr, (user_ptr->lev * 3) / 2); - return TRUE; + return true; case ACT_SUMMON_UNDEAD: return cast_summon_undead(user_ptr, (user_ptr->lev * 3) / 2); case ACT_SUMMON_HOUND: @@ -179,85 +179,85 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act case ACT_SUMMON_DAWN: msg_print(_("暁の師団を召喚した。", "You summon the Legion of the Dawn.")); (void)summon_specific(user_ptr, -1, user_ptr->y, user_ptr->x, user_ptr->current_floor_ptr->dun_level, SUMMON_DAWN, PM_ALLOW_GROUP | PM_FORCE_PET); - return TRUE; + return true; case ACT_SUMMON_OCTOPUS: return cast_summon_octopus(user_ptr); case ACT_CHOIR_SINGS: msg_print(_("天国の歌が聞こえる...", "A heavenly choir sings...")); (void)cure_critical_wounds(user_ptr, 777); (void)set_hero(user_ptr, randint1(25) + 25, FALSE); - return TRUE; + return true; case ACT_CURE_LW: return activate_cure_lw(user_ptr); case ACT_CURE_MW: msg_print(_("深紫色の光を発している...", "It radiates deep purple...")); (void)cure_serious_wounds(user_ptr, 4, 8); - return TRUE; + return true; case ACT_CURE_POISON: msg_print(_("深青色に輝いている...", "It glows deep blue...")); (void)set_afraid(user_ptr, 0); (void)set_poisoned(user_ptr, 0); - return TRUE; + return true; case ACT_REST_EXP: msg_print(_("深紅に輝いている...", "It glows a deep red...")); restore_level(user_ptr); - return TRUE; + return true; case ACT_REST_ALL: msg_print(_("濃緑色に輝いている...", "It glows a deep green...")); (void)restore_all_status(user_ptr); (void)restore_level(user_ptr); - return TRUE; + return true; case ACT_CURE_700: msg_print(_("深青色に輝いている...", "It glows deep blue...")); msg_print(_("体内に暖かい鼓動が感じられる...", "You feel a warm tingling inside...")); (void)cure_critical_wounds(user_ptr, 700); - return TRUE; + return true; case ACT_CURE_1000: msg_print(_("白く明るく輝いている...", "It glows a bright white...")); msg_print(_("ひじょうに気分がよい...", "You feel much better...")); (void)cure_critical_wounds(user_ptr, 1000); - return TRUE; + return true; case ACT_CURING: msg_format(_("%sの優しさに癒される...", "the %s cures you affectionately ..."), name); true_healing(user_ptr, 0); - return TRUE; + return true; case ACT_CURE_MANA_FULL: msg_format(_("%sが青白く光った．．．", "The %s glows palely..."), name); restore_mana(user_ptr, TRUE); - return TRUE; + return true; case ACT_ESP: (void)set_tim_esp(user_ptr, randint1(30) + 25, FALSE); - return TRUE; + return true; case ACT_BERSERK: (void)berserk(user_ptr, randint1(25) + 25); - return TRUE; + return true; case ACT_PROT_EVIL: msg_format(_("%sから鋭い音が流れ出た...", "The %s lets out a shrill wail..."), name); (void)set_protevil(user_ptr, randint1(25) + user_ptr->lev * 3, FALSE); - return TRUE; + return true; case ACT_RESIST_ALL: return activate_resistance_elements(user_ptr); case ACT_SPEED: msg_print(_("明るく緑色に輝いている...", "It glows bright green...")); (void)set_fast(user_ptr, randint1(20) + 20, FALSE); - return TRUE; + return true; case ACT_XTRA_SPEED: msg_print(_("明るく輝いている...", "It glows brightly...")); (void)set_fast(user_ptr, randint1(75) + 75, FALSE); - return TRUE; + return true; case ACT_WRAITH: set_wraith_form(user_ptr, randint1(user_ptr->lev / 2) + (user_ptr->lev / 2), FALSE); - return TRUE; + return true; case ACT_INVULN: (void)set_invuln(user_ptr, randint1(8) + 8, FALSE); - return TRUE; + return true; case ACT_HERO: (void)heroism(user_ptr, 25); - return TRUE; + return true; case ACT_HERO_SPEED: (void)set_fast(user_ptr, randint1(50) + 50, FALSE); (void)heroism(user_ptr, 50); - return TRUE; + return true; case ACT_ACID_BALL_AND_RESISTANCE: return activate_acid_ball_and_resistance(user_ptr, name); case ACT_FIRE_BALL_AND_RESISTANCE: @@ -296,7 +296,7 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act return activate_protection_rune(user_ptr); case ACT_SATIATE: (void)set_food(user_ptr, PY_FOOD_MAX - 1); - return TRUE; + return true; case ACT_DEST_DOOR: return activate_door_destroy(user_ptr); case ACT_STONE_MUD: @@ -306,7 +306,7 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act case ACT_ALCHEMY: msg_print(_("明るい黄色に輝いている...", "It glows bright yellow...")); (void)alchemy(user_ptr); - return TRUE; + return true; case ACT_DIM_DOOR: return activate_dimension_door(user_ptr); case ACT_TELEPORT: @@ -326,7 +326,7 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act case ACT_BRAND_FIRE_BOLTS: msg_format(_("%sが深紅に輝いた...", "Your %s glows deep red..."), name); brand_bolts(user_ptr); - return TRUE; + return true; case ACT_RECHARGE_XTRA: return activate_recharge_extra(user_ptr, name); case ACT_LORE: @@ -342,7 +342,7 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act return activate_ultimate_resistance(user_ptr); case ACT_CAST_OFF: (void)cosmic_cast_off(user_ptr, o_ptr_ptr); - return TRUE; + return true; case ACT_FALLING_STAR: return activate_toragoroshi(user_ptr); case ACT_GRAND_CROSS: @@ -353,12 +353,12 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act msg_format(_("%sはあなたの体力を奪った...", "The %s drains your vitality..."), name); take_hit(user_ptr, DAMAGE_LOSELIFE, damroll(3, 8), _("加速した疲労", "the strain of haste")); (void)set_fast(user_ptr, user_ptr->fast + 25 + randint1(25), FALSE); - return TRUE; + return true; case ACT_FISHING: return fishing(user_ptr); case ACT_INROU: mitokohmon(user_ptr); - return TRUE; + return true; case ACT_MURAMASA: return activate_muramasa(user_ptr, o_ptr); case ACT_BLOODY_MOON: @@ -369,6 +369,6 @@ bool switch_activation(player_type *user_ptr, object_type **o_ptr_ptr, const act return activate_protection_elbereth(user_ptr); default: msg_format(_("Unknown activation effect: %d.", "Unknown activation effect: %d."), act_ptr->index); - return FALSE; + return false; } } diff --git a/src/object-activation/activation-teleport.cpp b/src/object-activation/activation-teleport.cpp index a9fcd41a3..2926934a4 100644 --- a/src/object-activation/activation-teleport.cpp +++ b/src/object-activation/activation-teleport.cpp @@ -15,10 +15,10 @@ bool activate_teleport_away(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; (void)fire_beam(user_ptr, GF_AWAY_ALL, dir, user_ptr->lev); - return TRUE; + return true; } bool activate_escape(player_type *user_ptr) @@ -30,37 +30,37 @@ bool activate_escape(player_type *user_ptr) case 4: case 5: teleport_player(user_ptr, 10, TELEPORT_SPONTANEOUS); - return TRUE; + return true; case 6: case 7: case 8: case 9: case 10: teleport_player(user_ptr, 222, TELEPORT_SPONTANEOUS); - return TRUE; + return true; case 11: case 12: (void)stair_creation(user_ptr); - return TRUE; + return true; default: if (!get_check(_("この階を去りますか？", "Leave this level? "))) - return TRUE; + return true; if (autosave_l) do_cmd_save_game(user_ptr, TRUE); - user_ptr->leaving = TRUE; - return TRUE; + user_ptr->leaving = true; + return true; } } bool activate_teleport_level(player_type *user_ptr) { if (!get_check(_("本当に他の階にテレポートしますか？", "Are you sure? (Teleport Level)"))) - return FALSE; + return false; teleport_level(user_ptr, 0); - return TRUE; + return true; } bool activate_dimension_door(player_type *user_ptr) @@ -73,11 +73,11 @@ bool activate_teleport(player_type *user_ptr) { msg_print(_("周りの空間が歪んでいる...", "It twists space around you...")); teleport_player(user_ptr, 100, TELEPORT_SPONTANEOUS); - return TRUE; + return true; } bool activate_phase_door(player_type *user_ptr) { teleport_player(user_ptr, 10, TELEPORT_SPONTANEOUS); - return TRUE; + return true; } diff --git a/src/object-enchant/apply-magic-armor.cpp b/src/object-enchant/apply-magic-armor.cpp index 29a895207..933993dbb 100644 --- a/src/object-enchant/apply-magic-armor.cpp +++ b/src/object-enchant/apply-magic-armor.cpp @@ -80,19 +80,19 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; } - while (TRUE) { - bool okay_flag = TRUE; + while (true) { + bool okay_flag = true; o_ptr->name2 = get_random_ego(INVEN_BODY, TRUE); switch (o_ptr->name2) { case EGO_DWARVEN: if (o_ptr->tval != TV_HARD_ARMOR) { - okay_flag = FALSE; + okay_flag = false; } break; case EGO_DRUID: if (o_ptr->tval != TV_SOFT_ARMOR) { - okay_flag = FALSE; + okay_flag = false; } break; @@ -104,8 +104,8 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; } } else if (power < -1) { - while (TRUE) { - bool okay_flag = TRUE; + while (true) { + bool okay_flag = true; o_ptr->name2 = get_random_ego(INVEN_BODY, FALSE); switch (o_ptr->name2) { @@ -139,7 +139,7 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; } - while (TRUE) { + while (true) { o_ptr->name2 = get_random_ego(INVEN_SUB_HAND, TRUE); if (o_ptr->sval != SV_SMALL_METAL_SHIELD && o_ptr->sval != SV_LARGE_METAL_SHIELD && o_ptr->name2 == EGO_S_DWARVEN) { continue; @@ -210,8 +210,8 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; } - while (TRUE) { - bool ok_flag = TRUE; + while (true) { + bool ok_flag = true; o_ptr->name2 = get_random_ego(INVEN_HEAD, TRUE); switch (o_ptr->name2) { @@ -228,7 +228,7 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; default: /* not existing crown (wisdom,lite, etc...) */ - ok_flag = FALSE; + ok_flag = false; } if (ok_flag) @@ -237,8 +237,8 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; } else if (power < -1) { - while (TRUE) { - bool ok_flag = TRUE; + while (true) { + bool ok_flag = true; o_ptr->name2 = get_random_ego(INVEN_HEAD, FALSE); switch (o_ptr->name2) { @@ -270,8 +270,8 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; } - while (TRUE) { - bool ok_flag = TRUE; + while (true) { + bool ok_flag = true; o_ptr->name2 = get_random_ego(INVEN_HEAD, TRUE); switch (o_ptr->name2) { case EGO_BRILLIANCE: @@ -286,7 +286,7 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; default: /* not existing helm (Magi, Might, etc...)*/ - ok_flag = FALSE; + ok_flag = false; } if (ok_flag) @@ -295,13 +295,13 @@ void apply_magic_armor(player_type *owner_ptr, object_type *o_ptr, DEPTH level, break; } else if (power < -1) { - while (TRUE) { - bool ok_flag = TRUE; + while (true) { + bool ok_flag = true; o_ptr->name2 = get_random_ego(INVEN_HEAD, FALSE); switch (o_ptr->name2) { case EGO_ANCIENT_CURSE: - ok_flag = FALSE; + ok_flag = false; break; default: break; diff --git a/src/object-enchant/apply-magic-others.cpp b/src/object-enchant/apply-magic-others.cpp index 5cc1c2515..d8fe0094c 100644 --- a/src/object-enchant/apply-magic-others.cpp +++ b/src/object-enchant/apply-magic-others.cpp @@ -70,15 +70,15 @@ void apply_magic_others(player_type *owner_ptr, object_type *o_ptr, int power) become_random_artifact(owner_ptr, o_ptr, FALSE); } else if ((power == 2) || ((power == 1) && one_in_(3))) { while (!o_ptr->name2) { - while (TRUE) { - bool okay_flag = TRUE; + while (true) { + bool okay_flag = true; o_ptr->name2 = get_random_ego(INVEN_LITE, TRUE); switch (o_ptr->name2) { case EGO_LITE_LONG: if (o_ptr->sval == SV_LITE_FEANOR) - okay_flag = FALSE; + okay_flag = false; } if (okay_flag) @@ -126,7 +126,7 @@ void apply_magic_others(player_type *owner_ptr, object_type *o_ptr, int power) PARAMETER_VALUE i = 1; int check; monster_race *r_ptr; - while (TRUE) { + while (true) { i = randint1(max_r_idx - 1); if (!item_monster_okay(owner_ptr, i)) @@ -164,7 +164,7 @@ void apply_magic_others(player_type *owner_ptr, object_type *o_ptr, int power) } get_mon_num_prep(owner_ptr, item_monster_okay, NULL); - while (TRUE) { + while (true) { i = get_mon_num(owner_ptr, 0, floor_ptr->dun_level, 0); r_ptr = &r_info[i]; check = (floor_ptr->dun_level < r_ptr->level) ? (r_ptr->level - floor_ptr->dun_level) : 0; @@ -186,7 +186,7 @@ void apply_magic_others(player_type *owner_ptr, object_type *o_ptr, int power) case TV_STATUE: { PARAMETER_VALUE i = 1; monster_race *r_ptr; - while (TRUE) { + while (true) { i = randint1(max_r_idx - 1); r_ptr = &r_info[i]; if (!r_ptr->rarity) diff --git a/src/object-enchant/apply-magic-weapon.cpp b/src/object-enchant/apply-magic-weapon.cpp index 3210c3003..c3c518de6 100644 --- a/src/object-enchant/apply-magic-weapon.cpp +++ b/src/object-enchant/apply-magic-weapon.cpp @@ -89,7 +89,7 @@ void apply_magic_weapon(player_type *owner_ptr, object_type *o_ptr, DEPTH level, become_random_artifact(owner_ptr, o_ptr, FALSE); break; } - while (TRUE) { + while (true) { o_ptr->name2 = get_random_ego(INVEN_MAIN_HAND, TRUE); if (o_ptr->name2 == EGO_SHARPNESS && o_ptr->tval != TV_SWORD) continue; @@ -122,7 +122,7 @@ void apply_magic_weapon(player_type *owner_ptr, object_type *o_ptr, DEPTH level, } else if (power < -1) { if (randint0(MAX_DEPTH) < level) { int n = 0; - while (TRUE) { + while (true) { o_ptr->name2 = get_random_ego(INVEN_MAIN_HAND, FALSE); if (o_ptr->name2 == EGO_WEIRD && o_ptr->tval != TV_SWORD) { continue; diff --git a/src/object-enchant/object-boost.cpp b/src/object-enchant/object-boost.cpp index 785c96ebd..e6b043dfe 100644 --- a/src/object-enchant/object-boost.cpp +++ b/src/object-enchant/object-boost.cpp @@ -127,7 +127,7 @@ void one_sustain(object_type *o_ptr) */ bool add_esp_strong(object_type *o_ptr) { - bool nonliv = FALSE; + bool nonliv = false; switch (randint1(3)) { case 1: @@ -138,7 +138,7 @@ bool add_esp_strong(object_type *o_ptr) break; case 3: add_flag(o_ptr->art_flags, TR_ESP_NONLIVING); - nonliv = TRUE; + nonliv = true; break; } diff --git a/src/object-enchant/object-curse.cpp b/src/object-enchant/object-curse.cpp index 227d3af45..2a31aee4c 100644 --- a/src/object-enchant/object-curse.cpp +++ b/src/object-enchant/object-curse.cpp @@ -31,7 +31,7 @@ TRC get_curse(player_type *owner_ptr, int power, object_type *o_ptr) { TRC new_curse; - while (TRUE) { + while (true) { new_curse = static_cast(rand_range(static_cast(TRC::TY_CURSE), static_cast(TRC::MAX) - 1)); if (power == 2) { if (TRC_HEAVY_MASK.has_not(new_curse)) @@ -84,17 +84,17 @@ void curse_equipment(player_type *owner_ptr, PERCENTAGE chance, PERCENTAGE heavy return; } - bool changed = FALSE; + bool changed = false; int curse_power = 0; if ((randint1(100) <= heavy_chance) && (object_is_artifact(o_ptr) || object_is_ego(o_ptr))) { if (o_ptr->curse_flags.has_not(TRC::HEAVY_CURSE)) - changed = TRUE; + changed = true; o_ptr->curse_flags.set(TRC::HEAVY_CURSE); o_ptr->curse_flags.set(TRC::CURSED); curse_power++; } else { if (!object_is_cursed(o_ptr)) - changed = TRUE; + changed = true; o_ptr->curse_flags.set(TRC::CURSED); } @@ -103,7 +103,7 @@ void curse_equipment(player_type *owner_ptr, PERCENTAGE chance, PERCENTAGE heavy auto new_curse = get_curse(owner_ptr, curse_power, o_ptr); if (o_ptr->curse_flags.has_not(new_curse)) { - changed = TRUE; + changed = true; o_ptr->curse_flags.set(new_curse); } diff --git a/src/object-hook/hook-armor.cpp b/src/object-hook/hook-armor.cpp index 7e1b7b48a..4938899d5 100644 --- a/src/object-hook/hook-armor.cpp +++ b/src/object-hook/hook-armor.cpp @@ -16,13 +16,13 @@ bool item_tester_hook_wear(player_type *player_ptr, object_type *o_ptr) { if ((o_ptr->tval == TV_SOFT_ARMOR) && (o_ptr->sval == SV_ABUNAI_MIZUGI)) if (player_ptr->psex == SEX_MALE) - return FALSE; + return false; /* Check for a usable slot */ if (wield_slot(player_ptr, o_ptr) >= INVEN_MAIN_HAND) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -49,7 +49,7 @@ bool object_is_armour(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if (TV_ARMOR_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_ARMOR_END) - return TRUE; + return true; - return FALSE; + return false; } diff --git a/src/object-hook/hook-bow.cpp b/src/object-hook/hook-bow.cpp index 344c12153..aba8a4ab0 100644 --- a/src/object-hook/hook-bow.cpp +++ b/src/object-hook/hook-bow.cpp @@ -15,10 +15,10 @@ bool item_tester_hook_convertible(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if ((o_ptr->tval == TV_JUNK) || (o_ptr->tval == TV_SKELETON)) - return TRUE; + return true; if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_SKELETON)) - return TRUE; - return FALSE; + return true; + return false; } /*! @@ -35,14 +35,14 @@ bool item_tester_hook_ammo(player_type *player_ptr, object_type *o_ptr) case TV_SHOT: case TV_ARROW: case TV_BOLT: { - return TRUE; + return true; } default: break; } - return FALSE; + return false; } /*! @@ -53,7 +53,7 @@ bool item_tester_hook_ammo(player_type *player_ptr, object_type *o_ptr) bool object_is_ammo(object_type *o_ptr) { if (TV_MISSILE_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_MISSILE_END) - return TRUE; + return true; - return FALSE; + return false; } diff --git a/src/object-hook/hook-enchant.cpp b/src/object-hook/hook-enchant.cpp index 789ff285a..33b36b208 100644 --- a/src/object-hook/hook-enchant.cpp +++ b/src/object-hook/hook-enchant.cpp @@ -17,58 +17,58 @@ bool object_is_rare(object_type *o_ptr) switch (o_ptr->tval) { case TV_HAFTED: if (o_ptr->sval == SV_MACE_OF_DISRUPTION || o_ptr->sval == SV_WIZSTAFF) - return TRUE; + return true; break; case TV_POLEARM: if (o_ptr->sval == SV_SCYTHE_OF_SLICING || o_ptr->sval == SV_DEATH_SCYTHE) - return TRUE; + return true; break; case TV_SWORD: if (o_ptr->sval == SV_BLADE_OF_CHAOS || o_ptr->sval == SV_DIAMOND_EDGE || o_ptr->sval == SV_POISON_NEEDLE || o_ptr->sval == SV_HAYABUSA) - return TRUE; + return true; break; case TV_SHIELD: if (o_ptr->sval == SV_DRAGON_SHIELD || o_ptr->sval == SV_MIRROR_SHIELD) - return TRUE; + return true; break; case TV_HELM: if (o_ptr->sval == SV_DRAGON_HELM) - return TRUE; + return true; break; case TV_BOOTS: if (o_ptr->sval == SV_PAIR_OF_DRAGON_GREAVE) - return TRUE; + return true; break; case TV_CLOAK: if (o_ptr->sval == SV_ELVEN_CLOAK || o_ptr->sval == SV_ETHEREAL_CLOAK || o_ptr->sval == SV_SHADOW_CLOAK) - return TRUE; + return true; break; case TV_GLOVES: if (o_ptr->sval == SV_SET_OF_DRAGON_GLOVES) - return TRUE; + return true; break; case TV_SOFT_ARMOR: if (o_ptr->sval == SV_KUROSHOUZOKU || o_ptr->sval == SV_ABUNAI_MIZUGI) - return TRUE; + return true; break; case TV_DRAG_ARMOR: - return TRUE; + return true; default: break; } /* Any others are not "rare" objects. */ - return FALSE; + return false; } /*! diff --git a/src/object-hook/hook-expendable.cpp b/src/object-hook/hook-expendable.cpp index c8f02d793..3dfe07005 100644 --- a/src/object-hook/hook-expendable.cpp +++ b/src/object-hook/hook-expendable.cpp @@ -26,18 +26,18 @@ bool item_tester_hook_eatable(player_type *player_ptr, object_type *o_ptr) { if (o_ptr->tval == TV_FOOD) - return TRUE; + return true; auto food_type = player_race_food(player_ptr); if (food_type == PlayerRaceFood::MANA) { if (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND) - return TRUE; + return true; } else if (food_type == PlayerRaceFood::CORPSE) { if (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_CORPSE && angband_strchr("pht", r_info[o_ptr->pval].d_char)) - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -49,12 +49,12 @@ bool item_tester_hook_eatable(player_type *player_ptr, object_type *o_ptr) bool item_tester_hook_quaff(player_type *player_ptr, object_type *o_ptr) { if (o_ptr->tval == TV_POTION) - return TRUE; + return true; if (player_race_food(player_ptr) == PlayerRaceFood::OIL && o_ptr->tval == TV_FLASK && o_ptr->sval == SV_FLASK_OIL) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -69,9 +69,9 @@ bool item_tester_hook_readable(player_type *player_ptr, object_type *o_ptr) (void)player_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 true; - return FALSE; + return false; } /*! @@ -86,9 +86,9 @@ bool item_tester_refill_lantern(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if ((o_ptr->tval == TV_FLASK) || ((o_ptr->tval == TV_LITE) && (o_ptr->sval == SV_LITE_LANTERN))) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -103,9 +103,9 @@ bool object_can_refill_torch(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if ((o_ptr->tval == TV_LITE) && (o_ptr->sval == SV_LITE_TORCH)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -118,7 +118,7 @@ bool can_player_destroy_object(player_type *player_ptr, object_type *o_ptr) { /* Artifacts cannot be destroyed */ if (!object_is_artifact(o_ptr)) - return TRUE; + return true; if (!object_is_known(o_ptr)) { byte feel = FEEL_SPECIAL; @@ -129,10 +129,10 @@ bool can_player_destroy_object(player_type *player_ptr, object_type *o_ptr) o_ptr->ident |= IDENT_SENSE; player_ptr->update |= (PU_COMBINE); player_ptr->window_flags |= (PW_INVEN | PW_EQUIP); - return FALSE; + return false; } - return FALSE; + return false; } /*! diff --git a/src/object-hook/hook-magic.cpp b/src/object-hook/hook-magic.cpp index 3d7b79656..9202789ac 100644 --- a/src/object-hook/hook-magic.cpp +++ b/src/object-hook/hook-magic.cpp @@ -23,13 +23,13 @@ bool item_tester_hook_activate(player_type *player_ptr, object_type *o_ptr) BIT_FLAGS flags[TR_FLAG_SIZE]; if (!object_is_known(o_ptr)) - return FALSE; + return false; object_flags(player_ptr, o_ptr, flags); if (has_flag(flags, TR_ACTIVATE)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -45,7 +45,7 @@ bool item_tester_hook_use(player_type *player_ptr, object_type *o_ptr) BIT_FLAGS flags[TR_FLAG_SIZE]; if (o_ptr->tval == player_ptr->tval_ammo) - return TRUE; + return true; switch (o_ptr->tval) { case TV_SPIKE: @@ -55,25 +55,25 @@ bool item_tester_hook_use(player_type *player_ptr, object_type *o_ptr) case TV_SCROLL: case TV_POTION: case TV_FOOD: { - return TRUE; + return true; } default: { int i; if (!object_is_known(o_ptr)) - return FALSE; + return false; for (i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) { if (&player_ptr->inventory_list[i] == o_ptr) { object_flags(player_ptr, o_ptr, flags); if (has_flag(flags, TR_ACTIVATE)) - return TRUE; + return true; } } } } - return FALSE; + return false; } /*! @@ -107,12 +107,12 @@ bool item_tester_learn_spell(player_type *player_ptr, object_type *o_ptr) } if ((o_ptr->tval < TV_LIFE_BOOK) || (o_ptr->tval > (TV_LIFE_BOOK + static_cast(MAX_REALM) - 1))) - return FALSE; + return false; if ((o_ptr->tval == TV_MUSIC_BOOK) && (player_ptr->pclass == CLASS_BARD)) - return TRUE; + return true; else if (!is_magic(tval2realm(o_ptr->tval))) - return FALSE; + return false; return (get_realm1_book(player_ptr) == o_ptr->tval) || (get_realm2_book(player_ptr) == o_ptr->tval) || (choices & (0x0001U << (tval2realm(o_ptr->tval) - 1))); } @@ -128,10 +128,10 @@ bool item_tester_high_level_book(object_type *o_ptr) || (o_ptr->tval == TV_DEATH_BOOK) || (o_ptr->tval == TV_TRUMP_BOOK) || (o_ptr->tval == TV_CRAFT_BOOK) || (o_ptr->tval == TV_DEMON_BOOK) || (o_ptr->tval == TV_CRUSADE_BOOK) || (o_ptr->tval == TV_MUSIC_BOOK) || (o_ptr->tval == TV_HEX_BOOK)) { if (o_ptr->sval > 1) - return TRUE; + return true; else - return FALSE; + return false; } - return FALSE; + return false; } diff --git a/src/object-hook/hook-perception.cpp b/src/object-hook/hook-perception.cpp index 495c78960..e1d7d35ab 100644 --- a/src/object-hook/hook-perception.cpp +++ b/src/object-hook/hook-perception.cpp @@ -18,13 +18,13 @@ bool item_tester_hook_nameless_weapon_armour(player_type *player_ptr, object_typ /* Require weapon or armour */ if (!object_is_weapon_armour_ammo(player_ptr, o_ptr)) - return FALSE; + return false; /* Require nameless object if the object is well known */ if (object_is_known(o_ptr) && !object_is_nameless(player_ptr, o_ptr)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -52,7 +52,7 @@ bool item_tester_hook_identify_weapon_armour(player_type *player_ptr, object_typ if (object_is_known(o_ptr)) - return FALSE; + return false; return object_is_weapon_armour_ammo(player_ptr, o_ptr); } @@ -80,7 +80,7 @@ bool item_tester_hook_identify_fully_weapon_armour(player_type *player_ptr, obje (void)player_ptr; if (!item_tester_hook_identify_fully(player_ptr, o_ptr)) - return FALSE; + return false; return object_is_weapon_armour_ammo(player_ptr, o_ptr); } diff --git a/src/object-hook/hook-quest.cpp b/src/object-hook/hook-quest.cpp index 207d6076f..b6fd01b37 100644 --- a/src/object-hook/hook-quest.cpp +++ b/src/object-hook/hook-quest.cpp @@ -22,24 +22,24 @@ bool object_is_bounty(player_type *player_ptr, object_type *o_ptr) int i; if (o_ptr->tval != TV_CORPSE) - return FALSE; + return false; if (vanilla_town) - return FALSE; + return false; if (player_ptr->today_mon > 0 && (streq(r_info[o_ptr->pval].name.c_str(), r_info[current_world_ptr->today_mon].name.c_str()))) - return TRUE; + return true; if (o_ptr->pval == MON_TSUCHINOKO) - return TRUE; + return true; for (i = 0; i < MAX_BOUNTY; i++) if (o_ptr->pval == current_world_ptr->bounty_r_idx[i]) break; if (i < MAX_BOUNTY) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -50,15 +50,15 @@ bool object_is_bounty(player_type *player_ptr, object_type *o_ptr) bool object_is_quest_target(QUEST_IDX quest_idx, object_type *o_ptr) { if (quest_idx == 0) - return FALSE; + return false; ARTIFACT_IDX a_idx = quest[quest_idx].k_idx; if (a_idx == 0) - return FALSE; + return false; artifact_type *a_ptr = &a_info[a_idx]; if (a_ptr->gen_flags.has(TRG::INSTA_ART)) - return FALSE; + return false; return (o_ptr->tval == a_ptr->tval) && (o_ptr->sval == a_ptr->sval); } diff --git a/src/object-hook/hook-weapon.cpp b/src/object-hook/hook-weapon.cpp index 28771bf8f..9d4b7baa9 100644 --- a/src/object-hook/hook-weapon.cpp +++ b/src/object-hook/hook-weapon.cpp @@ -22,18 +22,18 @@ bool item_tester_hook_orthodox_melee_weapons(player_type *player_ptr, object_typ case TV_HAFTED: case TV_POLEARM: case TV_DIGGING: { - return TRUE; + return true; } case TV_SWORD: { if (o_ptr->sval != SV_POISON_NEEDLE) - return TRUE; + return true; } default: break; } - return FALSE; + return false; } /*! @@ -48,9 +48,9 @@ bool item_tester_hook_melee_weapon(player_type *player_ptr, object_type *o_ptr) /* Check for a usable slot */ if ((o_ptr->tval >= TV_DIGGING) && (o_ptr->tval <= TV_SWORD)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -64,15 +64,15 @@ bool item_tester_hook_broken_weapon(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if (o_ptr->tval != TV_SWORD) - return FALSE; + return false; switch (o_ptr->sval) { case SV_BROKEN_DAGGER: case SV_BROKEN_SWORD: - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -86,9 +86,9 @@ bool item_tester_hook_boomerang(player_type *player_ptr, object_type *o_ptr) (void)player_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 true; - return FALSE; + return false; } /*! @@ -103,9 +103,9 @@ bool item_tester_hook_mochikae(player_type *player_ptr, 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 true; - return FALSE; + return false; } /*! @@ -117,7 +117,7 @@ bool object_is_favorite(player_type *player_ptr, object_type *o_ptr) { /* Only melee weapons match */ if (!(o_ptr->tval == TV_POLEARM || o_ptr->tval == TV_SWORD || o_ptr->tval == TV_DIGGING || o_ptr->tval == TV_HAFTED)) { - return FALSE; + return false; } /* Favorite weapons are varied depend on the class */ @@ -127,7 +127,7 @@ bool object_is_favorite(player_type *player_ptr, object_type *o_ptr) object_flags_known(player_ptr, o_ptr, flgs); if (!has_flag(flgs, TR_BLESSED) && !(o_ptr->tval == TV_HAFTED)) - return FALSE; + return false; break; } @@ -135,7 +135,7 @@ bool object_is_favorite(player_type *player_ptr, object_type *o_ptr) case CLASS_FORCETRAINER: /* Icky to wield? */ if (!(s_info[player_ptr->pclass].w_max[o_ptr->tval - TV_WEAPON_BEGIN][o_ptr->sval])) - return FALSE; + return false; break; case CLASS_BEASTMASTER: @@ -145,28 +145,28 @@ bool object_is_favorite(player_type *player_ptr, object_type *o_ptr) /* Is it known to be suitable to using while riding? */ if (!(has_flag(flgs, TR_RIDING))) - return FALSE; + return false; break; } case CLASS_SORCERER: if (s_info[player_ptr->pclass].w_max[o_ptr->tval - TV_WEAPON_BEGIN][o_ptr->sval] < WEAPON_EXP_MASTER) - return FALSE; + return false; break; case CLASS_NINJA: /* Icky to wield? */ if (s_info[player_ptr->pclass].w_max[o_ptr->tval - TV_WEAPON_BEGIN][o_ptr->sval] <= WEAPON_EXP_BEGINNER) - return FALSE; + return false; break; default: /* All weapons are okay for non-special classes */ - return TRUE; + return true; } - return TRUE; + return true; } /*! @@ -180,9 +180,9 @@ bool object_is_weapon(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if (TV_WEAPON_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_WEAPON_END) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -194,9 +194,9 @@ bool object_is_weapon(player_type *player_ptr, object_type *o_ptr) bool object_is_weapon_ammo(object_type *o_ptr) { if (TV_MISSILE_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_WEAPON_END) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -210,9 +210,9 @@ bool object_is_weapon_armour_ammo(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if (object_is_weapon_ammo(o_ptr) || object_is_armour(player_ptr, o_ptr)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -223,9 +223,9 @@ bool object_is_weapon_armour_ammo(player_type *player_ptr, object_type *o_ptr) bool object_is_melee_weapon(object_type *o_ptr) { if (TV_DIGGING <= o_ptr->tval && o_ptr->tval <= TV_SWORD) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -236,9 +236,9 @@ bool object_is_melee_weapon(object_type *o_ptr) bool object_is_wearable(object_type *o_ptr) { if (TV_WEARABLE_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_WEARABLE_END) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -249,9 +249,9 @@ bool object_is_wearable(object_type *o_ptr) bool object_is_equipment(object_type *o_ptr) { if (TV_EQUIP_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_EQUIP_END) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -262,9 +262,9 @@ bool object_is_equipment(object_type *o_ptr) bool object_refuse_enchant_weapon(object_type *o_ptr) { if (o_ptr->tval == TV_SWORD && o_ptr->sval == SV_POISON_NEEDLE) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -279,9 +279,9 @@ bool object_allow_enchant_weapon(player_type *player_ptr, object_type *o_ptr) (void)player_ptr; if (object_is_weapon_ammo(o_ptr) && !object_refuse_enchant_weapon(o_ptr)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -296,9 +296,9 @@ bool object_allow_enchant_melee_weapon(player_type *player_ptr, object_type *o_p (void)player_ptr; if (object_is_melee_weapon(o_ptr) && !object_refuse_enchant_weapon(o_ptr)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -310,7 +310,7 @@ bool object_allow_enchant_melee_weapon(player_type *player_ptr, object_type *o_p bool object_allow_two_hands_wielding(object_type *o_ptr) { if (object_is_melee_weapon(o_ptr) && ((o_ptr->weight > 99) || (o_ptr->tval == TV_POLEARM))) - return TRUE; + return true; - return FALSE; + return false; } diff --git a/src/object-use/quaff-execution.cpp b/src/object-use/quaff-execution.cpp index 1649d9748..4ac882c44 100644 --- a/src/object-use/quaff-execution.cpp +++ b/src/object-use/quaff-execution.cpp @@ -102,7 +102,7 @@ static bool detonation(player_type *creature_ptr) take_hit(creature_ptr, DAMAGE_NOESCAPE, damroll(50, 20), _("爆発の薬", "a potion of Detonation")); (void)set_stun(creature_ptr, creature_ptr->stun + 75); (void)set_cut(creature_ptr, creature_ptr->cut + 5000); - return TRUE; + return true; } /*! diff --git a/src/object-use/read-execution.cpp b/src/object-use/read-execution.cpp index d3ed818e9..c131fd128 100644 --- a/src/object-use/read-execution.cpp +++ b/src/object-use/read-execution.cpp @@ -98,9 +98,9 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) if (hex_spelling_any(creature_ptr) && ((creature_ptr->lev < 35) || hex_spell_fully(creature_ptr))) stop_hex_spell_all(creature_ptr); - ident = FALSE; + ident = false; lev = k_info[o_ptr->k_idx].level; - used_up = TRUE; + used_up = true; if (o_ptr->tval == TV_SCROLL) { switch (o_ptr->sval) { case SV_SCROLL_DARKNESS: { @@ -108,19 +108,19 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) (void)set_blind(creature_ptr, creature_ptr->blind + 3 + randint1(5)); if (unlite_area(creature_ptr, 10, 3)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_AGGRAVATE_MONSTER: { msg_print(_("カン高くうなる様な音が辺りを覆った。", "There is a high pitched humming noise.")); aggravate_monsters(creature_ptr, 0); - ident = TRUE; + ident = true; break; } case SV_SCROLL_CURSE_ARMOR: { if (curse_armor(creature_ptr)) - ident = TRUE; + ident = true; break; } @@ -134,7 +134,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) k = INVEN_SUB_HAND; if (k && curse_weapon_object(creature_ptr, FALSE, &creature_ptr->inventory_list[k])) - ident = TRUE; + ident = true; break; } @@ -142,7 +142,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) for (k = 0; k < randint1(3); k++) { if (summon_specific(creature_ptr, 0, creature_ptr->y, creature_ptr->x, creature_ptr->current_floor_ptr->dun_level, SUMMON_NONE, PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)) { - ident = TRUE; + ident = true; } } @@ -152,7 +152,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) for (k = 0; k < randint1(3); k++) { if (summon_specific(creature_ptr, 0, creature_ptr->y, creature_ptr->x, creature_ptr->current_floor_ptr->dun_level, SUMMON_UNDEAD, PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)) { - ident = TRUE; + ident = true; } } @@ -161,181 +161,181 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) case SV_SCROLL_SUMMON_PET: { if (summon_specific( creature_ptr, -1, creature_ptr->y, creature_ptr->x, creature_ptr->current_floor_ptr->dun_level, SUMMON_NONE, PM_ALLOW_GROUP | PM_FORCE_PET)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_SUMMON_KIN: { if (summon_kin_player(creature_ptr, creature_ptr->lev, creature_ptr->y, creature_ptr->x, PM_FORCE_PET | PM_ALLOW_GROUP)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_TRAP_CREATION: { if (trap_creation(creature_ptr, creature_ptr->y, creature_ptr->x)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_PHASE_DOOR: { teleport_player(creature_ptr, 10, TELEPORT_SPONTANEOUS); - ident = TRUE; + ident = true; break; } case SV_SCROLL_TELEPORT: { teleport_player(creature_ptr, 100, TELEPORT_SPONTANEOUS); - ident = TRUE; + ident = true; break; } case SV_SCROLL_TELEPORT_LEVEL: { (void)teleport_level(creature_ptr, 0); - ident = TRUE; + ident = true; break; } case SV_SCROLL_WORD_OF_RECALL: { if (!recall_player(creature_ptr, randint0(21) + 15)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_IDENTIFY: { if (!ident_spell(creature_ptr, FALSE, TV_NONE)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_STAR_IDENTIFY: { if (!identify_fully(creature_ptr, FALSE, TV_NONE)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_REMOVE_CURSE: { if (remove_curse(creature_ptr)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_STAR_REMOVE_CURSE: { if (remove_all_curse(creature_ptr)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_ENCHANT_ARMOR: { - ident = TRUE; + ident = true; if (!enchant_spell(creature_ptr, 0, 0, 1)) - used_up = FALSE; + used_up = false; break; } case SV_SCROLL_ENCHANT_WEAPON_TO_HIT: { if (!enchant_spell(creature_ptr, 1, 0, 0)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_ENCHANT_WEAPON_TO_DAM: { if (!enchant_spell(creature_ptr, 0, 1, 0)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_STAR_ENCHANT_ARMOR: { if (!enchant_spell(creature_ptr, 0, 0, randint1(3) + 2)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_STAR_ENCHANT_WEAPON: { if (!enchant_spell(creature_ptr, randint1(3), randint1(3), 0)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_RECHARGING: { if (!recharge(creature_ptr, 130)) - used_up = FALSE; + used_up = false; - ident = TRUE; + ident = true; break; } case SV_SCROLL_MUNDANITY: { - ident = TRUE; + ident = true; if (!mundane_spell(creature_ptr, FALSE)) - used_up = FALSE; + used_up = false; break; } case SV_SCROLL_LIGHT: { if (lite_area(creature_ptr, damroll(2, 8), 2)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_MAPPING: { map_area(creature_ptr, DETECT_RAD_MAP); - ident = TRUE; + ident = true; break; } case SV_SCROLL_DETECT_GOLD: { if (detect_treasure(creature_ptr, DETECT_RAD_DEFAULT) || detect_objects_gold(creature_ptr, DETECT_RAD_DEFAULT)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_DETECT_ITEM: { if (detect_objects_normal(creature_ptr, DETECT_RAD_DEFAULT)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_DETECT_TRAP: { if (detect_traps(creature_ptr, DETECT_RAD_DEFAULT, known)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_DETECT_DOOR: { if (detect_doors(creature_ptr, DETECT_RAD_DEFAULT) || detect_stairs(creature_ptr, DETECT_RAD_DEFAULT)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_DETECT_INVIS: { if (detect_monsters_invis(creature_ptr, DETECT_RAD_DEFAULT)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_SATISFY_HUNGER: { if (set_food(creature_ptr, PY_FOOD_MAX - 1)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_BLESSING: { if (set_blessed(creature_ptr, creature_ptr->blessed + randint1(12) + 6, FALSE)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_HOLY_CHANT: { if (set_blessed(creature_ptr, creature_ptr->blessed + randint1(24) + 12, FALSE)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_HOLY_PRAYER: { if (set_blessed(creature_ptr, creature_ptr->blessed + randint1(48) + 24, FALSE)) - ident = TRUE; + ident = true; break; } @@ -344,7 +344,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) msg_print(_("手が輝き始めた。", "Your hands begin to glow.")); creature_ptr->special_attack |= ATTACK_CONFUSE; creature_ptr->redraw |= PR_STATUS; - ident = TRUE; + ident = true; } break; @@ -352,24 +352,24 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) case SV_SCROLL_PROTECTION_FROM_EVIL: { k = 3 * creature_ptr->lev; if (set_protevil(creature_ptr, creature_ptr->protevil + randint1(25) + k, FALSE)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_RUNE_OF_PROTECTION: { create_rune_protection_one(creature_ptr); - ident = TRUE; + ident = true; break; } case SV_SCROLL_TRAP_DOOR_DESTRUCTION: { if (destroy_doors_touch(creature_ptr)) - ident = TRUE; + ident = true; break; } case SV_SCROLL_STAR_DESTRUCTION: { if (destroy_area(creature_ptr, creature_ptr->y, creature_ptr->x, 13 + randint0(5), FALSE)) - ident = TRUE; + ident = true; else msg_print(_("ダンジョンが揺れた...", "The dungeon trembles...")); @@ -377,7 +377,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) } case SV_SCROLL_DISPEL_UNDEAD: { if (dispel_undead(creature_ptr, 80)) - ident = TRUE; + ident = true; break; } @@ -391,27 +391,27 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) creature_ptr->add_spells++; creature_ptr->update |= PU_SPELLS; - ident = TRUE; + ident = true; break; } case SV_SCROLL_GENOCIDE: { (void)symbol_genocide(creature_ptr, 300, TRUE); - ident = TRUE; + ident = true; break; } case SV_SCROLL_MASS_GENOCIDE: { (void)mass_genocide(creature_ptr, 300, TRUE); - ident = TRUE; + ident = true; break; } case SV_SCROLL_ACQUIREMENT: { acquirement(creature_ptr, creature_ptr->y, creature_ptr->x, 1, TRUE, FALSE, FALSE); - ident = TRUE; + ident = true; break; } case SV_SCROLL_STAR_ACQUIREMENT: { acquirement(creature_ptr, creature_ptr->y, creature_ptr->x, randint1(2) + 1, TRUE, FALSE, FALSE); - ident = TRUE; + ident = true; break; } case SV_SCROLL_FIRE: { @@ -419,7 +419,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) if (!(is_oppose_fire(creature_ptr) || has_resist_fire(creature_ptr) || has_immune_fire(creature_ptr))) take_hit(creature_ptr, DAMAGE_NOESCAPE, 50 + randint1(50), _("炎の巻物", "a Scroll of Fire")); - ident = TRUE; + ident = true; break; } case SV_SCROLL_ICE: { @@ -427,7 +427,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) if (!(is_oppose_cold(creature_ptr) || has_resist_cold(creature_ptr) || has_immune_cold(creature_ptr))) take_hit(creature_ptr, DAMAGE_NOESCAPE, 100 + randint1(100), _("氷の巻物", "a Scroll of Ice")); - ident = TRUE; + ident = true; break; } case SV_SCROLL_CHAOS: { @@ -435,7 +435,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) if (!has_resist_chaos(creature_ptr)) take_hit(creature_ptr, DAMAGE_NOESCAPE, 111 + randint1(111), _("ログルスの巻物", "a Scroll of Logrus")); - ident = TRUE; + ident = true; break; } case SV_SCROLL_RUMOR: { @@ -444,30 +444,30 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) display_rumor(creature_ptr, TRUE); msg_print(NULL); msg_print(_("巻物は煙を立てて消え去った！", "The scroll disappears in a puff of smoke!")); - ident = TRUE; + ident = true; break; } case SV_SCROLL_ARTIFACT: { - ident = TRUE; + ident = true; if (!artifact_scroll(creature_ptr)) - used_up = FALSE; + used_up = false; break; } case SV_SCROLL_RESET_RECALL: { - ident = TRUE; + ident = true; if (!reset_recall(creature_ptr)) - used_up = FALSE; + used_up = false; break; } case SV_SCROLL_AMUSEMENT: { - ident = TRUE; + ident = true; amusement(creature_ptr, creature_ptr->y, creature_ptr->x, 1, FALSE); break; } case SV_SCROLL_STAR_AMUSEMENT: { - ident = TRUE; + ident = true; amusement(creature_ptr, creature_ptr->y, creature_ptr->x, randint1(2) + 1, FALSE); break; } @@ -475,7 +475,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) } else if (o_ptr->name1 == ART_GHB) { msg_print(_("私は苦労して『グレーター・ヘル=ビースト』を倒した。", "I had a very hard time to kill the Greater hell-beast, ")); msg_print(_("しかし手に入ったのはこのきたないＴシャツだけだった。", "but all I got was this lousy t-shirt!")); - used_up = FALSE; + used_up = false; } else if (o_ptr->name1 == ART_POWER) { msg_print(_("「一つの指輪は全てを統べ、", "'One Ring to rule them all, ")); msg_print(NULL); @@ -484,7 +484,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) msg_print(_("一つの指輪は全てを捕らえて", "One Ring to bring them all ")); msg_print(NULL); msg_print(_("暗闇の中に繋ぎとめる。」", "and in the darkness bind them.'")); - used_up = FALSE; + used_up = false; } else if (o_ptr->tval == TV_PARCHMENT) { concptr q; GAME_TEXT o_name[MAX_NLEN]; @@ -495,7 +495,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known) path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, q); (void)show_file(creature_ptr, TRUE, buf, o_name, 0, 0); screen_load(); - used_up = FALSE; + used_up = false; } BIT_FLAGS inventory_flags = PU_COMBINE | PU_REORDER | (creature_ptr->update & PU_AUTODESTROY); diff --git a/src/object/item-tester-hooker.cpp b/src/object/item-tester-hooker.cpp index ce2fce62d..fe93ee370 100644 --- a/src/object/item-tester-hooker.cpp +++ b/src/object/item-tester-hooker.cpp @@ -24,22 +24,22 @@ bool (*item_tester_hook)(player_type *, object_type *); bool item_tester_okay(player_type *player_ptr, object_type *o_ptr, tval_type tval) { if (!o_ptr->k_idx) - return FALSE; + return false; if (o_ptr->tval == TV_GOLD) { if (!show_gold_on_floor) - return FALSE; + return false; } if (tval) { if ((tval <= TV_DEATH_BOOK) && (tval >= TV_LIFE_BOOK)) return check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval); else if (tval != o_ptr->tval) - return FALSE; + return false; } if (item_tester_hook == NULL) - return TRUE; + return true; return (*item_tester_hook)(player_ptr, o_ptr); } diff --git a/src/object/object-broken.cpp b/src/object/object-broken.cpp index bf71b74e8..96196997d 100644 --- a/src/object/object-broken.cpp +++ b/src/object/object-broken.cpp @@ -45,32 +45,32 @@ bool hates_acid(object_type *o_ptr) case TV_SOFT_ARMOR: 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 */ case TV_SKELETON: case TV_BOTTLE: case TV_JUNK: { - return TRUE; + return true; } default: break; } - return FALSE; + return false; } /*! @@ -84,14 +84,14 @@ bool hates_elec(object_type *o_ptr) switch (o_ptr->tval) { case TV_RING: case TV_WAND: { - return TRUE; + return true; } default: break; } - return FALSE; + return false; } /*! @@ -117,7 +117,7 @@ bool hates_fire(object_type *o_ptr) case TV_GLOVES: case TV_CLOAK: case TV_SOFT_ARMOR: { - return TRUE; + return true; } /* Books */ @@ -134,25 +134,25 @@ bool hates_fire(object_type *o_ptr) case TV_MUSIC_BOOK: 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; } default: break; } - return FALSE; + return false; } /*! @@ -167,14 +167,14 @@ bool hates_cold(object_type *o_ptr) case TV_POTION: case TV_FLASK: case TV_BOTTLE: { - return TRUE; + return true; } default: break; } - return FALSE; + return false; } /*! @@ -188,11 +188,11 @@ int set_acid_destroy(player_type *owner_ptr, object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; if (!hates_acid(o_ptr)) - return FALSE; + return false; object_flags(owner_ptr, o_ptr, flgs); if (has_flag(flgs, TR_IGNORE_ACID)) - return FALSE; - return TRUE; + return false; + return true; } /*! @@ -206,11 +206,11 @@ int set_elec_destroy(player_type *owner_ptr, object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; if (!hates_elec(o_ptr)) - return FALSE; + return false; object_flags(owner_ptr, o_ptr, flgs); if (has_flag(flgs, TR_IGNORE_ELEC)) - return FALSE; - return TRUE; + return false; + return true; } /*! @@ -224,11 +224,11 @@ int set_fire_destroy(player_type *owner_ptr, object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; if (!hates_fire(o_ptr)) - return FALSE; + return false; object_flags(owner_ptr, o_ptr, flgs); if (has_flag(flgs, TR_IGNORE_FIRE)) - return FALSE; - return TRUE; + return false; + return true; } /*! @@ -242,11 +242,11 @@ int set_cold_destroy(player_type *owner_ptr, object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; if (!hates_cold(o_ptr)) - return FALSE; + return false; object_flags(owner_ptr, o_ptr, flgs); if (has_flag(flgs, TR_IGNORE_COLD)) - return FALSE; - return TRUE; + return false; + return true; } /*! @@ -281,7 +281,7 @@ bool potion_smash_effect(player_type *owner_ptr, MONSTER_IDX who, POSITION y, PO int radius = 2; int dt = 0; int dam = 0; - bool angry = FALSE; + bool angry = false; object_kind *k_ptr = &k_info[k_idx]; switch (k_ptr->sval) { case SV_POTION_SALT_WATER: @@ -295,7 +295,7 @@ bool potion_smash_effect(player_type *owner_ptr, MONSTER_IDX who, POSITION y, PO case SV_POTION_DEC_CHR: case SV_POTION_WATER: /* perhaps a 'water' attack? */ case SV_POTION_APPLE_JUICE: - return TRUE; + return true; case SV_POTION_INFRAVISION: case SV_POTION_DETECT_INVIS: @@ -327,39 +327,39 @@ bool potion_smash_effect(player_type *owner_ptr, MONSTER_IDX who, POSITION y, PO case SV_POTION_INVULNERABILITY: case SV_POTION_NEW_LIFE: /* All of the above potions have no effect when shattered */ - return FALSE; + return false; case SV_POTION_SLOWNESS: dt = GF_OLD_SLOW; dam = 5; - angry = TRUE; + angry = true; break; case SV_POTION_POISON: dt = GF_POIS; dam = 3; - angry = TRUE; + angry = true; break; case SV_POTION_BLINDNESS: dt = GF_DARK; - angry = TRUE; + angry = true; break; case SV_POTION_BOOZE: dt = GF_OLD_CONF; - angry = TRUE; + angry = true; break; case SV_POTION_SLEEP: dt = GF_OLD_SLEEP; - angry = TRUE; + angry = true; break; case SV_POTION_RUINATION: case SV_POTION_DETONATIONS: dt = GF_SHARDS; dam = damroll(25, 25); - angry = TRUE; + angry = true; break; case SV_POTION_DEATH: dt = GF_DEATH_RAY; dam = k_ptr->level * 10; - angry = TRUE; + angry = true; radius = 1; break; case SV_POTION_SPEED: diff --git a/src/object/object-flags.cpp b/src/object/object-flags.cpp index bf699c49c..86e476b04 100644 --- a/src/object/object-flags.cpp +++ b/src/object/object-flags.cpp @@ -99,7 +99,7 @@ void object_flags(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS flgs[TR */ void object_flags_known(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]) { - bool spoil = FALSE; + bool spoil = false; object_kind *k_ptr = &k_info[o_ptr->k_idx]; for (int i = 0; i < TR_FLAG_SIZE; i++) { flgs[i] = 0; diff --git a/src/object/object-info.cpp b/src/object/object-info.cpp index 823b09378..f43ab1039 100644 --- a/src/object/object-info.cpp +++ b/src/object/object-info.cpp @@ -278,7 +278,7 @@ s16b wield_slot(player_type *owner_ptr, object_type *o_ptr) bool check_book_realm(player_type *owner_ptr, const tval_type book_tval, const OBJECT_SUBTYPE_VALUE book_sval) { if (book_tval < TV_LIFE_BOOK) - return FALSE; + return false; if (owner_ptr->pclass == CLASS_SORCERER) { return is_magic(tval2realm(book_tval)); } else if (owner_ptr->pclass == CLASS_RED_MAGE) { diff --git a/src/object/object-kind-hook.cpp b/src/object/object-kind-hook.cpp index feec6cecc..d2ecf32cd 100644 --- a/src/object/object-kind-hook.cpp +++ b/src/object/object-kind-hook.cpp @@ -151,7 +151,7 @@ bool kind_is_good(KIND_OBJECT_IDX k_idx) /* Ammo -- Arrows/Bolts are good */ case TV_BOLT: case TV_ARROW: - return TRUE; + return true; /* Books -- High level books are good (except Arcane books) */ case TV_LIFE_BOOK: @@ -176,7 +176,7 @@ bool kind_is_good(KIND_OBJECT_IDX k_idx) case TV_AMULET: return (k_ptr->sval == SV_AMULET_THE_MAGI) || (k_ptr->sval == SV_AMULET_RESISTANCE); default: - return FALSE; + return false; } } diff --git a/src/object/object-stack.cpp b/src/object/object-stack.cpp index 204879be2..f457cd339 100644 --- a/src/object/object-stack.cpp +++ b/src/object/object-stack.cpp @@ -220,11 +220,11 @@ bool object_similar(object_type *o_ptr, object_type *j_ptr) int total = o_ptr->number + j_ptr->number; int max_num = object_similar_part(o_ptr, j_ptr); if (!max_num) - return FALSE; + return false; if (total > max_num) return 0; - return TRUE; + return true; } /*! diff --git a/src/object/object-value.cpp b/src/object/object-value.cpp index b71b44739..9578d836a 100644 --- a/src/object/object-value.cpp +++ b/src/object/object-value.cpp @@ -163,10 +163,10 @@ PRICE object_value_real(player_type *player_ptr, object_type *o_ptr) value += e_ptr->cost; value += flag_cost(player_ptr, o_ptr, o_ptr->pval); } else { - bool flag = FALSE; + bool flag = false; for (int i = 0; i < TR_FLAG_SIZE; i++) if (o_ptr->art_flags[i]) - flag = TRUE; + flag = true; if (flag) value += flag_cost(player_ptr, o_ptr, o_ptr->pval); diff --git a/src/object/warning.cpp b/src/object/warning.cpp index 7ce386851..439de51d3 100644 --- a/src/object/warning.cpp +++ b/src/object/warning.cpp @@ -84,13 +84,13 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I { monster_race *r_ptr = &r_info[m_ptr->r_idx]; int rlev = r_ptr->level; - bool ignore_wraith_form = FALSE; + bool ignore_wraith_form = false; /* Vulnerability, resistance and immunity */ switch (typ) { case GF_ELEC: if (has_immune_elec(target_ptr)) { - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } dam = dam * calc_elec_damage_rate(target_ptr) / 100; break; @@ -101,7 +101,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_ACID: if (has_immune_acid(target_ptr)) { - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } dam = dam * calc_acid_damage_rate(target_ptr) / 100; break; @@ -109,26 +109,26 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_COLD: case GF_ICE: if (has_immune_cold(target_ptr)) { - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } dam = dam * calc_cold_damage_rate(target_ptr) / 100; break; case GF_FIRE: if (has_immune_fire(target_ptr)) { - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } dam = dam * calc_fire_damage_rate(target_ptr) / 100; break; case GF_PSY_SPEAR: - ignore_wraith_form = TRUE; + ignore_wraith_form = true; break; case GF_ARROW: if (!target_ptr->blind && (has_invuln_arrow(target_ptr))) { dam = 0; - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } break; @@ -139,7 +139,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_DARK: dam = dam * calc_dark_damage_rate(target_ptr, CALC_MAX) / 100; if (has_immune_dark(target_ptr) || target_ptr->wraith_form) - ignore_wraith_form = TRUE; + ignore_wraith_form = true; break; case GF_SHARDS: @@ -161,7 +161,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_NETHER: dam = dam * calc_nether_damage_rate(target_ptr, CALC_MAX) / 100; if (is_specific_player_race(target_ptr, RACE_SPECTRE)) { - ignore_wraith_form = TRUE; + ignore_wraith_form = true; dam = 0; } break; @@ -193,7 +193,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_DEATH_RAY: dam = dam * calc_deathray_damage_rate(target_ptr, CALC_MAX) / 100; if (dam == 0) - ignore_wraith_form = TRUE; + ignore_wraith_form = true; break; case GF_HOLY_FIRE: @@ -208,7 +208,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_BRAIN_SMASH: if (100 + rlev / 2 <= MAX(5, target_ptr->skill_sav)) { dam = 0; - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } break; @@ -219,7 +219,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_HAND_DOOM: if (100 + rlev / 2 <= target_ptr->skill_sav) { dam = 0; - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } break; @@ -227,7 +227,7 @@ static void spell_damcalc(player_type *target_ptr, monster_type *m_ptr, EFFECT_I case GF_CAUSE_4: if ((100 + rlev / 2 <= target_ptr->skill_sav) && (m_ptr->r_idx != MON_KENSHIROU)) { dam = 0; - ignore_wraith_form = TRUE; + ignore_wraith_form = true; } break; @@ -278,7 +278,7 @@ static int blow_damcalc(monster_type *m_ptr, player_type *target_ptr, monster_bl } ARMOUR_CLASS ac = target_ptr->ac + target_ptr->to_a; - bool check_wraith_form = TRUE; + bool check_wraith_form = true; switch (blow_ptr->effect) { case RBE_SUPERHURT: { int tmp_dam = dam - (dam * ((ac < 150) ? ac : 150) / 250); @@ -294,30 +294,30 @@ static int blow_damcalc(monster_type *m_ptr, player_type *target_ptr, monster_bl case RBE_ACID: spell_damcalc(target_ptr, m_ptr, GF_ACID, dam, &dummy_max); dam = dummy_max; - check_wraith_form = FALSE; + check_wraith_form = false; break; case RBE_ELEC: spell_damcalc(target_ptr, m_ptr, GF_ELEC, dam, &dummy_max); dam = dummy_max; - check_wraith_form = FALSE; + check_wraith_form = false; break; case RBE_FIRE: spell_damcalc(target_ptr, m_ptr, GF_FIRE, dam, &dummy_max); dam = dummy_max; - check_wraith_form = FALSE; + check_wraith_form = false; break; case RBE_COLD: spell_damcalc(target_ptr, m_ptr, GF_COLD, dam, &dummy_max); dam = dummy_max; - check_wraith_form = FALSE; + check_wraith_form = false; break; case RBE_DR_MANA: dam = 0; - check_wraith_form = FALSE; + check_wraith_form = false; break; default: @@ -492,7 +492,7 @@ bool process_warning(player_type *creature_ptr, POSITION xx, POSITION yy) bool is_warning = (!easy_disarm && is_trap(creature_ptr, g_ptr->feat)) || (g_ptr->mimic && is_trap(creature_ptr, g_ptr->feat)); is_warning &= !one_in_(13); if (!is_warning) - return TRUE; + return true; object_type *o_ptr = choose_warning_item(creature_ptr); if (o_ptr != NULL) diff --git a/src/perception/identification.cpp b/src/perception/identification.cpp index c451190a7..8c602e960 100644 --- a/src/perception/identification.cpp +++ b/src/perception/identification.cpp @@ -741,7 +741,7 @@ bool screen_object(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS mode) trivial_info = 0; if (i <= trivial_info) - return FALSE; + return false; screen_save(); int wid, hgt; @@ -781,5 +781,5 @@ bool screen_object(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS mode) prt(_("[何かキーを押すとゲームに戻ります]", "[Press any key to continue]"), k, 15); inkey(); screen_load(); - return TRUE; + return true; } diff --git a/src/perception/object-perception.cpp b/src/perception/object-perception.cpp index 0cd2f0c08..3dc1f6c87 100644 --- a/src/perception/object-perception.cpp +++ b/src/perception/object-perception.cpp @@ -46,7 +46,7 @@ void object_aware(player_type *owner_ptr, object_type *o_ptr) { const bool is_already_awared = object_is_aware(o_ptr); - k_info[o_ptr->k_idx].aware = TRUE; + k_info[o_ptr->k_idx].aware = true; // 以下、playrecordに記録しない場合はreturnする if (!record_ident) @@ -82,7 +82,7 @@ void object_aware(player_type *owner_ptr, object_type *o_ptr) * Something has been "sampled" * @param o_ptr 試行済にするオブジェクトの構造体参照ポインタ */ -void object_tried(object_type *o_ptr) { k_info[o_ptr->k_idx].tried = TRUE; } +void object_tried(object_type *o_ptr) { k_info[o_ptr->k_idx].tried = true; } /* * @brief 与えられたオブジェクトのベースアイテムが鑑定済かを返す / Determine if a given inventory item is "aware" diff --git a/src/perception/simple-perception.cpp b/src/perception/simple-perception.cpp index 2e5e8faf6..eacbe4733 100644 --- a/src/perception/simple-perception.cpp +++ b/src/perception/simple-perception.cpp @@ -132,7 +132,7 @@ static void sense_inventory_aux(player_type *creature_ptr, INVENTORY_IDX slot, b void sense_inventory1(player_type *creature_ptr) { PLAYER_LEVEL plev = creature_ptr->lev; - bool heavy = FALSE; + bool heavy = false; object_type *o_ptr; if (creature_ptr->confused) return; @@ -145,14 +145,14 @@ void sense_inventory1(player_type *creature_ptr) if (0 != randint0(9000L / (plev * plev + 40))) return; - heavy = TRUE; + heavy = true; break; } case CLASS_SMITH: { if (0 != randint0(6000L / (plev * plev + 50))) return; - heavy = TRUE; + heavy = true; break; } case CLASS_MAGE: @@ -177,14 +177,14 @@ void sense_inventory1(player_type *creature_ptr) if (0 != randint0(20000L / (plev * plev + 40))) return; - heavy = TRUE; + heavy = true; break; } case CLASS_RANGER: { if (0 != randint0(95000L / (plev * plev + 40))) return; - heavy = TRUE; + heavy = true; break; } case CLASS_PALADIN: @@ -192,7 +192,7 @@ void sense_inventory1(player_type *creature_ptr) if (0 != randint0(77777L / (plev * plev + 40))) return; - heavy = TRUE; + heavy = true; break; } case CLASS_WARRIOR_MAGE: @@ -215,7 +215,7 @@ void sense_inventory1(player_type *creature_ptr) if (0 != randint0(80000L / (plev * plev + 40))) return; - heavy = TRUE; + heavy = true; break; } case CLASS_MONK: @@ -229,7 +229,7 @@ void sense_inventory1(player_type *creature_ptr) if (0 != randint0(20000L / ((plev + 50) * (plev + 50)))) return; - heavy = TRUE; + heavy = true; break; } case CLASS_BEASTMASTER: { @@ -239,7 +239,7 @@ void sense_inventory1(player_type *creature_ptr) break; } case CLASS_BERSERKER: { - heavy = TRUE; + heavy = true; break; } @@ -248,10 +248,10 @@ void sense_inventory1(player_type *creature_ptr) } if (compare_virtue(creature_ptr, V_KNOWLEDGE, 100, VIRTUE_LARGE)) - heavy = TRUE; + heavy = true; for (INVENTORY_IDX i = 0; i < INVEN_TOTAL; i++) { - bool okay = FALSE; + bool okay = false; o_ptr = &creature_ptr->inventory_list[i]; @@ -277,7 +277,7 @@ void sense_inventory1(player_type *creature_ptr) case TV_HARD_ARMOR: case TV_DRAG_ARMOR: case TV_CARD: { - okay = TRUE; + okay = true; break; } @@ -291,7 +291,7 @@ void sense_inventory1(player_type *creature_ptr) continue; if (has_good_luck(creature_ptr) && !randint0(13)) { - heavy = TRUE; + heavy = true; } sense_inventory_aux(creature_ptr, i, heavy); @@ -372,7 +372,7 @@ void sense_inventory2(player_type *creature_ptr) } for (INVENTORY_IDX i = 0; i < INVEN_TOTAL; i++) { - bool okay = FALSE; + bool okay = false; o_ptr = &creature_ptr->inventory_list[i]; if (!o_ptr->k_idx) continue; @@ -382,7 +382,7 @@ void sense_inventory2(player_type *creature_ptr) case TV_AMULET: case TV_LITE: case TV_FIGURINE: { - okay = TRUE; + okay = true; break; } diff --git a/src/pet/pet-fall-off.cpp b/src/pet/pet-fall-off.cpp index fa94c316d..5032477c2 100644 --- a/src/pet/pet-fall-off.cpp +++ b/src/pet/pet-fall-off.cpp @@ -55,7 +55,7 @@ void check_fall_off_horse(player_type *creature_ptr, monap_type *monap_ptr) static bool calc_fall_off_possibility(player_type *creature_ptr, const HIT_POINT dam, const bool force, monster_race *r_ptr) { if (force) - return TRUE; + return true; int cur = creature_ptr->skill_exp[SKILL_RIDING]; int max = s_info[creature_ptr->pclass].s_max[SKILL_RIDING]; @@ -76,14 +76,14 @@ static bool calc_fall_off_possibility(player_type *creature_ptr, const HIT_POINT } if (randint0(dam / 2 + fall_off_level * 2) >= cur / 30 + 10) - return TRUE; + return true; if ((((creature_ptr->pclass == CLASS_BEASTMASTER) || (creature_ptr->pclass == CLASS_CAVALRY)) && !creature_ptr->riding_ryoute) || !one_in_(creature_ptr->lev * (creature_ptr->riding_ryoute ? 2 : 3) + 30)) { - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -102,11 +102,11 @@ bool process_fall_off_horse(player_type *creature_ptr, HIT_POINT dam, bool force monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!creature_ptr->riding || creature_ptr->wild_mode) - return FALSE; + return false; if (dam >= 0 || force) { if (!calc_fall_off_possibility(creature_ptr, dam, force, r_ptr)) - return FALSE; + return false; /* Check around the player */ for (DIRECTION i = 0; i < 8; i++) { @@ -144,7 +144,7 @@ bool process_fall_off_horse(player_type *creature_ptr, HIT_POINT dam, bool force monster_desc(creature_ptr, m_name, m_ptr, 0); msg_format(_("%sから振り落とされそうになって、壁にぶつかった。", "You have nearly fallen from %s but bumped into a wall."), m_name); take_hit(creature_ptr, DAMAGE_NOESCAPE, r_ptr->level + 3, _("壁への衝突", "bumping into a wall")); - return FALSE; + return false; } POSITION old_y = creature_ptr->y; @@ -158,7 +158,7 @@ bool process_fall_off_horse(player_type *creature_ptr, HIT_POINT dam, bool force creature_ptr->riding = 0; creature_ptr->pet_extra_flags &= ~(PF_TWO_HANDS); - creature_ptr->riding_ryoute = creature_ptr->old_riding_ryoute = FALSE; + creature_ptr->riding_ryoute = creature_ptr->old_riding_ryoute = false; creature_ptr->update |= (PU_BONUS | PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS); handle_stuff(creature_ptr); @@ -169,13 +169,13 @@ bool process_fall_off_horse(player_type *creature_ptr, HIT_POINT dam, bool force /* Update health track of mount */ creature_ptr->redraw |= (PR_UHEALTH); - bool fall_dam = FALSE; + bool fall_dam = false; if (creature_ptr->levitation && !force) { monster_desc(creature_ptr, m_name, m_ptr, 0); msg_format(_("%sから落ちたが、空中でうまく体勢を立て直して着地した。", "You are thrown from %s but make a good landing."), m_name); } else { take_hit(creature_ptr, DAMAGE_NOESCAPE, r_ptr->level + 3, _("落馬", "Falling from riding")); - fall_dam = TRUE; + fall_dam = true; } if (sy && !creature_ptr->is_dead) diff --git a/src/player-attack/attack-chaos-effect.cpp b/src/player-attack/attack-chaos-effect.cpp index f16166772..abe3c63ff 100644 --- a/src/player-attack/attack-chaos-effect.cpp +++ b/src/player-attack/attack-chaos-effect.cpp @@ -171,14 +171,14 @@ static bool judge_tereprt_resistance(player_type *attacker_ptr, player_attack_ty { monster_race *r_ptr = pa_ptr->r_ptr; if ((r_ptr->flagsr & RFR_RES_TELE) == 0) - return FALSE; + return false; if (r_ptr->flags1 & RF1_UNIQUE) { if (is_original_ap_and_seen(attacker_ptr, pa_ptr->m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; msg_format(_("%^sには効果がなかった。", "%^s is unaffected!"), pa_ptr->m_name); - return TRUE; + return true; } if (r_ptr->level > randint1(100)) { @@ -186,10 +186,10 @@ static bool judge_tereprt_resistance(player_type *attacker_ptr, player_attack_ty r_ptr->r_flagsr |= RFR_RES_TELE; msg_format(_("%^sは抵抗力を持っている！", "%^s resists!"), pa_ptr->m_name); - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -206,7 +206,7 @@ static void attack_teleport_away(player_type *attacker_ptr, player_attack_type * msg_format(_("%^sは消えた！", "%^s disappears!"), pa_ptr->m_name); teleport_away(attacker_ptr, pa_ptr->m_idx, 50, TELEPORT_PASSIVE); *num = pa_ptr->num_blow + 1; - *(pa_ptr->mdeath) = TRUE; + *(pa_ptr->mdeath) = true; } /*! @@ -224,8 +224,8 @@ static void attack_polymorph(player_type *attacker_ptr, player_attack_type *pa_p if (polymorph_monster(attacker_ptr, y, x)) { msg_format(_("%^sは変化した！", "%^s changes!"), pa_ptr->m_name); - *(pa_ptr->fear) = FALSE; - pa_ptr->weak = FALSE; + *(pa_ptr->fear) = false; + pa_ptr->weak = false; } else msg_format(_("%^sには効果がなかった。", "%^s is unaffected."), pa_ptr->m_name); diff --git a/src/player-attack/blood-sucking-processor.cpp b/src/player-attack/blood-sucking-processor.cpp index bac6571fd..69c6f0c8f 100644 --- a/src/player-attack/blood-sucking-processor.cpp +++ b/src/player-attack/blood-sucking-processor.cpp @@ -44,7 +44,7 @@ void decide_blood_sucking(player_type *attacker_ptr, player_attack_type *pa_ptr) void calc_drain(player_attack_type *pa_ptr) { if (pa_ptr->attack_damage <= 0) - pa_ptr->can_drain = FALSE; + pa_ptr->can_drain = false; if (pa_ptr->drain_result > pa_ptr->m_ptr->hp) pa_ptr->drain_result = pa_ptr->m_ptr->hp; @@ -64,18 +64,18 @@ static void drain_muramasa(player_type *attacker_ptr, player_attack_type *pa_ptr object_type *o_ptr = &attacker_ptr->inventory_list[INVEN_MAIN_HAND + pa_ptr->hand]; HIT_PROB to_h = o_ptr->to_h; HIT_POINT to_d = o_ptr->to_d; - bool flag = TRUE; + bool flag = true; for (int i = 0; i < to_h + 3; i++) if (one_in_(4)) - flag = FALSE; + flag = false; if (flag) to_h++; - flag = TRUE; + flag = true; for (int i = 0; i < to_d + 3; i++) if (one_in_(4)) - flag = FALSE; + flag = false; if (flag) to_d++; @@ -122,7 +122,7 @@ static void drain_result(player_type *attacker_ptr, player_attack_type *pa_ptr, if (*drain_msg) { msg_format(_("刃が%sから生命力を吸い取った！", "Your weapon drains life from %s!"), pa_ptr->m_name); - *drain_msg = FALSE; + *drain_msg = false; } drain_heal = (drain_heal * attacker_ptr->mutant_regenerate_mod) / 100; @@ -155,5 +155,5 @@ void process_drain(player_type *attacker_ptr, player_attack_type *pa_ptr, const if (pa_ptr->m_ptr->maxhp < 1) pa_ptr->m_ptr->maxhp = 1; - pa_ptr->weak = TRUE; + pa_ptr->weak = true; } diff --git a/src/player-attack/player-attack.cpp b/src/player-attack/player-attack.cpp index 6e03ced03..745af34c1 100644 --- a/src/player-attack/player-attack.cpp +++ b/src/player-attack/player-attack.cpp @@ -98,7 +98,7 @@ static void attack_classify(player_type *attacker_ptr, player_attack_type *pa_pt case CLASS_FORCETRAINER: case CLASS_BERSERKER: if ((empty_hands(attacker_ptr, TRUE) & EMPTY_HAND_MAIN) && !attacker_ptr->riding) - pa_ptr->monk_attack = TRUE; + pa_ptr->monk_attack = true; return; default: return; @@ -339,7 +339,7 @@ static void process_weapon_attack(player_type *attacker_ptr, player_attack_type calc_surprise_attack_damage(attacker_ptr, pa_ptr); if (does_equip_cause_earthquake(attacker_ptr, pa_ptr) || (pa_ptr->chaos_effect == CE_QUAKE) || (pa_ptr->mode == HISSATSU_QUAKE)) - *do_quake = TRUE; + *do_quake = true; auto do_impact = does_weapon_has_flag(attacker_ptr->impact, pa_ptr); if ((!(o_ptr->tval == TV_SWORD) || !(o_ptr->sval == SV_POISON_NEEDLE)) && !(pa_ptr->mode == HISSATSU_KYUSHO)) @@ -436,9 +436,9 @@ static void apply_damage_negative_effect(player_attack_type *pa_ptr, bool is_zan static bool check_fear_death(player_type *attacker_ptr, player_attack_type *pa_ptr, const int num, const bool is_lowlevel) { if (!mon_take_hit(attacker_ptr, pa_ptr->m_idx, pa_ptr->attack_damage, pa_ptr->fear, NULL)) - return FALSE; + return false; - *(pa_ptr->mdeath) = TRUE; + *(pa_ptr->mdeath) = true; if ((attacker_ptr->pclass == CLASS_BERSERKER) && attacker_ptr->energy_use) { PlayerEnergy energy(attacker_ptr); if (can_attack_with_main_hand(attacker_ptr) && can_attack_with_sub_hand(attacker_ptr)) { @@ -460,7 +460,7 @@ static bool check_fear_death(player_type *attacker_ptr, player_attack_type *pa_p if ((o_ptr->name1 == ART_ZANTETSU) && is_lowlevel) msg_print(_("またつまらぬものを斬ってしまった．．．", "Sigh... Another trifling thing I've cut....")); - return TRUE; + return true; } /*! @@ -516,7 +516,7 @@ static void cause_earthquake(player_type *attacker_ptr, player_attack_type *pa_p earthquake(attacker_ptr, attacker_ptr->y, attacker_ptr->x, 10, 0); if (attacker_ptr->current_floor_ptr->grid_array[y][x].m_idx == 0) - *(pa_ptr->mdeath) = TRUE; + *(pa_ptr->mdeath) = true; } /*! @@ -533,8 +533,8 @@ static void cause_earthquake(player_type *attacker_ptr, player_attack_type *pa_p */ void exe_player_attack_to_monster(player_type *attacker_ptr, POSITION y, POSITION x, bool *fear, bool *mdeath, s16b hand, combat_options mode) { - bool do_quake = FALSE; - bool drain_msg = TRUE; + bool do_quake = false; + bool drain_msg = true; player_attack_type tmp_attack; auto pa_ptr = initialize_player_attack_type(&tmp_attack, attacker_ptr, y, x, hand, mode, fear, mdeath); @@ -572,11 +572,11 @@ void exe_player_attack_to_monster(player_type *attacker_ptr, POSITION y, POSITIO touch_zap_player(pa_ptr->m_ptr, attacker_ptr); process_drain(attacker_ptr, pa_ptr, is_human, &drain_msg); - pa_ptr->can_drain = FALSE; + pa_ptr->can_drain = false; pa_ptr->drain_result = 0; change_monster_stat(attacker_ptr, pa_ptr, y, x, &num); - pa_ptr->backstab = FALSE; - pa_ptr->surprise_attack = FALSE; + pa_ptr->backstab = false; + pa_ptr->surprise_attack = false; } if (pa_ptr->weak && !(*mdeath)) diff --git a/src/player-info/avatar.cpp b/src/player-info/avatar.cpp index 645b83a7e..c0b89c88f 100644 --- a/src/player-info/avatar.cpp +++ b/src/player-info/avatar.cpp @@ -59,16 +59,16 @@ bool compare_virtue(player_type *creature_ptr, int type, int num, int tekitou) switch (tekitou) { case VIRTUE_LARGE: if (vir > num) - return TRUE; + return true; else - return FALSE; + return false; case VIRTUE_SMALL: if (vir < num) - return TRUE; + return true; else - return FALSE; + return false; default: - return FALSE; + return false; } } diff --git a/src/player-info/equipment-info.cpp b/src/player-info/equipment-info.cpp index ce7d67e84..d72a75ceb 100644 --- a/src/player-info/equipment-info.cpp +++ b/src/player-info/equipment-info.cpp @@ -52,7 +52,7 @@ bool can_two_hands_wielding(player_type *creature_ptr) bool heavy_armor(player_type *creature_ptr) { if ((creature_ptr->pclass != CLASS_MONK) && (creature_ptr->pclass != CLASS_FORCETRAINER) && (creature_ptr->pclass != CLASS_NINJA)) - return FALSE; + return false; WEIGHT monk_arm_wgt = 0; if (creature_ptr->inventory_list[INVEN_MAIN_HAND].tval > TV_SWORD) diff --git a/src/player/digestion-processor.cpp b/src/player/digestion-processor.cpp index 8777e83c0..677b53bb1 100644 --- a/src/player/digestion-processor.cpp +++ b/src/player/digestion-processor.cpp @@ -95,7 +95,7 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v) { int old_aux, new_aux; - bool notice = FALSE; + bool notice = false; v = (v > 20000) ? 20000 : (v < 0) ? 0 : v; if (creature_ptr->food < PY_FOOD_FAINT) { old_aux = 0; @@ -157,7 +157,7 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v) break; } - notice = TRUE; + notice = true; } else if (new_aux < old_aux) { switch (new_aux) { case 0: @@ -184,12 +184,12 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v) change_wild_mode(creature_ptr, FALSE); } - notice = TRUE; + notice = true; } creature_ptr->food = v; if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -197,5 +197,5 @@ bool set_food(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_HUNGER); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/player/patron.cpp b/src/player/patron.cpp index 38a2093cf..fcd6572e9 100644 --- a/src/player/patron.cpp +++ b/src/player/patron.cpp @@ -164,7 +164,7 @@ void gain_level_reward(player_type *creature_ptr, int chosen_reward) if (creature_ptr->suppress_multi_reward) return; else - creature_ptr->suppress_multi_reward = TRUE; + creature_ptr->suppress_multi_reward = true; } if (creature_ptr->lev == 13) diff --git a/src/player/player-damage.cpp b/src/player/player-damage.cpp index 81a1a1e1c..43c661e0a 100644 --- a/src/player/player-damage.cpp +++ b/src/player/player-damage.cpp @@ -106,7 +106,7 @@ static bool acid_minus_ac(player_type *creature_ptr) } if ((o_ptr == NULL) || (o_ptr->k_idx == 0) || !object_is_armour(creature_ptr, o_ptr)) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(creature_ptr, o_name, o_ptr, OD_OMIT_PREFIX | OD_NAME_ONLY); @@ -114,12 +114,12 @@ static bool acid_minus_ac(player_type *creature_ptr) object_flags(creature_ptr, o_ptr, flgs); if (o_ptr->ac + o_ptr->to_a <= 0) { msg_format(_("%sは既にボロボロだ！", "Your %s is already fully corroded!"), o_name); - return FALSE; + return false; } if (has_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); @@ -127,7 +127,7 @@ static bool acid_minus_ac(player_type *creature_ptr) creature_ptr->update |= PU_BONUS; creature_ptr->window_flags |= PW_EQUIP | PW_PLAYER; calc_android_exp(creature_ptr); - return TRUE; + return true; } /*! @@ -289,7 +289,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp if (damage_type != DAMAGE_USELIFE) { disturb(creature_ptr, TRUE, TRUE); if (auto_more) { - creature_ptr->now_damaged = TRUE; + creature_ptr->now_damaged = true; } } @@ -356,8 +356,8 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp sound(SOUND_DEATH); chg_virtue(creature_ptr, V_SACRIFICE, 10); handle_stuff(creature_ptr); - creature_ptr->leaving = TRUE; - if(!cheat_immortal) creature_ptr->is_dead = TRUE; + creature_ptr->leaving = true; + if(!cheat_immortal) creature_ptr->is_dead = true; if (creature_ptr->current_floor_ptr->inside_arena) { concptr m_name = r_info[arena_info[creature_ptr->arena_number].r_idx].name.c_str(); msg_format(_("あなたは%sの前に敗れ去った。", "You are beaten by %s."), m_name); @@ -391,7 +391,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp angband_strcpy(creature_ptr->died_from, dummy, sizeof creature_ptr->died_from); } - current_world_ptr->total_winner = FALSE; + current_world_ptr->total_winner = false; if (winning_seppuku) { add_retired_class(creature_ptr->pclass); exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("勝利の後切腹した。", "committed seppuku after the winning.")); @@ -529,7 +529,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp } if (auto_more) - creature_ptr->now_damaged = TRUE; + creature_ptr->now_damaged = true; msg_print(_("*** 警告:低ヒット・ポイント！ ***", "*** LOW HITPOINT WARNING! ***")); msg_print(NULL); diff --git a/src/player/player-move.cpp b/src/player/player-move.cpp index 484d417a9..a5fc44d0a 100644 --- a/src/player/player-move.cpp +++ b/src/player/player-move.cpp @@ -194,7 +194,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT if (music_singing(creature_ptr, MUSIC_WALL)) { (void)project(creature_ptr, 0, 0, creature_ptr->y, creature_ptr->x, (60 + creature_ptr->lev), GF_DISINTEGRATE, PROJECT_KILL | PROJECT_ITEM); if (!player_bold(creature_ptr, ny, nx) || creature_ptr->is_dead || creature_ptr->leaving) - return FALSE; + return false; } if ((creature_ptr->skill_fos >= 50) || (0 == randint0(50 - creature_ptr->skill_fos))) @@ -237,7 +237,7 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT creature_ptr->word_recall = 0; creature_ptr->oldpx = 0; creature_ptr->oldpy = 0; - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } else if (has_flag(f_ptr->flags, FF_HIT_TRAP) && !(mpe_mode & MPE_STAYING)) { disturb(creature_ptr, FALSE, TRUE); if (g_ptr->mimic || has_flag(f_ptr->flags, FF_SECRET)) { @@ -247,11 +247,11 @@ bool move_player_effect(player_type *creature_ptr, POSITION ny, POSITION nx, BIT hit_trap(creature_ptr, (mpe_mode & MPE_BREAK_TRAP) ? TRUE : FALSE); if (!player_bold(creature_ptr, ny, nx) || creature_ptr->is_dead || creature_ptr->leaving) - return FALSE; + return false; } if (!(mpe_mode & MPE_STAYING) && (disturb_trap_detect || alert_trap_detect) && creature_ptr->dtrap && !(g_ptr->info & CAVE_IN_DETECT)) { - creature_ptr->dtrap = FALSE; + creature_ptr->dtrap = false; if (!(g_ptr->info & CAVE_UNSAFE)) { if (alert_trap_detect) msg_print(_("* 注意:この先はトラップの感知範囲外です！ *", "*Leaving trap detect region!*")); @@ -274,7 +274,7 @@ bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat) { feature_type *f_ptr = &f_info[feat]; if (!has_flag(f_ptr->flags, FF_TRAP)) - return TRUE; + return true; switch (f_ptr->subtype) { case TRAP_TRAPDOOR: @@ -282,37 +282,37 @@ bool trap_can_be_ignored(player_type *creature_ptr, FEAT_IDX feat) case TRAP_SPIKED_PIT: case TRAP_POISON_PIT: if (creature_ptr->levitation) - return TRUE; + return true; break; case TRAP_TELEPORT: if (creature_ptr->anti_tele) - return TRUE; + return true; break; case TRAP_FIRE: if (has_immune_fire(creature_ptr)) - return TRUE; + return true; break; case TRAP_ACID: if (has_immune_acid(creature_ptr)) - return TRUE; + return true; break; case TRAP_BLIND: if (has_resist_blind(creature_ptr)) - return TRUE; + return true; break; case TRAP_CONFUSE: if (has_resist_conf(creature_ptr)) - return TRUE; + return true; break; case TRAP_POISON: if (has_resist_pois(creature_ptr)) - return TRUE; + return true; break; case TRAP_SLEEP: if (creature_ptr->free_act) - return TRUE; + return true; break; } - return FALSE; + return false; } diff --git a/src/player/player-status-flags.cpp b/src/player/player-status-flags.cpp index ceb465633..36300e94a 100644 --- a/src/player/player-status-flags.cpp +++ b/src/player/player-status-flags.cpp @@ -436,17 +436,17 @@ BIT_FLAGS get_player_flags(player_type *creature_ptr, tr_type tr_flag) bool has_kill_wall(player_type *creature_ptr) { if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || music_singing(creature_ptr, MUSIC_WALL)) { - return TRUE; + return true; } if (creature_ptr->riding) { monster_type *riding_m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding]; monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx]; if (riding_r_ptr->flags2 & RF2_KILL_WALL) - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -459,17 +459,17 @@ bool has_kill_wall(player_type *creature_ptr) */ bool has_pass_wall(player_type *creature_ptr) { - bool pow = FALSE; + bool pow = false; if (creature_ptr->wraith_form || creature_ptr->tim_pass_wall || (!creature_ptr->mimic_form && creature_ptr->prace == RACE_SPECTRE)) { - pow = TRUE; + pow = true; } if (creature_ptr->riding) { monster_type *riding_m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding]; monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx]; if (!(riding_r_ptr->flags2 & RF2_PASS_WALL)) - pow = FALSE; + pow = false; } return pow; @@ -675,46 +675,46 @@ BIT_FLAGS has_invuln_arrow(player_type *creature_ptr) void check_no_flowed(player_type *creature_ptr) { object_type *o_ptr; - bool has_sw = FALSE, has_kabe = FALSE; + bool has_sw = FALSE, has_kabe = false; - creature_ptr->no_flowed = FALSE; + creature_ptr->no_flowed = false; if (has_pass_wall(creature_ptr) && !has_kill_wall(creature_ptr)) { - creature_ptr->no_flowed = TRUE; + creature_ptr->no_flowed = true; return; } if (!creature_ptr->realm1) { - creature_ptr->no_flowed = FALSE; + creature_ptr->no_flowed = false; return; } for (int i = 0; i < INVEN_PACK; i++) { if ((creature_ptr->inventory_list[i].tval == TV_NATURE_BOOK) && (creature_ptr->inventory_list[i].sval == 2)) - has_sw = TRUE; + has_sw = true; if ((creature_ptr->inventory_list[i].tval == TV_CRAFT_BOOK) && (creature_ptr->inventory_list[i].sval == 2)) - has_kabe = TRUE; + has_kabe = true; } for (const auto this_o_idx : creature_ptr->current_floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].o_idx_list) { o_ptr = &creature_ptr->current_floor_ptr->o_list[this_o_idx]; if ((o_ptr->tval == TV_NATURE_BOOK) && (o_ptr->sval == 2)) - has_sw = TRUE; + has_sw = true; if ((o_ptr->tval == TV_CRAFT_BOOK) && (o_ptr->sval == 2)) - has_kabe = TRUE; + has_kabe = true; } if (has_sw && ((creature_ptr->realm1 == REALM_NATURE) || (creature_ptr->realm2 == REALM_NATURE) || (creature_ptr->pclass == CLASS_SORCERER))) { const magic_type *s_ptr = &mp_ptr->info[REALM_NATURE - 1][SPELL_SW]; if (creature_ptr->lev >= s_ptr->slevel) - creature_ptr->no_flowed = TRUE; + creature_ptr->no_flowed = true; } if (has_kabe && ((creature_ptr->realm1 == REALM_CRAFT) || (creature_ptr->realm2 == REALM_CRAFT) || (creature_ptr->pclass == CLASS_SORCERER))) { const magic_type *s_ptr = &mp_ptr->info[REALM_CRAFT - 1][SPELL_WALL]; if (creature_ptr->lev >= s_ptr->slevel) - creature_ptr->no_flowed = TRUE; + creature_ptr->no_flowed = true; } } @@ -1118,12 +1118,12 @@ BIT_FLAGS has_levitation(player_type *creature_ptr) bool has_can_swim(player_type *creature_ptr) { - bool can_swim = FALSE; + bool can_swim = false; if (creature_ptr->riding) { monster_type *riding_m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->riding]; monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx]; if (riding_r_ptr->flags7 & (RF7_CAN_SWIM | RF7_AQUATIC)) - can_swim = TRUE; + can_swim = true; } return can_swim; @@ -1944,12 +1944,12 @@ melee_type player_melee_type(player_type *creature_ptr) bool can_attack_with_main_hand(player_type *creature_ptr) { if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND)) - return TRUE; + return true; if ((empty_hands(creature_ptr, TRUE) & EMPTY_HAND_MAIN) && !can_attack_with_sub_hand(creature_ptr)) - return TRUE; + return true; - return FALSE; + return false; } /* @@ -1970,13 +1970,13 @@ bool has_two_handed_weapons(player_type *creature_ptr) if (can_two_hands_wielding(creature_ptr)) { if (can_attack_with_main_hand(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_SUB) && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_MAIN_HAND])) { - return TRUE; + return true; } else if (can_attack_with_sub_hand(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_MAIN) && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_SUB_HAND])) { - return TRUE; + return true; } } - return FALSE; + return false; } BIT_FLAGS has_lite(player_type *creature_ptr) @@ -2019,11 +2019,11 @@ bool has_disable_two_handed_bonus(player_type *creature_ptr, int i) /* Enable when two hand wields an enough light weapon */ if (limit >= o_ptr->weight / 5) - return FALSE; + return false; } /* Disable when empty hands, one hand wieldings and heavy weapons */ - return TRUE; + return true; } /*! @@ -2050,9 +2050,9 @@ bool has_icky_wield_weapon(player_type *creature_ptr, int i) } if (has_not_monk_weapon(creature_ptr, i) || has_not_ninja_weapon(creature_ptr, i)) - return TRUE; + return true; - return FALSE; + return false; } bool has_riding_wield_weapon(player_type *creature_ptr, int i) @@ -2063,15 +2063,15 @@ bool has_riding_wield_weapon(player_type *creature_ptr, int i) object_flags(creature_ptr, o_ptr, flgs); if (creature_ptr->riding != 0 && !(o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE)) && !has_flag(flgs, TR_RIDING)) { - return TRUE; + return true; } - return FALSE; + return false; } bool has_not_ninja_weapon(player_type *creature_ptr, int i) { if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i)) { - return FALSE; + return false; } int tval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].tval - TV_WEAPON_BEGIN; OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].sval; @@ -2082,7 +2082,7 @@ bool has_not_ninja_weapon(player_type *creature_ptr, int i) bool has_not_monk_weapon(player_type *creature_ptr, int i) { if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i)) { - return FALSE; + return false; } int tval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].tval - TV_WEAPON_BEGIN; OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].sval; diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp index 435184e7c..c40e8a215 100644 --- a/src/player/player-status.cpp +++ b/src/player/player-status.cpp @@ -811,18 +811,18 @@ static void update_max_mana(player_type *creature_ptr) if (any_bits(mp_ptr->spell_xtra, extra_magic_glove_reduce_mana)) { BIT_FLAGS flgs[TR_FLAG_SIZE]; - creature_ptr->cumber_glove = FALSE; + creature_ptr->cumber_glove = false; object_type *o_ptr; o_ptr = &creature_ptr->inventory_list[INVEN_ARMS]; object_flags(creature_ptr, o_ptr, flgs); if (o_ptr->k_idx && !(has_flag(flgs, TR_FREE_ACT)) && !(has_flag(flgs, TR_DEC_MANA)) && !(has_flag(flgs, TR_EASY_SPELL)) && !((has_flag(flgs, TR_MAGIC_MASTERY)) && (o_ptr->pval > 0)) && !((has_flag(flgs, TR_DEX)) && (o_ptr->pval > 0))) { - creature_ptr->cumber_glove = TRUE; + creature_ptr->cumber_glove = true; msp = (3 * msp) / 4; } } - creature_ptr->cumber_armor = FALSE; + creature_ptr->cumber_armor = false; int cur_wgt = 0; if (creature_ptr->inventory_list[INVEN_MAIN_HAND].tval > TV_SWORD) @@ -892,7 +892,7 @@ static void update_max_mana(player_type *creature_ptr) int max_wgt = mp_ptr->spell_weight; if ((cur_wgt - max_wgt) > 0) { - creature_ptr->cumber_armor = TRUE; + creature_ptr->cumber_armor = true; switch (creature_ptr->pclass) { case CLASS_MAGE: case CLASS_HIGH_MAGE: @@ -929,7 +929,7 @@ static void update_max_mana(player_type *creature_ptr) break; } case CLASS_SAMURAI: { - creature_ptr->cumber_armor = FALSE; + creature_ptr->cumber_armor = false; break; } default: { @@ -1822,11 +1822,11 @@ s16b calc_double_weapon_penalty(player_type *creature_ptr, INVENTORY_IDX slot) static bool is_riding_two_hands(player_type *creature_ptr) { if (!creature_ptr->riding) { - return FALSE; + return false; } if (has_two_handed_weapons(creature_ptr) || (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_NONE)) - return TRUE; + return true; else if (any_bits(creature_ptr->pet_extra_flags, PF_TWO_HANDS)) { switch (creature_ptr->pclass) { case CLASS_MONK: @@ -1834,14 +1834,14 @@ static bool is_riding_two_hands(player_type *creature_ptr) case CLASS_BERSERKER: if ((empty_hands(creature_ptr, FALSE) != EMPTY_HAND_NONE) && !has_melee_weapon(creature_ptr, INVEN_MAIN_HAND) && !has_melee_weapon(creature_ptr, INVEN_SUB_HAND)) - return TRUE; + return true; default: break; } } - return FALSE; + return false; } static s16b calc_riding_bow_penalty(player_type *creature_ptr) @@ -2634,17 +2634,17 @@ bool player_has_no_spellbooks(player_type *creature_ptr) for (int i = 0; i < INVEN_PACK; i++) { o_ptr = &creature_ptr->inventory_list[i]; if (o_ptr->k_idx && check_book_realm(creature_ptr, o_ptr->tval, o_ptr->sval)) - return FALSE; + return false; } floor_type *floor_ptr = creature_ptr->current_floor_ptr; for (const auto this_o_idx : floor_ptr->grid_array[creature_ptr->y][creature_ptr->x].o_idx_list) { o_ptr = &floor_ptr->o_list[this_o_idx]; if (o_ptr->k_idx && any_bits(o_ptr->marked, OM_FOUND) && check_book_realm(creature_ptr, o_ptr->tval, o_ptr->sval)) - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -2656,12 +2656,12 @@ bool player_has_no_spellbooks(player_type *creature_ptr) bool player_place(player_type *creature_ptr, POSITION y, POSITION x) { if (creature_ptr->current_floor_ptr->grid_array[y][x].m_idx != 0) - return FALSE; + return false; /* Save player location */ creature_ptr->y = y; creature_ptr->x = x; - return TRUE; + return true; } /*! @@ -2731,9 +2731,9 @@ void check_experience(player_type *creature_ptr) handle_stuff(creature_ptr); } - bool level_reward = FALSE; - bool level_mutation = FALSE; - bool level_inc_stat = FALSE; + bool level_reward = false; + bool level_mutation = false; + bool level_inc_stat = false; while ((creature_ptr->lev < PY_MAX_LEVEL) && (creature_ptr->exp >= ((android ? player_exp_a : player_exp)[creature_ptr->lev - 1] * creature_ptr->expfact / 100L))) { creature_ptr->lev++; @@ -2741,13 +2741,13 @@ void check_experience(player_type *creature_ptr) creature_ptr->max_plv = creature_ptr->lev; if ((creature_ptr->pclass == CLASS_CHAOS_WARRIOR) || creature_ptr->muta.has(MUTA::CHAOS_GIFT)) { - level_reward = TRUE; + level_reward = true; } if (creature_ptr->prace == RACE_BEASTMAN) { if (one_in_(5)) - level_mutation = TRUE; + level_mutation = true; } - level_inc_stat = TRUE; + level_inc_stat = true; exe_write_diary(creature_ptr, DIARY_LEVELUP, creature_ptr->lev, NULL); } @@ -2757,15 +2757,15 @@ void check_experience(player_type *creature_ptr) set_bits(creature_ptr->update, (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS)); set_bits(creature_ptr->redraw, (PR_LEV | PR_TITLE | PR_EXP)); set_bits(creature_ptr->window_flags, (PW_PLAYER | PW_SPELL | PW_INVEN)); - creature_ptr->level_up_message = TRUE; + creature_ptr->level_up_message = true; handle_stuff(creature_ptr); - creature_ptr->level_up_message = FALSE; + creature_ptr->level_up_message = false; if (level_inc_stat) { if (!(creature_ptr->max_plv % 10)) { int choice; screen_save(); - while (TRUE) { + while (true) { int n; char tmp[32]; @@ -2785,7 +2785,7 @@ void check_experience(player_type *creature_ptr) prt("", 8, 14); prt(_(" どの能力値を上げますか？", " Which stat do you want to raise?"), 1, 14); - while (TRUE) { + while (true) { choice = inkey(); if ((choice >= 'a') && (choice <= 'f')) break; @@ -2805,7 +2805,7 @@ void check_experience(player_type *creature_ptr) if (level_mutation) { msg_print(_("あなたは変わった気がする...", "You feel different...")); (void)gain_mutation(creature_ptr, 0); - level_mutation = FALSE; + level_mutation = false; } /* @@ -2814,7 +2814,7 @@ void check_experience(player_type *creature_ptr) */ if (level_reward) { gain_level_reward(creature_ptr, 0); - level_reward = FALSE; + level_reward = false; } set_bits(creature_ptr->update, PU_BONUS | PU_HP | PU_MANA | PU_SPELLS); diff --git a/src/player/player-view.cpp b/src/player/player-view.cpp index 8b86cec46..f2c34af4d 100644 --- a/src/player/player-view.cpp +++ b/src/player/player-view.cpp @@ -37,12 +37,12 @@ static bool update_view_aux(player_type *subject_ptr, POSITION y, POSITION x, PO bool f1 = (cave_los_grid(g1_c_ptr)); bool f2 = (cave_los_grid(g2_c_ptr)); if (!f1 && !f2) - return TRUE; + return true; bool v1 = (f1 && (g1_c_ptr->info & CAVE_VIEW)); bool v2 = (f2 && (g2_c_ptr->info & CAVE_VIEW)); if (!v1 && !v2) - return TRUE; + return true; grid_type *g_ptr; g_ptr = &floor_ptr->grid_array[y][x]; @@ -75,7 +75,7 @@ static bool update_view_aux(player_type *subject_ptr, POSITION y, POSITION x, PO return wall; } - return TRUE; + return true; } /* diff --git a/src/player/process-death.cpp b/src/player/process-death.cpp index 9bf88c732..ae975184b 100644 --- a/src/player/process-death.cpp +++ b/src/player/process-death.cpp @@ -293,7 +293,7 @@ static bool show_dead_player_items(player_type *creature_ptr) (void)show_equipment(creature_ptr, 0, USE_FULL, TV_NONE); prt(_("装備していたアイテム: -続く-", "You are using: -more-"), 0, 0); if (inkey() == ESCAPE) - return TRUE; + return true; } if (creature_ptr->inven_cnt) { @@ -302,10 +302,10 @@ static bool show_dead_player_items(player_type *creature_ptr) prt(_("持っていたアイテム: -続く-", "You are carrying: -more-"), 0, 0); if (inkey() == ESCAPE) - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -349,7 +349,7 @@ static void export_player_info(player_type *creature_ptr, display_player_pf disp { prt(_("キャラクターの記録をファイルに書き出すことができます。", "You may now dump a character record to one or more files."), 21, 0); prt(_("リターンキーでキャラクターを見ます。ESCで中断します。", "Then, hit RETURN to see the character, or ESC to abort."), 22, 0); - while (TRUE) { + while (true) { char out_val[160]; put_str(_("ファイルネーム: ", "Filename: "), 23, 0); strcpy(out_val, ""); diff --git a/src/player/process-name.cpp b/src/player/process-name.cpp index b999b0012..8ea0ed616 100644 --- a/src/player/process-name.cpp +++ b/src/player/process-name.cpp @@ -98,7 +98,7 @@ void process_player_name(player_type *creature_ptr, bool is_new_savefile) if (is_modified || !savefile_base[0]) { concptr s = savefile; - while (TRUE) { + while (true) { concptr t; t = angband_strstr(s, PATH_SEP); if (!t) diff --git a/src/racial/racial-android.cpp b/src/racial/racial-android.cpp index 194cb1a97..19900405d 100644 --- a/src/racial/racial-android.cpp +++ b/src/racial/racial-android.cpp @@ -24,35 +24,35 @@ bool android_inside_weapon(player_type *creature_ptr) { DIRECTION dir; if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; if (creature_ptr->lev < 10) { msg_print(_("レイガンを発射した。", "You fire your ray gun.")); fire_bolt(creature_ptr, GF_MISSILE, dir, (creature_ptr->lev + 1) / 2); - return TRUE; + return true; } if (creature_ptr->lev < 25) { msg_print(_("ブラスターを発射した。", "You fire your blaster.")); fire_bolt(creature_ptr, GF_MISSILE, dir, creature_ptr->lev); - return TRUE; + return true; } if (creature_ptr->lev < 35) { msg_print(_("バズーカを発射した。", "You fire your bazooka.")); fire_ball(creature_ptr, GF_MISSILE, dir, creature_ptr->lev * 2, 2); - return TRUE; + return true; } if (creature_ptr->lev < 45) { msg_print(_("ビームキャノンを発射した。", "You fire a beam cannon.")); fire_beam(creature_ptr, GF_MISSILE, dir, creature_ptr->lev * 2); - return TRUE; + return true; } msg_print(_("ロケットを発射した。", "You fire a rocket.")); fire_rocket(creature_ptr, GF_ROCKET, dir, creature_ptr->lev * 5, 2); - return TRUE; + return true; } void calc_android_exp(player_type *creature_ptr) diff --git a/src/racial/racial-balrog.cpp b/src/racial/racial-balrog.cpp index 972aa8b6f..bb8ab6e4e 100644 --- a/src/racial/racial-balrog.cpp +++ b/src/racial/racial-balrog.cpp @@ -11,9 +11,9 @@ bool demonic_breath(player_type *creature_ptr) DIRECTION dir; int type = (one_in_(2) ? GF_NETHER : GF_FIRE); if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; stop_mouth(creature_ptr); msg_format(_("あなたは%sのブレスを吐いた。", "You breathe %s."), ((type == GF_NETHER) ? _("地獄", "nether") : _("火炎", "fire"))); fire_breath(creature_ptr, type, dir, creature_ptr->lev * 3, (creature_ptr->lev / 15) + 1); - return TRUE; + return true; } diff --git a/src/racial/racial-draconian.cpp b/src/racial/racial-draconian.cpp index ada7c42ac..190692d90 100644 --- a/src/racial/racial-draconian.cpp +++ b/src/racial/racial-draconian.cpp @@ -125,12 +125,12 @@ bool draconian_breath(player_type *creature_ptr) concptr breath_type_description = ((breath_type == GF_COLD) ? _("冷気", "cold") : _("炎", "fire")); DIRECTION dir; if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; decide_breath_kind(creature_ptr, &breath_type, &breath_type_description); stop_mouth(creature_ptr); msg_format(_("あなたは%sのブレスを吐いた。", "You breathe %s."), breath_type_description); fire_breath(creature_ptr, breath_type, dir, creature_ptr->lev * 2, (creature_ptr->lev / 15) + 1); - return TRUE; + return true; } diff --git a/src/racial/racial-kutar.cpp b/src/racial/racial-kutar.cpp index aaf15754a..1ac3013a0 100644 --- a/src/racial/racial-kutar.cpp +++ b/src/racial/racial-kutar.cpp @@ -15,24 +15,24 @@ */ bool set_leveling(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tsubureru && !do_dec) { if (creature_ptr->tsubureru > v) - return FALSE; + return false; } else if (!creature_ptr->tsubureru) { msg_print(_("横に伸びた。", "Your body expands horizontally.")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tsubureru) { msg_print(_("もう横に伸びていない。", "Your body returns to normal.")); - notice = TRUE; + notice = true; } } @@ -40,11 +40,11 @@ bool set_leveling(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/racial/racial-switcher.cpp b/src/racial/racial-switcher.cpp index a50890a71..7d06ca448 100644 --- a/src/racial/racial-switcher.cpp +++ b/src/racial/racial-switcher.cpp @@ -109,7 +109,7 @@ bool switch_class_racial_execution(player_type *creature_ptr, const s32b command (void)dispel_monsters(creature_ptr, creature_ptr->lev * 4); turn_monsters(creature_ptr, creature_ptr->lev * 4); banish_monsters(creature_ptr, creature_ptr->lev * 4); - return TRUE; + return true; } return bless_weapon(creature_ptr); @@ -119,56 +119,56 @@ bool switch_class_racial_execution(player_type *creature_ptr, const s32b command case CLASS_SNIPER: msg_print(_("敵を調査した...", "You examine your foes...")); probing(creature_ptr); - return TRUE; + return true; case CLASS_PALADIN: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; fire_beam(creature_ptr, is_good_realm(creature_ptr->realm1) ? GF_HOLY_FIRE : GF_HELL_FIRE, dir, creature_ptr->lev * 3); - return TRUE; + return true; case CLASS_WARRIOR_MAGE: if (command == -3) return comvert_hp_to_mp(creature_ptr); else if (command == -4) return comvert_mp_to_hp(creature_ptr); - return TRUE; + return true; case CLASS_CHAOS_WARRIOR: return confusing_light(creature_ptr); case CLASS_MONK: if (none_bits(empty_hands(creature_ptr, TRUE), EMPTY_HAND_MAIN)) { msg_print(_("素手じゃないとできません。", "You need to be barehanded.")); - return FALSE; + return false; } if (creature_ptr->riding) { msg_print(_("乗馬中はできません。", "You need to get off a pet.")); - return FALSE; + return false; } if (command == -3) { if (!choose_monk_stance(creature_ptr)) - return FALSE; + return false; set_bits(creature_ptr->update, PU_BONUS); - return TRUE; + return true; } if (command == -4) return double_attack(creature_ptr); - return TRUE; + return true; case CLASS_MINDCRAFTER: case CLASS_FORCETRAINER: return clear_mind(creature_ptr); case CLASS_TOURIST: if (command == -3) { if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; project_length = 1; fire_beam(creature_ptr, GF_PHOTO, dir, 1); - return TRUE; + return true; } return (command != -4) || identify_fully(creature_ptr, FALSE, TV_NONE); @@ -178,16 +178,16 @@ bool switch_class_racial_execution(player_type *creature_ptr, const s32b command case CLASS_BEASTMASTER: if (command == -3) { if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; (void)fire_ball_hide(creature_ptr, GF_CHARM_LIVING, dir, creature_ptr->lev, 0); - return TRUE; + return true; } if (command == -4) project_all_los(creature_ptr, GF_CHARM_LIVING, creature_ptr->lev); - return TRUE; + return true; case CLASS_ARCHER: return create_ammo(creature_ptr); case CLASS_MAGIC_EATER: @@ -197,48 +197,48 @@ bool switch_class_racial_execution(player_type *creature_ptr, const s32b command return (command != -4) || (!cmd_limit_cast(creature_ptr) && do_cmd_magic_eater(creature_ptr, FALSE, TRUE)); case CLASS_BARD: if ((get_singing_song_effect(creature_ptr) == 0) && (get_interrupting_song_effect(creature_ptr) == 0)) - return FALSE; + return false; stop_singing(creature_ptr); PlayerEnergy(creature_ptr).set_player_turn_energy(10); - return TRUE; + return true; case CLASS_RED_MAGE: if (cmd_limit_cast(creature_ptr)) - return FALSE; + return false; handle_stuff(creature_ptr); if (!do_cmd_cast(creature_ptr)) - return FALSE; + return false; if (!creature_ptr->paralyzed && !cmd_limit_cast(creature_ptr)) { handle_stuff(creature_ptr); command_dir = 0; (void)do_cmd_cast(creature_ptr); } - return TRUE; + return true; case CLASS_SAMURAI: if (command == -3) { concentration(creature_ptr); - return TRUE; + return true; } if (command != -4) - return TRUE; + return true; if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND) && !has_melee_weapon(creature_ptr, INVEN_SUB_HAND)) { msg_print(_("武器を持たないといけません。", "You need to wield a weapon.")); - return FALSE; + return false; } if (!choose_kata(creature_ptr)) - return FALSE; + return false; set_bits(creature_ptr->update, PU_BONUS); - return TRUE; + return true; case CLASS_BLUE_MAGE: set_action(creature_ptr, creature_ptr->action == ACTION_LEARN ? ACTION_NONE : ACTION_LEARN); PlayerEnergy(creature_ptr).reset_player_turn(); - return TRUE; + return true; case CLASS_CAVALRY: return rodeo(creature_ptr); case CLASS_BERSERKER: @@ -251,13 +251,13 @@ bool switch_class_racial_execution(player_type *creature_ptr, const s32b command case CLASS_MIRROR_MASTER: if (command == -3) { remove_all_mirrors(creature_ptr, TRUE); - return TRUE; + return true; } if (command == -4) return mirror_concentration(creature_ptr); - return TRUE; + return true; case CLASS_NINJA: return hayagake(creature_ptr); case CLASS_ELEMENTALIST: @@ -265,9 +265,9 @@ bool switch_class_racial_execution(player_type *creature_ptr, const s32b command return clear_mind(creature_ptr); if (command == -4) return switch_element_execution(creature_ptr); - return TRUE; + return true; default: - return TRUE; + return true; } } @@ -280,9 +280,9 @@ bool switch_mimic_racial_execution(player_type *creature_ptr) } case MIMIC_VAMPIRE: vampirism(creature_ptr); - return TRUE; + return true; default: - return TRUE; + return true; } } @@ -295,72 +295,72 @@ bool switch_race_racial_execution(player_type *creature_ptr, const s32b command) (void)detect_traps(creature_ptr, DETECT_RAD_DEFAULT, TRUE); (void)detect_doors(creature_ptr, DETECT_RAD_DEFAULT); (void)detect_stairs(creature_ptr, DETECT_RAD_DEFAULT); - return TRUE; + return true; case RACE_HOBBIT: return create_ration(creature_ptr); case RACE_GNOME: msg_print(_("パッ！", "Blink!")); teleport_player(creature_ptr, 10, TELEPORT_SPONTANEOUS); - return TRUE; + return true; case RACE_HALF_ORC: msg_print(_("勇気を出した。", "You play tough.")); (void)set_afraid(creature_ptr, 0); - return TRUE; + return true; case RACE_HALF_TROLL: msg_print(_("うがぁぁ！", "RAAAGH!")); (void)berserk(creature_ptr, 10 + randint1(creature_ptr->lev)); - return TRUE; + return true; case RACE_AMBERITE: if (command == -1) { msg_print(_("あなたは歩き周り始めた。", "You start walking around. ")); reserve_alter_reality(creature_ptr, randint0(21) + 15); - return TRUE; + return true; } if (command != -2) - return TRUE; + return true; msg_print(_("あなたは「パターン」を心に描いてその上を歩いた...", "You picture the Pattern in your mind and walk it...")); (void)true_healing(creature_ptr, 0); (void)restore_all_status(creature_ptr); (void)restore_level(creature_ptr); - return TRUE; + return true; case RACE_BARBARIAN: msg_print(_("うぉぉおお！", "Raaagh!")); (void)berserk(creature_ptr, 10 + randint1(creature_ptr->lev)); - return TRUE; + return true; case RACE_HALF_OGRE: msg_print(_("爆発のルーンを慎重に仕掛けた...", "You carefully set an explosive rune...")); (void)create_rune_explosion(creature_ptr, creature_ptr->y, creature_ptr->x); - return TRUE; + return true; case RACE_HALF_GIANT: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; (void)wall_to_mud(creature_ptr, dir, 20 + randint1(30)); - return TRUE; + return true; case RACE_HALF_TITAN: msg_print(_("敵を調査した...", "You examine your foes...")); (void)probing(creature_ptr); - return TRUE; + return true; case RACE_CYCLOPS: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; msg_print(_("巨大な岩を投げた。", "You throw a huge boulder.")); (void)fire_bolt(creature_ptr, GF_MISSILE, dir, (3 * creature_ptr->lev) / 2); - return TRUE; + return true; case RACE_YEEK: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; stop_mouth(creature_ptr); msg_print(_("身の毛もよだつ叫び声を上げた！", "You make a horrible scream!")); (void)fear_monster(creature_ptr, dir, creature_ptr->lev); - return TRUE; + return true; case RACE_KLACKON: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; stop_mouth(creature_ptr); msg_print(_("酸を吐いた。", "You spit acid.")); @@ -369,39 +369,39 @@ bool switch_race_racial_execution(player_type *creature_ptr, const s32b command) else (void)fire_ball(creature_ptr, GF_ACID, dir, creature_ptr->lev, 2); - return TRUE; + return true; case RACE_KOBOLD: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; msg_print(_("毒のダーツを投げた。", "You throw a poisoned dart.")); (void)fire_bolt(creature_ptr, GF_POIS, dir, creature_ptr->lev); - return TRUE; + return true; case RACE_NIBELUNG: msg_print(_("周囲を調査した。", "You examine your surroundings.")); (void)detect_traps(creature_ptr, DETECT_RAD_DEFAULT, TRUE); (void)detect_doors(creature_ptr, DETECT_RAD_DEFAULT); (void)detect_stairs(creature_ptr, DETECT_RAD_DEFAULT); - return TRUE; + return true; case RACE_DARK_ELF: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; msg_print(_("マジック・ミサイルを放った。", "You cast a magic missile.")); (void)fire_bolt_or_beam(creature_ptr, 10, GF_MISSILE, dir, damroll(3 + ((creature_ptr->lev - 1) / 5), 4)); - return TRUE; + return true; case RACE_DRACONIAN: return draconian_breath(creature_ptr); case RACE_MIND_FLAYER: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; msg_print(_("あなたは集中し、目が赤く輝いた...", "You concentrate and your eyes glow red...")); (void)fire_bolt(creature_ptr, GF_PSI, dir, creature_ptr->lev); - return TRUE; + return true; case RACE_IMP: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; if (creature_ptr->lev >= 30) { msg_print(_("ファイア・ボールを放った。", "You cast a ball of fire.")); @@ -411,26 +411,26 @@ bool switch_race_racial_execution(player_type *creature_ptr, const s32b command) (void)fire_bolt(creature_ptr, GF_FIRE, dir, creature_ptr->lev); } - return TRUE; + return true; case RACE_GOLEM: (void)set_shield(creature_ptr, randint1(20) + 30, FALSE); - return TRUE; + return true; case RACE_SKELETON: case RACE_ZOMBIE: msg_print(_("あなたは失ったエネルギーを取り戻そうと試みた。", "You attempt to restore your lost energies.")); (void)restore_level(creature_ptr); - return TRUE; + return true; case RACE_VAMPIRE: (void)vampirism(creature_ptr); - return TRUE; + return true; case RACE_SPECTRE: if (!get_aim_dir(creature_ptr, &dir)) - return FALSE; + return false; stop_mouth(creature_ptr); msg_print(_("あなたはおどろおどろしい叫び声をあげた！", "You emit an eldritch howl!")); (void)fear_monster(creature_ptr, dir, creature_ptr->lev); - return TRUE; + return true; case RACE_SPRITE: msg_print(_("あなたは魔法の粉を投げつけた...", "You throw some magic dust...")); if (creature_ptr->lev < 25) @@ -438,17 +438,17 @@ bool switch_race_racial_execution(player_type *creature_ptr, const s32b command) else (void)sleep_monsters(creature_ptr, creature_ptr->lev); - return TRUE; + return true; case RACE_BALROG: return demonic_breath(creature_ptr); case RACE_KUTAR: (void)set_leveling(creature_ptr, randint1(20) + 30, FALSE); - return TRUE; + return true; case RACE_ANDROID: return android_inside_weapon(creature_ptr); default: msg_print(_("この種族は特殊な能力を持っていません。", "This race has no bonus power.")); PlayerEnergy(creature_ptr).reset_player_turn(); - return TRUE; + return true; } } diff --git a/src/racial/racial-vampire.cpp b/src/racial/racial-vampire.cpp index cd9997347..f85e51b65 100644 --- a/src/racial/racial-vampire.cpp +++ b/src/racial/racial-vampire.cpp @@ -16,12 +16,12 @@ bool vampirism(player_type *caster_ptr) { if (d_info[caster_ptr->dungeon_idx].flags.has(DF::NO_MELEE)) { msg_print(_("なぜか攻撃することができない。", "Something prevents you from attacking.")); - return FALSE; + return false; } DIRECTION dir; if (!get_direction(caster_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; POSITION y = caster_ptr->y + ddy[dir]; POSITION x = caster_ptr->x + ddx[dir]; @@ -30,7 +30,7 @@ bool vampirism(player_type *caster_ptr) stop_mouth(caster_ptr); if (!(g_ptr->m_idx)) { msg_print(_("何もない場所に噛みついた！", "You bite into thin air!")); - return FALSE; + return false; } msg_print(_("あなたはニヤリとして牙をむいた...", "You grin and bare your fangs...")); @@ -38,7 +38,7 @@ bool vampirism(player_type *caster_ptr) int dummy = caster_ptr->lev * 2; if (!hypodynamic_bolt(caster_ptr, dir, dummy)) { msg_print(_("げぇ！ひどい味だ。", "Yechh. That tastes foul.")); - return TRUE; + return true; } if (caster_ptr->food < PY_FOOD_FULL) @@ -54,5 +54,5 @@ bool vampirism(player_type *caster_ptr) if (caster_ptr->food < PY_FOOD_MAX) /* Not gorged already */ (void)set_food(caster_ptr, dummy >= PY_FOOD_MAX ? PY_FOOD_MAX - 1 : dummy); - return TRUE; + return true; } diff --git a/src/realm/realm-arcane.cpp b/src/realm/realm-arcane.cpp index 5a99be2f5..f3e62fe4a 100644 --- a/src/realm/realm-arcane.cpp +++ b/src/realm/realm-arcane.cpp @@ -34,10 +34,10 @@ */ concptr do_arcane_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-chaos.cpp b/src/realm/realm-chaos.cpp index 1b37f3941..f4dc09a75 100644 --- a/src/realm/realm-chaos.cpp +++ b/src/realm/realm-chaos.cpp @@ -34,10 +34,10 @@ */ concptr do_chaos_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-craft.cpp b/src/realm/realm-craft.cpp index 74d90df5b..67826577c 100644 --- a/src/realm/realm-craft.cpp +++ b/src/realm/realm-craft.cpp @@ -28,10 +28,10 @@ */ concptr do_craft_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-crusade.cpp b/src/realm/realm-crusade.cpp index 64d5b6c63..7e1ab9569 100644 --- a/src/realm/realm-crusade.cpp +++ b/src/realm/realm-crusade.cpp @@ -40,10 +40,10 @@ */ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-death.cpp b/src/realm/realm-death.cpp index 65edee42e..2576d168e 100644 --- a/src/realm/realm-death.cpp +++ b/src/realm/realm-death.cpp @@ -37,10 +37,10 @@ */ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-demon.cpp b/src/realm/realm-demon.cpp index 09f1a2d6d..997797123 100644 --- a/src/realm/realm-demon.cpp +++ b/src/realm/realm-demon.cpp @@ -37,10 +37,10 @@ */ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-hex.cpp b/src/realm/realm-hex.cpp index f4da2e1cb..0b22a1e5f 100644 --- a/src/realm/realm-hex.cpp +++ b/src/realm/realm-hex.cpp @@ -86,14 +86,14 @@ static bool item_tester_hook_weapon_except_bow(player_type *player_ptr, object_t case TV_HAFTED: case TV_POLEARM: case TV_DIGGING: { - return TRUE; + return true; } default: break; } - return FALSE; + return false; } /*! @@ -104,14 +104,14 @@ static bool item_tester_hook_weapon_except_bow(player_type *player_ptr, object_t */ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; - bool cont = (mode == SPELL_CONT) ? TRUE : FALSE; - bool stop = (mode == SPELL_STOP) ? TRUE : FALSE; + bool name = mode == SPELL_NAME; + bool desc = mode == SPELL_DESC; + bool info = mode == SPELL_INFO; + bool cast = mode == SPELL_CAST; + bool cont = mode == SPELL_CONT; + bool stop = mode == SPELL_STOP; - bool add = TRUE; + bool add = true; PLAYER_LEVEL plev = caster_ptr->lev; HIT_POINT power; @@ -203,13 +203,13 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP), TV_NONE); if (!o_ptr) - return FALSE; + return ""; describe_flavor(caster_ptr, o_name, o_ptr, OD_NAME_ONLY); object_flags(caster_ptr, o_ptr, f); if (!get_check(format(_("本当に %s を呪いますか？", "Do you curse %s, really？"), o_name))) - return FALSE; + return ""; if (!one_in_(3) && (object_is_artifact(o_ptr) || has_flag(f, TR_BLESSED))) { msg_format(_("%s は呪いを跳ね返した。", "%s resists the effect."), o_name); @@ -257,7 +257,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) } caster_ptr->update |= (PU_BONUS); - add = FALSE; + add = false; } break; @@ -295,7 +295,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) hex_revenge_turn(caster_ptr) = r; hex_revenge_power(caster_ptr) = 0; msg_print(_("じっと耐えることにした。", "You decide to endure damage for future retribution.")); - add = FALSE; + add = false; } if (cont) { POSITION rad = 2 + (power / 50); @@ -357,7 +357,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) casting_hex_flags(caster_ptr) |= (1UL << HEX_INHAIL); do_cmd_quaff_potion(caster_ptr); casting_hex_flags(caster_ptr) &= ~(1UL << HEX_INHAIL); - add = FALSE; + add = false; } break; @@ -475,7 +475,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) if (cast) { if (!recharge(caster_ptr, power)) return NULL; - add = FALSE; + add = false; } break; @@ -510,14 +510,14 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP), TV_NONE); if (!o_ptr) - return FALSE; + return ""; o_ptr = &caster_ptr->inventory_list[item]; describe_flavor(caster_ptr, o_name, o_ptr, OD_NAME_ONLY); object_flags(caster_ptr, o_ptr, f); if (!get_check(format(_("本当に %s を呪いますか？", "Do you curse %s, really？"), o_name))) - return FALSE; + return ""; if (!one_in_(3) && (object_is_artifact(o_ptr) || has_flag(f, TR_BLESSED))) { msg_format(_("%s は呪いを跳ね返した。", "%s resists the effect."), o_name); @@ -566,7 +566,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) } caster_ptr->update |= (PU_BONUS); - add = FALSE; + add = false; } break; @@ -647,7 +647,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) msg_print(_("体が元の活力を取り戻し始めた。", "You feel your lost status starting to return.")); } if (cast || cont) { - bool flag = FALSE; + bool flag = false; int d = (caster_ptr->max_exp - caster_ptr->exp); int r = (caster_ptr->exp / 20); int i; @@ -661,7 +661,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) /* Check the experience */ check_experience(caster_ptr); - flag = TRUE; + flag = true; } for (i = A_STR; i < A_MAX; i++) { if (caster_ptr->stat_cur[i] < caster_ptr->stat_max[i]) { @@ -674,7 +674,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) caster_ptr->stat_cur[i] = caster_ptr->stat_max[i]; caster_ptr->update |= (PU_BONUS); - flag = TRUE; + flag = true; } } @@ -711,7 +711,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP), TV_NONE); if (!o_ptr) - return FALSE; + return ""; object_flags(caster_ptr, o_ptr, f); @@ -733,7 +733,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) o_ptr->curse_flags.clear(); } - add = FALSE; + add = false; } break; @@ -786,9 +786,9 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) for (i = 0; i < 3; i++) { if (!tgt_pt(caster_ptr, &x, &y)) - return FALSE; + return ""; - flag = FALSE; + flag = false; for (dir = 0; dir < 8; dir++) { int dy = y + ddy_ddd[dir]; @@ -796,7 +796,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) if (dir == 5) continue; if (caster_ptr->current_floor_ptr->grid_array[dy][dx].m_idx) - flag = TRUE; + flag = true; } if (!is_cave_empty_bold(caster_ptr, y, x) || (caster_ptr->current_floor_ptr->grid_array[y][x].info & CAVE_ICKY) @@ -814,7 +814,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) teleport_player(caster_ptr, 30, TELEPORT_SPONTANEOUS); } - add = FALSE; + add = false; } break; @@ -853,7 +853,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) hex_revenge_type(caster_ptr) = 2; hex_revenge_turn(caster_ptr) = r; msg_format(_("あなたは復讐を宣告した。あと %d ターン。", "You declare your revenge. %d turns left."), r); - add = FALSE; + add = false; } if (cont) { hex_revenge_turn(caster_ptr)--; diff --git a/src/realm/realm-hissatsu.cpp b/src/realm/realm-hissatsu.cpp index 621e1e0cf..943f491b4 100644 --- a/src/realm/realm-hissatsu.cpp +++ b/src/realm/realm-hissatsu.cpp @@ -64,9 +64,9 @@ */ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; @@ -222,7 +222,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m return NULL; } msg_print(_("相手の攻撃に対して身構えた。", "You prepare to counterattack.")); - caster_ptr->counter = TRUE; + caster_ptr->counter = true; } break; @@ -538,7 +538,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m msg_print(_("その方向にはモンスターはいません。", "There is no monster.")); return NULL; } - caster_ptr->sutemi = TRUE; + caster_ptr->sutemi = true; } break; @@ -826,7 +826,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m if (cast) { const int mana_cost_per_monster = 8; - bool is_new = TRUE; + bool is_new = true; bool mdeath; do { @@ -835,7 +835,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m if (is_new) { /* Reserve needed mana point */ caster_ptr->csp -= technic_info[REALM_HISSATSU - MIN_TECHNIC][26].smana; - is_new = FALSE; + is_new = false; } else caster_ptr->csp -= mana_cost_per_monster; @@ -1010,7 +1010,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m return NULL; if (current_world_ptr->total_winner) { take_hit(caster_ptr, DAMAGE_FORCE, 9999, "Seppuku"); - current_world_ptr->total_winner = TRUE; + current_world_ptr->total_winner = true; } else { msg_print(_("武士道とは、死ぬことと見つけたり。", "The meaning of bushido is found in death.")); take_hit(caster_ptr, DAMAGE_FORCE, 9999, "Seppuku"); diff --git a/src/realm/realm-life.cpp b/src/realm/realm-life.cpp index 1d4aaec7f..593f2ea5d 100644 --- a/src/realm/realm-life.cpp +++ b/src/realm/realm-life.cpp @@ -32,10 +32,10 @@ */ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-nature.cpp b/src/realm/realm-nature.cpp index 9bca37193..12a3a7199 100644 --- a/src/realm/realm-nature.cpp +++ b/src/realm/realm-nature.cpp @@ -49,10 +49,10 @@ */ concptr do_nature_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-song.cpp b/src/realm/realm-song.cpp index 823631326..589ca3ecc 100644 --- a/src/realm/realm-song.cpp +++ b/src/realm/realm-song.cpp @@ -57,13 +57,13 @@ static void start_singing(player_type *caster_ptr, SPELL_IDX spell, MAGIC_NUM1 s */ concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; - bool fail = (mode == SPELL_FAIL) ? TRUE : FALSE; - bool cont = (mode == SPELL_CONT) ? TRUE : FALSE; - bool stop = (mode == SPELL_STOP) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; + bool fail = (mode == SPELL_FAIL) ? TRUE : false; + bool cont = (mode == SPELL_CONT) ? TRUE : false; + bool stop = (mode == SPELL_STOP) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-sorcery.cpp b/src/realm/realm-sorcery.cpp index 02eb9d0fc..c7951c497 100644 --- a/src/realm/realm-sorcery.cpp +++ b/src/realm/realm-sorcery.cpp @@ -34,10 +34,10 @@ */ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; diff --git a/src/realm/realm-trump.cpp b/src/realm/realm-trump.cpp index faf753531..1cbcafa1d 100644 --- a/src/realm/realm-trump.cpp +++ b/src/realm/realm-trump.cpp @@ -37,11 +37,11 @@ */ concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode) { - bool name = (mode == SPELL_NAME) ? TRUE : FALSE; - bool desc = (mode == SPELL_DESC) ? TRUE : FALSE; - bool info = (mode == SPELL_INFO) ? TRUE : FALSE; - bool cast = (mode == SPELL_CAST) ? TRUE : FALSE; - bool fail = (mode == SPELL_FAIL) ? TRUE : FALSE; + bool name = (mode == SPELL_NAME) ? TRUE : false; + bool desc = (mode == SPELL_DESC) ? TRUE : false; + bool info = (mode == SPELL_INFO) ? TRUE : false; + bool cast = (mode == SPELL_CAST) ? TRUE : false; + bool fail = (mode == SPELL_FAIL) ? TRUE : false; DIRECTION dir; PLAYER_LEVEL plev = caster_ptr->lev; @@ -278,7 +278,7 @@ concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode /* Temporary enable target_pet option */ bool old_target_pet = target_pet; - target_pet = TRUE; + target_pet = true; result = get_aim_dir(caster_ptr, &dir); @@ -562,7 +562,7 @@ concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode /* Temporary enable target_pet option */ bool old_target_pet = target_pet; - target_pet = TRUE; + target_pet = true; result = get_aim_dir(caster_ptr, &dir); diff --git a/src/room/cave-filler.cpp b/src/room/cave-filler.cpp index a3e3da978..ea15c7081 100644 --- a/src/room/cave-filler.cpp +++ b/src/room/cave-filler.cpp @@ -182,7 +182,7 @@ static bool hack_isnt_wall(player_type *player_ptr, POSITION y, POSITION x, int { floor_type *floor_ptr = player_ptr->current_floor_ptr; if (floor_ptr->grid_array[y][x].info & CAVE_ICKY) - return FALSE; + return false; floor_ptr->grid_array[y][x].info |= (CAVE_ICKY); if (floor_ptr->grid_array[y][x].feat <= c1) { @@ -190,12 +190,12 @@ static bool hack_isnt_wall(player_type *player_ptr, POSITION y, POSITION x, int floor_ptr->grid_array[y][x].feat = feat1; floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); floor_ptr->grid_array[y][x].info |= info1; - return TRUE; + return true; } else { floor_ptr->grid_array[y][x].feat = feat2; floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); floor_ptr->grid_array[y][x].info |= info2; - return TRUE; + return true; } } @@ -204,12 +204,12 @@ static bool hack_isnt_wall(player_type *player_ptr, POSITION y, POSITION x, int floor_ptr->grid_array[y][x].feat = feat2; floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); floor_ptr->grid_array[y][x].info |= info2; - return TRUE; + return true; } else { floor_ptr->grid_array[y][x].feat = feat1; floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); floor_ptr->grid_array[y][x].info |= info1; - return TRUE; + return true; } } @@ -217,11 +217,11 @@ static bool hack_isnt_wall(player_type *player_ptr, POSITION y, POSITION x, int floor_ptr->grid_array[y][x].feat = feat3; floor_ptr->grid_array[y][x].info &= ~(CAVE_MASK); floor_ptr->grid_array[y][x].info |= info3; - return TRUE; + return true; } place_bold(player_ptr, y, x, GB_OUTER); - return FALSE; + return false; } /* @@ -288,7 +288,7 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO } } - return FALSE; + return false; } for (int i = 0; i <= xsize; ++i) { @@ -378,7 +378,7 @@ bool generate_fracave(player_type *player_ptr, POSITION y0, POSITION x0, POSITIO } } - return TRUE; + return true; } bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION xsize, POSITION ysize, int c1, int c2, int c3, int type) @@ -423,7 +423,7 @@ bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION x feat3 = feat_shallow_lava; break; default: - return FALSE; + return false; } fill_data.c1 = c1; @@ -447,7 +447,7 @@ bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION x } } - return FALSE; + return false; } for (int i = 0; i <= xsize; ++i) { @@ -477,5 +477,5 @@ bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION x } } - return TRUE; + return true; } diff --git a/src/room/room-generator.cpp b/src/room/room-generator.cpp index e930b3397..2918de877 100644 --- a/src/room/room-generator.cpp +++ b/src/room/room-generator.cpp @@ -65,7 +65,7 @@ static bool room_build(player_type *player_ptr, dun_data_type *dd_ptr, EFFECT_ID case ROOM_T_FIXED: return build_type17(player_ptr, dd_ptr); default: - return FALSE; + return false; } } @@ -181,8 +181,8 @@ bool generate_rooms(player_type *player_ptr, dun_data_type *dd_ptr) } bool remain; - while (TRUE) { - remain = FALSE; + while (true) { + remain = false; for (int i = 0; i < ROOM_T_MAX; i++) { int room_type = room_build_order[i]; if (!room_num[room_type]) @@ -193,7 +193,7 @@ bool generate_rooms(player_type *player_ptr, dun_data_type *dd_ptr) continue; rooms_built++; - remain = TRUE; + remain = true; switch (room_type) { case ROOM_T_PIT: case ROOM_T_NEST: @@ -218,9 +218,9 @@ bool generate_rooms(player_type *player_ptr, dun_data_type *dd_ptr) /*! @details 部屋生成数が2未満の場合生成失敗を返す */ if (rooms_built < 2) { msg_format_wizard(player_ptr, CHEAT_DUNGEON, _("部屋数が2未満でした。生成を再試行します。", "Number of rooms was under 2. Retry."), rooms_built); - return FALSE; + return false; } msg_format_wizard(player_ptr, CHEAT_DUNGEON, _("このダンジョンの部屋数は %d です。", "Number of Rooms: %d"), rooms_built); - return TRUE; + return true; } diff --git a/src/room/rooms-builder.cpp b/src/room/rooms-builder.cpp index 4b9f9a33d..4d40c84cf 100644 --- a/src/room/rooms-builder.cpp +++ b/src/room/rooms-builder.cpp @@ -96,11 +96,11 @@ void build_small_room(player_type *player_ptr, POSITION x0, POSITION y0) */ void build_cavern(player_type *player_ptr) { - bool light = FALSE; - bool done = FALSE; + bool light = false; + bool done = false; floor_type *floor_ptr = player_ptr->current_floor_ptr; if ((floor_ptr->dun_level <= randint1(50)) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)) - light = TRUE; + light = true; POSITION xsize = floor_ptr->width - 1; POSITION ysize = floor_ptr->height - 1; @@ -135,7 +135,7 @@ void build_lake(player_type *player_ptr, int type) int y0 = ysize / 2; xsize = x0 * 2; ysize = y0 * 2; - bool done = FALSE; + bool done = false; while (!done) { int grd = randint1(3) + 4; int roug = randint1(8) * randint1(4); diff --git a/src/room/rooms-city.cpp b/src/room/rooms-city.cpp index 63286d538..1c72fb47d 100644 --- a/src/room/rooms-city.cpp +++ b/src/room/rooms-city.cpp @@ -47,7 +47,7 @@ static bool precalc_ugarcade(int town_hgt, int town_wid, int n) for (abort = FALSE, y = cur_ugbldg->y0; (y <= cur_ugbldg->y1) && !abort; y++) { for (x = cur_ugbldg->x0; x <= cur_ugbldg->x1; x++) { if (ugarcade_used[y][x]) { - abort = TRUE; + abort = true; break; } } @@ -61,7 +61,7 @@ static bool precalc_ugarcade(int town_hgt, int town_wid, int n) for (y = cur_ugbldg->y0 - 1; y <= cur_ugbldg->y1 + 1; y++) { for (x = cur_ugbldg->x0 - 1; x <= cur_ugbldg->x1 + 1; x++) { - ugarcade_used[y][x] = TRUE; + ugarcade_used[y][x] = true; } } } @@ -189,7 +189,7 @@ bool build_type16(player_type *player_ptr, dun_data_type *dd_ptr) POSITION i, y, x, y1, x1, yval, xval; int town_hgt = rand_range(MIN_TOWN_HGT, MAX_TOWN_HGT); int town_wid = rand_range(MIN_TOWN_WID, MAX_TOWN_WID); - bool prevent_bm = FALSE; + bool prevent_bm = false; floor_type *floor_ptr = player_ptr->current_floor_ptr; for (y = 0; (y < floor_ptr->height) && !prevent_bm; y++) { for (x = 0; x < floor_ptr->width; x++) { @@ -205,17 +205,17 @@ bool build_type16(player_type *player_ptr, dun_data_type *dd_ptr) stores[i] = stores[--n]; if (!n) - return FALSE; + return false; C_MAKE(ugbldg, n, ugbldg_type); if (!precalc_ugarcade(town_hgt, town_wid, n)) { C_KILL(ugbldg, n, ugbldg_type); - return FALSE; + return false; } if (!find_space(player_ptr, dd_ptr, &yval, &xval, town_hgt + 4, town_wid + 4)) { C_KILL(ugbldg, n, ugbldg_type); - return FALSE; + return false; } y1 = yval - (town_hgt / 2); @@ -224,5 +224,5 @@ bool build_type16(player_type *player_ptr, dun_data_type *dd_ptr) build_stores(player_ptr, y1, x1, stores, n); msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("地下街を生成しました", "Underground arcade was generated.")); C_KILL(ugbldg, n, ugbldg_type); - return TRUE; + return true; } diff --git a/src/room/rooms-fractal.cpp b/src/room/rooms-fractal.cpp index 3f5f44568..42a683e23 100644 --- a/src/room/rooms-fractal.cpp +++ b/src/room/rooms-fractal.cpp @@ -43,10 +43,10 @@ bool build_type9(player_type *player_ptr, dun_data_type *dd_ptr) } } - light = done = FALSE; - room = TRUE; + light = done = false; + room = true; - if ((floor_ptr->dun_level <= randint1(25)) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)) light = TRUE; + if ((floor_ptr->dun_level <= randint1(25)) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)) light = true; while (!done) { @@ -70,5 +70,5 @@ bool build_type9(player_type *player_ptr, dun_data_type *dd_ptr) done = generate_fracave(player_ptr, y0, x0, xsize, ysize, cutoff, light, room); } - return TRUE; + return true; } diff --git a/src/room/rooms-normal.cpp b/src/room/rooms-normal.cpp index c64bb6ec1..bacf4be01 100644 --- a/src/room/rooms-normal.cpp +++ b/src/room/rooms-normal.cpp @@ -52,7 +52,7 @@ bool build_type1(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, ysize + 2, xsize + 2)) - return FALSE; + return false; } /* Choose lite or dark */ @@ -184,7 +184,7 @@ bool build_type1(player_type *player_ptr, dun_data_type *dd_ptr) floor_ptr->grid_array[yval][xval].feat = feat_door[DOOR_CURTAIN].closed; } - return TRUE; + return true; } /*! @@ -202,7 +202,7 @@ bool build_type2(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ floor_type *floor_ptr = player_ptr->current_floor_ptr; if (!find_space(player_ptr, dd_ptr, &yval, &xval, 11, 25)) - return FALSE; + return false; /* Choose lite or dark */ light = ((floor_ptr->dun_level <= randint1(25)) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)); @@ -285,7 +285,7 @@ bool build_type2(player_type *player_ptr, dun_data_type *dd_ptr) } } - return TRUE; + return true; } /*! @@ -313,7 +313,7 @@ bool build_type3(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ floor_type *floor_ptr = player_ptr->current_floor_ptr; if (!find_space(player_ptr, dd_ptr, &yval, &xval, 11, 25)) - return FALSE; + return false; /* Choose lite or dark */ light = ((floor_ptr->dun_level <= randint1(25)) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)); @@ -524,7 +524,7 @@ bool build_type3(player_type *player_ptr, dun_data_type *dd_ptr) } } - return TRUE; + return true; } /*! @@ -548,7 +548,7 @@ bool build_type4(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ floor_type *floor_ptr = player_ptr->current_floor_ptr; if (!find_space(player_ptr, dd_ptr, &yval, &xval, 11, 25)) - return FALSE; + return false; /* Choose lite or dark */ light = ((floor_ptr->dun_level <= randint1(25)) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)); @@ -858,7 +858,7 @@ bool build_type4(player_type *player_ptr, dun_data_type *dd_ptr) } } - return TRUE; + return true; } /*! @@ -873,18 +873,18 @@ bool build_type4(player_type *player_ptr, dun_data_type *dd_ptr) bool build_type11(player_type *player_ptr, dun_data_type *dd_ptr) { POSITION rad, x, y, x0, y0; - int light = FALSE; + int light = false; /* Occasional light */ floor_type *floor_ptr = player_ptr->current_floor_ptr; if ((randint1(floor_ptr->dun_level) <= 15) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)) - light = TRUE; + light = true; rad = randint0(9); /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &y0, &x0, rad * 2 + 1, rad * 2 + 1)) - return FALSE; + return false; /* Make circular floor */ for (x = x0 - rad; x <= x0 + rad; x++) { @@ -902,7 +902,7 @@ bool build_type11(player_type *player_ptr, dun_data_type *dd_ptr) /* Find visible outer walls and set to be FEAT_OUTER */ add_outer_wall(player_ptr, x0, y0, light, x0 - rad, y0 - rad, x0 + rad, y0 + rad); - return TRUE; + return true; } /*! @@ -917,8 +917,8 @@ bool build_type11(player_type *player_ptr, dun_data_type *dd_ptr) bool build_type12(player_type *player_ptr, dun_data_type *dd_ptr) { POSITION rad, x, y, x0, y0; - int light = FALSE; - bool emptyflag = TRUE; + int light = false; + bool emptyflag = true; /* Make a random metric */ POSITION h1, h2, h3, h4; @@ -930,13 +930,13 @@ bool build_type12(player_type *player_ptr, dun_data_type *dd_ptr) /* Occasional light */ floor_type *floor_ptr = player_ptr->current_floor_ptr; if ((randint1(floor_ptr->dun_level) <= 5) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)) - light = TRUE; + light = true; rad = randint1(9); /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &y0, &x0, rad * 2 + 3, rad * 2 + 3)) - return FALSE; + return false; /* Make floor */ for (x = x0 - rad; x <= x0 + rad; x++) { @@ -969,7 +969,7 @@ bool build_type12(player_type *player_ptr, dun_data_type *dd_ptr) for (y = y0 - 2; y <= y0 + 2; y++) { if (!is_floor_bold(floor_ptr, y, x)) { /* Wall in the way */ - emptyflag = FALSE; + emptyflag = false; } } } @@ -988,5 +988,5 @@ bool build_type12(player_type *player_ptr, dun_data_type *dd_ptr) vault_traps(player_ptr, y0, x0, 4, 4, randint0(3) + 2); } - return TRUE; + return true; } diff --git a/src/room/rooms-pit-nest.cpp b/src/room/rooms-pit-nest.cpp index a0cc59d71..98d06dcf2 100644 --- a/src/room/rooms-pit-nest.cpp +++ b/src/room/rooms-pit-nest.cpp @@ -132,19 +132,19 @@ static bool ang_sort_comp_nest_mon_info(player_type *player_ptr, vptr u, vptr v, int z2 = nest_mon_info[b].used; if (z1 < z2) - return FALSE; + return false; if (z1 > z2) - return TRUE; + return true; if (r1_ptr->level < r2_ptr->level) - return TRUE; + return true; if (r1_ptr->level > r2_ptr->level) - return FALSE; + return false; if (r1_ptr->mexp < r2_ptr->mexp) - return TRUE; + return true; if (r1_ptr->mexp > r2_ptr->mexp) - return FALSE; + return false; return w1 <= w2; } @@ -222,7 +222,7 @@ bool build_type5(player_type *player_ptr, dun_data_type *dd_ptr) /* No type available */ if (cur_nest_type < 0) - return FALSE; + return false; n_ptr = &nest_types[cur_nest_type]; @@ -254,7 +254,7 @@ bool build_type5(player_type *player_ptr, dun_data_type *dd_ptr) /* Notice failure */ if (!r_idx || !attempts) - return FALSE; + return false; /* Note the alignment */ if (r_ptr->flags3 & RF3_EVIL) @@ -263,12 +263,12 @@ bool build_type5(player_type *player_ptr, dun_data_type *dd_ptr) align.sub_align |= SUB_ALIGN_GOOD; nest_mon_info[i].r_idx = (s16b)r_idx; - nest_mon_info[i].used = FALSE; + nest_mon_info[i].used = false; } /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, 11, 25)) - return FALSE; + return false; /* Large room */ y1 = yval - 4; @@ -355,7 +355,7 @@ bool build_type5(player_type *player_ptr, dun_data_type *dd_ptr) /* Place that "random" monster (no groups) */ (void)place_monster_aux(player_ptr, 0, y, x, r_idx, 0L); - nest_mon_info[i].used = TRUE; + nest_mon_info[i].used = true; } } @@ -377,7 +377,7 @@ bool build_type5(player_type *player_ptr, dun_data_type *dd_ptr) } } - return TRUE; + return true; } /*! @@ -449,7 +449,7 @@ bool build_type6(player_type *player_ptr, dun_data_type *dd_ptr) /* No type available */ if (cur_pit_type < 0) - return FALSE; + return false; n_ptr = &pit_types[cur_pit_type]; @@ -481,7 +481,7 @@ bool build_type6(player_type *player_ptr, dun_data_type *dd_ptr) /* Notice failure */ if (!r_idx || !attempts) - return FALSE; + return false; /* Note the alignment */ if (r_ptr->flags3 & RF3_EVIL) @@ -494,7 +494,7 @@ bool build_type6(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, 11, 25)) - return FALSE; + return false; /* Large room */ y1 = yval - 4; @@ -641,7 +641,7 @@ bool build_type6(player_type *player_ptr, dun_data_type *dd_ptr) /* Center monster */ place_monster_aux(player_ptr, 0, yval, xval, what[7], PM_NO_KAGE); - return TRUE; + return true; } // clang-format off @@ -680,13 +680,13 @@ static bool vault_aux_trapped_pit(player_type *player_ptr, MONRACE_IDX r_idx) monster_race *r_ptr = &r_info[r_idx]; if (!vault_monster_okay(player_ptr, r_idx)) - return FALSE; + return false; /* No wall passing monster */ if (r_ptr->flags2 & (RF2_PASS_WALL | RF2_KILL_WALL)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -750,11 +750,11 @@ bool build_type13(player_type *player_ptr, dun_data_type *dd_ptr) /* Only in Angband */ if (floor_ptr->dungeon_idx != DUNGEON_ANGBAND) - return FALSE; + return false; /* No type available */ if (cur_pit_type < 0) - return FALSE; + return false; n_ptr = &pit_types[cur_pit_type]; @@ -786,7 +786,7 @@ bool build_type13(player_type *player_ptr, dun_data_type *dd_ptr) /* Notice failure */ if (!r_idx || !attempts) - return FALSE; + return false; /* Note the alignment */ if (r_ptr->flags3 & RF3_EVIL) @@ -799,7 +799,7 @@ bool build_type13(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, 13, 25)) - return FALSE; + return false; /* Large room */ y1 = yval - 5; @@ -925,5 +925,5 @@ bool build_type13(player_type *player_ptr, dun_data_type *dd_ptr) place_monster_aux(player_ptr, 0, y, x, what[place_table_trapped_pit[i][2]], PM_NO_KAGE); } - return TRUE; + return true; } diff --git a/src/room/rooms-special.cpp b/src/room/rooms-special.cpp index 3d284dc6f..975c85ced 100644 --- a/src/room/rooms-special.cpp +++ b/src/room/rooms-special.cpp @@ -40,7 +40,7 @@ bool build_type15(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ floor_type *floor_ptr = player_ptr->current_floor_ptr; if (!find_space(player_ptr, dd_ptr, &yval, &xval, ysize + 2, xsize + 2)) - return FALSE; + return false; /* Choose lite or dark */ light = ((floor_ptr->dun_level <= randint1(25)) && d_info[floor_ptr->dungeon_idx].flags.has_not(DF::DARKNESS)); @@ -241,5 +241,5 @@ bool build_type15(player_type *player_ptr, dun_data_type *dd_ptr) } msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("ガラスの部屋が生成されました。", "Glass room was generated.")); - return TRUE; + return true; } diff --git a/src/room/rooms-trap.cpp b/src/room/rooms-trap.cpp index 362031b34..2ec3f738d 100644 --- a/src/room/rooms-trap.cpp +++ b/src/room/rooms-trap.cpp @@ -38,7 +38,7 @@ bool build_type14(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, ysize + 2, xsize + 2)) - return FALSE; + return false; /* Choose lite or dark */ floor_type *floor_ptr = player_ptr->current_floor_ptr; @@ -86,5 +86,5 @@ bool build_type14(player_type *player_ptr, dun_data_type *dd_ptr) g_ptr->feat = trap; msg_format_wizard(player_ptr, CHEAT_DUNGEON, _("%sの部屋が生成されました。", "Room of %s was generated."), f_info[trap].name.c_str()); - return TRUE; + return true; } diff --git a/src/room/rooms-vault.cpp b/src/room/rooms-vault.cpp index d055fda17..bc5e40e09 100644 --- a/src/room/rooms-vault.cpp +++ b/src/room/rooms-vault.cpp @@ -78,11 +78,11 @@ static void build_bubble_vault(player_type *player_ptr, POSITION x0, POSITION y0 center[0].y = (byte)randint1(ysize - 3) + 1; for (i = 1; i < BUBBLENUM; i++) { - done = FALSE; + done = false; /* get center and check to see if it is unique */ while (!done) { - done = TRUE; + done = true; x = randint1(xsize - 3) + 1; y = randint1(ysize - 3) + 1; @@ -90,7 +90,7 @@ static void build_bubble_vault(player_type *player_ptr, POSITION x0, POSITION y0 for (j = 0; j < i; j++) { /* rough test to see if there is an overlap */ if ((x == center[j].x) && (y == center[j].y)) - done = FALSE; + done = false; } } @@ -231,8 +231,8 @@ static void build_cave_vault(player_type *player_ptr, POSITION x0, POSITION y0, msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("洞穴ランダムVaultを生成しました。", "Cave Vault.")); - light = done = FALSE; - room = TRUE; + light = done = false; + room = true; floor_type *floor_ptr = player_ptr->current_floor_ptr; while (!done) { @@ -626,7 +626,7 @@ bool build_type7(player_type *player_ptr, dun_data_type *dd_ptr) /* No lesser vault found */ if (dummy >= SAFE_MAX_ATTEMPTS) { msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("小型固定Vaultを配置できませんでした。", "Could not place lesser vault.")); - return FALSE; + return false; } /* pick type of transformation (0-7) */ @@ -659,14 +659,14 @@ bool build_type7(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, abs(y), abs(x))) - return FALSE; + return false; msg_format_wizard(player_ptr, CHEAT_DUNGEON, _("小型Vault(%s)を生成しました。", "Lesser vault (%s)."), v_ptr->name.c_str()); /* Hack -- Build the vault */ build_vault(player_ptr, yval, xval, v_ptr->hgt, v_ptr->wid, v_ptr->text.c_str(), xoffset, yoffset, transno); - return TRUE; + return true; } /*! @@ -694,7 +694,7 @@ bool build_type8(player_type *player_ptr, dun_data_type *dd_ptr) /* No greater vault found */ if (dummy >= SAFE_MAX_ATTEMPTS) { msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("大型固定Vaultを配置できませんでした。", "Could not place greater vault.")); - return FALSE; + return false; } /* pick type of transformation (0-7) */ @@ -733,14 +733,14 @@ bool build_type8(player_type *player_ptr, dun_data_type *dd_ptr) */ /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, (POSITION)(abs(y) + 2), (POSITION)(abs(x) + 2))) - return FALSE; + return false; msg_format_wizard(player_ptr, CHEAT_DUNGEON, _("大型固定Vault(%s)を生成しました。", "Greater vault (%s)."), v_ptr->name.c_str()); /* Hack -- Build the vault */ build_vault(player_ptr, yval, xval, v_ptr->hgt, v_ptr->wid, v_ptr->text.c_str(), xoffset, yoffset, transno); - return TRUE; + return true; } /* @@ -856,7 +856,7 @@ static void build_elemental_vault(player_type *player_ptr, POSITION x0, POSITION { int grd, roug; int c1, c2, c3; - bool done = FALSE; + bool done = false; POSITION xsize, ysize, xhsize, yhsize, x, y; int i; int type; @@ -1094,7 +1094,7 @@ bool build_type10(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ floor_type *floor_ptr = player_ptr->current_floor_ptr; if (!find_space(player_ptr, dd_ptr, &y0, &x0, ysize + 1, xsize + 1)) - return FALSE; + return false; /* Select type of vault */ do { @@ -1136,10 +1136,10 @@ bool build_type10(player_type *player_ptr, dun_data_type *dd_ptr) break; /* I know how to add a few more... give me some time. */ default: - return FALSE; + return false; } - return TRUE; + return true; } /*! @@ -1167,7 +1167,7 @@ bool build_type17(player_type *player_ptr, dun_data_type *dd_ptr) /* No lesser vault found */ if (dummy >= SAFE_MAX_ATTEMPTS) { msg_print_wizard(player_ptr, CHEAT_DUNGEON, _("固定特殊部屋を配置できませんでした。", "Could not place fixed special room.")); - return FALSE; + return false; } /* pick type of transformation (0-7) */ @@ -1200,12 +1200,12 @@ bool build_type17(player_type *player_ptr, dun_data_type *dd_ptr) /* Find and reserve some space in the dungeon. Get center of room. */ if (!find_space(player_ptr, dd_ptr, &yval, &xval, abs(y), abs(x))) - return FALSE; + return false; msg_format_wizard(player_ptr, CHEAT_DUNGEON, _("特殊固定部屋(%s)を生成しました。", "Special Fixed Room (%s)."), v_ptr->name.c_str()); /* Hack -- Build the vault */ build_vault(player_ptr, yval, xval, v_ptr->hgt, v_ptr->wid, v_ptr->text.c_str(), xoffset, yoffset, transno); - return TRUE; + return true; } diff --git a/src/room/space-finder.cpp b/src/room/space-finder.cpp index 3cdf2178a..3cfc1c52e 100644 --- a/src/room/space-finder.cpp +++ b/src/room/space-finder.cpp @@ -16,13 +16,13 @@ static bool get_is_floor(floor_type *floor_ptr, POSITION x, POSITION y) { if (!in_bounds(floor_ptr, y, x)) { - return FALSE; + return false; } if (is_floor_bold(floor_ptr, y, x)) - return TRUE; + return true; - return FALSE; + return false; } /*! @@ -116,21 +116,21 @@ static bool find_space_aux(dun_data_type *dd_ptr, POSITION blocks_high, POSITION { if (blocks_wide < 3) { if ((blocks_wide == 2) && (block_x % 3) == 2) - return FALSE; + return false; } else if ((blocks_wide % 3) == 0) { if ((block_x % 3) != 0) - return FALSE; + return false; } else { if (block_x + (blocks_wide / 2) <= dd_ptr->col_rooms / 2) { if (((block_x % 3) == 2) && ((blocks_wide % 3) == 2)) - return FALSE; + return false; if ((block_x % 3) == 1) - return FALSE; + return false; } else { if (((block_x % 3) == 2) && ((blocks_wide % 3) == 2)) - return FALSE; + return false; if ((block_x % 3) == 1) - return FALSE; + return false; } } @@ -140,14 +140,14 @@ static bool find_space_aux(dun_data_type *dd_ptr, POSITION blocks_high, POSITION POSITION bx2 = block_x + blocks_wide; if ((by1 < 0) || (by2 > dd_ptr->row_rooms) || (bx1 < 0) || (bx2 > dd_ptr->col_rooms)) - return FALSE; + return false; for (POSITION by = by1; by < by2; by++) for (POSITION bx = bx1; bx < bx2; bx++) if (dd_ptr->room_map[by][bx]) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -179,7 +179,7 @@ bool find_space(player_type *player_ptr, dun_data_type *dd_ptr, POSITION *y, POS POSITION blocks_high = 1 + ((height - 1) / BLOCK_HGT); POSITION blocks_wide = 1 + ((width - 1) / BLOCK_WID); if ((dd_ptr->row_rooms < blocks_high) || (dd_ptr->col_rooms < blocks_wide)) - return FALSE; + return false; int candidates = 0; for (block_y = dd_ptr->row_rooms - blocks_high; block_y >= 0; block_y--) { @@ -192,7 +192,7 @@ bool find_space(player_type *player_ptr, dun_data_type *dd_ptr, POSITION *y, POS } if (!candidates) - return FALSE; + return false; if (d_info[player_ptr->current_floor_ptr->dungeon_idx].flags.has_not(DF::NO_CAVE)) pick = randint1(candidates); @@ -226,8 +226,8 @@ bool find_space(player_type *player_ptr, dun_data_type *dd_ptr, POSITION *y, POS for (POSITION by = by1; by < by2; by++) for (POSITION bx = bx1; bx < bx2; bx++) - dd_ptr->room_map[by][bx] = TRUE; + dd_ptr->room_map[by][bx] = true; check_room_boundary(player_ptr, *x - width / 2 - 1, *y - height / 2 - 1, *x + (width - 1) / 2 + 1, *y + (height - 1) / 2 + 1); - return TRUE; + return true; } diff --git a/src/save/floor-writer.cpp b/src/save/floor-writer.cpp index 2800d6ce8..2c80a0356 100644 --- a/src/save/floor-writer.cpp +++ b/src/save/floor-writer.cpp @@ -183,7 +183,7 @@ bool wr_dungeon(player_type *player_ptr) /* No array elements */ wr_byte(0); wr_saved_floor(player_ptr, NULL); - return TRUE; + return true; } /*** In the dungeon ***/ @@ -202,7 +202,7 @@ bool wr_dungeon(player_type *player_ptr) saved_floor_type *cur_sf_ptr; cur_sf_ptr = get_sf_ptr(player_ptr->floor_id); if (!save_floor(player_ptr, cur_sf_ptr, SLF_SECOND)) - return FALSE; + return false; for (int i = 0; i < MAX_SAVED_FLOORS; i++) { saved_floor_type *sf_ptr = &saved_floors[i]; @@ -274,7 +274,7 @@ bool save_floor(player_type *player_ptr, saved_floor_type *sf_ptr, BIT_FLAGS mod int fd = fd_make(floor_savefile, 0644); safe_setuid_drop(); - bool is_save_successful = FALSE; + bool is_save_successful = false; if (fd >= 0) { (void)fd_close(fd); safe_setuid_grab(player_ptr); @@ -282,10 +282,10 @@ bool save_floor(player_type *player_ptr, saved_floor_type *sf_ptr, BIT_FLAGS mod safe_setuid_drop(); if (saving_savefile) { if (save_floor_aux(player_ptr, sf_ptr)) - is_save_successful = TRUE; + is_save_successful = true; if (angband_fclose(saving_savefile)) - is_save_successful = FALSE; + is_save_successful = false; } if (!is_save_successful) { diff --git a/src/save/info-writer.cpp b/src/save/info-writer.cpp index 292d82c1c..a23f9a45b 100644 --- a/src/save/info-writer.cpp +++ b/src/save/info-writer.cpp @@ -172,7 +172,7 @@ void save_quick_start(void) /* UNUSED : Was number of random quests */ wr_byte(0); if (current_world_ptr->noscore) - previous_char.quick_ok = FALSE; + previous_char.quick_ok = false; wr_byte((byte)previous_char.quick_ok); } diff --git a/src/save/save.cpp b/src/save/save.cpp index 6a9052883..b25e2f7a3 100644 --- a/src/save/save.cpp +++ b/src/save/save.cpp @@ -211,7 +211,7 @@ static bool wr_savefile_new(player_type *player_ptr, save_type type) if (!player_ptr->is_dead) { if (!wr_dungeon(player_ptr)) - return FALSE; + return false; wr_ghost(); wr_s32b(0); @@ -237,7 +237,7 @@ static bool save_player_aux(player_type *player_ptr, char *name, save_type type) int fd = fd_make(name, file_permission); safe_setuid_drop(); - bool is_save_successful = FALSE; + bool is_save_successful = false; saving_savefile = NULL; if (fd >= 0) { (void)fd_close(fd); @@ -246,10 +246,10 @@ static bool save_player_aux(player_type *player_ptr, char *name, save_type type) safe_setuid_drop(); if (saving_savefile) { if (wr_savefile_new(player_ptr, type)) - is_save_successful = TRUE; + is_save_successful = true; if (angband_fclose(saving_savefile)) - is_save_successful = FALSE; + is_save_successful = false; } safe_setuid_grab(player_ptr); @@ -260,11 +260,11 @@ static bool save_player_aux(player_type *player_ptr, char *name, save_type type) } if (!is_save_successful) - return FALSE; + return false; counts_write(player_ptr, 0, current_world_ptr->play_time); - current_world_ptr->character_saved = TRUE; - return TRUE; + current_world_ptr->character_saved = true; + return true; } /*! @@ -282,7 +282,7 @@ bool save_player(player_type *player_ptr, save_type type) fd_kill(safe); safe_setuid_drop(); update_playtime(); - bool result = FALSE; + bool result = false; if (save_player_aux(player_ptr, safe, type)) { char temp[1024]; char filename[1024]; @@ -300,15 +300,15 @@ bool save_player(player_type *player_ptr, save_type type) fd_move(safe, filename); fd_kill(temp); safe_setuid_drop(); - current_world_ptr->character_loaded = TRUE; - result = TRUE; + current_world_ptr->character_loaded = true; + result = true; } if (type != SAVE_TYPE_CLOSE_GAME) { - current_world_ptr->is_loading_now = FALSE; + current_world_ptr->is_loading_now = false; update_creature(player_ptr); mproc_init(player_ptr->current_floor_ptr); - current_world_ptr->is_loading_now = TRUE; + current_world_ptr->is_loading_now = true; } return result; diff --git a/src/specific-object/blade-turner.cpp b/src/specific-object/blade-turner.cpp index 6c7617104..386bfa386 100644 --- a/src/specific-object/blade-turner.cpp +++ b/src/specific-object/blade-turner.cpp @@ -13,7 +13,7 @@ bool activate_bladeturner(player_type *user_ptr) { DIRECTION dir; if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; msg_print(_("あなたはエレメントのブレスを吐いた。", "You breathe the elements.")); fire_breath(user_ptr, GF_MISSILE, dir, 300, 4); @@ -27,5 +27,5 @@ bool activate_bladeturner(player_type *user_ptr) (void)set_oppose_fire(user_ptr, randint1(50) + 50, FALSE); (void)set_oppose_cold(user_ptr, randint1(50) + 50, FALSE); (void)set_oppose_pois(user_ptr, randint1(50) + 50, FALSE); - return TRUE; + return true; } diff --git a/src/specific-object/bloody-moon.cpp b/src/specific-object/bloody-moon.cpp index fb71ff155..cd4d198d8 100644 --- a/src/specific-object/bloody-moon.cpp +++ b/src/specific-object/bloody-moon.cpp @@ -55,7 +55,7 @@ void get_bloody_moon_flags(object_type *o_ptr) bool activate_bloody_moon(player_type *user_ptr, object_type *o_ptr) { if (o_ptr->name1 != ART_BLOOD) - return FALSE; + return false; msg_print(_("鎌が明るく輝いた...", "Your scythe glows brightly!")); get_bloody_moon_flags(o_ptr); @@ -63,5 +63,5 @@ bool activate_bloody_moon(player_type *user_ptr, object_type *o_ptr) calc_android_exp(user_ptr); user_ptr->update |= PU_BONUS | PU_HP; - return TRUE; + return true; } diff --git a/src/specific-object/chest.cpp b/src/specific-object/chest.cpp index 7cc01bbf5..911b635b3 100644 --- a/src/specific-object/chest.cpp +++ b/src/specific-object/chest.cpp @@ -71,7 +71,7 @@ void chest_death(player_type *owner_ptr, bool scatter, POSITION y, POSITION x, O if (o_ptr->sval == SV_CHEST_KANDUME) { number = 5; - small = FALSE; + small = false; mode |= AM_GREAT; floor_ptr->object_level = o_ptr->xtra3; } diff --git a/src/specific-object/death-crimson.cpp b/src/specific-object/death-crimson.cpp index 77570b17c..abb3d6c3c 100644 --- a/src/specific-object/death-crimson.cpp +++ b/src/specific-object/death-crimson.cpp @@ -22,7 +22,7 @@ static bool fire_crimson(player_type *shooter_ptr) { DIRECTION dir; if (!get_aim_dir(shooter_ptr, &dir)) - return FALSE; + return false; POSITION tx = shooter_ptr->x + 99 * ddx[dir]; POSITION ty = shooter_ptr->y + 99 * ddy[dir]; @@ -47,13 +47,13 @@ static bool fire_crimson(player_type *shooter_ptr) for (int i = 0; i < num; i++) (void)project(shooter_ptr, 0, shooter_ptr->lev / 20 + 1, ty, tx, shooter_ptr->lev * shooter_ptr->lev * 6 / 50, GF_ROCKET, flg); - return TRUE; + return true; } bool activate_crimson(player_type *user_ptr, object_type *o_ptr) { if (o_ptr->name1 != ART_CRIMSON) - return FALSE; + return false; msg_print(_("せっかくだから『クリムゾン』をぶっぱなすぜ！", "I'll fire CRIMSON! SEKKAKUDAKARA!")); return fire_crimson(user_ptr); diff --git a/src/specific-object/monster-ball.cpp b/src/specific-object/monster-ball.cpp index 01c6b4911..c8ada0a82 100644 --- a/src/specific-object/monster-ball.cpp +++ b/src/specific-object/monster-ball.cpp @@ -64,22 +64,22 @@ static void inscribe_nickname(ae_type *ae_ptr) static bool set_activation_target(player_type *user_ptr, ae_type *ae_ptr) { bool old_target_pet = target_pet; - target_pet = TRUE; + target_pet = true; if (!get_aim_dir(user_ptr, &ae_ptr->dir)) { target_pet = old_target_pet; - return FALSE; + return false; } target_pet = old_target_pet; if (!fire_ball(user_ptr, GF_CAPTURE, ae_ptr->dir, 0, 0)) - return TRUE; + return true; ae_ptr->o_ptr->pval = (PARAMETER_VALUE)cap_mon; ae_ptr->o_ptr->xtra3 = (XTRA8)cap_mspeed; ae_ptr->o_ptr->xtra4 = (XTRA16)cap_hp; ae_ptr->o_ptr->xtra5 = (XTRA16)cap_maxhp; inscribe_nickname(ae_ptr); - return TRUE; + return true; } static void add_quark_to_inscription(player_type *user_ptr, ae_type *ae_ptr, concptr t, char *buf) @@ -91,10 +91,10 @@ static void add_quark_to_inscription(player_type *user_ptr, ae_type *ae_ptr, con t++; #ifdef JP #else - bool quote = FALSE; + bool quote = false; if (*t == '\'') { t++; - quote = TRUE; + quote = true; } #endif @@ -165,25 +165,25 @@ static void check_monster_ball_use(player_type *user_ptr, ae_type *ae_ptr) ae_ptr->o_ptr->xtra3 = 0; ae_ptr->o_ptr->xtra4 = 0; ae_ptr->o_ptr->xtra5 = 0; - ae_ptr->success = TRUE; + ae_ptr->success = true; } bool exe_monster_capture(player_type *user_ptr, ae_type *ae_ptr) { if (ae_ptr->o_ptr->tval != TV_CAPTURE) - return FALSE; + return false; if (ae_ptr->o_ptr->pval == 0) { if (!set_activation_target(user_ptr, ae_ptr)) - return TRUE; + return true; calc_android_exp(user_ptr); - return TRUE; + return true; } - ae_ptr->success = FALSE; + ae_ptr->success = false; if (!get_direction(user_ptr, &ae_ptr->dir, FALSE, FALSE)) - return TRUE; + return true; check_monster_ball_use(user_ptr, ae_ptr); if (!ae_ptr->success) @@ -191,5 +191,5 @@ bool exe_monster_capture(player_type *user_ptr, ae_type *ae_ptr) calculate_upkeep(user_ptr); calc_android_exp(user_ptr); - return TRUE; + return true; } diff --git a/src/specific-object/muramasa.cpp b/src/specific-object/muramasa.cpp index 10bcfa21b..a25f2b0cb 100644 --- a/src/specific-object/muramasa.cpp +++ b/src/specific-object/muramasa.cpp @@ -10,10 +10,10 @@ bool activate_muramasa(player_type *user_ptr, object_type *o_ptr) { if (o_ptr->name1 != ART_MURAMASA) - return FALSE; + return false; if (!get_check(_("本当に使いますか？", "Are you sure?! "))) - return TRUE; + return true; msg_print(_("村正が震えた．．．", "The Muramasa pulsates...")); do_inc_stat(user_ptr, A_STR); @@ -22,5 +22,5 @@ bool activate_muramasa(player_type *user_ptr, object_type *o_ptr) curse_weapon_object(user_ptr, TRUE, o_ptr); } - return TRUE; + return true; } diff --git a/src/specific-object/ring-of-power.cpp b/src/specific-object/ring-of-power.cpp index 1684e4735..8df8c3b6b 100644 --- a/src/specific-object/ring-of-power.cpp +++ b/src/specific-object/ring-of-power.cpp @@ -58,8 +58,8 @@ bool activate_ring_of_power(player_type *user_ptr, concptr name) DIRECTION dir; msg_format(_("%sは漆黒に輝いた...", "The %s glows intensely black..."), name); if (!get_aim_dir(user_ptr, &dir)) - return FALSE; + return false; exe_ring_of_power(user_ptr, dir); - return TRUE; + return true; } diff --git a/src/specific-object/toragoroshi.cpp b/src/specific-object/toragoroshi.cpp index e6739ce40..79e88ae67 100644 --- a/src/specific-object/toragoroshi.cpp +++ b/src/specific-object/toragoroshi.cpp @@ -8,5 +8,5 @@ bool activate_toragoroshi(player_type *user_ptr) msg_print(_("あなたは妖刀に魅入られた…", "You are fascinated by the cursed blade...")); msg_print(_("「狂ほしく 血のごとき 月はのぼれり 秘めおきし 魔剣 いずこぞや」", "'Behold the blade arts.'")); massacre(user_ptr); - return TRUE; + return true; } diff --git a/src/spell-kind/blood-curse.cpp b/src/spell-kind/blood-curse.cpp index ca02e1742..747b8c9ad 100644 --- a/src/spell-kind/blood-curse.cpp +++ b/src/spell-kind/blood-curse.cpp @@ -23,9 +23,9 @@ void blood_curse_to_enemy(player_type *caster_ptr, MONSTER_IDX m_idx) grid_type *g_ptr = &caster_ptr->current_floor_ptr->grid_array[m_ptr->fy][m_ptr->fx]; BIT_FLAGS curse_flg = (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP); int count = 0; - bool is_first_loop = TRUE; + bool is_first_loop = true; while (is_first_loop || one_in_(5)) { - is_first_loop = FALSE; + is_first_loop = false; switch (randint1(28)) { case 1: case 2: @@ -120,7 +120,7 @@ void blood_curse_to_enemy(player_type *caster_ptr, MONSTER_IDX m_idx) case 28: { if (one_in_(13)) { for (int i = 0; i < A_MAX; i++) { - bool is_first_dec_stat = TRUE; + bool is_first_dec_stat = true; while (is_first_dec_stat || one_in_(2)) { (void)do_dec_stat(caster_ptr, i); } diff --git a/src/spell-kind/earthquake.cpp b/src/spell-kind/earthquake.cpp index 2677d5a46..1ffd70278 100644 --- a/src/spell-kind/earthquake.cpp +++ b/src/spell-kind/earthquake.cpp @@ -52,7 +52,7 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M { floor_type *floor_ptr = caster_ptr->current_floor_ptr; if ((floor_ptr->inside_quest && is_fixed_quest_idx(floor_ptr->inside_quest)) || !floor_ptr->dun_level) { - return FALSE; + return false; } if (r > 12) @@ -61,12 +61,12 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M bool map[32][32]; for (POSITION y = 0; y < 32; y++) { for (POSITION x = 0; x < 32; x++) { - map[y][x] = FALSE; + map[y][x] = false; } } int damage = 0; - bool hurt = FALSE; + bool hurt = false; for (POSITION dy = -r; dy <= r; dy++) { for (POSITION dx = -r; dx <= r; dx++) { POSITION yy = cy + dy; @@ -88,9 +88,9 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M if (randint0(100) < 85) continue; - map[16 + yy - cy][16 + xx - cx] = TRUE; + map[16 + yy - cy][16 + xx - cx] = true; if (player_bold(caster_ptr, yy, xx)) - hurt = TRUE; + hurt = true; } } @@ -159,7 +159,7 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M (void)move_player_effect(caster_ptr, sy, sx, MPE_DONT_PICKUP); } - map[16 + caster_ptr->y - cy][16 + caster_ptr->x - cx] = FALSE; + map[16 + caster_ptr->y - cy][16 + caster_ptr->x - cx] = false; if (damage) { concptr killer; @@ -194,7 +194,7 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M monster_type *m_ptr = &floor_ptr->m_list[g_ptr->m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (r_ptr->flags1 & RF1_QUESTOR) { - map[16 + yy - cy][16 + xx - cx] = FALSE; + map[16 + yy - cy][16 + xx - cx] = false; continue; } @@ -351,5 +351,5 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M set_superstealth(caster_ptr, FALSE); } - return TRUE; + return true; } diff --git a/src/spell-kind/magic-item-recharger.cpp b/src/spell-kind/magic-item-recharger.cpp index 9d09d1f08..3c0f2f17b 100644 --- a/src/spell-kind/magic-item-recharger.cpp +++ b/src/spell-kind/magic-item-recharger.cpp @@ -58,7 +58,7 @@ bool recharge(player_type *caster_ptr, int power) object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_NONE); if (!o_ptr) - return FALSE; + return false; object_kind *k_ptr; k_ptr = &k_info[o_ptr->k_idx]; @@ -66,11 +66,11 @@ bool recharge(player_type *caster_ptr, int power) TIME_EFFECT recharge_amount; int recharge_strength; - bool is_recharge_successful = TRUE; + bool is_recharge_successful = true; if (o_ptr->tval == TV_ROD) { recharge_strength = ((power > lev / 2) ? (power - lev / 2) : 0) / 5; if (one_in_(recharge_strength)) { - is_recharge_successful = FALSE; + is_recharge_successful = false; } else { recharge_amount = (power * damroll(3, 2)); if (o_ptr->timeout > recharge_amount) @@ -88,7 +88,7 @@ bool recharge(player_type *caster_ptr, int power) recharge_strength = 0; if (one_in_(recharge_strength)) { - is_recharge_successful = FALSE; + is_recharge_successful = false; } else { recharge_amount = randint1(1 + k_ptr->pval / 2); if ((o_ptr->tval == TV_WAND) && (o_ptr->number > 1)) { diff --git a/src/spell-kind/spells-detection.cpp b/src/spell-kind/spells-detection.cpp index 2ddcae41d..35caaa75e 100644 --- a/src/spell-kind/spells-detection.cpp +++ b/src/spell-kind/spells-detection.cpp @@ -44,7 +44,7 @@ static bool detect_feat_flag(player_type *caster_ptr, POSITION range, int flag, range /= 3; grid_type *g_ptr; - bool detect = FALSE; + bool detect = false; for (POSITION y = 1; y < caster_ptr->current_floor_ptr->height - 1; y++) { for (POSITION x = 1; x <= caster_ptr->current_floor_ptr->width - 1; x++) { int dist = distance(caster_ptr->y, caster_ptr->x, y, x); @@ -67,7 +67,7 @@ static bool detect_feat_flag(player_type *caster_ptr, POSITION range, int flag, disclose_grid(caster_ptr, y, x); g_ptr->info |= (CAVE_MARK); lite_spot(caster_ptr, y, x); - detect = TRUE; + detect = true; } } } @@ -91,10 +91,10 @@ bool detect_traps(player_type *caster_ptr, POSITION range, bool known) detect_feat_flag(caster_ptr, range, FF_TRAP, true); if (known || detect) - caster_ptr->dtrap = TRUE; + caster_ptr->dtrap = true; if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 0) - detect = FALSE; + detect = false; if (detect) msg_print(_("トラップの存在を感じとった！", "You sense the presence of traps!")); @@ -113,7 +113,7 @@ bool detect_doors(player_type *caster_ptr, POSITION range) bool detect = detect_feat_flag(caster_ptr, range, FF_DOOR, TRUE); if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 0) - detect = FALSE; + detect = false; if (detect) { msg_print(_("ドアの存在を感じとった！", "You sense the presence of doors!")); } @@ -132,7 +132,7 @@ bool detect_stairs(player_type *caster_ptr, POSITION range) bool detect = detect_feat_flag(caster_ptr, range, FF_STAIRS, TRUE); if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 0) - detect = FALSE; + detect = false; if (detect) { msg_print(_("階段の存在を感じとった！", "You sense the presence of stairs!")); } @@ -151,7 +151,7 @@ bool detect_treasure(player_type *caster_ptr, POSITION range) bool detect = detect_feat_flag(caster_ptr, range, FF_HAS_GOLD, TRUE); if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 6) - detect = FALSE; + detect = false; if (detect) { msg_print(_("埋蔵された財宝の存在を感じとった！", "You sense the presence of buried treasure!")); } @@ -171,7 +171,7 @@ bool detect_objects_gold(player_type *caster_ptr, POSITION range) range2 /= 3; /* Scan objects */ - bool detect = FALSE; + bool detect = false; POSITION y, x; for (OBJECT_IDX i = 1; i < caster_ptr->current_floor_ptr->o_max; i++) { object_type *o_ptr = &caster_ptr->current_floor_ptr->o_list[i]; @@ -189,18 +189,18 @@ bool detect_objects_gold(player_type *caster_ptr, POSITION range) if (o_ptr->tval == TV_GOLD) { o_ptr->marked |= OM_FOUND; lite_spot(caster_ptr, y, x); - detect = TRUE; + detect = true; } } if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 6) - detect = FALSE; + detect = false; if (detect) { msg_print(_("財宝の存在を感じとった！", "You sense the presence of treasure!")); } if (detect_monsters_string(caster_ptr, range, "$")) { - detect = TRUE; + detect = true; } return detect; @@ -218,7 +218,7 @@ bool detect_objects_normal(player_type *caster_ptr, POSITION range) if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range2 /= 3; - bool detect = FALSE; + bool detect = false; for (OBJECT_IDX i = 1; i < caster_ptr->current_floor_ptr->o_max; i++) { object_type *o_ptr = &caster_ptr->current_floor_ptr->o_list[i]; @@ -236,18 +236,18 @@ bool detect_objects_normal(player_type *caster_ptr, POSITION range) if (o_ptr->tval != TV_GOLD) { o_ptr->marked |= OM_FOUND; lite_spot(caster_ptr, y, x); - detect = TRUE; + detect = true; } } if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 6) - detect = FALSE; + detect = false; if (detect) { msg_print(_("アイテムの存在を感じとった！", "You sense the presence of objects!")); } if (detect_monsters_string(caster_ptr, range, "!=?|/`")) { - detect = TRUE; + detect = true; } return detect; @@ -273,7 +273,7 @@ bool detect_objects_magic(player_type *caster_ptr, POSITION range) range /= 3; tval_type tv; - bool detect = FALSE; + bool detect = false; for (OBJECT_IDX i = 1; i < caster_ptr->current_floor_ptr->o_max; i++) { object_type *o_ptr = &caster_ptr->current_floor_ptr->o_list[i]; @@ -296,7 +296,7 @@ bool detect_objects_magic(player_type *caster_ptr, POSITION range) || (tv == TV_HEX_BOOK) || ((o_ptr->to_a > 0) || (o_ptr->to_h + o_ptr->to_d > 0))) { o_ptr->marked |= OM_FOUND; lite_spot(caster_ptr, y, x); - detect = TRUE; + detect = true; } } @@ -318,7 +318,7 @@ bool detect_monsters_normal(player_type *caster_ptr, POSITION range) if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range /= 3; - bool flag = FALSE; + bool flag = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -333,12 +333,12 @@ bool detect_monsters_normal(player_type *caster_ptr, POSITION range) if (!(r_ptr->flags2 & RF2_INVISIBLE) || caster_ptr->see_inv) { m_ptr->mflag2.set({MFLAG2::MARK, MFLAG2::SHOW}); update_monster(caster_ptr, i, FALSE); - flag = TRUE; + flag = true; } } if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 3) - flag = FALSE; + flag = false; if (flag) { msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!")); } @@ -357,7 +357,7 @@ bool detect_monsters_invis(player_type *caster_ptr, POSITION range) if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range /= 3; - bool flag = FALSE; + bool flag = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -378,12 +378,12 @@ bool detect_monsters_invis(player_type *caster_ptr, POSITION range) m_ptr->mflag2.set({MFLAG2::MARK, MFLAG2::SHOW}); update_monster(caster_ptr, i, FALSE); - flag = TRUE; + flag = true; } } if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 3) - flag = FALSE; + flag = false; if (flag) { msg_print(_("透明な生物の存在を感じとった！", "You sense the presence of invisible creatures!")); } @@ -402,7 +402,7 @@ bool detect_monsters_evil(player_type *caster_ptr, POSITION range) if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range /= 3; - bool flag = FALSE; + bool flag = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -425,7 +425,7 @@ bool detect_monsters_evil(player_type *caster_ptr, POSITION range) m_ptr->mflag2.set({MFLAG2::MARK, MFLAG2::SHOW}); update_monster(caster_ptr, i, FALSE); - flag = TRUE; + flag = true; } } @@ -447,7 +447,7 @@ bool detect_monsters_nonliving(player_type *caster_ptr, POSITION range) if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range /= 3; - bool flag = FALSE; + bool flag = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; if (!monster_is_valid(m_ptr)) @@ -465,7 +465,7 @@ bool detect_monsters_nonliving(player_type *caster_ptr, POSITION range) m_ptr->mflag2.set({MFLAG2::MARK, MFLAG2::SHOW}); update_monster(caster_ptr, i, FALSE); - flag = TRUE; + flag = true; } } @@ -487,7 +487,7 @@ bool detect_monsters_mind(player_type *caster_ptr, POSITION range) if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range /= 3; - bool flag = FALSE; + bool flag = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -507,7 +507,7 @@ bool detect_monsters_mind(player_type *caster_ptr, POSITION range) m_ptr->mflag2.set({MFLAG2::MARK, MFLAG2::SHOW}); update_monster(caster_ptr, i, FALSE); - flag = TRUE; + flag = true; } } @@ -530,7 +530,7 @@ bool detect_monsters_string(player_type *caster_ptr, POSITION range, concptr Mat if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range /= 3; - bool flag = FALSE; + bool flag = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -550,12 +550,12 @@ bool detect_monsters_string(player_type *caster_ptr, POSITION range, concptr Mat m_ptr->mflag2.set({MFLAG2::MARK, MFLAG2::SHOW}); update_monster(caster_ptr, i, FALSE); - flag = TRUE; + flag = true; } } if (music_singing(caster_ptr, MUSIC_DETECT) && get_singing_count(caster_ptr) > 3) - flag = FALSE; + flag = false; if (flag) { msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!")); } @@ -575,7 +575,7 @@ bool detect_monsters_xxx(player_type *caster_ptr, POSITION range, u32b match_fla if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) range /= 3; - bool flag = FALSE; + bool flag = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -598,7 +598,7 @@ bool detect_monsters_xxx(player_type *caster_ptr, POSITION range, u32b match_fla m_ptr->mflag2.set({MFLAG2::MARK, MFLAG2::SHOW}); update_monster(caster_ptr, i, FALSE); - flag = TRUE; + flag = true; } } @@ -628,20 +628,20 @@ bool detect_monsters_xxx(player_type *caster_ptr, POSITION range, u32b match_fla */ bool detect_all(player_type *caster_ptr, POSITION range) { - bool detect = FALSE; + bool detect = false; if (detect_traps(caster_ptr, range, TRUE)) - detect = TRUE; + detect = true; if (detect_doors(caster_ptr, range)) - detect = TRUE; + detect = true; if (detect_stairs(caster_ptr, range)) - detect = TRUE; + detect = true; if (detect_objects_gold(caster_ptr, range)) - detect = TRUE; + detect = true; if (detect_objects_normal(caster_ptr, range)) - detect = TRUE; + detect = true; if (detect_monsters_invis(caster_ptr, range)) - detect = TRUE; + detect = true; if (detect_monsters_normal(caster_ptr, range)) - detect = TRUE; + detect = true; return (detect); } diff --git a/src/spell-kind/spells-enchant.cpp b/src/spell-kind/spells-enchant.cpp index acbb85684..7b71cc925 100644 --- a/src/spell-kind/spells-enchant.cpp +++ b/src/spell-kind/spells-enchant.cpp @@ -34,7 +34,7 @@ bool artifact_scroll(player_type *caster_ptr) OBJECT_IDX item; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_NONE); if (!o_ptr) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); @@ -44,21 +44,21 @@ bool artifact_scroll(player_type *caster_ptr) msg_format("%s %s radiate%s a blinding light!", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "" : "s")); #endif - bool okay = FALSE; + bool okay = false; if (object_is_artifact(o_ptr)) { #ifdef JP msg_format("%sは既に伝説のアイテムです！", o_name); #else msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "artifacts" : "an artifact")); #endif - okay = FALSE; + okay = false; } else if (object_is_ego(o_ptr)) { #ifdef JP msg_format("%sは既に名のあるアイテムです！", o_name); #else msg_format("The %s %s already %s!", o_name, ((o_ptr->number > 1) ? "are" : "is"), ((o_ptr->number > 1) ? "ego items" : "an ego item")); #endif - okay = FALSE; + okay = false; } else if (o_ptr->xtra3) { #ifdef JP msg_format("%sは既に強化されています！", o_name); @@ -93,7 +93,7 @@ bool artifact_scroll(player_type *caster_ptr) chg_virtue(caster_ptr, V_ENCHANT, -1); calc_android_exp(caster_ptr); - return TRUE; + return true; } if (record_rand_art) { @@ -103,7 +103,7 @@ bool artifact_scroll(player_type *caster_ptr) chg_virtue(caster_ptr, V_ENCHANT, 1); calc_android_exp(caster_ptr); - return TRUE; + return true; } /*! @@ -131,7 +131,7 @@ bool mundane_spell(player_type *owner_ptr, bool only_equip) o_ptr = choose_object(owner_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_NONE); if (!o_ptr) - return FALSE; + return false; msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!")); POSITION iy = o_ptr->iy; @@ -147,5 +147,5 @@ bool mundane_spell(player_type *owner_ptr, bool only_equip) o_ptr->inscription = inscription; calc_android_exp(owner_ptr); - return TRUE; + return true; } diff --git a/src/spell-kind/spells-equipment.cpp b/src/spell-kind/spells-equipment.cpp index 73851f4eb..2b7c4188e 100644 --- a/src/spell-kind/spells-equipment.cpp +++ b/src/spell-kind/spells-equipment.cpp @@ -54,13 +54,13 @@ bool apply_disenchant(player_type *target_ptr, BIT_FLAGS mode) object_type *o_ptr; o_ptr = &target_ptr->inventory_list[t]; if (!o_ptr->k_idx) - return FALSE; + return false; if (!object_is_weapon_armour_ammo(target_ptr, o_ptr)) - return FALSE; + return false; if ((o_ptr->to_h <= 0) && (o_ptr->to_d <= 0) && (o_ptr->to_a <= 0) && (o_ptr->pval <= 1)) { - return FALSE; + return false; } GAME_TEXT o_name[MAX_NLEN]; @@ -71,7 +71,7 @@ bool apply_disenchant(player_type *target_ptr, BIT_FLAGS mode) #else msg_format("Your %s (%c) resist%s disenchantment!", o_name, index_to_label(t), ((o_ptr->number != 1) ? "" : "s")); #endif - return TRUE; + return true; } int to_h = o_ptr->to_h; @@ -102,7 +102,7 @@ bool apply_disenchant(player_type *target_ptr, BIT_FLAGS mode) is_actually_disenchanted |= to_a != o_ptr->to_a; is_actually_disenchanted |= pval != o_ptr->pval; if (!is_actually_disenchanted) - return TRUE; + return true; #ifdef JP msg_format("%s(%c)は劣化してしまった！", o_name, index_to_label(t)); @@ -115,5 +115,5 @@ bool apply_disenchant(player_type *target_ptr, BIT_FLAGS mode) target_ptr->window_flags |= (PW_EQUIP | PW_PLAYER); calc_android_exp(target_ptr); - return TRUE; + return true; } diff --git a/src/spell-kind/spells-fetcher.cpp b/src/spell-kind/spells-fetcher.cpp index c9413f6bd..51e74e49d 100644 --- a/src/spell-kind/spells-fetcher.cpp +++ b/src/spell-kind/spells-fetcher.cpp @@ -77,10 +77,10 @@ void fetch_item(player_type *caster_ptr, DIRECTION dir, WEIGHT wgt, bool require } else { ty = caster_ptr->y; tx = caster_ptr->x; - bool is_first_loop = TRUE; + bool is_first_loop = true; g_ptr = &caster_ptr->current_floor_ptr->grid_array[ty][tx]; while (is_first_loop || g_ptr->o_idx_list.empty()) { - is_first_loop = FALSE; + is_first_loop = false; ty += ddy[dir]; tx += ddx[dir]; g_ptr = &caster_ptr->current_floor_ptr->grid_array[ty][tx]; @@ -122,17 +122,17 @@ bool fetch_monster(player_type *caster_ptr) POSITION ty, tx; if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; m_idx = caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx; if (!m_idx) - return FALSE; + return false; if (m_idx == caster_ptr->riding) - return FALSE; + return false; if (!player_has_los_bold(caster_ptr, target_row, target_col)) - return FALSE; + return false; if (!projectable(caster_ptr, caster_ptr->y, caster_ptr->x, target_row, target_col)) - return FALSE; + return false; m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx]; monster_desc(caster_ptr, m_name, m_ptr, 0); @@ -169,5 +169,5 @@ bool fetch_monster(player_type *caster_ptr) health_track(caster_ptr, m_idx); } - return TRUE; + return true; } diff --git a/src/spell-kind/spells-floor.cpp b/src/spell-kind/spells-floor.cpp index 17aaa2264..c866db151 100644 --- a/src/spell-kind/spells-floor.cpp +++ b/src/spell-kind/spells-floor.cpp @@ -251,7 +251,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r, /* Prevent destruction of quest levels and town */ floor_type *floor_ptr = caster_ptr->current_floor_ptr; if ((floor_ptr->inside_quest && is_fixed_quest_idx(floor_ptr->inside_quest)) || !floor_ptr->dun_level) { - return FALSE; + return false; } /* Lose monster light */ @@ -259,7 +259,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r, clear_mon_lite(floor_ptr); /* Big area of affect */ - bool flag = FALSE; + bool flag = false; for (POSITION y = (y1 - r); y <= (y1 + r); y++) { for (POSITION x = (x1 - r); x <= (x1 + r); x++) { if (!in_bounds(floor_ptr, y, x)) @@ -288,7 +288,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r, /* Hack -- Notice player affect */ if (player_bold(caster_ptr, y, x)) { /* Hurt the player later */ - flag = TRUE; + flag = true; /* Do not hurt this grid */ continue; @@ -399,7 +399,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r, } if (in_generate) - return TRUE; + return true; /* Process "re-glowing" */ for (POSITION y = (y1 - r); y <= (y1 + r); y++) { @@ -465,5 +465,5 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r, set_superstealth(caster_ptr, FALSE); } - return TRUE; + return true; } diff --git a/src/spell-kind/spells-genocide.cpp b/src/spell-kind/spells-genocide.cpp index 3ab30270a..7e8821d16 100644 --- a/src/spell-kind/spells-genocide.cpp +++ b/src/spell-kind/spells-genocide.cpp @@ -44,22 +44,22 @@ bool genocide_aux(player_type *caster_ptr, MONSTER_IDX m_idx, int power, bool pl monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (is_pet(m_ptr) && !player_cast) - return FALSE; + return false; - bool resist = FALSE; + bool resist = false; if (r_ptr->flags1 & (RF1_UNIQUE | RF1_QUESTOR)) - resist = TRUE; + resist = true; else if (r_ptr->flags7 & RF7_UNIQUE2) - resist = TRUE; + resist = true; else if (m_idx == caster_ptr->riding) - resist = TRUE; + resist = true; else if ((caster_ptr->current_floor_ptr->inside_quest && !random_quest_number(caster_ptr, caster_ptr->current_floor_ptr->dun_level)) || caster_ptr->current_floor_ptr->inside_arena || caster_ptr->phase_out) - resist = TRUE; + resist = true; else if (player_cast && (r_ptr->level > randint0(power))) - resist = TRUE; + resist = true; else if (player_cast && m_ptr->mflag2.has(MFLAG2::NOGENO)) - resist = TRUE; + resist = true; else { if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname) { GAME_TEXT m_name[MAX_NLEN]; @@ -127,13 +127,13 @@ bool symbol_genocide(player_type *caster_ptr, int power, bool player_cast) is_special_floor |= caster_ptr->phase_out; if (is_special_floor) { msg_print(_("何も起きないようだ……", "Nothing seems to happen...")); - return FALSE; + return false; } char typ; while (!get_com(_("どの種類(文字)のモンスターを抹殺しますか: ", "Choose a monster race (by symbol) to genocide: "), &typ, FALSE)) ; - bool result = FALSE; + bool result = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; @@ -166,10 +166,10 @@ bool mass_genocide(player_type *caster_ptr, int power, bool player_cast) is_special_floor |= caster_ptr->current_floor_ptr->inside_arena; is_special_floor |= caster_ptr->phase_out; if (is_special_floor) { - return FALSE; + return false; } - bool result = FALSE; + bool result = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; if (!monster_is_valid(m_ptr)) @@ -201,10 +201,10 @@ bool mass_genocide_undead(player_type *caster_ptr, int power, bool player_cast) is_special_floor |= caster_ptr->current_floor_ptr->inside_arena; is_special_floor |= caster_ptr->phase_out; if (is_special_floor) { - return FALSE; + return false; } - bool result = FALSE; + bool result = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; diff --git a/src/spell-kind/spells-grid.cpp b/src/spell-kind/spells-grid.cpp index d3d187ca5..27f3b9dd0 100644 --- a/src/spell-kind/spells-grid.cpp +++ b/src/spell-kind/spells-grid.cpp @@ -23,14 +23,14 @@ bool create_rune_protection_one(player_type *caster_ptr) { if (!cave_clean_bold(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x)) { msg_print(_("床上のアイテムが呪文を跳ね返した。", "The object resists the spell.")); - return FALSE; + return false; } caster_ptr->current_floor_ptr->grid_array[caster_ptr->y][caster_ptr->x].info |= CAVE_OBJECT; caster_ptr->current_floor_ptr->grid_array[caster_ptr->y][caster_ptr->x].mimic = feat_rune_protection; note_spot(caster_ptr, caster_ptr->y, caster_ptr->x); lite_spot(caster_ptr, caster_ptr->y, caster_ptr->x); - return TRUE; + return true; } /*! @@ -46,14 +46,14 @@ bool create_rune_explosion(player_type *caster_ptr, POSITION y, POSITION x) floor_type *floor_ptr = caster_ptr->current_floor_ptr; if (!cave_clean_bold(floor_ptr, y, x)) { msg_print(_("床上のアイテムが呪文を跳ね返した。", "The object resists the spell.")); - return FALSE; + return false; } floor_ptr->grid_array[y][x].info |= CAVE_OBJECT; floor_ptr->grid_array[y][x].mimic = feat_rune_explosion; note_spot(caster_ptr, y, x); lite_spot(caster_ptr, y, x); - return TRUE; + return true; } /*! @@ -62,14 +62,14 @@ bool create_rune_explosion(player_type *caster_ptr, POSITION y, POSITION x) */ void stair_creation(player_type *caster_ptr) { - bool up = TRUE; + bool up = true; if (ironman_downward) - up = FALSE; + up = false; - bool down = TRUE; + bool down = true; floor_type *floor_ptr = caster_ptr->current_floor_ptr; if (quest_number(caster_ptr, floor_ptr->dun_level) || (floor_ptr->dun_level >= d_info[caster_ptr->dungeon_idx].maxdepth)) - down = FALSE; + down = false; if (!floor_ptr->dun_level || (!up && !down) || (floor_ptr->inside_quest && is_fixed_quest_idx(floor_ptr->inside_quest)) || floor_ptr->inside_arena || caster_ptr->phase_out) { @@ -92,9 +92,9 @@ void stair_creation(player_type *caster_ptr) if (up && down) { if (randint0(100) < 50) - up = FALSE; + up = false; else - down = FALSE; + down = false; } FLOOR_IDX dest_floor_id = 0; diff --git a/src/spell-kind/spells-launcher.cpp b/src/spell-kind/spells-launcher.cpp index 8f16a9463..c6222804d 100644 --- a/src/spell-kind/spells-launcher.cpp +++ b/src/spell-kind/spells-launcher.cpp @@ -169,9 +169,9 @@ bool fire_blast(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, DICE_NUMB int ld = distance(caster_ptr->y, caster_ptr->x, ly, lx); BIT_FLAGS flg = PROJECT_FAST | PROJECT_THRU | PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE | PROJECT_GRID; - bool result = TRUE; + bool result = true; for (int i = 0; i < num; i++) { - while (TRUE) { + while (true) { /* Get targets for some bolts */ y = rand_spread(ly, ld * dev / 20); x = rand_spread(lx, ld * dev / 20); @@ -183,7 +183,7 @@ bool fire_blast(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, DICE_NUMB /* Analyze the "dir" and the "target". */ const auto proj_res = project(caster_ptr, 0, 0, y, x, damroll(dd, ds), typ, flg); if (!proj_res.notice) - result = FALSE; + result = false; } return result; diff --git a/src/spell-kind/spells-lite.cpp b/src/spell-kind/spells-lite.cpp index a0fe56add..44d8e84e6 100644 --- a/src/spell-kind/spells-lite.cpp +++ b/src/spell-kind/spells-lite.cpp @@ -121,7 +121,7 @@ static void cave_temp_room_unlite(player_type *caster_ptr, const std::vectorcurrent_floor_ptr->grid_array[by][bx]; if (has_flag(f_info[get_feat_mimic(cc_ptr)].flags, FF_GLOW)) { - do_dark = FALSE; + do_dark = false; break; } } @@ -393,7 +393,7 @@ bool starlight(player_type *caster_ptr, bool magic) (PROJECT_BEAM | PROJECT_THRU | PROJECT_GRID | PROJECT_KILL | PROJECT_LOS)); } - return TRUE; + return true; } /*! @@ -407,7 +407,7 @@ bool lite_area(player_type *caster_ptr, HIT_POINT dam, POSITION rad) { if (d_info[caster_ptr->dungeon_idx].flags.has(DF::DARKNESS)) { msg_print(_("ダンジョンが光を吸収した。", "The darkness of this dungeon absorbs your light.")); - return FALSE; + return false; } if (!caster_ptr->blind) { @@ -419,7 +419,7 @@ bool lite_area(player_type *caster_ptr, HIT_POINT dam, POSITION rad) lite_room(caster_ptr, caster_ptr->y, caster_ptr->x); - return TRUE; + return true; } /*! @@ -440,7 +440,7 @@ bool unlite_area(player_type *caster_ptr, HIT_POINT dam, POSITION rad) unlite_room(caster_ptr, caster_ptr->y, caster_ptr->x); - return TRUE; + return true; } /*! diff --git a/src/spell-kind/spells-neighbor.cpp b/src/spell-kind/spells-neighbor.cpp index 4d8c74f5b..92cd79fca 100644 --- a/src/spell-kind/spells-neighbor.cpp +++ b/src/spell-kind/spells-neighbor.cpp @@ -149,7 +149,7 @@ void wall_breaker(player_type *caster_ptr) int num = damroll(5, 3); for (int i = 0; i < num; i++) { - while (TRUE) { + while (true) { scatter(caster_ptr, &y, &x, caster_ptr->y, caster_ptr->x, 10, PROJECT_NONE); if (!player_bold(caster_ptr, y, x)) diff --git a/src/spell-kind/spells-perception.cpp b/src/spell-kind/spells-perception.cpp index 7f2303be1..4effc6019 100644 --- a/src/spell-kind/spells-perception.cpp +++ b/src/spell-kind/spells-perception.cpp @@ -59,9 +59,9 @@ bool identify_item(player_type *owner_ptr, object_type *o_ptr) GAME_TEXT o_name[MAX_NLEN]; describe_flavor(owner_ptr, o_name, o_ptr, 0); - bool old_known = FALSE; + bool old_known = false; if (any_bits(o_ptr->ident, IDENT_KNOWN)) - old_known = TRUE; + old_known = true; if (!object_is_fully_known(o_ptr)) { if (object_is_artifact(o_ptr) || one_in_(5)) @@ -122,7 +122,7 @@ bool ident_spell(player_type *caster_ptr, bool only_equip, tval_type item_tester object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_NONE); if (!o_ptr) - return FALSE; + return false; bool old_known = identify_item(caster_ptr, o_ptr); @@ -137,7 +137,7 @@ bool ident_spell(player_type *caster_ptr, bool only_equip, tval_type item_tester } autopick_alter_item(caster_ptr, item, (bool)(destroy_identify && !old_known)); - return TRUE; + return true; } /*! @@ -175,7 +175,7 @@ bool identify_fully(player_type *caster_ptr, bool only_equip, tval_type item_tes object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_NONE); if (!o_ptr) - return FALSE; + return false; bool old_known = identify_item(caster_ptr, o_ptr); @@ -198,5 +198,5 @@ bool identify_fully(player_type *caster_ptr, bool only_equip, tval_type item_tes (void)screen_object(caster_ptr, o_ptr, 0L); autopick_alter_item(caster_ptr, item, (bool)(destroy_identify && !old_known)); - return TRUE; + return true; } diff --git a/src/spell-kind/spells-pet.cpp b/src/spell-kind/spells-pet.cpp index b77087ae2..caa68c8b7 100644 --- a/src/spell-kind/spells-pet.cpp +++ b/src/spell-kind/spells-pet.cpp @@ -23,13 +23,13 @@ */ void discharge_minion(player_type *caster_ptr) { - bool okay = TRUE; + bool okay = true; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; if (!m_ptr->r_idx || !is_pet(m_ptr)) continue; if (m_ptr->nickname) - okay = FALSE; + okay = false; } if (!okay || caster_ptr->riding) { diff --git a/src/spell-kind/spells-polymorph.cpp b/src/spell-kind/spells-polymorph.cpp index a4d93e418..a5d3ffe69 100644 --- a/src/spell-kind/spells-polymorph.cpp +++ b/src/spell-kind/spells-polymorph.cpp @@ -70,18 +70,18 @@ bool polymorph_monster(player_type *caster_ptr, POSITION y, POSITION x) monster_type *m_ptr = &floor_ptr->m_list[g_ptr->m_idx]; MONRACE_IDX new_r_idx; MONRACE_IDX old_r_idx = m_ptr->r_idx; - bool targeted = (target_who == g_ptr->m_idx) ? TRUE : FALSE; - bool health_tracked = (caster_ptr->health_who == g_ptr->m_idx) ? TRUE : FALSE; + bool targeted = (target_who == g_ptr->m_idx) ? TRUE : false; + bool health_tracked = (caster_ptr->health_who == g_ptr->m_idx) ? TRUE : false; if (floor_ptr->inside_arena || caster_ptr->phase_out) - return FALSE; + return false; if ((caster_ptr->riding == g_ptr->m_idx) || m_ptr->mflag2.has(MFLAG2::KAGE)) - return FALSE; + return false; monster_type back_m = *m_ptr; new_r_idx = poly_r_idx(caster_ptr, old_r_idx); if (new_r_idx == old_r_idx) - return FALSE; + return false; bool preserve_hold_objects = !back_m.hold_o_idx_list.empty(); @@ -95,18 +95,18 @@ bool polymorph_monster(player_type *caster_ptr, POSITION y, POSITION x) m_ptr->hold_o_idx_list.clear(); delete_monster_idx(caster_ptr, g_ptr->m_idx); - bool polymorphed = FALSE; + bool polymorphed = false; if (place_monster_aux(caster_ptr, 0, y, x, new_r_idx, mode)) { floor_ptr->m_list[hack_m_idx_ii].nickname = back_m.nickname; floor_ptr->m_list[hack_m_idx_ii].parent_m_idx = back_m.parent_m_idx; floor_ptr->m_list[hack_m_idx_ii].hold_o_idx_list = back_m.hold_o_idx_list; - polymorphed = TRUE; + polymorphed = true; } else { if (place_monster_aux(caster_ptr, 0, y, x, old_r_idx, (mode | PM_NO_KAGE | PM_IGNORE_TERRAIN))) { floor_ptr->m_list[hack_m_idx_ii] = back_m; mproc_init(floor_ptr); } else - preserve_hold_objects = FALSE; + preserve_hold_objects = false; } if (preserve_hold_objects) { diff --git a/src/spell-kind/spells-random.cpp b/src/spell-kind/spells-random.cpp index 2e165f51a..53613d7cf 100644 --- a/src/spell-kind/spells-random.cpp +++ b/src/spell-kind/spells-random.cpp @@ -47,9 +47,9 @@ void call_chaos(player_type *caster_ptr) GF_ROCKET, GF_NUKE, GF_HELL_FIRE, GF_DISINTEGRATE, GF_PSY_SPEAR }; int chaos_type = hurt_types[randint0(31)]; - bool line_chaos = FALSE; + bool line_chaos = false; if (one_in_(4)) - line_chaos = TRUE; + line_chaos = true; int dir; if (one_in_(6)) { @@ -93,10 +93,10 @@ void call_chaos(player_type *caster_ptr) bool activate_ty_curse(player_type *target_ptr, bool stop_ty, int *count) { BIT_FLAGS flg = (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP); - bool is_first_curse = TRUE; + bool is_first_curse = true; floor_type *floor_ptr = target_ptr->current_floor_ptr; while (is_first_curse || (one_in_(3) && !stop_ty)) { - is_first_curse = FALSE; + is_first_curse = false; switch (randint1(34)) { case 28: case 29: @@ -187,7 +187,7 @@ bool activate_ty_curse(player_type *target_ptr, bool stop_ty, int *count) set_paralyzed(target_ptr, target_ptr->paralyzed + randint1(3)); else set_paralyzed(target_ptr, target_ptr->paralyzed + randint1(13)); - stop_ty = TRUE; + stop_ty = true; } if (!one_in_(6)) @@ -210,7 +210,7 @@ bool activate_ty_curse(player_type *target_ptr, bool stop_ty, int *count) case 25: if ((floor_ptr->dun_level > 65) && !stop_ty) { (*count) += summon_cyber(target_ptr, -1, target_ptr->y, target_ptr->x); - stop_ty = TRUE; + stop_ty = true; break; } @@ -219,9 +219,9 @@ bool activate_ty_curse(player_type *target_ptr, bool stop_ty, int *count) /* Fall through */ default: for (int i = 0; i < A_MAX; i++) { - bool is_first_dec_stat = TRUE; + bool is_first_dec_stat = true; while (is_first_dec_stat || one_in_(2)) { - is_first_dec_stat = FALSE; + is_first_dec_stat = false; (void)do_dec_stat(target_ptr, i); } } diff --git a/src/spell-kind/spells-sight.cpp b/src/spell-kind/spells-sight.cpp index 86dff5954..fcb74a8e6 100644 --- a/src/spell-kind/spells-sight.cpp +++ b/src/spell-kind/spells-sight.cpp @@ -60,7 +60,7 @@ bool project_all_los(player_type *caster_ptr, EFFECT_ID typ, HIT_POINT dam) } BIT_FLAGS flg = PROJECT_JUMP | PROJECT_KILL | PROJECT_HIDE; - bool obvious = FALSE; + bool obvious = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; if (m_ptr->mflag.has_not(MFLAG::LOS)) @@ -71,7 +71,7 @@ bool project_all_los(player_type *caster_ptr, EFFECT_ID typ, HIT_POINT dam) POSITION x = m_ptr->fx; if (project(caster_ptr, 0, 0, y, x, dam, typ, flg).notice) - obvious = TRUE; + obvious = true; } return obvious; @@ -179,8 +179,8 @@ bool crusade(player_type *caster_ptr) { return (project_all_los(caster_ptr, GF_C */ void aggravate_monsters(player_type *caster_ptr, MONSTER_IDX who) { - bool sleep = FALSE; - bool speed = FALSE; + bool sleep = false; + bool speed = false; for (MONSTER_IDX i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; if (!monster_is_valid(m_ptr)) @@ -191,7 +191,7 @@ void aggravate_monsters(player_type *caster_ptr, MONSTER_IDX who) if (m_ptr->cdis < MAX_SIGHT * 2) { if (monster_csleep_remaining(m_ptr)) { (void)set_monster_csleep(caster_ptr, i, 0); - sleep = TRUE; + sleep = true; } if (!is_pet(m_ptr)) @@ -201,7 +201,7 @@ void aggravate_monsters(player_type *caster_ptr, MONSTER_IDX who) if (player_has_los_bold(caster_ptr, m_ptr->fy, m_ptr->fx)) { if (!is_pet(m_ptr)) { (void)set_monster_fast(caster_ptr, i, monster_fast_remaining(m_ptr) + 100); - speed = TRUE; + speed = true; } } } @@ -369,7 +369,7 @@ bool probing(player_type *caster_ptr) Term->scr->cu = 0; Term->scr->cv = 1; - bool probe = FALSE; + bool probe = false; char buf[256]; for (int i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; @@ -405,7 +405,7 @@ bool probing(player_type *caster_ptr) msg_print(NULL); } - probe = TRUE; + probe = true; } Term->scr->cu = cu; diff --git a/src/spell-kind/spells-teleport.cpp b/src/spell-kind/spells-teleport.cpp index a058b65b6..f68d03add 100644 --- a/src/spell-kind/spells-teleport.cpp +++ b/src/spell-kind/spells-teleport.cpp @@ -63,19 +63,19 @@ bool teleport_swap(player_type *caster_ptr, DIRECTION dir) if (caster_ptr->anti_tele) { msg_print(_("不思議な力がテレポートを防いだ！", "A mysterious force prevents you from teleporting!")); - return FALSE; + return false; } grid_type *g_ptr; g_ptr = &caster_ptr->current_floor_ptr->grid_array[ty][tx]; if (!g_ptr->m_idx || (g_ptr->m_idx == caster_ptr->riding)) { msg_print(_("それとは場所を交換できません。", "You can't trade places with that!")); - return FALSE; + return false; } if ((g_ptr->info & CAVE_ICKY) || (distance(ty, tx, caster_ptr->y, caster_ptr->x) > caster_ptr->lev * 3 / 2 + 10)) { msg_print(_("失敗した。", "Failed to swap.")); - return FALSE; + return false; } monster_type *m_ptr; @@ -89,12 +89,12 @@ bool teleport_swap(player_type *caster_ptr, DIRECTION dir) msg_print(_("テレポートを邪魔された！", "Your teleportation is blocked!")); if (is_original_ap_and_seen(caster_ptr, m_ptr)) r_ptr->r_flagsr |= RFR_RES_TELE; - return FALSE; + return false; } sound(SOUND_TELEPORT); (void)move_player_effect(caster_ptr, ty, tx, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP); - return TRUE; + return true; } /*! @@ -126,7 +126,7 @@ bool teleport_away(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION dis, tel { monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[m_idx]; if (!monster_is_valid(m_ptr)) - return FALSE; + return false; if ((mode & TELEPORT_DEC_VALOUR) && (((caster_ptr->chp * 10) / caster_ptr->mhp) > 5) && (4 + randint1(5) < ((caster_ptr->chp * 10) / caster_ptr->mhp))) { chg_virtue(caster_ptr, V_VALOUR, -1); @@ -137,14 +137,14 @@ bool teleport_away(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION dis, tel POSITION min = dis / 2; int tries = 0; POSITION ny = 0, nx = 0; - bool look = TRUE; + bool look = true; while (look) { tries++; if (dis > 200) dis = 200; for (int i = 0; i < 500; i++) { - while (TRUE) { + while (true) { ny = rand_spread(oy, dis); nx = rand_spread(ox, dis); POSITION d = distance(oy, ox, ny, nx); @@ -160,7 +160,7 @@ bool teleport_away(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION dis, tel if (caster_ptr->current_floor_ptr->grid_array[ny][nx].info & CAVE_ICKY) continue; - look = FALSE; + look = false; break; } @@ -168,7 +168,7 @@ bool teleport_away(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION dis, tel min = min / 2; const int MAX_TELEPORT_TRIES = 100; if (tries > MAX_TELEPORT_TRIES) - return FALSE; + return false; } sound(SOUND_TPOTHER); @@ -186,7 +186,7 @@ bool teleport_away(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION dis, tel if (r_info[m_ptr->r_idx].flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)) caster_ptr->update |= (PU_MON_LITE); - return TRUE; + return true; } /*! @@ -215,13 +215,13 @@ void teleport_monster_to(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION ty POSITION dis = 2; int min = dis / 2; int attempts = 500; - bool look = TRUE; + bool look = true; while (look && --attempts) { if (dis > 200) dis = 200; for (int i = 0; i < 500; i++) { - while (TRUE) { + while (true) { ny = rand_spread(ty, dis); nx = rand_spread(tx, dis); int d = distance(ty, tx, ny, nx); @@ -234,7 +234,7 @@ void teleport_monster_to(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION ty if (!cave_monster_teleportable_bold(caster_ptr, m_idx, ny, nx, mode)) continue; - look = FALSE; + look = false; break; } @@ -287,10 +287,10 @@ void teleport_monster_to(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION ty bool teleport_player_aux(player_type *creature_ptr, POSITION dis, bool is_quantum_effect, teleport_flags mode) { if (creature_ptr->wild_mode) - return FALSE; + return false; if (!is_quantum_effect && creature_ptr->anti_tele && !(mode & TELEPORT_NONMAGICAL)) { msg_print(_("不思議な力がテレポートを防いだ！", "A mysterious force prevents you from teleporting!")); - return FALSE; + return false; } int candidates_at[MAX_TELEPORT_DISTANCE + 1]; @@ -320,7 +320,7 @@ bool teleport_player_aux(player_type *creature_ptr, POSITION dis, bool is_quantu } if (0 == total_candidates) - return FALSE; + return false; int cur_candidates; int min = dis; @@ -355,7 +355,7 @@ bool teleport_player_aux(player_type *creature_ptr, POSITION dis, bool is_quantu } if (player_bold(creature_ptr, yy, xx)) - return FALSE; + return false; sound(SOUND_TELEPORT); #ifdef JP @@ -363,7 +363,7 @@ bool teleport_player_aux(player_type *creature_ptr, POSITION dis, bool is_quantu msg_format("『こっちだぁ、%s』", creature_ptr->name); #endif (void)move_player_effect(creature_ptr, yy, xx, MPE_FORGET_FLOW | MPE_HANDLE_STUFF | MPE_DONT_PICKUP); - return TRUE; + return true; } /*! @@ -461,8 +461,8 @@ void teleport_player_to(player_type *creature_ptr, POSITION ny, POSITION nx, tel /* Find a usable location */ POSITION y, x; POSITION dis = 0, ctr = 0; - while (TRUE) { - while (TRUE) { + while (true) { + while (true) { y = (POSITION)rand_spread(ny, dis); x = (POSITION)rand_spread(nx, dis); if (in_bounds(creature_ptr->current_floor_ptr, y, x)) @@ -507,9 +507,9 @@ void teleport_away_followable(player_type *tracer_ptr, MONSTER_IDX m_idx) if (!is_followable) return; - bool follow = FALSE; + bool follow = false; if (tracer_ptr->muta.has(MUTA::VTELEPORT) || (tracer_ptr->pclass == CLASS_IMITATOR)) - follow = TRUE; + follow = true; else { BIT_FLAGS flgs[TR_FLAG_SIZE]; object_type *o_ptr; @@ -520,7 +520,7 @@ void teleport_away_followable(player_type *tracer_ptr, MONSTER_IDX m_idx) if (o_ptr->k_idx && !object_is_cursed(o_ptr)) { object_flags(tracer_ptr, o_ptr, flgs); if (has_flag(flgs, TR_TELEPORT)) { - follow = TRUE; + follow = true; break; } } @@ -560,11 +560,11 @@ bool exe_dimension_door(player_type *caster_ptr, POSITION x, POSITION y) || (!randint0(plev / 10 + 10))) { caster_ptr->energy_need += (s16b)((s32b)(60 - plev) * ENERGY_NEED() / 100L); teleport_player(caster_ptr, (plev + 2) * 2, TELEPORT_PASSIVE); - return FALSE; + return false; } teleport_player_to(caster_ptr, y, x, TELEPORT_SPONTANEOUS); - return TRUE; + return true; } /*! @@ -577,11 +577,11 @@ bool dimension_door(player_type *caster_ptr) { DEPTH x = 0, y = 0; if (!tgt_pt(caster_ptr, &x, &y)) - return FALSE; + return false; if (exe_dimension_door(caster_ptr, x, y)) - return TRUE; + return true; msg_print(_("精霊界から物質界に戻る時うまくいかなかった！", "You fail to exit the astral plane correctly!")); - return TRUE; + return true; } diff --git a/src/spell-kind/spells-world.cpp b/src/spell-kind/spells-world.cpp index fcf7729fb..104bf66c7 100644 --- a/src/spell-kind/spells-world.cpp +++ b/src/spell-kind/spells-world.cpp @@ -68,7 +68,7 @@ bool is_teleport_level_ineffective(player_type *caster_ptr, MONSTER_IDX idx) void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) { GAME_TEXT m_name[160]; - bool see_m = TRUE; + bool see_m = true; if (m_idx <= 0) { strcpy(m_name, _("あなた", "you")); } else { @@ -90,15 +90,15 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) bool go_up; if (randint0(100) < 50) - go_up = TRUE; + go_up = true; else - go_up = FALSE; + go_up = false; if ((m_idx <= 0) && current_world_ptr->wizard) { if (get_check("Force to go up? ")) - go_up = TRUE; + go_up = true; else if (get_check("Force to go down? ")) - go_up = FALSE; + go_up = false; } if ((ironman_downward && (m_idx <= 0)) || (creature_ptr->current_floor_ptr->dun_level <= d_info[creature_ptr->dungeon_idx].mindepth)) { @@ -129,7 +129,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) prepare_change_floor_mode(creature_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT); } - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } } else if (quest_number(creature_ptr, creature_ptr->current_floor_ptr->dun_level) || (creature_ptr->current_floor_ptr->dun_level >= d_info[creature_ptr->dungeon_idx].maxdepth)) { @@ -152,7 +152,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) leave_quest_check(creature_ptr); creature_ptr->current_floor_ptr->inside_quest = 0; - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } } else if (go_up) { #ifdef JP @@ -171,7 +171,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) do_cmd_save_game(creature_ptr, TRUE); prepare_change_floor_mode(creature_ptr, CFM_SAVE_FLOORS | CFM_UP | CFM_RAND_PLACE | CFM_RAND_CONNECT); - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } } else { #ifdef JP @@ -189,7 +189,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) do_cmd_save_game(creature_ptr, TRUE); prepare_change_floor_mode(creature_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT); - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } } @@ -214,14 +214,14 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) bool teleport_level_other(player_type *caster_ptr) { if (!target_set(caster_ptr, TARGET_KILL)) - return FALSE; + return false; MONSTER_IDX target_m_idx = caster_ptr->current_floor_ptr->grid_array[target_row][target_col].m_idx; if (!target_m_idx) - return TRUE; + return true; if (!player_has_los_bold(caster_ptr, target_row, target_col)) - return TRUE; + return true; if (!projectable(caster_ptr, caster_ptr->y, caster_ptr->x, target_row, target_col)) - return TRUE; + return true; monster_type *m_ptr; monster_race *r_ptr; @@ -238,7 +238,7 @@ bool teleport_level_other(player_type *caster_ptr) teleport_level(caster_ptr, target_m_idx); } - return TRUE; + return true; } /*! @@ -250,12 +250,12 @@ bool tele_town(player_type *caster_ptr) { if (caster_ptr->current_floor_ptr->dun_level) { msg_print(_("この魔法は地上でしか使えない！", "This spell can only be used on the surface!")); - return FALSE; + return false; } if (caster_ptr->current_floor_ptr->inside_arena || caster_ptr->phase_out) { msg_print(_("この魔法は外でしか使えない！", "This spell can only be used outside!")); - return FALSE; + return false; } screen_save(); @@ -278,16 +278,16 @@ bool tele_town(player_type *caster_ptr) msg_print(_("まだ行けるところがない。", "You have not yet visited any town.")); msg_print(NULL); screen_load(); - return FALSE; + return false; } prt(_("どこに行きますか:", "Where do you want to go: "), 0, 0); - while (TRUE) { + while (true) { i = inkey(); if (i == ESCAPE) { screen_load(); - return FALSE; + return false; } else if ((i < 'a') || (i > ('a' + max_towns - 2))) @@ -307,11 +307,11 @@ bool tele_town(player_type *caster_ptr) } } - caster_ptr->leaving = TRUE; - caster_ptr->leave_bldg = TRUE; - caster_ptr->teleport_town = TRUE; + caster_ptr->leaving = true; + caster_ptr->leave_bldg = true; + caster_ptr->teleport_town = true; screen_load(); - return TRUE; + return true; } /*! @@ -352,7 +352,7 @@ bool recall_player(player_type *creature_ptr, TIME_EFFECT turns) */ if (creature_ptr->current_floor_ptr->inside_arena || ironman_downward) { msg_print(_("何も起こらなかった。", "Nothing happens.")); - return TRUE; + return true; } bool is_special_floor = is_in_dungeon(creature_ptr); @@ -371,28 +371,28 @@ bool recall_player(player_type *creature_ptr, TIME_EFFECT turns) creature_ptr->word_recall = 0; msg_print(_("張りつめた大気が流れ去った...", "A tension leaves the air around you...")); creature_ptr->redraw |= (PR_STATUS); - return TRUE; + return true; } if (!is_in_dungeon(creature_ptr)) { DUNGEON_IDX select_dungeon; select_dungeon = choose_dungeon(_("に帰還", "recall"), 2, 14); if (!select_dungeon) - return FALSE; + return false; creature_ptr->recall_dungeon = select_dungeon; } creature_ptr->word_recall = turns; msg_print(_("回りの大気が張りつめてきた...", "The air about you becomes charged...")); creature_ptr->redraw |= (PR_STATUS); - return TRUE; + return true; } bool free_level_recall(player_type *creature_ptr) { DUNGEON_IDX select_dungeon = choose_dungeon(_("にテレポート", "teleport"), 4, 0); if (!select_dungeon) - return FALSE; + return false; DEPTH max_depth = d_info[select_dungeon].maxdepth; if (select_dungeon == DUNGEON_ANGBAND) { @@ -405,7 +405,7 @@ bool free_level_recall(player_type *creature_ptr) QUANTITY amt = get_quantity( format(_("%sの何階にテレポートしますか？", "Teleport to which level of %s? "), d_info[select_dungeon].name.c_str()), (QUANTITY)max_depth); if (amt <= 0) { - return FALSE; + return false; } creature_ptr->word_recall = 1; @@ -419,7 +419,7 @@ bool free_level_recall(player_type *creature_ptr) msg_print(_("回りの大気が張りつめてきた...", "The air about you becomes charged...")); creature_ptr->redraw |= PR_STATUS; - return TRUE; + return true; } /*! @@ -436,16 +436,16 @@ bool reset_recall(player_type *caster_ptr) select_dungeon = choose_dungeon(_("をセット", "reset"), 2, 14); if (ironman_downward) { msg_print(_("何も起こらなかった。", "Nothing happens.")); - return TRUE; + return true; } if (!select_dungeon) - return FALSE; + return false; sprintf(ppp, _("何階にセットしますか (%d-%d):", "Reset to which level (%d-%d): "), (int)d_info[select_dungeon].mindepth, (int)max_dlv[select_dungeon]); sprintf(tmp_val, "%d", (int)MAX(caster_ptr->current_floor_ptr->dun_level, 1)); if (!get_string(ppp, tmp_val, 10)) { - return FALSE; + return false; } dummy = atoi(tmp_val); @@ -465,5 +465,5 @@ bool reset_recall(player_type *caster_ptr) #else msg_format("Recall depth set to level %d (%d').", dummy, dummy * 50); #endif - return TRUE; + return true; } diff --git a/src/spell-realm/spells-chaos.cpp b/src/spell-realm/spells-chaos.cpp index 546ac13c5..e69cf3490 100644 --- a/src/spell-realm/spells-chaos.cpp +++ b/src/spell-realm/spells-chaos.cpp @@ -33,13 +33,13 @@ void call_the_void(player_type *caster_ptr) { grid_type *g_ptr; - bool do_call = TRUE; + bool do_call = true; for (int i = 0; i < 9; i++) { g_ptr = &caster_ptr->current_floor_ptr->grid_array[caster_ptr->y + ddy_ddd[i]][caster_ptr->x + ddx_ddd[i]]; if (!cave_has_flag_grid(g_ptr, FF_PROJECT)) { if (!g_ptr->mimic || !has_flag(f_info[g_ptr->mimic].flags, FF_PROJECT) || !permanent_wall(&f_info[g_ptr->feat])) { - do_call = FALSE; + do_call = false; break; } } @@ -105,7 +105,7 @@ bool vanish_dungeon(player_type *caster_ptr) bool is_special_floor = caster_ptr->current_floor_ptr->inside_quest && is_fixed_quest_idx(caster_ptr->current_floor_ptr->inside_quest); is_special_floor |= !caster_ptr->current_floor_ptr->dun_level; if (is_special_floor) - return FALSE; + return false; grid_type *g_ptr; feature_type *f_ptr; @@ -179,7 +179,7 @@ bool vanish_dungeon(player_type *caster_ptr) caster_ptr->update |= (PU_UN_VIEW | PU_UN_LITE | PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS); caster_ptr->redraw |= (PR_MAP); caster_ptr->window_flags |= (PW_OVERHEAD | PW_DUNGEON); - return TRUE; + return true; } /*! diff --git a/src/spell-realm/spells-craft.cpp b/src/spell-realm/spells-craft.cpp index 0929d46ce..4cabeb762 100644 --- a/src/spell-realm/spells-craft.cpp +++ b/src/spell-realm/spells-craft.cpp @@ -92,7 +92,7 @@ bool set_ele_attack(player_type *creature_ptr, u32b attack_type, TIME_EFFECT v) creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -151,7 +151,7 @@ bool set_ele_immune(player_type *creature_ptr, u32b immune_type, TIME_EFFECT v) creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /* @@ -161,7 +161,7 @@ bool choose_ele_attack(player_type *creature_ptr) { if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND) && !has_melee_weapon(creature_ptr, INVEN_SUB_HAND)) { msg_format(_("武器を持たないと魔法剣は使えない。", "You cannot use temporary branding with no weapon.")); - return FALSE; + return false; } screen_save(); @@ -210,11 +210,11 @@ bool choose_ele_attack(player_type *creature_ptr) else { msg_print(_("魔法剣を使うのをやめた。", "You cancel the temporary branding.")); screen_load(); - return FALSE; + return false; } screen_load(); - return TRUE; + return true; } /* * Choose a elemental immune. -LM- @@ -249,11 +249,11 @@ bool choose_ele_immune(player_type *creature_ptr, TIME_EFFECT immune_turn) else { msg_print(_("免疫を付けるのをやめた。", "You cancel the temporary immunity.")); screen_load(); - return FALSE; + return false; } screen_load(); - return TRUE; + return true; } /*! @@ -269,7 +269,7 @@ bool pulish_shield(player_type *caster_ptr) OBJECT_IDX item; object_type *o_ptr = choose_object(caster_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, TV_SHIELD); if (o_ptr == NULL) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(caster_ptr, o_name, o_ptr, OD_OMIT_PREFIX | OD_NAME_ONLY); @@ -289,7 +289,7 @@ bool pulish_shield(player_type *caster_ptr) enchant_equipment(caster_ptr, o_ptr, randint0(3) + 4, ENCH_TOAC); o_ptr->discount = 99; chg_virtue(caster_ptr, V_ENCHANT, 2); - return TRUE; + return true; } if (flush_failure) @@ -298,5 +298,5 @@ bool pulish_shield(player_type *caster_ptr) msg_print(_("失敗した。", "Failed.")); chg_virtue(caster_ptr, V_ENCHANT, -2); calc_android_exp(caster_ptr); - return FALSE; + return false; } diff --git a/src/spell-realm/spells-crusade.cpp b/src/spell-realm/spells-crusade.cpp index 153d90586..f19067c60 100644 --- a/src/spell-realm/spells-crusade.cpp +++ b/src/spell-realm/spells-crusade.cpp @@ -38,7 +38,7 @@ bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad) { DIRECTION dir; if (!get_aim_dir(caster_ptr, &dir)) - return FALSE; + return false; POSITION tx = caster_ptr->x + 99 * ddx[dir]; POSITION ty = caster_ptr->y + 99 * ddy[dir]; @@ -50,7 +50,7 @@ bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad) POSITION x = caster_ptr->x; POSITION y = caster_ptr->y; POSITION nx, ny; - while (TRUE) { + while (true) { if ((y == ty) && (x == tx)) break; @@ -99,7 +99,7 @@ bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad) project(caster_ptr, 0, rad, y, x, dam, GF_DISINTEGRATE, PROJECT_JUMP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL); } - return TRUE; + return true; } /*! @@ -110,24 +110,24 @@ bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad) */ bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_sh_holy && !do_dec) { if (creature_ptr->tim_sh_holy > v) - return FALSE; + return false; } else if (!creature_ptr->tim_sh_holy) { msg_print(_("体が聖なるオーラで覆われた。", "You are enveloped by a holy aura!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_sh_holy) { msg_print(_("聖なるオーラが消えた。", "The holy aura disappeared.")); - notice = TRUE; + notice = true; } } @@ -135,13 +135,13 @@ bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -153,24 +153,24 @@ bool set_tim_sh_holy(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_tim_eyeeye(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_eyeeye && !do_dec) { if (creature_ptr->tim_eyeeye > v) - return FALSE; + return false; } else if (!creature_ptr->tim_eyeeye) { msg_print(_("法の守り手になった気がした！", "You feel like a keeper of commandments!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_eyeeye) { msg_print(_("懲罰を執行することができなくなった。", "You lost your aura of retribution.")); - notice = TRUE; + notice = true; } } @@ -178,11 +178,11 @@ bool set_tim_eyeeye(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/spell-realm/spells-demon.cpp b/src/spell-realm/spells-demon.cpp index baf1efc76..ae013eba4 100644 --- a/src/spell-realm/spells-demon.cpp +++ b/src/spell-realm/spells-demon.cpp @@ -15,24 +15,24 @@ */ bool set_tim_sh_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_sh_fire && !do_dec) { if (creature_ptr->tim_sh_fire > v) - return FALSE; + return false; } else if (!creature_ptr->tim_sh_fire) { msg_print(_("体が炎のオーラで覆われた。", "You are enveloped by a fiery aura!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_sh_fire) { msg_print(_("炎のオーラが消えた。", "The fiery aura disappeared.")); - notice = TRUE; + notice = true; } } @@ -40,11 +40,11 @@ bool set_tim_sh_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/spell-realm/spells-hex.cpp b/src/spell-realm/spells-hex.cpp index dfdc17f57..7e85f5247 100644 --- a/src/spell-realm/spells-hex.cpp +++ b/src/spell-realm/spells-hex.cpp @@ -43,7 +43,7 @@ bool stop_hex_spell_all(player_type *caster_ptr) caster_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS); caster_ptr->redraw |= (PR_EXTRA | PR_HP | PR_MANA); - return TRUE; + return true; } /*! @@ -54,14 +54,14 @@ bool stop_hex_spell(player_type *caster_ptr) int spell; char choice = 0; char out_val[160]; - bool flag = FALSE; + bool flag = false; TERM_LEN y = 1; TERM_LEN x = 20; int sp[MAX_KEEP]; if (!hex_spelling_any(caster_ptr)) { msg_print(_("呪文を詠唱していません。", "You are not casting a spell.")); - return FALSE; + return false; } /* Stop all spells */ @@ -97,7 +97,7 @@ bool stop_hex_spell(player_type *caster_ptr) } if ((choice < I2A(0)) || (choice > I2A(casting_hex_num(caster_ptr) - 1))) continue; - flag = TRUE; + flag = true; } } @@ -126,7 +126,7 @@ void check_hex(player_type *caster_ptr) int spell; MANA_POINT need_mana; u32b need_mana_frac; - bool res = FALSE; + bool res = false; /* Spells spelled by player */ if (caster_ptr->realm1 != REALM_HEX) @@ -137,7 +137,7 @@ void check_hex(player_type *caster_ptr) if (caster_ptr->magic_num1[1]) { caster_ptr->magic_num1[0] = caster_ptr->magic_num1[1]; caster_ptr->magic_num1[1] = 0; - res = TRUE; + res = true; } /* Stop all spells when anti-magic ability is given */ @@ -225,8 +225,8 @@ bool hex_spell_fully(player_type *caster_ptr) k_max = (caster_ptr->lev / 15) + 1; k_max = MIN(k_max, MAX_KEEP); if (casting_hex_num(caster_ptr) < k_max) - return FALSE; - return TRUE; + return false; + return true; } /*! @@ -274,11 +274,11 @@ bool teleport_barrier(player_type *caster_ptr, MONSTER_IDX m_idx) monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!hex_spelling(caster_ptr, HEX_ANTI_TELE)) - return FALSE; + return false; if ((caster_ptr->lev * 3 / 2) < randint1(r_ptr->level)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -292,11 +292,11 @@ bool magic_barrier(player_type *target_ptr, MONSTER_IDX m_idx) monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!hex_spelling(target_ptr, HEX_ANTI_MAGIC)) - return FALSE; + return false; if ((target_ptr->lev * 3 / 2) < randint1(r_ptr->level)) - return FALSE; + return false; - return TRUE; + return true; } /*! @@ -310,11 +310,11 @@ bool multiply_barrier(player_type *caster_ptr, MONSTER_IDX m_idx) monster_race *r_ptr = &r_info[m_ptr->r_idx]; if (!hex_spelling(caster_ptr, HEX_ANTI_MULTI)) - return FALSE; + return false; if ((caster_ptr->lev * 3 / 2) < randint1(r_ptr->level)) - return FALSE; + return false; - return TRUE; + return true; } bool hex_spelling(player_type *caster_ptr, int hex) { return (caster_ptr->realm1 == REALM_HEX) && (caster_ptr->magic_num1[0] & (1UL << (hex))); } diff --git a/src/spell-realm/spells-nature.cpp b/src/spell-realm/spells-nature.cpp index 849ad54a4..d7bf0aca9 100644 --- a/src/spell-realm/spells-nature.cpp +++ b/src/spell-realm/spells-nature.cpp @@ -26,7 +26,7 @@ bool rustproof(player_type *caster_ptr) OBJECT_IDX item; object_type *o_ptr = choose_object(caster_ptr, &item, q, s, USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT, TV_NONE); if (o_ptr == NULL) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(caster_ptr, o_name, o_ptr, OD_OMIT_PREFIX | OD_NAME_ONLY); @@ -46,5 +46,5 @@ bool rustproof(player_type *caster_ptr) msg_format("%s %s %s now protected against corrosion.", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "are" : "is")); #endif calc_android_exp(caster_ptr); - return TRUE; + return true; } diff --git a/src/spell-realm/spells-song.cpp b/src/spell-realm/spells-song.cpp index 69705b608..0a88316e2 100644 --- a/src/spell-realm/spells-song.cpp +++ b/src/spell-realm/spells-song.cpp @@ -86,24 +86,24 @@ void check_music(player_type *caster_ptr) */ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_stealth && !do_dec) { if (creature_ptr->tim_stealth > v) - return FALSE; + return false; } else if (!is_time_limit_stealth(creature_ptr)) { msg_print(_("足音が小さくなった！", "You begin to walk silently!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_stealth && !music_singing(creature_ptr, MUSIC_STEALTH)) { msg_print(_("足音が大きくなった。", "You no longer walk silently.")); - notice = TRUE; + notice = true; } } @@ -111,13 +111,13 @@ bool set_tim_stealth(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! diff --git a/src/spell-realm/spells-sorcery.cpp b/src/spell-realm/spells-sorcery.cpp index d27de1fa8..ea79b7b7f 100644 --- a/src/spell-realm/spells-sorcery.cpp +++ b/src/spell-realm/spells-sorcery.cpp @@ -22,9 +22,9 @@ */ bool alchemy(player_type *caster_ptr) { - bool force = FALSE; + bool force = false; if (command_arg > 0) - force = TRUE; + force = true; concptr q = _("どのアイテムを金に変えますか？", "Turn which item to gold? "); concptr s = _("金に変えられる物がありません。", "You have nothing to turn to gold."); @@ -32,13 +32,13 @@ bool alchemy(player_type *caster_ptr) object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_NONE); if (!o_ptr) - return FALSE; + return false; int amt = 1; if (o_ptr->number > 1) { amt = get_quantity(NULL, o_ptr->number); if (amt <= 0) - return FALSE; + return false; } ITEM_NUMBER old_number = o_ptr->number; @@ -52,20 +52,20 @@ bool alchemy(player_type *caster_ptr) char out_val[MAX_NLEN + 40]; sprintf(out_val, _("本当に%sを金に変えますか？", "Really turn %s to gold? "), o_name); if (!get_check(out_val)) - return FALSE; + return false; } } if (!can_player_destroy_object(caster_ptr, o_ptr)) { msg_format(_("%sを金に変えることに失敗した。", "You fail to turn %s to gold!"), o_name); - return FALSE; + return false; } PRICE price = object_value_real(caster_ptr, o_ptr); if (price <= 0) { msg_format(_("%sをニセの金に変えた。", "You turn %s to fool's gold."), o_name); vary_item(caster_ptr, item, -amt); - return TRUE; + return true; } price /= 3; @@ -81,5 +81,5 @@ bool alchemy(player_type *caster_ptr) caster_ptr->redraw |= PR_GOLD; caster_ptr->window_flags |= PW_PLAYER; vary_item(caster_ptr, item, -amt); - return TRUE; + return true; } diff --git a/src/spell/range-calc.cpp b/src/spell/range-calc.cpp index 2bd30e2eb..09251e643 100644 --- a/src/spell/range-calc.cpp +++ b/src/spell/range-calc.cpp @@ -46,7 +46,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO POSITION delta_x = x2 - x1; POSITION absolute_y = ABS(delta_y); POSITION absolute_x = ABS(delta_x); - if ((absolute_x < 2) && (absolute_y < 2)) return TRUE; + if ((absolute_x < 2) && (absolute_y < 2)) return true; POSITION scanner_y; if (!delta_x) @@ -56,7 +56,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (scanner_y = y1 + 1; scanner_y < y2; scanner_y++) { - if (cave_stop_disintegration(floor_ptr, scanner_y, x1)) return FALSE; + if (cave_stop_disintegration(floor_ptr, scanner_y, x1)) return false; } } @@ -65,11 +65,11 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (scanner_y = y1 - 1; scanner_y > y2; scanner_y--) { - if (cave_stop_disintegration(floor_ptr, scanner_y, x1)) return FALSE; + if (cave_stop_disintegration(floor_ptr, scanner_y, x1)) return false; } } - return TRUE; + return true; } /* Directly East/West */ @@ -81,7 +81,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (scanner_x = x1 + 1; scanner_x < x2; scanner_x++) { - if (cave_stop_disintegration(floor_ptr, y1, scanner_x)) return FALSE; + if (cave_stop_disintegration(floor_ptr, y1, scanner_x)) return false; } } @@ -90,11 +90,11 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { for (scanner_x = x1 - 1; scanner_x > x2; scanner_x--) { - if (cave_stop_disintegration(floor_ptr, y1, scanner_x)) return FALSE; + if (cave_stop_disintegration(floor_ptr, y1, scanner_x)) return false; } } - return TRUE; + return true; } POSITION sign_x = (delta_x < 0) ? -1 : 1; @@ -103,14 +103,14 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO { if (absolute_y == 2) { - if (!cave_stop_disintegration(floor_ptr, y1 + sign_y, x1)) return TRUE; + if (!cave_stop_disintegration(floor_ptr, y1 + sign_y, x1)) return true; } } else if (absolute_y == 1) { if (absolute_x == 2) { - if (!cave_stop_disintegration(floor_ptr, y1, x1 + sign_x)) return TRUE; + if (!cave_stop_disintegration(floor_ptr, y1, x1 + sign_x)) return true; } } @@ -137,7 +137,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 - scanner_x) { - if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return FALSE; + if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return false; fraction_y += m; @@ -148,7 +148,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO else if (fraction_y > scale_factor_2) { scanner_y += sign_y; - if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return FALSE; + if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return false; fraction_y -= scale_factor_1; scanner_x += sign_x; } @@ -160,7 +160,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO } } - return TRUE; + return true; } POSITION fraction_x = absolute_x * absolute_x; @@ -180,7 +180,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 - scanner_y) { - if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return FALSE; + if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return false; fraction_x += m; @@ -191,7 +191,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO else if (fraction_x > scale_factor_2) { scanner_x += sign_x; - if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return FALSE; + if (cave_stop_disintegration(floor_ptr, scanner_y, scanner_x)) return false; fraction_x -= scale_factor_1; scanner_y += sign_y; } @@ -203,7 +203,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO } } - return TRUE; + return true; } diff --git a/src/spell/spell-info.cpp b/src/spell/spell-info.cpp index 49e48e6b1..61963077b 100644 --- a/src/spell/spell-info.cpp +++ b/src/spell/spell-info.cpp @@ -253,7 +253,7 @@ void print_spells(player_type *caster_ptr, SPELL_IDX target_spell, SPELL_IDX *sp char info[80]; char out_val[160]; char ryakuji[5]; - bool max = FALSE; + bool max = false; for (i = 0; i < num; i++) { SPELL_IDX spell = spells[i]; @@ -274,15 +274,15 @@ void print_spells(player_type *caster_ptr, SPELL_IDX target_spell, SPELL_IDX *sp else exp_level = spell_exp_level(exp); - max = FALSE; + max = false; if (!increment && (exp_level == EXP_LEVEL_MASTER)) - max = TRUE; + max = true; else if ((increment == 32) && (exp_level >= EXP_LEVEL_EXPERT)) - max = TRUE; + max = true; else if (s_ptr->slevel >= 99) - max = TRUE; + max = true; else if ((caster_ptr->pclass == CLASS_RED_MAGE) && (exp_level >= EXP_LEVEL_SKILLED)) - max = TRUE; + max = true; strncpy(ryakuji, exp_level_str[exp_level], 4); ryakuji[3] = ']'; diff --git a/src/spell/spells-diceroll.cpp b/src/spell/spells-diceroll.cpp index aa280a662..f0758f2ff 100644 --- a/src/spell/spells-diceroll.cpp +++ b/src/spell/spells-diceroll.cpp @@ -25,22 +25,22 @@ bool common_saving_throw_charm(player_type *operator_ptr, HIT_POINT pow, monster { monster_race *r_ptr = &r_info[m_ptr->r_idx]; - if (operator_ptr->current_floor_ptr->inside_arena) return TRUE; + if (operator_ptr->current_floor_ptr->inside_arena) return true; /* Memorize a flag */ if (r_ptr->flagsr & RFR_RES_ALL) { if (is_original_ap_and_seen(operator_ptr, m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); - return TRUE; + return true; } if (r_ptr->flags3 & RF3_NO_CONF) { if (is_original_ap_and_seen(operator_ptr, m_ptr)) r_ptr->r_flags3 |= (RF3_NO_CONF); - return TRUE; + return true; } - if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2.has(MFLAG2::NOPET)) return TRUE; + if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2.has(MFLAG2::NOPET)) return true; pow += (adj_chr_chm[operator_ptr->stat_index[A_CHR]] - 1); if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3; @@ -57,16 +57,16 @@ bool common_saving_throw_control(player_type *operator_ptr, HIT_POINT pow, monst { monster_race *r_ptr = &r_info[m_ptr->r_idx]; - if (operator_ptr->current_floor_ptr->inside_arena) return TRUE; + if (operator_ptr->current_floor_ptr->inside_arena) return true; /* Memorize a flag */ if (r_ptr->flagsr & RFR_RES_ALL) { if (is_original_ap_and_seen(operator_ptr, m_ptr)) r_ptr->r_flagsr |= (RFR_RES_ALL); - return TRUE; + return true; } - if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2.has(MFLAG2::NOPET)) return TRUE; + if (r_ptr->flags1 & RF1_QUESTOR || m_ptr->mflag2.has(MFLAG2::NOPET)) return true; pow += adj_chr_chm[operator_ptr->stat_index[A_CHR]] - 1; if ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) pow = pow * 2 / 3; diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp index e99b1d3e9..f10276aed 100644 --- a/src/spell/spells-object.cpp +++ b/src/spell/spells-object.cpp @@ -221,7 +221,7 @@ bool curse_armor(player_type *owner_ptr) o_ptr = &owner_ptr->inventory_list[INVEN_BODY]; if (!o_ptr->k_idx) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(owner_ptr, o_name, o_ptr, OD_OMIT_PREFIX); @@ -234,7 +234,7 @@ bool curse_armor(player_type *owner_ptr) #else msg_format("A %s tries to %s, but your %s resists the effects!", "terrible black aura", "surround your armor", o_name); #endif - return TRUE; + return true; } /* not artifact or failed save... */ @@ -261,7 +261,7 @@ bool curse_armor(player_type *owner_ptr) o_ptr->ident |= (IDENT_BROKEN); owner_ptr->update |= (PU_BONUS | PU_MANA); owner_ptr->window_flags |= (PW_INVEN | PW_EQUIP | PW_PLAYER); - return TRUE; + return true; } /*! @@ -276,7 +276,7 @@ bool curse_armor(player_type *owner_ptr) bool curse_weapon_object(player_type *owner_ptr, bool force, object_type *o_ptr) { if (!o_ptr->k_idx) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(owner_ptr, o_name, o_ptr, OD_OMIT_PREFIX); @@ -288,7 +288,7 @@ bool curse_weapon_object(player_type *owner_ptr, bool force, object_type *o_ptr) #else msg_format("A %s tries to %s, but your %s resists the effects!", "terrible black aura", "surround your weapon", o_name); #endif - return TRUE; + return true; } /* not artifact or failed save... */ @@ -316,7 +316,7 @@ bool curse_weapon_object(player_type *owner_ptr, bool force, object_type *o_ptr) o_ptr->ident |= (IDENT_BROKEN); owner_ptr->update |= (PU_BONUS | PU_MANA); owner_ptr->window_flags |= (PW_INVEN | PW_EQUIP | PW_PLAYER); - return TRUE; + return true; } /*! @@ -370,7 +370,7 @@ void brand_bolts(player_type *caster_ptr) bool perilous_secrets(player_type *user_ptr) { if (!ident_spell(user_ptr, FALSE, TV_NONE)) - return FALSE; + return false; if (user_ptr->msp > 0) { if (20 <= user_ptr->csp) @@ -398,7 +398,7 @@ bool perilous_secrets(player_type *user_ptr) if (one_in_(20)) take_hit(user_ptr, DAMAGE_LOSELIFE, damroll(4, 10), _("危険な秘密", "perilous secrets")); - return TRUE; + return true; } /*! @@ -456,7 +456,7 @@ bool enchant_equipment(player_type *caster_ptr, object_type *o_ptr, int n, int e /* Try "n" times */ int chance; - bool res = FALSE; + bool res = false; bool a = object_is_artifact(o_ptr); bool force = (eflag & ENCH_FORCE); for (int i = 0; i < n; i++) { @@ -475,7 +475,7 @@ bool enchant_equipment(player_type *caster_ptr, object_type *o_ptr, int n, int e if (force || ((randint1(1000) > chance) && (!a || (randint0(100) < 50)))) { o_ptr->to_h++; - res = TRUE; + res = true; /* only when you get it above -1 -CFT */ if (o_ptr->to_h >= 0) @@ -494,7 +494,7 @@ bool enchant_equipment(player_type *caster_ptr, object_type *o_ptr, int n, int e if (force || ((randint1(1000) > chance) && (!a || (randint0(100) < 50)))) { o_ptr->to_d++; - res = TRUE; + res = true; /* only when you get it above -1 -CFT */ if (o_ptr->to_d >= 0) @@ -516,7 +516,7 @@ bool enchant_equipment(player_type *caster_ptr, object_type *o_ptr, int n, int e if (force || ((randint1(1000) > chance) && (!a || (randint0(100) < 50)))) { o_ptr->to_a++; - res = TRUE; + res = true; /* only when you get it above -1 -CFT */ if (o_ptr->to_a >= 0) @@ -526,14 +526,14 @@ bool enchant_equipment(player_type *caster_ptr, object_type *o_ptr, int n, int e /* Failure */ if (!res) - return FALSE; + return false; set_bits(caster_ptr->update, PU_BONUS | PU_COMBINE | PU_REORDER); set_bits(caster_ptr->window_flags, PW_INVEN | PW_EQUIP | PW_PLAYER | PW_FLOOR_ITEM_LIST); calc_android_exp(caster_ptr); /* Success */ - return TRUE; + return true; } /*! @@ -564,7 +564,7 @@ bool enchant_spell(player_type *caster_ptr, HIT_PROB num_hit, HIT_POINT num_dam, object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT), TV_NONE); if (!o_ptr) - return FALSE; + return false; GAME_TEXT o_name[MAX_NLEN]; describe_flavor(caster_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); @@ -575,13 +575,13 @@ bool enchant_spell(player_type *caster_ptr, HIT_PROB num_hit, HIT_POINT num_dam, #endif /* Enchant */ - bool is_enchant_successful = FALSE; + bool is_enchant_successful = false; if (enchant_equipment(caster_ptr, o_ptr, num_hit, ENCH_TOHIT)) - is_enchant_successful = TRUE; + is_enchant_successful = true; if (enchant_equipment(caster_ptr, o_ptr, num_dam, ENCH_TODAM)) - is_enchant_successful = TRUE; + is_enchant_successful = true; if (enchant_equipment(caster_ptr, o_ptr, num_ac, ENCH_TOAC)) - is_enchant_successful = TRUE; + is_enchant_successful = true; if (!is_enchant_successful) { if (flush_failure) @@ -595,7 +595,7 @@ bool enchant_spell(player_type *caster_ptr, HIT_PROB num_hit, HIT_POINT num_dam, calc_android_exp(caster_ptr); /* Something happened */ - return TRUE; + return true; } /*! diff --git a/src/spell/spells-staff-only.cpp b/src/spell/spells-staff-only.cpp index d0ccbb105..95fcd161d 100644 --- a/src/spell/spells-staff-only.cpp +++ b/src/spell/spells-staff-only.cpp @@ -18,28 +18,28 @@ */ bool cleansing_nova(player_type *creature_ptr, bool magic, bool powerful) { - bool ident = FALSE; + bool ident = false; if (dispel_evil(creature_ptr, powerful ? 225 : 150)) - ident = TRUE; + ident = true; int k = 3 * creature_ptr->lev; if (set_protevil(creature_ptr, (magic ? 0 : creature_ptr->protevil) + randint1(25) + k, FALSE)) - ident = TRUE; + ident = true; if (set_poisoned(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_afraid(creature_ptr, 0)) - ident = TRUE; + ident = true; if (hp_player(creature_ptr, 50)) - ident = TRUE; + ident = true; if (set_stun(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_cut(creature_ptr, 0)) - ident = TRUE; + ident = true; return ident; } @@ -64,5 +64,5 @@ bool unleash_mana_storm(player_type *creature_ptr, bool powerful) if (is_special_class) (void)take_hit(creature_ptr, DAMAGE_NOESCAPE, 50, _("コントロールし難い強力な魔力の解放", "unleashing magics too mighty to control")); - return TRUE; + return true; } diff --git a/src/spell/spells-status.cpp b/src/spell/spells-status.cpp index 1e991e93f..a792addc8 100644 --- a/src/spell/spells-status.cpp +++ b/src/spell/spells-status.cpp @@ -197,10 +197,10 @@ bool time_walk(player_type *creature_ptr) { if (creature_ptr->timewalk) { msg_print(_("既に時は止まっている。", "Time is already stopped.")); - return FALSE; + return false; } - creature_ptr->timewalk = TRUE; + creature_ptr->timewalk = true; msg_print(_("「時よ！」", "You yell 'Time!'")); // msg_print(_("「『ザ・ワールド』！時は止まった！」", "You yell 'The World! Time has stopped!'")); msg_print(NULL); @@ -210,7 +210,7 @@ bool time_walk(player_type *creature_ptr) creature_ptr->update |= (PU_MONSTERS); creature_ptr->window_flags |= (PW_OVERHEAD | PW_DUNGEON); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -224,7 +224,7 @@ void roll_hitdice(player_type *creature_ptr, spell_operation options) HIT_POINT max_value = creature_ptr->hitdie + ((PY_MAX_LEVEL + 2) * (creature_ptr->hitdie + 1)) * 5 / 8; /* Rerate */ - while (TRUE) { + while (true) { /* Pre-calculate level 1 hitdice */ creature_ptr->player_hp[0] = (HIT_POINT)creature_ptr->hitdie; @@ -290,100 +290,100 @@ bool life_stream(player_type *creature_ptr, bool message, bool virtue_change) handle_stuff(creature_ptr); hp_player(creature_ptr, 5000); - return TRUE; + return true; } bool heroism(player_type *creature_ptr, int base) { - bool ident = FALSE; + bool ident = false; if (set_afraid(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_hero(creature_ptr, creature_ptr->hero + randint1(base) + base, FALSE)) - ident = TRUE; + ident = true; if (hp_player(creature_ptr, 10)) - ident = TRUE; + ident = true; return ident; } bool berserk(player_type *creature_ptr, int base) { - bool ident = FALSE; + bool ident = false; if (set_afraid(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_shero(creature_ptr, creature_ptr->shero + randint1(base) + base, FALSE)) - ident = TRUE; + ident = true; if (hp_player(creature_ptr, 30)) - ident = TRUE; + ident = true; return ident; } bool cure_light_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides) { - bool ident = FALSE; + bool ident = false; if (hp_player(creature_ptr, damroll(dice, sides))) - ident = TRUE; + ident = true; if (set_blind(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_cut(creature_ptr, creature_ptr->cut - 10)) - ident = TRUE; + ident = true; if (set_shero(creature_ptr, 0, TRUE)) - ident = TRUE; + ident = true; return ident; } bool cure_serious_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides) { - bool ident = FALSE; + bool ident = false; if (hp_player(creature_ptr, damroll(dice, sides))) - ident = TRUE; + ident = true; if (set_blind(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_confused(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_cut(creature_ptr, (creature_ptr->cut / 2) - 50)) - ident = TRUE; + ident = true; if (set_shero(creature_ptr, 0, TRUE)) - ident = TRUE; + ident = true; return ident; } bool cure_critical_wounds(player_type *creature_ptr, HIT_POINT pow) { - bool ident = FALSE; + bool ident = false; if (hp_player(creature_ptr, pow)) - ident = TRUE; + ident = true; if (set_blind(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_confused(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_poisoned(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_stun(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_cut(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_shero(creature_ptr, 0, TRUE)) - ident = TRUE; + ident = true; return ident; } bool true_healing(player_type *creature_ptr, HIT_POINT pow) { - bool ident = FALSE; + bool ident = false; if (hp_player(creature_ptr, pow)) - ident = TRUE; + ident = true; if (set_blind(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_confused(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_poisoned(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_stun(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_cut(creature_ptr, 0)) - ident = TRUE; + ident = true; if (set_image(creature_ptr, 0)) - ident = TRUE; + ident = true; return ident; } @@ -407,11 +407,11 @@ bool restore_mana(player_type *creature_ptr, bool magic_eater) msg_print(_("頭がハッキリとした。", "You feel your head clear.")); creature_ptr->window_flags |= (PW_PLAYER); - return TRUE; + return true; } if (creature_ptr->csp >= creature_ptr->msp) - return FALSE; + return false; creature_ptr->csp = creature_ptr->msp; creature_ptr->csp_frac = 0; @@ -419,24 +419,24 @@ bool restore_mana(player_type *creature_ptr, bool magic_eater) creature_ptr->redraw |= (PR_MANA); creature_ptr->window_flags |= (PW_PLAYER); creature_ptr->window_flags |= (PW_SPELL); - return TRUE; + return true; } bool restore_all_status(player_type *creature_ptr) { - bool ident = FALSE; + bool ident = false; if (do_res_stat(creature_ptr, A_STR)) - ident = TRUE; + ident = true; if (do_res_stat(creature_ptr, A_INT)) - ident = TRUE; + ident = true; if (do_res_stat(creature_ptr, A_WIS)) - ident = TRUE; + ident = true; if (do_res_stat(creature_ptr, A_DEX)) - ident = TRUE; + ident = true; if (do_res_stat(creature_ptr, A_CON)) - ident = TRUE; + ident = true; if (do_res_stat(creature_ptr, A_CHR)) - ident = TRUE; + ident = true; return ident; } @@ -444,13 +444,13 @@ bool fishing(player_type *creature_ptr) { DIRECTION dir; if (!get_direction(creature_ptr, &dir, FALSE, FALSE)) - return FALSE; + return false; POSITION y = creature_ptr->y + ddy[dir]; POSITION x = creature_ptr->x + ddx[dir]; creature_ptr->fishing_dir = dir; if (!cave_has_flag_bold(creature_ptr->current_floor_ptr, y, x, FF_WATER)) { msg_print(_("そこは水辺ではない。", "You can't fish here.")); - return FALSE; + return false; } if (creature_ptr->current_floor_ptr->grid_array[y][x].m_idx) { @@ -458,12 +458,12 @@ bool fishing(player_type *creature_ptr) monster_desc(creature_ptr, m_name, &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[y][x].m_idx], 0); msg_format(_("%sが邪魔だ！", "%^s is standing in your way."), m_name); PlayerEnergy(creature_ptr).reset_player_turn(); - return FALSE; + return false; } set_action(creature_ptr, ACTION_FISH); creature_ptr->redraw |= (PR_STATE); - return TRUE; + return true; } /*! @@ -486,7 +486,7 @@ bool cosmic_cast_off(player_type *creature_ptr, object_type **o_ptr_ptr) } if (slot > INVEN_FEET) - return FALSE; + return false; object_type forge; (&forge)->copy_from(o_ptr); @@ -516,7 +516,7 @@ bool cosmic_cast_off(player_type *creature_ptr, object_type **o_ptr_ptr) msg_print(_("気が爆発寸前になった。", "Your force absorbs the explosion.")); } - return TRUE; + return true; } /*! diff --git a/src/spell/spells-summon.cpp b/src/spell/spells-summon.cpp index 954ab739b..108b67af6 100644 --- a/src/spell/spells-summon.cpp +++ b/src/spell/spells-summon.cpp @@ -77,10 +77,10 @@ bool trump_summoning(player_type *caster_ptr, int num, bool pet, POSITION y, POS who = 0; } - bool success = FALSE; + bool success = false; for (int i = 0; i < num; i++) { if (summon_specific(caster_ptr, who, y, x, lev, type, mode)) - success = TRUE; + success = true; } if (!success) { @@ -102,7 +102,7 @@ bool cast_summon_demon(player_type *caster_ptr, int power) flg |= PM_ALLOW_GROUP; if (!summon_specific(caster_ptr, (pet ? -1 : 0), caster_ptr->y, caster_ptr->x, power, SUMMON_DEMON, flg)) - return TRUE; + return true; msg_print(_("硫黄の悪臭が充満した。", "The area fills with a stench of sulphur and brimstone.")); if (pet) { @@ -111,7 +111,7 @@ bool cast_summon_demon(player_type *caster_ptr, int power) msg_print(_("「卑しき者よ、我は汝の下僕にあらず！ お前の魂を頂くぞ！」", "'NON SERVIAM! Wretch! I shall feast on thy mortal soul!'")); } - return TRUE; + return true; } bool cast_summon_undead(player_type *creature_ptr, int power) @@ -135,7 +135,7 @@ bool cast_summon_undead(player_type *creature_ptr, int power) else msg_print(_("死者が甦った。眠りを妨げるあなたを罰するために！", "'The dead arise... to punish you for disturbing them!'")); } - return TRUE; + return true; } bool cast_summon_hound(player_type *creature_ptr, int power) @@ -154,7 +154,7 @@ bool cast_summon_hound(player_type *creature_ptr, int power) msg_print(_("ハウンドはあなたに牙を向けている！", "A group of hounds appear as your enemies!")); } - return TRUE; + return true; } bool cast_summon_elemental(player_type *creature_ptr, int power) @@ -176,7 +176,7 @@ bool cast_summon_elemental(player_type *creature_ptr, int power) msg_print(_("それをコントロールできなかった！", "You fail to control it!")); } - return TRUE; + return true; } bool cast_summon_octopus(player_type *creature_ptr) @@ -192,7 +192,7 @@ bool cast_summon_octopus(player_type *creature_ptr) msg_print(_("蛸はあなたを睨んでいる！", "A group of octopuses appear as your enemies!")); } - return TRUE; + return true; } /*! @@ -206,12 +206,12 @@ bool item_tester_offer(player_type *creature_ptr, object_type *o_ptr) (void)creature_ptr; if (o_ptr->tval != TV_CORPSE) - return FALSE; + return false; if (o_ptr->sval != SV_CORPSE) - return FALSE; + return false; if (angband_strchr("pht", r_info[o_ptr->pval].d_char)) - return TRUE; - return FALSE; + return true; + return false; } /*! @@ -227,7 +227,7 @@ bool cast_summon_greater_demon(player_type *caster_ptr) object_type *o_ptr; o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), TV_NONE); if (!o_ptr) - return FALSE; + return false; PLAYER_LEVEL plev = caster_ptr->lev; int summon_lev = plev * 2 / 3 + r_info[o_ptr->pval].level; @@ -240,7 +240,7 @@ bool cast_summon_greater_demon(player_type *caster_ptr) msg_print(_("悪魔は現れなかった。", "No Greater Demon arrives.")); } - return TRUE; + return true; } /*! @@ -332,12 +332,12 @@ void mitokohmon(player_type *kohmon_ptr) msg_format( _("「者ども、ひかえおろう！！！このお方をどなたとこころえる。」", "%^s says 'WHO do you think this person is! Bow your head, down to your knees!'"), sukekakusan); - sukekaku = TRUE; + sukekaku = true; stun_monsters(kohmon_ptr, 120); confuse_monsters(kohmon_ptr, 120); turn_monsters(kohmon_ptr, 120); stasis_monsters(kohmon_ptr, 120); - sukekaku = FALSE; + sukekaku = false; } /*! @@ -352,13 +352,13 @@ void mitokohmon(player_type *kohmon_ptr) int activate_hi_summon(player_type *caster_ptr, POSITION y, POSITION x, bool can_pet) { BIT_FLAGS mode = PM_ALLOW_GROUP; - bool pet = FALSE; + bool pet = false; if (can_pet) { if (one_in_(4)) { mode |= PM_FORCE_FRIENDLY; } else { mode |= PM_FORCE_PET; - pet = TRUE; + pet = true; } } diff --git a/src/status/action-setter.cpp b/src/status/action-setter.cpp index 39c1c4f9c..ba496f6ac 100644 --- a/src/status/action-setter.cpp +++ b/src/status/action-setter.cpp @@ -47,7 +47,7 @@ void set_action(player_type *creature_ptr, ACTION_IDX typ) } case ACTION_LEARN: { msg_print(_("学習をやめた。", "You stop learning.")); - creature_ptr->new_mane = FALSE; + creature_ptr->new_mane = false; break; } case ACTION_KAMAE: { diff --git a/src/status/bad-status-setter.cpp b/src/status/bad-status-setter.cpp index 7cb6040d2..dde2f6f14 100644 --- a/src/status/bad-status-setter.cpp +++ b/src/status/bad-status-setter.cpp @@ -29,11 +29,11 @@ */ bool set_blind(player_type *creature_ptr, TIME_EFFECT v) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (!creature_ptr->blind) { @@ -43,7 +43,7 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v) msg_print(_("目が見えなくなってしまった！", "You are blind!")); } - notice = TRUE; + notice = true; chg_virtue(creature_ptr, V_ENLIGHTEN, -1); } } @@ -56,14 +56,14 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v) msg_print(_("やっと目が見えるようになった。", "You can see again.")); } - notice = TRUE; + notice = true; } } creature_ptr->blind = v; creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); @@ -71,7 +71,7 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_MAP); creature_ptr->window_flags |= (PW_OVERHEAD | PW_DUNGEON); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -81,11 +81,11 @@ bool set_blind(player_type *creature_ptr, TIME_EFFECT v) */ bool set_confused(player_type *creature_ptr, TIME_EFFECT v) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (!creature_ptr->confused) { @@ -93,7 +93,7 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v) if (creature_ptr->action == ACTION_LEARN) { msg_print(_("学習が続けられない！", "You cannot continue learning!")); - creature_ptr->new_mane = FALSE; + creature_ptr->new_mane = false; creature_ptr->redraw |= (PR_STATE); creature_ptr->action = ACTION_NONE; @@ -121,15 +121,15 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v) if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr); - notice = TRUE; - creature_ptr->counter = FALSE; + notice = true; + creature_ptr->counter = false; chg_virtue(creature_ptr, V_HARMONY, -1); } } else { if (creature_ptr->confused) { msg_print(_("やっと混乱がおさまった。", "You feel less confused now.")); creature_ptr->special_attack &= ~(ATTACK_SUIKEN); - notice = TRUE; + notice = true; } } @@ -137,12 +137,12 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -152,21 +152,21 @@ bool set_confused(player_type *creature_ptr, TIME_EFFECT v) */ bool set_poisoned(player_type *creature_ptr, TIME_EFFECT v) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (!creature_ptr->poisoned) { msg_print(_("毒に侵されてしまった！", "You are poisoned!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->poisoned) { msg_print(_("やっと毒の痛みがなくなった。", "You are no longer poisoned.")); - notice = TRUE; + notice = true; } } @@ -174,12 +174,12 @@ bool set_poisoned(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -189,11 +189,11 @@ bool set_poisoned(player_type *creature_ptr, TIME_EFFECT v) */ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (!creature_ptr->afraid) { @@ -209,14 +209,14 @@ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->action = ACTION_NONE; } - notice = TRUE; - creature_ptr->counter = FALSE; + notice = true; + creature_ptr->counter = false; chg_virtue(creature_ptr, V_VALOUR, -1); } } else { if (creature_ptr->afraid) { msg_print(_("やっと恐怖を振り払った。", "You feel bolder now.")); - notice = TRUE; + notice = true; } } @@ -224,12 +224,12 @@ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -239,11 +239,11 @@ bool set_afraid(player_type *creature_ptr, TIME_EFFECT v) */ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (!creature_ptr->paralyzed) { @@ -253,13 +253,13 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v) if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr); - creature_ptr->counter = FALSE; - notice = TRUE; + creature_ptr->counter = false; + notice = true; } } else { if (creature_ptr->paralyzed) { msg_print(_("やっと動けるようになった。", "You can move again.")); - notice = TRUE; + notice = true; } } @@ -267,13 +267,13 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->redraw |= (PR_STATE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -284,11 +284,11 @@ bool set_paralyzed(player_type *creature_ptr, TIME_EFFECT v) */ bool set_image(player_type *creature_ptr, TIME_EFFECT v) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (creature_ptr->pseikaku == PERSONALITY_CHARGEMAN) v = 0; @@ -301,13 +301,13 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v) if (creature_ptr->concent) reset_concentration(creature_ptr, TRUE); - creature_ptr->counter = FALSE; - notice = TRUE; + creature_ptr->counter = false; + notice = true; } } else { if (creature_ptr->image) { msg_print(_("やっとはっきりと物が見えるようになった。", "You can see clearly again.")); - notice = TRUE; + notice = true; } } @@ -315,7 +315,7 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, TRUE); @@ -324,7 +324,7 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v) creature_ptr->update |= (PU_MONSTERS); creature_ptr->window_flags |= (PW_OVERHEAD | PW_DUNGEON); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -335,36 +335,36 @@ bool set_image(player_type *creature_ptr, TIME_EFFECT v) */ bool set_slow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->slow && !do_dec) { if (creature_ptr->slow > v) - return FALSE; + return false; } else if (!creature_ptr->slow) { msg_print(_("体の動きが遅くなってしまった！", "You feel yourself moving slower!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->slow) { msg_print(_("動きの遅さがなくなったようだ。", "You feel yourself speed up.")); - notice = TRUE; + notice = true; } } creature_ptr->slow = v; if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -377,10 +377,10 @@ bool set_slow(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) bool set_stun(player_type *creature_ptr, TIME_EFFECT v) { int old_aux, new_aux; - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (is_specific_player_race(creature_ptr, RACE_GOLEM) || ((creature_ptr->pclass == CLASS_BERSERKER) && (creature_ptr->lev > 34))) v = 0; @@ -449,7 +449,7 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v) if (hex_spelling_any(creature_ptr)) stop_hex_spell_all(creature_ptr); - notice = TRUE; + notice = true; } else if (new_aux < old_aux) { if (new_aux == 0) { msg_print(_("やっと朦朧状態から回復した。", "You are no longer stunned.")); @@ -457,20 +457,20 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v) disturb(creature_ptr, FALSE, FALSE); } - notice = TRUE; + notice = true; } creature_ptr->stun = v; if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->redraw |= (PR_STUN); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -483,10 +483,10 @@ bool set_stun(player_type *creature_ptr, TIME_EFFECT v) bool set_cut(player_type *creature_ptr, TIME_EFFECT v) { int old_aux, new_aux; - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if ((creature_ptr->prace == RACE_GOLEM || creature_ptr->prace == RACE_SKELETON || creature_ptr->prace == RACE_SPECTRE || (creature_ptr->prace == RACE_ZOMBIE && creature_ptr->lev > 11)) @@ -554,7 +554,7 @@ bool set_cut(player_type *creature_ptr, TIME_EFFECT v) break; } - notice = TRUE; + notice = true; if (randint1(1000) < v || one_in_(16)) { if (!has_sustain_chr(creature_ptr)) { msg_print(_("ひどい傷跡が残ってしまった。", "You have been horribly scarred.")); @@ -568,17 +568,17 @@ bool set_cut(player_type *creature_ptr, TIME_EFFECT v) disturb(creature_ptr, FALSE, FALSE); } - notice = TRUE; + notice = true; } creature_ptr->cut = v; if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->redraw |= (PR_CUT); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/status/base-status.cpp b/src/status/base-status.cpp index a14fcb853..38d3a94b4 100644 --- a/src/status/base-status.cpp +++ b/src/status/base-status.cpp @@ -36,7 +36,7 @@ bool inc_stat(player_type *creature_ptr, int stat) BASE_STATUS gain; BASE_STATUS value = creature_ptr->stat_cur[stat]; if (value >= creature_ptr->stat_max_max[stat]) - return FALSE; + return false; if (value < 18) { gain = ((randint0(100) < 75) ? 1 : 2); @@ -59,7 +59,7 @@ bool inc_stat(player_type *creature_ptr, int stat) } creature_ptr->update |= PU_BONUS; - return TRUE; + return true; } /*! @@ -81,7 +81,7 @@ bool inc_stat(player_type *creature_ptr, int stat) */ bool dec_stat(player_type *creature_ptr, int stat, int amount, int permanent) { - bool res = FALSE; + bool res = false; BASE_STATUS cur = creature_ptr->stat_cur[stat]; BASE_STATUS max = creature_ptr->stat_max[stat]; int same = (cur == max); @@ -112,7 +112,7 @@ bool dec_stat(player_type *creature_ptr, int stat, int amount, int permanent) cur = 3; if (cur != creature_ptr->stat_cur[stat]) - res = TRUE; + res = true; } if (permanent && (max > 3)) { @@ -143,7 +143,7 @@ bool dec_stat(player_type *creature_ptr, int stat, int amount, int permanent) max = cur; if (max != creature_ptr->stat_max[stat]) - res = TRUE; + res = true; } if (res) { @@ -167,10 +167,10 @@ bool res_stat(player_type *creature_ptr, int stat) creature_ptr->stat_cur[stat] = creature_ptr->stat_max[stat]; creature_ptr->update |= (PU_BONUS); creature_ptr->redraw |= (PR_STATS); - return TRUE; + return true; } - return FALSE; + return false; } /* @@ -178,45 +178,45 @@ bool res_stat(player_type *creature_ptr, int stat) */ bool do_dec_stat(player_type *creature_ptr, int stat) { - bool sust = FALSE; + bool sust = false; switch (stat) { case A_STR: if (has_sustain_str(creature_ptr)) - sust = TRUE; + sust = true; break; case A_INT: if (has_sustain_int(creature_ptr)) - sust = TRUE; + sust = true; break; case A_WIS: if (has_sustain_wis(creature_ptr)) - sust = TRUE; + sust = true; break; case A_DEX: if (has_sustain_dex(creature_ptr)) - sust = TRUE; + sust = true; break; case A_CON: if (has_sustain_con(creature_ptr)) - sust = TRUE; + sust = true; break; case A_CHR: if (has_sustain_chr(creature_ptr)) - sust = TRUE; + sust = true; break; } if (sust && (!ironman_nightmare || randint0(13))) { msg_format(_("%sなった気がしたが、すぐに元に戻った。", "You feel %s for a moment, but the feeling passes."), desc_stat_neg[stat]); - return TRUE; + return true; } if (dec_stat(creature_ptr, stat, 10, (ironman_nightmare && !randint0(13)))) { msg_format(_("ひどく%sなった気がする。", "You feel %s."), desc_stat_neg[stat]); - return TRUE; + return true; } - return FALSE; + return false; } /* @@ -226,10 +226,10 @@ bool do_res_stat(player_type *creature_ptr, int stat) { if (res_stat(creature_ptr, stat)) { msg_format(_("元通りに%sなった気がする。", "You feel %s."), desc_stat_pos[stat]); - return TRUE; + return true; } - return FALSE; + return false; } /* @@ -249,15 +249,15 @@ bool do_inc_stat(player_type *creature_ptr, int stat) chg_virtue(creature_ptr, V_VITALITY, 1); msg_format(_("ワーオ！とても%sなった！", "Wow! You feel %s!"), desc_stat_pos[stat]); - return TRUE; + return true; } if (res) { msg_format(_("元通りに%sなった気がする。", "You feel %s."), desc_stat_pos[stat]); - return TRUE; + return true; } - return FALSE; + return false; } /* @@ -281,5 +281,5 @@ bool lose_all_info(player_type *creature_ptr) set_bits(creature_ptr->update, PU_BONUS | PU_COMBINE | PU_REORDER); set_bits(creature_ptr->window_flags, PW_INVEN | PW_EQUIP | PW_PLAYER | PW_FLOOR_ITEM_LIST); wiz_dark(creature_ptr); - return TRUE; + return true; } diff --git a/src/status/body-improvement.cpp b/src/status/body-improvement.cpp index 87a6d4c28..d18d73fa2 100644 --- a/src/status/body-improvement.cpp +++ b/src/status/body-improvement.cpp @@ -21,24 +21,24 @@ */ bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->protevil && !do_dec) { if (creature_ptr->protevil > v) - return FALSE; + return false; } else if (!creature_ptr->protevil) { msg_print(_("邪悪なる存在から守られているような感じがする！", "You feel safe from evil!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->protevil) { msg_print(_("邪悪なる存在から守られている感じがなくなった。", "You no longer feel safe from evil.")); - notice = TRUE; + notice = true; } } @@ -46,13 +46,13 @@ bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -63,19 +63,19 @@ bool set_protevil(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->invuln && !do_dec) { if (creature_ptr->invuln > v) - return FALSE; + return false; } else if (!is_invuln(creature_ptr)) { msg_print(_("無敵だ！", "Invulnerability!")); - notice = TRUE; + notice = true; chg_virtue(creature_ptr, V_UNLIFE, -2); chg_virtue(creature_ptr, V_HONOUR, -2); @@ -90,7 +90,7 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) } else { if (creature_ptr->invuln && !music_singing(creature_ptr, MUSIC_INVULN)) { msg_print(_("無敵ではなくなった。", "The invulnerability wears off.")); - notice = TRUE; + notice = true; creature_ptr->redraw |= (PR_MAP); creature_ptr->update |= (PU_MONSTERS); @@ -105,14 +105,14 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -123,24 +123,24 @@ bool set_invuln(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_tim_regen(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_regen && !do_dec) { if (creature_ptr->tim_regen > v) - return FALSE; + return false; } else if (!creature_ptr->tim_regen) { msg_print(_("回復力が上がった！", "You feel yourself regenerating quickly!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_regen) { msg_print(_("素早く回復する感じがなくなった。", "You feel you are no longer regenerating quickly.")); - notice = TRUE; + notice = true; } } @@ -148,14 +148,14 @@ bool set_tim_regen(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -166,24 +166,24 @@ bool set_tim_regen(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_tim_reflect(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_reflect && !do_dec) { if (creature_ptr->tim_reflect > v) - return FALSE; + return false; } else if (!creature_ptr->tim_reflect) { msg_print(_("体の表面が滑かになった気がする。", "Your body becames smooth.")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_reflect) { msg_print(_("体の表面が滑かでなくなった。", "Your body is no longer smooth.")); - notice = TRUE; + notice = true; } } @@ -191,14 +191,14 @@ bool set_tim_reflect(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -209,24 +209,24 @@ bool set_tim_reflect(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_pass_wall(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_pass_wall && !do_dec) { if (creature_ptr->tim_pass_wall > v) - return FALSE; + return false; } else if (!creature_ptr->tim_pass_wall) { msg_print(_("体が半物質の状態になった。", "You became ethereal.")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_pass_wall) { msg_print(_("体が物質化した。", "You are no longer ethereal.")); - notice = TRUE; + notice = true; } } @@ -234,12 +234,12 @@ bool set_pass_wall(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/status/buff-setter.cpp b/src/status/buff-setter.cpp index f563bb066..9d3e3c95c 100644 --- a/src/status/buff-setter.cpp +++ b/src/status/buff-setter.cpp @@ -76,8 +76,8 @@ void reset_tim_flags(player_type *creature_ptr) creature_ptr->word_recall = 0; creature_ptr->alter_reality = 0; - creature_ptr->sutemi = FALSE; - creature_ptr->counter = FALSE; + creature_ptr->sutemi = false; + creature_ptr->counter = false; creature_ptr->ele_attack = 0; creature_ptr->ele_immune = 0; creature_ptr->special_attack = 0L; @@ -86,7 +86,7 @@ void reset_tim_flags(player_type *creature_ptr) while (creature_ptr->energy_need < 0) creature_ptr->energy_need += ENERGY_NEED(); - creature_ptr->timewalk = FALSE; + creature_ptr->timewalk = false; if (creature_ptr->riding) { (void)set_monster_fast(creature_ptr, creature_ptr->riding, 0); @@ -108,38 +108,38 @@ void reset_tim_flags(player_type *creature_ptr) */ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->fast && !do_dec) { if (creature_ptr->fast > v) - return FALSE; + return false; } else if (!is_fast(creature_ptr) && !creature_ptr->lightspeed) { msg_print(_("素早く動けるようになった！", "You feel yourself moving much faster!")); - notice = TRUE; + notice = true; chg_virtue(creature_ptr, V_PATIENCE, -1); chg_virtue(creature_ptr, V_DILIGENCE, 1); } } else { if (creature_ptr->fast && !creature_ptr->lightspeed && !music_singing(creature_ptr, MUSIC_SPEED) && !music_singing(creature_ptr, MUSIC_SHERO)) { msg_print(_("動きの素早さがなくなったようだ。", "You feel yourself slow down.")); - notice = TRUE; + notice = true; } } creature_ptr->fast = v; if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -150,24 +150,24 @@ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->shield && !do_dec) { if (creature_ptr->shield > v) - return FALSE; + return false; } else if (!creature_ptr->shield) { msg_print(_("肌が石になった。", "Your skin turns to stone.")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->shield) { msg_print(_("肌が元に戻った。", "Your skin returns to normal.")); - notice = TRUE; + notice = true; } } @@ -175,13 +175,13 @@ bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -192,24 +192,24 @@ bool set_shield(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->magicdef && !do_dec) { if (creature_ptr->magicdef > v) - return FALSE; + return false; } else if (!creature_ptr->magicdef) { msg_print(_("魔法の防御力が増したような気がする。", "You feel more resistant to magic.")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->magicdef) { msg_print(_("魔法の防御力が元に戻った。", "You feel less resistant to magic.")); - notice = TRUE; + notice = true; } } @@ -217,13 +217,13 @@ bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -234,24 +234,24 @@ bool set_magicdef(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->blessed && !do_dec) { if (creature_ptr->blessed > v) - return FALSE; + return false; } else if (!is_blessed(creature_ptr)) { msg_print(_("高潔な気分になった！", "You feel righteous!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->blessed && !music_singing(creature_ptr, MUSIC_BLESS)) { msg_print(_("高潔な気分が消え失せた。", "The prayer has expired.")); - notice = TRUE; + notice = true; } } @@ -259,13 +259,13 @@ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -276,24 +276,24 @@ bool set_blessed(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->hero && !do_dec) { if (creature_ptr->hero > v) - return FALSE; + return false; } else if (!is_hero(creature_ptr)) { msg_print(_("ヒーローになった気がする！", "You feel like a hero!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->hero && !music_singing(creature_ptr, MUSIC_HERO) && !music_singing(creature_ptr, MUSIC_SHERO)) { msg_print(_("ヒーローの気分が消え失せた。", "The heroism wears off.")); - notice = TRUE; + notice = true; } } @@ -301,14 +301,14 @@ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->update |= (PU_HP); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -320,20 +320,20 @@ bool set_hero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_mimic && (creature_ptr->mimic_form == p) && !do_dec) { if (creature_ptr->tim_mimic > v) - return FALSE; + return false; } else if ((!creature_ptr->tim_mimic) || (creature_ptr->mimic_form != p)) { msg_print(_("自分の体が変わってゆくのを感じた。", "You feel that your body changes.")); creature_ptr->mimic_form = p; - notice = TRUE; + notice = true; } } @@ -343,14 +343,14 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool if (creature_ptr->mimic_form == MIMIC_DEMON) set_oppose_fire(creature_ptr, 0, TRUE); creature_ptr->mimic_form = 0; - notice = TRUE; + notice = true; p = 0; } } creature_ptr->tim_mimic = v; if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, TRUE); @@ -359,7 +359,7 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool creature_ptr->update |= (PU_BONUS | PU_HP); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -370,29 +370,29 @@ bool set_mimic(player_type *creature_ptr, TIME_EFFECT v, MIMIC_RACE_IDX p, bool */ bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (creature_ptr->pclass == CLASS_BERSERKER) { v = 1; - return FALSE; + return false; } if (v) { if (creature_ptr->shero && !do_dec) { if (creature_ptr->shero > v) - return FALSE; + return false; } else if (!creature_ptr->shero) { msg_print(_("殺戮マシーンになった気がする！", "You feel like a killing machine!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->shero) { msg_print(_("野蛮な気持ちが消え失せた。", "You feel less berserk.")); - notice = TRUE; + notice = true; } } @@ -400,14 +400,14 @@ bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->update |= (PU_HP); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -418,19 +418,19 @@ bool set_shero(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->wraith_form && !do_dec) { if (creature_ptr->wraith_form > v) - return FALSE; + return false; } else if (!creature_ptr->wraith_form) { msg_print(_("物質界を離れて幽鬼のような存在になった！", "You leave the physical world and turn into a wraith-being!")); - notice = TRUE; + notice = true; chg_virtue(creature_ptr, V_UNLIFE, 3); chg_virtue(creature_ptr, V_HONOUR, -2); chg_virtue(creature_ptr, V_SACRIFICE, -2); @@ -444,7 +444,7 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) } else { if (creature_ptr->wraith_form) { msg_print(_("不透明になった感じがする。", "You feel opaque.")); - notice = TRUE; + notice = true; creature_ptr->redraw |= (PR_MAP); creature_ptr->update |= (PU_MONSTERS); @@ -457,13 +457,13 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -474,19 +474,19 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tsuyoshi && !do_dec) { if (creature_ptr->tsuyoshi > v) - return FALSE; + return false; } else if (!creature_ptr->tsuyoshi) { msg_print(_("「オクレ兄さん！」", "Brother OKURE!")); - notice = TRUE; + notice = true; chg_virtue(creature_ptr, V_VITALITY, 2); } } else { @@ -496,7 +496,7 @@ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) (void)dec_stat(creature_ptr, A_CON, 20, TRUE); (void)dec_stat(creature_ptr, A_STR, 20, TRUE); - notice = TRUE; + notice = true; chg_virtue(creature_ptr, V_VITALITY, -3); } } @@ -505,12 +505,12 @@ bool set_tsuyoshi(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->update |= (PU_HP); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/status/element-resistance.cpp b/src/status/element-resistance.cpp index 5d6dfaf9b..aa874c48b 100644 --- a/src/status/element-resistance.cpp +++ b/src/status/element-resistance.cpp @@ -18,36 +18,36 @@ */ bool set_oppose_acid(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->oppose_acid && !do_dec) { if (creature_ptr->oppose_acid > v) - return FALSE; + return false; } else if (!is_oppose_acid(creature_ptr)) { msg_print(_("酸への耐性がついた気がする！", "You feel resistant to acid!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->oppose_acid && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU)) { msg_print(_("酸への耐性が薄れた気がする。", "You feel less resistant to acid.")); - notice = TRUE; + notice = true; } } creature_ptr->oppose_acid = v; if (!notice) - return FALSE; + return false; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -58,37 +58,37 @@ bool set_oppose_acid(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_oppose_elec(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->oppose_elec && !do_dec) { if (creature_ptr->oppose_elec > v) - return FALSE; + return false; } else if (!is_oppose_elec(creature_ptr)) { msg_print(_("電撃への耐性がついた気がする！", "You feel resistant to electricity!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->oppose_elec && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU)) { msg_print(_("電撃への耐性が薄れた気がする。", "You feel less resistant to electricity.")); - notice = TRUE; + notice = true; } } creature_ptr->oppose_elec = v; if (!notice) - return FALSE; + return false; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -99,38 +99,38 @@ bool set_oppose_elec(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if ((is_specific_player_race(creature_ptr, RACE_BALROG) && (creature_ptr->lev > 44)) || (creature_ptr->mimic_form == MIMIC_DEMON)) v = 1; if (v) { if (creature_ptr->oppose_fire && !do_dec) { if (creature_ptr->oppose_fire > v) - return FALSE; + return false; } else if (!is_oppose_fire(creature_ptr)) { msg_print(_("火への耐性がついた気がする！", "You feel resistant to fire!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->oppose_fire && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU)) { msg_print(_("火への耐性が薄れた気がする。", "You feel less resistant to fire.")); - notice = TRUE; + notice = true; } } creature_ptr->oppose_fire = v; if (!notice) - return FALSE; + return false; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -141,36 +141,36 @@ bool set_oppose_fire(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->oppose_cold && !do_dec) { if (creature_ptr->oppose_cold > v) - return FALSE; + return false; } else if (!is_oppose_cold(creature_ptr)) { msg_print(_("冷気への耐性がついた気がする！", "You feel resistant to cold!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->oppose_cold && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU)) { msg_print(_("冷気への耐性が薄れた気がする。", "You feel less resistant to cold.")); - notice = TRUE; + notice = true; } } creature_ptr->oppose_cold = v; if (!notice) - return FALSE; + return false; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -181,37 +181,37 @@ bool set_oppose_cold(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_oppose_pois(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if ((creature_ptr->pclass == CLASS_NINJA) && (creature_ptr->lev > 44)) v = 1; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->oppose_pois && !do_dec) { if (creature_ptr->oppose_pois > v) - return FALSE; + return false; } else if (!is_oppose_pois(creature_ptr)) { msg_print(_("毒への耐性がついた気がする！", "You feel resistant to poison!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->oppose_pois && !music_singing(creature_ptr, MUSIC_RESIST) && !(creature_ptr->special_defense & KATA_MUSOU)) { msg_print(_("毒への耐性が薄れた気がする。", "You feel less resistant to poison.")); - notice = TRUE; + notice = true; } } creature_ptr->oppose_pois = v; if (!notice) - return FALSE; + return false; creature_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(creature_ptr, FALSE, FALSE); handle_stuff(creature_ptr); - return TRUE; + return true; } bool is_oppose_acid(player_type *creature_ptr) diff --git a/src/status/experience.cpp b/src/status/experience.cpp index 3bf7e3486..7ad61e34f 100644 --- a/src/status/experience.cpp +++ b/src/status/experience.cpp @@ -51,10 +51,10 @@ bool restore_level(player_type *creature_ptr) msg_print(_("経験値が戻ってきた気がする。", "You feel your experience returning.")); creature_ptr->exp = creature_ptr->max_exp; check_experience(creature_ptr); - return TRUE; + return true; } - return FALSE; + return false; } /* @@ -64,11 +64,11 @@ bool restore_level(player_type *creature_ptr) bool drain_exp(player_type *creature_ptr, s32b drain, s32b slip, int hold_exp_prob) { if (creature_ptr->prace == RACE_ANDROID) - return FALSE; + return false; if (creature_ptr->hold_exp && (randint0(100) < hold_exp_prob)) { msg_print(_("しかし自己の経験値を守りきった！", "You keep hold of your experience!")); - return FALSE; + return false; } if (creature_ptr->hold_exp) { @@ -79,5 +79,5 @@ bool drain_exp(player_type *creature_ptr, s32b drain, s32b slip, int hold_exp_pr lose_exp(creature_ptr, drain); } - return TRUE; + return true; } diff --git a/src/status/sight-setter.cpp b/src/status/sight-setter.cpp index cc8fcd965..cc24032b7 100644 --- a/src/status/sight-setter.cpp +++ b/src/status/sight-setter.cpp @@ -18,24 +18,24 @@ */ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_esp && !do_dec) { if (creature_ptr->tim_esp > v) - return FALSE; + return false; } else if (!is_time_limit_esp(creature_ptr)) { msg_print(_("意識が広がった気がする！", "You feel your consciousness expand!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_esp && !music_singing(creature_ptr, MUSIC_MIND)) { msg_print(_("意識は元に戻った。", "Your consciousness contracts again.")); - notice = TRUE; + notice = true; } } @@ -43,14 +43,14 @@ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->update |= (PU_MONSTERS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -61,24 +61,24 @@ bool set_tim_esp(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_tim_invis(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_invis && !do_dec) { if (creature_ptr->tim_invis > v) - return FALSE; + return false; } else if (!creature_ptr->tim_invis) { msg_print(_("目が非常に敏感になった気がする！", "Your eyes feel very sensitive!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_invis) { msg_print(_("目の敏感さがなくなったようだ。", "Your eyes feel less sensitive.")); - notice = TRUE; + notice = true; } } @@ -86,14 +86,14 @@ bool set_tim_invis(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->update |= (PU_MONSTERS); handle_stuff(creature_ptr); - return TRUE; + return true; } /*! @@ -104,24 +104,24 @@ bool set_tim_invis(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) */ bool set_tim_infra(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_infra && !do_dec) { if (creature_ptr->tim_infra > v) - return FALSE; + return false; } else if (!creature_ptr->tim_infra) { msg_print(_("目がランランと輝き始めた！", "Your eyes begin to tingle!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_infra) { msg_print(_("目の輝きがなくなった。", "Your eyes stop tingling.")); - notice = TRUE; + notice = true; } } @@ -129,12 +129,12 @@ bool set_tim_infra(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); creature_ptr->update |= (PU_MONSTERS); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/status/temporary-resistance.cpp b/src/status/temporary-resistance.cpp index 5be6748c0..23a82c449 100644 --- a/src/status/temporary-resistance.cpp +++ b/src/status/temporary-resistance.cpp @@ -15,24 +15,24 @@ */ bool set_tim_levitation(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_levitation && !do_dec) { if (creature_ptr->tim_levitation > v) - return FALSE; + return false; } else if (!creature_ptr->tim_levitation) { msg_print(_("体が宙に浮き始めた。", "You begin to fly!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_levitation) { msg_print(_("もう宙に浮かべなくなった。", "You stop flying.")); - notice = TRUE; + notice = true; } } @@ -40,37 +40,37 @@ bool set_tim_levitation(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } bool set_ultimate_res(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->ult_res && !do_dec) { if (creature_ptr->ult_res > v) - return FALSE; + return false; } else if (!creature_ptr->ult_res) { msg_print(_("あらゆることに対して耐性がついた気がする！", "You feel resistant!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->ult_res) { msg_print(_("あらゆることに対する耐性が薄れた気がする。", "You feel less resistant")); - notice = TRUE; + notice = true; } } @@ -78,38 +78,38 @@ bool set_ultimate_res(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } bool set_tim_res_nether(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_res_nether && !do_dec) { if (creature_ptr->tim_res_nether > v) - return FALSE; + return false; } else if (!creature_ptr->tim_res_nether) { msg_print(_("地獄の力に対して耐性がついた気がする！", "You feel nether-resistant!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_res_nether) { msg_print(_("地獄の力に対する耐性が薄れた気がする。", "You feel less nether-resistant")); - notice = TRUE; + notice = true; } } @@ -117,45 +117,45 @@ bool set_tim_res_nether(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } bool set_tim_res_time(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) { - bool notice = FALSE; + bool notice = false; v = (v > 10000) ? 10000 : (v < 0) ? 0 : v; if (creature_ptr->is_dead) - return FALSE; + return false; if (v) { if (creature_ptr->tim_res_time && !do_dec) { if (creature_ptr->tim_res_time > v) - return FALSE; + return false; } else if (!creature_ptr->tim_res_time) { msg_print(_("時間逆転の力に対して耐性がついた気がする！", "You feel time-resistant!")); - notice = TRUE; + notice = true; } } else { if (creature_ptr->tim_res_time) { msg_print(_("時間逆転の力に対する耐性が薄れた気がする。", "You feel less time-resistant")); - notice = TRUE; + notice = true; } } creature_ptr->tim_res_time = v; creature_ptr->redraw |= (PR_STATUS); if (!notice) - return FALSE; + return false; if (disturb_state) disturb(creature_ptr, FALSE, FALSE); creature_ptr->update |= (PU_BONUS); handle_stuff(creature_ptr); - return TRUE; + return true; } diff --git a/src/store/black-market.cpp b/src/store/black-market.cpp index 97d372f5d..225490cb1 100644 --- a/src/store/black-market.cpp +++ b/src/store/black-market.cpp @@ -21,16 +21,16 @@ bool black_market_crap(player_type *player_ptr, object_type *o_ptr) { if (object_is_ego(o_ptr)) - return FALSE; + return false; if (o_ptr->to_a > 0) - return FALSE; + return false; if (o_ptr->to_h > 0) - return FALSE; + return false; if (o_ptr->to_d > 0) - return FALSE; + return false; for (int i = 0; i < MAX_STORES; i++) { if (i == STORE_HOME) @@ -41,9 +41,9 @@ bool black_market_crap(player_type *player_ptr, object_type *o_ptr) for (int j = 0; j < town_info[player_ptr->town_num].store[i].stock_num; j++) { object_type *j_ptr = &town_info[player_ptr->town_num].store[i].stock[j]; if (o_ptr->k_idx == j_ptr->k_idx) - return TRUE; + return true; } } - return FALSE; + return false; } diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp index 38d1e330d..fe2618a57 100644 --- a/src/store/cmd-store.cpp +++ b/src/store/cmd-store.cpp @@ -104,7 +104,7 @@ void do_cmd_store(player_type *player_ptr) command_arg = 0; command_rep = 0; command_new = 0; - get_com_no_macros = TRUE; + get_com_no_macros = true; cur_store_num = which; cur_store_feat = g_ptr->feat; st_ptr = &town_info[player_ptr->town_num].store[cur_store_num]; @@ -112,7 +112,7 @@ void do_cmd_store(player_type *player_ptr) store_top = 0; play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_BUILD); display_store(player_ptr); - leave_store = FALSE; + leave_store = false; while (!leave_store) { prt("", 1, 0); @@ -147,7 +147,7 @@ void do_cmd_store(player_type *player_ptr) request_command(player_ptr, TRUE); store_process_command(player_ptr); - bool need_redraw_store_inv = (player_ptr->update & PU_BONUS) ? TRUE : FALSE; + bool need_redraw_store_inv = (player_ptr->update & PU_BONUS) ? TRUE : false; current_world_ptr->character_icky_depth = 1; handle_stuff(player_ptr); if (player_ptr->inventory_list[INVEN_PACK].k_idx) { @@ -159,10 +159,10 @@ void do_cmd_store(player_type *player_ptr) else msg_print(_("ザックからアイテムがあふれそうなので、あわてて店から出た...", "Your pack is so full that you flee the store...")); - leave_store = TRUE; + leave_store = true; } else if (!store_check_num(o_ptr)) { msg_print(_("ザックからアイテムがあふれそうなので、あわてて家から出た...", "Your pack is so full that you flee your home...")); - leave_store = TRUE; + leave_store = true; } else { int item_pos; object_type forge; @@ -188,7 +188,7 @@ void do_cmd_store(player_type *player_ptr) display_store_inventory(player_ptr); if (st_ptr->store_open >= current_world_ptr->game_turn) - leave_store = TRUE; + leave_store = true; } // 現在地の偽装を解除。 @@ -198,8 +198,8 @@ void do_cmd_store(player_type *player_ptr) PlayerEnergy(player_ptr).set_player_turn_energy(100); current_world_ptr->character_icky_depth = 0; command_new = 0; - command_see = FALSE; - get_com_no_macros = FALSE; + command_see = false; + get_com_no_macros = false; msg_erase(); term_clear(); diff --git a/src/store/home.cpp b/src/store/home.cpp index eb561ecc6..9562e2b8d 100644 --- a/src/store/home.cpp +++ b/src/store/home.cpp @@ -28,8 +28,8 @@ int home_carry(player_type *player_ptr, object_type *o_ptr) bool old_stack_force_notes = stack_force_notes; bool old_stack_force_costs = stack_force_costs; if (cur_store_num != STORE_HOME) { - stack_force_notes = FALSE; - stack_force_costs = FALSE; + stack_force_notes = false; + stack_force_costs = false; } for (int slot = 0; slot < st_ptr->stock_num; slot++) { @@ -85,7 +85,7 @@ int home_carry(player_type *player_ptr, object_type *o_ptr) static bool exe_combine_store_items(object_type *o_ptr, object_type *j_ptr, const int max_num, const int i, bool *combined) { if (o_ptr->number + j_ptr->number > max_num) - return FALSE; + return false; object_absorb(j_ptr, o_ptr); st_ptr->stock_num--; @@ -94,8 +94,8 @@ static bool exe_combine_store_items(object_type *o_ptr, object_type *j_ptr, cons st_ptr->stock[k] = st_ptr->stock[k + 1]; (&st_ptr->stock[k])->wipe(); - *combined = TRUE; - return TRUE; + *combined = true; + return true; } static void sweep_reorder_store_item(object_type *o_ptr, const int i, bool *combined) @@ -124,7 +124,7 @@ static void sweep_reorder_store_item(object_type *o_ptr, const int i, bool *comb o_ptr->pval = o_ptr->pval * remain / old_num; } - *combined = TRUE; + *combined = true; break; } } @@ -146,7 +146,7 @@ static void exe_reorder_store_item(player_type *player_ptr, bool *flag) if (j >= i) continue; - *flag = TRUE; + *flag = true; object_type *j_ptr; object_type forge; j_ptr = &forge; @@ -170,15 +170,15 @@ bool combine_and_reorder_home(player_type *player_ptr, const int store_num) bool old_stack_force_costs = stack_force_costs; store_type *old_st_ptr = st_ptr; st_ptr = &town_info[1].store[store_num]; - bool flag = FALSE; + bool flag = false; if (store_num != STORE_HOME) { - stack_force_notes = FALSE; - stack_force_costs = FALSE; + stack_force_notes = false; + stack_force_costs = false; } - bool combined = TRUE; + bool combined = true; while (combined) { - combined = FALSE; + combined = false; for (int i = st_ptr->stock_num - 1; i > 0; i--) { object_type *o_ptr; o_ptr = &st_ptr->stock[i]; diff --git a/src/store/rumor.cpp b/src/store/rumor.cpp index 57263ede3..f72821bb1 100644 --- a/src/store/rumor.cpp +++ b/src/store/rumor.cpp @@ -65,7 +65,7 @@ void display_rumor(player_type *player_ptr, bool ex) if (strcmp(zz[0], "ARTIFACT") == 0) { ARTIFACT_IDX a_idx; artifact_type *a_ptr; - while (TRUE) { + while (true) { a_idx = rumor_num(zz[1], max_a_idx); a_ptr = &a_info[a_idx]; @@ -82,7 +82,7 @@ void display_rumor(player_type *player_ptr, bool ex) describe_flavor(player_ptr, fullname, q_ptr, OD_NAME_ONLY); } else if (strcmp(zz[0], "MONSTER") == 0) { monster_race *r_ptr; - while (TRUE) { + while (true) { MONRACE_IDX r_idx = rumor_num(zz[1], max_r_idx); r_ptr = &r_info[r_idx]; if (!r_ptr->name.empty()) @@ -97,7 +97,7 @@ void display_rumor(player_type *player_ptr, bool ex) } else if (strcmp(zz[0], "DUNGEON") == 0) { DUNGEON_IDX d_idx; dungeon_type *d_ptr; - while (TRUE) { + while (true) { d_idx = rumor_num(zz[1], current_world_ptr->max_d_idx); d_ptr = &d_info[d_idx]; if (!d_ptr->name.empty()) @@ -112,7 +112,7 @@ void display_rumor(player_type *player_ptr, bool ex) } } else if (strcmp(zz[0], "TOWN") == 0) { IDX t_idx; - while (TRUE) { + while (true) { t_idx = rumor_num(zz[1], NO_TOWN); if (town_info[t_idx].name[0] != '\0') break; diff --git a/src/store/service-checker.cpp b/src/store/service-checker.cpp index f35ce53b1..f6e5fbbda 100644 --- a/src/store/service-checker.cpp +++ b/src/store/service-checker.cpp @@ -50,9 +50,9 @@ static bool check_store_general(object_type *o_ptr) case TV_STATUE: case TV_CAPTURE: case TV_CARD: - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -68,9 +68,9 @@ static bool check_store_armoury(object_type *o_ptr) case TV_SOFT_ARMOR: case TV_HARD_ARMOR: case TV_DRAG_ARMOR: - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -85,11 +85,11 @@ static bool check_store_weapon(object_type *o_ptr) case TV_POLEARM: case TV_SWORD: case TV_HISSATSU_BOOK: - return TRUE; + return true; case TV_HAFTED: return o_ptr->sval != SV_WIZSTAFF; default: - return FALSE; + return false; } } @@ -101,23 +101,23 @@ static bool check_store_temple(player_type *player_ptr, object_type *o_ptr) case TV_SCROLL: case TV_POTION: case TV_HAFTED: - return TRUE; + return true; case TV_FIGURINE: case TV_STATUE: { monster_race *r_ptr = &r_info[o_ptr->pval]; if (!(r_ptr->flags3 & RF3_EVIL)) if (((r_ptr->flags3 & RF3_GOOD) != 0) || ((r_ptr->flags3 & RF3_ANIMAL) != 0) || (angband_strchr("?!", r_ptr->d_char) != NULL)) - return TRUE; + return true; } /* Fall through */ case TV_POLEARM: case TV_SWORD: if (is_blessed_item(player_ptr, o_ptr)) - return TRUE; + return true; /* Fall through */ default: - return FALSE; + return false; } } @@ -126,9 +126,9 @@ static bool check_store_alchemist(object_type *o_ptr) switch (o_ptr->tval) { case TV_SCROLL: case TV_POTION: - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -153,11 +153,11 @@ static bool check_store_magic(object_type *o_ptr) case TV_SCROLL: case TV_POTION: case TV_FIGURINE: - return TRUE; + return true; case TV_HAFTED: return o_ptr->sval == SV_WIZSTAFF; default: - return FALSE; + return false; } } @@ -176,9 +176,9 @@ static bool check_store_book(object_type *o_ptr) case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HEX_BOOK: - return TRUE; + return true; default: - return FALSE; + return false; } } @@ -200,7 +200,7 @@ static bool switch_store_check(player_type *player_ptr, object_type *o_ptr) case STORE_BOOK: return check_store_book(o_ptr); default: - return TRUE; + return true; } } @@ -215,10 +215,10 @@ static bool switch_store_check(player_type *player_ptr, object_type *o_ptr) bool store_will_buy(player_type *player_ptr, object_type *o_ptr) { if ((cur_store_num == STORE_HOME) || (cur_store_num == STORE_MUSEUM)) - return TRUE; + return true; if (!switch_store_check(player_ptr, o_ptr)) - return FALSE; + return false; return object_value(player_ptr, o_ptr) > 0; } diff --git a/src/store/store-key-processor.cpp b/src/store/store-key-processor.cpp index 55745a9c9..ee478b901 100644 --- a/src/store/store-key-processor.cpp +++ b/src/store/store-key-processor.cpp @@ -36,7 +36,7 @@ #include "window/display-sub-windows.h" /* Set this to leave the store */ -bool leave_store = FALSE; +bool leave_store = false; /*! * @brief 店舗処理コマンド選択のメインルーチン / @@ -58,7 +58,7 @@ void store_process_command(player_type *client_ptr) switch (command_cmd) { case ESCAPE: { - leave_store = TRUE; + leave_store = true; break; } case '-': { diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp index 4d55a182b..fae45b224 100644 --- a/src/store/store-util.cpp +++ b/src/store/store-util.cpp @@ -204,61 +204,61 @@ void store_create( bool store_object_similar(object_type *o_ptr, object_type *j_ptr) { if (o_ptr == j_ptr) - return FALSE; + return false; if (o_ptr->k_idx != j_ptr->k_idx) - return FALSE; + return false; if ((o_ptr->pval != j_ptr->pval) && (o_ptr->tval != TV_WAND) && (o_ptr->tval != TV_ROD)) - return FALSE; + return false; if (o_ptr->to_h != j_ptr->to_h) - return FALSE; + return false; if (o_ptr->to_d != j_ptr->to_d) - return FALSE; + return false; if (o_ptr->to_a != j_ptr->to_a) - return FALSE; + return false; if (o_ptr->name2 != j_ptr->name2) - return FALSE; + return false; if (object_is_artifact(o_ptr) || object_is_artifact(j_ptr)) - return FALSE; + return false; for (int i = 0; i < TR_FLAG_SIZE; i++) if (o_ptr->art_flags[i] != j_ptr->art_flags[i]) - return FALSE; + return false; if (o_ptr->xtra1 || j_ptr->xtra1) - return FALSE; + return false; if (o_ptr->timeout || j_ptr->timeout) - return FALSE; + return false; if (o_ptr->ac != j_ptr->ac) - return FALSE; + return false; if (o_ptr->dd != j_ptr->dd) - return FALSE; + return false; if (o_ptr->ds != j_ptr->ds) - return FALSE; + return false; if (o_ptr->tval == TV_CHEST) - return FALSE; + return false; if (o_ptr->tval == TV_STATUE) - return FALSE; + return false; if (o_ptr->tval == TV_CAPTURE) - return FALSE; + return false; if (o_ptr->discount != j_ptr->discount) - return FALSE; + return false; - return TRUE; + return true; } /*! diff --git a/src/store/store.cpp b/src/store/store.cpp index f05cd613c..6846e70da 100644 --- a/src/store/store.cpp +++ b/src/store/store.cpp @@ -47,7 +47,7 @@ s16b inner_town_num = 0; int cur_store_feat; /* Enable "increments" */ -bool allow_inc = FALSE; +bool allow_inc = false; /*! * @brief 店舗の最大スロット数を返す @@ -108,8 +108,8 @@ int store_check_num(object_type *o_ptr) bool old_stack_force_notes = stack_force_notes; bool old_stack_force_costs = stack_force_costs; if (cur_store_num != STORE_HOME) { - stack_force_notes = FALSE; - stack_force_costs = FALSE; + stack_force_notes = false; + stack_force_costs = false; } for (int i = 0; i < st_ptr->stock_num; i++) { @@ -152,7 +152,7 @@ int store_check_num(object_type *o_ptr) int get_stock(COMMAND_CODE *com_val, concptr pmt, int i, int j) { if (repeat_pull(com_val) && (*com_val >= i) && (*com_val <= j)) - return TRUE; + return true; msg_print(NULL); *com_val = (-1); @@ -166,7 +166,7 @@ int get_stock(COMMAND_CODE *com_val, concptr pmt, int i, int j) #endif char command; - while (TRUE) { + while (true) { if (!get_com(out_val, &command, FALSE)) break; @@ -188,10 +188,10 @@ int get_stock(COMMAND_CODE *com_val, concptr pmt, int i, int j) prt("", 0, 0); if (command == ESCAPE) - return FALSE; + return false; repeat_push(*com_val); - return TRUE; + return true; } /*! @@ -248,7 +248,7 @@ void store_shuffle(player_type *player_ptr, int which) cur_store_num = which; st_ptr = &town_info[player_ptr->town_num].store[cur_store_num]; int j = st_ptr->owner; - while (TRUE) { + while (true) { st_ptr->owner = (byte)randint0(MAX_OWNERS); if (j == st_ptr->owner) continue; @@ -364,7 +364,7 @@ void store_init(int town_num, int store_num) { cur_store_num = store_num; st_ptr = &town_info[town_num].store[store_num]; - while (TRUE) { + while (true) { st_ptr->owner = (byte)randint0(MAX_OWNERS); int i; for (i = 1; i < max_towns; i++) { diff --git a/src/target/grid-selector.cpp b/src/target/grid-selector.cpp index 9833b209c..5cfb8c168 100644 --- a/src/target/grid-selector.cpp +++ b/src/target/grid-selector.cpp @@ -33,27 +33,27 @@ static bool tgt_pt_accept(player_type *creature_ptr, POSITION y, POSITION x) { floor_type *floor_ptr = creature_ptr->current_floor_ptr; if (!(in_bounds(floor_ptr, y, x))) - return FALSE; + return false; if ((y == creature_ptr->y) && (x == creature_ptr->x)) - return TRUE; + return true; if (creature_ptr->image) - return FALSE; + return false; grid_type *g_ptr; g_ptr = &floor_ptr->grid_array[y][x]; if (!(g_ptr->info & (CAVE_MARK))) - return FALSE; + return false; if (cave_has_flag_grid(g_ptr, FF_LESS) || cave_has_flag_grid(g_ptr, FF_MORE) || cave_has_flag_grid(g_ptr, FF_QUEST_ENTER) || cave_has_flag_grid(g_ptr, FF_QUEST_EXIT)) - return TRUE; + return true; if (cave_has_flag_grid(g_ptr, FF_STORE) || cave_has_flag_grid(g_ptr, FF_BLDG)) - return TRUE; + return true; - return FALSE; + return false; } /* @@ -187,13 +187,13 @@ bool tgt_pt(player_type *creature_ptr, POSITION *x_ptr, POSITION *y_ptr) tgt_pt_prepare(creature_ptr, info.ys, info.xs); msg_print(_("場所を選んでスペースキーを押して下さい。", "Select a point and press space.")); - msg_flag = FALSE; + msg_flag = false; info.ch = 0; info.n = 0; - bool success = FALSE; + bool success = false; while ((info.ch != ESCAPE) && !success) { - bool move_fast = FALSE; + bool move_fast = false; move_cursor_relative(info.y, info.x); info.ch = inkey(); switch (info.ch) { @@ -205,7 +205,7 @@ bool tgt_pt(player_type *creature_ptr, POSITION *x_ptr, POSITION *y_ptr) if (player_bold(creature_ptr, info.y, info.x)) info.ch = 0; else - success = TRUE; + success = true; break; case '>': case '<': @@ -237,14 +237,14 @@ bool tgt_pt(player_type *creature_ptr, POSITION *x_ptr, POSITION *y_ptr) if (player_bold(creature_ptr, info.y, info.x)) info.ch = 0; else - success = TRUE; + success = true; break; } } int d = get_keymap_dir(info.ch); if (isupper(info.ch)) - move_fast = TRUE; + move_fast = true; if (d == 0) break; diff --git a/src/target/projection-path-calculator.cpp b/src/target/projection-path-calculator.cpp index 5001ea3ad..f06d84d38 100644 --- a/src/target/projection-path-calculator.cpp +++ b/src/target/projection-path-calculator.cpp @@ -90,7 +90,7 @@ static void calc_frac(projection_path_type *pp_ptr, bool is_vertical) static void calc_projection_to_target(player_type *player_ptr, projection_path_type *pp_ptr, bool is_vertical) { floor_type *floor_ptr = player_ptr->current_floor_ptr; - while (TRUE) { + while (true) { pp_ptr->gp[pp_ptr->n++] = location_to_grid(pp_ptr->y, pp_ptr->x); if ((pp_ptr->n + (pp_ptr->k >> 1)) >= pp_ptr->range) break; @@ -130,7 +130,7 @@ static void calc_projection_to_target(player_type *player_ptr, projection_path_t static bool calc_vertical_projection(player_type *player_ptr, projection_path_type *pp_ptr) { if (pp_ptr->ay <= pp_ptr->ax) - return FALSE; + return false; pp_ptr->m = pp_ptr->ax * pp_ptr->ax * 2; pp_ptr->y = pp_ptr->y1 + pp_ptr->sy; @@ -143,13 +143,13 @@ static bool calc_vertical_projection(player_type *player_ptr, projection_path_ty } calc_projection_to_target(player_ptr, pp_ptr, TRUE); - return TRUE; + return true; } static bool calc_horizontal_projection(player_type *player_ptr, projection_path_type *pp_ptr) { if (pp_ptr->ax <= pp_ptr->ay) - return FALSE; + return false; pp_ptr->m = pp_ptr->ay * pp_ptr->ay * 2; pp_ptr->y = pp_ptr->y1; @@ -162,13 +162,13 @@ static bool calc_horizontal_projection(player_type *player_ptr, projection_path_ } calc_projection_to_target(player_ptr, pp_ptr, FALSE); - return TRUE; + return true; } static void calc_projection_others(player_type *player_ptr, projection_path_type *pp_ptr) { floor_type *floor_ptr = player_ptr->current_floor_ptr; - while (TRUE) { + while (true) { pp_ptr->gp[pp_ptr->n++] = location_to_grid(pp_ptr->y, pp_ptr->x); if ((pp_ptr->n + (pp_ptr->n >> 1)) >= pp_ptr->range) break; @@ -248,14 +248,14 @@ bool projectable(player_type *player_ptr, POSITION y1, POSITION x1, POSITION y2, u16b grid_g[512]; int grid_n = projection_path(player_ptr, grid_g, (project_length ? project_length : get_max_range(player_ptr)), y1, x1, y2, x2, 0); if (!grid_n) - return TRUE; + return true; POSITION y = get_grid_y(grid_g[grid_n - 1]); POSITION x = get_grid_x(grid_g[grid_n - 1]); if ((y != y2) || (x != x2)) - return FALSE; + return false; - return TRUE; + return true; } /*! diff --git a/src/target/target-checker.cpp b/src/target/target-checker.cpp index 5aa86a52c..a4fe1f95c 100644 --- a/src/target/target-checker.cpp +++ b/src/target/target-checker.cpp @@ -120,16 +120,16 @@ void verify_panel(player_type *creature_ptr) bool target_okay(player_type *creature_ptr) { if (target_who < 0) - return TRUE; + return true; if (target_who <= 0) - return FALSE; + return false; if (!target_able(creature_ptr, target_who)) - return FALSE; + return false; monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[target_who]; target_row = m_ptr->fy; target_col = m_ptr->fx; - return TRUE; + return true; } diff --git a/src/target/target-describer.cpp b/src/target/target-describer.cpp index f36a38073..7972d08fa 100644 --- a/src/target/target-describer.cpp +++ b/src/target/target-describer.cpp @@ -46,7 +46,7 @@ static const s16b CONTINUOUS_DESCRIPTION = 256; -bool show_gold_on_floor = FALSE; +bool show_gold_on_floor = false; // Examine grid typedef struct eg_type { @@ -75,7 +75,7 @@ static eg_type *initialize_eg_type(player_type *subject_ptr, eg_type *eg_ptr, PO { eg_ptr->y = y; eg_ptr->x = x; - eg_ptr->boring = TRUE; + eg_ptr->boring = true; eg_ptr->mode = mode; eg_ptr->info = info; eg_ptr->s1 = ""; @@ -188,16 +188,16 @@ static bool describe_grid_lore(player_type *subject_ptr, eg_type *eg_ptr) static void describe_grid_monster(player_type *subject_ptr, eg_type *eg_ptr) { - bool recall = FALSE; + bool recall = false; GAME_TEXT m_name[MAX_NLEN]; monster_desc(subject_ptr, m_name, eg_ptr->m_ptr, MD_INDEF_VISIBLE); - while (TRUE) { + while (true) { char acount[10]; if (recall) { if (describe_grid_lore(subject_ptr, eg_ptr)) return; - recall = FALSE; + recall = false; continue; } @@ -215,7 +215,7 @@ static void describe_grid_monster(player_type *subject_ptr, eg_type *eg_ptr) if (eg_ptr->query != 'r') return; - recall = TRUE; + recall = true; } } @@ -270,7 +270,7 @@ static s16b describe_grid(player_type *subject_ptr, eg_type *eg_ptr) if ((eg_ptr->g_ptr->m_idx == 0) || !subject_ptr->current_floor_ptr->m_list[eg_ptr->g_ptr->m_idx].ml) return CONTINUOUS_DESCRIPTION; - eg_ptr->boring = FALSE; + eg_ptr->boring = false; monster_race_track(subject_ptr, eg_ptr->m_ptr->ap_r_idx); health_track(subject_ptr, eg_ptr->g_ptr->m_idx); handle_stuff(subject_ptr); @@ -336,11 +336,11 @@ static s16b describe_footing_items(eg_type *eg_ptr) static char describe_footing_many_items(player_type *subject_ptr, eg_type *eg_ptr, int *min_width) { - while (TRUE) { + while (true) { screen_save(); - show_gold_on_floor = TRUE; + show_gold_on_floor = true; (void)show_floor_items(subject_ptr, 0, eg_ptr->y, eg_ptr->x, min_width, TV_NONE); - show_gold_on_floor = FALSE; + show_gold_on_floor = false; #ifdef JP sprintf(eg_ptr->out_val, "%s %d個のアイテム%s%s [Enterで次へ, %s]", eg_ptr->s1, (int)eg_ptr->floor_num, eg_ptr->s2, eg_ptr->s3, eg_ptr->info); #else @@ -368,7 +368,7 @@ static s16b loop_describing_grid(player_type *subject_ptr, eg_type *eg_ptr) return CONTINUOUS_DESCRIPTION; int min_width = 0; - while (TRUE) { + while (true) { s16b footing_description = describe_footing(subject_ptr, eg_ptr); if (within_char_util(footing_description)) return (char)footing_description; @@ -387,7 +387,7 @@ static s16b describe_footing_sight(player_type *subject_ptr, eg_type *eg_ptr, ob return CONTINUOUS_DESCRIPTION; GAME_TEXT o_name[MAX_NLEN]; - eg_ptr->boring = FALSE; + eg_ptr->boring = false; describe_flavor(subject_ptr, o_name, o_ptr, 0); #ifdef JP sprintf(eg_ptr->out_val, "%s%s%s%s[%s]", eg_ptr->s1, o_name, eg_ptr->s2, eg_ptr->s3, eg_ptr->info); diff --git a/src/target/target-getter.cpp b/src/target/target-getter.cpp index 95a479e26..b6dce15ea 100644 --- a/src/target/target-getter.cpp +++ b/src/target/target-getter.cpp @@ -85,7 +85,7 @@ bool get_aim_dir(player_type *creature_ptr, DIRECTION *dp) if (!dir) { project_length = 0; - return FALSE; + return false; } command_dir = dir; @@ -97,7 +97,7 @@ bool get_aim_dir(player_type *creature_ptr, DIRECTION *dp) *dp = dir; repeat_push((COMMAND_CODE)command_dir); - return TRUE; + return true; } bool get_direction(player_type *creature_ptr, DIRECTION *dp, bool allow_under, bool with_steed) @@ -130,7 +130,7 @@ bool get_direction(player_type *creature_ptr, DIRECTION *dp, bool allow_under, b dir = 0; if (!dir) - return FALSE; + return false; command_dir = dir; if (creature_ptr->confused) { @@ -167,7 +167,7 @@ bool get_direction(player_type *creature_ptr, DIRECTION *dp, bool allow_under, b *dp = dir; repeat_push((COMMAND_CODE)command_dir); - return TRUE; + return true; } /* @@ -215,7 +215,7 @@ bool get_rep_dir(player_type *creature_ptr, DIRECTION *dp, bool under) dir = 0; if (!dir) - return FALSE; + return false; command_dir = dir; if (creature_ptr->confused) { @@ -249,5 +249,5 @@ bool get_rep_dir(player_type *creature_ptr, DIRECTION *dp, bool under) *dp = dir; repeat_push((COMMAND_CODE)command_dir); - return TRUE; + return true; } diff --git a/src/target/target-preparation.cpp b/src/target/target-preparation.cpp index 94c813f24..2a81f5f05 100644 --- a/src/target/target-preparation.cpp +++ b/src/target/target-preparation.cpp @@ -43,21 +43,21 @@ bool target_able(player_type *creature_ptr, MONSTER_IDX m_idx) floor_type *floor_ptr = creature_ptr->current_floor_ptr; monster_type *m_ptr = &floor_ptr->m_list[m_idx]; if (!monster_is_valid(m_ptr)) - return FALSE; + return false; if (creature_ptr->image) - return FALSE; + return false; if (!m_ptr->ml) - return FALSE; + return false; if (creature_ptr->riding && (creature_ptr->riding == m_idx)) - return TRUE; + return true; if (!projectable(creature_ptr, creature_ptr->y, creature_ptr->x, m_ptr->fy, m_ptr->fx)) - return FALSE; + return false; - return TRUE; + return true; } /* @@ -67,38 +67,38 @@ static bool target_set_accept(player_type *creature_ptr, POSITION y, POSITION x) { floor_type *floor_ptr = creature_ptr->current_floor_ptr; if (!(in_bounds(floor_ptr, y, x))) - return FALSE; + return false; if (player_bold(creature_ptr, y, x)) - return TRUE; + return true; if (creature_ptr->image) - return FALSE; + return false; grid_type *g_ptr; g_ptr = &floor_ptr->grid_array[y][x]; if (g_ptr->m_idx) { monster_type *m_ptr = &floor_ptr->m_list[g_ptr->m_idx]; if (m_ptr->ml) - return TRUE; + return true; } for (const auto this_o_idx : g_ptr->o_idx_list) { object_type *o_ptr; o_ptr = &floor_ptr->o_list[this_o_idx]; if (o_ptr->marked & OM_FOUND) - return TRUE; + return true; } if (g_ptr->info & (CAVE_MARK)) { if (g_ptr->info & CAVE_OBJECT) - return TRUE; + return true; if (has_flag(f_info[get_feat_mimic(g_ptr)].flags, FF_NOTICE)) - return TRUE; + return true; } - return FALSE; + return false; } /*! diff --git a/src/target/target-setter.cpp b/src/target/target-setter.cpp index 299db0595..22a6a7e89 100644 --- a/src/target/target-setter.cpp +++ b/src/target/target-setter.cpp @@ -57,8 +57,8 @@ static ts_type *initialize_target_set_type(player_type *creature_ptr, ts_type *t ts_ptr->mode = mode; ts_ptr->y = creature_ptr->y; ts_ptr->x = creature_ptr->x; - ts_ptr->done = FALSE; - ts_ptr->flag = TRUE; + ts_ptr->done = false; + ts_ptr->flag = true; get_screen_size(&ts_ptr->wid, &ts_ptr->hgt); ts_ptr->m = 0; return ts_ptr; @@ -93,7 +93,7 @@ static bool change_panel_xy(player_type *creature_ptr, POSITION y, POSITION x) dx = 1; if (!dy && !dx) - return FALSE; + return false; return change_panel(creature_ptr, dy, dx); } @@ -193,7 +193,7 @@ static void switch_target_input(player_type *creature_ptr, ts_type *ts_ptr) switch (ts_ptr->query) { case ESCAPE: case 'q': - ts_ptr->done = TRUE; + ts_ptr->done = true; return; case 't': case '.': @@ -208,7 +208,7 @@ static void switch_target_input(player_type *creature_ptr, ts_type *ts_ptr) target_who = ts_ptr->g_ptr->m_idx; target_row = ts_ptr->y; target_col = ts_ptr->x; - ts_ptr->done = TRUE; + ts_ptr->done = true; return; case ' ': case '*': @@ -218,7 +218,7 @@ static void switch_target_input(player_type *creature_ptr, ts_type *ts_ptr) ts_ptr->m = 0; if (!expand_list) - ts_ptr->done = TRUE; + ts_ptr->done = true; return; case '-': @@ -227,7 +227,7 @@ static void switch_target_input(player_type *creature_ptr, ts_type *ts_ptr) ts_ptr->m = (int)size(ys_interest) - 1; if (!expand_list) - ts_ptr->done = TRUE; + ts_ptr->done = true; return; case 'p': { @@ -242,7 +242,7 @@ static void switch_target_input(player_type *creature_ptr, ts_type *ts_ptr) } /* Fall through */ case 'o': - ts_ptr->flag = FALSE; + ts_ptr->flag = false; return; case 'm': return; @@ -261,7 +261,7 @@ static void switch_target_input(player_type *creature_ptr, ts_type *ts_ptr) ts_ptr->m = 0; if (!expand_list) - ts_ptr->done = TRUE; + ts_ptr->done = true; return; } @@ -276,7 +276,7 @@ static bool check_panel_changed(player_type *creature_ptr, ts_type *ts_ptr) { // カーソル移動によって描画範囲が変化しないなら何もせずその旨を返す。 if (!change_panel(creature_ptr, ddy[ts_ptr->distance], ddx[ts_ptr->distance])) - return FALSE; + return false; // 描画範囲が変化した場合、"interesting" 座標リストおよび現在のターゲットを更新する必要がある。 @@ -296,12 +296,12 @@ static bool check_panel_changed(player_type *creature_ptr, ts_type *ts_ptr) target_set_prepare(creature_ptr, ys_interest, xs_interest, ts_ptr->mode); // 新たな "interesting" 座標リストからターゲットを探す。 - ts_ptr->flag = TRUE; + ts_ptr->flag = true; ts_ptr->target_num = target_pick(v, u, ddy[ts_ptr->distance], ddx[ts_ptr->distance]); if (ts_ptr->target_num >= 0) ts_ptr->m = ts_ptr->target_num; - return TRUE; + return true; } /*! @@ -328,7 +328,7 @@ static void sweep_targets(player_type *creature_ptr, ts_type *ts_ptr) creature_ptr->window_flags |= PW_OVERHEAD; handle_stuff(creature_ptr); target_set_prepare(creature_ptr, ys_interest, xs_interest, ts_ptr->mode); - ts_ptr->flag = FALSE; + ts_ptr->flag = false; ts_ptr->x += dx; ts_ptr->y += dy; if (((ts_ptr->x < panel_col_min + ts_ptr->wid / 2) && (dx > 0)) || ((ts_ptr->x > panel_col_min + ts_ptr->wid / 2) && (dx < 0))) @@ -358,12 +358,12 @@ static void sweep_targets(player_type *creature_ptr, ts_type *ts_ptr) static bool set_target_grid(player_type *creature_ptr, ts_type *ts_ptr) { if (!ts_ptr->flag || ys_interest.empty()) - return FALSE; + return false; describe_projectablity(creature_ptr, ts_ptr); fix_floor_item_list(creature_ptr, ts_ptr->y, ts_ptr->x); - while (TRUE) { + while (true) { ts_ptr->query = examine_grid(creature_ptr, ts_ptr->y, ts_ptr->x, ts_ptr->mode, ts_ptr->info); if (ts_ptr->query) break; @@ -372,7 +372,7 @@ static bool set_target_grid(player_type *creature_ptr, ts_type *ts_ptr) menu_target(ts_ptr); switch_target_input(creature_ptr, ts_ptr); if (ts_ptr->distance == 0) - return TRUE; + return true; ts_ptr->y2 = panel_row_min; ts_ptr->x2 = panel_col_min; @@ -383,7 +383,7 @@ static bool set_target_grid(player_type *creature_ptr, ts_type *ts_ptr) } sweep_targets(creature_ptr, ts_ptr); ts_ptr->m = ts_ptr->target_num; - return TRUE; + return true; } static void describe_grid_wizard(player_type *creature_ptr, ts_type *ts_ptr) @@ -402,7 +402,7 @@ static void switch_next_grid_command(player_type *creature_ptr, ts_type *ts_ptr) switch (ts_ptr->query) { case ESCAPE: case 'q': - ts_ptr->done = TRUE; + ts_ptr->done = true; break; case 't': case '.': @@ -411,7 +411,7 @@ static void switch_next_grid_command(player_type *creature_ptr, ts_type *ts_ptr) target_who = -1; target_row = ts_ptr->y; target_col = ts_ptr->x; - ts_ptr->done = TRUE; + ts_ptr->done = true; break; case 'p': verify_panel(creature_ptr); @@ -430,7 +430,7 @@ static void switch_next_grid_command(player_type *creature_ptr, ts_type *ts_ptr) case '+': case '-': case 'm': { - ts_ptr->flag = TRUE; + ts_ptr->flag = true; ts_ptr->m = 0; int bd = 999; for (size_t i = 0; i < size(ys_interest); i++) { @@ -444,14 +444,14 @@ static void switch_next_grid_command(player_type *creature_ptr, ts_type *ts_ptr) } if (bd == 999) - ts_ptr->flag = FALSE; + ts_ptr->flag = false; break; } default: ts_ptr->distance = get_keymap_dir(ts_ptr->query); if (isupper(ts_ptr->query)) - ts_ptr->move_fast = TRUE; + ts_ptr->move_fast = true; if (!ts_ptr->distance) bell(); @@ -506,7 +506,7 @@ static void sweep_target_grids(player_type *creature_ptr, ts_type *ts_ptr) if (set_target_grid(creature_ptr, ts_ptr)) continue; - ts_ptr->move_fast = FALSE; + ts_ptr->move_fast = false; if ((ts_ptr->mode & TARGET_LOOK) == 0) print_path(creature_ptr, ts_ptr->y, ts_ptr->x); diff --git a/src/term/screen-processor.cpp b/src/term/screen-processor.cpp index fc1ba68a3..6a4806405 100644 --- a/src/term/screen-processor.cpp +++ b/src/term/screen-processor.cpp @@ -21,7 +21,7 @@ void move_cursor(int row, int col) { term_gotoxy(col, row); } * This is not only more efficient, but also necessary to make sure * that various "inkey()" codes are not "lost" along the way. */ -void flush(void) { inkey_xtra = TRUE; } +void flush(void) { inkey_xtra = true; } /* * Save the screen, and increase the "icky" depth. diff --git a/src/term/z-form.cpp b/src/term/z-form.cpp index 8f5ada4fc..5199bce0d 100644 --- a/src/term/z-form.cpp +++ b/src/term/z-form.cpp @@ -271,7 +271,7 @@ uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp) s = fmt; /* Scan the format string */ - while (TRUE) { + while (true) { /* All done */ if (!*s) break; @@ -336,16 +336,16 @@ uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp) aux[q++] = '%'; /* Assume no "long" argument */ - do_long = FALSE; + do_long = false; /* Assume no "long long" argument */ - do_long_long = FALSE; + do_long_long = false; /* Assume no "xtra" processing */ - do_xtra = FALSE; + do_xtra = false; /* Build the "aux" string */ - while (TRUE) { + while (true) { /* Error -- format sequence is not terminated */ if (!*s) { /* Terminate the buffer */ @@ -372,7 +372,7 @@ uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp) aux[q++] = *s++; /* Note the "long" flag */ - do_long = TRUE; + do_long = true; } /* Mega-Hack -- handle "extra-long" request */ @@ -383,7 +383,7 @@ uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp) s++; /* Note the "long long" flag */ - do_long_long = TRUE; + do_long_long = true; } /* Handle normal end of format sequence */ @@ -419,7 +419,7 @@ uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp) /* Mega-Hack -- Handle 'caret' (for "uppercase" request) */ else if (*s == '^') { /* Note the "xtra" flag */ - do_xtra = TRUE; + do_xtra = true; /* Skip the "^" */ s++; @@ -594,7 +594,7 @@ uint vstrnfmt(char *buf, uint max, concptr fmt, va_list vp) #ifdef JP for (q = 0; tmp[q]; q++) if (iskanji(tmp[q])) { - do_xtra = FALSE; + do_xtra = false; break; } #endif @@ -662,7 +662,7 @@ char *vformat(concptr fmt, va_list vp) return (format_buf); /* Keep going until successful */ - while (TRUE) { + while (true) { uint len; /* Build the string */ diff --git a/src/term/z-rand.cpp b/src/term/z-rand.cpp index 7d2b7c6da..d3501c6b0 100644 --- a/src/term/z-rand.cpp +++ b/src/term/z-rand.cpp @@ -360,14 +360,14 @@ s32b div_round(s32b n, s32b d) */ s32b Rand_external(s32b m) { - static bool initialized = FALSE; + static bool initialized = false; static u32b Rand_state_external[4]; if (!initialized) { /* Initialize with new seed */ u32b seed = (u32b)time(NULL); Rand_seed(seed, Rand_state_external); - initialized = TRUE; + initialized = true; } return Rand_div_impl(m, Rand_state_external); diff --git a/src/term/z-term.cpp b/src/term/z-term.cpp index 186fe2378..af7e1661a 100644 --- a/src/term/z-term.cpp +++ b/src/term/z-term.cpp @@ -1024,7 +1024,7 @@ errr term_fresh(void) term_xtra(TERM_XTRA_CLEAR, 0); /* clear all "cursor" data */ - old->cv = old->cu = FALSE; + old->cv = old->cu = false; old->cx = old->cy = 0; /* Wipe each row */ @@ -1057,7 +1057,7 @@ errr term_fresh(void) } /* Forget "total erase" */ - Term->total_erase = FALSE; + Term->total_erase = false; } /* Cursor update -- Erase old Cursor */ @@ -1237,7 +1237,7 @@ errr term_fresh(void) errr term_fresh_force(void) { bool old = Term->never_fresh; - Term->never_fresh = FALSE; + Term->never_fresh = false; errr err = term_fresh(); Term->never_fresh = old; return err; @@ -1622,7 +1622,7 @@ errr term_clear(void) Term->y2 = h - 1; /* Force "total erase" */ - Term->total_erase = TRUE; + Term->total_erase = true; return 0; } @@ -1632,7 +1632,7 @@ errr term_clear(void) errr term_redraw(void) { /* Force "total erase" */ - Term->total_erase = TRUE; + Term->total_erase = true; term_fresh(); return 0; } @@ -1968,7 +1968,7 @@ errr term_resize(TERM_LEN w, TERM_LEN h) Term->hgt = h; /* Force "total erase" */ - Term->total_erase = TRUE; + Term->total_erase = true; /* Assume change */ for (int i = 0; i < h; i++) { @@ -2014,10 +2014,10 @@ errr term_activate(term_type *t) (*t->init_hook)(t); /* Remember */ - t->active_flag = TRUE; + t->active_flag = true; /* Assume mapped */ - t->mapped_flag = TRUE; + t->mapped_flag = true; } /* Remember the Term */ @@ -2076,7 +2076,7 @@ errr term_init(term_type *t, TERM_LEN w, TERM_LEN h, int k) t->y2 = h - 1; /* Force "total erase" */ - t->total_erase = TRUE; + t->total_erase = true; /* Default "blank" */ t->attr_blank = 0; @@ -2130,8 +2130,8 @@ errr term_nuke(term_type *t) if (t->nuke_hook) (*t->nuke_hook)(t); - t->active_flag = FALSE; - t->mapped_flag = FALSE; + t->active_flag = false; + t->mapped_flag = false; } t->old.reset(); diff --git a/src/term/z-util.cpp b/src/term/z-util.cpp index 15e9aeb92..84533b87d 100644 --- a/src/term/z-util.cpp +++ b/src/term/z-util.cpp @@ -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; } diff --git a/src/util/buffer-shaper.cpp b/src/util/buffer-shaper.cpp index 5c133a2fb..8f80afcc0 100644 --- a/src/util/buffer-shaper.cpp +++ b/src/util/buffer-shaper.cpp @@ -11,7 +11,7 @@ void shape_buffer(concptr str, int maxlen, char *tbuf, size_t bufsize) while (str[read_pt]) { #ifdef JP - bool kinsoku = FALSE; + bool kinsoku = false; bool kanji; #endif int ch_len = 1; @@ -25,7 +25,7 @@ void shape_buffer(concptr str, int maxlen, char *tbuf, size_t bufsize) ch_len = 2; if (strcmp(ch, "。") == 0 || strcmp(ch, "、") == 0 || strcmp(ch, "ィ") == 0 || strcmp(ch, "ー") == 0) - kinsoku = TRUE; + kinsoku = true; } else if (!isprint(ch[0])) ch[0] = ' '; #else diff --git a/src/util/object-sort.cpp b/src/util/object-sort.cpp index 552cf09a4..5267dddb0 100644 --- a/src/util/object-sort.cpp +++ b/src/util/object-sort.cpp @@ -26,37 +26,37 @@ bool object_sort_comp(player_type *player_ptr, object_type *o_ptr, s32b o_value, { int o_type, j_type; if (!j_ptr->k_idx) - return TRUE; + return true; if ((o_ptr->tval == get_realm1_book(player_ptr)) && (j_ptr->tval != get_realm1_book(player_ptr))) - return TRUE; + return true; if ((j_ptr->tval == get_realm1_book(player_ptr)) && (o_ptr->tval != get_realm1_book(player_ptr))) - return FALSE; + return false; if ((o_ptr->tval == get_realm2_book(player_ptr)) && (j_ptr->tval != get_realm2_book(player_ptr))) - return TRUE; + return true; if ((j_ptr->tval == get_realm2_book(player_ptr)) && (o_ptr->tval != get_realm2_book(player_ptr))) - return FALSE; + return false; if (o_ptr->tval > j_ptr->tval) - return TRUE; + return true; if (o_ptr->tval < j_ptr->tval) - return FALSE; + return false; if (!object_is_aware(o_ptr)) - return FALSE; + return false; if (!object_is_aware(j_ptr)) - return TRUE; + return true; if (o_ptr->sval < j_ptr->sval) - return TRUE; + return true; if (o_ptr->sval > j_ptr->sval) - return FALSE; + return false; if (!object_is_known(o_ptr)) - return FALSE; + return false; if (!object_is_known(j_ptr)) - return TRUE; + return true; if (object_is_fixed_artifact(o_ptr)) o_type = 3; @@ -77,9 +77,9 @@ bool object_sort_comp(player_type *player_ptr, object_type *o_ptr, s32b o_value, j_type = 0; if (o_type < j_type) - return TRUE; + return true; if (o_type > j_type) - return FALSE; + return false; switch (o_ptr->tval) { case TV_FIGURINE: @@ -87,25 +87,25 @@ bool object_sort_comp(player_type *player_ptr, object_type *o_ptr, s32b o_value, case TV_CORPSE: case TV_CAPTURE: if (r_info[o_ptr->pval].level < r_info[j_ptr->pval].level) - return TRUE; + return true; if ((r_info[o_ptr->pval].level == r_info[j_ptr->pval].level) && (o_ptr->pval < j_ptr->pval)) - return TRUE; - return FALSE; + return true; + return false; case TV_SHOT: case TV_ARROW: case TV_BOLT: if (o_ptr->to_h + o_ptr->to_d < j_ptr->to_h + j_ptr->to_d) - return TRUE; + return true; if (o_ptr->to_h + o_ptr->to_d > j_ptr->to_h + j_ptr->to_d) - return FALSE; + return false; break; case TV_ROD: if (o_ptr->pval < j_ptr->pval) - return TRUE; + return true; if (o_ptr->pval > j_ptr->pval) - return FALSE; + return false; break; default: diff --git a/src/util/sort.cpp b/src/util/sort.cpp index 924e0a428..4a1352320 100644 --- a/src/util/sort.cpp +++ b/src/util/sort.cpp @@ -29,7 +29,7 @@ static void exe_ang_sort(player_type *player_ptr, vptr u, vptr v, int p, int q, int z = p; int a = p; int b = q; - while (TRUE) { + while (true) { /* Slide i2 */ while (!(*ang_sort_comp)(player_ptr, u, v, b, z)) b--; @@ -123,10 +123,10 @@ bool ang_sort_comp_importance(player_type *player_ptr, vptr u, vptr v, int a, in /* The player grid */ if (y[a] == player_ptr->y && x[a] == player_ptr->x) - return TRUE; + return true; if (y[b] == player_ptr->y && x[b] == player_ptr->x) - return FALSE; + return false; /* Extract monster race */ if (ca_ptr->m_idx && ma_ptr->ml) @@ -140,59 +140,59 @@ bool ang_sort_comp_importance(player_type *player_ptr, vptr u, vptr v, int a, in ap_rb_ptr = NULL; if (ap_ra_ptr && !ap_rb_ptr) - return TRUE; + return true; if (!ap_ra_ptr && ap_rb_ptr) - return FALSE; + return false; /* Compare two monsters */ if (ap_ra_ptr && ap_rb_ptr) { /* Unique monsters first */ if ((ap_ra_ptr->flags1 & RF1_UNIQUE) && !(ap_rb_ptr->flags1 & RF1_UNIQUE)) - return TRUE; + return true; if (!(ap_ra_ptr->flags1 & RF1_UNIQUE) && (ap_rb_ptr->flags1 & RF1_UNIQUE)) - return FALSE; + return false; /* Shadowers first (あやしい影) */ if (ma_ptr->mflag2.has(MFLAG2::KAGE) && mb_ptr->mflag2.has_not(MFLAG2::KAGE)) - return TRUE; + return true; if (ma_ptr->mflag2.has_not(MFLAG2::KAGE) && mb_ptr->mflag2.has(MFLAG2::KAGE)) - return FALSE; + return false; /* Unknown monsters first */ if (!ap_ra_ptr->r_tkills && ap_rb_ptr->r_tkills) - return TRUE; + return true; if (ap_ra_ptr->r_tkills && !ap_rb_ptr->r_tkills) - return FALSE; + return false; /* Higher level monsters first (if known) */ if (ap_ra_ptr->r_tkills && ap_rb_ptr->r_tkills) { if (ap_ra_ptr->level > ap_rb_ptr->level) - return TRUE; + return true; if (ap_ra_ptr->level < ap_rb_ptr->level) - return FALSE; + return false; } /* Sort by index if all conditions are same */ if (ma_ptr->ap_r_idx > mb_ptr->ap_r_idx) - return TRUE; + return true; if (ma_ptr->ap_r_idx < mb_ptr->ap_r_idx) - return FALSE; + return false; } /* An object get higher priority */ if (!player_ptr->current_floor_ptr->grid_array[y[a]][x[a]].o_idx_list.empty() && player_ptr->current_floor_ptr->grid_array[y[b]][x[b]].o_idx_list.empty()) - return TRUE; + return true; if (player_ptr->current_floor_ptr->grid_array[y[a]][x[a]].o_idx_list.empty() && !player_ptr->current_floor_ptr->grid_array[y[b]][x[b]].o_idx_list.empty()) - return FALSE; + return false; /* Priority from the terrain */ if (f_info[ca_ptr->feat].priority > f_info[cb_ptr->feat].priority) - return TRUE; + return true; if (f_info[ca_ptr->feat].priority < f_info[cb_ptr->feat].priority) - return FALSE; + return false; /* If all conditions are same, compare distance */ return ang_sort_comp_distance(player_ptr, u, v, a, b); @@ -248,10 +248,10 @@ bool ang_sort_art_comp(player_type *player_ptr, vptr u, vptr v, int a, int b) /* Compare total kills */ if (z1 < z2) - return TRUE; + return true; if (z1 > z2) - return FALSE; + return false; } /* Sort by monster level */ @@ -262,10 +262,10 @@ bool ang_sort_art_comp(player_type *player_ptr, vptr u, vptr v, int a, int b) /* Compare levels */ if (z1 < z2) - return TRUE; + return true; if (z1 > z2) - return FALSE; + return false; } /* Sort by monster experience */ @@ -276,10 +276,10 @@ bool ang_sort_art_comp(player_type *player_ptr, vptr u, vptr v, int a, int b) /* Compare experience */ if (z1 < z2) - return TRUE; + return true; if (z1 > z2) - return FALSE; + return false; } /* Compare indexes */ @@ -352,28 +352,28 @@ bool ang_sort_comp_pet(player_type *player_ptr, vptr u, vptr v, int a, int b) monster_race *r_ptr2 = &r_info[m_ptr2->r_idx]; if (m_ptr1->nickname && !m_ptr2->nickname) - return TRUE; + return true; if (m_ptr2->nickname && !m_ptr1->nickname) - return FALSE; + return false; if ((r_ptr1->flags1 & RF1_UNIQUE) && !(r_ptr2->flags1 & RF1_UNIQUE)) - return TRUE; + return true; if ((r_ptr2->flags1 & RF1_UNIQUE) && !(r_ptr1->flags1 & RF1_UNIQUE)) - return FALSE; + return false; if (r_ptr1->level > r_ptr2->level) - return TRUE; + return true; if (r_ptr2->level > r_ptr1->level) - return FALSE; + return false; if (m_ptr1->hp > m_ptr2->hp) - return TRUE; + return true; if (m_ptr2->hp > m_ptr1->hp) - return FALSE; + return false; return w1 <= w2; } @@ -410,9 +410,9 @@ bool ang_sort_comp_hook(player_type *player_ptr, vptr u, vptr v, int a, int b) /* Compare player kills */ if (z1 < z2) - return TRUE; + return true; if (z1 > z2) - return FALSE; + return false; } /* Sort by total kills */ @@ -423,9 +423,9 @@ bool ang_sort_comp_hook(player_type *player_ptr, vptr u, vptr v, int a, int b) /* Compare total kills */ if (z1 < z2) - return TRUE; + return true; if (z1 > z2) - return FALSE; + return false; } /* Sort by monster level */ @@ -436,9 +436,9 @@ bool ang_sort_comp_hook(player_type *player_ptr, vptr u, vptr v, int a, int b) /* Compare levels */ if (z1 < z2) - return TRUE; + return true; if (z1 > z2) - return FALSE; + return false; } /* Sort by monster experience */ @@ -449,9 +449,9 @@ bool ang_sort_comp_hook(player_type *player_ptr, vptr u, vptr v, int a, int b) /* Compare experience */ if (z1 < z2) - return TRUE; + return true; if (z1 > z2) - return FALSE; + return false; } /* Compare indexes */ @@ -501,16 +501,16 @@ bool ang_sort_comp_monster_level(player_type *player_ptr, vptr u, vptr v, int a, monster_race *r_ptr2 = &r_info[w2]; if (r_ptr2->level > r_ptr1->level) - return TRUE; + return true; if (r_ptr1->level > r_ptr2->level) - return FALSE; + return false; if ((r_ptr2->flags1 & RF1_UNIQUE) && !(r_ptr1->flags1 & RF1_UNIQUE)) - return TRUE; + return true; if ((r_ptr1->flags1 & RF1_UNIQUE) && !(r_ptr2->flags1 & RF1_UNIQUE)) - return FALSE; + return false; return w1 <= w2; } @@ -539,40 +539,40 @@ bool ang_sort_comp_pet_dismiss(player_type *player_ptr, vptr u, vptr v, int a, i monster_race *r_ptr2 = &r_info[m_ptr2->r_idx]; if (w1 == player_ptr->riding) - return TRUE; + return true; if (w2 == player_ptr->riding) - return FALSE; + return false; if (m_ptr1->nickname && !m_ptr2->nickname) - return TRUE; + return true; if (m_ptr2->nickname && !m_ptr1->nickname) - return FALSE; + return false; if (!m_ptr1->parent_m_idx && m_ptr2->parent_m_idx) - return TRUE; + return true; if (!m_ptr2->parent_m_idx && m_ptr1->parent_m_idx) - return FALSE; + return false; if ((r_ptr1->flags1 & RF1_UNIQUE) && !(r_ptr2->flags1 & RF1_UNIQUE)) - return TRUE; + return true; if ((r_ptr2->flags1 & RF1_UNIQUE) && !(r_ptr1->flags1 & RF1_UNIQUE)) - return FALSE; + return false; if (r_ptr1->level > r_ptr2->level) - return TRUE; + return true; if (r_ptr2->level > r_ptr1->level) - return FALSE; + return false; if (m_ptr1->hp > m_ptr2->hp) - return TRUE; + return true; if (m_ptr2->hp > m_ptr1->hp) - return FALSE; + return false; return w1 <= w2; } @@ -644,24 +644,24 @@ bool ang_sort_comp_evol_tree(player_type *player_ptr, vptr u, vptr v, int a, int /* Used tree first */ if (w1 && !w2) - return TRUE; + return true; if (!w1 && w2) - return FALSE; + return false; /* Sort by monster level */ if (r1_ptr->level < r2_ptr->level) - return TRUE; + return true; if (r1_ptr->level > r2_ptr->level) - return FALSE; + return false; /* Sort by monster experience */ if (r1_ptr->mexp < r2_ptr->mexp) - return TRUE; + return true; if (r1_ptr->mexp > r2_ptr->mexp) - return FALSE; + return false; /* Compare indexes */ return w1 <= w2; diff --git a/src/util/string-processor.cpp b/src/util/string-processor.cpp index 286ac384e..c72df1a94 100644 --- a/src/util/string-processor.cpp +++ b/src/util/string-processor.cpp @@ -62,7 +62,7 @@ static char force_upper(char a) static int angband_stricmp(concptr a, concptr b) { - for (concptr s1 = a, s2 = b; TRUE; s1++, s2++) { + for (concptr s1 = a, s2 = b; true; s1++, s2++) { char z1 = force_upper(*s1); char z2 = force_upper(*s2); if (z1 < z2) @@ -104,11 +104,11 @@ static void trigger_text_to_ascii(char **bufptr, concptr *strptr) return; for (i = 0; macro_modifier_chr[i]; i++) - mod_status[i] = FALSE; + mod_status[i] = false; str++; /* Examine modifier keys */ - while (TRUE) { + while (true) { for (i = 0; macro_modifier_chr[i]; i++) { len = strlen(macro_modifier_name[i]); @@ -119,7 +119,7 @@ static void trigger_text_to_ascii(char **bufptr, concptr *strptr) if (!macro_modifier_chr[i]) break; str += len; - mod_status[i] = TRUE; + mod_status[i] = true; if ('S' == macro_modifier_chr[i]) shiftstatus = 1; } @@ -246,7 +246,7 @@ static bool trigger_ascii_to_text(char **bufptr, concptr *strptr) char key_code[100]; int i; if (macro_template == NULL) - return FALSE; + return false; *s++ = '\\'; *s++ = '['; @@ -275,13 +275,13 @@ static bool trigger_ascii_to_text(char **bufptr, concptr *strptr) } default: if (ch != *str) - return FALSE; + return false; str++; } } if (*str++ != '\r') - return FALSE; + return false; for (i = 0; i < max_macrotrigger; i++) { if (!angband_stricmp(key_code, macro_trigger_keycode[0][i]) || !angband_stricmp(key_code, macro_trigger_keycode[1][i])) @@ -289,7 +289,7 @@ static bool trigger_ascii_to_text(char **bufptr, concptr *strptr) } if (i == max_macrotrigger) - return FALSE; + return false; tmp = macro_trigger_name[i]; while (*tmp) @@ -299,7 +299,7 @@ static bool trigger_ascii_to_text(char **bufptr, concptr *strptr) *bufptr = s; *strptr = str; - return TRUE; + return true; } /* diff --git a/src/util/tag-sorter.cpp b/src/util/tag-sorter.cpp index eefe1a66d..b1772d45a 100644 --- a/src/util/tag-sorter.cpp +++ b/src/util/tag-sorter.cpp @@ -70,7 +70,7 @@ static void quicksort(tag_type elements[], int left, int right) int i = left; int j = right - 1; - while (TRUE) { + while (true) { while (elements[++i].tag < pivot.tag) ; while (elements[--j].tag > pivot.tag) diff --git a/src/view/display-lore-drops.cpp b/src/view/display-lore-drops.cpp index b0f3d347f..4b8f7060f 100644 --- a/src/view/display-lore-drops.cpp +++ b/src/view/display-lore-drops.cpp @@ -10,7 +10,7 @@ void display_monster_drop_quantity(lore_type *lore_ptr) hooked_roff(_("一つの", " a")); #ifdef JP #else - lore_ptr->sin = TRUE; + lore_ptr->sin = true; #endif } else if (lore_ptr->drop_quantity == 2) { hooked_roff(_("一つか二つの", " one or two")); @@ -27,7 +27,7 @@ void display_monster_drop_quality(lore_type* lore_ptr) lore_ptr->drop_quality = _("上質な", " good"); #ifdef JP #else - lore_ptr->sin = FALSE; + lore_ptr->sin = false; #endif } else { lore_ptr->drop_quality = NULL; @@ -44,7 +44,7 @@ void display_monster_drop_items(lore_type *lore_ptr) if (lore_ptr->sin) hooked_roff("n"); - lore_ptr->sin = FALSE; + lore_ptr->sin = false; #endif if (lore_ptr->drop_quality != NULL) @@ -70,12 +70,12 @@ void display_monster_drop_golds(lore_type *lore_ptr) #ifdef JP #else if (lore_ptr->drop_quality == NULL) - lore_ptr->sin = FALSE; + lore_ptr->sin = false; if (lore_ptr->sin) hooked_roff("n"); - lore_ptr->sin = FALSE; + lore_ptr->sin = false; #endif if (lore_ptr->drop_quality != NULL) @@ -97,7 +97,7 @@ void display_monster_drops(lore_type *lore_ptr) hooked_roff(format(_("%^sは", "%^s may carry"), Who::who(lore_ptr->msex))); #ifdef JP #else - lore_ptr->sin = FALSE; + lore_ptr->sin = false; #endif display_monster_drop_quantity(lore_ptr); diff --git a/src/view/display-lore-magics.cpp b/src/view/display-lore-magics.cpp index 42b0b5cc1..4b7ca8188 100644 --- a/src/view/display-lore-magics.cpp +++ b/src/view/display-lore-magics.cpp @@ -6,11 +6,11 @@ void display_monster_breath(lore_type *lore_ptr) { - lore_ptr->breath = FALSE; + lore_ptr->breath = false; if (lore_ptr->vn <= 0) return; - lore_ptr->breath = TRUE; + lore_ptr->breath = true; hooked_roff(format(_("%^sは", "%^s"), Who::who(lore_ptr->msex))); for (int n = 0; n < lore_ptr->vn; n++) { #ifdef JP @@ -34,11 +34,11 @@ void display_monster_breath(lore_type *lore_ptr) void display_monster_magic_types(lore_type *lore_ptr) { - lore_ptr->magic = FALSE; + lore_ptr->magic = false; if (lore_ptr->vn == 0) return; - lore_ptr->magic = TRUE; + lore_ptr->magic = true; if (lore_ptr->breath) { hooked_roff(_("、なおかつ", ", and is also")); } else { diff --git a/src/view/display-lore.cpp b/src/view/display-lore.cpp index 901817056..16a574f47 100644 --- a/src/view/display-lore.cpp +++ b/src/view/display-lore.cpp @@ -130,7 +130,7 @@ void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr static bool display_kill_unique(lore_type *lore_ptr) { if ((lore_ptr->flags1 & RF1_UNIQUE) == 0) - return FALSE; + return false; bool dead = (lore_ptr->r_ptr->max_num == 0); if (lore_ptr->r_ptr->r_deaths) { @@ -154,7 +154,7 @@ static bool display_kill_unique(lore_type *lore_ptr) hooked_roff("\n"); } - return TRUE; + return true; } static void display_killed(lore_type *lore_ptr) @@ -243,10 +243,10 @@ void display_kill_numbers(lore_type *lore_ptr) */ bool display_where_to_appear(lore_type *lore_ptr) { - lore_ptr->old = FALSE; + lore_ptr->old = false; if (lore_ptr->r_ptr->level == 0) { hooked_roff(format(_("%^sは町に住み", "%^s lives in the town"), Who::who(lore_ptr->msex))); - lore_ptr->old = TRUE; + lore_ptr->old = true; } else if (lore_ptr->r_ptr->r_tkills || lore_ptr->know_everything) { if (depth_in_feet) { hooked_roff(format( @@ -255,22 +255,22 @@ bool display_where_to_appear(lore_type *lore_ptr) hooked_roff(format(_("%^sは通常地下 %d 階で出現し", "%^s is normally found on dungeon level %d"), Who::who(lore_ptr->msex), lore_ptr->r_ptr->level)); } - lore_ptr->old = TRUE; + lore_ptr->old = true; } if (lore_ptr->r_idx == MON_CHAMELEON) { hooked_roff(_("、他のモンスターに化ける。", "and can take the shape of other monster.")); - return FALSE; + return false; } if (lore_ptr->old) { hooked_roff(_("、", ", and ")); } else { hooked_roff(format(_("%^sは", "%^s "), Who::who(lore_ptr->msex))); - lore_ptr->old = TRUE; + lore_ptr->old = true; } - return TRUE; + return true; } void display_monster_move(lore_type *lore_ptr) @@ -339,7 +339,7 @@ void display_monster_never_move(lore_type *lore_ptr) hooked_roff(_("、しかし", ", but ")); } else { hooked_roff(format(_("%^sは", "%^s "), Who::who(lore_ptr->msex))); - lore_ptr->old = TRUE; + lore_ptr->old = true; } hooked_roff(_("侵入者を追跡しない", "does not deign to chase intruders")); diff --git a/src/view/display-map.cpp b/src/view/display-map.cpp index 8ca61f63f..7f63f1ac0 100644 --- a/src/view/display-map.cpp +++ b/src/view/display-map.cpp @@ -98,16 +98,16 @@ static bool is_revealed_wall(floor_type *floor_ptr, feature_type *f_ptr, POSITIO { if (view_hidden_walls) { if (view_unsafe_walls) - return TRUE; + return true; if (none_bits(floor_ptr->grid_array[y][x].info, CAVE_UNSAFE)) - return TRUE; + return true; } if (!has_flag(f_ptr->flags, FF_WALL) || has_flag(f_ptr->flags, FF_HAS_GOLD)) - return TRUE; + return true; if (in_bounds(floor_ptr, y, x) && has_flag(f_ptr->flags, FF_PERMANENT)) - return TRUE; + return true; int n = 0; for (int i = 0; i < 8; i++) { diff --git a/src/view/display-messages.cpp b/src/view/display-messages.cpp index 2cdd8ebdb..9e575d3ee 100644 --- a/src/view/display-messages.cpp +++ b/src/view/display-messages.cpp @@ -187,7 +187,7 @@ bool is_msg_window_flowed(void) } if (i < 8) { if (num_more < angband_term[i]->hgt) - return FALSE; + return false; return (num_more >= 0); } @@ -206,12 +206,12 @@ static void msg_flush(player_type *player_ptr, int x) show_more = is_msg_window_flowed(); if (skip_more) - show_more = FALSE; + show_more = false; - player_ptr->now_damaged = FALSE; + player_ptr->now_damaged = false; if (!player_ptr->playing || show_more) { term_putstr(x, 0, -1, a, _("-続く-", "-more-")); - while (TRUE) { + while (true) { int cmd = inkey(); if (cmd == ESCAPE) { /* auto_moreのとき、全て流す */ @@ -284,7 +284,7 @@ void msg_print(concptr msg) int n = (msg ? strlen(msg) : 0); if (p && (!msg || ((p + n) > 72))) { msg_flush(p_ptr, p); - msg_flag = FALSE; + msg_flag = false; p = 0; } @@ -307,16 +307,16 @@ void msg_print(concptr msg) while (n > 72) { int check, split = 72; #ifdef JP - bool k_flag = FALSE; + bool k_flag = false; int wordlen = 0; for (check = 0; check < 72; check++) { if (k_flag) { - k_flag = FALSE; + k_flag = false; continue; } if (iskanji(t[check])) { - k_flag = TRUE; + k_flag = true; split = check; } else if (t[check] == ' ') { split = check; @@ -349,7 +349,7 @@ void msg_print(concptr msg) p_ptr->window_flags |= (PW_MESSAGE); window_stuff(p_ptr); - msg_flag = TRUE; + msg_flag = true; #ifdef JP p += n; #else diff --git a/src/view/display-player.cpp b/src/view/display-player.cpp index faf112f66..0787bbb68 100644 --- a/src/view/display-player.cpp +++ b/src/view/display-player.cpp @@ -53,25 +53,25 @@ static bool display_player_info(player_type *creature_ptr, int mode) display_player_misc_info(creature_ptr); display_player_stat_info(creature_ptr); display_player_flag_info_1(creature_ptr, display_player_equippy); - return TRUE; + return true; } if (mode == 3) { display_player_flag_info_2(creature_ptr, display_player_equippy); - return TRUE; + return true; } if (mode == 4) { display_player_flag_info_3(creature_ptr, display_player_equippy); - return TRUE; + return true; } if (mode == 5) { do_cmd_knowledge_mutations(creature_ptr); - return TRUE; + return true; } - return FALSE; + return false; } /*! @@ -173,13 +173,13 @@ static bool search_death_cause(player_type *creature_ptr, char *statmsg) { floor_type *floor_ptr = creature_ptr->current_floor_ptr; if (!creature_ptr->is_dead) - return FALSE; + return false; if (current_world_ptr->total_winner) { sprintf(statmsg, _("…あなたは勝利の後%sした。", "...You %s after winning."), streq(creature_ptr->died_from, "Seppuku") ? _("切腹", "committed seppuku") : _("引退", "retired from the adventure")); - return TRUE; + return true; } if (!floor_ptr->dun_level) { @@ -188,7 +188,7 @@ static bool search_death_cause(player_type *creature_ptr, char *statmsg) #else sprintf(statmsg, "...You were killed by %s in %s.", creature_ptr->died_from, map_name(creature_ptr)); #endif - return TRUE; + return true; } if (floor_ptr->inside_quest && is_fixed_quest_idx(floor_ptr->inside_quest)) { @@ -201,7 +201,7 @@ static bool search_death_cause(player_type *creature_ptr, char *statmsg) #else sprintf(statmsg, "...You were killed by %s in the quest '%s'.", creature_ptr->died_from, quest[floor_ptr->inside_quest].name); #endif - return TRUE; + return true; } #ifdef JP @@ -210,7 +210,7 @@ static bool search_death_cause(player_type *creature_ptr, char *statmsg) sprintf(statmsg, "...You were killed by %s on level %d of %s.", creature_ptr->died_from, floor_ptr->dun_level, map_name(creature_ptr)); #endif - return TRUE; + return true; } /*! @@ -223,7 +223,7 @@ static bool decide_death_in_quest(player_type *creature_ptr, char *statmsg) { floor_type *floor_ptr = creature_ptr->current_floor_ptr; if (!floor_ptr->inside_quest || !is_fixed_quest_idx(floor_ptr->inside_quest)) - return FALSE; + return false; for (int i = 0; i < 10; i++) quest_text[i][0] = '\0'; @@ -232,7 +232,7 @@ static bool decide_death_in_quest(player_type *creature_ptr, char *statmsg) init_flags = INIT_NAME_ONLY; parse_fixed_map(creature_ptr, "q_info.txt", 0, 0, 0, 0); sprintf(statmsg, _("…あなたは現在、 クエスト「%s」を遂行中だ。", "...Now, you are in the quest '%s'."), quest[floor_ptr->inside_quest].name); - return TRUE; + return true; } /*! diff --git a/src/view/status-first-page.cpp b/src/view/status-first-page.cpp index 8bd0fb846..2f38d65b9 100644 --- a/src/view/status-first-page.cpp +++ b/src/view/status-first-page.cpp @@ -75,7 +75,7 @@ static bool calc_weapon_damage_limit(player_type *creature_ptr, int hand, int *d PLAYER_LEVEL level = creature_ptr->lev; if (hand > 0) { damage[hand] = 0; - return FALSE; + return false; } if (creature_ptr->pclass == CLASS_FORCETRAINER) @@ -93,7 +93,7 @@ static bool calc_weapon_damage_limit(player_type *creature_ptr, int hand, int *d if (damage[hand] < 0) damage[hand] = 0; - return TRUE; + return true; } /*! @@ -107,7 +107,7 @@ static bool calc_weapon_damage_limit(player_type *creature_ptr, int hand, int *d static bool calc_weapon_one_hand(object_type *o_ptr, int hand, int *damage, int *basedam) { if (o_ptr->k_idx == 0) - return FALSE; + return false; *basedam = 0; damage[hand] += *basedam; @@ -117,7 +117,7 @@ static bool calc_weapon_one_hand(object_type *o_ptr, int hand, int *damage, int if (damage[hand] < 0) damage[hand] = 0; - return TRUE; + return true; } /*! @@ -261,9 +261,9 @@ static void calc_two_hands(player_type *creature_ptr, int *damage, int *to_h) continue; to_h[i] = 0; - bool poison_needle = FALSE; + bool poison_needle = false; if ((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_POISON_NEEDLE)) - poison_needle = TRUE; + poison_needle = true; if (object_is_known(o_ptr)) { damage[i] += o_ptr->to_d * 100; to_h[i] += o_ptr->to_h; diff --git a/src/window/display-sub-window-spells.cpp b/src/window/display-sub-window-spells.cpp index a177d2344..9ad005640 100644 --- a/src/window/display-sub-window-spells.cpp +++ b/src/window/display-sub-window-spells.cpp @@ -54,7 +54,7 @@ static void display_spell_list(player_type *caster_ptr) char comment[80]; char psi_desc[160]; int use_mind; - bool use_hp = FALSE; + bool use_hp = false; y = 1; x = 1; @@ -72,14 +72,14 @@ static void display_spell_list(player_type *caster_ptr) break; case CLASS_BERSERKER: use_mind = MIND_BERSERKER; - use_hp = TRUE; + use_hp = true; break; case CLASS_MIRROR_MASTER: use_mind = MIND_MIRROR_MASTER; break; case CLASS_NINJA: use_mind = MIND_NINJUTSU; - use_hp = TRUE; + use_hp = true; break; case CLASS_ELEMENTALIST: use_mind = MIND_ELEMENTAL; diff --git a/src/window/display-sub-windows.cpp b/src/window/display-sub-windows.cpp index 06ad5a159..a35c80e03 100644 --- a/src/window/display-sub-windows.cpp +++ b/src/window/display-sub-windows.cpp @@ -95,10 +95,10 @@ static void print_monster_line(TERM_LEN x, TERM_LEN y, monster_type *m_ptr, int if (!r_ptr) return; if (r_ptr->flags1 & RF1_UNIQUE) { - bool is_bounty = FALSE; + bool is_bounty = false; for (int i = 0; i < MAX_BOUNTY; i++) { if (current_world_ptr->bounty_r_idx[i] == r_idx) { - is_bounty = TRUE; + is_bounty = true; break; } } diff --git a/src/window/main-window-util.cpp b/src/window/main-window-util.cpp index 89860b85d..6d5d99db8 100644 --- a/src/window/main-window-util.cpp +++ b/src/window/main-window-util.cpp @@ -207,8 +207,8 @@ void display_map(player_type *player_ptr, int *cy, int *cx) floor_type *floor_ptr = player_ptr->current_floor_ptr; yrat = (floor_ptr->height + hgt - 1) / hgt; xrat = (floor_ptr->width + wid - 1) / wid; - view_special_lite = FALSE; - view_granite_lite = FALSE; + view_special_lite = false; + view_granite_lite = false; using std::vector; vector> ma(hgt + 2, vector(wid + 2, TERM_WHITE)); diff --git a/src/wizard/cmd-wizard.cpp b/src/wizard/cmd-wizard.cpp index 1d157cf00..832ebadad 100644 --- a/src/wizard/cmd-wizard.cpp +++ b/src/wizard/cmd-wizard.cpp @@ -123,7 +123,7 @@ bool exe_cmd_debug(player_type *creature_ptr, char cmd) case '<': case '>': case KTRL('a'): - return FALSE; + return false; case ESCAPE: case '\n': case '\r': @@ -260,7 +260,7 @@ bool exe_cmd_debug(player_type *creature_ptr, char cmd) break; } - return TRUE; + return true; } /*! @@ -282,7 +282,7 @@ void do_cmd_debug(player_type *creature_ptr) int page = 0; char cmd; - while (TRUE) { + while (true) { screen_save(); display_debug_menu(page, max_page, page_size, max_line); get_com("Debug Command: ", &cmd, FALSE); diff --git a/src/wizard/fixed-artifacts-spoiler.cpp b/src/wizard/fixed-artifacts-spoiler.cpp index 0650c8794..ade256957 100644 --- a/src/wizard/fixed-artifacts-spoiler.cpp +++ b/src/wizard/fixed-artifacts-spoiler.cpp @@ -31,7 +31,7 @@ void spoiler_outlist(concptr header, concptr *list, char separator) int buf_len; int line_len = strlen(line); - while (TRUE) { + while (true) { strcpy(buf, *list); buf_len = strlen(buf); if (list[1]) { @@ -86,11 +86,11 @@ static bool make_fake_artifact(player_type *player_ptr, object_type *o_ptr, ARTI { artifact_type *a_ptr = &a_info[name1]; if (a_ptr->name.empty()) - return FALSE; + return false; OBJECT_IDX i = lookup_kind(a_ptr->tval, a_ptr->sval); if (!i) - return FALSE; + return false; o_ptr->prep(player_ptr, i); o_ptr->name1 = name1; @@ -102,7 +102,7 @@ static bool make_fake_artifact(player_type *player_ptr, object_type *o_ptr, ARTI o_ptr->to_h = a_ptr->to_h; o_ptr->to_d = a_ptr->to_d; o_ptr->weight = a_ptr->weight; - return TRUE; + return true; } /*! diff --git a/src/wizard/items-spoiler.cpp b/src/wizard/items-spoiler.cpp index 00337e6e9..832113b82 100644 --- a/src/wizard/items-spoiler.cpp +++ b/src/wizard/items-spoiler.cpp @@ -104,7 +104,7 @@ spoiler_output_status spoil_obj_desc(concptr fname) int n = 0; int group_start = 0; OBJECT_IDX who[200]; - for (int i = 0; TRUE; i++) { + for (int i = 0; true; i++) { if (group_item[i].name) { if (n) { for (int s = 0; s < n - 1; s++) { diff --git a/src/wizard/spoiler-util.cpp b/src/wizard/spoiler-util.cpp index 9a5f77fff..a9f64c874 100644 --- a/src/wizard/spoiler-util.cpp +++ b/src/wizard/spoiler-util.cpp @@ -52,16 +52,16 @@ void spoil_out(concptr str) static char roff_waiting_buf[256]; #ifdef JP - bool iskanji_flag = FALSE; + bool iskanji_flag = false; #endif static char *roff_p = roff_buf; static char *roff_s = NULL; - static bool waiting_output = FALSE; + static bool waiting_output = false; if (!str) { if (waiting_output) { fputs(roff_waiting_buf, spoiler_file); - waiting_output = FALSE; + waiting_output = false; } if (roff_p != roff_buf) @@ -105,26 +105,26 @@ void spoil_out(concptr str) if (!wrap) fputc('\n', spoiler_file); - waiting_output = FALSE; + waiting_output = false; } if (!wrap) { #ifdef JP if (roff_p >= roff_buf + (iskanji_flag ? 74 : 75)) - wrap = TRUE; + wrap = true; else if ((ch == ' ') && (roff_p >= roff_buf + (iskanji_flag ? 72 : 73))) - wrap = TRUE; + wrap = true; #else if (roff_p >= roff_buf + 75) - wrap = TRUE; + wrap = true; else if ((ch == ' ') && (roff_p >= roff_buf + 73)) - wrap = TRUE; + wrap = true; #endif if (wrap) { #ifdef JP bool k_flag_local; - bool iskanji_flag_local = FALSE; + bool iskanji_flag_local = false; concptr tail = str + (iskanji_flag ? 2 : 1); #else concptr tail = str + 1; @@ -147,7 +147,7 @@ void spoil_out(concptr str) } if (!*tail) - waiting_output = TRUE; + waiting_output = true; } } diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp index ae3ba0bf8..9f0884659 100644 --- a/src/wizard/wizard-item-modifier.cpp +++ b/src/wizard/wizard-item-modifier.cpp @@ -237,7 +237,7 @@ void wiz_identify_full_inventory(player_type *caster_ptr) continue; auto k_ptr = &k_info[o_ptr->k_idx]; - k_ptr->aware = TRUE; //!< @note 記録には残さないためTRUEを立てるのみ + k_ptr->aware = true; //!< @note 記録には残さないためTRUEを立てるのみ set_bits(o_ptr->ident, IDENT_KNOWN | IDENT_FULL_KNOWN); set_bits(o_ptr->marked, OM_TOUCHED); } @@ -410,7 +410,7 @@ static void wiz_statistics(player_type *caster_ptr, object_type *o_ptr) char ch; concptr quality; BIT_FLAGS mode; - while (TRUE) { + while (true) { concptr pmt = "Roll for [n]ormal, [g]ood, or [e]xcellent treasure? "; wiz_display_item(caster_ptr, o_ptr); if (!get_com(pmt, &ch, FALSE)) @@ -439,7 +439,7 @@ static void wiz_statistics(player_type *caster_ptr, object_type *o_ptr) correct = matches = better = worse = other = 0; for (i = 0; i <= test_roll; i++) { if ((i < 100) || (i % 100 == 0)) { - inkey_scan = TRUE; + inkey_scan = true; if (inkey()) { flush(); break; // stop rolling @@ -496,8 +496,8 @@ static void wiz_reroll_item(player_type *owner_ptr, object_type *o_ptr) q_ptr->copy_from(o_ptr); char ch; - bool changed = FALSE; - while (TRUE) { + bool changed = false; + while (true) { wiz_display_item(owner_ptr, q_ptr); if (!get_com("[a]ccept, [w]orthless, [c]ursed, [n]ormal, [g]ood, [e]xcellent, [s]pecial? ", &ch, FALSE)) { if (object_is_fixed_artifact(q_ptr)) { @@ -505,12 +505,12 @@ static void wiz_reroll_item(player_type *owner_ptr, object_type *o_ptr) q_ptr->name1 = 0; } - changed = FALSE; + changed = false; break; } if (ch == 'A' || ch == 'a') { - changed = TRUE; + changed = true; break; } @@ -666,16 +666,16 @@ void wiz_modify_item(player_type *creature_ptr) q_ptr = &forge; q_ptr->copy_from(o_ptr); char ch; - bool changed = FALSE; - while (TRUE) { + bool changed = false; + while (true) { wiz_display_item(creature_ptr, q_ptr); if (!get_com("[a]ccept [s]tatistics [r]eroll [t]weak [q]uantity? ", &ch, FALSE)) { - changed = FALSE; + changed = false; break; } if (ch == 'A' || ch == 'a') { - changed = TRUE; + changed = true; break; } @@ -767,15 +767,15 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo object_type *o_ptr = &forge; char o_name[MAX_NLEN]; - bool wish_art = FALSE; - bool wish_randart = FALSE; - bool wish_ego = FALSE; - bool exam_base = TRUE; - bool ok_art = (randint0(100) < prob) ? TRUE : FALSE; - bool ok_ego = (randint0(100) < 50 + prob) ? TRUE : FALSE; - bool must = (prob < 0) ? TRUE : FALSE; - bool blessed = FALSE; - bool fixed = TRUE; + bool wish_art = false; + bool wish_randart = false; + bool wish_ego = false; + bool exam_base = true; + bool ok_art = (randint0(100) < prob) ? TRUE : false; + bool ok_ego = (randint0(100) < 50 + prob) ? TRUE : false; + bool must = (prob < 0) ? TRUE : false; + bool blessed = false; + bool fixed = true; while (1) { if (get_string(_("何をお望み？ ", "For what do you wish?"), buf, (MAX_NLEN - 1))) @@ -801,14 +801,14 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo if (!strncmp(str, _("祝福された", "blessed"), _(10, 7))) { str = ltrim(str + _(10, 7)); - blessed = TRUE; + blessed = true; } for (int i = 0; fixed_str[i] != NULL; i++) { int len = strlen(fixed_str[i]); if (!strncmp(str, fixed_str[i], len)) { str = ltrim(str + len); - fixed = TRUE; + fixed = true; break; } } @@ -816,21 +816,21 @@ WishResult do_cmd_wishing(player_type *caster_ptr, int prob, bool allow_art, boo #ifdef JP if (!strncmp(str, "★", 2)) { str = ltrim(str + 2); - wish_art = TRUE; - exam_base = FALSE; + wish_art = true; + exam_base = false; } else #endif if (!strncmp(str, _("☆", "The "), _(2, 4))) { str = ltrim(str + _(2, 4)); - wish_art = TRUE; - wish_randart = TRUE; + wish_art = true; + wish_randart = true; } /* wishing random ego ? */ else if (!strncmp(str, _("高級な", "excellent "), _(6, 9))) { str = ltrim(str + _(6, 9)); - wish_ego = TRUE; + wish_ego = true; } if (strlen(str) < 1) { diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp index cd39bc770..fd7cfed17 100644 --- a/src/wizard/wizard-special-process.cpp +++ b/src/wizard/wizard-special-process.cpp @@ -477,8 +477,8 @@ void wiz_jump_to_dungeon(player_type *creature_ptr) if (!is_in_dungeon(creature_ptr)) creature_ptr->dungeon_idx = 0; - creature_ptr->current_floor_ptr->inside_arena = FALSE; - creature_ptr->wild_mode = FALSE; + creature_ptr->current_floor_ptr->inside_arena = false; + creature_ptr->wild_mode = false; leave_quest_check(creature_ptr); if (record_stair) exe_write_diary(creature_ptr, DIARY_WIZ_TELE, 0, NULL); @@ -487,7 +487,7 @@ void wiz_jump_to_dungeon(player_type *creature_ptr) PlayerEnergy(creature_ptr).reset_player_turn(); creature_ptr->energy_need = 0; prepare_change_floor_mode(creature_ptr, CFM_FIRST_FLOOR); - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } /*! @@ -719,7 +719,7 @@ void cheat_death(player_type *creature_ptr) msg_print(_("ウィザードモードに念を送り、死を欺いた。", "You invoke wizard mode and cheat death.")); msg_print(NULL); - creature_ptr->is_dead = FALSE; + creature_ptr->is_dead = false; (void)life_stream(creature_ptr, FALSE, FALSE); (void)restore_mana(creature_ptr, TRUE); (void)recall_player(creature_ptr, 0); @@ -730,8 +730,8 @@ void cheat_death(player_type *creature_ptr) floor_type *floor_ptr = creature_ptr->current_floor_ptr; floor_ptr->dun_level = 0; - floor_ptr->inside_arena = FALSE; - creature_ptr->phase_out = FALSE; + floor_ptr->inside_arena = false; + creature_ptr->phase_out = false; leaving_quest = 0; floor_ptr->inside_quest = 0; if (creature_ptr->dungeon_idx) @@ -754,8 +754,8 @@ void cheat_death(player_type *creature_ptr) creature_ptr->oldpx = 131; } - creature_ptr->wild_mode = FALSE; - creature_ptr->leaving = TRUE; + creature_ptr->wild_mode = false; + creature_ptr->leaving = true; exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, _(" しかし、生き返った。", " but revived.")); leave_floor(creature_ptr); diff --git a/src/wizard/wizard-spells.cpp b/src/wizard/wizard-spells.cpp index bc1d062b6..a58db8a28 100644 --- a/src/wizard/wizard-spells.cpp +++ b/src/wizard/wizard-spells.cpp @@ -48,7 +48,7 @@ bool wiz_debug_spell(player_type *creature_ptr) int tmp_int; if (!get_string("SPELL: ", tmp_val, 32)) - return FALSE; + return false; for (int i = 0; i < SPELL_MAX; i++) { if (strcmp(tmp_val, debug_spell_commands_list[i].command_name) != 0) @@ -57,15 +57,15 @@ bool wiz_debug_spell(player_type *creature_ptr) switch (debug_spell_commands_list[i].type) { case 2: (*(debug_spell_commands_list[i].command_function.spell2.spell_function))(creature_ptr); - return TRUE; + return true; break; case 3: tmp_val[0] = '\0'; if (!get_string("POWER:", tmp_val, 32)) - return FALSE; + return false; tmp_int = atoi(tmp_val); (*(debug_spell_commands_list[i].command_function.spell3.spell_function))(creature_ptr, tmp_int); - return TRUE; + return true; break; default: break; @@ -73,7 +73,7 @@ bool wiz_debug_spell(player_type *creature_ptr) } msg_format("Command not found."); - return FALSE; + return false; } /*! diff --git a/src/wizard/wizard-spoiler.cpp b/src/wizard/wizard-spoiler.cpp index 4788f2984..451ae91b5 100644 --- a/src/wizard/wizard-spoiler.cpp +++ b/src/wizard/wizard-spoiler.cpp @@ -53,16 +53,16 @@ static bool int_n_cmp(int *a, int *b, int length) { if (!length) - return TRUE; + return true; do { if (*a != *(b++)) - return FALSE; + return false; if (!(*(a++))) break; } while (--length); - return TRUE; + return true; } /*! @@ -82,11 +82,11 @@ static bool is_partial_tree(int *tree, int *partial_tree) while (*tree) { if (*(tree++) == pt_head) { if (int_n_cmp(tree, partial_tree, pt_len)) - return TRUE; + return true; } } - return FALSE; + return false; } /*! @@ -299,7 +299,7 @@ static spoiler_output_status spoil_player_spell(concptr fname) void exe_output_spoilers(void) { screen_save(); - while (TRUE) { + while (true) { auto status = spoiler_output_status::SPOILER_OUTPUT_CANCEL; term_clear(); prt("Create a spoiler file.", 2, 0); diff --git a/src/world/world-movement-processor.cpp b/src/world/world-movement-processor.cpp index 3a9f1a78d..e54d320b5 100644 --- a/src/world/world-movement-processor.cpp +++ b/src/world/world-movement-processor.cpp @@ -54,7 +54,7 @@ void execute_recall(player_type *creature_ptr) leave_quest_check(creature_ptr); leave_tower_check(creature_ptr); creature_ptr->current_floor_ptr->inside_quest = 0; - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; sound(SOUND_TPLEVEL); return; } @@ -85,14 +85,14 @@ void execute_recall(player_type *creature_ptr) creature_ptr->oldpy = creature_ptr->y; } - creature_ptr->wild_mode = FALSE; + creature_ptr->wild_mode = false; /* * Clear all saved floors * and create a first saved floor */ prepare_change_floor_mode(creature_ptr, CFM_FIRST_FLOOR); - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; if (creature_ptr->dungeon_idx != DUNGEON_ANGBAND) { sound(SOUND_TPLEVEL); @@ -141,7 +141,7 @@ void execute_floor_reset(player_type *creature_ptr) * and create a first saved floor */ prepare_change_floor_mode(creature_ptr, CFM_FIRST_FLOOR); - creature_ptr->leaving = TRUE; + creature_ptr->leaving = true; } else { msg_print(_("世界が少しの間変化したようだ。", "The world seems to change for a moment!")); } diff --git a/src/world/world-turn-processor.cpp b/src/world/world-turn-processor.cpp index bed7c2a23..275bffb26 100644 --- a/src/world/world-turn-processor.cpp +++ b/src/world/world-turn-processor.cpp @@ -64,9 +64,9 @@ void process_world(player_type *player_ptr) floor_ptr->dun_level = 0; player_ptr->dungeon_idx = 0; prepare_change_floor_mode(player_ptr, CFM_FIRST_FLOOR | CFM_RAND_PLACE); - floor_ptr->inside_arena = FALSE; - player_ptr->wild_mode = FALSE; - player_ptr->leaving = TRUE; + floor_ptr->inside_arena = false; + player_ptr->wild_mode = false; + player_ptr->leaving = true; } if (player_ptr->phase_out && !player_ptr->leaving) { @@ -221,7 +221,7 @@ void process_world(player_type *player_ptr) PlayerEnergy(player_ptr).set_player_turn_energy(100); } - player_ptr->invoking_midnight_curse = TRUE; + player_ptr->invoking_midnight_curse = true; } } diff --git a/src/world/world.cpp b/src/world/world.cpp index c04f7ee5e..7d3482128 100644 --- a/src/world/world.cpp +++ b/src/world/world.cpp @@ -15,9 +15,9 @@ bool is_daytime(void) { s32b len = TURNS_PER_TICK * TOWN_DAWN; if ((current_world_ptr->game_turn % len) < (len / 2)) - return TRUE; + return true; else - return FALSE; + return false; } /*! -- 2.11.0