Update physics_impact_damage.cpp

game/server/physics_impact_damage.cpp

@@ -255,6 +255,12 @@ float CalculatePhysicsImpactDamage( int index, gamevcollisionevent_t *pEvent, co
 	if ( pEvent->pEntities[0] == pEvent->pEntities[1] )
 		return 0;
 
+	if (pEvent->pEntities[otherIndex]->GetCollisionGroup() == COLLISION_GROUP_VEHICLE)
+	{
+		//Our friend is 100% vehicle, reassigning to the damage type.
+		damageType = DMG_VEHICLE;
+	}
+
 	if ( pEvent->pObjects[otherIndex]->GetGameFlags() & FVPHYSICS_NO_NPC_IMPACT_DMG )
 	{
 		if( pEvent->pEntities[index]->IsNPC() || pEvent->pEntities[index]->IsPlayer() )

materialsystem/stdshaders/example_model_dx9_helper.cpp

@@ -206,7 +206,7 @@ void DrawExampleModel_DX9_Internal( CBaseVSShader *pShader, IMaterialVar** param
 			pShaderAPI->BindStandardTexture( SHADER_SAMPLER0, TEXTURE_WHITE );
 		}
 
-		LightState_t lightState = LightState_t();
+		LightState_t lightState = { 0, false, false };
 		bool bFlashlightShadows = false;
 		if( bHasFlashlight )
 		{

materialsystem/stdshaders/eye_refract_helper.cpp

@@ -274,7 +274,7 @@ void Draw_Eyes_Refract_Internal( CBaseVSShader *pShader, IMaterialVar** params,
 		if ( bDrawFlashlightAdditivePass == true )
 			pShaderAPI->SetVertexShaderConstant( VERTEX_SHADER_SHADER_SPECIFIC_CONST_4, flashlightState.m_vecLightOrigin.Base(), 1 );
 
-		LightState_t lightState = LightState_t();
+		LightState_t lightState = { 0, false, false };
 		if ( bDrawFlashlightAdditivePass == false )
 		{
 			pShaderAPI->GetDX9LightState( &lightState );

materialsystem/stdshaders/flesh_interior_blended_pass_helper.cpp

@@ -222,7 +222,7 @@ void DrawFleshInteriorBlendedPass( CBaseVSShader *pShader, IMaterialVar** params
 		bool bUseStaticControlFlow = g_pHardwareConfig->SupportsStaticControlFlow();
 
 		// Set Vertex Shader Combos
-		LightState_t lightState = LightState_t();
+		LightState_t lightState = { 0, false, false };
 		pShaderAPI->GetDX9LightState( &lightState );
 		DECLARE_DYNAMIC_VERTEX_SHADER( flesh_interior_blended_pass_vs20 );
 		SET_DYNAMIC_VERTEX_SHADER_COMBO( DOWATERFOG, pShaderAPI->GetSceneFogMode() == MATERIAL_FOG_LINEAR_BELOW_FOG_Z );

materialsystem/stdshaders/particlelitgeneric_dx9_helper.cpp

@@ -234,7 +234,7 @@ void DrawParticleLitGeneric_DX9( CBaseVSShader *pShader, IMaterialVar** params,
 			pShader->BindTexture( SHADER_SAMPLER7, info.m_nFlashlightTexture, info.m_nFlashlightTextureFrame );
 		}
 
-		LightState_t lightState = LightState_t();
+		LightState_t lightState = { 0, false, false };
 		if( !hasFlashlight )
 			pShaderAPI->GetDX9LightState( &lightState );
 

materialsystem/stdshaders/pyro_vision.cpp

@@ -638,7 +638,7 @@ BEGIN_VS_SHADER( pyro_vision, "Help for pyro vision" )
 			DynamicCmdsOut.SetPixelShaderConstant( 12, vParms.Base() );
 
 			int numBones = pShaderAPI->GetCurrentNumBones();
-			LightState_t lightState = LightState_t();
+			LightState_t lightState = { 0, false, false };
 			if ( bVertexLit && !bFullBright )
 			{
 				pShaderAPI->GetDX9LightState( &lightState );

materialsystem/stdshaders/skin_dx9_helper.cpp

@@ -611,7 +611,7 @@ void DrawSkin_DX9_Internal( CBaseVSShader *pShader, IMaterialVar** params, IShad
 			}
 		}
 
-		LightState_t lightState = LightState_t();
+		LightState_t lightState = { 0, false, false };
 		bool bFlashlightShadows = false;
 		if( bHasFlashlight )
 		{

materialsystem/stdshaders/vertexlitgeneric_dx9_helper.cpp

@@ -1188,7 +1188,7 @@ static void DrawVertexLitGeneric_DX9_Internal( CBaseVSShader *pShader, IMaterial
 
 
 		// Set up light combo state
-		LightState_t lightState = LightState_t();
+		LightState_t lightState = {0, false, false};
 		if ( bVertexLitGeneric && (!bHasFlashlight || IsX360() ) )
 		{
 			pShaderAPI->GetDX9LightState( &lightState );

materialsystem/stdshaders/vortwarp_dx9.cpp

@@ -310,7 +310,7 @@ void DrawVortWarp_DX9( CBaseVSShader *pShader, IMaterialVar** params, IShaderDyn
 		}
 
 		// Set up light combo state
-		LightState_t lightState = LightState_t();
+		LightState_t lightState = {0, false, false};
 		if ( bVertexLitGeneric && !hasFlashlight )
 		{
 			pShaderAPI->GetDX9LightState( &lightState );