[Refactor] #40634 Separated activation-genocide.c/h from activation-switcher.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 5553ea5..eb7decb 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -305,6 +305,7 @@
     <ClCompile Include="..\..\src\object-activation\activation-bolt-ball.c" />\r
     <ClCompile Include="..\..\src\object-activation\activation-breath.c" />\r
     <ClCompile Include="..\..\src\object-activation\activation-charm.c" />\r
+    <ClCompile Include="..\..\src\object-activation\activation-genocide.c" />\r
     <ClCompile Include="..\..\src\object-activation\activation-resistance.c" />\r
     <ClCompile Include="..\..\src\object-activation\activation-teleport.c" />\r
     <ClCompile Include="..\..\src\object-activation\activation-util.c" />\r
@@ -925,6 +926,7 @@
     <ClInclude Include="..\..\src\object-activation\activation-bolt-ball.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-breath.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-charm.h" />\r
+    <ClInclude Include="..\..\src\object-activation\activation-genocide.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-resistance.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-teleport.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-util.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 9783599..ade6d2a 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2078,6 +2078,9 @@
     <ClCompile Include="..\..\src\specific-object\toragoroshi.c">
       <Filter>specific-object</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\object-activation\activation-genocide.c">
+      <Filter>object-activation</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -4507,6 +4510,9 @@
     <ClInclude Include="..\..\src\specific-object\toragoroshi.h">
       <Filter>specific-object</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\object-activation\activation-genocide.h">
+      <Filter>object-activation</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 38d62be..ff52dce 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -541,6 +541,7 @@ hengband_SOURCES = \
        object-activation/activation-bolt-ball.c object-activation/activation-bolt-ball.h \
        object-activation/activation-breath.c object-activation/activation-breath.h \
        object-activation/activation-charm.c object-activation/activation-charm.h \
+       object-activation/activation-genocide.c object-activation/activation-genocide.h \
        object-activation/activation-others.c object-activation/activation-others.h \
        object-activation/activation-resistance.c object-activation/activation-resistance.h \
        object-activation/activation-switcher.c object-activation/activation-switcher.h \

diff --git a/src/object-activation/activation-genocide.c b/src/object-activation/activation-genocide.c
new file mode 100644 (file)
index 0000000..d59727f
--- /dev/null
+++ b/src/object-activation/activation-genocide.c
@@ -0,0 +1,17 @@
+#include "object-activation/activation-genocide.h"
+#include "spell-kind/spells-genocide.h"
+#include "view/display-messages.h"
+
+bool activate_genocide(player_type *user_ptr)
+{
+    msg_print(_("\90[\90Â\90F\82É\8bP\82¢\82Ä\82¢\82é...", "It glows deep blue..."));
+    (void)symbol_genocide(user_ptr, 200, TRUE);
+    return TRUE;
+}
+
+bool activate_mass_genocide(player_type *user_ptr)
+{
+    msg_print(_("\82Ð\82Ç\82­\89s\82¢\89¹\82ª\97¬\82ê\8fo\82½...", "It lets out a long, shrill note..."));
+    (void)mass_genocide(user_ptr, 200, TRUE);
+    return TRUE;
+}

diff --git a/src/object-activation/activation-genocide.h b/src/object-activation/activation-genocide.h
new file mode 100644 (file)
index 0000000..df61956
--- /dev/null
+++ b/src/object-activation/activation-genocide.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "system/angband.h"
+
+bool activate_genocide(player_type *user_ptr);
+bool activate_mass_genocide(player_type *user_ptr);

diff --git a/src/object-activation/activation-others.c b/src/object-activation/activation-others.c
index f0d50ca..0f1e456 100644 (file)
--- a/src/object-activation/activation-others.c
+++ b/src/object-activation/activation-others.c
@@ -311,4 +311,12 @@ bool activate_terror(player_type *user_ptr)
     turn_monsters(user_ptr, 40 + user_ptr->lev);
     return TRUE;
 
-}
\ No newline at end of file
+}
+
+bool activate_map_light(player_type *user_ptr)
+{
+    msg_print(_("á¿\82µ\82­\8bP\82¢\82½...", "It shines brightly..."));
+    map_area(user_ptr, DETECT_RAD_MAP);
+    lite_area(user_ptr, damroll(2, 15), 3);
+    return TRUE;
+}

diff --git a/src/object-activation/activation-others.h b/src/object-activation/activation-others.h
index 2260836..5f6e93c 100644 (file)
--- a/src/object-activation/activation-others.h
+++ b/src/object-activation/activation-others.h
@@ -32,3 +32,4 @@ bool activate_recharge(player_type *user_ptr);
 bool activate_recharge_extra(player_type *user_ptr, concptr name);
 bool activate_shikofumi(player_type *user_ptr);
 bool activate_terror(player_type *user_ptr);
+bool activate_map_light(player_type *user_ptr);

diff --git a/src/object-activation/activation-switcher.c b/src/object-activation/activation-switcher.c
index 00509d4..39443b2 100644 (file)
--- a/src/object-activation/activation-switcher.c
+++ b/src/object-activation/activation-switcher.c
@@ -11,6 +11,7 @@
 #include "object-activation/activation-bolt-ball.h"
 #include "object-activation/activation-breath.h"
 #include "object-activation/activation-charm.h"
+#include "object-activation/activation-genocide.h"
 #include "object-activation/activation-others.h"
 #include "object-activation/activation-resistance.h"
 #include "object-activation/activation-teleport.h"
@@ -23,8 +24,6 @@
 #include "specific-object/muramasa.h"
 #include "specific-object/ring-of-power.h"
 #include "specific-object/toragoroshi.h"
-#include "spell-kind/spells-floor.h"
-#include "spell-kind/spells-genocide.h"
 #include "spell-kind/spells-grid.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
@@ -141,13 +140,9 @@ bool switch_activation(player_type *user_ptr, object_type *o_ptr, const activati
     case ACT_BANISH_EVIL:
         return activate_banish_evil(user_ptr);
     case ACT_GENOCIDE:
-        msg_print(_("深青色に輝いている...", "It glows deep blue..."));
-        (void)symbol_genocide(user_ptr, 200, TRUE);
-        return TRUE;
+        return activate_genocide(user_ptr);
     case ACT_MASS_GENO:
-        msg_print(_("ひどく鋭い音が流れ出た...", "It lets out a long, shrill note..."));
-        (void)mass_genocide(user_ptr, 200, TRUE);
-        return TRUE;
+        return activate_mass_genocide(user_ptr);
     case ACT_SCARE_AREA:
         return activate_scare(user_ptr);
     case ACT_AGGRAVATE:
@@ -275,10 +270,7 @@ bool switch_activation(player_type *user_ptr, object_type *o_ptr, const activati
         lite_area(user_ptr, damroll(2, 15), 3);
         return TRUE;
     case ACT_MAP_LIGHT:
-        msg_print(_("眩しく輝いた...", "It shines brightly..."));
-        map_area(user_ptr, DETECT_RAD_MAP);
-        lite_area(user_ptr, damroll(2, 15), 3);
-        return TRUE;
+        return activate_map_light(user_ptr);
     case ACT_DETECT_ALL:
         return activate_all_detection(user_ptr);
     case ACT_DETECT_XTRA: