diff options
| author | mrb0nk500 <b0nk@b0nk.xyz> | 2023-03-04 17:49:03 -0400 |
|---|---|---|
| committer | mrb0nk500 <b0nk@b0nk.xyz> | 2023-03-04 17:49:03 -0400 |
| commit | cb40b0808a639fa0de330cb2b88574a0e8b4d2d5 (patch) | |
| tree | 874b64b99c55f244d97d627f61869c084eea09ed /include/pso/TProtocol.h | |
| parent | 1892a429d2b635b369684676f0528a3320f95cc2 (diff) | |
TProtocol: Match ctor
The reason for the large change is because I was trying to figure out
why `TTcpSocket`'s ctor was so disjointed from the rest of the
functions. Turns out, it's inlined, and inlining was turned off.
Most likely, the whole codebase has inlining turned off.
oof, press f `TArray`.
Diffstat (limited to 'include/pso/TProtocol.h')
| -rw-r--r-- | include/pso/TProtocol.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/pso/TProtocol.h b/include/pso/TProtocol.h index 5be26eb..ed80d04 100644 --- a/include/pso/TProtocol.h +++ b/include/pso/TProtocol.h @@ -19,6 +19,8 @@ #include <pso/TTcpSocket.h> +EXTERN_OBJECT_NAME(TProtocol); + struct packet { packet_header header; TArray<u8, 0x7c00-sizeof(packet_header)> data; @@ -67,10 +69,10 @@ private: TArray<u8, 80> m_unused3; TPlyCharData m_character_data; u32 m_unused4; - TArray<TMenuListEntry<GameListEntry>, 64> m_game_entries; - TArray<TMenuListEntry<GameListEntry>, 64> m_game_entries2; - TArray<TMenuListEntry<LobbyListEntry>, 16> m_lobby_entries; - TArray<TMenuListEntry<QuestListEntry>, 30> m_quest_entries; + TMenuListEntry<GameListEntry> m_game_entries[64]; + TMenuListEntry<GameListEntry> m_game_entries2[64]; + TMenuListEntry<LobbyListEntry> m_lobby_entries[16]; + TMenuListEntry<QuestListEntry> m_quest_entries[30]; TArray<u8, 128> m_unused5; TArray<char, 17> m_serial_number3; TArray<char, 17> m_password2; @@ -111,10 +113,10 @@ public: PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, unused3, 80); PRIVATE_MEMBER_ACCESSORS(TPlyCharData, character_data); PRIVATE_MEMBER_ACCESSORS(u32, unused4); - PRIVATE_MEMBER_ACCESSORS_ARRAY(TMenuListEntry<GameListEntry>, game_entries, 64); - PRIVATE_MEMBER_ACCESSORS_ARRAY(TMenuListEntry<GameListEntry>, game_entries2, 64); - PRIVATE_MEMBER_ACCESSORS_ARRAY(TMenuListEntry<LobbyListEntry>, lobby_entries, 16); - PRIVATE_MEMBER_ACCESSORS_ARRAY(TMenuListEntry<QuestListEntry>, quest_entries, 30); + PRIVATE_MEMBER_ACCESSORS_C_ARRAY(TMenuListEntry<GameListEntry>, game_entries, 64); + PRIVATE_MEMBER_ACCESSORS_C_ARRAY(TMenuListEntry<GameListEntry>, game_entries2, 64); + PRIVATE_MEMBER_ACCESSORS_C_ARRAY(TMenuListEntry<LobbyListEntry>, lobby_entries, 16); + PRIVATE_MEMBER_ACCESSORS_C_ARRAY(TMenuListEntry<QuestListEntry>, quest_entries, 30); PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, unused5, 128); PRIVATE_MEMBER_ACCESSORS_ARRAY(char, serial_number3, 17); PRIVATE_MEMBER_ACCESSORS_ARRAY(char, password2, 17); |