From bb5d50681bd4ad7d7f32068c3df175cd74b0db16 Mon Sep 17 00:00:00 2001 From: Hourier Date: Mon, 8 Jun 2020 20:29:08 +0900 Subject: [PATCH] [Refactor] #40014 Renamed creature.c/h to speed-table.c/h --- Hengband/Hengband/Hengband.vcxproj | 4 ++-- Hengband/Hengband/Hengband.vcxproj.filters | 12 ++++++------ src/Makefile.am | 2 +- src/core/game-play.c | 2 +- src/core/player-processor.c | 2 +- src/{monster/creature.c => core/speed-table.c} | 10 ++++------ src/{monster/creature.h => core/speed-table.h} | 6 +++++- src/mind/monk-attack.c | 2 +- src/monster/monster-move.c | 2 +- src/monster/monster-processor.c | 2 +- src/monster/monster-status.c | 2 +- src/monster/monster2.c | 2 +- src/player/digestion-processor.c | 2 +- src/player/player-effects.c | 2 +- src/spell-kind/spells-teleport.c | 2 +- src/spell/spells3.c | 2 +- 16 files changed, 29 insertions(+), 27 deletions(-) rename src/{monster/creature.c => core/speed-table.c} (95%) rename src/{monster/creature.h => core/speed-table.h} (80%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 5445390ce..85ef95ffe 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -398,7 +398,7 @@ - + @@ -957,7 +957,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 8d8f67853..c9055cda5 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -575,9 +575,6 @@ floor - - monster - io @@ -1247,6 +1244,9 @@ monster + + core + @@ -1870,9 +1870,6 @@ floor - - monster - io @@ -2716,6 +2713,9 @@ monster + + core + diff --git a/src/Makefile.am b/src/Makefile.am index 3bac177d2..6aa19e359 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -115,6 +115,7 @@ hengband_SOURCES = \ core/player-processor.c core/player-processor.h \ core/scores.c core/scores.h \ core/sort.c core/sort.h \ + core/speed-table.c core/speed-table.h \ core/visuals-reseter.c core/visuals-reseter.h \ \ dungeon/dungeon.c dungeon/dungeon.h \ @@ -276,7 +277,6 @@ hengband_SOURCES = \ mind/racial-draconian.c mind/racial-draconian.h \ mind/racial-vampire.c mind/racial-vampire.h \ \ - monster/creature.h monster/creature.c \ monster/horror-descriptions.c monster/horror-descriptions.h \ monster/monster1.c monster/monster1.h \ monster/monster2.c monster/monster2.h \ diff --git a/src/core/game-play.c b/src/core/game-play.c index 4eee8df64..0b9e6eded 100644 --- a/src/core/game-play.c +++ b/src/core/game-play.c @@ -39,7 +39,7 @@ #include "market/arena-info-table.h" #include "market/bounty.h" #include "monster-race/race-indice-types.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster2.h" #include "monster/place-monster-types.h" #include "object/object-flavor.h" diff --git a/src/core/player-processor.c b/src/core/player-processor.c index 99848d906..71b0ada35 100644 --- a/src/core/player-processor.c +++ b/src/core/player-processor.c @@ -6,7 +6,7 @@ #include "inventory/pack-overflow.h" #include "io/input-key-processor.h" #include "mind/mind-force-trainer.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster-race/monster-race-hook.h" #include "monster/monster-flag-types.h" #include "monster/monster-status.h" diff --git a/src/monster/creature.c b/src/core/speed-table.c similarity index 95% rename from src/monster/creature.c rename to src/core/speed-table.c index 3940c63ad..5aa1ca0f8 100644 --- a/src/monster/creature.c +++ b/src/core/speed-table.c @@ -1,11 +1,11 @@ -#include "system/angband.h" -#include "monster/creature.h" +#include "core/speed-table.h" /*! * @brief 加速値による実質速度修正倍率テーブル / * This table allows quick conversion from "speed" to "energy" + * @date 2019/05/10 + * @author deskull * @details - * 
  * The basic function WAS ((S>=110) ? (S-110) : (100 / (120-S)))
  * Note that table access is *much* quicker than computation.
  *
@@ -26,10 +26,8 @@
  * 100 units to 50 units, though this may interact badly with
  * the (compiled out) small random energy boost code.  It may
  * also tend to cause more "clumping" at high speeds.
