変愚「Refactor dice_to_string() to avoid sprintf(). Does part of the work …」のマージ

Bakabakaband/Bakabakaband/Bakabakaband.vcxproj

@@ -103,7 +103,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='English-Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WINDOWS;_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_STDINT_H;JP;SJIS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINDOWS;_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_STDINT_H;JP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>EnableAllWarnings</WarningLevel>

Bakabakaband/Bakabakaband/Bakabakaband.vcxproj.filters

@@ -2470,9 +2470,6 @@
     <ClCompile Include="..\..\src\system\dungeon-info.cpp">
       <Filter>system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\system\terrain-type-definition.cpp">
-      <Filter>system</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\monster-race\race-brightness-mask.cpp">
       <Filter>monster-race</Filter>
     </ClCompile>
@@ -5372,9 +5369,6 @@
     <ClInclude Include="..\..\src\system\dungeon-info.h">
       <Filter>system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\system\terrain-type-definition.h">
-      <Filter>system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster-race\race-brightness-flags.h">
       <Filter>monster-race</Filter>
     </ClInclude>

src/blue-magic/learnt-info.cpp

@@ -9,6 +9,7 @@
 #include "monster-race/race-ability-flags.h"
 #include "mspell/mspell-damage-calculator.h"
 #include "system/player-type-definition.h"
+#include "term/z-form.h"
 
 /*!
  * @brief モンスター魔法をプレイヤーが使用する場合の換算レベル
@@ -26,76 +27,35 @@ PLAYER_LEVEL get_pseudo_monstetr_level(PlayerType *player_ptr)
  * @param SPELL_NUM 呪文番号
  * @param plev プレイヤーレベル
  * @param msg 表示する文字列
- * @param tmp 返すメッセージを格納する配列
+ * @return std::string 潜在的な損傷の説明
  */
-static void set_bluemage_damage(PlayerType *player_ptr, MonsterAbilityType ms_type, PLAYER_LEVEL plev, concptr msg, char *tmp)
+static std::string set_bluemage_damage(PlayerType *player_ptr, MonsterAbilityType ms_type, PLAYER_LEVEL plev, concptr msg)
 {
     int base_damage = monspell_bluemage_damage(player_ptr, ms_type, plev, BASE_DAM);
     int dice_num = monspell_bluemage_damage(player_ptr, ms_type, plev, DICE_NUM);
     int dice_side = monspell_bluemage_damage(player_ptr, ms_type, plev, DICE_SIDE);
     int dice_mult = monspell_bluemage_damage(player_ptr, ms_type, plev, DICE_MULT);
     int dice_div = monspell_bluemage_damage(player_ptr, ms_type, plev, DICE_DIV);
     char dmg_str[80];
-    dice_to_string(base_damage, dice_num, dice_side, dice_mult, dice_div, dmg_str);
-    sprintf(tmp, " %s %s", msg, dmg_str);
+    dice_to_string(base_damage, dice_num, dice_side, dice_mult, dice_div);
+    return format(" %s %s", msg, dmg_str);
 }
 
 /*!
  * @brief 受け取ったモンスター魔法のIDに応じて青魔法の効果情報をまとめたフォーマットを返す
  * @param player_ptr プレイヤーへの参照ポインタ
- * @param p 情報を返す文字列参照ポインタ
  * @param power モンスター魔法のID
+ * @return std::string パワーについてのコメント
  */
