X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fsave.c;h=384b2340699db8f7abf1d494696add1270955fad;hb=57f8ef6e42a487dc2af160c8f28a9caf956b223c;hp=9379d7bd0e563ac2e7635a2a49ba33377e854bc3;hpb=c806c62e01f485b9d5a9a5a08a51b36921ff50c4;p=hengband%2Fhengband.git

diff --git a/src/save.c b/src/save.c
index 9379d7bd0..384b23406 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1,15 +1,16 @@
-/* File: save.c */
-
-/*
+/*!
+ * @file save.c
+ * @brief セーブファイル書き込み処理 / Purpose: interact with savefiles
+ * @date 2014/07/12
+ * @author
+ * <pre>
  * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
- *
  * This software may be copied and distributed for educational, research,
  * and not for profit purposes provided that this copyright and statement
  * are included in all such copies.  Other copyrights may also apply.
+ * </pre>
  */
 
-/* Purpose: interact with savefiles */
-
 #include "angband.h"
 
 
@@ -27,10 +28,11 @@ static u32b     x_stamp = 0L;   /* A simple "checksum" on the encoded bytes */
 
 
 
-/*
- * These functions place information into a savefile a byte at a time
+/*!
+ * @brief 1バイトをファイルに書き込む / These functions place information into a savefile a byte at a time
+ * @param v 書き込むバイト値
+ * @return なし
  */
-
 static void sf_put(byte v)
 {
 	/* Encode the value, write a character */
@@ -42,22 +44,42 @@ static void sf_put(byte v)
 	x_stamp += xor_byte;
 }
 
+/*!
+ * @brief 1バイトをファイルに書き込む(sf_put()の糖衣)
+ * @param v 書き込むバイト
+ * @return なし
+ */
 static void wr_byte(byte v)
 {
 	sf_put(v);
 }
 
+/*!
+ * @brief 符号なし16ビットをファイルに書き込む
+ * @param v 書き込む符号なし16bit値
+ * @return なし
+ */
 static void wr_u16b(u16b v)
 {
 	sf_put((byte)(v & 0xFF));
 	sf_put((byte)((v >> 8) & 0xFF));
 }
 
+/*!
+ * @brief 符号あり16ビットをファイルに書き込む
+ * @param v 書き込む符号あり16bit値
+ * @return なし
+ */
 static void wr_s16b(s16b v)
 {
 	wr_u16b((u16b)v);
 }
 
+/*!
+ * @brief 符号なし32ビットをファイルに書き込む
+ * @param v 書き込む符号なし32bit値
+ * @return なし
+ */
 static void wr_u32b(u32b v)
 {
 	sf_put((byte)(v & 0xFF));
@@ -66,11 +88,21 @@ static void wr_u32b(u32b v)
 	sf_put((byte)((v >> 24) & 0xFF));
 }
 
+/*!
+ * @brief 符号あり32ビットをファイルに書き込む
+ * @param v 書き込む符号あり32bit値
+ * @return なし
+ */
 static void wr_s32b(s32b v)
 {
 	wr_u32b((u32b)v);
 }
 
