OSDN Git Service

[Refactor] #40483 Removed the inclusion of grid.h from grid.h
authorHourier <hourier@users.sourceforge.jp>
Sat, 20 Jun 2020 13:04:46 +0000 (22:04 +0900)
committerHourier <hourier@users.sourceforge.jp>
Sat, 20 Jun 2020 13:04:46 +0000 (22:04 +0900)
47 files changed:
src/cmd-action/cmd-spell.c
src/cmd-building/cmd-building.c
src/cmd-item/cmd-activate.c
src/combat/aura-counterattack.c
src/core/hp-mp-processor.c
src/core/player-processor.c
src/floor/fixed-map-generator.c
src/floor/floor-object.c
src/floor/floor.h
src/floor/geometry.c
src/floor/pattern-walk.c
src/grid/grid.h
src/inventory/player-inventory.c
src/io/save.c
src/knowledge/knowledge-items.c
src/market/building-quest.c
src/melee/melee-util.c
src/mind/mind-sniper.c
src/monster-floor/monster-death.c
src/monster-floor/monster-generator.c
src/monster-floor/monster-object.c
src/monster-floor/monster-remover.c
src/monster-floor/monster-runaway.c
src/monster-floor/monster-safety-hiding.c
src/monster-floor/monster-sweep-grid.c
src/monster/monster-compaction.c
src/monster/monster-info.c
src/monster/monster-list.c
src/monster/monster-update.c
src/mspell/mspell-learn-checker.c
src/mspell/mspell-learn-checker.h
src/mspell/mspell-special.c
src/mspell/mspell-util.c
src/mutation/mutation-processor.c
src/mutation/mutation.c
src/object/warning.c
src/spell-kind/earthquake.c
src/spell-kind/spells-genocide.c
src/spell-kind/spells-grid.c
src/spell-kind/spells-neighbor.c
src/spell-kind/spells-sight.c
src/spell-kind/spells-teleport.c
src/spell-realm/spells-crusade.c
src/spell/range-calc.c
src/spell/spells-status.c
src/util/sort.c
src/world/world-turn-processor.c

index fb34900..147fe70 100644 (file)
@@ -15,6 +15,7 @@
 #include "game-option/disturbance-options.h"
 #include "game-option/input-options.h"
 #include "game-option/text-display-options.h"
+#include "grid/grid.h"
 #include "inventory/player-inventory.h"
 #include "io/command-repeater.h"
 #include "io/input-key-acceptor.h"
index b1e6d31..dbed3e7 100644 (file)
@@ -26,6 +26,7 @@
 #include "floor/floor.h"
 #include "floor/wild.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "io/input-key-requester.h"
index 732a29d..f595f15 100644 (file)
@@ -20,6 +20,7 @@
 #include "game-option/input-options.h"
 #include "game-option/special-options.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "inventory/player-inventory.h"
 #include "io/files-util.h"
 #include "io/targeting.h"
index e23d96e..0e1da49 100644 (file)
@@ -7,6 +7,7 @@
 #include "combat/aura-counterattack.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
+#include "grid/grid.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags3.h"
index 7adb339..6a41860 100644 (file)
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "floor/pattern-walk.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
index 6a371fd..454e136 100644 (file)
@@ -6,6 +6,7 @@
 #include "floor/wild.h"
 #include "game-option/disturbance-options.h"
 #include "game-option/map-screen-options.h"
+#include "grid/grid.h"
 #include "inventory/pack-overflow.h"
 #include "io/input-key-acceptor.h"
 #include "io/input-key-processor.h"
index f9dcc61..d7c99e4 100644 (file)
@@ -4,6 +4,7 @@
 #include "floor/floor-town.h"
 #include "floor/floor.h"
 #include "floor/wild.h"
+#include "grid/grid.h"
 #include "grid/trap.h"
 #include "info-reader/general-parser.h"
 #include "info-reader/random-grid-effect-types.h"
index b38c2ba..9ffed7f 100644 (file)
@@ -10,6 +10,7 @@
 #include "game-option/cheat-options.h"
 #include "game-option/cheat-types.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "object-enchant/apply-magic.h"
index 42f03d5..77cab00 100644 (file)
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "grid/grid.h"
 #include "system/monster-type-definition.h"
 #include "system/object-type-definition.h"
 #include "floor/floor-save.h"
@@ -83,7 +82,7 @@
  */
 #define REDRAW_MAX 2298
 
