Mapbase v4.0

- Fixed SDK_Refract and SDK_Water not using new cubemap method
- Added missing .inc files for SDK_ShatteredGlass
- Updated gitignore
- Fixed parallax corrected cubemaps sometimes causing VBSP to crash
- Added spawnflag to npc_headcrab which can prevent a headcrab from drowning
- Added spawnflag to npc_headcrab which can prevent a headcrab from instantly dying to a melee weapon

sp/src/game/server/hl2/npc_headcrab.cpp

@@ -72,6 +72,10 @@ ConVar g_debug_headcrab( "g_debug_headcrab", "0", FCVAR_CHEAT );
 //------------------------------------
 #define SF_HEADCRAB_START_HIDDEN		(1 << 16)
 #define SF_HEADCRAB_START_HANGING		(1 << 17)
+#ifdef MAPBASE
+#define SF_HEADCRAB_DONT_DROWN			(1 << 18)
+#define SF_HEADCRAB_NO_MELEE_INSTAKILL	(1 << 19)
+#endif
 
 
 //-----------------------------------------------------------------------------
@@ -1045,7 +1049,11 @@ void CBaseHeadcrab::GatherConditions( void )
 
 	BaseClass::GatherConditions();
 
+#ifdef MAPBASE
+	if (GetWaterLevel() > 1 && m_lifeState == LIFE_ALIVE && !HasSpawnFlags( SF_HEADCRAB_DONT_DROWN ))
+#else
 	if( m_lifeState == LIFE_ALIVE && GetWaterLevel() > 1 )