+/*!
+ * @brief 文字列をファイルに書き込む
+ * @param str 書き込む文字列
+ * @return なし
+ */
 static void wr_string(cptr str)
 {
 	while (*str)
@@ -87,8 +119,10 @@ static void wr_string(cptr str)
  */
 
 
-/*
- * Write an "item" record
+/*!
+ * @brief アイテムオブジェクトを書き込む / Write an "item" record
+ * @param o_ptr アイテムオブジェクト保存元ポインタ
+ * @return なし
  */
 static void wr_item(object_type *o_ptr)
 {
@@ -112,6 +146,7 @@ static void wr_item(object_type *o_ptr)
 	if (o_ptr->art_flags[1]) flags |= SAVE_ITEM_ART_FLAGS1;
 	if (o_ptr->art_flags[2]) flags |= SAVE_ITEM_ART_FLAGS2;
 	if (o_ptr->art_flags[3]) flags |= SAVE_ITEM_ART_FLAGS3;
+	if (o_ptr->art_flags[4]) flags |= SAVE_ITEM_ART_FLAGS4;
 	if (o_ptr->curse_flags) flags |= SAVE_ITEM_CURSE_FLAGS;
 	if (o_ptr->held_m_idx) flags |= SAVE_ITEM_HELD_M_IDX;
 	if (o_ptr->xtra1) flags |= SAVE_ITEM_XTRA1;
@@ -130,26 +165,26 @@ static void wr_item(object_type *o_ptr)
 	wr_s16b(o_ptr->k_idx);
 
 	/* Location */
-	wr_byte(o_ptr->iy);
-	wr_byte(o_ptr->ix);
+	wr_byte((byte_hack)o_ptr->iy);
+	wr_byte((byte_hack)o_ptr->ix);
 
 	if (flags & SAVE_ITEM_PVAL) wr_s16b(o_ptr->pval);
 
 	if (flags & SAVE_ITEM_DISCOUNT) wr_byte(o_ptr->discount);
-	if (flags & SAVE_ITEM_NUMBER) wr_byte(o_ptr->number);
+	if (flags & SAVE_ITEM_NUMBER) wr_byte((byte_hack)o_ptr->number);
 
-	wr_s16b(o_ptr->weight);
+	wr_s16b((s16b)o_ptr->weight);
 
-	if (flags & SAVE_ITEM_NAME1) wr_byte(o_ptr->name1);
-	if (flags & SAVE_ITEM_NAME2) wr_byte(o_ptr->name2);
+	if (flags & SAVE_ITEM_NAME1) wr_byte((byte_hack)o_ptr->name1);
+	if (flags & SAVE_ITEM_NAME2) wr_byte((byte_hack)o_ptr->name2);
 	if (flags & SAVE_ITEM_TIMEOUT) wr_s16b(o_ptr->timeout);
 
 	if (flags & SAVE_ITEM_TO_H) wr_s16b(o_ptr->to_h);
-	if (flags & SAVE_ITEM_TO_D) wr_s16b(o_ptr->to_d);
+	if (flags & SAVE_ITEM_TO_D) wr_s16b((s16b)o_ptr->to_d);
 	if (flags & SAVE_ITEM_TO_A) wr_s16b(o_ptr->to_a);
 	if (flags & SAVE_ITEM_AC) wr_s16b(o_ptr->ac);
-	if (flags & SAVE_ITEM_DD) wr_byte(o_ptr->dd);
-	if (flags & SAVE_ITEM_DS) wr_byte(o_ptr->ds);
+	if (flags & SAVE_ITEM_DD) wr_byte((byte_hack)o_ptr->dd);
+	if (flags & SAVE_ITEM_DS) wr_byte((byte_hack)o_ptr->ds);
 
 	if (flags & SAVE_ITEM_IDENT) wr_byte(o_ptr->ident);
 
@@ -159,6 +194,7 @@ static void wr_item(object_type *o_ptr)
 	if (flags & SAVE_ITEM_ART_FLAGS1) wr_u32b(o_ptr->art_flags[1]);
 	if (flags & SAVE_ITEM_ART_FLAGS2) wr_u32b(o_ptr->art_flags[2]);
 	if (flags & SAVE_ITEM_ART_FLAGS3) wr_u32b(o_ptr->art_flags[3]);
+	if (flags & SAVE_ITEM_ART_FLAGS4) wr_u32b(o_ptr->art_flags[4]);
 
 	if (flags & SAVE_ITEM_CURSE_FLAGS) wr_u32b(o_ptr->curse_flags);
 
@@ -180,24 +216,27 @@ static void wr_item(object_type *o_ptr)
 }
 
 
-/*
- * Write a "monster" record
+/*!
+ * @brief モンスター情報を書き込む / Write a "monster" record
+ * @param m_ptr モンスター情報保存元ポインタ
+ * @return なし
  */
 static void wr_monster(monster_type *m_ptr)
 {
 	u32b flags = 0x00000000;
+	byte tmp8u;
 
-	if (m_ptr->ap_r_idx != m_ptr->r_idx) flags |= SAVE_MON_AP_R_IDX;
+	if (!is_original_ap(m_ptr)) flags |= SAVE_MON_AP_R_IDX;
 	if (m_ptr->sub_align) flags |= SAVE_MON_SUB_ALIGN;
-	if (m_ptr->csleep) flags |= SAVE_MON_CSLEEP;
-	if (m_ptr->fast) flags |= SAVE_MON_FAST;
-	if (m_ptr->slow) flags |= SAVE_MON_SLOW;
-	if (m_ptr->stunned) flags |= SAVE_MON_STUNNED;
-	if (m_ptr->confused) flags |= SAVE_MON_CONFUSED;
-	if (m_ptr->monfear) flags |= SAVE_MON_MONFEAR;
+	if (MON_CSLEEP(m_ptr)) flags |= SAVE_MON_CSLEEP;
+	if (MON_FAST(m_ptr)) flags |= SAVE_MON_FAST;
+	if (MON_SLOW(m_ptr)) flags |= SAVE_MON_SLOW;
+	if (MON_STUNNED(m_ptr)) flags |= SAVE_MON_STUNNED;
+	if (MON_CONFUSED(m_ptr)) flags |= SAVE_MON_CONFUSED;
+	if (MON_MONFEAR(m_ptr)) flags |= SAVE_MON_MONFEAR;
 	if (m_ptr->target_y) flags |= SAVE_MON_TARGET_Y;
 	if (m_ptr->target_x) flags |= SAVE_MON_TARGET_X;
-	if (m_ptr->invulner) flags |= SAVE_MON_INVULNER;
+	if (MON_INVULNER(m_ptr)) flags |= SAVE_MON_INVULNER;
 	if (m_ptr->smart) flags |= SAVE_MON_SMART;
 	if (m_ptr->exp) flags |= SAVE_MON_EXP;
 	if (m_ptr->mflag2) flags |= SAVE_MON_MFLAG2;
@@ -209,29 +248,55 @@ static void wr_monster(monster_type *m_ptr)
 
 	/*** Write only un-obvious elements ***/
 	wr_s16b(m_ptr->r_idx);
-	wr_byte(m_ptr->fy);
-	wr_byte(m_ptr->fx);
-	wr_s16b(m_ptr->hp);
-	wr_s16b(m_ptr->maxhp);
-	wr_s16b(m_ptr->max_maxhp);
+	wr_byte((byte_hack)m_ptr->fy);
+	wr_byte((byte_hack)m_ptr->fx);
+	wr_s16b((s16b)m_ptr->hp);
+	wr_s16b((s16b)m_ptr->maxhp);
+	wr_s16b((s16b)m_ptr->max_maxhp);
+	wr_u32b(m_ptr->dealt_damage);
+	
 
 	/* Monster race index of its appearance */
 	if (flags & SAVE_MON_AP_R_IDX) wr_s16b(m_ptr->ap_r_idx);
 
 	if (flags & SAVE_MON_SUB_ALIGN) wr_byte(m_ptr->sub_align);
-	if (flags & SAVE_MON_CSLEEP) wr_s16b(m_ptr->csleep);
+	if (flags & SAVE_MON_CSLEEP) wr_s16b(m_ptr->mtimed[MTIMED_CSLEEP]);
 
 	wr_byte(m_ptr->mspeed);
 	wr_s16b(m_ptr->energy_need);
 
-	if (flags & SAVE_MON_FAST) wr_byte(m_ptr->fast);
-	if (flags & SAVE_MON_SLOW) wr_byte(m_ptr->slow);
-	if (flags & SAVE_MON_STUNNED) wr_byte(m_ptr->stunned);
-	if (flags & SAVE_MON_CONFUSED) wr_byte(m_ptr->confused);
-	if (flags & SAVE_MON_MONFEAR) wr_byte(m_ptr->monfear);
-	if (flags & SAVE_MON_TARGET_Y) wr_s16b(m_ptr->target_y);
-	if (flags & SAVE_MON_TARGET_X) wr_s16b(m_ptr->target_x);
-	if (flags & SAVE_MON_INVULNER) wr_byte(m_ptr->invulner);
+	if (flags & SAVE_MON_FAST)
+	{
+		tmp8u = (byte)m_ptr->mtimed[MTIMED_FAST];
+		wr_byte(tmp8u);
+	}
+	if (flags & SAVE_MON_SLOW)
+	{
+		tmp8u = (byte)m_ptr->mtimed[MTIMED_SLOW];
+		wr_byte(tmp8u);
+	}
+	if (flags & SAVE_MON_STUNNED)
+	{
+		tmp8u = (byte)m_ptr->mtimed[MTIMED_STUNNED];
+		wr_byte(tmp8u);
+	}
+	if (flags & SAVE_MON_CONFUSED)
+	{
+		tmp8u = (byte)m_ptr->mtimed[MTIMED_CONFUSED];
+		wr_byte(tmp8u);
+	}
+	if (flags & SAVE_MON_MONFEAR)
+	{
+		tmp8u = (byte)m_ptr->mtimed[MTIMED_MONFEAR];
+		wr_byte(tmp8u);
+	}
+	if (flags & SAVE_MON_TARGET_Y) wr_s16b((s16b)m_ptr->target_y);
+	if (flags & SAVE_MON_TARGET_X) wr_s16b((s16b)m_ptr->target_x);
+	if (flags & SAVE_MON_INVULNER)
+	{
+		tmp8u = (byte)m_ptr->mtimed[MTIMED_INVULNER];
+		wr_byte(tmp8u);
+	}
 	if (flags & SAVE_MON_SMART) wr_u32b(m_ptr->smart);
 	if (flags & SAVE_MON_EXP) wr_u32b(m_ptr->exp);
 	if (flags & SAVE_MON_MFLAG2) wr_byte(m_ptr->mflag2);
@@ -240,18 +305,21 @@ static void wr_monster(monster_type *m_ptr)
 }
 
 
-/*
- * Write a "lore" record
+/*!
+ * @brief モンスターの思い出を書き込む / Write a "lore" record
+ * @param r_idx モンスター種族ID
+ * @return なし
  */
-static void wr_lore(int r_idx)
+static void wr_lore(MONRACE_IDX r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
 	/* Count sights/deaths/kills */
-	wr_s16b(r_ptr->r_sights);
-	wr_s16b(r_ptr->r_deaths);
-	wr_s16b(r_ptr->r_pkills);
-	wr_s16b(r_ptr->r_tkills);
+	wr_s16b((s16b)r_ptr->r_sights);
+	wr_s16b((s16b)r_ptr->r_deaths);
+	wr_s16b((s16b)r_ptr->r_pkills);
+	wr_s16b((s16b)r_ptr->r_akills);
+	wr_s16b((s16b)r_ptr->r_tkills);
 
 	/* Count wakes and ignores */
 	wr_byte(r_ptr->r_wake);
@@ -262,8 +330,8 @@ static void wr_lore(int r_idx)
 	wr_byte(r_ptr->r_xtra2);
 
 	/* Count drops */
-	wr_byte(r_ptr->r_drop_gold);
-	wr_byte(r_ptr->r_drop_item);
+	wr_byte((byte_hack)r_ptr->r_drop_gold);
+	wr_byte((byte_hack)r_ptr->r_drop_item);
 
 	/* Count spells */
 	wr_byte(0); /* unused now */
@@ -286,7 +354,7 @@ static void wr_lore(int r_idx)
 
 
 	/* Monster limit per level */
-	wr_byte(r_ptr->max_num);
+	wr_byte((byte_hack)r_ptr->max_num);
 
 	/* Location in saved floor */
 	wr_s16b(r_ptr->floor_id);
@@ -295,11 +363,12 @@ static void wr_lore(int r_idx)
 	wr_byte(0);
 }
 
-
-/*
- * Write an "xtra" record
+/*!
+ * @brief その他のゲーム情報を書き込む(実質はアイテムの鑑定情報のみ) / Write an "xtra" record
+ * @param k_idx ベースアイテムのID
+ * @return なし
  */
-static void wr_xtra(int k_idx)
+static void wr_xtra(KIND_OBJECT_IDX k_idx)
 {
 	byte tmp8u = 0;
 
@@ -312,8 +381,10 @@ static void wr_xtra(int k_idx)
 }
 
 
-/*
- * Write a "store" record
+/*!
+ * @brief 店舗情報を書き込む / Write a "store" record
+ * @param st_ptr 店舗情報の参照ポインタ
+ * @return なし
  */
 static void wr_store(store_type *st_ptr)
 {
@@ -346,8 +417,9 @@ static void wr_store(store_type *st_ptr)
 }
 
 
-/*
- * Write RNG state
+/*!
+ * @brief 乱数情報を書き込む / Write RNG state
+ * @return なし
  */
 static errr wr_randomizer(void)
 {
@@ -370,8 +442,9 @@ static errr wr_randomizer(void)
 }
 
 
-/*
- * Write the "options"
+/*!
+ * @brief ゲームオプション情報を書き込む / Write the "options"
+ * @return なし
  */
 static void wr_options(void)
 {
@@ -403,6 +476,9 @@ 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;
 	if (cheat_hear) c |= 0x0200;
 	if (cheat_room) c |= 0x0400;
@@ -410,6 +486,7 @@ static void wr_options(void)
 	if (cheat_know) c |= 0x1000;
 	if (cheat_live) c |= 0x2000;
 	if (cheat_save) c |= 0x4000;
+	if (cheat_diary_output) c |= 0x8000;
 
 	wr_u16b(c);
 
@@ -465,28 +542,25 @@ static void wr_options(void)
 }
 
 
-/*
- * Hack -- Write the "ghost" info
+/*!
+ * @brief ダミー情報スキップを書き込む / Hack -- Write the "ghost" info
+ * @return なし
  */
 static void wr_ghost(void)
 {
 	int i;
 
 	/* Name */
-#ifdef JP
-	wr_string("ÉÔÀµ¤Ê¥´¡¼¥¹¥È");
-#else
-	wr_string("Broken Ghost");
-#endif
-
+	wr_string(_("不正なゴースト", "Broken Ghost"));
 
 	/* Hack -- stupid data */
 	for (i = 0; i < 60; i++) wr_byte(0);
 }
 
 
-/*
- * Save quick start data
+/*!
+ * @brief クイック・スタート情報を書き込む / Save quick start data
+ * @return なし
  */
 static void save_quick_start(void)
 {
@@ -496,8 +570,8 @@ static void save_quick_start(void)
 	wr_byte(previous_char.prace);
 	wr_byte(previous_char.pclass);
 	wr_byte(previous_char.pseikaku);
-	wr_byte(previous_char.realm1);
-	wr_byte(previous_char.realm2);
+	wr_byte((byte_hack)previous_char.realm1);
+	wr_byte((byte_hack)previous_char.realm2);
 
 	wr_s16b(previous_char.age);
 	wr_s16b(previous_char.ht);
@@ -508,7 +582,7 @@ static void save_quick_start(void)
 	for (i = 0; i < 6; i++) wr_s16b(previous_char.stat_max[i]);
 	for (i = 0; i < 6; i++) wr_s16b(previous_char.stat_max_max[i]);
 
-	for (i = 0; i < PY_MAX_LEVEL; i++) wr_s16b(previous_char.player_hp[i]);
+	for (i = 0; i < PY_MAX_LEVEL; i++) wr_s16b((s16b)previous_char.player_hp[i]);
 
 	wr_s16b(previous_char.chaos_patron);
 
@@ -525,15 +599,17 @@ static void save_quick_start(void)
 	wr_byte((byte)previous_char.quick_ok);
 }
 
-/*
- * Write some "extra" info
+
+/*!
+ * @brief その他の情報を書き込む / Write some "extra" info
+ * @return なし
  */
 static void wr_extra(void)
 {
 	int i,j;
 	byte tmp8u;
 
-	wr_string(player_name);
+	wr_string(p_ptr->name);
 
 	wr_string(p_ptr->died_from);
 
@@ -551,11 +627,11 @@ static void wr_extra(void)
 	wr_byte(p_ptr->pclass);
 	wr_byte(p_ptr->pseikaku);
 	wr_byte(p_ptr->psex);
-	wr_byte(p_ptr->realm1);
-	wr_byte(p_ptr->realm2);
+	wr_byte((byte_hack)p_ptr->realm1);
+	wr_byte((byte_hack)p_ptr->realm2);
 	wr_byte(0);	/* oops */
 
-	wr_byte(p_ptr->hitdie);
+	wr_byte((byte)p_ptr->hitdie);
 	wr_u16b(p_ptr->expfact);
 
 	wr_s16b(p_ptr->age);
@@ -580,7 +656,7 @@ static void wr_extra(void)
 
 	for (i = 0; i < 64; i++) wr_s16b(p_ptr->spell_exp[i]);
 	for (i = 0; i < 5; i++) for (j = 0; j < 64; j++) wr_s16b(p_ptr->weapon_exp[i][j]);
-	for (i = 0; i < 10; i++) wr_s16b(p_ptr->skill_exp[i]);
+	for (i = 0; i < GINOU_MAX; i++) wr_s16b(p_ptr->skill_exp[i]);
 	for (i = 0; i < 108; i++) wr_s32b(p_ptr->magic_num1[i]);
 	for (i = 0; i < 108; i++) wr_byte(p_ptr->magic_num2[i]);
 
@@ -591,8 +667,8 @@ static void wr_extra(void)
 
 	for (i = 0; i < MAX_MANE; i++)
 	{
-		wr_s16b(p_ptr->mane_spell[i]);
-		wr_s16b(p_ptr->mane_dam[i]);
+		wr_s16b((s16b)p_ptr->mane_spell[i]);
+		wr_s16b((s16b)p_ptr->mane_dam[i]);
 	}
 	wr_s16b(p_ptr->mane_num);
 
@@ -617,8 +693,8 @@ static void wr_extra(void)
 	wr_byte(p_ptr->exit_bldg);
 	wr_byte(0); /* Unused */
 
-	wr_s16b(p_ptr->oldpx);
-	wr_s16b(p_ptr->oldpy);
+	wr_s16b((s16b)p_ptr->oldpx);
+	wr_s16b((s16b)p_ptr->oldpy);
 
 	/* Was number of p_ptr->rewards[] */
 	wr_s16b(0);
@@ -636,7 +712,7 @@ static void wr_extra(void)
 	tmp8u = (byte)max_d_idx;
 	wr_byte(tmp8u);
 	for (i = 0; i < tmp8u; i++)
-		wr_s16b(max_dlv[i]);
+		wr_s16b((s16b)max_dlv[i]);
 
 	/* More info */
 	wr_s16b(0);     /* oops */
@@ -644,7 +720,7 @@ static void wr_extra(void)
 	wr_s16b(0);     /* oops */
 	wr_s16b(0);     /* oops */
 	wr_s16b(p_ptr->sc);
-	wr_s16b(0);     /* oops */
+	wr_s16b(p_ptr->concent);
 
 	wr_s16b(0);             /* old "rest" */
 	wr_s16b(p_ptr->blind);
@@ -654,6 +730,7 @@ static void wr_extra(void)
 	wr_s16b(0);     /* old "food_digested" */
 	wr_s16b(0);     /* old "protection" */
 	wr_s16b(p_ptr->energy_need);
+	wr_s16b(p_ptr->enchant_energy_need);
 	wr_s16b(p_ptr->fast);
 	wr_s16b(p_ptr->slow);
 	wr_s16b(p_ptr->afraid);
@@ -693,7 +770,7 @@ static void wr_extra(void)
 	wr_s16b(p_ptr->magicdef);
 	wr_s16b(p_ptr->tim_res_nether);
 	wr_s16b(p_ptr->tim_res_time);
-	wr_byte(p_ptr->mimic_form);
+	wr_byte((byte)p_ptr->mimic_form);
 	wr_s16b(p_ptr->tim_mimic);
 	wr_s16b(p_ptr->tim_sh_fire);
 	wr_s16b(p_ptr->tim_sh_holy);
@@ -721,7 +798,7 @@ static void wr_extra(void)
 	wr_byte(p_ptr->knowledge);
 	wr_byte(p_ptr->autopick_autoregister);
 	wr_byte(0);     /* oops */
-	wr_byte(p_ptr->action);
+	wr_byte((byte_hack)p_ptr->action);
 	wr_byte(0);
 	wr_byte(preserve_mode);
 	wr_byte(p_ptr->wait_report_score);
@@ -783,9 +860,13 @@ static void wr_extra(void)
 }
 
 
-
-/*
- * hook function to sort monsters by level
+/*!
+ * @brief フロア保存時のcave情報テンプレートをソートするための比較処理
+ * @param u caveテンプレートの参照ポインタ
+ * @param v 未使用
+ * @param a スワップするモンスター種族のID1
+ * @param b スワップするモンスター種族のID2
+ * @return aの方が大きければtrue
  */
 static bool ang_sort_comp_cave_temp(vptr u, vptr v, int a, int b)
 {
@@ -801,8 +882,13 @@ static bool ang_sort_comp_cave_temp(vptr u, vptr v, int a, int b)
 }
 
 
-/*
- * Sorting hook -- Swap function
+/*!
+ * @brief フロア保存時のcave情報テンプレートをソートするためのスワップ処理 / Sorting hook -- Swap function
+ * @param u caveテンプレートの参照ポインタ
+ * @param v 未使用
+ * @param a スワップするモンスター種族のID1
+ * @param b スワップするモンスター種族のID2
+ * @return なし
  */
 static void ang_sort_swap_cave_temp(vptr u, vptr v, int a, int b)
 {
@@ -820,13 +906,14 @@ static void ang_sort_swap_cave_temp(vptr u, vptr v, int a, int b)
 }
 
 
-/*
- * Actually write a saved floor data
- * using effectively compressed format.
+/*!
+ * @brief 保存フロアの書き込み / Actually write a saved floor data using effectively compressed format.
+ * @param sf_ptr 保存したいフロアの参照ポインタ
+ * @return なし
  */
 static void wr_saved_floor(saved_floor_type *sf_ptr)
 {
-	cave_template_type *template;
+	cave_template_type *templates;
 	u16b max_num_temp;
 	u16b num_temp = 0;
 	int dummy_why;
@@ -847,27 +934,27 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 	{
 		/*** Not a saved floor ***/
 
-		wr_s16b(dun_level);
+		wr_s16b((s16b)dun_level);
 	}
 	else
 	{
 		/*** The saved floor ***/
 
 		wr_s16b(sf_ptr->floor_id);
-		wr_byte(sf_ptr->savefile_id);
-		wr_s16b(sf_ptr->dun_level);
+		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);
 		wr_s16b(sf_ptr->upper_floor_id);
 		wr_s16b(sf_ptr->lower_floor_id);
 	}
 
-	wr_u16b(base_level);
+	wr_u16b((u16b)base_level);
 	wr_u16b(num_repro);
-	wr_u16b((u16b)py);
-	wr_u16b((u16b)px);
-	wr_u16b(cur_hgt);
-	wr_u16b(cur_wid);
+	wr_u16b((u16b)p_ptr->y);
+	wr_u16b((u16b)p_ptr->x);
+	wr_u16b((u16b)cur_hgt);
+	wr_u16b((u16b)cur_wid);
 	wr_byte(p_ptr->feeling);
 
 
@@ -889,7 +976,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 	max_num_temp = 255;
 
 	/* Allocate the "template" array */
-	C_MAKE(template, max_num_temp, cave_template_type);
+	C_MAKE(templates, max_num_temp, cave_template_type);
 
 	/* Extract template array */
 	for (y = 0; y < cur_hgt; y++)
@@ -900,13 +987,13 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 
 			for (i = 0; i < num_temp; i++)
 			{
-				if (template[i].info == c_ptr->info &&
-				    template[i].feat == c_ptr->feat &&
-				    template[i].mimic == c_ptr->mimic &&
-				    template[i].special == c_ptr->special)
+				if (templates[i].info == c_ptr->info &&
+				    templates[i].feat == c_ptr->feat &&
+				    templates[i].mimic == c_ptr->mimic &&
+				    templates[i].special == c_ptr->special)
 				{
 					/* Same terrain is exist */
-					template[i].occurrence++;
+					templates[i].occurrence++;
 					break;
 				}
 			}
@@ -917,21 +1004,21 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 			/* If the max_num_temp is too small, increase it. */
 			if (num_temp >= max_num_temp)
 			{
-				cave_template_type *old_template = template;
+				cave_template_type *old_template = templates;
 
 				/* Re-allocate the "template" array */
-				C_MAKE(template, max_num_temp + 255, cave_template_type);
-				C_COPY(template, old_template, max_num_temp, cave_template_type);
-				C_FREE(old_template, max_num_temp, cave_template_type);
+				C_MAKE(templates, max_num_temp + 255, cave_template_type);
+				(void)C_COPY(templates, old_template, max_num_temp, cave_template_type);
+				C_KILL(old_template, max_num_temp, cave_template_type);
 				max_num_temp += 255;
 			}
 
 			/* Add new template */
-			template[num_temp].info = c_ptr->info;
-			template[num_temp].feat = c_ptr->feat;
-			template[num_temp].mimic = c_ptr->mimic;
-			template[num_temp].special = c_ptr->special;
-			template[num_temp].occurrence = 1;
+			templates[num_temp].info = c_ptr->info;
+			templates[num_temp].feat = c_ptr->feat;
+			templates[num_temp].mimic = c_ptr->mimic;
+			templates[num_temp].special = c_ptr->special;
+			templates[num_temp].occurrence = 1;
 
 			/* Increase number of template */
 			num_temp++;
@@ -943,7 +1030,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 	ang_sort_swap = ang_sort_swap_cave_temp;
 
 	/* Sort by occurrence */
-	ang_sort(template, &dummy_why, num_temp);
+	ang_sort(templates, &dummy_why, num_temp);
 
 
 	/*** Dump templates ***/
@@ -954,10 +1041,10 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 	/* Dump the templates */
 	for (i = 0; i < num_temp; i++)
 	{
-		cave_template_type *ct_ptr = &template[i];
+		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);
@@ -980,15 +1067,15 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 
 			for (i = 0; i < num_temp; i++)
 			{
-				if (template[i].info == c_ptr->info &&
-				    template[i].feat == c_ptr->feat &&
-				    template[i].mimic == c_ptr->mimic &&
-				    template[i].special == c_ptr->special)
+				if (templates[i].info == c_ptr->info &&
+				    templates[i].feat == c_ptr->feat &&
+				    templates[i].mimic == c_ptr->mimic &&
+				    templates[i].special == c_ptr->special)
 					break;
 			}
 
 			/* Extract an ID */
-			tmp16u = i;
+			tmp16u = (u16b)i;
 
 			/* If the run is broken, or too full, flush it */
 			if ((tmp16u != prev_u16b) || (count == MAX_UCHAR))
@@ -1031,7 +1118,7 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 
 
 	/* Free the "template" array */
-	C_FREE(template, max_num_temp, cave_template_type);
+	C_KILL(templates, max_num_temp, cave_template_type);
 
 
 	/*** Dump objects ***/
@@ -1065,8 +1152,10 @@ static void wr_saved_floor(saved_floor_type *sf_ptr)
 }
 
 
