No one is .neutral() here (except IPv4 addresses)

4 files changed, 21 insertions, 21 deletions

diff --git a/src/char/char.cpp b/src/char/char.cpp
index 7bc17ba..965693b 100644
--- a/src/char/char.cpp
+++ b/src/char/char.cpp
@@ -175,7 +175,7 @@ std::chrono::milliseconds autosave_time = DEFAULT_AUTOSAVE_INTERVAL;
 
 // Initial position (it's possible to set it in conf file)
 static
-struct point start_point = { {"001-1.gat"_s}, 273, 354 };
+Point start_point = { {"001-1.gat"_s}, 273, 354 };
 
 static
 std::vector<GM_Account> gm_accounts;
@@ -402,7 +402,7 @@ AString mmo_char_tostr(struct CharPair *cp)
 }
 
 static
-bool extract(XString str, struct point *p)
+bool extract(XString str, Point *p)
 {
     return extract(str, record<','>(&p->map_, &p->x, &p->y));
 }
@@ -437,10 +437,10 @@ bool extract(XString str, CharPair *cp)
 
     uint32_t unused_guild_id, unused_pet_id;
     XString unused_memos;
-    std::vector<struct item> inventory;
+    std::vector<Item> inventory;
     XString unused_cart;
     std::vector<struct skill_loader> skills;
