Format project

7 files changed, 48 insertions, 192 deletions

diff --git a/primedev/core/hooks.h b/primedev/core/hooks.h
index facf51bf..2a2180da 100644
--- a/primedev/core/hooks.h
+++ b/primedev/core/hooks.h
@@ -327,10 +327,7 @@ public:
 		pAutohook->vars.push_back(this);
 	}
 
-	void Dispatch()
-	{
-		*m_pTarget = (void*)ParseDLLOffsetString(m_pAddrString);
-	}
+	void Dispatch() { *m_pTarget = (void*)ParseDLLOffsetString(m_pAddrString); }
 };
 
 // VAR_AT(engine.dll+0x404, ConVar*, Cvar_host_timescale)
diff --git a/primedev/core/math/bitbuf.h b/primedev/core/math/bitbuf.h
index a06dab17..33056e63 100644
--- a/primedev/core/math/bitbuf.h
+++ b/primedev/core/math/bitbuf.h
@@ -90,25 +90,13 @@ enum EBitCoordType
 class BitBufferBase
 {
 protected:
-	INLINE void SetName(const char* name)
-	{
-		m_BufferName = name;
-	}
+	INLINE void SetName(const char* name) { m_BufferName = name; }
 
 public:
-	INLINE bool IsOverflowed()
-	{
-		return m_Overflow;
-	}
-	INLINE void SetOverflowed()
-	{
-		m_Overflow = true;
-	}
+	INLINE bool IsOverflowed() { return m_Overflow; }
+	INLINE void SetOverflowed() { m_Overflow = true; }
 
-	INLINE const char* GetName()
-	{
-		return m_BufferName;
-	}
+	INLINE const char* GetName() { return m_BufferName; }
 
 private:
 	const char* m_BufferName = "";
@@ -437,28 +425,13 @@ public:
 		return fReturn;
 	}
 
-	INLINE i32 ReadChar()
-	{
-		return ReadSBitLong(sizeof(char) << 3);
-	}
-	INLINE u32 ReadByte()
-	{
-		return ReadUBitLong(sizeof(unsigned char) << 3);
-	}
+	INLINE i32 ReadChar() { return ReadSBitLong(sizeof(char) << 3); }
+	INLINE u32 ReadByte() { return ReadUBitLong(sizeof(unsigned char) << 3); }
 
-	INLINE i32 ReadShort()
-	{
-		return ReadSBitLong(sizeof(short) << 3);
-	}
-	INLINE u32 ReadWord()
-	{
-		return ReadUBitLong(sizeof(unsigned short) << 3);
-	}
+	INLINE i32 ReadShort() { return ReadSBitLong(sizeof(short) << 3); }
+	INLINE u32 ReadWord() { return ReadUBitLong(sizeof(unsigned short) << 3); }
 
-	INLINE i32 ReadLong()
-	{
-		return (i32)(ReadUBitLong(sizeof(i32) << 3));
-	}
+	INLINE i32 ReadLong() { return (i32)(ReadUBitLong(sizeof(i32) << 3)); }
 	INLINE float ReadFloat()
 	{
 		u32 temp = ReadUBitLong(sizeof(float) << 3);
@@ -687,24 +660,12 @@ public:
 		return std::min(nCurOfs + nAdjust, m_DataBits);
 	}
 
-	INLINE bool SeekRelative(size_t offset)
-	{
-		return Seek(GetNumBitsRead() + offset);
-	}
+	INLINE bool SeekRelative(size_t offset) { return Seek(GetNumBitsRead() + offset); }
 
-	INLINE size_t TotalBytesAvailable()
-	{
-		return m_DataBytes;
-	}
+	INLINE size_t TotalBytesAvailable() { return m_DataBytes; }
 
-	INLINE size_t GetNumBitsLeft()
-	{
-		return m_DataBits - GetNumBitsRead();
-	}
-	INLINE size_t GetNumBytesLeft()
-	{
-		return GetNumBitsLeft() >> 3;
-	}
+	INLINE size_t GetNumBitsLeft() { return m_DataBits - GetNumBitsRead(); }
+	INLINE size_t GetNumBytesLeft() { return GetNumBitsLeft() >> 3; }
 
 private:
 	size_t m_DataBits; // 0x0010
@@ -743,10 +704,7 @@ public:
 		m_DataEnd = reinterpret_cast<u32*>(reinterpret_cast<u8*>(m_Data) + m_DataBytes);
 	}
 
-	INLINE int GetNumBitsLeft()
-	{
-		return m_OutBitsLeft + (32 * (m_DataEnd - m_DataOut - 1));
-	}
+	INLINE int GetNumBitsLeft() { return m_OutBitsLeft + (32 * (m_DataEnd - m_DataOut - 1)); }
 
 	INLINE void Reset()
 	{
@@ -775,10 +733,7 @@ public:
 		return reinterpret_cast<u8*>(m_Data);
 	}
 
