X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fsave.c;h=2fb2438e4588c16556dbfccd437ca5ac5f2695dc;hb=9e39f3f130adf821d9b22fa497ca17766cffa155;hp=ec61b9832a1529afc8361a41aab61ba372c407e2;hpb=72c26b306e9a912fe13a4c1dd05f7bbe76051f29;p=hengband%2Fhengband.git

diff --git a/src/save.c b/src/save.c
index ec61b9832..2fb2438e4 100644
--- a/src/save.c
+++ b/src/save.c
@@ -19,12 +19,10 @@
  * Some "local" parameters, used to help write savefiles
  */
 
-static FILE     *fff;           /* Current save "file" */
-
-static byte     xor_byte;       /* Simple encryption */
-
-static u32b     v_stamp = 0L;   /* A simple "checksum" on the actual values */
-static u32b     x_stamp = 0L;   /* A simple "checksum" on the encoded bytes */
+static FILE *fff;           /* Current save "file" */
+static byte xor_byte;       /* Simple encryption */
+static u32b v_stamp = 0L;   /* A simple "checksum" on the actual values */
+static u32b x_stamp = 0L;   /* A simple "checksum" on the encoded bytes */
 
 
 
@@ -126,7 +124,7 @@ static void wr_string(cptr str)
  */
 static void wr_item(object_type *o_ptr)
 {
-	u32b flags = 0x00000000;
+	BIT_FLAGS flags = 0x00000000;
 
 	if (o_ptr->pval) flags |= SAVE_ITEM_PVAL;
 	if (o_ptr->discount) flags |= SAVE_ITEM_DISCOUNT;
@@ -164,7 +162,6 @@ static void wr_item(object_type *o_ptr)
 	/*** Write only un-obvious elements ***/
 	wr_s16b(o_ptr->k_idx);
 
-	/* Location */
 	wr_byte((byte_hack)o_ptr->iy);
 	wr_byte((byte_hack)o_ptr->ix);
 
@@ -223,7 +220,7 @@ static void wr_item(object_type *o_ptr)
  */
 static void wr_monster(monster_type *m_ptr)
 {
-	u32b flags = 0x00000000;
+	BIT_FLAGS flags = 0x00000000;
 	byte tmp8u;
 
 	if (!is_original_ap(m_ptr)) flags |= SAVE_MON_AP_R_IDX;
@@ -352,7 +349,6 @@ static void wr_lore(MONRACE_IDX r_idx)
 	wr_u32b(r_ptr->r_flags6);
 	wr_u32b(r_ptr->r_flagsr);
 
-
 	/* Monster limit per level */
 	wr_byte((byte_hack)r_ptr->max_num);
 
@@ -382,7 +378,7 @@ static void wr_xtra(KIND_OBJECT_IDX k_idx)
 
 
 /*!
- * @brief 店舗情報を書き込む / Write a "store" record
+ * @brief セーブデータに店舗情報を書き込む / Write a "store" record
  * @param st_ptr 店舗情報の参照ポインタ
  * @return なし
  */
@@ -418,26 +414,20 @@ static void wr_store(store_type *st_ptr)
 
 
 /*!
- * @brief 乱数情報を書き込む / Write RNG state
- * @return なし
+ * @brief セーブデータに乱数情報を書き込む / Write RNG state
+ * @return 常に0(成功を返す) 
  */
 static errr wr_randomizer(void)
 {
 	int i;
-
-	/* Zero */
 	wr_u16b(0);
-
-	/* Place */
 	wr_u16b(Rand_place);
 
-	/* State */
 	for (i = 0; i < RAND_DEG; i++)
 	{
 		wr_u32b(Rand_state[i]);
 	}
 
-	/* Success */
 	return (0);
 }
 
@@ -455,7 +445,6 @@ static void wr_options(void)
 
 	/*** Oops ***/
 
-	/* Oops */
 	for (i = 0; i < 4; i++) wr_u32b(0L);
 
 
@@ -476,6 +465,7 @@ static void wr_options(void)
 
 	if (p_ptr->wizard) c |= 0x0002;
 
+	if (cheat_sight) c |= 0x0040;
 	if (cheat_turn) c |= 0x0080;
 
 	if (cheat_peek) c |= 0x0100;
@@ -628,7 +618,7 @@ static void wr_extra(void)
 	wr_byte(p_ptr->psex);
 	wr_byte((byte_hack)p_ptr->realm1);
 	wr_byte((byte_hack)p_ptr->realm2);
-	wr_byte(0);	/* oops */
+	wr_byte(0);
 
 	wr_byte((byte)p_ptr->hitdie);
 	wr_u16b(p_ptr->expfact);
@@ -714,10 +704,10 @@ static void wr_extra(void)
 		wr_s16b((s16b)max_dlv[i]);
 
 	/* More info */
-	wr_s16b(0);     /* oops */
-	wr_s16b(0);     /* oops */
-	wr_s16b(0);     /* oops */
-	wr_s16b(0);     /* oops */
+	wr_s16b(0);
+	wr_s16b(0);
+	wr_s16b(0);
+	wr_s16b(0);
 	wr_s16b(p_ptr->sc);
 	wr_s16b(p_ptr->concent);
 
@@ -796,8 +786,8 @@ static void wr_extra(void)
 	wr_u32b(p_ptr->special_defense);
 	wr_byte(p_ptr->knowledge);
 	wr_byte(p_ptr->autopick_autoregister);
-	wr_byte(0);     /* oops */
-	wr_byte(p_ptr->action);
+	wr_byte(0);
+	wr_byte((byte_hack)p_ptr->action);
 	wr_byte(0);
 	wr_byte(preserve_mode);
 	wr_byte(p_ptr->wait_report_score);
@@ -806,9 +796,9 @@ static void wr_extra(void)
 	for (i = 0; i < 12; i++) wr_u32b(0L);
 
 	/* Ignore some flags */
-	wr_u32b(0L);    /* oops */
-	wr_u32b(0L);    /* oops */
-	wr_u32b(0L);    /* oops */
+	wr_u32b(0L);
+	wr_u32b(0L);
+	wr_u32b(0L);
 
 
 	/* Write the "object seeds" */
@@ -940,7 +930,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 		/*** The saved floor ***/
 
 		wr_s16b(sf_ptr->floor_id);
-		wr_byte(sf_ptr->savefile_id);
+		wr_byte((byte_hack)sf_ptr->savefile_id);
 		wr_s16b((s16b)sf_ptr->dun_level);
 		wr_s32b(sf_ptr->last_visit);
 		wr_u32b(sf_ptr->visit_mark);
@@ -949,7 +939,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 	}
 
 	wr_u16b((u16b)base_level);
-	wr_u16b(num_repro);
+	wr_u16b((s16b)num_repro);
 	wr_u16b((u16b)p_ptr->y);
 	wr_u16b((u16b)p_ptr->x);
 	wr_u16b((u16b)cur_hgt);
@@ -1043,7 +1033,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 		cave_template_type *ct_ptr = &templates[i];
 
 		/* Dump it */
-		wr_u16b(ct_ptr->info);
+		wr_u16b((u16b)ct_ptr->info);
 		wr_s16b(ct_ptr->feat);
 		wr_s16b(ct_ptr->mimic);
 		wr_s16b(ct_ptr->special);
@@ -1211,7 +1201,7 @@ static bool wr_dungeon(void)
 		saved_floor_type *sf_ptr = &saved_floors[i];
 
 		wr_s16b(sf_ptr->floor_id);
-		wr_byte(sf_ptr->savefile_id);
+		wr_byte((byte_hack)sf_ptr->savefile_id);
 		wr_s16b((s16b)sf_ptr->dun_level);
 		wr_s32b(sf_ptr->last_visit);
 		wr_u32b(sf_ptr->visit_mark);
@@ -1387,14 +1377,14 @@ static bool wr_savefile_new(void)
 	wr_u16b(tmp16u);
 
 	/* Dump the quests */
-	tmp16u = max_quests;
+	tmp16u = max_q_idx;
 	wr_u16b(tmp16u);
 
 	/* Dump the quests */
 	tmp8u = MAX_RANDOM_QUEST-MIN_RANDOM_QUEST;
 	wr_byte(tmp8u);
 
-	for (i = 0; i < max_quests; i++)
+	for (i = 0; i < max_q_idx; i++)
 	{
 		quest_type* const q_ptr = &quest[i];
 
@@ -1565,25 +1555,20 @@ static bool wr_savefile_new(void)
  * Medium level player saver
  * @return 成功すればtrue
  * @details
- * XXX XXX XXX Angband 2.8.0 will use "fd" instead of "fff" if possible
+ * Angband 2.8.0 will use "fd" instead of "fff" if possible
  */
 static bool save_player_aux(char *name)
 {
-	bool    ok = FALSE;
-
-	int             fd = -1;
-
-	int             mode = 0644;
-
+	bool ok = FALSE;
+	int fd = -1;
+	int mode = 0644;
 
 	/* No file yet */
 	fff = NULL;
 
-
 	/* File type is "SAVE" */
 	FILE_TYPE(FILE_TYPE_SAVE);
 
-
 	/* Grab permissions */
 	safe_setuid_grab();
 
@@ -1805,7 +1790,7 @@ bool load_player(void)
 
 #if !defined(MACINTOSH) && !defined(WINDOWS)
 
-	/* XXX XXX XXX Fix this */
+	/* Fix this */
 
 	/* Verify the existance of the savefile */
 	if (access(savefile, 0) < 0)
@@ -1844,11 +1829,9 @@ bool load_player(void)
 			/* Close the file */
 			my_fclose(fkk);
 
-			/* Message */
 			msg_print(_("セーブファイルは現在使用中です。", "Savefile is currently in use."));
 			msg_print(NULL);
 
-			/* Oops */
 			return (FALSE);
 		}
 
@@ -1865,7 +1848,6 @@ bool load_player(void)
 #endif
 
 
-	/* Okay */
 	if (!err)
 	{
 		/* Open the savefile */
@@ -1936,17 +1918,14 @@ bool load_player(void)
 		if (sf_when > (statbuf.st_ctime + 100) ||
 		    sf_when < (statbuf.st_ctime - 100))
 		{
-			/* Message */
 			what = _("無効なタイム・スタンプです", "Invalid timestamp");
 
-			/* Oops */
 			err = -1;
 		}
 	}
 #endif
 
 
-	/* Okay */
 	if (!err)
 	{
 		/* Give a conversion warning */
@@ -1960,7 +1939,6 @@ bool load_player(void)
 			}
 			else
 			{
-				/* Message */
 #ifdef JP
 				msg_format("バージョン %d.%d.%d 用のセーブ・ファイルを変換しました。",
 				    (z_major > 9) ? z_major-10 : z_major , z_minor, z_patch);
@@ -1981,7 +1959,6 @@ bool load_player(void)
 				/* A character was loaded */
 				character_loaded = TRUE;
 
-				/* Done */
 				return (TRUE);
 			}
 
@@ -1991,7 +1968,6 @@ bool load_player(void)
 			/* Count lives */
 			sf_lives++;
 
-			/* Done */
 			return (TRUE);
 		}
 
@@ -2030,7 +2006,6 @@ bool load_player(void)
 #endif
 
 
-	/* Message */
 #ifdef JP
 	msg_format("エラー(%s)がバージョン%d.%d.%d 用セーブファイル読み込み中に発生。",
 		   what, (z_major>9) ? z_major - 10 : z_major, z_minor, z_patch);
@@ -2040,7 +2015,6 @@ bool load_player(void)
 #endif
 	msg_print(NULL);
 
-	/* Oops */
 	return (FALSE);
 }