-/*
+/*!
+ * @brief 現在フロアの書き込み /
  * Write the current dungeon (new method)
+ * @return なし
  */
 static bool wr_dungeon(void)
 {
@@ -1091,11 +1180,11 @@ static bool wr_dungeon(void)
 
 	/*** Meta info ***/
 
-        /* Number of floor_id used from birth */
+	/* Number of floor_id used from birth */
 	wr_s16b(max_floor_id);
 
 	/* Current dungeon type */
-	wr_byte(dungeon_type);
+	wr_byte((byte_hack)dungeon_type);
 
 
 	/*** No saved floor (On the surface etc.) ***/
@@ -1123,8 +1212,8 @@ 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_s16b(sf_ptr->dun_level);
+		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);
 		wr_s16b(sf_ptr->upper_floor_id);
@@ -1169,9 +1258,10 @@ static bool wr_dungeon(void)
 }
 
 
-
-/*
+/*!
+ * @brief セーブデータの書き込み /
  * Actually write a save-file
+ * @return 成功すればtrue
  */
 static bool wr_savefile_new(void)
 {
@@ -1181,7 +1271,10 @@ static bool wr_savefile_new(void)
 
 	byte            tmp8u;
 	u16b            tmp16u;
+	u32b            tmp32u;
 
+	MONRACE_IDX r_idx;
+	KIND_OBJECT_IDX k_idx;
 
 	/* Compact the objects */
 	compact_objects(0);
@@ -1189,7 +1282,7 @@ static bool wr_savefile_new(void)
 	compact_monsters(0);
 
 	/* Guess at the current time */
-	now = time((time_t *)0);
+	now = (u32b)time((time_t *)0);
 
 
 	/* Note the operating system */
@@ -1214,7 +1307,7 @@ static bool wr_savefile_new(void)
 	xor_byte = 0;
 
 	/* Initial value of xor_byte */
-	tmp8u = (byte)randint0(256);
+	tmp8u = (byte)Rand_external(256);
 	wr_byte(tmp8u);
 
 
@@ -1270,61 +1363,62 @@ static bool wr_savefile_new(void)
 
 
 	/* Dump the number of "messages" */
-	tmp16u = message_num();
-	if (compress_savefile && (tmp16u > 40)) tmp16u = 40;
-	wr_u16b(tmp16u);
+	tmp32u = message_num();
+	if (compress_savefile && (tmp32u > 40)) tmp32u = 40;
+	wr_u32b(tmp32u);
 
 	/* Dump the messages (oldest first!) */
-	for (i = tmp16u - 1; i >= 0; i--)
+	for (i = tmp32u - 1; i >= 0; i--)
 	{
 		wr_string(message_str((s16b)i));
 	}
 
-
 	/* Dump the monster lore */
 	tmp16u = max_r_idx;
 	wr_u16b(tmp16u);
-	for (i = 0; i < tmp16u; i++) wr_lore(i);
-
+	for (r_idx = 0; r_idx < tmp16u; r_idx++) wr_lore(r_idx);
 
 	/* Dump the object memory */
 	tmp16u = max_k_idx;
 	wr_u16b(tmp16u);
-	for (i = 0; i < tmp16u; i++) wr_xtra(i);
+	for (k_idx = 0; k_idx < tmp16u; k_idx++) wr_xtra(k_idx);
 
 	/* Dump the towns */
 	tmp16u = max_towns;
 	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];
