From 8df67ec7d7cecd31c4f893671d7973268553b0df Mon Sep 17 00:00:00 2001
From: GAMMACASE <darknesss456@mail.ru>
Date: Fri, 7 Apr 2023 16:33:27 +0300
Subject: [PATCH] Update ConVar & ConCommand handle types

---
 public/tier0/basetypes.h |  2 +-
 public/tier1/convar.h    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/tier0/basetypes.h b/public/tier0/basetypes.h
index 57360432..9890125f 100644
--- a/public/tier0/basetypes.h
+++ b/public/tier0/basetypes.h
@@ -471,7 +471,7 @@ struct interval_t
 
 // Typesafe 8-bit and 16-bit handles.
 template< class HandleType >
-class CBaseIntHandle
+class ALIGN8 CBaseIntHandle
 {
 public:
 
diff --git a/public/tier1/convar.h b/public/tier1/convar.h
index 217813a6..5f1be2eb 100644
--- a/public/tier1/convar.h
+++ b/public/tier1/convar.h
@@ -44,7 +44,7 @@ class ConCommandRef;
 class ConCommandBase;
 struct characterset_t;
 class ConVarRefAbstract;
-class CSplitScreenSlot;
+struct CSplitScreenSlot;
 union CVValue_t;
 
 //-----------------------------------------------------------------------------
@@ -54,11 +54,11 @@ union CVValue_t;
 //-----------------------------------------------------------------------------
 //#define CONVAR_TEST_MATERIAL_THREAD_CONVARS 1
 
-DECLARE_HANDLE_64BIT(ConVarHandle);
-#define CONVAR_ID_INVALID ConVarHandle::MakeHandle( 0xFFFFFFFF )
+DECLARE_HANDLE_16BIT(ConVarHandle);
+#define CONVAR_HANDLE_INVALID ConVarHandle::MakeHandle( 0xFFFF )
 
-DECLARE_HANDLE_64BIT(ConCommandHandle);
-#define CONCOMMAND_ID_INVALID ConCommandHandle::MakeHandle( 0xFFFF )
+DECLARE_HANDLE_16BIT(ConCommandHandle);
+#define CONCOMMAND_HANDLE_INVALID ConCommandHandle::MakeHandle( 0xFFFF )
 
 //-----------------------------------------------------------------------------
 // ConVar flags