-	INLINE u8* GetData()
-	{
-		return GetBasePointer();
-	}
+	INLINE u8* GetData() { return GetBasePointer(); }
 
 	INLINE void Finish()
 	{
@@ -851,10 +806,7 @@ public:
 		}
 	}
 
-	INLINE void WriteSBitLong(i32 data, i32 numBits)
-	{
-		WriteUBitLong((u32)data, numBits, false);
-	}
+	INLINE void WriteSBitLong(i32 data, i32 numBits) { WriteUBitLong((u32)data, numBits, false); }
 
 	INLINE void WriteUBitVar(u32 n)
 	{
@@ -911,40 +863,19 @@ public:
 		return !IsOverflowed();
 	}
 
-	INLINE bool WriteBytes(const uptr data, i32 numBytes)
-	{
-		return WriteBits(data, numBytes << 3);
-	}
+	INLINE bool WriteBytes(const uptr data, i32 numBytes) { return WriteBits(data, numBytes << 3); }
 
-	INLINE i32 GetNumBitsWritten()
-	{
-		return (32 - m_OutBitsLeft) + (32 * (m_DataOut - m_Data));
-	}
+	INLINE i32 GetNumBitsWritten() { return (32 - m_OutBitsLeft) + (32 * (m_DataOut - m_Data)); }
 
-	INLINE i32 GetNumBytesWritten()
-	{
-		return (GetNumBitsWritten() + 7) >> 3;
-	}
+	INLINE i32 GetNumBytesWritten() { return (GetNumBitsWritten() + 7) >> 3; }
 
-	INLINE void WriteChar(i32 val)
-	{
-		WriteSBitLong(val, sizeof(char) << 3);
-	}
+	INLINE void WriteChar(i32 val) { WriteSBitLong(val, sizeof(char) << 3); }
 
-	INLINE void WriteByte(i32 val)
-	{
-		WriteUBitLong(val, sizeof(unsigned char) << 3, false);
-	}
+	INLINE void WriteByte(i32 val) { WriteUBitLong(val, sizeof(unsigned char) << 3, false); }
 
-	INLINE void WriteShort(i32 val)
-	{
-		WriteSBitLong(val, sizeof(short) << 3);
-	}
+	INLINE void WriteShort(i32 val) { WriteSBitLong(val, sizeof(short) << 3); }
 
-	INLINE void WriteWord(i32 val)
-	{
-		WriteUBitLong(val, sizeof(unsigned short) << 3);
-	}
+	INLINE void WriteWord(i32 val) { WriteUBitLong(val, sizeof(unsigned short) << 3); }
 
 	INLINE bool WriteString(const char* str)
 	{
diff --git a/primedev/core/math/color.h b/primedev/core/math/color.h
index 013c4e4c..a46bc089 100644
--- a/primedev/core/math/color.h
+++ b/primedev/core/math/color.h
@@ -7,22 +7,10 @@ struct color24
 
 typedef struct color32_s
 {
-	bool operator!=(const struct color32_s& other) const
-	{
-		return r != other.r || g != other.g || b != other.b || a != other.a;
-	}
-	inline unsigned* asInt(void)
-	{
-		return reinterpret_cast<unsigned*>(this);
-	}
-	inline const unsigned* asInt(void) const
-	{
-		return reinterpret_cast<const unsigned*>(this);
-	}
-	inline void Copy(const color32_s& rhs)
-	{
-		*asInt() = *rhs.asInt();
-	}
+	bool operator!=(const struct color32_s& other) const { return r != other.r || g != other.g || b != other.b || a != other.a; }
+	inline unsigned* asInt(void) { return reinterpret_cast<unsigned*>(this); }
+	inline const unsigned* asInt(void) const { return reinterpret_cast<const unsigned*>(this); }
+	inline void Copy(const color32_s& rhs) { *asInt() = *rhs.asInt(); }
 
 	uint8_t r, g, b, a;
 } color32;
@@ -79,55 +67,22 @@ public:
 		_b = _color[2];
 		_a = _color[3];
 	}
-	int GetValue(int index) const
-	{
-		return _color[index];
-	}
-	void SetRawColor(int color32)
-	{
-		*((int*)this) = color32;
-	}
-	int GetRawColor(void) const
-	{
-		return *((int*)this);
-	}
+	int GetValue(int index) const { return _color[index]; }
+	void SetRawColor(int color32) { *((int*)this) = color32; }
+	int GetRawColor(void) const { return *((int*)this); }
 
-	inline int r() const
-	{
-		return _color[0];
-	}
-	inline int g() const
-	{
-		return _color[1];
-	}
-	inline int b() const
-	{
-		return _color[2];
-	}
-	inline int a() const
-	{
-		return _color[3];
-	}
+	inline int r() const { return _color[0]; }
+	inline int g() const { return _color[1]; }
+	inline int b() const { return _color[2]; }
+	inline int a() const { return _color[3]; }
 
