X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fworld.c;h=0d7d5f1c2a9f79afef7ac8aac8f20f1fa79907be;hb=39fe7d793cc45a32cbd3d71a6051b81c6a4c089b;hp=b335b9e54c25326e487396ad5dfb61b5b745718c;hpb=9b6497cb053839e0b632be11ab666474c4780a1e;p=hengband%2Fhengband.git

diff --git a/src/world.c b/src/world.c
index b335b9e54..0d7d5f1c2 100644
--- a/src/world.c
+++ b/src/world.c
@@ -1,43 +1,47 @@
-#include "angband.h"
-
-/*!
- * @brief ゲーム時間が日中かどうかを返す /
- * Whether daytime or not
- * @return 日中ならばTRUE、夜ならばFALSE
- */
-bool is_daytime(void)
-{
-	s32b len = TURNS_PER_TICK * TOWN_DAWN;
-	if ((turn % len) < (len / 2))
-		return TRUE;
-	else
-		return FALSE;
-}
-
-/*!
- * @brief 現在の日数、時刻を返す /
- * Extract day, hour, min
- * @param day 日数を返すための参照ポインタ
- * @param hour 時数を返すための参照ポインタ
- * @param min 分数を返すための参照ポインタ
- */
-void extract_day_hour_min(int *day, int *hour, int *min)
-{
-	const s32b A_DAY = TURNS_PER_TICK * TOWN_DAWN;
-	s32b turn_in_today = (turn + A_DAY / 4) % A_DAY;
-
-	switch (p_ptr->start_race)
-	{
-	case RACE_VAMPIRE:
-	case RACE_SKELETON:
-	case RACE_ZOMBIE:
-	case RACE_SPECTRE:
-		*day = (turn - A_DAY * 3 / 4) / A_DAY + 1;
-		break;
-	default:
-		*day = (turn + A_DAY / 4) / A_DAY + 1;
-		break;
-	}
-	*hour = (24 * turn_in_today / A_DAY) % 24;
-	*min = (1440 * turn_in_today / A_DAY) % 60;
-}
+#include "angband.h"
+#include "world.h"
+
+world_type world;
+world_type *current_world_ptr = &world;
+
+/*!
+ * @brief ゲーム時間が日中かどうかを返す /
+ * Whether daytime or not
+ * @return 日中ならばTRUE、夜ならばFALSE
+ */
+bool is_daytime(void)
+{
+	s32b len = TURNS_PER_TICK * TOWN_DAWN;
+	if ((current_world_ptr->game_turn % len) < (len / 2))
+		return TRUE;
+	else
+		return FALSE;
+}
+
+/*!
+ * @brief 現在の日数、時刻を返す /
+ * Extract day, hour, min
+ * @param day 日数を返すための参照ポインタ
+ * @param hour 時数を返すための参照ポインタ
+ * @param min 分数を返すための参照ポインタ
+ */
+void extract_day_hour_min(int *day, int *hour, int *min)
+{
+	const s32b A_DAY = TURNS_PER_TICK * TOWN_DAWN;
+	s32b turn_in_today = (current_world_ptr->game_turn + A_DAY / 4) % A_DAY;
+
+	switch (p_ptr->start_race)
+	{
+	case RACE_VAMPIRE:
+	case RACE_SKELETON:
+	case RACE_ZOMBIE:
+	case RACE_SPECTRE:
+		*day = (current_world_ptr->game_turn - A_DAY * 3 / 4) / A_DAY + 1;
+		break;
+	default:
+		*day = (current_world_ptr->game_turn + A_DAY / 4) / A_DAY + 1;
+		break;
+	}
+	*hour = (24 * turn_in_today / A_DAY) % 24;
+	*min = (1440 * turn_in_today / A_DAY) % 60;
+}