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);
- 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);
/*** 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);
tmp8u = (byte)m_ptr->mtimed[MTIMED_MONFEAR];
wr_byte(tmp8u);
}
- 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_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];
* @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];
* @param k_idx ベースアイテムのID
* @return なし
*/
-static void wr_xtra(int k_idx)
+static void wr_xtra(KIND_OBJECT_IDX k_idx)
{
byte tmp8u = 0;
if (p_ptr->wizard) c |= 0x0002;
+ if (cheat_turn) c |= 0x0080;
+
if (cheat_peek) c |= 0x0100;
if (cheat_hear) c |= 0x0200;
if (cheat_room) c |= 0x0400;
if (cheat_know) c |= 0x1000;
if (cheat_live) c |= 0x2000;
if (cheat_save) c |= 0x4000;
+ if (cheat_diary_output) c |= 0x8000;
wr_u16b(c);
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);
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);
int i,j;
byte tmp8u;
- wr_string(player_name);
+ wr_string(p_ptr->name);
wr_string(p_ptr->died_from);
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);
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]);
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);
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);
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 */
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);
{
/*** Not a saved floor ***/
- wr_s16b(dun_level);
+ wr_s16b((s16b)dun_level);
}
else
{
wr_s16b(sf_ptr->floor_id);
wr_byte(sf_ptr->savefile_id);
- wr_s16b(sf_ptr->dun_level);
+ 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)p_ptr->y);
wr_u16b((u16b)p_ptr->x);
- wr_u16b(cur_hgt);
- wr_u16b(cur_wid);
+ wr_u16b((u16b)cur_hgt);
+ wr_u16b((u16b)cur_wid);
wr_byte(p_ptr->feeling);
}
/* 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))
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.) ***/
wr_s16b(sf_ptr->floor_id);
wr_byte(sf_ptr->savefile_id);
- wr_s16b(sf_ptr->dun_level);
+ 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);
byte tmp8u;
u16b tmp16u;
+ u32b tmp32u;
+ MONRACE_IDX r_idx;
+ KIND_OBJECT_IDX k_idx;
/* Compact the objects */
compact_objects(0);
compact_monsters(0);
/* Guess at the current time */
- now = time((time_t *)0);
+ now = (u32b)time((time_t *)0);
/* Note the operating system */
/* 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;
/* And the dungeon level too */
/* (prevents problems with multi-level quests) */
- wr_s16b(q_ptr->level);
+ wr_s16b((s16b)q_ptr->level);
- wr_byte(q_ptr->complev);
+ wr_byte((byte_hack)q_ptr->complev);
wr_u32b(q_ptr->comptime);
/* Save quest status if quest is running */
if (q_ptr->status == QUEST_STATUS_TAKEN || q_ptr->status == QUEST_STATUS_COMPLETED || !is_fixed_quest_idx(i))
{
- wr_s16b(q_ptr->cur_num);
- wr_s16b(q_ptr->max_num);
+ 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(q_ptr->flags);
- wr_byte(q_ptr->dungeon);
+ wr_byte((byte_hack)q_ptr->flags);
+ wr_byte((byte_hack)q_ptr->dungeon);
}
}
wr_u16b(tmp16u);
for (i = 0; i < tmp16u; i++)
{
- wr_s16b(p_ptr->player_hp[i]);
+ wr_s16b((s16b)p_ptr->player_hp[i]);
}
/* 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]);
}
*/
bool save_player(void)
{
- int result = FALSE;
+ bool result = FALSE;
- char safe[1024];
+ char safe[1024];
#ifdef SET_UID
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();
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();
if (!savefile[0]) return (TRUE);
-#if !defined(MACINTOSH) && !defined(WINDOWS) && !defined(VM)
+#if !defined(MACINTOSH) && !defined(WINDOWS)
/* XXX XXX XXX Fix this */
/* 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.",
OSDN Git Service
