Update Dota & CS2 support

common/GameUI/IGameConsole.h

@@ -10,7 +10,7 @@
 #pragma once
 #endif
 
-#include "tier1/interface.h"
+#include "tier0/interface.h"
 
 
 //-----------------------------------------------------------------------------

game/server/recipientfilter.h

@@ -68,9 +68,11 @@ class CRecipientFilter : public IRecipientFilter
 private:
 
 	bool				m_bReliable;
-	bool				m_bInitMessage;
-	CUtlVector< int >	m_Recipients;
+	int					m_Unk001;
+	int					m_nRecipientCount;
+	CUtlVectorFixedGrowable< int, 64 >	m_Recipients;
 
+	bool				m_bInitMessage;
 	// If using prediction rules, the filter itself suppresses local player
 	bool				m_bUsingPredictionRules;
 	// If ignoring prediction cull, then external systems can determine

interfaces/interfaces.cpp

@@ -12,7 +12,7 @@
 ICvar *cvar, *g_pCVar;
 IEventSystem *g_pEventSystem;
 IProcessUtils *g_pProcessUtils;
-IPhysics2 *g_pPhysics2;
+IVPhysics2 *g_pVPhysics2;
 IPhysics2ResourceManager *g_pPhysics2ResourceManager;
 IBaseFileSystem *g_pBaseFileSystem;
 IFileSystem *g_pFullFileSystem;
@@ -155,7 +155,7 @@ static const InterfaceGlobals_t g_pInterfaceGlobals[] =
 	{ CVAR_INTERFACE_VERSION, &g_pCVar },
 	{ EVENTSYSTEM_INTERFACE_VERSION, &g_pEventSystem },
 	{ PROCESS_UTILS_INTERFACE_VERSION, &g_pProcessUtils },
-	{ VPHYSICS2_INTERFACE_VERSION, &g_pPhysics2 },
+	{ VPHYSICS2_INTERFACE_VERSION, &g_pVPhysics2 },
 	{ VPHYSICS2_RESOURCE_MGR_INTERFACE_VERSION, &g_pPhysics2ResourceManager },
 	{ BASEFILESYSTEM_INTERFACE_VERSION, &g_pBaseFileSystem },
 	{ FILESYSTEM_INTERFACE_VERSION, &g_pFullFileSystem },

interfaces/interfaces.vcxproj

@@ -22,23 +22,24 @@
     <ProjectName>interfaces</ProjectName>
     <ProjectGuid>{E1DA8DB8-FB4C-4B14-91A6-98BCED6B9720}</ProjectGuid>
     <RootNamespace>tier1</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -77,7 +78,7 @@
     <OutDir>..\lib\public\win64</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\lib\public\win64</OutDir>
+    <OutDir>..\lib\public\win64\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
@@ -124,7 +125,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\public;..\public\tier0;..\public\tier1;..\public\interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;_ITERATOR_DEBUG_LEVEL=0;WIN32;_WIN32;COMPILER_MSVC;COMPILER_MSVC32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;_ITERATOR_DEBUG_LEVEL=0;WIN32;_WIN32;COMPILER_MSVC;COMPILER_MSVC64;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>

mathlib/mathlib.vcxproj

@@ -22,6 +22,7 @@
     <ProjectName>mathlib</ProjectName>
     <ProjectGuid>{884C66F2-7F84-4570-AE6C-B634C1113D69}</ProjectGuid>
     <RootNamespace>mathlib</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -30,15 +31,15 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

mathlib/mathlib_base.cpp

@@ -3232,6 +3232,9 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright
 		s_bMMXEnabled = false;
 	}
 
+	// GAMMACASE: Since the sse.cpp doesn't have any x64 code rn
+	// we can't use the sse stuff here
+#ifndef COMPILER_MSVC64
 	if ( bAllowSSE && pi.m_bSSE )
 	{
 		s_bSSEEnabled = true;
@@ -3246,12 +3249,17 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright
 		pfFastSinCos = _SSE_SinCos;
 		pfFastCos = _SSE_cos;
 #endif
+
 	}
 	else
 	{
 		s_bSSEEnabled = false;
 	}
+#else
+	s_bSSEEnabled = false;
+#endif
 
