From 0c069db90c671cfdc6158df8791809453853f846 Mon Sep 17 00:00:00 2001
From: Amos <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 23 Feb 2022 03:41:10 +0100
Subject: [PATCH] Fix ConCommand size
---
r5dev/tier0/cmd.cpp | 14 +++++++-------
r5dev/tier0/cmd.h | 1 -
2 files changed, 7 insertions(+), 8 deletions(-)
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<ConCommand*>(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<void*>();
- 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<void*>();
+ 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