#include "load/load-v1-5-0.h"
#include "cmd-item/cmd-smith.h"
#include "dungeon/dungeon.h"
+#include "game-option/birth-options.h"
#include "grid/grid.h"
#include "grid/trap.h"
-#include "game-option/birth-options.h"
#include "load/angband-version-comparer.h"
#include "load/item-loader.h"
#include "load/load-util.h"
/* Type/Subtype */
rd_byte(&tmp8u);
- o_ptr->tval = tmp8u;
+ o_ptr->tval = static_cast<tval_type>(tmp8u);
rd_byte(&tmp8u);
o_ptr->sval = tmp8u;
rd_s16b(&o_ptr->held_m_idx);
rd_byte(&o_ptr->xtra1);
- rd_byte(&o_ptr->xtra2);
+ rd_byte(&tmp8u);
+ o_ptr->xtra2 = tmp8u;
if (z_older_than(11, 0, 10)) {
if (o_ptr->xtra1 == EGO_XTRA_SUSTAIN) {
o_ptr->k_idx = lookup_kind(TV_SOFT_ARMOR, SV_YOIYAMI_ROBE);
if (z_older_than(10, 4, 9)) {
- if (have_flag(o_ptr->art_flags, TR_MAGIC_MASTERY)) {
+ if (has_flag(o_ptr->art_flags, TR_MAGIC_MASTERY)) {
remove_flag(o_ptr->art_flags, TR_MAGIC_MASTERY);
add_flag(o_ptr->art_flags, TR_DEC_MANA);
}
/* Old CAVE_IN_MIRROR flag */
if (g_ptr->info & CAVE_OBJECT) {
g_ptr->mimic = feat_mirror;
- } else if ((g_ptr->feat == OLD_FEAT_MINOR_GLYPH) || (g_ptr->feat == OLD_FEAT_GLYPH)) {
+ } else if ((g_ptr->feat == OLD_FEAT_RUNE_EXPLOSION) || (g_ptr->feat == OLD_FEAT_RUNE_PROTECTION)) {
g_ptr->info |= CAVE_OBJECT;
g_ptr->mimic = g_ptr->feat;
g_ptr->feat = feat_floor;