+#endif
 	{
 		// Start Drowning!
 		SetCondition( COND_HEADCRAB_IN_WATER );
@@ -1725,7 +1733,12 @@ int CBaseHeadcrab::OnTakeDamage_Alive( const CTakeDamageInfo &inputInfo )
 	//
 	// Certain death from melee bludgeon weapons!
 	//
+#ifdef MAPBASE
+	// (unless the mapper said no)
+	if ( info.GetDamageType() & DMG_CLUB && !HasSpawnFlags( SF_HEADCRAB_NO_MELEE_INSTAKILL ) )
+#else
 	if ( info.GetDamageType() & DMG_CLUB )
+#endif
 	{
 		info.SetDamage( m_iHealth );
 	}

sp/src/materialsystem/stdshaders/fxctmp9/SDK_ShatteredGlass_ps20.inc

@@ -0,0 +1,212 @@
+#include "shaderlib/cshader.h"
+class sdk_shatteredglass_ps20_Static_Index
+{
+private:
+	int m_nCUBEMAP;
+#ifdef _DEBUG
+	bool m_bCUBEMAP;
+#endif
+public:
+	void SetCUBEMAP( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nCUBEMAP = i;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+	void SetCUBEMAP( bool i )
+	{
+		m_nCUBEMAP = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+private:
+	int m_nVERTEXCOLOR;
+#ifdef _DEBUG
+	bool m_bVERTEXCOLOR;
+#endif
+public:
+	void SetVERTEXCOLOR( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nVERTEXCOLOR = i;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+	void SetVERTEXCOLOR( bool i )
+	{
+		m_nVERTEXCOLOR = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+private:
+	int m_nENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bENVMAPMASK;
+#endif
+public:
+	void SetENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+	void SetENVMAPMASK( bool i )
+	{
+		m_nENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nBASEALPHAENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bBASEALPHAENVMAPMASK;
+#endif
+public:
+	void SetBASEALPHAENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nBASEALPHAENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+	void SetBASEALPHAENVMAPMASK( bool i )
+	{
+		m_nBASEALPHAENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nHDRTYPE;
+#ifdef _DEBUG
+	bool m_bHDRTYPE;
+#endif
+public:
+	void SetHDRTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 2 );
+		m_nHDRTYPE = i;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+	void SetHDRTYPE( bool i )
+	{
+		m_nHDRTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+private:
+	int m_nPARALLAXCORRECT;
+#ifdef _DEBUG
+	bool m_bPARALLAXCORRECT;
+#endif
+public:
+	void SetPARALLAXCORRECT( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPARALLAXCORRECT = i;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+	void SetPARALLAXCORRECT( bool i )
+	{
+		m_nPARALLAXCORRECT = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20_Static_Index( )
+	{
+#ifdef _DEBUG
+		m_bCUBEMAP = false;
+#endif // _DEBUG
+		m_nCUBEMAP = 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = false;
+#endif // _DEBUG
+		m_nVERTEXCOLOR = 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = false;
+#endif // _DEBUG
+		m_nENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = false;
+#endif // _DEBUG
+		m_nBASEALPHAENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = false;
+#endif // _DEBUG
+		m_nHDRTYPE = 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = false;
+#endif // _DEBUG
+		m_nPARALLAXCORRECT = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllStaticVarsDefined = m_bCUBEMAP && m_bVERTEXCOLOR && m_bENVMAPMASK && m_bBASEALPHAENVMAPMASK && m_bHDRTYPE && m_bPARALLAXCORRECT;
+		Assert( bAllStaticVarsDefined );
+#endif // _DEBUG
+		return ( 2 * m_nCUBEMAP ) + ( 4 * m_nVERTEXCOLOR ) + ( 8 * m_nENVMAPMASK ) + ( 16 * m_nBASEALPHAENVMAPMASK ) + ( 32 * m_nHDRTYPE ) + ( 96 * m_nPARALLAXCORRECT ) + 0;
+	}
+};
+#define shaderStaticTest_sdk_shatteredglass_ps20 psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_VERTEXCOLOR + psh_forgot_to_set_static_ENVMAPMASK + psh_forgot_to_set_static_BASEALPHAENVMAPMASK + psh_forgot_to_set_static_HDRTYPE + psh_forgot_to_set_static_PARALLAXCORRECT + 0
+class sdk_shatteredglass_ps20_Dynamic_Index
+{
+private:
+	int m_nPIXELFOGTYPE;
+#ifdef _DEBUG
+	bool m_bPIXELFOGTYPE;
+#endif
+public:
+	void SetPIXELFOGTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPIXELFOGTYPE = i;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+	void SetPIXELFOGTYPE( bool i )
+	{
+		m_nPIXELFOGTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20_Dynamic_Index()
+	{
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = false;
+#endif // _DEBUG
+		m_nPIXELFOGTYPE = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllDynamicVarsDefined = m_bPIXELFOGTYPE;
+		Assert( bAllDynamicVarsDefined );
+#endif // _DEBUG
+		return ( 1 * m_nPIXELFOGTYPE ) + 0;
+	}
+};
+#define shaderDynamicTest_sdk_shatteredglass_ps20 psh_forgot_to_set_dynamic_PIXELFOGTYPE + 0

sp/src/materialsystem/stdshaders/fxctmp9/SDK_ShatteredGlass_ps20b.inc

@@ -0,0 +1,212 @@
+#include "shaderlib/cshader.h"
+class sdk_shatteredglass_ps20b_Static_Index
+{
+private:
+	int m_nCUBEMAP;
+#ifdef _DEBUG
+	bool m_bCUBEMAP;
+#endif
+public:
+	void SetCUBEMAP( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nCUBEMAP = i;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+	void SetCUBEMAP( bool i )
+	{
+		m_nCUBEMAP = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+private:
+	int m_nVERTEXCOLOR;
+#ifdef _DEBUG
+	bool m_bVERTEXCOLOR;
+#endif
+public:
+	void SetVERTEXCOLOR( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nVERTEXCOLOR = i;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+	void SetVERTEXCOLOR( bool i )
+	{
+		m_nVERTEXCOLOR = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+private:
+	int m_nENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bENVMAPMASK;
+#endif
+public:
+	void SetENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+	void SetENVMAPMASK( bool i )
+	{
+		m_nENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nBASEALPHAENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bBASEALPHAENVMAPMASK;
+#endif
+public:
+	void SetBASEALPHAENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nBASEALPHAENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+	void SetBASEALPHAENVMAPMASK( bool i )
+	{
+		m_nBASEALPHAENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nHDRTYPE;
+#ifdef _DEBUG
+	bool m_bHDRTYPE;
+#endif
+public:
+	void SetHDRTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 2 );
+		m_nHDRTYPE = i;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+	void SetHDRTYPE( bool i )
+	{
+		m_nHDRTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+private:
+	int m_nPARALLAXCORRECT;
+#ifdef _DEBUG
+	bool m_bPARALLAXCORRECT;
+#endif
+public:
+	void SetPARALLAXCORRECT( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPARALLAXCORRECT = i;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+	void SetPARALLAXCORRECT( bool i )
+	{
+		m_nPARALLAXCORRECT = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20b_Static_Index( )
+	{
+#ifdef _DEBUG
+		m_bCUBEMAP = false;
+#endif // _DEBUG
+		m_nCUBEMAP = 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = false;
+#endif // _DEBUG
+		m_nVERTEXCOLOR = 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = false;
+#endif // _DEBUG
+		m_nENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = false;
+#endif // _DEBUG
+		m_nBASEALPHAENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = false;
+#endif // _DEBUG
+		m_nHDRTYPE = 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = false;
+#endif // _DEBUG
+		m_nPARALLAXCORRECT = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllStaticVarsDefined = m_bCUBEMAP && m_bVERTEXCOLOR && m_bENVMAPMASK && m_bBASEALPHAENVMAPMASK && m_bHDRTYPE && m_bPARALLAXCORRECT;
+		Assert( bAllStaticVarsDefined );
+#endif // _DEBUG
+		return ( 2 * m_nCUBEMAP ) + ( 4 * m_nVERTEXCOLOR ) + ( 8 * m_nENVMAPMASK ) + ( 16 * m_nBASEALPHAENVMAPMASK ) + ( 32 * m_nHDRTYPE ) + ( 96 * m_nPARALLAXCORRECT ) + 0;
+	}
+};
+#define shaderStaticTest_sdk_shatteredglass_ps20b psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_VERTEXCOLOR + psh_forgot_to_set_static_ENVMAPMASK + psh_forgot_to_set_static_BASEALPHAENVMAPMASK + psh_forgot_to_set_static_HDRTYPE + psh_forgot_to_set_static_PARALLAXCORRECT + 0
+class sdk_shatteredglass_ps20b_Dynamic_Index
+{
+private:
+	int m_nPIXELFOGTYPE;
+#ifdef _DEBUG
+	bool m_bPIXELFOGTYPE;
+#endif
+public:
+	void SetPIXELFOGTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPIXELFOGTYPE = i;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+	void SetPIXELFOGTYPE( bool i )
+	{
+		m_nPIXELFOGTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20b_Dynamic_Index()
+	{
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = false;
+#endif // _DEBUG
+		m_nPIXELFOGTYPE = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllDynamicVarsDefined = m_bPIXELFOGTYPE;
+		Assert( bAllDynamicVarsDefined );
+#endif // _DEBUG
+		return ( 1 * m_nPIXELFOGTYPE ) + 0;
+	}
+};
+#define shaderDynamicTest_sdk_shatteredglass_ps20b psh_forgot_to_set_dynamic_PIXELFOGTYPE + 0

sp/src/materialsystem/stdshaders/fxctmp9/SDK_ShatteredGlass_vs20.inc

@@ -0,0 +1,87 @@
+#include "shaderlib/cshader.h"
+class sdk_shatteredglass_vs20_Static_Index
+{
+private:
+	int m_nENVMAP_MASK;
+#ifdef _DEBUG
+	bool m_bENVMAP_MASK;
+#endif
+public:
+	void SetENVMAP_MASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nENVMAP_MASK = i;
+#ifdef _DEBUG
+		m_bENVMAP_MASK = true;
+#endif
+	}
+	void SetENVMAP_MASK( bool i )
+	{
+		m_nENVMAP_MASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bENVMAP_MASK = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_vs20_Static_Index( )
+	{
+#ifdef _DEBUG
+		m_bENVMAP_MASK = false;
+#endif // _DEBUG
+		m_nENVMAP_MASK = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllStaticVarsDefined = m_bENVMAP_MASK;
+		Assert( bAllStaticVarsDefined );
+#endif // _DEBUG
+		return ( 2 * m_nENVMAP_MASK ) + 0;
+	}
+};
+#define shaderStaticTest_sdk_shatteredglass_vs20 vsh_forgot_to_set_static_ENVMAP_MASK + 0
+class sdk_shatteredglass_vs20_Dynamic_Index
+{
+private:
+	int m_nDOWATERFOG;
+#ifdef _DEBUG
+	bool m_bDOWATERFOG;
+#endif
+public:
+	void SetDOWATERFOG( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nDOWATERFOG = i;
+#ifdef _DEBUG
+		m_bDOWATERFOG = true;
+#endif
+	}
+	void SetDOWATERFOG( bool i )
+	{
+		m_nDOWATERFOG = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bDOWATERFOG = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_vs20_Dynamic_Index()
+	{
+#ifdef _DEBUG
+		m_bDOWATERFOG = false;
+#endif // _DEBUG
+		m_nDOWATERFOG = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllDynamicVarsDefined = m_bDOWATERFOG;
+		Assert( bAllDynamicVarsDefined );
+#endif // _DEBUG
+		return ( 1 * m_nDOWATERFOG ) + 0;
+	}
+};
+#define shaderDynamicTest_sdk_shatteredglass_vs20 vsh_forgot_to_set_dynamic_DOWATERFOG + 0

sp/src/materialsystem/stdshaders/fxctmp9_tmp/SDK_ShatteredGlass_ps20.inc

@@ -0,0 +1,212 @@
+#include "shaderlib/cshader.h"
+class sdk_shatteredglass_ps20_Static_Index
+{
+private:
+	int m_nCUBEMAP;
+#ifdef _DEBUG
+	bool m_bCUBEMAP;
+#endif
+public:
+	void SetCUBEMAP( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nCUBEMAP = i;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+	void SetCUBEMAP( bool i )
+	{
+		m_nCUBEMAP = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+private:
+	int m_nVERTEXCOLOR;
+#ifdef _DEBUG
+	bool m_bVERTEXCOLOR;
+#endif
+public:
+	void SetVERTEXCOLOR( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nVERTEXCOLOR = i;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+	void SetVERTEXCOLOR( bool i )
+	{
+		m_nVERTEXCOLOR = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+private:
+	int m_nENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bENVMAPMASK;
+#endif
+public:
+	void SetENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+	void SetENVMAPMASK( bool i )
+	{
+		m_nENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nBASEALPHAENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bBASEALPHAENVMAPMASK;
+#endif
+public:
+	void SetBASEALPHAENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nBASEALPHAENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+	void SetBASEALPHAENVMAPMASK( bool i )
+	{
+		m_nBASEALPHAENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nHDRTYPE;
+#ifdef _DEBUG
+	bool m_bHDRTYPE;
+#endif
+public:
+	void SetHDRTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 2 );
+		m_nHDRTYPE = i;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+	void SetHDRTYPE( bool i )
+	{
+		m_nHDRTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+private:
+	int m_nPARALLAXCORRECT;
+#ifdef _DEBUG
+	bool m_bPARALLAXCORRECT;
+#endif
+public:
+	void SetPARALLAXCORRECT( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPARALLAXCORRECT = i;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+	void SetPARALLAXCORRECT( bool i )
+	{
+		m_nPARALLAXCORRECT = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20_Static_Index( )
+	{
+#ifdef _DEBUG
+		m_bCUBEMAP = false;
+#endif // _DEBUG
+		m_nCUBEMAP = 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = false;
+#endif // _DEBUG
+		m_nVERTEXCOLOR = 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = false;
+#endif // _DEBUG
+		m_nENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = false;
+#endif // _DEBUG
+		m_nBASEALPHAENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = false;
+#endif // _DEBUG
+		m_nHDRTYPE = 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = false;
+#endif // _DEBUG
+		m_nPARALLAXCORRECT = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllStaticVarsDefined = m_bCUBEMAP && m_bVERTEXCOLOR && m_bENVMAPMASK && m_bBASEALPHAENVMAPMASK && m_bHDRTYPE && m_bPARALLAXCORRECT;
+		Assert( bAllStaticVarsDefined );
+#endif // _DEBUG
+		return ( 2 * m_nCUBEMAP ) + ( 4 * m_nVERTEXCOLOR ) + ( 8 * m_nENVMAPMASK ) + ( 16 * m_nBASEALPHAENVMAPMASK ) + ( 32 * m_nHDRTYPE ) + ( 96 * m_nPARALLAXCORRECT ) + 0;
+	}
+};
+#define shaderStaticTest_sdk_shatteredglass_ps20 psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_VERTEXCOLOR + psh_forgot_to_set_static_ENVMAPMASK + psh_forgot_to_set_static_BASEALPHAENVMAPMASK + psh_forgot_to_set_static_HDRTYPE + psh_forgot_to_set_static_PARALLAXCORRECT + 0
+class sdk_shatteredglass_ps20_Dynamic_Index
+{
+private:
+	int m_nPIXELFOGTYPE;
+#ifdef _DEBUG
+	bool m_bPIXELFOGTYPE;
+#endif
+public:
+	void SetPIXELFOGTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPIXELFOGTYPE = i;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+	void SetPIXELFOGTYPE( bool i )
+	{
+		m_nPIXELFOGTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20_Dynamic_Index()
+	{
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = false;
+#endif // _DEBUG
+		m_nPIXELFOGTYPE = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllDynamicVarsDefined = m_bPIXELFOGTYPE;
+		Assert( bAllDynamicVarsDefined );
+#endif // _DEBUG
+		return ( 1 * m_nPIXELFOGTYPE ) + 0;
+	}
+};
+#define shaderDynamicTest_sdk_shatteredglass_ps20 psh_forgot_to_set_dynamic_PIXELFOGTYPE + 0

sp/src/materialsystem/stdshaders/fxctmp9_tmp/SDK_ShatteredGlass_ps20b.inc

@@ -0,0 +1,212 @@
+#include "shaderlib/cshader.h"
+class sdk_shatteredglass_ps20b_Static_Index
+{
+private:
+	int m_nCUBEMAP;
+#ifdef _DEBUG
+	bool m_bCUBEMAP;
+#endif
+public:
+	void SetCUBEMAP( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nCUBEMAP = i;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+	void SetCUBEMAP( bool i )
+	{
+		m_nCUBEMAP = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bCUBEMAP = true;
+#endif
+	}
+private:
+	int m_nVERTEXCOLOR;
+#ifdef _DEBUG
+	bool m_bVERTEXCOLOR;
+#endif
+public:
+	void SetVERTEXCOLOR( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nVERTEXCOLOR = i;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+	void SetVERTEXCOLOR( bool i )
+	{
+		m_nVERTEXCOLOR = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = true;
+#endif
+	}
+private:
+	int m_nENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bENVMAPMASK;
+#endif
+public:
+	void SetENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+	void SetENVMAPMASK( bool i )
+	{
+		m_nENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nBASEALPHAENVMAPMASK;
+#ifdef _DEBUG
+	bool m_bBASEALPHAENVMAPMASK;
+#endif
+public:
+	void SetBASEALPHAENVMAPMASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nBASEALPHAENVMAPMASK = i;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+	void SetBASEALPHAENVMAPMASK( bool i )
+	{
+		m_nBASEALPHAENVMAPMASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = true;
+#endif
+	}
+private:
+	int m_nHDRTYPE;
+#ifdef _DEBUG
+	bool m_bHDRTYPE;
+#endif
+public:
+	void SetHDRTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 2 );
+		m_nHDRTYPE = i;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+	void SetHDRTYPE( bool i )
+	{
+		m_nHDRTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = true;
+#endif
+	}
+private:
+	int m_nPARALLAXCORRECT;
+#ifdef _DEBUG
+	bool m_bPARALLAXCORRECT;
+#endif
+public:
+	void SetPARALLAXCORRECT( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPARALLAXCORRECT = i;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+	void SetPARALLAXCORRECT( bool i )
+	{
+		m_nPARALLAXCORRECT = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20b_Static_Index( )
+	{
+#ifdef _DEBUG
+		m_bCUBEMAP = false;
+#endif // _DEBUG
+		m_nCUBEMAP = 0;
+#ifdef _DEBUG
+		m_bVERTEXCOLOR = false;
+#endif // _DEBUG
+		m_nVERTEXCOLOR = 0;
+#ifdef _DEBUG
+		m_bENVMAPMASK = false;
+#endif // _DEBUG
+		m_nENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bBASEALPHAENVMAPMASK = false;
+#endif // _DEBUG
+		m_nBASEALPHAENVMAPMASK = 0;
+#ifdef _DEBUG
+		m_bHDRTYPE = false;
+#endif // _DEBUG
+		m_nHDRTYPE = 0;
+#ifdef _DEBUG
+		m_bPARALLAXCORRECT = false;
+#endif // _DEBUG
+		m_nPARALLAXCORRECT = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllStaticVarsDefined = m_bCUBEMAP && m_bVERTEXCOLOR && m_bENVMAPMASK && m_bBASEALPHAENVMAPMASK && m_bHDRTYPE && m_bPARALLAXCORRECT;
+		Assert( bAllStaticVarsDefined );
+#endif // _DEBUG
+		return ( 2 * m_nCUBEMAP ) + ( 4 * m_nVERTEXCOLOR ) + ( 8 * m_nENVMAPMASK ) + ( 16 * m_nBASEALPHAENVMAPMASK ) + ( 32 * m_nHDRTYPE ) + ( 96 * m_nPARALLAXCORRECT ) + 0;
+	}
+};
+#define shaderStaticTest_sdk_shatteredglass_ps20b psh_forgot_to_set_static_CUBEMAP + psh_forgot_to_set_static_VERTEXCOLOR + psh_forgot_to_set_static_ENVMAPMASK + psh_forgot_to_set_static_BASEALPHAENVMAPMASK + psh_forgot_to_set_static_HDRTYPE + psh_forgot_to_set_static_PARALLAXCORRECT + 0
+class sdk_shatteredglass_ps20b_Dynamic_Index
+{
+private:
+	int m_nPIXELFOGTYPE;
+#ifdef _DEBUG
+	bool m_bPIXELFOGTYPE;
+#endif
+public:
+	void SetPIXELFOGTYPE( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nPIXELFOGTYPE = i;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+	void SetPIXELFOGTYPE( bool i )
+	{
+		m_nPIXELFOGTYPE = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_ps20b_Dynamic_Index()
+	{
+#ifdef _DEBUG
+		m_bPIXELFOGTYPE = false;
+#endif // _DEBUG
+		m_nPIXELFOGTYPE = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllDynamicVarsDefined = m_bPIXELFOGTYPE;
+		Assert( bAllDynamicVarsDefined );
+#endif // _DEBUG
+		return ( 1 * m_nPIXELFOGTYPE ) + 0;
+	}
+};
+#define shaderDynamicTest_sdk_shatteredglass_ps20b psh_forgot_to_set_dynamic_PIXELFOGTYPE + 0

sp/src/materialsystem/stdshaders/fxctmp9_tmp/SDK_ShatteredGlass_vs20.inc

@@ -0,0 +1,87 @@
+#include "shaderlib/cshader.h"
+class sdk_shatteredglass_vs20_Static_Index
+{
+private:
+	int m_nENVMAP_MASK;
+#ifdef _DEBUG
+	bool m_bENVMAP_MASK;
+#endif
+public:
+	void SetENVMAP_MASK( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nENVMAP_MASK = i;
+#ifdef _DEBUG
+		m_bENVMAP_MASK = true;
+#endif
+	}
+	void SetENVMAP_MASK( bool i )
+	{
+		m_nENVMAP_MASK = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bENVMAP_MASK = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_vs20_Static_Index( )
+	{
+#ifdef _DEBUG
+		m_bENVMAP_MASK = false;
+#endif // _DEBUG
+		m_nENVMAP_MASK = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllStaticVarsDefined = m_bENVMAP_MASK;
+		Assert( bAllStaticVarsDefined );
+#endif // _DEBUG
+		return ( 2 * m_nENVMAP_MASK ) + 0;
+	}
+};
+#define shaderStaticTest_sdk_shatteredglass_vs20 vsh_forgot_to_set_static_ENVMAP_MASK + 0
+class sdk_shatteredglass_vs20_Dynamic_Index
+{
+private:
+	int m_nDOWATERFOG;
+#ifdef _DEBUG
+	bool m_bDOWATERFOG;
+#endif
+public:
+	void SetDOWATERFOG( int i )
+	{
+		Assert( i >= 0 && i <= 1 );
+		m_nDOWATERFOG = i;
+#ifdef _DEBUG
+		m_bDOWATERFOG = true;
+#endif
+	}
+	void SetDOWATERFOG( bool i )
+	{
+		m_nDOWATERFOG = i ? 1 : 0;
+#ifdef _DEBUG
+		m_bDOWATERFOG = true;
+#endif
+	}
+public:
+	sdk_shatteredglass_vs20_Dynamic_Index()
+	{
+#ifdef _DEBUG
+		m_bDOWATERFOG = false;
+#endif // _DEBUG
+		m_nDOWATERFOG = 0;
+	}
+	int GetIndex()
+	{
+		// Asserts to make sure that we aren't using any skipped combinations.
+		// Asserts to make sure that we are setting all of the combination vars.
+#ifdef _DEBUG
+		bool bAllDynamicVarsDefined = m_bDOWATERFOG;
+		Assert( bAllDynamicVarsDefined );
+#endif // _DEBUG
+		return ( 1 * m_nDOWATERFOG ) + 0;
+	}
+};
+#define shaderDynamicTest_sdk_shatteredglass_vs20 vsh_forgot_to_set_dynamic_DOWATERFOG + 0

sp/src/materialsystem/stdshaders/refract_dx9_helper.cpp

@@ -76,6 +76,19 @@ void InitRefract_DX9( CBaseVSShader *pShader, IMaterialVar** params, Refract_DX9
 	if( params[info.m_nEnvmap]->IsDefined() )
 	{
 		pShader->LoadCubeMap( info.m_nEnvmap, TEXTUREFLAGS_SRGB  );
+
+#ifdef MAPBASE
+		if (mat_specular_disable_on_missing.GetBool())
+		{
+			// Revert to defaultcubemap when the envmap texture is missing
+			// (should be equivalent to toolsblack in Mapbase)
+			if (!IS_FLAG_SET( MATERIAL_VAR_MODEL ) && params[info.m_nEnvmap]->GetTextureValue()->IsError())
+			{
+				params[info.m_nEnvmap]->SetStringValue( "engine/defaultcubemap" );
+				pShader->LoadCubeMap( info.m_nEnvmap, TEXTUREFLAGS_SRGB );
+			}
+		}
+#endif
 	}
 	if( params[info.m_nRefractTintTexture]->IsDefined() )
 	{

sp/src/materialsystem/stdshaders/water.cpp

@@ -151,6 +151,19 @@ BEGIN_VS_SHADER( SDK_Water_DX90,
 		if ( params[ENVMAP]->IsDefined() )
 		{
 			LoadCubeMap( ENVMAP, TEXTUREFLAGS_SRGB );
+
+#ifdef MAPBASE
+			if (mat_specular_disable_on_missing.GetBool())
+			{
+				// Revert to defaultcubemap when the envmap texture is missing
+				// (should be equivalent to toolsblack in Mapbase)
+				if (params[ENVMAP]->GetTextureValue()->IsError())
+				{
+					params[ENVMAP]->SetStringValue( "engine/defaultcubemap" );
+					LoadCubeMap( ENVMAP, TEXTUREFLAGS_SRGB );
+				}
+			}
+#endif
 		}
 		if ( params[NORMALMAP]->IsDefined() )
 		{

sp/src/utils/vbsp/cubemap.cpp

@@ -689,7 +689,7 @@ static int Cubemap_CreateTexInfo( int originalTexInfo, int origin[3] )
 #ifdef PARALLAX_CORRECTED_CUBEMAPS
 	// Append origin info if this cubemap has a parallax OBB
 	char originAppendedString[1024] = "";
-	if (g_pParallaxObbStrs[cubemapIndex][0] != '\0')
+	if (g_pParallaxObbStrs[cubemapIndex] && g_pParallaxObbStrs[cubemapIndex][0] != '\0')
 	{
 		Q_snprintf(originAppendedString, 1024, "%s;[%d %d %d]", g_pParallaxObbStrs[cubemapIndex], origin[0], origin[1], origin[2]);
 	}