From adc89476bd40f70ea56ca307b6b586b9679d6218 Mon Sep 17 00:00:00 2001 From: Hourier Date: Mon, 8 Jun 2020 20:19:02 +0900 Subject: [PATCH] [Refactor] #40014 Renamed monster-process.c/h to monster-processor.c/h and monster-util.c/h to monster-processor-util.c/h --- Hengband/Hengband/Hengband.vcxproj | 8 ++++---- Hengband/Hengband/Hengband.vcxproj.filters | 24 +++++++++++----------- src/Makefile.am | 4 ++-- src/cmd-action/cmd-mane.c | 2 +- src/dungeon/dungeon-processor.c | 2 +- src/monster/monster-attack.h | 2 +- src/monster/monster-direction.c | 2 +- src/monster/monster-move.h | 2 +- src/monster/monster-object.h | 2 +- .../{monster-util.c => monster-processor-util.c} | 2 +- .../{monster-util.h => monster-processor-util.h} | 0 .../{monster-process.c => monster-processor.c} | 4 ++-- .../{monster-process.h => monster-processor.h} | 0 src/monster/monster-runaway.h | 2 +- src/monster/monster-safety-hiding.h | 2 +- src/monster/monster-status.c | 2 +- src/monster/monster-sweep-grid.h | 2 +- src/monster/monster-update.h | 2 +- src/spell/spells3.c | 2 +- 19 files changed, 33 insertions(+), 33 deletions(-) rename src/monster/{monster-util.c => monster-processor-util.c} (99%) rename src/monster/{monster-util.h => monster-processor-util.h} (100%) rename src/monster/{monster-process.c => monster-processor.c} (99%) rename src/monster/{monster-process.h => monster-processor.h} (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 0243fdeb4..5445390ce 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -431,7 +431,7 @@ - + @@ -443,7 +443,7 @@ - + @@ -915,7 +915,7 @@ - + @@ -980,7 +980,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 4302936a7..8d8f67853 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -62,9 +62,6 @@ monster - - monster - monster @@ -509,9 +506,6 @@ monster - - monster - monster @@ -1247,6 +1241,12 @@ player + + monster + + + monster + @@ -1309,9 +1309,6 @@ monster - - monster - monster @@ -1786,9 +1783,6 @@ monster - - monster - monster @@ -2716,6 +2710,12 @@ system + + monster + + + monster + diff --git a/src/Makefile.am b/src/Makefile.am index 7b0674084..3bac177d2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -287,7 +287,8 @@ hengband_SOURCES = \ monster/monster-flag-types.h \ monster/monster-move.c monster/monster-move.h \ monster/monster-object.c monster/monster-object.h \ - monster/monster-process.c monster/monster-process.h \ + monster/monster-processor.c monster/monster-processor.h \ + monster/monster-processor-util.c monster/monster-processor-util.h \ monster/monster-runaway.c monster/monster-runaway.h \ monster/monster-safety-hiding.c monster/monster-safety-hiding.h \ monster/monster-timed-effect-types.h \ @@ -296,7 +297,6 @@ hengband_SOURCES = \ monster/monster-status.c monster/monster-status.h \ monster/monster-sweep-grid.c monster/monster-sweep-grid.h \ monster/monster-update.c monster/monster-update.h \ - monster/monster-util.c monster/monster-util.h \ monster/quantum-effect.c monster/quantum-effect.h \ \ monster-attack/insults-moans.c monster-attack/insults-moans.h \ diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c index 92a635fe6..89a875358 100644 --- a/src/cmd-action/cmd-mane.c +++ b/src/cmd-action/cmd-mane.c @@ -17,7 +17,7 @@ #include "grid/grid.h" #include "io/targeting.h" #include "main/sound-definitions-table.h" -#include "monster/monster-process.h" +#include "monster/monster-processor.h" #include "monster/monster-status.h" #include "monster/monster2.h" #include "monster/place-monster-types.h" diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c index b642f9191..b15b87a58 100644 --- a/src/dungeon/dungeon-processor.c +++ b/src/dungeon/dungeon-processor.c @@ -9,7 +9,7 @@ #include "io/targeting.h" #include "io/write-diary.h" #include "market/arena.h" -#include "monster/monster-process.h" +#include "monster/monster-processor.h" #include "monster/monster-status.h" #include "monster/monster2.h" #include "player/player-effects.h" diff --git a/src/monster/monster-attack.h b/src/monster/monster-attack.h index b4ef3ce83..5ffff4d16 100644 --- a/src/monster/monster-attack.h +++ b/src/monster/monster-attack.h @@ -2,7 +2,7 @@ #include "system/angband.h" #include "grid/grid.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" void exe_monster_attack_to_player(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx); bool process_monster_attack_to_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, grid_type *g_ptr, bool can_cross); diff --git a/src/monster/monster-direction.c b/src/monster/monster-direction.c index 4c34f7ff2..8b6e9f6a7 100644 --- a/src/monster/monster-direction.c +++ b/src/monster/monster-direction.c @@ -7,7 +7,7 @@ #include "monster/monster-direction.h" #include "floor/floor.h" #include "monster/monster-sweep-grid.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" #include "monster/monster-status.h" #include "monster/monster2.h" #include "monster/smart-learn-types.h" diff --git a/src/monster/monster-move.h b/src/monster/monster-move.h index 78cdfc28c..d7bd03dc7 100644 --- a/src/monster/monster-move.h +++ b/src/monster/monster-move.h @@ -1,7 +1,7 @@ #pragma once #include "system/angband.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" bool process_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, DIRECTION *mm, POSITION oy, POSITION ox, int *count); void process_speak_sound(player_type *target_ptr, MONSTER_IDX m_idx, POSITION oy, POSITION ox, bool aware); diff --git a/src/monster/monster-object.h b/src/monster/monster-object.h index c94288aa7..2314bfc3d 100644 --- a/src/monster/monster-object.h +++ b/src/monster/monster-object.h @@ -7,6 +7,6 @@ #pragma once #include "system/angband.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" void update_object_by_monster_movement(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION ny, POSITION nx); diff --git a/src/monster/monster-util.c b/src/monster/monster-processor-util.c similarity index 99% rename from src/monster/monster-util.c rename to src/monster/monster-processor-util.c index 5e6718c3b..3408dda21 100644 --- a/src/monster/monster-util.c +++ b/src/monster/monster-processor-util.c @@ -7,7 +7,7 @@ * 引数に入っていたらここには移動させないこと */ -#include "monster-util.h" +#include "monster/monster-processor-util.h" #include "monster/monster-status.h" /*! diff --git a/src/monster/monster-util.h b/src/monster/monster-processor-util.h similarity index 100% rename from src/monster/monster-util.h rename to src/monster/monster-processor-util.h diff --git a/src/monster/monster-process.c b/src/monster/monster-processor.c similarity index 99% rename from src/monster/monster-process.c rename to src/monster/monster-processor.c index 99b9dbc07..90283605c 100644 --- a/src/monster/monster-process.c +++ b/src/monster/monster-processor.c @@ -13,7 +13,7 @@ * to improve the general quality of the AI (version 0.1.1). */ -#include "monster/monster-process.h" +#include "monster/monster-processor.h" #include "cmd-io/cmd-dump.h" #include "grid/feature.h" #include "grid/grid.h" @@ -28,7 +28,7 @@ #include "monster/monster-runaway.h" #include "monster/monster-status.h" #include "monster/monster-update.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" #include "monster/monster2.h" #include "monster/place-monster-types.h" #include "monster/quantum-effect.h" diff --git a/src/monster/monster-process.h b/src/monster/monster-processor.h similarity index 100% rename from src/monster/monster-process.h rename to src/monster/monster-processor.h diff --git a/src/monster/monster-runaway.h b/src/monster/monster-runaway.h index d0adfe39b..cb873b4b1 100644 --- a/src/monster/monster-runaway.h +++ b/src/monster/monster-runaway.h @@ -1,6 +1,6 @@ #pragma once #include "system/angband.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" bool runaway_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx); diff --git a/src/monster/monster-safety-hiding.h b/src/monster/monster-safety-hiding.h index 6b0af99bb..beffe09ed 100644 --- a/src/monster/monster-safety-hiding.h +++ b/src/monster/monster-safety-hiding.h @@ -1,7 +1,7 @@ #pragma once #include "system/angband.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" bool find_safety(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSITION *xp); bool find_hiding(player_type *target_ptr, MONSTER_IDX m_idx, POSITION *yp, POSITION *xp); diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c index dda120425..735d66a70 100644 --- a/src/monster/monster-status.c +++ b/src/monster/monster-status.c @@ -18,7 +18,7 @@ #include "monster/creature.h" #include "monster/monster-description-types.h" #include "monster/monster-flag-types.h" -#include "monster/monster-process.h" +#include "monster/monster-processor.h" #include "monster/monster2.h" #include "monster/place-monster-types.h" #include "monster/smart-learn-types.h" diff --git a/src/monster/monster-sweep-grid.h b/src/monster/monster-sweep-grid.h index e8d059ff9..6cdd355c5 100644 --- a/src/monster/monster-sweep-grid.h +++ b/src/monster/monster-sweep-grid.h @@ -1,6 +1,6 @@ #pragma once #include "system/angband.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" bool get_movable_grid(player_type *target_ptr, MONSTER_IDX m_idx, DIRECTION *mm); \ No newline at end of file diff --git a/src/monster/monster-update.h b/src/monster/monster-update.h index 42d61c3bd..58b0e7d0f 100644 --- a/src/monster/monster-update.h +++ b/src/monster/monster-update.h @@ -1,7 +1,7 @@ #pragma once #include "system/angband.h" -#include "monster/monster-util.h" +#include "monster/monster-processor-util.h" bool update_riding_monster(player_type *target_ptr, turn_flags *turn_flags_ptr, MONSTER_IDX m_idx, POSITION oy, POSITION ox, POSITION ny, POSITION nx); void update_player_type(player_type *target_ptr, turn_flags *turn_flags_ptr, monster_race *r_ptr); diff --git a/src/spell/spells3.c b/src/spell/spells3.c index e327f2fd2..24fbd52ba 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -37,7 +37,7 @@ #include "mind/mind-force-trainer.h" #include "monster/creature.h" #include "monster/monster-flag-types.h" -#include "monster/monster-process.h" +#include "monster/monster-processor.h" #include "monster/monster-status.h" #include "monster/monster2.h" #include "monster/place-monster-types.h" -- 2.11.0