[Refactor] #40634 Renamed cmd-activate.c/h to activation-switcher.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 317be2e..8225f1c 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -577,7 +577,7 @@
     <ClCompile Include="..\..\src\io-dump\character-dump.c" />\r
     <ClCompile Include="..\..\src\specific-object\chest.c" />\r
     <ClCompile Include="..\..\src\io\chuukei.c" />\r
-    <ClCompile Include="..\..\src\cmd-item\cmd-activate.c" />\r
+    <ClCompile Include="..\..\src\object-activation\activation-switcher.c" />\r
     <ClCompile Include="..\..\src\cmd-action\cmd-others.c" />\r
     <ClCompile Include="..\..\src\cmd-io\cmd-diary.c" />\r
     <ClCompile Include="..\..\src\cmd-visual\cmd-draw.c" />\r
@@ -1388,7 +1388,7 @@
     <ClCompile Include="..\..\src\term\z-term.c" />\r
     <ClCompile Include="..\..\src\term\z-util.c" />\r
     <ClCompile Include="..\..\src\term\z-virt.c" />\r
-    <ClInclude Include="..\..\src\cmd-item\cmd-activate.h" />\r
+    <ClInclude Include="..\..\src\object-activation\activation-switcher.h" />\r
     <ClInclude Include="..\..\src\cmd-action\cmd-others.h" />\r
     <ClInclude Include="..\..\src\cmd-io\cmd-diary.h" />\r
     <ClInclude Include="..\..\src\cmd-visual\cmd-draw.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 334133a..ed2f1f7 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -794,9 +794,6 @@
     <ClCompile Include="..\..\src\cmd-action\cmd-spell.c">
       <Filter>cmd-action</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cmd-item\cmd-activate.c">
-      <Filter>cmd-item</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cmd-io\cmd-autopick.c">
       <Filter>cmd-io</Filter>
     </ClCompile>
@@ -2042,6 +2039,9 @@
     <ClCompile Include="..\..\src\object-activation\activation-breath.c">
       <Filter>object-activation</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\object-activation\activation-switcher.c">
+      <Filter>object-activation</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -2899,9 +2899,6 @@
     <ClInclude Include="..\..\src\cmd-action\cmd-spell.h">
       <Filter>cmd-action</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cmd-item\cmd-activate.h">
-      <Filter>cmd-item</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\cmd-io\cmd-autopick.h">
       <Filter>cmd-io</Filter>
     </ClInclude>
@@ -4435,6 +4432,9 @@
     <ClInclude Include="..\..\src\object-activation\activation-breath.h">
       <Filter>object-activation</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object-activation\activation-switcher.h">
+      <Filter>object-activation</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index fa2776d..151f9c0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,7 +124,6 @@ hengband_SOURCES = \
        cmd-io/feeling-table.c cmd-io/feeling-table.h \
        cmd-io/macro-util.c cmd-io/macro-util.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 \
@@ -540,6 +539,7 @@ hengband_SOURCES = \
        object/item-use-flags.h \
        \
        object-activation/activation-breath.c object-activation/activation-breath.h \
+       object-activation/acrivation-switcher.c object-activation/acrivation-switcher.h \
        \
        object-enchant/activation-info-table.c object-enchant/activation-info-table.h \
        object-enchant/apply-magic.c object-enchant/apply-magic.h \

diff --git a/src/action/activation-execution.c b/src/action/activation-execution.c
index b358ab6..1fc4ca9 100644 (file)
--- a/src/action/activation-execution.c
+++ b/src/action/activation-execution.c
@@ -13,6 +13,7 @@
 #include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "monster/monster-util.h"
+#include "object-activation/activation-switcher.h"
 #include "object-enchant/object-ego.h"
 #include "object-hook/hook-enchant.h"
 #include "object/object-info.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 1ff3751..1f47281 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -18,7 +18,6 @@
 #include "autopick/autopick.h"
 #include "cmd-action/cmd-open-close.h"
 #include "cmd-action/cmd-pet.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"
@@ -48,6 +47,7 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "mind/snipe-types.h"
+#include "object-activation/activation-switcher.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/object-ego.h"
 #include "object-enchant/special-object-flags.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/object-activation/activation-switcher.c
similarity index 99%
rename from src/cmd-item/cmd-activate.c
rename to src/object-activation/activation-switcher.c
index d9656eb..126a24e 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/object-activation/activation-switcher.c
@@ -4,7 +4,7 @@
  * @author deskull
  */
 
-#include "cmd-item/cmd-activate.h"
+#include "object-activation/activation-switcher.h"
 #include "action/action-limited.h"
 #include "action/activation-execution.h"
 #include "artifact/artifact-info.h"

diff --git a/src/cmd-item/cmd-activate.h b/src/object-activation/activation-switcher.h
similarity index 100%
rename from src/cmd-item/cmd-activate.h
rename to src/object-activation/activation-switcher.h

diff --git a/src/system/artifact-type-definition.h b/src/system/artifact-type-definition.h
index 5ae8f93..4a511ad 100644 (file)
--- a/src/system/artifact-type-definition.h
+++ b/src/system/artifact-type-definition.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "cmd-item/cmd-activate.h"
-#include "object-enchant/activation-info-table.h"
+#include "system/object-type-definition.h"
 
 /*!
  * @struct artifact_type