+
 		/* Save status for every quest */
-		wr_s16b(quest[i].status);
+		wr_s16b(q_ptr->status);
 
 		/* And the dungeon level too */
 		/* (prevents problems with multi-level quests) */
-		wr_s16b(quest[i].level);
+		wr_s16b((s16b)q_ptr->level);
 
-		wr_byte(quest[i].complev);
+		wr_byte((byte_hack)q_ptr->complev);
+		wr_u32b(q_ptr->comptime);
 
 		/* Save quest status if quest is running */
-		if (quest[i].status == QUEST_STATUS_TAKEN || quest[i].status == QUEST_STATUS_COMPLETED || !is_fixed_quest_idx(i))
+		if (q_ptr->status == QUEST_STATUS_TAKEN || q_ptr->status == QUEST_STATUS_COMPLETED || !is_fixed_quest_idx(i))
 		{
-			wr_s16b(quest[i].cur_num);
-			wr_s16b(quest[i].max_num);
-			wr_s16b(quest[i].type);
-			wr_s16b(quest[i].r_idx);
-			wr_s16b(quest[i].k_idx);
-			wr_byte(quest[i].flags);
-			wr_byte(quest[i].dungeon);
+			wr_s16b((s16b)q_ptr->cur_num);
+			wr_s16b((s16b)q_ptr->max_num);
+			wr_s16b(q_ptr->type);
+			wr_s16b(q_ptr->r_idx);
+			wr_s16b(q_ptr->k_idx);
+			wr_byte((byte_hack)q_ptr->flags);
+			wr_byte((byte_hack)q_ptr->dungeon);
 		}
 	}
 
