* 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 */
*/
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;
/*** 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);
*/
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;
if (flags & SAVE_MON_SUB_ALIGN) wr_byte(m_ptr->sub_align);
if (flags & SAVE_MON_CSLEEP) wr_s16b(m_ptr->mtimed[MTIMED_CSLEEP]);
- wr_byte(m_ptr->mspeed);
+ wr_byte((byte)m_ptr->mspeed);
wr_s16b(m_ptr->energy_need);
if (flags & SAVE_MON_FAST)
wr_u32b(r_ptr->r_flags6);
wr_u32b(r_ptr->r_flagsr);
-
/* Monster limit per level */
wr_byte((byte_hack)r_ptr->max_num);
/*!
- * @brief 店舗情報を書き込む / Write a "store" record
+ * @brief セーブデータに店舗情報を書き込む / Write a "store" record
* @param st_ptr 店舗情報の参照ポインタ
* @return なし
*/
/*!
- * @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);
}
/*** Oops ***/
- /* Oops */
for (i = 0; i < 4; i++) wr_u32b(0L);
if (p_ptr->wizard) c |= 0x0002;
+ if (cheat_sight) c |= 0x0040;
if (cheat_turn) c |= 0x0080;
if (cheat_peek) c |= 0x0100;
int i;
wr_byte(previous_char.psex);
- wr_byte(previous_char.prace);
- wr_byte(previous_char.pclass);
- wr_byte(previous_char.pseikaku);
+ wr_byte((byte_hack)previous_char.prace);
+ wr_byte((byte_hack)previous_char.pclass);
+ wr_byte((byte_hack)previous_char.pseikaku);
wr_byte((byte_hack)previous_char.realm1);
wr_byte((byte_hack)previous_char.realm2);
wr_s16b(previous_char.sc);
wr_s32b(previous_char.au);
- 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 < A_MAX; i++) wr_s16b(previous_char.stat_max[i]);
+ for (i = 0; i < A_MAX; i++) wr_s16b(previous_char.stat_max_max[i]);
for (i = 0; i < PY_MAX_LEVEL; i++) wr_s16b((s16b)previous_char.player_hp[i]);
byte tmp8u;
wr_string(p_ptr->name);
-
wr_string(p_ptr->died_from);
-
wr_string(p_ptr->last_message ? p_ptr->last_message : "");
save_quick_start();
}
/* Race/Class/Gender/Spells */
- wr_byte(p_ptr->prace);
- wr_byte(p_ptr->pclass);
- wr_byte(p_ptr->pseikaku);
- wr_byte(p_ptr->psex);
+ wr_byte((byte_hack)p_ptr->prace);
+ wr_byte((byte_hack)p_ptr->pclass);
+ wr_byte((byte_hack)p_ptr->pseikaku);
+ wr_byte((byte_hack)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);
wr_s16b(p_ptr->wt);
/* Dump the stats (maximum and current) */
- for (i = 0; i < 6; ++i) wr_s16b(p_ptr->stat_max[i]);
- for (i = 0; i < 6; ++i) wr_s16b(p_ptr->stat_max_max[i]);
- for (i = 0; i < 6; ++i) wr_s16b(p_ptr->stat_cur[i]);
+ for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_max[i]);
+ for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_max_max[i]);
+ for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_cur[i]);
/* Ignore the transient stats */
for (i = 0; i < 12; ++i) wr_s16b(0);
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]);
- wr_byte(p_ptr->start_race);
+ wr_byte((byte_hack)p_ptr->start_race);
wr_s32b(p_ptr->old_race1);
wr_s32b(p_ptr->old_race2);
wr_s16b(p_ptr->old_realm);
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);
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);
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" */
/*** 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);
}
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);
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);
saved_floor_type *cur_sf_ptr;
int i;
- /* Forget the lite */
forget_lite();
-
- /* Forget the view */
forget_view();
-
- /* Forget the view */
clear_mon_lite();
/* Update lite/view */
p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
-
- /* Update monsters */
p_ptr->update |= (PU_MONSTERS | PU_DISTANCE | PU_FLOW);
-
/*** Meta info ***/
/* Number of floor_id used from birth */
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);
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];
* 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();
#if !defined(MACINTOSH) && !defined(WINDOWS)
- /* XXX XXX XXX Fix this */
+ /* Fix this */
/* Verify the existance of the savefile */
if (access(savefile, 0) < 0)
/* Oops, lock exists */
if (fkk)
{
- /* Close the file */
my_fclose(fkk);
- /* Message */
msg_print(_("セーブファイルは現在使用中です。", "Savefile is currently in use."));
msg_print(NULL);
- /* Oops */
return (FALSE);
}
#endif
- /* Okay */
if (!err)
{
/* Open the savefile */
/* What */
if (err) what = _("セーブファイルを読めません。", "Cannot read savefile");
-
- /* Close the file */
(void)fd_close(fd);
}
z_patch = vvv[2];
sf_extra = vvv[3];
-
- /* Clear screen */
Term_clear();
/* Attempt to load */
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 */
}
else
{
- /* Message */
-#ifdef JP
- 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.",
+ msg_format(_("バージョン %d.%d.%d 用のセーブ・ファイルを変換しました。", "Converted a %d.%d.%d savefile."),
(z_major > 9) ? z_major-10 : z_major , z_minor, z_patch);
-#endif
}
msg_print(NULL);
}
{
/* A character was loaded */
character_loaded = TRUE;
-
- /* Done */
return (TRUE);
}
/* Count lives */
sf_lives++;
- /* Done */
return (TRUE);
}
#endif
+ msg_format(_("エラー(%s)がバージョン%d.%d.%d 用セーブファイル読み込み中に発生。", "Error (%s) reading %d.%d.%d savefile."),
+ what, (z_major>9) ? z_major - 10 : z_major, z_minor, z_patch);
- /* Message */
-#ifdef JP
- 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.",
- what, (z_major>9) ? z_major - 10 : z_major, z_minor, z_patch);
-#endif
msg_print(NULL);
- /* Oops */
return (FALSE);
}
OSDN Git Service
