[Refactor] #38862 Moved player-*.c/h to player/ except for player-inventory.c/h

[hengband/hengband.git] / src / mspells1.c

diff --git a/src/mspells1.c b/src/mspells1.c
index 1caa7e4..b448ccb 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -41,22 +41,24 @@
 #include "angband.h"
 #include "util.h"
 
-#include "floor.h"
-#include "dungeon.h"
+#include "effect/effect-characteristics.h"
+#include "dungeon/dungeon.h"
 #include "grid.h"
-#include "object-curse.h"
+#include "object/object-curse.h"
 #include "quest.h"
-#include "realm-hex.h"
-#include "player-move.h"
-#include "player-status.h"
+#include "realm/realm-hex.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
 #include "monster.h"
 #include "monster-spell.h"
-#include "spells.h"
-#include "world.h"
-#include "realm-song.h"
-#include "view-mainwindow.h"
-#include "player-race.h"
-#include "player-class.h"
+#include "spell/spells-type.h"
+#include "world/world.h"
+#include "realm/realm-song.h"
+#include "view/display-main-window.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
+#include "spell/process-effect.h"
+#include "spell/spells3.h"
 
 #define DO_SPELL_NONE    0
 #define DO_SPELL_BR_LITE 1
@@ -434,7 +436,7 @@ bool raise_possible(player_type *target_ptr, monster_type *m_ptr)
                                /* Known to be worthless? */
                                if (o_ptr->tval == TV_CORPSE)
                                {
-                                       if (!monster_has_hostile_align(m_ptr, 0, 0, &r_info[o_ptr->pval])) return TRUE;
+                                       if (!monster_has_hostile_align(target_ptr, m_ptr, 0, 0, &r_info[o_ptr->pval])) return TRUE;
                                }
                        }
                }
@@ -469,7 +471,7 @@ bool clean_shot(player_type *target_ptr, POSITION y1, POSITION x1, POSITION y2,
        /* Check the projection path */
        floor_type *floor_ptr = target_ptr->current_floor_ptr;
        u16b grid_g[512];
-       int grid_n = grid_n = project_path(target_ptr, grid_g, MAX_RANGE, y1, x1, y2, x2, 0);
+       int grid_n = project_path(target_ptr, grid_g, MAX_RANGE, y1, x1, y2, x2, 0);
 
        /* No grid is ever projectable from itself */
        if (!grid_n) return FALSE;
@@ -1641,9 +1643,8 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr)
 
 #ifdef JP
 #else
-
        /* Get the monster possessive ("his"/"her"/"its") */
-       monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
+       monster_desc(target_ptr, m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 #endif
 
        SPELL_IDX thrown_spell = 0;
@@ -1746,7 +1747,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr)
        }
 
        /* Cast the spell. */
-       int dam = monspell_to_player(thrown_spell, target_ptr, y, x, m_idx);
+       int dam = monspell_to_player(target_ptr, thrown_spell, y, x, m_idx);
        if (dam < 0) return FALSE;
 
        if ((target_ptr->action == ACTION_LEARN) && thrown_spell > 175)