[Refactor] #40457 Moved cmd-activate.* to cmd-item/

diff --git a/src/Makefile.am b/src/Makefile.am
index deb054b..24eaa74 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -336,7 +336,7 @@ hengband_SOURCES = \
        cmd/dump-util.c cmd/dump-util.h \
        cmd/monster-group-table.c cmd/monster-group-table.h \
        cmd/object-group-table.c cmd/object-group-table.h \
-       cmd/cmd-activate.c cmd/cmd-activate.h cmd/cmd-basic.c cmd/cmd-basic.h \
+       cmd/cmd-basic.c cmd/cmd-basic.h \
        cmd/cmd-draw.c cmd/cmd-draw.h \
        cmd/cmd-inn.c cmd/cmd-inn.h \
        cmd/lighting-level-table.c cmd/lighting-level-table.h \
@@ -360,6 +360,7 @@ hengband_SOURCES = \
        cmd-io/diary-subtitle-table.c cmd-io/diary-subtitle-table.h \
        cmd-io/feeling-table.c cmd-io/feeling-table.h \
        \
+       cmd-item/cmd-activate.c cmd-item/cmd-activate.h \
        cmd-item/cmd-eat.c cmd-item/cmd-eat.h \
        cmd-item/cmd-item.c cmd-item/cmd-item.h \
        cmd-item/cmd-magiceat.c cmd-item/cmd-magiceat.h \

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index b113b10..1c2f0ec 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -8,7 +8,7 @@
 
 #include "system/angband.h"
 #include "main/sound-definitions-table.h"
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 #include "cmd/cmd-basic.h"
 #include "cmd-io/cmd-save.h"
 #include "object/object-hook.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 7d70d87..9a7d5a9 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -16,7 +16,7 @@
 #include "term/gameterm.h"
 
 #include "player/selfinfo.h"
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 #include "cmd-item/cmd-eat.h"
 #include "cmd-item/cmd-quaff.h"
 #include "cmd-item/cmd-read.h"

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 6af8427..10c9b0b 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -61,7 +61,7 @@
 #include "grid/trap.h"
 #include "object/artifact.h"
 #include "object/sv-scroll-types.h"
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 #include "term/gameterm.h"
 #include "floor/wild.h"
 #include "view/display-main-window.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index d702bf4..6f1cc20 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -31,7 +31,7 @@
 #include "player/player-move.h" // do_cmd_travel() がある。後で移設する.
 #include "io/files-util.h"
 
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 #include "cmd/cmd-autopick.h"
 #include "cmd/cmd-building.h"
 #include "cmd-io/cmd-diary.h"

diff --git a/src/object/artifact.c b/src/object/artifact.c
index e8164af..024c0f9 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -18,7 +18,7 @@
 
 #include "player/avatar.h"
 #include "floor/floor.h"
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 #include "object/object1.h"
 #include "object/object-kind.h"
 #include "object/object-boost.h"

diff --git a/src/object/artifact.h b/src/object/artifact.h
index f97e464..2d9ee4f 100644 (file)
--- a/src/object/artifact.h
+++ b/src/object/artifact.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 
 typedef struct artifact_type artifact_type;
 

diff --git a/src/object/object-boost.c b/src/object/object-boost.c
index af125d4..fde2aa2 100644 (file)
--- a/src/object/object-boost.c
+++ b/src/object/object-boost.c
@@ -2,7 +2,7 @@
 #include "floor/floor.h"
 #include "object/object-boost.h"
 #include "object/object-boost.h"
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 #include "object/tr-types.h"
 
 /*!

diff --git a/src/object/object1.c b/src/object/object1.c
index 56a5864..89604b7 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -18,7 +18,7 @@
 #include "util/util.h"
 #include "object/artifact.h"
 #include "floor/floor.h"
-#include "cmd/cmd-activate.h"
+#include "cmd-item/cmd-activate.h"
 #include "object/item-apply-magic.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"