From aed0a7f631f543b006ad31ce96142e6c7f1e62ac Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 5 Jun 2019 23:49:15 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20INVEN=5FPACK=20=E3=82=92?= =?utf8?q?=20player-status.h=20=E3=81=B8=E7=A7=BB=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 11 ----------- src/player-status.h | 10 ++++++++-- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/defines.h b/src/defines.h index d83ce06d4..73b23190d 100644 --- a/src/defines.h +++ b/src/defines.h @@ -132,17 +132,6 @@ #define MESSAGE_BUF 655360 -/* - * Maximum number of "normal" pack slots, and the index of the "overflow" - * slot, which can hold an item, but only temporarily, since it causes the - * pack to "overflow", dropping the "last" item onto the ground. Since this - * value is used as an actual slot, it must be less than "INVEN_RARM" (below). - * Note that "INVEN_PACK" is probably hard-coded by its use in savefiles, and - * by the fact that the screen can only show 23 items plus a one-line prompt. - */ -#define INVEN_PACK 23 /*!< アイテムスロット…所持品(0～) */ - - /*** Screen Locations ***/ #define VER_INFO_ROW 3 //!< タイトル表記(行) diff --git a/src/player-status.h b/src/player-status.h index 6266c73d9..e2f8dbf85 100644 --- a/src/player-status.h +++ b/src/player-status.h @@ -423,10 +423,16 @@ struct player_type byte feeling; /* Most recent dungeon feeling */ s32b feeling_turn; /* The turn of the last dungeon feeling */ - /* + * Maximum number of "normal" pack slots, and the index of the "overflow" + * slot, which can hold an item, but only temporarily, since it causes the + * pack to "overflow", dropping the "last" item onto the ground. Since this + * value is used as an actual slot, it must be less than "INVEN_RARM" (below). + * Note that "INVEN_PACK" is probably hard-coded by its use in savefiles, and + * by the fact that the screen can only show 23 items plus a one-line prompt. * Indexes used for various "equipment" slots (hard-coded by savefiles, etc). */ + #define INVEN_PACK 23 /*!< アイテムスロット…所持品(0～) */ #define INVEN_RARM 24 /*!< アイテムスロット…右手 */ #define INVEN_LARM 25 /*!< アイテムスロット…左手 */ #define INVEN_BOW 26 /*!< アイテムスロット…射撃 */ @@ -446,7 +452,7 @@ struct player_type s16b inven_cnt; /* Number of items in inventory */ s16b equip_cnt; /* Number of items in equipment */ - /*** Temporary fields ***/ + /*** Temporary fields ***/ bool playing; /* True if player is playing */ bool leaving; /* True if player is leaving */ -- 2.11.0