X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fsave.c;h=ce028f1b6388075e084b1b463decdbd70caf0d37;hb=c5929dec1ff057c1f014869a02c39fba3096ab44;hp=7db8b36d8812bf702aef6354446166b866038363;hpb=bc0b36b162786b37212bb99575020e94ed9380ee;p=hengband%2Fhengband.git diff --git a/src/save.c b/src/save.c index 7db8b36d8..ce028f1b6 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 */ @@ -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); @@ -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); @@ -629,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); @@ -715,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); @@ -797,7 +786,7 @@ 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(0); wr_byte((byte_hack)p_ptr->action); wr_byte(0); wr_byte(preserve_mode); @@ -807,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" */ @@ -1566,7 +1555,7 @@ 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) { @@ -1806,7 +1795,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) @@ -1848,7 +1837,6 @@ bool load_player(void) msg_print(_("セーブファイルは現在使用中です。", "Savefile is currently in use.")); msg_print(NULL); - /* Oops */ return (FALSE); } @@ -1865,7 +1853,6 @@ bool load_player(void) #endif - /* Okay */ if (!err) { /* Open the savefile */ @@ -1938,14 +1925,12 @@ bool load_player(void) { what = _("無効なタイム・スタンプです", "Invalid timestamp"); - /* Oops */ err = -1; } } #endif - /* Okay */ if (!err) { /* Give a conversion warning */ @@ -2035,7 +2020,6 @@ bool load_player(void) #endif msg_print(NULL); - /* Oops */ return (FALSE); }