+#ifndef COMPILER_MSVC64
 	if ( bAllowSSE2 && pi.m_bSSE2 )
 	{
 		s_bSSE2Enabled = true;
@@ -3264,6 +3272,9 @@ void MathLib_Init( float gamma, float texGamma, float brightness, int overbright
 	{
 		s_bSSE2Enabled = false;
 	}
+#else
+	s_bSSE2Enabled = false;
+#endif
 #endif
 
 	s_bMathlibInitialized = true;

public/appframework/IAppSystem.h

@@ -47,6 +47,7 @@ enum AppSystemTier_t
 	APP_SYSTEM_TIER1,
 	APP_SYSTEM_TIER2,
 	APP_SYSTEM_TIER3,
+	APP_SYSTEM_TIER4,
 
 	APP_SYSTEM_TIER_OTHER,
 };

public/appframework/IAppSystemGroup.h

@@ -20,7 +20,7 @@
 #endif
 
 
-#include "tier1/interface.h"
+#include "tier0/interface.h"
 #include "tier1/utlvector.h"
 #include "tier1/utldict.h"
 #include "tier1/UtlStringMap.h"

public/basehandle.h

@@ -17,6 +17,21 @@
 
 class IHandleEntity;
 
+// Represents EHANDLE2 class
+// TODO: GAMMACASE: Replace old CBaseHandle with this
+class CEntityHandle
+{
+public:
+	union
+	{
+		uint32 m_Index;
+		struct
+		{
+			uint32 m_EntityIndex : 15;
+			uint32 m_Serial : 17;
+		} m_Parts;
+	};
+};
 
 // -------------------------------------------------------------------------------------------------- //
 // CBaseHandle.

public/bitmap/tgawriter.h

@@ -12,7 +12,7 @@
 #pragma once
 #endif
 
-#include "tier1/interface.h"
+#include "tier0/interface.h"
 #include "bitmap/imageformat.h" //ImageFormat enum definition
 
 class CUtlBuffer;

public/const.h

@@ -141,29 +141,29 @@
 #define FL_FREEZING				(1<<31) // We're becoming frozen!
 
 // edict->movetype values
-enum MoveType_t
+enum MoveType_t : unsigned char
 {
 	MOVETYPE_NONE		= 0,	// never moves
-	MOVETYPE_ISOMETRIC,			// For players -- in TF2 commander view, etc.
+	MOVETYPE_OBSOLETE,			// Previously isometric movetype
 	MOVETYPE_WALK,				// Player only - moving on the ground
 	MOVETYPE_STEP,				// gravity, special edge handling -- monsters use this
 	MOVETYPE_FLY,				// No gravity, but still collides with stuff
 	MOVETYPE_FLYGRAVITY,		// flies through the air + is affected by gravity
 	MOVETYPE_VPHYSICS,			// uses VPHYSICS for simulation
 	MOVETYPE_PUSH,				// no clip to world, push and crush
 	MOVETYPE_NOCLIP,			// No gravity, no collisions, still do velocity/avelocity
-	MOVETYPE_LADDER,			// Used by players only when going onto a ladder
 	MOVETYPE_OBSERVER,			// Observer movement, depends on player's observer mode
+	MOVETYPE_LADDER,			// Used by players only when going onto a ladder
 	MOVETYPE_CUSTOM,			// Allows the entity to describe its own physics
 
 	// should always be defined as the last item in the list
 	MOVETYPE_LAST		= MOVETYPE_CUSTOM,
 
-	MOVETYPE_MAX_BITS	= 4
+	MOVETYPE_MAX_BITS	= 5
 };
 
 // edict->movecollide values
-enum MoveCollide_t
+enum MoveCollide_t : unsigned char
 {
 	MOVECOLLIDE_DEFAULT = 0,
 
@@ -185,18 +185,20 @@ enum MoveCollide_t
 // Solid type basically describes how the bounding volume of the object is represented
 // NOTE: SOLID_BBOX MUST BE 2, and SOLID_VPHYSICS MUST BE 6
 // NOTE: These numerical values are used in the FGD by the prop code (see prop_dynamic)
-enum SolidType_t
+enum SolidType_t : unsigned char
 {
 	SOLID_NONE			= 0,	// no solid model
 	SOLID_BSP			= 1,	// a BSP tree
 	SOLID_BBOX			= 2,	// an AABB
 	SOLID_OBB			= 3,	// an OBB (not implemented yet)
-	SOLID_OBB_YAW		= 4,	// an OBB, constrained so that it can only yaw
-	SOLID_CUSTOM		= 5,	// Always call into the entity for tests
+	SOLID_SPHERE		= 4,
+	SOLID_POINT			= 5,
 	SOLID_VPHYSICS		= 6,	// solid vphysics object, get vcollide from the model and collide with that
+	SOLID_CAPSULE		= 7,
 	SOLID_LAST,
 };
 
+// GAMMACASE: Potentially obsolete
 enum SolidFlags_t
 {
 	FSOLID_CUSTOMRAYTEST		= 0x0001,	// Ignore solid type + always call into the entity for ray tests
@@ -224,14 +226,17 @@ inline bool IsSolid( SolidType_t solidType, int nSolidFlags )
 	return (solidType != SOLID_NONE) && ((nSolidFlags & FSOLID_NOT_SOLID) == 0);
 }
 
-
 // m_lifeState values
-#define	LIFE_ALIVE				0 // alive
-#define	LIFE_DYING				1 // playing death animation or still falling off of a ledge waiting to hit ground
-#define	LIFE_DEAD				2 // dead. lying still.
-#define LIFE_RESPAWNABLE		3
-#define LIFE_DISCARDBODY		4
+enum LifeState_t
+{
+	LIFE_ALIVE			= 0x0,	// alive
+	LIFE_DYING			= 0x1,	// playing death animation or still falling off of a ledge waiting to hit ground
+	LIFE_DEAD			= 0x2,	// dead. lying still.
+	LIFE_RESPAWNABLE	= 0x3,
+	LIFE_RESPAWNING		= 0x4
+};
 
+// GAMMACASE: Potentially obsolete
 // entity effects
 enum
 {
@@ -302,7 +307,7 @@ enum
 
 // Rendering constants
 // if this is changed, update common/MaterialSystem/Sprite.cpp
-enum RenderMode_t
+enum RenderMode_t : unsigned char
 {	
 	kRenderNormal = 0,		// src
 	kRenderTransColor,		// c*a+dest*(1-a)
@@ -315,11 +320,12 @@ enum RenderMode_t
 	kRenderTransAlphaAdd,	// src + dest*(1-a)
 	kRenderWorldGlow,		// Same as kRenderGlow but not fixed size in screen space
 	kRenderNone,			// Don't render.
+	kRenderDevVisualizer,
 
 	kRenderModeCount,		// must be last
 };
 
-enum RenderFx_t
+enum RenderFx_t : unsigned char
 {	
 	kRenderFxNone = 0, 
 	kRenderFxPulseSlow, 

public/datamap.h

@@ -93,6 +93,33 @@ typedef enum _fieldtypes
 	FIELD_V8_ARRAY,
 	FIELD_V8_CALLBACK_INFO,
 	FIELD_UTLSTRING,
+
+	FIELD_NETWORK_ORIGIN_CELL_QUANTIZED_POSITION_VECTOR,
+	FIELD_HRENDERTEXTURE,
+
+	FIELD_HPARTICLESYSTEMDEFINITION,
+	FIELD_UINT8,
+	FIELD_UINT16,
+	FIELD_CTRANSFORM,
+	FIELD_CTRANSFORM_WORLDSPACE,
+	FIELD_HPOSTPROCESSING,
+	FIELD_MATRIX3X4,
+	FIELD_SHIM,
+	FIELD_CMOTIONTRANSFORM,
+	FIELD_CMOTIONTRANSFORM_WORLDSPACE,
+	FIELD_ATTACHMENT_HANDLE,
+	FIELD_AMMO_INDEX,
+	FIELD_CONDITION_ID,
+	FIELD_AI_SCHEDULE_BITS,
+	FIELD_MODIFIER_HANDLE,
+	FIELD_ROTATION_VECTOR,
+	FIELD_ROTATION_VECTOR_WORLDSPACE,
+	FIELD_HVDATA,
+	FIELD_SCALE32,
+	FIELD_STRING_AND_TOKEN,
+	FIELD_ENGINE_TIME,
+	FIELD_ENGINE_TICK,
+	FIELD_WORLD_GROUP_ID,
 
 	FIELD_TYPECOUNT
 } fieldtype_t;

public/datamodel/idatamodel.h

@@ -10,7 +10,7 @@
 #pragma once
 #endif
 
-#include "tier1/interface.h"
+#include "tier0/interface.h"
 #include "tier1/utlvector.h"
 #include "tier1/utlsymbollarge.h"
 #include "appframework/IAppSystem.h"

public/edict.h

@@ -43,26 +43,24 @@ class CGlobalVars : public CGlobalVarsBase
 {	
 public:
 
-	CGlobalVars( bool bIsClient );
+	CGlobalVars();
 
 public:
 
 	// Current map
 	string_t		mapname;
-	int				mapversion;
 	string_t		startspot;
 	MapLoadType_t	eLoadType;		// How the current map was loaded
-	bool			bMapLoadFailed;	// Map has failed to load, we need to kick back to the main menu
+	bool mp_teamplay;
 
 	// current maxentities
 	int				maxEntities;
 
 	int				serverCount;
-	edict_t			*pEdicts;
 };
 
-inline CGlobalVars::CGlobalVars( bool bIsClient ) : 
-	CGlobalVarsBase( bIsClient )
+inline CGlobalVars::CGlobalVars() : 
+	CGlobalVarsBase()
 {
 	serverCount = 0;
 }