From 09c901655db3bb42d2aac4b506846b18833d777c Mon Sep 17 00:00:00 2001
From: mrb0nk500 <b0nk@b0nk.xyz>
Date: Tue, 7 Mar 2023 15:23:51 -0400
Subject: global: Completly disable inlining

This is because it looks more, and more clear that the entire codebase
was compiled without inlining. Likely to reduce code size from all the
byteswap functions, only present on the GameCube version.
---
 include/pso/TPlyInventory.h | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'include/pso/TPlyInventory.h')

diff --git a/include/pso/TPlyInventory.h b/include/pso/TPlyInventory.h
index 6cfb7ec..397b4cc 100644
--- a/include/pso/TPlyInventory.h
+++ b/include/pso/TPlyInventory.h
@@ -12,14 +12,14 @@ struct TItemData {
 	TItemData &assign(const TItemData &src);
 
 	union {
-		TArray<u8, 12> data_u8;
-		TArray<u16, 6> data_u16;
-		TArray<u32, 3> data_u32;
+		u8 data_u8[12];
+		u16 data_u16[6];
+		u32 data_u32[3];
 	} data1;
 	u32 id;
 	union {
-		TArray<u8, 4> data_u8;
-		TArray<u8, 2> data_u16;
+		u8 data_u8[4];
+		u8 data_u16[2];
 		u32 data_u32;
 	} data2;
 };
@@ -29,12 +29,8 @@ public:
 	void init();
 	void bswap();
 	TPlyInventoryItem &assign(const TPlyInventoryItem &src);
-
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, present, 4);
-	PRIVATE_MEMBER_ACCESSORS(u32, flags);
-	PRIVATE_MEMBER_ACCESSORS(TItemData, data);
-private:
-	TArray<u8, 4> m_present;
+public:
+	u8 m_present[4];
 	u32 m_flags;
 	TItemData m_data;
 };
@@ -43,18 +39,12 @@ class TPlyInventory {
 public:
 	void bswap();
 	TPlyInventory &assign(const TPlyInventory &src);
-
-	PRIVATE_MEMBER_ACCESSORS(u8, num_items);
-	PRIVATE_MEMBER_ACCESSORS(u8, hp_materials_used);
-	PRIVATE_MEMBER_ACCESSORS(u8, tp_materials_used);
-	PRIVATE_MEMBER_ACCESSORS(u8, language);
-	PRIVATE_MEMBER_ACCESSORS_ARRAY(TPlyInventoryItem, items, 30);
-private:
+public:
 	u8 m_num_items;
 	u8 m_hp_materials_used;
 	u8 m_tp_materials_used;
 	u8 m_language;
-	TArray<TPlyInventoryItem, 30> m_items;
+	TPlyInventoryItem m_items[30];
 };
 
 #endif
-- 
cgit v1.2.3-13-gbd6f