From c194e33e98492bbd0384f2a6b9a533bcfb57701d Mon Sep 17 00:00:00 2001
From: mrb0nk500 <b0nk@b0nk.xyz>
Date: Wed, 8 Mar 2023 16:41:27 -0400
Subject: macros: Add `as()`

---
 include/pso/TPlySmth.h | 6 +++---
 include/pso/macros.h   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'include/pso')

diff --git a/include/pso/TPlySmth.h b/include/pso/TPlySmth.h
index 2530c7b..e510047 100644
--- a/include/pso/TPlySmth.h
+++ b/include/pso/TPlySmth.h
@@ -2,8 +2,8 @@
 #define TPLYSMTH_H
 
 #include <global_types.h>
+#include <pso/macros.h>
 #include <pso/protocol.h>
-#include <pso/TArray.h>
 #include <pso/TProtocol.h>
 
 class TPlySmth {
@@ -11,8 +11,8 @@ public:
 	TPlySmth() {};
 
 	void bswap() {
-		bswap_32(reinterpret_cast<u32 *>(&m_smth));
-		bswap_32(reinterpret_cast<u32 *>(&m_smth1));
+		bswap_32(as(u32 *, &m_smth));
+		bswap_32(as(u32 *, &m_smth1));
 	};
 public:
 	u8 m_smth[4];
diff --git a/include/pso/macros.h b/include/pso/macros.h
index 291a550..e182c54 100644
--- a/include/pso/macros.h
+++ b/include/pso/macros.h
@@ -108,4 +108,6 @@
 	PRIVATE_MEMBER_GETTER_FUNC(ret_type, name, __VA_ARGS__);	\
 	PRIVATE_MEMBER_SETTER_FUNC(ret_type, name, __VA_ARGS__)
 
+#define as(type, var) reinterpret_cast<type>(var)
+
 #endif
-- 
cgit v1.2.3-13-gbd6f