-
+typedef struct grid_type grid_type;
 typedef struct floor_type {
        DUNGEON_IDX dungeon_idx;
        grid_type *grid_array[MAX_HGT];
index afe3cd4..217b546 100644 (file)
@@ -2,6 +2,7 @@
 #include "floor/geometry.h"
 #include "game-option/text-display-options.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "util/bit-flags-calculator.h"
 
 /*!
index 75ccb83..750d9ed 100644 (file)
@@ -6,6 +6,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/play-record-options.h"
 #include "game-option/special-options.h"
+#include "grid/grid.h"
 #include "io/input-key-requester.h"
 #include "io/write-diary.h"
 #include "player/player-damage.h"
index 5087dc4..892be69 100644 (file)
   * Note the special fields for the "MONSTER_FLOW" code.
   */
 
-typedef struct grid_type grid_type;
-
-struct grid_type
-{
+typedef struct grid_type {
        BIT_FLAGS info;         /* Hack -- grid flags */
 
        FEAT_IDX feat;          /* Hack -- feature type */
@@ -66,13 +63,10 @@ struct grid_type
        byte cost;              /* Hack -- cost of flowing */
        byte dist;              /* Hack -- distance from player */
        byte when;              /* Hack -- when cost was computed */
-};
+} grid_type;
 
-/*
- *  A structure type for terrain template of saving dungeon floor
- */
-typedef struct
-{
+/*  A structure type for terrain template of saving dungeon floor */
+typedef struct grid_template_type {
        BIT_FLAGS info;
        FEAT_IDX feat;
        FEAT_IDX mimic;
index f87b47f..327a84a 100644 (file)
@@ -8,6 +8,7 @@
 #include "game-option/option-flags.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
+#include "grid/grid.h"
 #include "inventory/inventory-object.h"
 #include "io/command-repeater.h"
 #include "io/input-key-acceptor.h"
index 5db6915..b1808f0 100644 (file)
@@ -28,6 +28,7 @@
 #include "game-option/runtime-arguments.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
+#include "grid/grid.h"
 #include "io/files-util.h"
 #include "io/load.h"
 #include "io/report.h"
index 49fd2ed..d1a71c4 100644 (file)
@@ -10,6 +10,7 @@
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "game-option/special-options.h"
+#include "grid/grid.h"
 #include "io-dump/dump-util.h"
 #include "io/input-key-acceptor.h"
 #include "knowledge/object-group-table.h"
index 4ff1c0e..c876a8f 100644 (file)
@@ -3,6 +3,7 @@
 #include "info-reader/fixed-map-parser.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
+#include "grid/grid.h"
 #include "market/building-util.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
index b2054c4..9d2e5e0 100644 (file)
@@ -1,5 +1,6 @@
 #include "melee/melee-util.h"
 #include "floor/floor.h"
+#include "grid/grid.h"
 #include "monster-race/monster-race.h"
 
 mam_type *initialize_mam_type(player_type *subject_ptr, mam_type *mam_ptr, MONRACE_IDX m_idx, MONRACE_IDX t_idx)
index cd9b97a..b217201 100644 (file)
@@ -11,6 +11,7 @@
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "game-option/text-display-options.h"
+#include "grid/grid.h"
 #include "io/command-repeater.h"
 #include "io/input-key-requester.h"
 #include "main/sound-definitions-table.h"
index 2a3288e..f33f76b 100644 (file)
@@ -11,6 +11,7 @@
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/play-record-options.h"
+#include "grid/grid.h"
 #include "io/write-diary.h"
 #include "lore/lore-store.h"
 #include "main/music-definitions-table.h"
index 13405ae..02e5192 100644 (file)
@@ -9,6 +9,7 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "game-option/cheat-options.h"
+#include "grid/grid.h"
 #include "monster-floor/one-monster-placer.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/monster-race-hook.h"
index 7e353e9..cf6114f 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-object.h"
 #include "floor/floor-object.h"
+#include "grid/grid.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags2.h"
index 37dd57f..bbd1c5e 100644 (file)
@@ -1,6 +1,7 @@
 #include "monster-floor/monster-remover.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
+#include "grid/grid.h"
 #include "io/targeting.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
index efa5e6e..6c1e6d3 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-runaway.h"
 #include "dungeon/quest.h"
+#include "grid/grid.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
index 770620d..3805268 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-safety-hiding.h"
 #include "floor/floor.h"
+#include "grid/grid.h"
 #include "monster-floor/monster-dist-offsets.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
index 49ff499..1b1ee56 100644 (file)
@@ -7,6 +7,7 @@
 #include "monster-floor/monster-sweep-grid.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
index 845ecf8..ad709fa 100644 (file)
@@ -1,6 +1,7 @@
 #include "monster/monster-compaction.h"
 #include "floor/floor.h"
 #include "game-option/play-record-options.h"
+#include "grid/grid.h"
 #include "io/targeting.h"
 #include "io/write-diary.h"
 #include "monster-race/monster-race.h"
index dbb1284..a416f21 100644 (file)
@@ -13,6 +13,7 @@
 #include "dungeon/quest.h"
 #include "floor/wild.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
index 88fccf2..f47c835 100644 (file)
@@ -15,6 +15,7 @@
 #include "floor/floor-object.h"
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
+#include "grid/grid.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
index 347543f..1a6814f 100644 (file)
@@ -8,6 +8,7 @@
 #include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"
 #include "game-option/disturbance-options.h"
+#include "grid/grid.h"
 #include "mind/drs-types.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
index 0502cc3..6005c6f 100644 (file)
@@ -1,5 +1,5 @@
-#include "system/angband.h"
-#include "floor/floor.h"
+#include "floor/floor.h"
+#include "grid/grid.h"
 #include "mspell-learn-checker.h"
 #include "world/world.h"
 
index c0871b1..e8c2eac 100644 (file)
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "system/angband.h"
+
 bool spell_learnable(player_type* target_ptr, MONSTER_IDX m_idx);
index 1956877..3fca93c 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "mspell/mspell-special.h"
 #include "effect/effect-characteristics.h"
+#include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "melee/melee-postprocess.h"
index dfb2251..01a0405 100644 (file)
@@ -1,4 +1,5 @@
 #include "mspell/mspell-util.h"
+#include "grid/grid.h"
 #include "monster/monster-info.h"
 #include "player/player-move.h"
 #include "view/display-messages.h"
index f697966..894e2b7 100644 (file)
@@ -1,4 +1,5 @@
 #include "mutation/mutation-processor.h"
+#include "grid/grid.h"
 #include "io/targeting.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
index 196fae5..2067406 100644 (file)
@@ -20,6 +20,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor.h"
 #include "game-option/play-record-options.h"
+#include "grid/grid.h"
 #include "io/files-util.h"
 #include "io/targeting.h"
 #include "io/write-diary.h"
index 72b30be..984101a 100644 (file)
@@ -5,6 +5,7 @@
 #include "floor/floor.h"
 #include "game-option/input-options.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "monster-attack/monster-attack-effect.h"
 #include "monster-attack/monster-attack-types.h"
 #include "monster-race/monster-race.h"
index 9a9bd16..9a4a717 100644 (file)
@@ -6,6 +6,7 @@
 #include "floor/floor.h"
 #include "game-option/play-record-options.h"
 #include "game-option/text-display-options.h"
+#include "grid/grid.h"
 #include "io/write-diary.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
index 623ba97..b8516ec 100644 (file)
@@ -5,6 +5,7 @@
 #include "floor/floor.h"
 #include "game-option/play-record-options.h"
 #include "game-option/special-options.h"
+#include "grid/grid.h"
 #include "io/write-diary.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
index 7f2c723..8944167 100644 (file)
@@ -4,6 +4,7 @@
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
+#include "grid/grid.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 
index 595740f..73be3f1 100644 (file)
@@ -2,6 +2,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "spell/process-effect.h"
 #include "spell-kind/earthquake.h"
 #include "spell/spell-types.h"
index 3b5a65d..20ab277 100644 (file)
@@ -3,6 +3,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
+#include "grid/grid.h"
 #include "io/input-key-acceptor.h"
 #include "locale/english.h"
 #include "lore/lore-store.h"
index f649a42..25fce73 100644 (file)
@@ -16,6 +16,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/play-record-options.h"
 #include "game-option/special-options.h"
+#include "grid/grid.h"
 #include "io/targeting.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
index a1a9026..18ae2cc 100644 (file)
@@ -8,6 +8,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "io/targeting.h"
 #include "spell/range-calc.h"
 #include "spell/process-effect.h"
index 14ed552..d5b9c02 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "spell/range-calc.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "spell/spell-types.h"
 #include "util/bit-flags-calculator.h"
 
index 6f4c68b..a6090e2 100644 (file)
@@ -10,6 +10,7 @@
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor-object.h"
+#include "grid/grid.h"
 #include "inventory/inventory-object.h"
 #include "io/targeting.h"
 #include "mind/mind-force-trainer.h"
index fa58b71..b41902c 100644 (file)
@@ -2,6 +2,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
+#include "grid/grid.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
index c70310e..ae10b9c 100644 (file)
@@ -11,6 +11,7 @@
 #include "game-option/cheat-options.h"
 #include "game-option/special-options.h"
 #include "game-option/text-display-options.h"
+#include "grid/grid.h"
 #include "inventory/inventory-curse.h"
 #include "inventory/recharge-processor.h"
 #include "io/write-diary.h"