diff --git a/r5dev/tier0/cmd.cpp b/r5dev/tier0/cmd.cpp index a36dfb47..f9d008e8 100644 --- a/r5dev/tier0/cmd.cpp +++ b/r5dev/tier0/cmd.cpp @@ -78,13 +78,13 @@ ConCommand::ConCommand(const char* pszName, const char* pszHelpString, int nFlag ConCommand* pCommand = reinterpret_cast(MemAlloc_Wrapper(sizeof(ConCommand))); // Allocate new memory with StdMemAlloc else we crash. memset(pCommand, '\0', sizeof(ConCommand)); // Set all to null. - pCommand->m_ConCommandBase.m_pConCommandBaseVTable = g_pConCommandVtable.RCast(); - pCommand->m_ConCommandBase.m_pszName = pszName; - pCommand->m_ConCommandBase.m_pszHelpString = pszHelpString; - pCommand->m_ConCommandBase.m_nFlags = nFlags; - pCommand->m_nNullCallBack = NullSub; - pCommand->m_pCommandCallback = pCallback; - pCommand->m_nCallbackFlags = 2; + pCommand->m_pConCommandBaseVTable = g_pConCommandVtable.RCast(); + pCommand->m_pszName = pszName; + pCommand->m_pszHelpString = pszHelpString; + pCommand->m_nFlags = nFlags; + pCommand->m_nNullCallBack = NullSub; + pCommand->m_pCommandCallback = pCallback; + pCommand->m_nCallbackFlags = 2; if (pCommandCompletionCallback) { pCommand->m_pCompletionCallback = pCommandCompletionCallback; diff --git a/r5dev/tier0/cmd.h b/r5dev/tier0/cmd.h index b7ca42a6..421d89dc 100644 --- a/r5dev/tier0/cmd.h +++ b/r5dev/tier0/cmd.h @@ -118,7 +118,6 @@ public: void Init(void); bool IsCommand(void) const; - ConCommandBase m_ConCommandBase {}; //0x0000 void* m_nNullCallBack {}; //0x0040 char m_nPad48[8] {}; //0x0048 void* m_pCommandCallback {}; //0x0050