-	unsigned char& operator[](int index)
-	{
-		return _color[index];
-	}
+	unsigned char& operator[](int index) { return _color[index]; }
 
-	const unsigned char& operator[](int index) const
-	{
-		return _color[index];
-	}
+	const unsigned char& operator[](int index) const { return _color[index]; }
 
-	bool operator==(const Color& rhs) const
-	{
-		return (*((int*)this) == *((int*)&rhs));
-	}
+	bool operator==(const Color& rhs) const { return (*((int*)this) == *((int*)&rhs)); }
 
-	bool operator!=(const Color& rhs) const
-	{
-		return !(operator==(rhs));
-	}
+	bool operator!=(const Color& rhs) const { return !(operator==(rhs)); }
 
 	Color& operator=(const Color& rhs)
 	{
@@ -164,10 +119,7 @@ public:
 		return out;
 	}
 
-	SourceColor ToSourceColor()
-	{
-		return SourceColor(_color[0], _color[1], _color[2], _color[3]);
-	}
+	SourceColor ToSourceColor() { return SourceColor(_color[0], _color[1], _color[2], _color[3]); }
 
 private:
 	unsigned char _color[4];
diff --git a/primedev/core/math/vector.h b/primedev/core/math/vector.h
index e62f2c93..0face732 100644
--- a/primedev/core/math/vector.h
+++ b/primedev/core/math/vector.h
@@ -17,10 +17,7 @@ public:
 	Vector3(float _f) : x(_f), y(_f), z(_f) {}
 	Vector3() : x(0.0f), y(0.0f), z(0.0f) {}
 
-	inline bool IsValid()
-	{
-		return IsFinite(x) && IsFinite(y) && IsFinite(z);
-	}
+	inline bool IsValid() { return IsFinite(x) && IsFinite(y) && IsFinite(z); }
 
 	inline void Init(float fX = 0.0f, float fY = 0.0f, float fZ = 0.0f)
 	{
@@ -29,10 +26,7 @@ public:
 		z = fZ;
 	}
 
-	inline float Length()
-	{
-		return FastSqrt(x * x + y * y + z * z);
-	}
+	inline float Length() { return FastSqrt(x * x + y * y + z * z); }
 
 	inline float DistTo(const Vector3& vOther)
 	{
@@ -44,10 +38,7 @@ public:
 		return vDelta.Length();
 	}
 
-	float Dot(const Vector3& vOther) const
-	{
-		return x * vOther.x + y * vOther.y + z * vOther.z;
-	}
+	float Dot(const Vector3& vOther) const { return x * vOther.x + y * vOther.y + z * vOther.z; }
 
 	// Cross product between two vectors.
 	Vector3 Cross(const Vector3& vOther) const;
@@ -318,10 +309,7 @@ public:
 	Vector3 GetNormal() const;
 
 	// todo: more operators maybe
-	bool operator==(const QAngle& other)
-	{
-		return x == other.x && y == other.y && z == other.z;
-	}
+	bool operator==(const QAngle& other) { return x == other.x && y == other.y && z == other.z; }
 };
 
 inline Vector3 QAngle::GetNormal() const
diff --git a/primedev/core/memalloc.h b/primedev/core/memalloc.h
index 73e078f5..a55ce361 100644
--- a/primedev/core/memalloc.h
+++ b/primedev/core/memalloc.h
@@ -40,10 +40,7 @@ public:
 		}
 		return _realloc_base(originalPtr, newSize);
 	}
-	static void Free(void* ptr)
-	{
-		_free_base(ptr);
-	}
+	static void Free(void* ptr) { _free_base(ptr); }
 };
 
 typedef rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::MemoryPoolAllocator<SourceAllocator>, SourceAllocator> rapidjson_document;
diff --git a/primedev/core/sourceinterface.h b/primedev/core/sourceinterface.h
index bbbbd3bc..730339da 100644
--- a/primedev/core/sourceinterface.h
+++ b/primedev/core/sourceinterface.h
@@ -26,13 +26,7 @@ public:
 			spdlog::error("Failed to call CreateInterface for %s in %s", interfaceName, moduleName);
 	}
 
-	T* operator->() const
-	{
-		return m_interface;
-	}
+	T* operator->() const { return m_interface; }
 
-	operator T*() const
-	{
-		return m_interface;
-	}
+	operator T*() const { return m_interface; }
 };
diff --git a/primedev/core/vanilla.h b/primedev/core/vanilla.h
index b0797803..356495c8 100644
--- a/primedev/core/vanilla.h
+++ b/primedev/core/vanilla.h
@@ -17,10 +17,7 @@ public:
 		m_bIsVanillaCompatible = isVanilla;
 	}
 
-	bool GetVanillaCompatibility()
-	{
-		return m_bIsVanillaCompatible;
-	}
+	bool GetVanillaCompatibility() { return m_bIsVanillaCompatible; }
 
 private:
 	bool m_bIsVanillaCompatible = false;