* the existing "number of turns to protect for", and where each hit
* by a monster will reduce the shield by that amount.
*
- * XXX XXX XXX
+ *
*/
#include "angband.h"
+#include "generate.h"
+#include "trap.h"
/*
*/
static void note(cptr msg)
{
- static int y = 2;
+ static TERM_LEN y = 2;
/* Draw the message */
prt(msg, y, 0);
/* Kind */
rd_s16b(&o_ptr->k_idx);
- /* Location */
rd_byte(&tmp8u);
o_ptr->iy = (POSITION)tmp8u;
rd_byte(&tmp8u);
o_ptr->ix = (POSITION)tmp8u;
/* Type/Subtype */
- rd_byte(&o_ptr->tval);
- rd_byte(&o_ptr->sval);
+ rd_byte(&tmp8u);
+ o_ptr->tval = tmp8u;
+ rd_byte(&tmp8u);
+ o_ptr->sval = tmp8u;
if (z_older_than(10, 4, 4))
{
rd_byte(&o_ptr->discount);
rd_byte(&tmp8u);
o_ptr->number = (ITEM_NUMBER)tmp8u;
- rd_s16b(&o_ptr->weight);
+
+ rd_s16b(&tmp16s);
+ o_ptr->weight = tmp16s;
rd_byte(&tmp8u);
o_ptr->name1 = tmp8u;
rd_s16b(&o_ptr->ac);
- rd_byte(&o_ptr->dd);
- rd_byte(&o_ptr->ds);
+ rd_byte(&tmp8u);
+ o_ptr->dd = tmp8u;
+ rd_byte(&tmp8u);
+ o_ptr->ds = tmp8u;
rd_byte(&o_ptr->ident);
static void rd_item(object_type *o_ptr)
{
object_kind *k_ptr;
- u32b flags;
+ BIT_FLAGS flags;
char buf[128];
byte_hack tmp8u;
s16b tmp16s;
/* Kind */
rd_s16b(&o_ptr->k_idx);
- /* Location */
rd_byte(&tmp8u);
o_ptr->iy = (POSITION)tmp8u;
rd_byte(&tmp8u);
}
else o_ptr->number = 1;
- rd_s16b(&o_ptr->weight);
+ rd_s16b(&tmp16s);
+ o_ptr->weight = tmp16s;
if (flags & SAVE_ITEM_NAME1)
{
if (flags & SAVE_ITEM_AC) rd_s16b(&o_ptr->ac);
else o_ptr->ac = 0;
- if (flags & SAVE_ITEM_DD) rd_byte(&o_ptr->dd);
+ if (flags & SAVE_ITEM_DD)
+ {
+ rd_byte(&tmp8u);
+ o_ptr->dd = tmp8u;
+ }
else o_ptr->dd = 0;
- if (flags & SAVE_ITEM_DS) rd_byte(&o_ptr->ds);
+ if (flags & SAVE_ITEM_DS)
+ {
+ rd_byte(&tmp8u);
+ o_ptr->ds = tmp8u;
+ }
else o_ptr->ds = 0;
if (flags & SAVE_ITEM_IDENT) rd_byte(&o_ptr->ident);
if(h_older_than(2,1,2,4))
{
- u32b flgs[TR_FLAG_SIZE];
+ BIT_FLAGS flgs[TR_FLAG_SIZE];
object_flags(o_ptr, flgs);
if ((o_ptr->name2 == EGO_DARK) || (o_ptr->name2 == EGO_ANCIENT_CURSE) || (o_ptr->name1 == ART_NIGHT))
{
byte tmp8u;
s16b tmp16s;
+ u32b tmp32u;
char buf[128];
/* Read the monster race */
}
else
{
- rd_u32b(&m_ptr->dealt_damage);
+ rd_s32b(&m_ptr->dealt_damage);
}
rd_s16b(&m_ptr->mtimed[MTIMED_CSLEEP]);
else
m_ptr->smart = 0;
- if (z_older_than(10, 4, 5))
+ if (z_older_than(10, 4, 5)) {
m_ptr->exp = 0;
- else
- rd_u32b(&m_ptr->exp);
+ } else {
+ rd_u32b(&tmp32u);
+ m_ptr->exp = tmp32u;
+ }
if (z_older_than(10, 2, 2))
{
*/
static void rd_monster(monster_type *m_ptr)
{
- u32b flags;
+ BIT_FLAGS flags;
char buf[128];
byte tmp8u;
s16b tmp16s;
+ u32b tmp32u;
if (h_older_than(1, 5, 0, 0))
{
}
else
{
- rd_u32b(&m_ptr->dealt_damage);
+ rd_s32b(&m_ptr->dealt_damage);
}
/* Monster race index of its appearance */
if (flags & SAVE_MON_SMART) rd_u32b(&m_ptr->smart);
else m_ptr->smart = 0;
- if (flags & SAVE_MON_EXP) rd_u32b(&m_ptr->exp);
+ if (flags & SAVE_MON_EXP)
+ {
+ rd_u32b(&tmp32u);
+ m_ptr->exp = (EXP)tmp32u;
+ }
else m_ptr->exp = 0;
m_ptr->mflag = 0; /* Not saved */
* @param r_idx 読み込み先モンスターID
* @return なし
*/
-static void rd_lore(int r_idx)
+static void rd_lore(MONRACE_IDX r_idx)
{
byte tmp8u;
+ s16b tmp16s;
monster_race *r_ptr = &r_info[r_idx];
/* Count sights/deaths/kills */
- rd_s16b(&r_ptr->r_sights);
- rd_s16b(&r_ptr->r_deaths);
- rd_s16b(&r_ptr->r_pkills);
+ rd_s16b(&tmp16s);
+ r_ptr->r_sights = (MONSTER_NUMBER)tmp16s;
+ rd_s16b(&tmp16s);
+ r_ptr->r_deaths = (MONSTER_NUMBER)tmp16s;
+ rd_s16b(&tmp16s);
+ r_ptr->r_pkills = (MONSTER_NUMBER)tmp16s;
if (h_older_than(1, 7, 0, 5))
{
r_ptr->r_akills = r_ptr->r_pkills;
}
else
{
- rd_s16b(&r_ptr->r_akills);
+ rd_s16b(&tmp16s);
+ r_ptr->r_akills = (MONSTER_NUMBER)tmp16s;
}
- rd_s16b(&r_ptr->r_tkills);
+ rd_s16b(&tmp16s);
+ r_ptr->r_tkills = (MONSTER_NUMBER)tmp16s;
/* Count wakes and ignores */
rd_byte(&r_ptr->r_wake);
rd_byte(&r_ptr->r_xtra2);
/* Count drops */
- rd_byte(&r_ptr->r_drop_gold);
- rd_byte(&r_ptr->r_drop_item);
+ rd_byte(&tmp8u);
+ r_ptr->r_drop_gold = (ITEM_NUMBER)tmp8u;
+ rd_byte(&tmp8u);
+ r_ptr->r_drop_item = (ITEM_NUMBER)tmp8u;
/* Count spells */
rd_byte(&tmp8u);
}
/* Read the "Racial" monster limit per level */
- rd_byte(&r_ptr->max_num);
+ rd_byte(&tmp8u);
+ r_ptr->max_num = (MONSTER_NUMBER)tmp8u;
/* Location in saved floor */
rd_s16b(&r_ptr->floor_id);
u16b c;
- u32b flag[8];
- u32b mask[8];
+ BIT_FLAGS flag[8];
+ BIT_FLAGS mask[8];
/*** Oops ***/
cheat_save = (c & 0x4000) ? TRUE : FALSE;
cheat_diary_output = (c & 0x8000) ? TRUE : FALSE;
cheat_turn = (c & 0x0080) ? TRUE : FALSE;
+ cheat_sight = (c & 0x0040) ? TRUE : FALSE;
rd_byte((byte *)&autosave_l);
rd_byte((byte *)&autosave_t);
* @brief ダミー情報スキップ / Hack -- strip the "ghost" info
* @return なし
* @details
- * XXX XXX XXX This is such a nasty hack it hurts.
+ * This is such a nasty hack it hurts.
*/
static void rd_ghost(void)
{
static void load_quick_start(void)
{
byte tmp8u;
+ s16b tmp16s;
int i;
if (z_older_than(11, 0, 13))
rd_byte(&previous_char.prace);
rd_byte(&previous_char.pclass);
rd_byte(&previous_char.pseikaku);
- rd_byte(&previous_char.realm1);
- rd_byte(&previous_char.realm2);
+ rd_byte(&tmp8u);
+ previous_char.realm1 = (REALM_IDX)tmp8u;
+ rd_byte(&tmp8u);
+ previous_char.realm2 = (REALM_IDX)tmp8u;
rd_s16b(&previous_char.age);
rd_s16b(&previous_char.ht);
for (i = 0; i < 6; i++) rd_s16b(&previous_char.stat_max[i]);
for (i = 0; i < 6; i++) rd_s16b(&previous_char.stat_max_max[i]);
- for (i = 0; i < PY_MAX_LEVEL; i++) rd_s16b(&previous_char.player_hp[i]);
+ for (i = 0; i < PY_MAX_LEVEL; i++)
+ {
+ rd_s16b(&tmp16s);
+ previous_char.player_hp[i] = (HIT_POINT)tmp16s;
+ }
rd_s16b(&previous_char.chaos_patron);
byte tmp8u;
s16b tmp16s;
+ s32b tmp32s;
u16b tmp16u;
rd_string(p_ptr->name, sizeof(p_ptr->name));
rd_byte(&p_ptr->pclass);
rd_byte(&p_ptr->pseikaku);
rd_byte(&p_ptr->psex);
- rd_byte(&p_ptr->realm1);
- rd_byte(&p_ptr->realm2);
- rd_byte(&tmp8u); /* oops */
+ rd_byte(&tmp8u);
+ p_ptr->realm1 = (REALM_IDX)tmp8u;
+ rd_byte(&tmp8u);
+ p_ptr->realm2 = (REALM_IDX)tmp8u;
if (z_older_than(10, 4, 4))
{
for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_max_max[i]);
for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_cur[i]);
- strip_bytes(24); /* oops */
rd_s32b(&p_ptr->au);
else
{
rd_byte(&p_ptr->start_race);
- rd_s32b(&p_ptr->old_race1);
- rd_s32b(&p_ptr->old_race2);
+ rd_s32b(&tmp32s);
+ p_ptr->old_race1 = (BIT_FLAGS)tmp32s;
+ rd_s32b(&tmp32s);
+ p_ptr->old_race2 = (BIT_FLAGS)tmp32s;
rd_s16b(&p_ptr->old_realm);
}
{
for (i = 0; i < MAX_MANE; i++)
{
- rd_s16b(&p_ptr->mane_spell[i]);
- rd_s16b(&p_ptr->mane_dam[i]);
+ rd_s16b(&tmp16s);
+ p_ptr->mane_spell[i] = (SPELL_IDX)tmp16s;
+ rd_s16b(&tmp16s);
+ p_ptr->mane_dam[i] = (SPELL_IDX)tmp16s;
}
rd_s16b(&p_ptr->mane_num);
}
}
}
- /* Repair maximum player level XXX XXX XXX */
+ /* Repair maximum player level */
if (p_ptr->max_plv < p_ptr->lev) p_ptr->max_plv = p_ptr->lev;
/* More info */
else
{
rd_s16b(&p_ptr->tim_res_time);
- rd_byte(&p_ptr->mimic_form);
+ rd_byte(&tmp8u);
+ p_ptr->mimic_form = (IDX)tmp8u;
rd_s16b(&p_ptr->tim_mimic);
rd_s16b(&p_ptr->tim_sh_fire);
}
rd_byte(&tmp8u);
p_ptr->autopick_autoregister = tmp8u ? TRUE : FALSE;
- rd_byte(&tmp8u); /* oops */
- rd_byte(&p_ptr->action);
+ rd_byte(&tmp8u);
+ p_ptr->action = (ACTION_IDX)tmp8u;
if (!z_older_than(10, 4, 3))
{
rd_byte(&tmp8u);
}
else if (z_older_than(10, 3, 10))
{
- s32b tmp32s;
rd_s32b(&tmp32s);
p_ptr->visit = 1L;
}
else
{
- rd_s32b(&p_ptr->visit);
+ rd_s32b(&tmp32s);
+ p_ptr->visit = (BIT_FLAGS)tmp32s;
}
if (!z_older_than(11, 0, 5))
{
/* Warning -- backpack is full */
else if (inven_cnt == INVEN_PACK)
{
- /* Oops */
note(_("持ち物の中のアイテムが多すぎる！", "Too many items in the inventory!"));
/* Fail */
{
int i;
char buf[128];
+ int message_max;
if (h_older_than(2, 2, 0, 75))
u16b num;
/* Total */
rd_u16b(&num);
+ message_max = (int)num;
/* Read the messages */
- for (i = 0; i < num; i++)
+ for (i = 0; i < message_max; i++)
{
/* Read the message */
rd_string(buf, sizeof(buf));
u32b num;
/* Total */
rd_u32b(&num);
+ message_max = (int)num;
/* Read the messages */
- for (i = 0; i < num; i++)
+ for (i = 0; i < message_max; i++)
{
/* Read the message */
rd_string(buf, sizeof(buf));
rd_s16b(&tmp16s);
dun_level = (DEPTH)tmp16s;
if (z_older_than(10, 3, 8)) dungeon_type = DUNGEON_ANGBAND;
- else rd_byte(&dungeon_type);
+ else
+ {
+ rd_byte(&tmp8u);
+ dungeon_type = (IDX)tmp8u;
+ }
/* Set the base level for old versions */
base_level = dun_level;
rd_s16b(&tmp16s);
base_level = (DEPTH)tmp16s;
- rd_s16b(&num_repro);
rd_s16b(&tmp16s);
- p_ptr->y = (int)tmp16s;
+ num_repro = (MONSTER_NUMBER)tmp16s;
+ rd_s16b(&tmp16s);
+ p_ptr->y = (POSITION)tmp16s;
rd_s16b(&tmp16s);
- p_ptr->x = (int)tmp16s;
+ p_ptr->x = (POSITION)tmp16s;
if (z_older_than(10, 3, 13) && !dun_level && !p_ptr->inside_arena) {p_ptr->y = 33;p_ptr->x = 131;}
rd_s16b(&tmp16s);
cur_hgt = (POSITION)tmp16s;
/* Read the dungeon items */
for (i = 1; i < limit; i++)
{
- IDX o_idx;
+ OBJECT_IDX o_idx;
object_type *o_ptr;
/* Get a new record */
o_idx = o_pop();
- /* Oops */
if (i != o_idx)
{
note(format(_("アイテム配置エラー (%d <> %d)", "Object allocation error (%d <> %d)"), i, o_idx));
rd_item(o_ptr);
- /* XXX XXX XXX XXX XXX */
+ /* XXX XXX */
/* Monster */
if (o_ptr->held_m_idx)
/* Read the monsters */
for (i = 1; i < limit; i++)
{
- IDX m_idx;
+ MONSTER_IDX m_idx;
monster_type *m_ptr;
/* Get a new record */
m_idx = m_pop();
- /* Oops */
if (i != m_idx)
{
note(format(_("モンスター配置エラー (%d <> %d)", "Monster allocation error (%d <> %d)"), i, m_idx));
/*!
* @brief 保存されたフロアを読み込む / Read the saved floor
- * @return なし
+ * @return info読み込みエラーコード
* @details
+ * この関数は、セーブデータの互換性を保つために多くのデータ改変処理を備えている。
+ * 現在確認している処理は以下の通り、
+ * <ul>
+ * <li>1.7.0.2で8bitだったcave_typeのfeat,mimicのID値を16bitに拡張する処理。</li>
+ * <li>1.7.0.8までに廃止、IDなどを差し替えたクエスト番号を置換する処理。</li>
+ * </ul>
* The monsters/objects must be loaded in the same order
* that they were stored, since the actual indexes matter.
*/
static errr rd_saved_floor(saved_floor_type *sf_ptr)
{
- int ymax, xmax;
- int i, y, x;
+ POSITION ymax, xmax;
+ POSITION y, x;
+ int i;
byte count;
byte tmp8u;
s16b tmp16s;
rd_s16b(&tmp16s);
base_level = (DEPTH)tmp16s;
- rd_s16b(&num_repro);
+ rd_s16b(&tmp16s);
+ num_repro = (MONSTER_NUMBER)tmp16s;
rd_u16b(&tmp16u);
- p_ptr->y = (int)tmp16u;
+ p_ptr->y = (POSITION)tmp16u;
rd_u16b(&tmp16u);
- p_ptr->x = (int)tmp16u;
+ p_ptr->x = (POSITION)tmp16u;
rd_s16b(&tmp16s);
cur_hgt = (POSITION)tmp16s;
cave_template_type *ct_ptr = &templates[i];
/* Read it */
- rd_u16b(&ct_ptr->info);
+ rd_u16b(&tmp16u);
+ ct_ptr->info = (BIT_FLAGS)tmp16u;
if (h_older_than(1, 7, 0, 2))
{
rd_byte(&tmp8u);
}
}
else if ((c_ptr->feat == OLD_FEAT_QUEST_EXIT) &&
- (p_ptr->inside_quest == OLD_QUEST_WATER_CAVE))
+ (p_ptr->inside_quest == OLD_QUEST_WATER_CAVE))
{
c_ptr->feat = feat_up_stair;
c_ptr->special = 0;
/* Read the dungeon items */
for (i = 1; i < limit; i++)
{
- IDX o_idx;
+ OBJECT_IDX o_idx;
object_type *o_ptr;
/* Get a new record */
o_idx = o_pop();
- /* Oops */
if (i != o_idx) return 152;
/* Acquire place */
for (i = 1; i < limit; i++)
{
cave_type *c_ptr;
- int m_idx;
+ MONSTER_IDX m_idx;
monster_type *m_ptr;
/* Get a new record */
m_idx = m_pop();
- /* Oops */
if (i != m_idx) return 162;
{
errr err = 0;
s16b tmp16s;
+ byte_hack tmp8u;
byte num;
int i;
rd_s16b(&max_floor_id);
/* Current dungeon type */
- rd_byte(&dungeon_type);
-
+ rd_byte(&tmp8u);
+ dungeon_type = (DUNGEON_IDX)tmp8u;
/* Number of the saved_floors array elements */
rd_byte(&num);
saved_floor_type *sf_ptr = &saved_floors[i];
rd_s16b(&sf_ptr->floor_id);
- rd_byte(&sf_ptr->savefile_id);
+ rd_byte(&tmp8u);
+ sf_ptr->savefile_id = (s16b)tmp8u;
rd_s16b(&tmp16s);
sf_ptr->dun_level = (DEPTH)tmp16s;
for (i = 0; i < num; i++)
{
saved_floor_type *sf_ptr = &saved_floors[i];
- byte tmp8u;
/* Unused element */
if (!sf_ptr->floor_id) continue;
byte tmp8u;
u16b tmp16u;
+ s16b tmp16s;
u32b tmp32u;
#ifdef VERIFY_CHECKSUMS
for (i = 0; i < tmp16u; i++)
{
/* Read the lore */
- rd_lore(i);
+ rd_lore((MONRACE_IDX)i);
}
if (arg_fiddle) note(_("モンスターの思い出をロードしました", "Loaded Monster Memory"));
}
/* Incompatible save files */
- if (max_quests_load > max_quests)
+ if (max_quests_load > max_q_idx)
{
note(format(_("クエストが多すぎる(%u)！", "Too many (%u) quests!"), max_quests_load));
return (23);
for (i = 0; i < max_quests_load; i++)
{
- if (i < max_quests)
+ if (i < max_q_idx)
{
quest_type* const q_ptr = &quest[i];
rd_s16b(&q_ptr->status);
- rd_s16b(&q_ptr->level);
+ rd_s16b(&tmp16s);
+ q_ptr->level = tmp16s;
if (z_older_than(11, 0, 6))
{
}
else
{
- rd_byte(&q_ptr->complev);
+ rd_byte(&tmp8u);
+ q_ptr->complev = tmp8u;
}
if(h_older_than(2, 1, 2, 2))
{
(!z_older_than(10, 3, 14) && (q_ptr->status == QUEST_STATUS_COMPLETED)) ||
(!z_older_than(11, 0, 7) && (i >= MIN_RANDOM_QUEST) && (i <= (MIN_RANDOM_QUEST + max_rquests_load))))
{
- rd_s16b(&q_ptr->cur_num);
- rd_s16b(&q_ptr->max_num);
+ rd_s16b(&tmp16s);
+ q_ptr->cur_num = (MONSTER_NUMBER)tmp16s;
+ rd_s16b(&tmp16s);
+ q_ptr->max_num = (MONSTER_NUMBER)tmp16s;
rd_s16b(&q_ptr->type);
/* Load quest monster index */
if (q_ptr->k_idx)
a_info[q_ptr->k_idx].gen_flags |= TRG_QUESTITEM;
- rd_byte(&q_ptr->flags);
+ rd_byte(&tmp8u);
+ q_ptr->flags = tmp8u;
if (z_older_than(10, 3, 11))
{
else
{
init_flags = INIT_ASSIGN;
- p_ptr->inside_quest = i;
+ p_ptr->inside_quest = (QUEST_IDX)i;
process_dungeon_file("q_info.txt", 0, 0, 0, 0);
p_ptr->inside_quest = old_inside_quest;
}
else
{
- rd_byte(&q_ptr->dungeon);
+ rd_byte(&tmp8u);
+ q_ptr->dungeon = tmp8u;
}
/* Mark uniques */
if (q_ptr->status == QUEST_STATUS_TAKEN || q_ptr->status == QUEST_STATUS_UNTAKEN)
/* Read the player_hp array */
for (i = 0; i < tmp16u; i++)
{
- rd_s16b(&p_ptr->player_hp[i]);
+ rd_s16b(&tmp16s);
+ p_ptr->player_hp[i] = (HIT_POINT)tmp16s;
}
/* Important -- Initialize the sex */
for (i = 0; i < 64; i++)
{
- rd_byte(&p_ptr->spell_order[i]);
+ rd_byte(&tmp8u);
+ p_ptr->spell_order[i] = (SPELL_IDX)tmp8u;
}
if (!z_older_than(11, 0, 9))
{
- char buf[SCREEN_BUF_SIZE];
+ char buf[SCREEN_BUF_MAX_SIZE];
rd_string(buf, sizeof(buf));
if (buf[0]) screen_dump = string_make(buf);
}
* @param mode オプション
* @return 成功したらtrue
*/
-bool load_floor(saved_floor_type *sf_ptr, u32b mode)
+bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode)
{
FILE *old_fff = NULL;
byte old_xor_byte = 0;
OSDN Git Service
