ﾊｬ､ｫ､熙荀ｹ､､､隍ｦ､ﾋ｡｢rand_int()､andint0()｡｢randint()､andint1()､ﾋ､ｹ､ﾙ､ﾆﾃﾖ､ｭﾊﾑ､ｨ､ｿ｡｣

[hengband/hengband.git] / src / save.c

diff --git a/src/save.c b/src/save.c
index a103fb5..4e96f1b 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -872,7 +872,7 @@ static void wr_ghost(void)
 
        /* Name */
 #ifdef JP
-wr_string("ÉÔÀµ¤Ê¥´¡¼¥¹¥È");
+       wr_string("ÉÔÀµ¤Ê¥´¡¼¥¹¥È");
 #else
        wr_string("Broken Ghost");
 #endif
@@ -1403,7 +1403,7 @@ static bool wr_savefile_new(void)
        wr_byte(FAKE_VER_PATCH);
        xor_byte = 0;
 
-       tmp8u = (byte)rand_int(256);
+       tmp8u = (byte)randint0(256);
        wr_byte(tmp8u);
 
 
@@ -1602,6 +1602,16 @@ static bool wr_savefile_new(void)
        wr_s16b(p_ptr->pet_follow_distance);
        wr_s16b(p_ptr->pet_extra_flags);
 
+       /* Write screen dump for sending score */
+       if (screen_dump && (wait_report_score || !death))
+       {
+               wr_string(screen_dump);
+       }
+       else
+       {
+               wr_string("");
+       }
+
        /* Player is not dead, write the dungeon */
        if (!death)
        {
@@ -1853,7 +1863,7 @@ bool load_player(void)
        {
                /* Give a message */
 #ifdef JP
-msg_print("¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£");
+               msg_print("¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£");
 #else
                msg_print("Savefile does not exist.");
 #endif
@@ -1891,7 +1901,7 @@ msg_print("
 
                        /* Message */
 #ifdef JP
-msg_print("¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£");
+                       msg_print("¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£");
 #else
                        msg_print("Savefile is currently in use.");
 #endif
@@ -1926,7 +1936,7 @@ msg_print("
 
                /* Message (below) */
 #ifdef JP
-if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¡£";
+               if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¡£";
 #else
                if (err) what = "Cannot open savefile";
 #endif
@@ -1947,7 +1957,7 @@ if (err) what = "
 
                /* What */
 #ifdef JP
-if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤òÆɤá¤Þ¤»¤ó¡£";
+               if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤òÆɤá¤Þ¤»¤ó¡£";
 #else
                if (err) what = "Cannot read savefile";
 #endif
@@ -2013,7 +2023,7 @@ if (err) what = "
 
                /* Message (below) */
 #ifdef JP
-if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ò²òÀϽÐÍè¤Þ¤»¤ó¡£";
+               if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ò²òÀϽÐÍè¤Þ¤»¤ó¡£";
 #else
                if (err) what = "Cannot parse savefile";
 #endif
@@ -2028,7 +2038,7 @@ if (err) what = "
 
                /* Message (below) */
 #ifdef JP
-if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹";
+               if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹";
 #else
                if (err) what = "Broken savefile";
 #endif
@@ -2045,7 +2055,7 @@ if (err) what = "
                {
                        /* Message */
 #ifdef JP
-what = "̵¸ú¤Ê¥¿¥¤¥à¡¦¥¹¥¿¥ó¥×¤Ç¤¹";
+                       what = "̵¸ú¤Ê¥¿¥¤¥à¡¦¥¹¥¿¥ó¥×¤Ç¤¹";
 #else
                        what = "Invalid timestamp";
 #endif
@@ -2069,7 +2079,7 @@ what = "̵
                        if (z_major == 2 && z_minor == 0 && z_patch == 6)
                        {
 #ifdef JP
-msg_print("¥Ð¡¼¥¸¥ç¥ó 2.0.* ÍѤΥ»¡¼¥Ö¥Õ¥¡¥¤¥ë¤òÊÑ´¹¤·¤Þ¤·¤¿¡£");
+                               msg_print("¥Ð¡¼¥¸¥ç¥ó 2.0.* ÍѤΥ»¡¼¥Ö¥Õ¥¡¥¤¥ë¤òÊÑ´¹¤·¤Þ¤·¤¿¡£");
 #else
                                msg_print("Converted a 2.0.* savefile.");
 #endif
@@ -2079,7 +2089,7 @@ msg_print("
                        {
                                /* Message */
 #ifdef JP
-msg_format("¥Ð¡¼¥¸¥ç¥ó %d.%d.%d ÍѤΥ»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ë¤òÊÑ´¹¤·¤Þ¤·¤¿¡£",
+                               msg_format("¥Ð¡¼¥¸¥ç¥ó %d.%d.%d ÍѤΥ»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ë¤òÊÑ´¹¤·¤Þ¤·¤¿¡£",
 #else
                                msg_format("Converted a %d.%d.%d savefile.",
 #endif
@@ -2152,7 +2162,7 @@ msg_format("
 
        /* Message */
 #ifdef JP
-msg_format("¥¨¥é¡¼(%s)¤¬¥Ð¡¼¥¸¥ç¥ó%d.%d.%d ÍÑ¥»¡¼¥Ö¥Õ¥¡¥¤¥ëÆɤ߹þÃæ¤ËȯÀ¸¡£",
+       msg_format("¥¨¥é¡¼(%s)¤¬¥Ð¡¼¥¸¥ç¥ó%d.%d.%d ÍÑ¥»¡¼¥Ö¥Õ¥¡¥¤¥ëÆɤ߹þÃæ¤ËȯÀ¸¡£",
 #else
        msg_format("Error (%s) reading %d.%d.%d savefile.",
 #endif