[Refactor] #3733 optional 型の値取得処理 value() を撤廃した その1

[hengbandforosx/hengbandosx.git] / src / floor / geometry.h

diff --git a/src/floor/geometry.h b/src/floor/geometry.h
index bf019ec..9031326 100644 (file)
--- a/src/floor/geometry.h
+++ b/src/floor/geometry.h
@@ -1,26 +1,6 @@
-#pragma once
+#pragma once
 
 #include "system/angband.h"
-#include "system/monster-type-definition.h"
-
-typedef struct player_type player_type;
-
-extern const POSITION ddd[9];
-extern const POSITION ddx[10];
-extern const POSITION ddy[10];
-extern const POSITION ddx_ddd[9];
-extern const POSITION ddy_ddd[9];
-extern const POSITION cdd[8];
-extern const POSITION ddx_cdd[8];
-extern const POSITION ddy_cdd[8];
-
-extern DIRECTION coords_to_dir(player_type *creature_ptr, POSITION y, POSITION x);
-
-extern POSITION distance(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-
-extern void mmove2(POSITION *y, POSITION *x, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-
-extern bool player_can_see_bold(player_type *creature_ptr, POSITION y, POSITION x);
 
 /*!
  * @brief 視界及び光源の過渡処理配列サイズ / Maximum size of the "temp" array
@@ -33,10 +13,26 @@ extern bool player_can_see_bold(player_type *creature_ptr, POSITION y, POSITION
 #define TEMP_MAX 2298
 
 //!< 対象グリッドの一覧をまとめる構造体
-typedef struct pos_list {
-       POSITION_IDX n; //!< Array of grids for use by various functions (see grid.c")
-       POSITION y[TEMP_MAX];
-       POSITION x[TEMP_MAX];
-} pos_list;
+struct pos_list {
+    POSITION_IDX n; //!< Array of grids for use by various functions (see grid.c")
+    POSITION y[TEMP_MAX];
+    POSITION x[TEMP_MAX];
+};
+
+extern const POSITION ddd[9];
+extern const POSITION ddx[10];
+extern const POSITION ddy[10];
+extern const POSITION ddx_ddd[9];
+extern const POSITION ddy_ddd[9];
+extern const POSITION cdd[8];
+extern const POSITION ddx_cdd[8];
+extern const POSITION ddy_cdd[8];
+
+class PlayerType;
+DIRECTION coords_to_dir(PlayerType *player_ptr, POSITION y, POSITION x);
+POSITION distance(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
+void mmove2(POSITION *y, POSITION *x, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
+bool player_can_see_bold(PlayerType *player_ptr, POSITION y, POSITION x);
 
-bool is_seen(player_type *creature_ptr, monster_type *m_ptr);
+class MonsterEntity;
+bool is_seen(PlayerType *player_ptr, MonsterEntity *m_ptr);