[Refactor] #38862 Moved angband.h, h-*.h and system-variables.c/h

[hengband/hengband.git] / src / cmd / cmd-quaff.c

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 8aa4616..0b2e22c 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -6,30 +6,31 @@
  * cmd6.cより分離。
  */
 
-#include "angband.h"
+#include "system/angband.h"
 #include "util.h"
+#include "main/sound-definitions-table.h"
 
-#include "birth.h"
+#include "birth/birth.h"
 #include "selfinfo.h"
-#include "object-hook.h"
-#include "mutation.h"
+#include "object/object-hook.h"
+#include "mutation/mutation.h"
 #include "avatar.h"
-#include "spells.h"
+#include "spell/spells2.h"
+#include "spell/spells3.h"
 #include "spells-status.h"
-#include "player-effects.h"
-#include "player-status.h"
-#include "player-damage.h"
-#include "player-race.h"
+#include "player/player-effects.h"
+#include "player/player-status.h"
+#include "player/player-damage.h"
+#include "player/mimic-info-table.h"
 #include "player-inventory.h"
-#include "realm-hex.h"
-#include "realm-song.h"
+#include "realm/realm-hex.h"
 #include "spells-floor.h"
-#include "object-broken.h"
+#include "object/object-broken.h"
 #include "cmd-basic.h"
-#include "floor.h"
-#include "objectkind.h"
-#include "view-mainwindow.h"
-#include "player-class.h"
+#include "floor/floor.h"
+#include "object/object-kind.h"
+#include "view/display-main-window.h"
+#include "player/player-class.h"
 
 /*!
  * @brief 薬を飲むコマンドのサブルーチン /
@@ -51,7 +52,7 @@ void exe_quaff_potion(player_type *creature_ptr, INVENTORY_IDX item)
        if (creature_ptr->timewalk)
        {
                if (flush_failure) flush();
-               msg_print(_("瓶から水が流れ出てこない！", "The potion doesn't flow out from a bottle."));
+               msg_print(_("瓶から水が流れ出てこない！", "The potion doesn't flow out from the bottle."));
 
                sound(SOUND_FAIL);
                return;
@@ -492,7 +493,7 @@ void exe_quaff_potion(player_type *creature_ptr, INVENTORY_IDX item)
        if (PRACE_IS_(creature_ptr, RACE_SKELETON))
        {
                msg_print(_("液体の一部はあなたのアゴを素通りして落ちた！", "Some of the fluid falls through your jaws!"));
-               (void)potion_smash_effect(0, creature_ptr->y, creature_ptr->x, q_ptr->k_idx);
+               (void)potion_smash_effect(creature_ptr, 0, creature_ptr->y, creature_ptr->x, q_ptr->k_idx);
        }
        creature_ptr->update |= (PU_COMBINE | PU_REORDER);