@@ -1367,7 +1461,7 @@ static bool wr_savefile_new(void)
 	wr_u16b(tmp16u);
 	for (i = 0; i < tmp16u; i++)
 	{
-		wr_s16b(p_ptr->player_hp[i]);
+		wr_s16b((s16b)p_ptr->player_hp[i]);
 	}
 
 
@@ -1385,7 +1479,7 @@ static bool wr_savefile_new(void)
 	/* Dump the ordered spells */
 	for (i = 0; i < 64; i++)
 	{
-		wr_byte(p_ptr->spell_order[i]);
+		wr_byte((byte_hack)p_ptr->spell_order[i]);
 	}
 
 
@@ -1467,9 +1561,11 @@ static bool wr_savefile_new(void)
 }
 
 
-/*
+/*!
+ * @brief セーブデータ書き込みのサブルーチン /
  * Medium level player saver
- *
+ * @return 成功すればtrue
+ * @details
  * XXX XXX XXX Angband 2.8.0 will use "fd" instead of "fff" if possible
  */
 static bool save_player_aux(char *name)
@@ -1548,14 +1644,16 @@ static bool save_player_aux(char *name)
 
 
 
-/*
+/*!
+ * @brief セーブデータ書き込みのメインルーチン /
  * Attempt to save the player in a savefile
+ * @return 成功すればtrue
  */
 bool save_player(void)
 {
-	int             result = FALSE;
+	bool result = FALSE;
 
-	char    safe[1024];
+	char safe[1024];
 
 
 #ifdef SET_UID
@@ -1574,12 +1672,6 @@ bool save_player(void)
 	strcpy(safe, savefile);
 	strcat(safe, ".new");
 
-#ifdef VM
-	/* Hack -- support "flat directory" usage on VM/ESA */
-	strcpy(safe, savefile);
-	strcat(safe, "n");
-#endif /* VM */
-
 	/* Grab permissions */
 	safe_setuid_grab();
 
@@ -1600,12 +1692,6 @@ bool save_player(void)
 		strcpy(temp, savefile);
 		strcat(temp, ".old");
 
-#ifdef VM
-		/* Hack -- support "flat directory" usage on VM/ESA */
-		strcpy(temp, savefile);
-		strcat(temp, "o");
-#endif /* VM */
-
 		/* Grab permissions */
 		safe_setuid_grab();
 
@@ -1665,10 +1751,12 @@ bool save_player(void)
 }
 
 
