[Refactor] enum spells-typeをenum class AttributeTypeに置換

[hengbandforosx/hengbandosx.git] / src / io / interpret-pref-file.cpp

diff --git a/src/io/interpret-pref-file.cpp b/src/io/interpret-pref-file.cpp
index 8b46adc..90bd894 100644 (file)
--- a/src/io/interpret-pref-file.cpp
+++ b/src/io/interpret-pref-file.cpp
@@ -342,7 +342,7 @@ static errr interpret_z_token(char *buf)
         if (!streq(gf_desc[i].name, buf + 2))
             continue;
 
-        gf_color[gf_desc[i].num] = (TERM_COLOR)quark_add(t);
+        gf_color[(int)gf_desc[i].num] = (TERM_COLOR)quark_add(t);
         return 0;
     }
 
@@ -379,7 +379,7 @@ static errr decide_template_modifier(int tok, char **zz)
         return 0;
 
     int zz_length = strlen(zz[1]);
-    zz_length = MIN(MAX_MACRO_MOD, zz_length);
+    zz_length = std::min(MAX_MACRO_MOD, zz_length);
     if (2 + zz_length != tok)
         return 1;