X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fknowledge%2Fknowledge-experiences.cpp;h=7a74a43024c2df1db4d1e0d919a8921273b22cab;hb=613e3c767869a96d7ef620ae26c94c83e1f48c37;hp=0904960ee8dc19cd7a065dd1e9a91d99dbde26bb;hpb=5e65f8f2a4c08382567dd9215c1c3b4bf3a96769;p=hengbandforosx%2Fhengbandosx.git

diff --git a/src/knowledge/knowledge-experiences.cpp b/src/knowledge/knowledge-experiences.cpp
index 0904960ee..7a74a4302 100644
--- a/src/knowledge/knowledge-experiences.cpp
+++ b/src/knowledge/knowledge-experiences.cpp
@@ -11,7 +11,7 @@
 #include "game-option/text-display-options.h"
 #include "io-dump/dump-util.h"
 #include "object/object-kind.h"
-#include "player/player-class.h"
+#include "player-info/class-info.h"
 #include "player/player-skill.h"
 #include "player/player-status.h"
 #include "realm/realm-names-table.h"
@@ -24,35 +24,34 @@
 /*
  * Display weapon-exp
  */
-void do_cmd_knowledge_weapon_exp(player_type *creature_ptr)
+void do_cmd_knowledge_weapon_exp(player_type *player_ptr)
 {
-    FILE *fff = NULL;
+    FILE *fff = nullptr;
     GAME_TEXT file_name[FILE_NAME_SIZE];
     if (!open_temporary_file(&fff, file_name))
         return;
 
-    for (int i = 0; i < 5; i++) {
+    for (auto tval : { ItemKindType::SWORD, ItemKindType::POLEARM, ItemKindType::HAFTED, ItemKindType::DIGGING, ItemKindType::BOW }) {
         for (int num = 0; num < 64; num++) {
             char tmp[30];
-            for (KIND_OBJECT_IDX j = 0; j < max_k_idx; j++) {
-                object_kind *k_ptr = &k_info[j];
-
-                if ((k_ptr->tval != TV_SWORD - i) || (k_ptr->sval != num))
+            for (const auto &k_ref : k_info) {
+                if ((k_ref.tval != tval) || (k_ref.sval != num))
                     continue;
-                if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON || k_ptr->sval == SV_HARP))
+                if ((k_ref.tval == ItemKindType::BOW) && (k_ref.sval == SV_CRIMSON || k_ref.sval == SV_HARP))
                     continue;
 
-                SUB_EXP weapon_exp = creature_ptr->weapon_exp[4 - i][num];
-                SUB_EXP weapon_max = s_info[creature_ptr->pclass].w_max[4 - i][num];
-                strip_name(tmp, j);
+                SUB_EXP weapon_exp = player_ptr->weapon_exp[tval][num];
+                SUB_EXP weapon_max = s_info[enum2i(player_ptr->pclass)].w_max[tval][num];
+                strip_name(tmp, k_ref.idx);
                 fprintf(fff, "%-25s ", tmp);
                 if (show_actual_value)
-                    fprintf(fff, "%4d/%4d ", MIN(weapon_exp, weapon_max), weapon_max);
+                    fprintf(fff, "%4d/%4d ", std::min(weapon_exp, weapon_max), weapon_max);
                 if (weapon_exp >= weapon_max)
                     fprintf(fff, "!");
                 else
                     fprintf(fff, " ");
-                fprintf(fff, "%s", exp_level_str[weapon_exp_level(weapon_exp)]);
+                auto skill_rank = PlayerSkill::weapon_skill_rank(weapon_exp);
+                fprintf(fff, "%s", PlayerSkill::skill_rank_str(skill_rank));
                 if (cheat_xtra)
                     fprintf(fff, " %d", weapon_exp);
                 fprintf(fff, "\n");
@@ -62,7 +61,7 @@ void do_cmd_knowledge_weapon_exp(player_type *creature_ptr)
     }
 
     angband_fclose(fff);
-    (void)show_file(creature_ptr, TRUE, file_name, _("武器の経験値", "Weapon Proficiency"), 0, 0);
+    (void)show_file(player_ptr, true, file_name, _("武器の経験値", "Weapon Proficiency"), 0, 0);
     fd_kill(file_name);
 }
 
@@ -70,41 +69,40 @@ void do_cmd_knowledge_weapon_exp(player_type *creature_ptr)
  * @brief 魔法の経験値を表示するコマンドのメインルーチン
  * Display spell-exp
  */
-void do_cmd_knowledge_spell_exp(player_type *creature_ptr)
+void do_cmd_knowledge_spell_exp(player_type *player_ptr)
 {
-    FILE *fff = NULL;
+    FILE *fff = nullptr;
     GAME_TEXT file_name[FILE_NAME_SIZE];
     if (!open_temporary_file(&fff, file_name))
         return;
 
-    if (creature_ptr->realm1 != REALM_NONE) {
-        fprintf(fff, _("%sの魔法書\n", "%s Spellbook\n"), realm_names[creature_ptr->realm1]);
+    if (player_ptr->realm1 != REALM_NONE) {
+        fprintf(fff, _("%sの魔法書\n", "%s Spellbook\n"), realm_names[player_ptr->realm1]);
         for (SPELL_IDX i = 0; i < 32; i++) {
             const magic_type *s_ptr;
-            if (!is_magic(creature_ptr->realm1)) {
-                s_ptr = &technic_info[creature_ptr->realm1 - MIN_TECHNIC][i];
+            if (!is_magic(player_ptr->realm1)) {
+                s_ptr = &technic_info[player_ptr->realm1 - MIN_TECHNIC][i];
             } else {
-                s_ptr = &mp_ptr->info[creature_ptr->realm1 - 1][i];
+                s_ptr = &mp_ptr->info[player_ptr->realm1 - 1][i];
             }
 
             if (s_ptr->slevel >= 99)
                 continue;
-            SUB_EXP spell_exp = creature_ptr->spell_exp[i];
-            int exp_level = spell_exp_level(spell_exp);
-            fprintf(fff, "%-25s ", exe_spell(creature_ptr, creature_ptr->realm1, i, SPELL_NAME));
-            if (creature_ptr->realm1 == REALM_HISSATSU) {
+            SUB_EXP spell_exp = player_ptr->spell_exp[i];
+            auto skill_rank = PlayerSkill::spell_skill_rank(spell_exp);
+            fprintf(fff, "%-25s ", exe_spell(player_ptr, player_ptr->realm1, i, SPELL_NAME));
+            if (player_ptr->realm1 == REALM_HISSATSU) {
                 if (show_actual_value)
                     fprintf(fff, "----/---- ");
                 fprintf(fff, "[--]");
-            }
-            else {
+            } else {
                 if (show_actual_value)
-                    fprintf(fff, "%4d/%4d ", MIN(spell_exp, SPELL_EXP_MASTER), SPELL_EXP_MASTER);
-                if (exp_level >= EXP_LEVEL_MASTER)
+                    fprintf(fff, "%4d/%4d ", spell_exp, PlayerSkill::spell_exp_at(PlayerSkillRank::MASTER));
+                if (skill_rank >= PlayerSkillRank::MASTER)
                     fprintf(fff, "!");
                 else
                     fprintf(fff, " ");
-                fprintf(fff, "%s", exp_level_str[exp_level]);
+                fprintf(fff, "%s", PlayerSkill::skill_rank_str(skill_rank));
             }
 
             if (cheat_xtra)
@@ -113,29 +111,29 @@ void do_cmd_knowledge_spell_exp(player_type *creature_ptr)
         }
     }
 
-    if (creature_ptr->realm2 != REALM_NONE) {
-        fprintf(fff, _("%sの魔法書\n", "\n%s Spellbook\n"), realm_names[creature_ptr->realm2]);
+    if (player_ptr->realm2 != REALM_NONE) {
+        fprintf(fff, _("%sの魔法書\n", "\n%s Spellbook\n"), realm_names[player_ptr->realm2]);
         for (SPELL_IDX i = 0; i < 32; i++) {
             const magic_type *s_ptr;
-            if (!is_magic(creature_ptr->realm1)) {
-                s_ptr = &technic_info[creature_ptr->realm2 - MIN_TECHNIC][i];
+            if (!is_magic(player_ptr->realm1)) {
+                s_ptr = &technic_info[player_ptr->realm2 - MIN_TECHNIC][i];
             } else {
-                s_ptr = &mp_ptr->info[creature_ptr->realm2 - 1][i];
+                s_ptr = &mp_ptr->info[player_ptr->realm2 - 1][i];
             }
 
             if (s_ptr->slevel >= 99)
                 continue;
 
-            SUB_EXP spell_exp = creature_ptr->spell_exp[i + 32];
-            int exp_level = spell_exp_level(spell_exp);
-            fprintf(fff, "%-25s ", exe_spell(creature_ptr, creature_ptr->realm2, i, SPELL_NAME));
+            SUB_EXP spell_exp = player_ptr->spell_exp[i + 32];
+            auto skill_rank = PlayerSkill::spell_skill_rank(spell_exp);
+            fprintf(fff, "%-25s ", exe_spell(player_ptr, player_ptr->realm2, i, SPELL_NAME));
             if (show_actual_value)
-                fprintf(fff, "%4d/%4d ", MIN(spell_exp, SPELL_EXP_MASTER), SPELL_EXP_MASTER);
-            if (exp_level >= EXP_LEVEL_EXPERT)
+                fprintf(fff, "%4d/%4d ", spell_exp, PlayerSkill::spell_exp_at(PlayerSkillRank::MASTER));
+            if (skill_rank >= PlayerSkillRank::EXPERT)
                 fprintf(fff, "!");
             else
                 fprintf(fff, " ");
-            fprintf(fff, "%s", exp_level_str[exp_level]);
+            fprintf(fff, "%s", PlayerSkill::skill_rank_str(skill_rank));
             if (cheat_xtra)
                 fprintf(fff, " %d", spell_exp);
             fprintf(fff, "\n");
@@ -143,7 +141,7 @@ void do_cmd_knowledge_spell_exp(player_type *creature_ptr)
     }
 
     angband_fclose(fff);
-    (void)show_file(creature_ptr, TRUE, file_name, _("魔法の経験値", "Spell Proficiency"), 0, 0);
+    (void)show_file(player_ptr, true, file_name, _("魔法の経験値", "Spell Proficiency"), 0, 0);
     fd_kill(file_name);
 }
 
@@ -151,33 +149,31 @@ void do_cmd_knowledge_spell_exp(player_type *creature_ptr)
  * @brief スキル情報を表示するコマンドのメインルーチン /
  * Display skill-exp
  */
-void do_cmd_knowledge_skill_exp(player_type *creature_ptr)
+void do_cmd_knowledge_skill_exp(player_type *player_ptr)
 {
-    char skill_name[GINOU_TEMPMAX][20] = { _("マーシャルアーツ", "Martial Arts    "), _("二刀流          ", "Dual Wielding   "),
-        _("乗馬            ", "Riding          "), _("盾              ", "Shield          ") };
-
-    FILE *fff = NULL;
+    FILE *fff = nullptr;
     char file_name[FILE_NAME_SIZE];
     if (!open_temporary_file(&fff, file_name))
         return;
 
-    for (int i = 0; i < GINOU_TEMPMAX; i++) {
-        SUB_EXP skill_exp = creature_ptr->skill_exp[i];
-        SUB_EXP skill_max = s_info[creature_ptr->pclass].s_max[i];
-        fprintf(fff, "%-20s ", skill_name[i]);
+    for (auto i : PLAYER_SKILL_KIND_TYPE_RANGE) {
+        SUB_EXP skill_exp = player_ptr->skill_exp[i];
+        SUB_EXP skill_max = s_info[enum2i(player_ptr->pclass)].s_max[i];
+        fprintf(fff, "%-20s ", PlayerSkill::skill_name(i));
         if (show_actual_value)
-            fprintf(fff, "%4d/%4d ", MIN(skill_exp, skill_max), skill_max);
+            fprintf(fff, "%4d/%4d ", std::min(skill_exp, skill_max), skill_max);
         if (skill_exp >= skill_max)
             fprintf(fff, "!");
         else
             fprintf(fff, " ");
-        fprintf(fff, "%s", exp_level_str[(i == GINOU_RIDING) ? riding_exp_level(skill_exp) : weapon_exp_level(skill_exp)]);
+        auto skill_rank = (i == PlayerSkillKindType::RIDING) ? PlayerSkill::riding_skill_rank(skill_exp) : PlayerSkill::weapon_skill_rank(skill_exp);
+        fprintf(fff, "%s", PlayerSkill::skill_rank_str(skill_rank));
         if (cheat_xtra)
             fprintf(fff, " %d", skill_exp);
         fprintf(fff, "\n");
     }
 
     angband_fclose(fff);
-    (void)show_file(creature_ptr, TRUE, file_name, _("技能の経験値", "Miscellaneous Proficiency"), 0, 0);
+    (void)show_file(player_ptr, true, file_name, _("技能の経験値", "Miscellaneous Proficiency"), 0, 0);
     fd_kill(file_name);
 }