-
-/*
+/*!
+ * @brief セーブデータ読み込みのメインルーチン /
  * Attempt to Load a "savefile"
- *
+ * @return 成功すればtrue
+ * @details
+ * <pre>
  * Version 2.7.0 introduced a slightly different "savefile" format from
  * older versions, requiring a completely different parsing method.
  *
@@ -1688,6 +1776,7 @@ bool save_player(void)
  *
  * Note that we always try to load the "current" savefile, even if
  * there is no such file, so we must check for "empty" savefile names.
+ * </pre>
  */
 bool load_player(void)
 {
@@ -1715,7 +1804,7 @@ bool load_player(void)
 	if (!savefile[0]) return (TRUE);
 
 
-#if !defined(MACINTOSH) && !defined(WINDOWS) && !defined(VM)
+#if !defined(MACINTOSH) && !defined(WINDOWS)
 
 	/* XXX XXX XXX Fix this */
 
@@ -1723,11 +1812,7 @@ bool load_player(void)
 	if (access(savefile, 0) < 0)
 	{
 		/* Give a message */
-#ifdef JP
-		msg_print("¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£");
-#else
-		msg_print("Savefile does not exist.");
-#endif
+		msg_print(_("セーブファイルがありません。", "Savefile does not exist."));
 
 		msg_print(NULL);
 
@@ -1761,12 +1846,7 @@ bool load_player(void)
 			my_fclose(fkk);
 
 			/* Message */
-#ifdef JP
-			msg_print("¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤Ï¸½ºß»ÈÍÑÃæ¤Ç¤¹¡£");
-#else
-			msg_print("Savefile is currently in use.");
-#endif
-
+			msg_print(_("セーブファイルは現在使用中です。", "Savefile is currently in use."));
 			msg_print(NULL);
 
 			/* Oops */
@@ -1796,12 +1876,7 @@ bool load_player(void)
 		if (fd < 0) err = -1;
 
 		/* Message (below) */
-#ifdef JP
-		if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¡£";
-#else
-		if (err) what = "Cannot open savefile";
-#endif
-
+		if (err) what = _("セーブファイルを開けません。", "Cannot open savefile");
 	}
 
 	/* Process file */
@@ -1817,12 +1892,7 @@ bool load_player(void)
 		if (fd_read(fd, (char*)(vvv), 4)) err = -1;
 
 		/* What */
-#ifdef JP
-		if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤òÆɤá¤Þ¤»¤ó¡£";
-#else
-		if (err) what = "Cannot read savefile";
-#endif
-
+		if (err) what = _("セーブファイルを読めません。", "Cannot read savefile");
 
 		/* Close the file */
 		(void)fd_close(fd);
@@ -1846,12 +1916,7 @@ bool load_player(void)
 		err = rd_savefile_new();
 
 		/* Message (below) */
-#ifdef JP
-		if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤ò²òÀϽÐÍè¤Þ¤»¤ó¡£";
-#else
-		if (err) what = "Cannot parse savefile";
-#endif
-
+		if (err) what = _("セーブファイルを解析出来ません。", "Cannot parse savefile");
 	}
 
 	/* Paranoia */