-void learnt_info(PlayerType *player_ptr, char *p, MonsterAbilityType power)
+std::string learnt_info(PlayerType *player_ptr, MonsterAbilityType power)
 {
     PLAYER_LEVEL plev = get_pseudo_monstetr_level(player_ptr);
 
-    strcpy(p, "");
-
     switch (power) {
-    case MonsterAbilityType::SHRIEK:
-    case MonsterAbilityType::XXX1:
-    case MonsterAbilityType::XXX2:
-    case MonsterAbilityType::XXX3:
-    case MonsterAbilityType::XXX4:
-    case MonsterAbilityType::SCARE:
-    case MonsterAbilityType::BLIND:
-    case MonsterAbilityType::CONF:
-    case MonsterAbilityType::SLOW:
-    case MonsterAbilityType::HOLD:
-    case MonsterAbilityType::HAND_DOOM:
-    case MonsterAbilityType::WORLD:
-    case MonsterAbilityType::SPECIAL:
-    case MonsterAbilityType::TELE_TO:
-    case MonsterAbilityType::TELE_AWAY:
-    case MonsterAbilityType::TELE_LEVEL:
-    case MonsterAbilityType::DARKNESS:
-    case MonsterAbilityType::TRAPS:
-    case MonsterAbilityType::FORGET:
-    case MonsterAbilityType::S_KIN:
-    case MonsterAbilityType::S_CYBER:
-    case MonsterAbilityType::S_MONSTER:
-    case MonsterAbilityType::S_MONSTERS:
-    case MonsterAbilityType::S_ANT:
-    case MonsterAbilityType::S_SPIDER:
-    case MonsterAbilityType::S_HOUND:
-    case MonsterAbilityType::S_HYDRA:
-    case MonsterAbilityType::S_ANGEL:
-    case MonsterAbilityType::S_DEMON:
-    case MonsterAbilityType::S_UNDEAD:
-    case MonsterAbilityType::S_DRAGON:
-    case MonsterAbilityType::S_HI_UNDEAD:
-    case MonsterAbilityType::S_HI_DRAGON:
-    case MonsterAbilityType::S_AMBERITES:
-    case MonsterAbilityType::S_UNIQUE:
-        break;
     case MonsterAbilityType::BA_MANA:
     case MonsterAbilityType::BA_DARK:
     case MonsterAbilityType::BA_LITE:
-        set_bluemage_damage(player_ptr, power, plev, KWD_DAM, p);
-        break;
-    case MonsterAbilityType::DISPEL:
-        break;
+        return set_bluemage_damage(player_ptr, power, plev, KWD_DAM);
     case MonsterAbilityType::ROCKET:
     case MonsterAbilityType::SHOOT:
     case MonsterAbilityType::BR_ACID:
@@ -133,11 +93,9 @@ void learnt_info(PlayerType *player_ptr, char *p, MonsterAbilityType power)
     case MonsterAbilityType::BA_WATE:
     case MonsterAbilityType::BA_VOID:
     case MonsterAbilityType::BA_ABYSS:
-        set_bluemage_damage(player_ptr, power, plev, KWD_DAM, p);
-        break;
+        return set_bluemage_damage(player_ptr, power, plev, KWD_DAM);
     case MonsterAbilityType::DRAIN_MANA:
-        set_bluemage_damage(player_ptr, power, plev, KWD_HEAL, p);
-        break;
+        return set_bluemage_damage(player_ptr, power, plev, KWD_HEAL);
     case MonsterAbilityType::MIND_BLAST:
     case MonsterAbilityType::BRAIN_SMASH:
     case MonsterAbilityType::CAUSE_1:
@@ -156,31 +114,22 @@ void learnt_info(PlayerType *player_ptr, char *p, MonsterAbilityType power)
     case MonsterAbilityType::BO_VOID:
     case MonsterAbilityType::BO_ICEE:
     case MonsterAbilityType::MISSILE:
-        set_bluemage_damage(player_ptr, power, plev, KWD_DAM, p);
-        break;
+        return set_bluemage_damage(player_ptr, power, plev, KWD_DAM);
     case MonsterAbilityType::HASTE:
-        sprintf(p, " %sd%d+%d", KWD_DURATION, 20 + plev, plev);
-        break;
+        return format(" %sd%d+%d", KWD_DURATION, 20 + plev, plev);
     case MonsterAbilityType::HEAL:
-        set_bluemage_damage(player_ptr, power, plev, KWD_HEAL, p);
-        break;
+        return set_bluemage_damage(player_ptr, power, plev, KWD_HEAL);
     case MonsterAbilityType::INVULNER:
-        sprintf(p, " %sd7+7", KWD_DURATION);
-        break;
+        return format(" %sd7+7", KWD_DURATION);
     case MonsterAbilityType::BLINK:
-        sprintf(p, " %s10", KWD_SPHERE);
-        break;
+        return format(" %s10", KWD_SPHERE);
     case MonsterAbilityType::TPORT:
-        sprintf(p, " %s%d", KWD_SPHERE, plev * 5);
-        break;
+        return format(" %s%d", KWD_SPHERE, plev * 5);
     case MonsterAbilityType::PSY_SPEAR:
-        set_bluemage_damage(player_ptr, power, plev, KWD_DAM, p);
-        break;
-        break;
+        return set_bluemage_damage(player_ptr, power, plev, KWD_DAM);
     case MonsterAbilityType::RAISE_DEAD:
-        sprintf(p, " %s5", KWD_SPHERE);
-        break;
+        return format(" %s5", KWD_SPHERE);
     default:
-        break;
+        return std::string();
     }
 }

src/blue-magic/learnt-info.h

@@ -5,9 +5,10 @@
  */
 
 #include "system/angband.h"
+#include <string>
 
 enum class MonsterAbilityType;
 
 class PlayerType;
 PLAYER_LEVEL get_pseudo_monstetr_level(PlayerType *player_ptr);