-    std::vector<struct global_reg> vars;
+    std::vector<GlobalReg> vars;
     if (!extract(str,
                 record<'\t'>(
                     &k->char_id,
@@ -1010,10 +1010,10 @@ int mmo_char_send006b(Session *s, struct char_session_data *sd)
         sel.manner = p->manner;
 
         sel.status_point = p->status_point;
-        sel.hp = std::min(p->hp, 0x7fff);
-        sel.max_hp = std::min(p->max_hp, 0x7fff);
-        sel.sp = std::min(p->sp, 0x7fff);
-        sel.max_sp = std::min(p->max_sp, 0x7fff);
+        sel.hp = std::min(p->hp, 0x7fffu);
+        sel.max_hp = std::min(p->max_hp, 0x7fffu);
+        sel.sp = std::min(p->sp, 0x7fffu);
+        sel.max_sp = std::min(p->max_sp, 0x7fffu);
         sel.speed = static_cast<uint16_t>(DEFAULT_WALK_SPEED.count());   // p->speed;
         sel.species = p->species;
         sel.hair_style = p->hair;
@@ -1047,7 +1047,7 @@ int mmo_char_send006b(Session *s, struct char_session_data *sd)
 }
 
 static
-int set_account_reg2(AccountId acc, Slice<global_reg> reg)
+int set_account_reg2(AccountId acc, Slice<GlobalReg> reg)
 {
     size_t num = reg.size();
     assert (num < ACCOUNT_REG2_NUM);
@@ -1060,7 +1060,7 @@ int set_account_reg2(AccountId acc, Slice<global_reg> reg)
                 cd.data->account_reg2[i] = reg[i];
             cd.data->account_reg2_num = num;
             for (int i = num; i < ACCOUNT_REG2_NUM; ++i)
-                cd.data->account_reg2[i] = global_reg{};
+                cd.data->account_reg2[i] = GlobalReg{};
             c++;
         }
     }
@@ -1426,7 +1426,7 @@ void parse_tologin(Session *ls)
                     break;
 
                 {
-                    Array<struct global_reg, ACCOUNT_REG2_NUM> reg;
+                    Array<GlobalReg, ACCOUNT_REG2_NUM> reg;
                     int j = 0;
                     AccountId acc = head.account_id;
                     for (const auto& info : repeat)
@@ -1437,7 +1437,7 @@ void parse_tologin(Session *ls)
                         if (j == ACCOUNT_REG2_NUM)
                             break;
                     }
-                    set_account_reg2(acc, Slice<struct global_reg>(reg.begin(), j));
+                    set_account_reg2(acc, Slice<GlobalReg>(reg.begin(), j));
 
                     Packet_Head<0x2b11> head_11;
                     head_11.account_id = head.account_id;
@@ -2211,7 +2211,7 @@ void parse_frommap(Session *ms)
                     break;
 
                 {
-                    Array<struct global_reg, ACCOUNT_REG2_NUM> reg;
+                    Array<GlobalReg, ACCOUNT_REG2_NUM> reg;
                     AccountId acc = head.account_id;
                     auto jlim = std::min(repeat.size(), ACCOUNT_REG2_NUM);
                     for (size_t j = 0; j < jlim; ++j)
@@ -2219,7 +2219,7 @@ void parse_frommap(Session *ms)
                         reg[j].str = repeat[j].name;
                         reg[j].value = repeat[j].value;
                     }
-                    set_account_reg2(acc, Slice<struct global_reg>(reg.begin(), jlim));
+                    set_account_reg2(acc, Slice<GlobalReg>(reg.begin(), jlim));
                     // loginサーバーへ送る
                     if (login_session)
                     {
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp
index 64e3158..b86b3a4 100644
--- a/src/char/int_party.cpp
+++ b/src/char/int_party.cpp
@@ -74,7 +74,7 @@ AString inter_party_tostr(PartyPair p)
             p->exp, p->item);
     for (int i = 0; i < MAX_PARTY; i++)
     {
-        struct party_member *m = &p->member[i];
+        PartyMember *m = &p->member[i];
         if (!m->account_id)
             continue;
         str += STRPRINTF(
@@ -111,7 +111,7 @@ bool extract(XString str, PartyPair *pp)
 
     for (int i = 0; begin != end && i < MAX_PARTY; ++i)
     {
-        struct party_member *m = &p->member[i];
+        PartyMember *m = &p->member[i];
 
         if (begin == end || !extract(*begin, record<','>(&m->account_id, &m->leader)))
             return false;
@@ -142,7 +142,7 @@ void party_check_deleted_init(PartyPair p)
             PRINTF("WARNING: deleting obsolete party member %d %s of %d %s\n"_fmt,
                     p->member[i].account_id, p->member[i].name,
                     p.party_id, p->name);
-            p->member[i] = party_member{};
+            p->member[i] = PartyMember{};
         }
     }
 }
@@ -608,7 +608,7 @@ void mapif_parse_PartyLeave(Session *, PartyId party_id, AccountId account_id)
             continue;
         mapif_party_leaved(party_id, account_id, p->member[i].name);
 
-        p->member[i] = party_member{};
+        p->member[i] = PartyMember{};
         if (party_check_empty(p) == 0)
             mapif_party_info(nullptr, p);   // まだ人がいるのでデータ送信
         return;
diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp
index 6ff6e2e..7a41f43 100644
--- a/src/char/int_storage.cpp
+++ b/src/char/int_storage.cpp
@@ -89,7 +89,7 @@ AString storage_tostr(Storage *p)
 static
 bool extract(XString str, Storage *p)
 {
-    std::vector<struct item> storage_items;
+    std::vector<Item> storage_items;
     if (!extract(str,
                 record<'\t'>(
                     record<','>(
diff --git a/src/char/inter.cpp b/src/char/inter.cpp
index 9eb43cf..04c1146 100644
--- a/src/char/inter.cpp
+++ b/src/char/inter.cpp
@@ -58,7 +58,7 @@ struct accreg
 {
     AccountId account_id;
     int reg_num;
-    Array<struct global_reg, ACCOUNT_REG_NUM> reg;
+    Array<GlobalReg, ACCOUNT_REG_NUM> reg;
 };
 static
 Map<AccountId, struct accreg> accreg_db;
@@ -83,7 +83,7 @@ AString inter_accreg_tostr(struct accreg *reg)
 static
 bool extract(XString str, struct accreg *reg)
 {
-    std::vector<struct global_reg> vars;
+    std::vector<GlobalReg> vars;
     if (!extract(str,
                 record<'\t'>(
                     &reg->account_id,