From e376d6d99d85c3ea26cfb1ec610a73de02f95cba Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 14 Jun 2020 21:37:31 +0900 Subject: [PATCH] [Refactor] #40413 Renamed util.h to alloc-entry-definition.h --- Hengband/Hengband/Hengband.vcxproj | 2 +- Hengband/Hengband/Hengband.vcxproj.filters | 6 +++--- src/Makefile.am | 2 +- src/monster-race/monster-race.c | 2 +- src/monster-race/monster-race.h | 2 +- src/monster/monster-processor.c | 2 +- src/object-enchant/object-curse.c | 2 +- src/object/object-kind.c | 2 +- src/player/patron.c | 2 +- src/room/rooms-trap.c | 2 +- src/{util/util.h => system/alloc-entry-definition.h} | 14 +++++++++++++- 11 files changed, 25 insertions(+), 13 deletions(-) rename src/{util/util.h => system/alloc-entry-definition.h} (59%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 455316e30..9edbbe65c 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -1166,7 +1166,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 266afe0c8..ae0f52257 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -2221,9 +2221,6 @@ mind - - util - object @@ -3067,6 +3064,9 @@ locale + + system + diff --git a/src/Makefile.am b/src/Makefile.am index 9cce4e5cf..6b7eb7909 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -536,6 +536,7 @@ hengband_SOURCES = \ sv-definition/sv-wand-types.h sv-definition/sv-weapon-types.h \ sv-definition/sv-other-types.h \ \ + system/alloc-entry-definition.h \ system/angband.h system/angband-version.h \ system/building-type-definition.c system/building-type-definition.h \ system/game-option-types.h \ @@ -564,7 +565,6 @@ hengband_SOURCES = \ util/sort.c util/sort.h \ util/string-processor.c util/string-processor.h \ util/tag-sorter.c util/tag-sorter.h \ - util/util.h \ \ view/display-characteristic.c view/display-characteristic.h \ view/display-fruit.c view/display-fruit.h \ diff --git a/src/monster-race/monster-race.c b/src/monster-race/monster-race.c index 60425fc0a..9e98cf4d6 100644 --- a/src/monster-race/monster-race.c +++ b/src/monster-race/monster-race.c @@ -1,6 +1,6 @@ #include "system/angband.h" #include "monster-race/monster-race.h" -#include "util/util.h" +#include "system/alloc-entry-definition.h" monster_race *r_info; char *r_name; diff --git a/src/monster-race/monster-race.h b/src/monster-race/monster-race.h index edb47249d..2fb8dad25 100644 --- a/src/monster-race/monster-race.h +++ b/src/monster-race/monster-race.h @@ -1,7 +1,7 @@ #pragma once #include "system/monster-race-definition.h" -#include "util/util.h" +#include "system/alloc-entry-definition.h" /* * The monster race arrays diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c index c92eb97a6..0f96e1e3b 100644 --- a/src/monster/monster-processor.c +++ b/src/monster/monster-processor.c @@ -51,7 +51,7 @@ #include "player/player-move.h" #include "spell-realm/spells-hex.h" #include "spell/spells-summon.h" -#include "util/util.h" +#include "system/alloc-entry-definition.h" #include "view/display-messages.h" void decide_drop_from_monster(player_type *target_ptr, MONSTER_IDX m_idx, bool is_riding_mon); diff --git a/src/object-enchant/object-curse.c b/src/object-enchant/object-curse.c index bcceead40..44bf587ba 100644 --- a/src/object-enchant/object-curse.c +++ b/src/object-enchant/object-curse.c @@ -1,5 +1,5 @@ #include "system/angband.h" -#include "util/util.h" +#include "system/alloc-entry-definition.h" #include "object-enchant/item-feeling.h" #include "object-enchant/object-curse.h" #include "object/object-flags.h" diff --git a/src/object/object-kind.c b/src/object/object-kind.c index e89824742..a92c47529 100644 --- a/src/object/object-kind.c +++ b/src/object/object-kind.c @@ -1,5 +1,5 @@ #include "object-kind.h" -#include "util/util.h" +#include "system/alloc-entry-definition.h" /* * The object kind arrays diff --git a/src/player/patron.c b/src/player/patron.c index 017f486aa..d3e34b435 100644 --- a/src/player/patron.c +++ b/src/player/patron.c @@ -24,7 +24,7 @@ #include "spell/spells-status.h" #include "spell/spells-summon.h" #include "spell/spell-types.h" -#include "util/util.h" +#include "system/alloc-entry-definition.h" #include "view/display-messages.h" #ifdef JP diff --git a/src/room/rooms-trap.c b/src/room/rooms-trap.c index a4bee1145..b5322460b 100644 --- a/src/room/rooms-trap.c +++ b/src/room/rooms-trap.c @@ -5,7 +5,7 @@ #include "grid/feature.h" #include "grid/grid.h" #include "room/rooms.h" -#include "util/util.h" +#include "system/alloc-entry-definition.h" #include "view/display-messages.h" /*! diff --git a/src/util/util.h b/src/system/alloc-entry-definition.h similarity index 59% rename from src/util/util.h rename to src/system/alloc-entry-definition.h index 933772167..ab23db5a7 100644 --- a/src/util/util.h +++ b/src/system/alloc-entry-definition.h @@ -1,4 +1,16 @@ -#pragma once +/* + * @brief + * @author + * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke + * 2002/01/12 mogami + * 2020/05/16 Hourier + * @details + * This software may be copied and distributed for educational, research, + * and not for profit purposes provided that this copyright and statement + * are included in all such copies. Other copyrights may also apply. + */ + +#pragma once #include "floor/geometry.h" -- 2.11.0