From: deskull <deskull@users.sourceforge.jp>
Date: Wed, 10 Apr 2019 10:50:13 +0000 (+0900)
Subject: [fix] #37353 "floor" 変数がリリースビルド時のmath.hと重複していたので修正。
X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=649a1e1e181b14d86c78ec4069b9f8c7082a4e66

[fix] #37353 "floor" 変数がリリースビルド時のmath.hと重複していたので修正。
---

diff --git a/src/variable.c b/src/variable.c
index a3142a21e..5668b7bee 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -435,32 +435,28 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
  * Not completely allocated, that would be inefficient
  * Not completely hardcoded, that would overflow memory
  */
-floor_type floor;
-floor_type *current_floor_ptr = &floor;
+floor_type floor_info;
+floor_type *current_floor_ptr = &floor_info;
 
 /*
  * The array of saved floors
  */
 saved_floor_type saved_floors[MAX_SAVED_FLOORS];
 
-
 /*
  * Number of floor_id used from birth
  */
 FLOOR_IDX max_floor_id;
 
-
 world_type world;
 world_type *current_world_ptr = &world;
 
-
 /*
  * Sign for current process used in temporal files.
  * Actually it is the start time of current process.
  */
 u32b saved_floor_file_sign;
 
-
 /*
  * Maximum number of towns
  */