1 files changed, 15 insertions, 50 deletions

diff --git a/include/pso/TProtocol.h b/include/pso/TProtocol.h
index ac2589e..f9d22f9 100644
--- a/include/pso/TProtocol.h
+++ b/include/pso/TProtocol.h
@@ -25,7 +25,7 @@ struct packet {
 	union {
 		struct {
 			packet_header header;
-			TArray<u8, 0x7c00-sizeof(packet_header)> data;
+			u8 data[0x7c00-sizeof(packet_header)];
 		} pkt;
 		u8 bytes[0x7c00];
 	};
@@ -44,7 +44,7 @@ struct packet {
 struct GameListEntry {
 	u8 difficulty_tag;
 	u8 num_players;
-	TArray<char, 16> name;
+	char name[16];
 	u8 episode;
 	u8 flags;
 };
@@ -54,8 +54,8 @@ struct LobbyListEntry {
 };
 
 struct QuestListEntry {
-	TArray<char, 32> name;
-	TArray<char, 112> short_description;
+	char name[32];
+	char short_description[112];
 };
 
 typedef void (*recv_packet_handler)(packet &pkt);
@@ -76,27 +76,27 @@ public:
 	int m_unused2;
 	int m_udp_disabled;
 	int m_language;
-	TArray<u8, 80> m_unused3;
+	u8 m_unused3[80];
 	TPlyCharData m_character_data;
 	u32 m_unused4;
 	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;
-	TArray<char, 48> m_serial_number;
-	TArray<char, 48> m_access_key;
-	TArray<char, 64> m_password;
-	TArray<char, 16> m_player_name;
-	TArray<char, 17> m_serial_number2;
-	TArray<char, 17> m_access_key2;
+	u8 m_unused5[128];
+	char m_serial_number3[17];
+	char m_password2[17];
+	char m_serial_number[48];
+	char m_access_key[48];
+	char m_password[64];
+	char m_player_name[16];
+	char m_serial_number2[17];
+	char m_access_key2[17];
 	TPlyClientConfig m_client_config;
 	int m_packet_offset;
 	int m_packet_size;
 	struct packet m_packet;
-	TArray<recv_packet_handler, 52> m_recv_handlers;
+	recv_packet_handler m_recv_handlers[52];
 public:
 	TProtocol(TObject *parent, u16 sub_version, int language, char *serial_number, char *access_key, char *password);
 	virtual ~TProtocol();
@@ -107,41 +107,6 @@ public:
 	void some_stub() {};
 	int handle_command(struct packet *pkt);
 	void parse_packet();
-
-	PRIVATE_MEMBER_ACCESSORS(TPlySmth, smth);
-	PRIVATE_MEMBER_ACCESSORS(TPlyGuildCardTag, guildcard_tag);
-	PRIVATE_MEMBER_ACCESSORS(u16, sub_version);
-	PRIVATE_MEMBER_ACCESSORS(int, login_response_state);
-	PRIVATE_MEMBER_ACCESSORS(int, connected);
-	PRIVATE_MEMBER_ACCESSORS(int, joined_game);
-	PRIVATE_MEMBER_ACCESSORS(int, has_meet_user_settings);
-	PRIVATE_MEMBER_ACCESSORS(int, handle_pings_only);
-	PRIVATE_MEMBER_ACCESSORS(int, entry_count);
-	PRIVATE_MEMBER_ACCESSORS(int, unused);
-	PRIVATE_MEMBER_ACCESSORS(int, lobby_list_count);
-	PRIVATE_MEMBER_ACCESSORS(int, unused2);
-	PRIVATE_MEMBER_ACCESSORS(int, udp_disabled);
-	PRIVATE_MEMBER_ACCESSORS(int, language);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, unused3, 80);
-	PRIVATE_MEMBER_ACCESSORS(TPlyCharData, character_data);
-	PRIVATE_MEMBER_ACCESSORS(u32, unused4);
-	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);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(char, serial_number, 48);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(char, access_key, 48);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(char, password, 64);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(char, player_name, 16);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(char, serial_number2, 17);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(char, access_key2, 17);
-	PRIVATE_MEMBER_ACCESSORS(int, packet_offset);
-	PRIVATE_MEMBER_ACCESSORS(int, packet_size);
-	PRIVATE_MEMBER_ACCESSORS(struct packet, packet);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(recv_packet_handler, recv_handlers, 52);
 };
 
 #endif