- 英語版の'C'画面調整。

- 日付表示を実装。

diff --git a/src/files.c b/src/files.c
index 5daba86..7d26369 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1570,7 +1570,7 @@ static void prt_num2(cptr header, cptr tailer, int num, int row, int col, byte c
 #define ENTRY_MAX_EXP 13
 #define ENTRY_EXP_TO_ADV 14
 #define ENTRY_GOLD 15
-#define ENTRY_TURN 16
+#define ENTRY_DAY 16
 #define ENTRY_HP 17
 #define ENTRY_SP 18
 #define ENTRY_PLAY_TIME 19
@@ -1625,7 +1625,7 @@ static struct
        {29, 15, 21, "ºÇÂç·Ð¸³"},
        {29, 16, 21, "¼¡¥ì¥Ù¥ë"},
        {29, 17, 21, "½ê»ý¶â"},
-       {29, 19, 21, "¥¿¡¼¥ó¿ô"},
+       {29, 19, 21, "ÆüÉÕ"},
        {29, 10, 21, "£È£Ð"},
        {29, 11, 21, "£Í£Ð"},
        {29, 20, 21, "¥×¥ì¥¤»þ´Ö"},
@@ -1651,7 +1651,7 @@ static struct
        {29,  4, 21, "¿ÈĹ"},
        {29,  5, 21, "ÂνÅ"},
        {29,  6, 21, "¼Ò²ñŪÃÏ°Ì"},
-       {29,  8, 21, "°À­"},
+       {29,  7, 21, "°À­"},
 };
 #else
 = {
@@ -1662,8 +1662,8 @@ static struct
        { 1, 11, 25, "Left hand"},
        { 1, 11, 25, "Right hand"},
        { 1, 11, 25, "Posture"},
-       { 1, 15, 25, "Shoot"},
-       { 1, 16, 25, "Shoot Power"},
+       { 1, 15, 25, "Shooting"},
+       { 1, 16, 25, "Multiplier"},
        {01, 20, 25, "Speed"},
        { 1, 19, 25, "AC"},
        {29, 13, 21, "Level"},
@@ -1671,7 +1671,7 @@ static struct
        {29, 15, 21, "Max Exp"},
        {29, 16, 21, "Exp to Adv"},
        {29, 17, 21, "Gold"},
-       {29, 19, 21, "Total turn"},
+       {29, 19, 21, "Time"},
        {29, 10, 21, "Hit point"},
        {29, 11, 21, "SP (Mana)"},
        {29, 20, 21, "Play time"},
@@ -1685,7 +1685,7 @@ static struct
        {54, 18, -1, "Magic Device: "},
        {01, 12, 25, "Blows/Round"},
        {01, 17, 25, "Shots/Round"},
-       {01, 13, 25, "Wpn.dmg/Rnd"},
+       {01, 13, 25, "AverageDmg/Rnd"},
        {54, 20, -1, "Infra-Vision: "},
        {26,  1, -1, "Name  : "},
        { 1,  3, -1, "Sex      : "},
@@ -1697,7 +1697,7 @@ static struct
        {29,  4, 21, "Height"},
        {29,  5, 21, "Weight"},
        {29,  6, 21, "Social Class"},
-       {29,  8, 21, "Alignment"},
+       {29,  7, 21, "Align"},
 };
 #endif
 
@@ -1911,8 +1911,27 @@ static void display_player_middle(void)
        /* Dump gold */
        display_player_one_line(ENTRY_GOLD, format("%ld", p_ptr->au), TERM_L_GREEN);
 
-       /* Dump turn */
-       display_player_one_line(ENTRY_TURN, format("%ld", MAX(turn_real(turn),0)), TERM_L_GREEN);
+       /* Dump Day */
+       {
+               s32b len = 20L * TOWN_DAWN;
+               s32b tick = turn % len + len / 4;
+
+               sprintf(buf, 
+#ifdef JP
+                       "%2dÆüÌÜ  %d:%02d", 
+#else
+                       "Day %d  %d:%02d", 
+#endif
+                       ((p_ptr->prace == RACE_VAMPIRE) ||
+                        (p_ptr->prace == RACE_SKELETON) ||
+                        (p_ptr->prace == RACE_ZOMBIE) ||
+                        (p_ptr->prace == RACE_SPECTRE))
+                       ? (turn - (15L * TOWN_DAWN)) / len + 1
+                       : (turn + (5L * TOWN_DAWN))/ len + 1,
+                       (24 * tick / len) % 24,
+                       (1440 * tick / len) % 60);
+       }
+       display_player_one_line(ENTRY_DAY, buf, TERM_L_GREEN);
 
        /* Dump hit point */
        if (p_ptr->chp >= p_ptr->mhp) 

diff --git a/src/xtra2.c b/src/xtra2.c
index 4af51d7..fe53588 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -5796,13 +5796,13 @@ cptr your_alignment(void)
        else if (p_ptr->align > -151) return "Ãæ°­";
        else return "Âç°­";
 #else
-       if (p_ptr->align > 150) return "lawful";
-       else if (p_ptr->align > 50) return "good";
-       else if (p_ptr->align > 10) return "neutral good";
-       else if (p_ptr->align > -11) return "neutral";
-       else if (p_ptr->align > -51) return "neutral evil";
-       else if (p_ptr->align > -151) return "evil";
-       else return "chaotic";
+       if (p_ptr->align > 150) return "Lawful";
+       else if (p_ptr->align > 50) return "Good";
+       else if (p_ptr->align > 10) return "Neutral Good";
+       else if (p_ptr->align > -11) return "Neutral";
+       else if (p_ptr->align > -51) return "Neutral Evil";
+       else if (p_ptr->align > -151) return "Evil";
+       else return "Chaotic";
 #endif
 }