From: deskull <deskull@users.sourceforge.jp>
Date: Sun, 3 Mar 2019 05:26:53 +0000 (+0900)
Subject: [Refactor] #38993 old_turn を generated_turn に改名して floor_type に取り込む。 / Rename old_turn... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=445a20692956f586f84b6ce59f280b12415c0827;p=hengband%2Fhengband.git

[Refactor] #38993 old_turn を generated_turn に改名して floor_type に取り込む。 / Rename old_turn to generated_turn and move to floor_type structure.
---

diff --git a/src/dungeon.c b/src/dungeon.c
index fc79710d5..b76a645b8 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -3450,7 +3450,7 @@ static void process_world(void)
 			p_ptr->energy_need = 0;
 			battle_monsters();
 		}
-		else if (current_world_ptr->game_turn - old_turn == 150 * TURNS_PER_TICK)
+		else if (current_world_ptr->game_turn - current_floor_ptr->generated_turn == 150 * TURNS_PER_TICK)
 		{
 			msg_print(_("申し分けありませんが、この勝負は引き分けとさせていただきます。", "This battle have ended in a draw."));
 			p_ptr->au += kakekin;
@@ -6235,8 +6235,8 @@ void prevent_turn_overflow(void)
 
 	if (current_world_ptr->game_turn > rollback_turns) current_world_ptr->game_turn -= rollback_turns;
 	else current_world_ptr->game_turn = 1; /* Paranoia */
-	if (old_turn > rollback_turns) old_turn -= rollback_turns;
-	else old_turn = 1;
+	if (current_floor_ptr->generated_turn > rollback_turns) current_floor_ptr->generated_turn -= rollback_turns;
+	else current_floor_ptr->generated_turn = 1;
 	if (old_battle > rollback_turns) old_battle -= rollback_turns;
 	else old_battle = 1;
 	if (p_ptr->feeling_turn > rollback_turns) p_ptr->feeling_turn -= rollback_turns;
diff --git a/src/externs.h b/src/externs.h
index ce6d6fb70..bc1eeffb1 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -160,7 +160,6 @@ extern bool msg_flag;
 extern s16b running;
 extern GAME_TURN resting;
 extern bool invoking_midnight_curse;
-extern GAME_TURN old_turn;
 extern GAME_TURN old_battle;
 extern bool use_sound;
 extern bool use_music;
diff --git a/src/floor-save.c b/src/floor-save.c
index 122a56dd2..327aa7267 100644
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -1386,10 +1386,10 @@ void change_floor(void)
 		wiz_lite((bool)(p_ptr->pclass == CLASS_NINJA));
 
 	/* Remember when this level was "created" */
-	old_turn = current_world_ptr->game_turn;
+	current_floor_ptr->generated_turn = current_world_ptr->game_turn;
 
 	/* No dungeon feeling yet */
-	p_ptr->feeling_turn = old_turn;
+	p_ptr->feeling_turn = current_floor_ptr->generated_turn;
 	p_ptr->feeling = 0;
 
 	/* Clear all flags */
diff --git a/src/load.c b/src/load.c
index e0d7f1aad..0ef109679 100644
--- a/src/load.c
+++ b/src/load.c
@@ -2265,11 +2265,11 @@ static void rd_extra(void)
 	current_world_ptr->dungeon_turn_limit = TURNS_PER_TICK * TOWN_DAWN * (MAX_DAYS - 1) + TURNS_PER_TICK * TOWN_DAWN * 3 / 4;
 
 	/* Turn when level began */
-	rd_s32b(&old_turn);
+	rd_s32b(&current_floor_ptr->generated_turn);
 
 	if (h_older_than(1, 7, 0, 4))
 	{
-		p_ptr->feeling_turn = old_turn;
+		p_ptr->feeling_turn = current_floor_ptr->generated_turn;
 	}
 	else
 	{
@@ -2288,7 +2288,7 @@ static void rd_extra(void)
 
 	if (z_older_than(11, 0, 13))
 	{
-		old_turn /= 2;
+		current_floor_ptr->generated_turn /= 2;
 		p_ptr->feeling_turn /= 2;
 		current_world_ptr->game_turn /= 2;
 		current_world_ptr->dungeon_turn /= 2;
diff --git a/src/save.c b/src/save.c
index b935d9c59..09e9cb451 100644
--- a/src/save.c
+++ b/src/save.c
@@ -820,7 +820,7 @@ static void wr_extra(void)
 	wr_byte(p_ptr->feeling);
 
 	/* Turn when level began */
-	wr_s32b(old_turn);
+	wr_s32b(current_floor_ptr->generated_turn);
 
 	/* Turn of last "feeling" */
 	wr_s32b(p_ptr->feeling_turn);
diff --git a/src/types.h b/src/types.h
index 81c5424e7..8abebc291 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1886,6 +1886,8 @@ typedef struct {
 	POSITION height;		/* Current dungeon height */
 	MONSTER_NUMBER num_repro; /*!< Current reproducer count */
 
+	GAME_TURN generated_turn; /* Turn when level began */
+
 	object_type *o_list; /*!< The array of dungeon items [current_floor_ptr->max_o_idx] */
 	OBJECT_IDX max_o_idx; /*!< Maximum number of objects in the level */
 
diff --git a/src/variable.c b/src/variable.c
index ed550e00f..ddf3a75ae 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -113,7 +113,6 @@ GAME_TURN resting;			/* Current counter for resting, if any */
 
 bool invoking_midnight_curse; /*!< 悪夢モード時の真夜中太古の呪い発生処理フラグ */
 
-GAME_TURN old_turn;			/* Turn when level began */
 GAME_TURN old_battle;
 
 bool use_sound;			/* The "sound" mode is enabled */