@@ -1861,12 +1926,7 @@ bool load_player(void)
 		if (!turn) err = -1;
 
 		/* Message (below) */
-#ifdef JP
-		if (err) what = "¥»¡¼¥Ö¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹";
-#else
-		if (err) what = "Broken savefile";
-#endif
-
+		if (err) what = _("セーブファイルが壊れています", "Broken savefile");
 	}
 
 #ifdef VERIFY_TIMESTAMP
@@ -1878,12 +1938,7 @@ bool load_player(void)
 		    sf_when < (statbuf.st_ctime - 100))
 		{
 			/* Message */
-#ifdef JP
-			what = "̵¸ú¤Ê¥¿¥¤¥à¡¦¥¹¥¿¥ó¥×¤Ç¤¹";
-#else
-			what = "Invalid timestamp";
-#endif
-
+			what = _("無効なタイム・スタンプです", "Invalid timestamp");
 
 			/* Oops */
 			err = -1;
@@ -1902,18 +1957,13 @@ bool load_player(void)
 		{
 			if (z_major == 2 && z_minor == 0 && z_patch == 6)
 			{
-#ifdef JP
-				msg_print("¥Ð¡¼¥¸¥ç¥ó 2.0.* ÍѤΥ»¡¼¥Ö¥Õ¥¡¥¤¥ë¤òÊÑ´¹¤·¤Þ¤·¤¿¡£");
-#else
-				msg_print("Converted a 2.0.* savefile.");
-#endif
-
+				msg_print(_("バージョン 2.0.* 用のセーブファイルを変換しました。", "Converted a 2.0.* savefile."));
 			}
 			else
 			{
 				/* Message */
 #ifdef JP
-				msg_format("¥Ð¡¼¥¸¥ç¥ó %d.%d.%d ÍѤΥ»¡¼¥Ö¡¦¥Õ¥¡¥¤¥ë¤òÊÑ´¹¤·¤Þ¤·¤¿¡£",
+				msg_format("バージョン %d.%d.%d 用のセーブ・ファイルを変換しました。",
 				    (z_major > 9) ? z_major-10 : z_major , z_minor, z_patch);
 #else
 				msg_format("Converted a %d.%d.%d savefile.",
@@ -1983,7 +2033,7 @@ bool load_player(void)
 
 	/* Message */
 #ifdef JP
-	msg_format("¥¨¥é¡¼(%s)¤¬¥Ð¡¼¥¸¥ç¥ó%d.%d.%d ÍÑ¥»¡¼¥Ö¥Õ¥¡¥¤¥ëÆɤ߹þÃæ¤ËȯÀ¸¡£",
+	msg_format("エラー(%s)がバージョン%d.%d.%d 用セーブファイル読み込み中に発生。",
 		   what, (z_major>9) ? z_major - 10 : z_major, z_minor, z_patch);
 #else
 	msg_format("Error (%s) reading %d.%d.%d savefile.",
@@ -1995,7 +2045,10 @@ bool load_player(void)
 	return (FALSE);
 }
 
-
+/*!
+ * @brief ファイルロック処理
+ * @return なし
+ */
 void remove_loc(void)
 {
 #ifdef VERIFY_SAVEFILE
@@ -2034,8 +2087,10 @@ void remove_loc(void)
 }
 
 
-/*
- * Actually write a temporal saved floor file
+/*!
+ * @brief ゲームプレイ中のフロア一時保存出力処理サブルーチン / Actually write a temporal saved floor file
+ * @param sf_ptr 保存フロア参照ポインタ
+ * @return なし
  */
 static bool save_floor_aux(saved_floor_type *sf_ptr)
 {
@@ -2081,10 +2136,13 @@ static bool save_floor_aux(saved_floor_type *sf_ptr)
 }
 
 
-/*
- * Attempt to save the temporally saved-floor data
+/*!
+ * @brief ゲームプレイ中のフロア一時保存出力処理メインルーチン / Attempt to save the temporally saved-floor data
+ * @param sf_ptr 保存フロア参照ポインタ
+ * @param mode 保存オプション
+ * @return なし
  */
-bool save_floor(saved_floor_type *sf_ptr, u32b mode)
+bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode)
 {
 	FILE *old_fff = NULL;
 	byte old_xor_byte = 0;