[feature] ソースファイルをC++に対応

[hengbandforosx/hengbandosx.git] / src / load / load-v1-5-0.c

diff --git a/src/load/load-v1-5-0.c b/src/load/load-v1-5-0.c
index a727218..d49a11d 100644 (file)
--- a/src/load/load-v1-5-0.c
+++ b/src/load/load-v1-5-0.c
@@ -8,9 +8,9 @@
 #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"
@@ -68,7 +68,7 @@ void rd_item_old(player_type *player_ptr, object_type *o_ptr)
 
     /* Type/Subtype */
     rd_byte(&tmp8u);
-    o_ptr->tval = tmp8u;
+    o_ptr->tval = static_cast<tval_type>(tmp8u);
     rd_byte(&tmp8u);
     o_ptr->sval = tmp8u;
 
@@ -680,7 +680,7 @@ errr rd_dungeon_old(player_type *player_ptr)
                 /* 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;