OSDN Git Service
(root)
/
hengband
/
hengband.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7fc80e9
)
[fix] #37353 "floor" 変数がリリースビルド時のmath.hと重複していたので修正。
author
deskull
<deskull@users.sourceforge.jp>
Wed, 10 Apr 2019 10:50:13 +0000
(19:50 +0900)
committer
deskull
<deskull@users.sourceforge.jp>
Wed, 10 Apr 2019 10:50:13 +0000
(19:50 +0900)
src/variable.c
patch
|
blob
|
history
diff --git
a/src/variable.c
b/src/variable.c
index
a3142a2
..
5668b7b
100644
(file)
--- 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
*/
* 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];
/*
* 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;
/*
* Number of floor_id used from birth
*/
FLOOR_IDX max_floor_id;
-
world_type world;
world_type *current_world_ptr = &world;
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;
/*
* 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
*/
/*
* Maximum number of towns
*/