- *
*/ -const byte extract_energy[200] = -{ +const byte extract_energy[NUM_SPEED] = { /* Slow */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* Slow */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* Slow */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, diff --git a/src/monster/creature.h b/src/core/speed-table.h similarity index 80% rename from src/monster/creature.h rename to src/core/speed-table.h index 7ea994da5..0f6a1cea6 100644 --- a/src/monster/creature.h +++ b/src/core/speed-table.h @@ -1,9 +1,13 @@ #pragma once +#include "system/angband.h" + +#define NUM_SPEED 200 + /*! @brief 消費する行動エネルギー値を正規乱数で返す(中央100/分散25) / Random energy */ #define ENERGY_NEED() (randnor(100, 25)) /*! @brief 加速値に応じた基本行動エネルギー消費量を返す / Extract energy from speed (Assumes that SPEED is unsigned) */ #define SPEED_TO_ENERGY(SPEED) (((SPEED) > 199) ? 49 : extract_energy[(SPEED)]) -extern const byte extract_energy[200]; +extern const byte extract_energy[NUM_SPEED]; diff --git a/src/mind/monk-attack.c b/src/mind/monk-attack.c index a5ae3398d..0e863c8ce 100644 --- a/src/mind/monk-attack.c +++ b/src/mind/monk-attack.c @@ -13,7 +13,7 @@ #include "io/targeting.h" #include "main/sound-definitions-table.h" #include "mind/mind-force-trainer.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster-status.h" #include "world/world.h" diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c index 9f516462e..3621ac1ba 100644 --- a/src/monster/monster-move.c +++ b/src/monster/monster-move.c @@ -8,7 +8,7 @@ #include "effect/effect-characteristics.h" #include "io/files-util.h" #include "monster-race/race-indice-types.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster-attack.h" #include "monster/monster-flag-types.h" #include "monster/monster-object.h" diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c index 90283605c..d5844978b 100644 --- a/src/monster/monster-processor.c +++ b/src/monster/monster-processor.c @@ -20,7 +20,7 @@ #include "io/write-diary.h" #include "melee/melee-postprocess.h" #include "monster-race/race-indice-types.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster-description-types.h" #include "monster/monster-direction.h" #include "monster/monster-flag-types.h" diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c index 735d66a70..678470557 100644 --- a/src/monster/monster-status.c +++ b/src/monster/monster-status.c @@ -15,7 +15,7 @@ #include "monster-attack/monster-attack-types.h" #include "monster-race/monster-race-hook.h" #include "monster-race/race-indice-types.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster-description-types.h" #include "monster/monster-flag-types.h" #include "monster/monster-processor.h" diff --git a/src/monster/monster2.c b/src/monster/monster2.c index d0f6a99c1..9ca2fbd82 100644 --- a/src/monster/monster2.c +++ b/src/monster/monster2.c @@ -26,7 +26,7 @@ #include "mind/drs-types.h" #include "monster-attack/monster-attack-types.h" #include "monster-race/race-indice-types.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster-race/monster-race-hook.h" #include "monster-race/monster-race.h" #include "monster/monster-description-types.h" diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c index 7b82547a6..a02eee370 100644 --- a/src/player/digestion-processor.c +++ b/src/player/digestion-processor.c @@ -1,5 +1,5 @@ #include "player/digestion-processor.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "object-enchant/trc-types.h" #include "player/player-damage.h" #include "player/player-effects.h" diff --git a/src/player/player-effects.c b/src/player/player-effects.c index 683c3f185..53b6b3513 100644 --- a/src/player/player-effects.c +++ b/src/player/player-effects.c @@ -29,7 +29,7 @@ #include "io/files-util.h" #include "io/report.h" #include "io/save.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster-status.h" #include "mspell/monster-spell.h" #include "mutation/mutation.h" diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c index bd855687b..11b398ddf 100644 --- a/src/spell-kind/spells-teleport.c +++ b/src/spell-kind/spells-teleport.c @@ -14,7 +14,7 @@ #include "io/targeting.h" #include "io/write-diary.h" #include "main/sound-definitions-table.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster-description-types.h" #include "monster/monster-status.h" #include "monster/monster2.h" diff --git a/src/spell/spells3.c b/src/spell/spells3.c index 24fbd52ba..4f060b1e5 100644 --- a/src/spell/spells3.c +++ b/src/spell/spells3.c @@ -35,7 +35,7 @@ #include "market/building-util.h" #include "mind/mind.h" #include "mind/mind-force-trainer.h" -#include "monster/creature.h" +#include "core/speed-table.h" #include "monster/monster-flag-types.h" #include "monster/monster-processor.h" #include "monster/monster-status.h" -- 2.11.0