[Refactor] #37353 GRID, GRID_X, GRID_Y を floor.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index b12f5ee..08c9d84 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2284,24 +2284,6 @@
 
 
 /*
- * Convert a "location" (Y,X) into a "grid" (G)
- */
-#define GRID(Y,X) \
-       (256 * (Y) + (X))
-
-/*
- * Convert a "grid" (G) into a "location" (Y)
- */
-#define GRID_Y(G) \
-       ((int)((G) / 256U))
-
-/*
- * Convert a "grid" (G) into a "location" (X)
- */
-#define GRID_X(G) \
-       ((int)((G) % 256U))
-
-/*
  * Hack -- Prepare to use the "Secure" routines
  */
 #if defined(SET_UID) && defined(SECURE)

diff --git a/src/floor.h b/src/floor.h
index ee41b50..a6a018f 100644 (file)
--- a/src/floor.h
+++ b/src/floor.h
@@ -308,4 +308,23 @@ typedef struct {
         have_flag((F)->flags, FF_PERMANENT))
 
 extern floor_type *current_floor_ptr;
-extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
\ No newline at end of file
+extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
+
+/*
+ * Convert a "location" (Y,X) into a "grid" (G)
+ */
+#define GRID(Y,X) \
+       (256 * (Y) + (X))
+
+/*
+ * Convert a "grid" (G) into a "location" (Y)
+ */
+#define GRID_Y(G) \
+       ((int)((G) / 256U))
+
+/*
+ * Convert a "grid" (G) into a "location" (X)
+ */
+#define GRID_X(G) \
+       ((int)((G) % 256U))
+