Format project

1 files changed, 44 insertions, 26 deletions

diff --git a/NorthstarDedicatedTest/concommand.h b/NorthstarDedicatedTest/concommand.h
index 8f5d59e0..ea35ec1f 100644
--- a/NorthstarDedicatedTest/concommand.h
+++ b/NorthstarDedicatedTest/concommand.h
@@ -17,10 +17,10 @@ class CCommand
 
 	int64_t ArgC() const;
 	const char** ArgV() const;
-	const char* ArgS() const;				  // All args that occur after the 0th arg, in string form
-	const char* GetCommandString() const;	  // The entire command in string form, including the 0th arg
+	const char* ArgS() const; // All args that occur after the 0th arg, in string form
+	const char* GetCommandString() const; // The entire command in string form, including the 0th arg
 	const char* operator[](int nIndex) const; // Gets at arguments
-	const char* Arg(int nIndex) const;		  // Gets at arguments
+	const char* Arg(int nIndex) const; // Gets at arguments
 
 	static int MaxCommandLength();
 
@@ -38,11 +38,26 @@ class CCommand
 	const char* m_ppArgv[COMMAND_MAX_ARGC];
 };
 
-inline int CCommand::MaxCommandLength() { return COMMAND_MAX_LENGTH - 1; }
-inline int64_t CCommand::ArgC() const { return m_nArgc; }
-inline const char** CCommand::ArgV() const { return m_nArgc ? (const char**)m_ppArgv : NULL; }
-inline const char* CCommand::ArgS() const { return m_nArgv0Size ? &m_pArgSBuffer[m_nArgv0Size] : ""; }
-inline const char* CCommand::GetCommandString() const { return m_nArgc ? m_pArgSBuffer : ""; }
+inline int CCommand::MaxCommandLength()
+{
+	return COMMAND_MAX_LENGTH - 1;
+}
+inline int64_t CCommand::ArgC() const
+{
+	return m_nArgc;
+}
+inline const char** CCommand::ArgV() const
+{
+	return m_nArgc ? (const char**)m_ppArgv : NULL;
+}
+inline const char* CCommand::ArgS() const
+{
+	return m_nArgv0Size ? &m_pArgSBuffer[m_nArgv0Size] : "";
+}
+inline const char* CCommand::GetCommandString() const
+{
+	return m_nArgc ? m_pArgSBuffer : "";
+}
 inline const char* CCommand::Arg(int nIndex) const
 {
 	// FIXME: Many command handlers appear to not be particularly careful
@@ -52,7 +67,10 @@ inline const char* CCommand::Arg(int nIndex) const
 		return "";
 	return m_ppArgv[nIndex];
 }
-inline const char* CCommand::operator[](int nIndex) const { return Arg(nIndex); }
+inline const char* CCommand::operator[](int nIndex) const
+{
+	return Arg(nIndex);
+}
 
 // From r5reloaded
 class ConCommandBase
@@ -73,16 +91,16 @@ class ConCommandBase
 
 	char* CopyString(const char* szFrom) const;
 
-	void* m_pConCommandBaseVTable;		  // 0x0000
-	ConCommandBase* m_pNext;			  // 0x0008
-	bool m_bRegistered;					  // 0x0010
-	char pad_0011[7];					  // 0x0011 <- 3 bytes padding + unk int32.
-	const char* m_pszName;				  // 0x0018
-	const char* m_pszHelpString;		  // 0x0020
-	int m_nFlags;						  // 0x0028
-	ConCommandBase* s_pConCommandBases;	  // 0x002C
+	void* m_pConCommandBaseVTable; // 0x0000
+	ConCommandBase* m_pNext; // 0x0008
+	bool m_bRegistered; // 0x0010
+	char pad_0011[7]; // 0x0011 <- 3 bytes padding + unk int32.
+	const char* m_pszName; // 0x0018
+	const char* m_pszHelpString; // 0x0020
+	int m_nFlags; // 0x0028
+	ConCommandBase* s_pConCommandBases; // 0x002C
 	IConCommandBaseAccessor* s_pAccessor; // 0x0034
-};										  // Size: 0x0040
+}; // Size: 0x0040
 
 // taken from ttf2sdk
 class ConCommand : public ConCommandBase
@@ -90,18 +108,18 @@ class ConCommand : public ConCommandBase
 	friend class CCVar;
 
   public:
-	ConCommand(void){}; // !TODO: Rebuild engine constructor in SDK instead.
+	ConCommand(void) {}; // !TODO: Rebuild engine constructor in SDK instead.
 	ConCommand(const char* szName, const char* szHelpString, int nFlags, void* pCallback, void* pCommandCompletionCallback);
 	void Init(void);
 	bool IsCommand(void) const;
 
-	void* m_pCommandCallback{};	   // 0x0040 <- starts from 0x40 since we inherit ConCommandBase.
-	void* m_pCompletionCallback{}; // 0x0048 <- defaults to sub_180417410 ('xor eax, eax').
-	int m_nCallbackFlags{};		   // 0x0050
-	char pad_0054[4];			   // 0x0054
-	int unk0;					   // 0x0058
-	int unk1;					   // 0x005C
-};								   // Size: 0x0060
+	void* m_pCommandCallback {}; // 0x0040 <- starts from 0x40 since we inherit ConCommandBase.
+	void* m_pCompletionCallback {}; // 0x0048 <- defaults to sub_180417410 ('xor eax, eax').
+	int m_nCallbackFlags {}; // 0x0050
+	char pad_0054[4]; // 0x0054
+	int unk0; // 0x0058
+	int unk1; // 0x005C
+}; // Size: 0x0060
 
 void RegisterConCommand(const char* name, void (*callback)(const CCommand&), const char* helpString, int flags);
 void InitialiseConCommands(HMODULE baseAddress);