X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd%2Fcmd-activate.c;h=56ef3d723b326e88544093a75883151543522aeb;hb=8601160dbf33565c79884a7c0d064bc47ead8be4;hp=4bf735f0c81a134795db6e4346b8a21a866c8647;hpb=7ae4e2b73c97fe47c5cc9ba0009bde3e88c8d764;p=hengband%2Fhengband.git

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 4bf735f0c..56ef3d723 100644
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -7,37 +7,31 @@
 */
 
 #include "angband.h"
-#include "util.h"
+#include "main/sound-definitions-table.h"
 
-#include "cmd-activate.h"
-#include "cmd-item.h"
-#include "cmd-basic.h"
-#include "floor.h"
+#include "cmd/cmd-activate.h"
+#include "cmd/cmd-basic.h"
+#include "cmd/cmd-save.h"
 #include "object-hook.h"
 #include "sort.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "spells.h"
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-object.h"
 #include "spells-floor.h"
 #include "player-effects.h"
-#include "realm-hex.h"
-#include "player-status.h"
+#include "realm/realm-hex.h"
 #include "player-damage.h"
 #include "player-inventory.h"
 #include "monster-status.h"
 #include "files.h"
-#include "objectkind.h"
+#include "object/object-kind.h"
 #include "object-ego.h"
-#include "grid.h"
 #include "targeting.h"
-#include "realm-song.h"
-#include "player-race.h"
-#include "player-class.h"
-#include "view-mainwindow.h"
 #include "world.h"
+#include "effect/spells-effect-util.h"
+#include "spell/spells-type.h"
 
 /*!
  * @brief 装備耐性に準じたブレス効果の選択テーブル /
@@ -859,8 +853,8 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
 	{
 		msg_format(_("あなたは%sに敵を締め殺すよう命じた。", "You order the %s to strangle your opponent."), name);
 		if (!get_aim_dir(user_ptr, &dir)) return FALSE;
-		if (hypodynamic_bolt(user_ptr, dir, 100))
-			break;
+		hypodynamic_bolt(user_ptr, dir, 100);
+		break;
 	}
 
 	case ACT_HYPODYNAMIA_2:
@@ -1142,7 +1136,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
 	{
 		if (o_ptr->name1 == ART_HYOUSIGI)
 		{
-			msg_print(_("拍子木を打った。", "You beat Your wooden clappers."));
+			msg_print(_("拍子木を打った。", "You beat your wooden clappers."));
 		}
 		else
 		{
@@ -1539,7 +1533,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
 	case ACT_TELEPORT:
 	{
 		msg_print(_("周りの空間が歪んでいる...", "It twists space around you..."));
-		teleport_player(user_ptr, 100, 0L);
+		teleport_player(user_ptr, 100, TELEPORT_SPONTANEOUS);
 		break;
 	}
 
@@ -1609,10 +1603,10 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
 		switch (randint1(13))
 		{
 		case 1: case 2: case 3: case 4: case 5:
-			teleport_player(user_ptr, 10, 0L);
+			teleport_player(user_ptr, 10, TELEPORT_SPONTANEOUS);
 			break;
 		case 6: case 7: case 8: case 9: case 10:
-			teleport_player(user_ptr, 222, 0L);
+			teleport_player(user_ptr, 222, TELEPORT_SPONTANEOUS);
 			break;
 		case 11: case 12:
 			(void)stair_creation(user_ptr);
@@ -1665,7 +1659,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr)
 
 	case ACT_PHASE_DOOR:
 	{
-		teleport_player(user_ptr, 10, 0L);
+		teleport_player(user_ptr, 10, TELEPORT_SPONTANEOUS);
 		break;
 	}