From 8555d0ad720e1f5999a76c70c4fb9fc845241084 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 16 May 2020 11:52:08 +0900 Subject: [PATCH] [Refactor] #38862 Moved quest.c/h to dungeon/ --- Hengband/Hengband/Hengband.vcxproj | 4 ++-- Hengband/Hengband/Hengband.vcxproj.filters | 12 ++++++------ src/birth/birth.c | 2 +- src/cmd/cmd-basic.c | 2 +- src/cmd/cmd-dump.c | 2 +- src/cmd/cmd-item.c | 2 +- src/dungeon/dungeon-file.c | 2 +- src/dungeon/dungeon-processor.c | 2 +- src/{ => dungeon}/quest.c | 2 +- src/{ => dungeon}/quest.h | 0 src/effect/effect-monster-domination.c | 2 +- src/floor/floor-events.c | 2 +- src/floor/floor-generate.c | 2 +- src/floor/floor-save.c | 2 +- src/floor/floor.c | 2 +- src/floor/pattern-walk.c | 2 +- src/floor/wild.c | 2 +- src/grid/grid.c | 2 +- src/grid/trap.c | 2 +- src/io/character-dump.c | 2 +- src/io/input-key-processor.c | 2 +- src/io/load.c | 2 +- src/io/save.c | 2 +- src/io/targeting.c | 2 +- src/io/write-diary.c | 2 +- src/knowledge/knowledge-quests.c | 2 +- src/main-win.c | 2 +- src/main/init.c | 2 +- src/market/building.c | 2 +- src/monster/monster-runaway.c | 2 +- src/monster/monster1.c | 2 +- src/monster/monster2.c | 2 +- src/object/object-hook.c | 2 +- src/player/player-damage.c | 2 +- src/player/player-effects.c | 2 +- src/player/player-move.c | 2 +- src/player/player-status.c | 2 +- src/sort.c | 2 +- src/spell/mspells1.c | 2 +- src/spell/mspells2.c | 2 +- src/spell/spells-floor.c | 2 +- src/spell/spells2.c | 2 +- src/spell/spells3.c | 2 +- src/util.c | 2 +- src/view/display-main-window.c | 2 +- src/view/display-player.c | 2 +- src/wizard/wizard-special-process.c | 2 +- src/world/world-movement-processor.c | 2 +- 48 files changed, 53 insertions(+), 53 deletions(-) rename src/{ => dungeon}/quest.c (99%) rename src/{ => dungeon}/quest.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 6fdc1d59c..2d5357562 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -339,7 +339,7 @@ - + @@ -674,7 +674,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 2b922d0bf..0a475edc5 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -2,9 +2,6 @@ - - market - core @@ -839,11 +836,11 @@ io + + dungeon + - - market - core @@ -1723,6 +1720,9 @@ io + + dungeon + diff --git a/src/birth/birth.c b/src/birth/birth.c index f6380ee05..bba719314 100644 --- a/src/birth/birth.c +++ b/src/birth/birth.c @@ -50,7 +50,7 @@ #include "player/player-status.h" #include "player/process-name.h" #include "player/race-info-table.h" -#include "quest.h" +#include "dungeon/quest.h" #include "realm/realm.h" #include "io/save.h" #include "spell/spells-util.h" diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index e5038ca4d..07703fa76 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -26,7 +26,7 @@ #include "melee.h" #include "object/object-hook.h" #include "monster/monster-status.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "player/avatar.h" #include "player/player-status.h" diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 93ac298b8..656874776 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -42,7 +42,7 @@ #include "world/world.h" #include "view/display-player.h" // 暫定。後で消す. #include "player/player-personality.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "floor/floor-town.h" #include "cmd/feeling-table.h" diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c index 3799fa310..284ca4ad6 100644 --- a/src/cmd/cmd-item.c +++ b/src/cmd/cmd-item.c @@ -31,7 +31,7 @@ #include "object/object-hook.h" #include "object/object-ego.h" #include "sort.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "player/avatar.h" #include "player/player-status.h" diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c index 0e3701736..e63405cbf 100644 --- a/src/dungeon/dungeon-file.c +++ b/src/dungeon/dungeon-file.c @@ -41,7 +41,7 @@ #include "room/rooms-vault.h" #include "grid/feature.h" #include "grid/grid.h" -#include "quest.h" +#include "dungeon/quest.h" #include "monster/monster.h" #include "io/files.h" #include "player/player-skill.h" diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c index 6c0c11f58..c947b242f 100644 --- a/src/dungeon/dungeon-processor.c +++ b/src/dungeon/dungeon-processor.c @@ -3,7 +3,7 @@ #include "world/world.h" #include "io/targeting.h" #include "core/player-processor.h" -#include "quest.h" +#include "dungeon/quest.h" #include "dungeon/dungeon.h" #include "io/write-diary.h" #include "realm/realm-song.h" diff --git a/src/quest.c b/src/dungeon/quest.c similarity index 99% rename from src/quest.c rename to src/dungeon/quest.c index c0adf22a4..60e0216ee 100644 --- a/src/quest.c +++ b/src/dungeon/quest.c @@ -8,7 +8,7 @@ #include "floor/floor-save.h" #include "floor/floor-events.h" #include "grid/grid.h" -#include "quest.h" +#include "dungeon/quest.h" #include "monster/monsterrace-hook.h" #include "monster/monster.h" #include "player/player-status.h" diff --git a/src/quest.h b/src/dungeon/quest.h similarity index 100% rename from src/quest.h rename to src/dungeon/quest.h diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c index b2b2dc181..2c5220093 100644 --- a/src/effect/effect-monster-domination.c +++ b/src/effect/effect-monster-domination.c @@ -6,7 +6,7 @@ #include "monster/monster-status.h" #include "effect/spells-effect-util.h" #include "cmd/cmd-pet.h" // 暫定、後で消すかも. -#include "quest.h" +#include "dungeon/quest.h" #include "monster/monsterrace-hook.h" static void effect_monster_domination_corrupted_addition(player_type *caster_ptr, effect_monster_type *em_ptr) diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c index 6e140afa4..259d7571e 100644 --- a/src/floor/floor-events.c +++ b/src/floor/floor-events.c @@ -7,7 +7,7 @@ #include "grid/grid.h" #include "monster/monster.h" #include "monster/monster-status.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/object-hook.h" #include "player/player-move.h" #include "world/world.h" diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c index 9681bb661..d604871bf 100644 --- a/src/floor/floor-generate.c +++ b/src/floor/floor-generate.c @@ -116,7 +116,7 @@ #include "grid/feature.h" #include "grid/trap.h" #include "monster/monster.h" -#include "quest.h" +#include "dungeon/quest.h" #include "player/player-status.h" #include "floor/wild.h" #include "monster/monster-status.h" diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c index 4b8d0db01..1401cca9c 100644 --- a/src/floor/floor-save.c +++ b/src/floor/floor-save.c @@ -26,7 +26,7 @@ #include "floor/geometry.h" #include "grid/grid.h" #include "monster/monster.h" -#include "quest.h" +#include "dungeon/quest.h" #include "floor/wild.h" #include "spell/spells-floor.h" #include "monster/monster-status.h" diff --git a/src/floor/floor.c b/src/floor/floor.c index b43e78a45..d0fa52afd 100644 --- a/src/floor/floor.c +++ b/src/floor/floor.c @@ -5,7 +5,7 @@ #include "grid/grid.h" #include "dungeon/dungeon.h" #include "room/rooms.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/object-hook.h" #include "world/world.h" #include "player/player-effects.h" diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c index cd6e67e3f..689a0b99e 100644 --- a/src/floor/pattern-walk.c +++ b/src/floor/pattern-walk.c @@ -9,7 +9,7 @@ #include "realm/realm-song.h" #include "spell/spells3.h" #include "cmd/cmd-save.h" -#include "quest.h" +#include "dungeon/quest.h" /*! * @brief パターン終点到達時のテレポート処理を行う diff --git a/src/floor/wild.c b/src/floor/wild.c index d7b3f3370..3a9b7bc92 100644 --- a/src/floor/wild.c +++ b/src/floor/wild.c @@ -24,7 +24,7 @@ #include "player/player-effects.h" #include "grid/grid.h" #include "monster/monster-status.h" -#include "quest.h" +#include "dungeon/quest.h" #include "dungeon/dungeon-file.h" #include "io/tokenizer.h" #include "io/files.h" diff --git a/src/grid/grid.c b/src/grid/grid.c index f4376d96e..60e995b73 100644 --- a/src/grid/grid.c +++ b/src/grid/grid.c @@ -28,7 +28,7 @@ #include "grid/trap.h" #include "room/rooms.h" #include "monster/monster.h" -#include "quest.h" +#include "dungeon/quest.h" #include "grid/feature.h" #include "monster/monster-status.h" #include "player/player-status.h" diff --git a/src/grid/trap.c b/src/grid/trap.c index 5c71590bb..83743aba7 100644 --- a/src/grid/trap.c +++ b/src/grid/trap.c @@ -12,7 +12,7 @@ #include "player/player-class.h" #include "player/player-personality.h" #include "spell/spells-summon.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "grid/feature.h" #include "player/player-status.h" diff --git a/src/io/character-dump.c b/src/io/character-dump.c index 62fde49cd..64d0fb023 100644 --- a/src/io/character-dump.c +++ b/src/io/character-dump.c @@ -7,7 +7,7 @@ #include "cmd/cmd-pet.h" #include "monster/monster-status.h" #include "sort.h" -#include "quest.h" +#include "dungeon/quest.h" #include "main/init.h" #include "io/mutations-dump.h" #include "object/object-flavor.h" diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c index 8520263c9..cd327fbe7 100644 --- a/src/io/input-key-processor.c +++ b/src/io/input-key-processor.c @@ -18,7 +18,7 @@ #include "inventory/player-inventory.h" #include "player/player-effects.h" #include "market/store.h" // do_cmd_store() がある。後で移設する. -#include "quest.h" // do_cmd_quest() がある。後で移設する. +#include "dungeon/quest.h" // do_cmd_quest() がある。後で移設する. #include "floor/wild.h" #include "spell/spells-object.h" #include "mind/mind.h" // do_cmd_mind_browse() がある。後で移設する. diff --git a/src/io/load.c b/src/io/load.c index e8521b6c5..508e01d71 100644 --- a/src/io/load.c +++ b/src/io/load.c @@ -56,7 +56,7 @@ #include "mutation/mutation.h" #include "monster/monster.h" #include "market/store-util.h" -#include "quest.h" +#include "dungeon/quest.h" #include "market/store.h" #include "object/artifact.h" #include "player/avatar.h" diff --git a/src/io/save.c b/src/io/save.c index 29ede91a3..6e2ea3f74 100644 --- a/src/io/save.c +++ b/src/io/save.c @@ -21,7 +21,7 @@ #include "object/artifact.h" #include "sort.h" #include "dungeon/dungeon.h" -#include "quest.h" +#include "dungeon/quest.h" #include "market/store.h" #include "market/store-util.h" #include "floor/wild.h" diff --git a/src/io/targeting.c b/src/io/targeting.c index 70237d67e..1d6f1792f 100644 --- a/src/io/targeting.c +++ b/src/io/targeting.c @@ -37,7 +37,7 @@ #include "monster/monster-status.h" #include "view/display-main-window.h" #include "grid/feature.h" -#include "quest.h" +#include "dungeon/quest.h" #include "dungeon/dungeon.h" #include "world/world.h" #include "effect/spells-effect-util.h" diff --git a/src/io/write-diary.c b/src/io/write-diary.c index 51f2d9f2b..a7548e498 100644 --- a/src/io/write-diary.c +++ b/src/io/write-diary.c @@ -6,7 +6,7 @@ #include "io/write-diary.h" #include "system/system-variables.h" -#include "quest.h" +#include "dungeon/quest.h" #include "io/files.h" #include "dungeon/dungeon.h" #include "dungeon/dungeon-file.h" diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c index fa717921f..b11b72471 100644 --- a/src/knowledge/knowledge-quests.c +++ b/src/knowledge/knowledge-quests.c @@ -7,7 +7,7 @@ #include "system/angband.h" #include "knowledge-quests.h" #include "cmd/dump-util.h" -#include "quest.h" +#include "dungeon/quest.h" #include "system/system-variables.h" // 暫定、init_flagsのため。後で消すかも. #include "object/artifact.h" #include "object/object-flavor.h" diff --git a/src/main-win.c b/src/main-win.c index 3dfa33763..5fcdde127 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -107,7 +107,7 @@ #include "main/init.h" #include "io/files.h" #include "scores.h" -#include "quest.h" +#include "dungeon/quest.h" #include "io/files.h" #include "system/system-variables.h" #include "core/game-play.h" diff --git a/src/main/init.c b/src/main/init.c index 71790c608..b59924fc7 100644 --- a/src/main/init.c +++ b/src/main/init.c @@ -42,7 +42,7 @@ #include "object/artifact.h" #include "market/building.h" #include "main/init.h" -#include "quest.h" +#include "dungeon/quest.h" #include "grid/trap.h" #include "room/rooms.h" #include "market/store.h" diff --git a/src/market/building.c b/src/market/building.c index 108b849c1..6249c1c02 100644 --- a/src/market/building.c +++ b/src/market/building.c @@ -42,7 +42,7 @@ #include "market/building.h" #include "dungeon/dungeon.h" #include "mutation/mutation.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "cmd-spell.h" #include "spell/spells3.h" diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c index 4c1a492a6..b89ff2223 100644 --- a/src/monster/monster-runaway.c +++ b/src/monster/monster-runaway.c @@ -7,7 +7,7 @@ #include "monster/monster-runaway.h" #include "player/player-move.h" #include "cmd/cmd-pet.h" -#include "quest.h" +#include "dungeon/quest.h" /*! * @brief HPが1/3未満になった有効的なユニークモンスターの逃走処理を行う diff --git a/src/monster/monster1.c b/src/monster/monster1.c index efc10fdd5..868af5592 100644 --- a/src/monster/monster1.c +++ b/src/monster/monster1.c @@ -27,7 +27,7 @@ #include "monster/monsterrace-hook.h" #include "spell/spells-summon.h" #include "player/patron.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "player/avatar.h" #include "floor/wild.h" diff --git a/src/monster/monster2.c b/src/monster/monster2.c index e2c1dab7b..8b6d966c3 100644 --- a/src/monster/monster2.c +++ b/src/monster/monster2.c @@ -26,7 +26,7 @@ #include "monster/monster.h" #include "spell/spells-type.h" #include "spell/spells-summon.h" -#include "quest.h" +#include "dungeon/quest.h" #include "grid/grid.h" #include "player/player-move.h" #include "player/player-status.h" diff --git a/src/object/object-hook.c b/src/object/object-hook.c index fc7787ad8..9b9c5521f 100644 --- a/src/object/object-hook.c +++ b/src/object/object-hook.c @@ -8,7 +8,7 @@ #include "player/player-class.h" #include "player/player-skill.h" #include "player/mimic-info-table.h" -#include "quest.h" +#include "dungeon/quest.h" #include "world/world.h" #include "object/object-kind.h" #include "view/display-main-window.h" diff --git a/src/player/player-damage.c b/src/player/player-damage.c index 452d81638..75409e70c 100644 --- a/src/player/player-damage.c +++ b/src/player/player-damage.c @@ -27,7 +27,7 @@ #include "spell/monster-spell.h" #include "world/world.h" #include "view/display-main-window.h" -#include "quest.h" +#include "dungeon/quest.h" #include "io/report.h" #include "floor/wild.h" #include "io/save.h" diff --git a/src/player/player-effects.c b/src/player/player-effects.c index 61371fc65..6932e1d16 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -26,7 +26,7 @@ #include "birth/birth.h" #include "grid/grid.h" #include "mutation/mutation.h" -#include "quest.h" +#include "dungeon/quest.h" #include "player/avatar.h" #include "spell/spells-status.h" #include "realm/realm-song.h" diff --git a/src/player/player-move.c b/src/player/player-move.c index 853bcb504..2e7d7d046 100644 --- a/src/player/player-move.c +++ b/src/player/player-move.c @@ -152,7 +152,7 @@ #include "melee.h" #include "grid/grid.h" #include "grid/trap.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "player/player-move.h" #include "player/player-status.h" diff --git a/src/player/player-status.c b/src/player/player-status.c index 3f86ded1a..26dec8be9 100644 --- a/src/player/player-status.c +++ b/src/player/player-status.c @@ -4,7 +4,7 @@ #include "main/sound-definitions-table.h" #include "market/building.h" -#include "quest.h" +#include "dungeon/quest.h" #include "player/player-move.h" #include "player/player-status.h" #include "player/player-effects.h" diff --git a/src/sort.c b/src/sort.c index cc0b7ab28..f9858855d 100644 --- a/src/sort.c +++ b/src/sort.c @@ -1,7 +1,7 @@ #include "system/angband.h" #include "sort.h" #include "floor/floor.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "monster/monster-race.h" diff --git a/src/spell/mspells1.c b/src/spell/mspells1.c index 3d99dc6cc..919ced14a 100644 --- a/src/spell/mspells1.c +++ b/src/spell/mspells1.c @@ -45,7 +45,7 @@ #include "dungeon/dungeon.h" #include "grid/grid.h" #include "object/object-curse.h" -#include "quest.h" +#include "dungeon/quest.h" #include "realm/realm-hex.h" #include "player/player-move.h" #include "player/player-status.h" diff --git a/src/spell/mspells2.c b/src/spell/mspells2.c index 340222f40..075049760 100644 --- a/src/spell/mspells2.c +++ b/src/spell/mspells2.c @@ -18,7 +18,7 @@ #include "cmd-pet.h" #include "effect/effect-characteristics.h" #include "grid/grid.h" -#include "quest.h" +#include "dungeon/quest.h" #include "realm/realm-hex.h" #include "player/player-move.h" #include "player/player-class.h" diff --git a/src/spell/spells-floor.c b/src/spell/spells-floor.c index 15e56cafd..5c4af83c5 100644 --- a/src/spell/spells-floor.c +++ b/src/spell/spells-floor.c @@ -4,7 +4,7 @@ #include "dungeon/dungeon.h" #include "floor/floor.h" #include "grid/grid.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "object/object-kind.h" #include "object/object-flavor.h" diff --git a/src/spell/spells2.c b/src/spell/spells2.c index d13dd099b..406e7576d 100644 --- a/src/spell/spells2.c +++ b/src/spell/spells2.c @@ -33,7 +33,7 @@ #include "spell/spells3.h" #include "spell/spells-summon.h" #include "mutation/mutation.h" -#include "quest.h" +#include "dungeon/quest.h" #include "player/avatar.h" #include "spell/spells-status.h" diff --git a/src/spell/spells3.c b/src/spell/spells3.c index 1e2107546..1518d2c7d 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -34,7 +34,7 @@ #include "player/player-damage.h" #include "inventory/player-inventory.h" #include "spell/spells-summon.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "player/avatar.h" #include "spell/spells2.h" diff --git a/src/util.c b/src/util.c index cac2ff8da..7bc68e5c7 100644 --- a/src/util.c +++ b/src/util.c @@ -20,7 +20,7 @@ #include "io/files.h" #include "monster/monsterrace-hook.h" #include "view/display-main-window.h" -#include "quest.h" +#include "dungeon/quest.h" #include "floor/floor.h" #include "world/world.h" #include "io/write-diary.h" diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c index ded4ed7da..38f29c95c 100644 --- a/src/view/display-main-window.c +++ b/src/view/display-main-window.c @@ -22,7 +22,7 @@ #include "core/stuff-handler.h" #include "io/files.h" #include "world/world.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "player/avatar.h" #include "view/display-player.h" diff --git a/src/view/display-player.c b/src/view/display-player.c index 5d7af4c88..0f98b4e50 100644 --- a/src/view/display-player.c +++ b/src/view/display-player.c @@ -14,7 +14,7 @@ #include "player/player-sex.h" #include "player/patron.h" #include "world/world.h" -#include "quest.h" +#include "dungeon/quest.h" #include "system/system-variables.h" // 暫定。後で消す #include "knowledge/knowledge-mutations.h" #include "dungeon/dungeon-file.h" diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c index 9243a32d3..c81b04b3d 100644 --- a/src/wizard/wizard-special-process.c +++ b/src/wizard/wizard-special-process.c @@ -28,7 +28,7 @@ #include "player/selfinfo.h" #include "player/patron.h" #include "mutation/mutation.h" -#include "quest.h" +#include "dungeon/quest.h" #include "object/artifact.h" #include "player/player-status.h" #include "player/player-effects.h" diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c index 48e29119f..3e3ab7644 100644 --- a/src/world/world-movement-processor.c +++ b/src/world/world-movement-processor.c @@ -3,7 +3,7 @@ #include "main/sound-definitions-table.h" #include "io/write-diary.h" #include "dungeon/dungeon.h" -#include "quest.h" +#include "dungeon/quest.h" #include "world/world.h" #include "cmd/cmd-save.h" #include "player/player-move.h" -- 2.11.0