-void learnt_info(PlayerType *player_ptr, char *p, MonsterAbilityType power);
+std::string learnt_info(PlayerType *player_ptr, MonsterAbilityType power);

src/blue-magic/learnt-power-getter.cpp

@@ -329,11 +329,9 @@ static void describe_blue_magic_name(PlayerType *player_ptr, int menu_line, cons
         const auto &mp = monster_powers.at(spell);
         auto need_mana = mod_need_mana(player_ptr, mp.smana, 0, REALM_NONE);
         auto chance = calculate_blue_magic_failure_probability(player_ptr, mp, need_mana);
-        char comment[80];
-        learnt_info(player_ptr, comment, spell);
         char psi_desc[80];
         close_blue_magic_name(psi_desc, sizeof(psi_desc), i, menu_line);
-        angband_strcat(psi_desc, format(" %-26s %3d %3d%%%s", mp.name, need_mana, chance, comment), sizeof(psi_desc));
+        angband_strcat(psi_desc, format(" %-26s %3d %3d%%%s", mp.name, need_mana, chance, learnt_info(player_ptr, spell).data()), sizeof(psi_desc));
         prt(psi_desc, y_base + i + 1, x_base);
     }
 

src/lore/lore-calculator.cpp

@@ -8,6 +8,7 @@
 #include "system/monster-race-info.h"
 #include "system/player-type-definition.h"
 #include "util/string-processor.h"
+#include <sstream>
 
 /*!
  * @brief ダイス目を文字列に変換する
@@ -16,36 +17,34 @@
  * @param dice_side ダイス面
  * @param dice_mult ダイス倍率
  * @param dice_div ダイス除数
- * @param msg 文字列を格納するポインタ
+ * @return std::string サイコロ式の印刷可能なバージョン
  */
-void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char *msg)
+std::string dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div)
 {
-    char base[80] = "", dice[80] = "", mult[80] = "";
-
     if (dice_num == 0) {
-        sprintf(msg, "%d", base_damage);
-        return;
+        return std::to_string(base_damage);
     }
 
+    std::stringstream ss;
     if (base_damage != 0) {
-        strnfmt(base, sizeof(base), "%d+", base_damage);
+        ss << base_damage << '+';
     }
 
-    if (dice_num == 1) {
-        strnfmt(dice, sizeof(dice), "d%d", dice_side);
-    } else {
-        strnfmt(dice, sizeof(dice), "%dd%d", dice_num, dice_side);
+    if (dice_num != 1) {
+        ss << dice_num;
     }
+    ss << 'd' << dice_side;
 
     if (dice_mult != 1 || dice_div != 1) {
+        ss << '*';
         if (dice_div == 1) {
-            strnfmt(mult, sizeof(mult), "*%d", dice_mult);
+            ss << dice_mult;
         } else {
-            strnfmt(mult, sizeof(mult), "*(%d/%d)", dice_mult, dice_div);
+            ss << '(' << dice_mult << '/' << dice_div << ')';
         }
     }
 
-    sprintf(msg, "%s%s%s", base, dice, mult);
+    return ss.str();
 }
 
 /*!
@@ -139,10 +138,7 @@ void set_damage(PlayerType *player_ptr, lore_type *lore_ptr, MonsterAbilityType
     int dice_side = monspell_race_damage(player_ptr, ms_type, r_idx, DICE_SIDE);
     int dice_mult = monspell_race_damage(player_ptr, ms_type, r_idx, DICE_MULT);
     int dice_div = monspell_race_damage(player_ptr, ms_type, r_idx, DICE_DIV);
-    char dmg_str[80] = "(";
-    dice_to_string(base_damage, dice_num, dice_side, dice_mult, dice_div, dmg_str + 1);
-    angband_strcat(dmg_str, ")", sizeof(dmg_str));
-    strnfmt(tmp, tmpsz, msg, dmg_str);
+    strnfmt(tmp, tmpsz, msg, std::string("(").append(dice_to_string(base_damage, dice_num, dice_side, dice_mult, dice_div)).append(")").data());
 }
 
 void set_drop_flags(lore_type *lore_ptr)

src/lore/lore-calculator.h

@@ -1,13 +1,14 @@
 #pragma once
 
 #include "system/angband.h"
+#include <string>
 
 enum class MonsterAbilityType;
 enum class MonsterRaceId : int16_t;
 
 struct lore_type;
 class PlayerType;
-void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char *msg);
+std::string dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div);
 bool know_armour(MonsterRaceId r_idx, const bool know_everything);
 bool know_damage(MonsterRaceId r_idx, int i);
 void set_damage(PlayerType *player_ptr, lore_type *lore_ptr, MonsterAbilityType ms_type, concptr msg);