• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision649a1e1e181b14d86c78ec4069b9f8c7082a4e66 (tree)
Zeit2019-04-10 19:50:13
Autordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Ändern Zusammenfassung

Diff

--- a/src/variable.c
+++ b/src/variable.c
@@ -435,32 +435,28 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
435435 * Not completely allocated, that would be inefficient
436436 * Not completely hardcoded, that would overflow memory
437437 */
438-floor_type floor;
439-floor_type *current_floor_ptr = &floor;
438+floor_type floor_info;
439+floor_type *current_floor_ptr = &floor_info;
440440
441441 /*
442442 * The array of saved floors
443443 */
444444 saved_floor_type saved_floors[MAX_SAVED_FLOORS];
445445
446-
447446 /*
448447 * Number of floor_id used from birth
449448 */
450449 FLOOR_IDX max_floor_id;
451450
452-
453451 world_type world;
454452 world_type *current_world_ptr = &world;
455453
456-
457454 /*
458455 * Sign for current process used in temporal files.
459456 * Actually it is the start time of current process.
460457 */
461458 u32b saved_floor_file_sign;
462459
463-
464460 /*
465461 * Maximum number of towns
466462 */
Show on old repository browser