diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/admin/ladmin.cpp | 8 | ||||
| -rw-r--r-- | src/char/inter.cpp | 2 | ||||
| -rw-r--r-- | src/map/atcommand.cpp | 2 | ||||
| -rw-r--r-- | src/map/intif.cpp | 2 | ||||
| -rw-r--r-- | src/map/map.hpp | 2 | ||||
| -rw-r--r-- | src/map/party.cpp | 14 | ||||
| -rw-r--r-- | src/map/pc.cpp | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/admin/ladmin.cpp b/src/admin/ladmin.cpp index 240582b..872d300 100644 --- a/src/admin/ladmin.cpp +++ b/src/admin/ladmin.cpp @@ -1304,8 +1304,8 @@ void reloadGM(ZString params) send_fpacket<0x7955, 2>(login_session, fixed_55); bytes_to_read = 0; - LADMIN_LOG("Request to reload the GM configuration file sended.\n"_fmt); - PRINTF("Request to reload the GM configuration file sended.\n"_fmt); + LADMIN_LOG("Request to reload the GM configuration file sent.\n"_fmt); + PRINTF("Request to reload the GM configuration file sent.\n"_fmt); PRINTF("Check the actual GM accounts (after reloading):\n"_fmt); listaccount(params, 1); // 1: to list only GM } @@ -2422,8 +2422,8 @@ void parse_fromlogin(Session *s) } else { - PRINTF("Message successfully sended to login-server.\n"_fmt); - LADMIN_LOG("Message successfully sended to login-server.\n"_fmt); + PRINTF("Message successfully sent to login-server.\n"_fmt); + LADMIN_LOG("Message successfully sent to login-server.\n"_fmt); } bytes_to_read = 0; break; diff --git a/src/char/inter.cpp b/src/char/inter.cpp index 3f2d1aa..90c3e7c 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -167,7 +167,7 @@ void inter_init2() } //-------------------------------------------------------- -// sended packets to map-server +// sent packets to map-server // GMメッセージ送信 static diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 346b0ac..feacd52 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -4415,7 +4415,7 @@ ATCE atcommand_email(Session *s, dumb_ptr<map_session_data> sd, else { chrif_changeemail(sd->status_key.account_id, actual_email, new_email); - clif_displaymessage(s, "Information sended to login-server via char-server."_s); + clif_displaymessage(s, "Information sent to login-server via char-server."_s); } return ATCE::OKAY; diff --git a/src/map/intif.cpp b/src/map/intif.cpp index f64f797..bdb73b6 100644 --- a/src/map/intif.cpp +++ b/src/map/intif.cpp @@ -364,7 +364,7 @@ void mapif_parse_WisToGM(Session *, const Packet_Head<0x3803>& head, AString& me // 0x3003/0x3803 <packet_len>.w <wispname>.24B <min_gm_level>.w <message>.?B GmLevel min_gm_level = head.min_gm_level; CharName Wisp_name = head.char_name; - // information is sended to all online GM + // information is sent to all online GM for (io::FD i : iter_fds()) { Session *s2 = get_session(i); diff --git a/src/map/map.hpp b/src/map/map.hpp index 8bb5aa7..0a1bd06 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -275,7 +275,7 @@ struct map_session_data : block_list, SessionData int deal_zeny; short deal_locked; - int party_sended; + int party_sent; PartyId party_invite; AccountId party_invite_account; int party_hp, party_x, party_y; diff --git a/src/map/party.cpp b/src/map/party.cpp index ccbfd75..2210064 100644 --- a/src/map/party.cpp +++ b/src/map/party.cpp @@ -250,10 +250,10 @@ int party_recv_info(const PartyPair sp) { // 設定情報の送信 // dumb_ptr<map_session_data> sd = map_id2sd(p->member[i].account_id); dumb_ptr<map_session_data> sd = dumb_ptr<map_session_data>(p->member[i].sd); - if (sd != nullptr && sd->party_sended == 0) + if (sd != nullptr && sd->party_sent == 0) { clif_party_option(p, sd, 0x100); - sd->party_sended = 1; + sd->party_sent = 1; } } @@ -393,7 +393,7 @@ int party_member_added(PartyId party_id, AccountId account_id, int flag) } // 成功 - sd->party_sended = 0; + sd->party_sent = 0; sd->status.party_id = party_id; if (sd2 != nullptr) @@ -476,7 +476,7 @@ int party_member_leaved(PartyId party_id, AccountId account_id, CharName name) if (sd != nullptr && sd->status.party_id == party_id) { sd->status.party_id = PartyId(); - sd->party_sended = 0; + sd->party_sent = 0; } return 0; } @@ -495,7 +495,7 @@ int party_broken(PartyId party_id) p->member[i].account_id, p->member[i].name, 0x10); p->member[i].sd->status.party_id = PartyId(); - p->member[i].sd->party_sended = 0; + p->member[i].sd->party_sent = 0; } } party_db.erase(party_id); @@ -582,7 +582,7 @@ int party_send_movemap(dumb_ptr<map_session_data> sd) return 0; intif_party_changemap(sd, 1); - if (sd->party_sended != 0) // もうパーティデータは送信済み + if (sd->party_sent != 0) // もうパーティデータは送信済み return 0; // 競合確認 @@ -596,7 +596,7 @@ int party_send_movemap(dumb_ptr<map_session_data> sd) { clif_party_info(p, sd->sess); clif_party_option(p, sd, 0x100); - sd->party_sended = 1; + sd->party_sent = 1; } } diff --git a/src/map/pc.cpp b/src/map/pc.cpp index ecfd50e..54ea13d 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -904,7 +904,7 @@ int pc_authok(AccountId id, int login_id2, ClientVersion client_version, } // パーティー関係の初期化 | Initializing Party Relationships - sd->party_sended = 0; + sd->party_sent = 0; sd->party_invite = PartyId(); sd->party_x = -1; sd->party_y = -1; |