Merge pull request #2579 from Hourier/Make-Deceleration-Class

[hengbandforosx/hengbandosx.git] / src / market / building-initializer.cpp

diff --git a/src/market/building-initializer.cpp b/src/market/building-initializer.cpp
index 839ca83..6207d5d 100644 (file)
--- a/src/market/building-initializer.cpp
+++ b/src/market/building-initializer.cpp
@@ -1,85 +1,83 @@
 #include "market/building-initializer.h"
 #include "floor/floor-town.h"
-#include "object/object-kind.h"
 #include "object/object-kind-hook.h"
+#include "object/object-kind.h"
+#include "player-info/class-types.h"
 #include "store/articles-on-sale.h"
 #include "store/store-owners.h"
 #include "store/store-util.h"
 #include "store/store.h"
+#include "system/angband.h"
 #include "system/building-type-definition.h"
 #include "system/object-type-definition.h"
+#include <vector>
 
 /*!
  * @brief 町情報読み込みのメインルーチン /
  * Initialize town array
- * @return エラーコード
+ * @details 「我が家を拡張する」オプションのON/OFFとは無関係に、ON時の容量を確保しておく.
  */
-errr init_towns(void)
+void init_towns(void)
 {
     town_info = std::vector<town_type>(max_towns);
-    for (int i = 1; i < max_towns; i++) {
+    for (auto i = 1; i < max_towns; i++) {
         town_info[i].store = std::vector<store_type>(MAX_STORES);
         for (auto sst : STORE_SALE_TYPE_LIST) {
-            store_type *store_ptr = &town_info[i].store[enum2i(sst)];
-            if ((i > 1) && (sst == StoreSaleType::MUSEUM || sst == StoreSaleType::HOME))
+            auto *store_ptr = &town_info[i].store[enum2i(sst)];
+            if ((i > 1) && (sst == StoreSaleType::MUSEUM || sst == StoreSaleType::HOME)) {
                 continue;
+            }
 
-            /*
-             * 我が家が 20 ページまで使える隠し機能のための準備。
-             * オプションが有効でもそうでなくても一応スペースを作っておく。
-             */
             store_ptr->stock_size = store_get_stock_max(sst);
-
-            store_ptr->stock = std::make_unique<object_type[]>(store_ptr->stock_size);
-            if ((sst == StoreSaleType::BLACK) || (sst == StoreSaleType::HOME) || (sst == StoreSaleType::MUSEUM))
+            store_ptr->stock = std::make_unique<ObjectType[]>(store_ptr->stock_size);
+            if ((sst == StoreSaleType::BLACK) || (sst == StoreSaleType::HOME) || (sst == StoreSaleType::MUSEUM)) {
                 continue;
+            }
 
-            for (int k = 0; k < STORE_INVEN_MAX; k++) {
+            for (auto k = 0; k < STORE_INVEN_MAX; k++) {
                 auto tv = store_regular_table[enum2i(sst)][k].tval;
                 auto sv = store_regular_table[enum2i(sst)][k].sval;
-                if (tv == ItemKindType::NONE)
+                if (tv == ItemKindType::NONE) {
                     break;
+                }
 
-                KIND_OBJECT_IDX k_idx = lookup_kind(tv, sv);
-
-                if (k_idx == 0)
+                auto k_idx = lookup_kind(tv, sv);
+                if (k_idx == 0) {
                     continue;
+                }
 
                 store_ptr->regular.push_back(k_idx);
             }
 
-            for (int k = 0; k < STORE_CHOICES; k++) {
+            for (auto k = 0; k < STORE_CHOICES; k++) {
                 auto tv = store_table[enum2i(sst)][k].tval;
                 auto sv = store_table[enum2i(sst)][k].sval;
-                if (tv == ItemKindType::NONE)
+                if (tv == ItemKindType::NONE) {
                     break;
+                }
 
-                KIND_OBJECT_IDX k_idx = lookup_kind(tv, sv);
-
-                if (k_idx == 0)
+                auto k_idx = lookup_kind(tv, sv);
+                if (k_idx == 0) {
                     continue;
+                }
 
                 store_ptr->table.push_back(k_idx);
             }
         }
     }
-
-    return 0;
 }
 
 /*!
  * @brief 店情報初期化のメインルーチン /
  * Initialize buildings
- * @return エラーコード
  */
-errr init_buildings(void)
+void init_buildings(void)
 {
-    for (int i = 0; i < MAX_BLDG; i++) {
+    for (auto i = 0; i < MAX_BLDG; i++) {
         building[i].name[0] = '\0';
         building[i].owner_name[0] = '\0';
         building[i].owner_race[0] = '\0';
-
-        for (int j = 0; j < 8; j++) {
+        for (auto j = 0; j < 8; j++) {
             building[i].act_names[j][0] = '\0';
             building[i].member_costs[j] = 0;
             building[i].other_costs[j] = 0;
@@ -88,15 +86,8 @@ errr init_buildings(void)
             building[i].action_restr[j] = 0;
         }
 
-        for (int j = 0; j < MAX_CLASS; j++)
-            building[i].member_class[j] = CLASS_WARRIOR;
-
-        for (int j = 0; j < MAX_RACES; j++)
-            building[i].member_race[j] = PlayerRaceType::HUMAN;
-
-        for (int j = 0; j < MAX_MAGIC + 1; j++)
-            building[i].member_realm[j] = 0;
+        building[i].member_class.assign(PLAYER_CLASS_TYPE_MAX, static_cast<short>(PlayerClassType::WARRIOR));
+        building[i].member_race.assign(MAX_RACES, static_cast<short>(PlayerRaceType::HUMAN));
+        building[i].member_realm.assign(MAX_MAGIC + 1, 0);
     }
-
-    return 0;
 }