finish implementation

Author: Bitl

src/game/client/fx_blood.cpp

@@ -25,14 +25,6 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-#ifdef BDSBASE
-#ifdef TF_CLIENT_DLL
-ConVar r_classic_blood("r_classic_blood", "0", FCVAR_DEVELOPMENTONLY);
-#else
-ConVar r_classic_blood("r_classic_blood", "0", FCVAR_ARCHIVE);
-#endif
-#endif
-
 CLIENTEFFECT_REGISTER_BEGIN( PrecacheEffectBloodSpray )
 CLIENTEFFECT_MATERIAL( "effects/blood_core" )
 CLIENTEFFECT_MATERIAL( "effects/blood_gore" )
@@ -510,24 +502,6 @@ DECLARE_CLIENT_EFFECT( "bloodspray", BloodSprayCallback );
 void BloodImpactCallback( const CEffectData & data )
 {
 	bool bFoundBlood = false;
-
-#ifdef BDSBASE
-	if (!r_classic_blood.GetBool())
-	{
-		// Find which sort of blood we are
-		for (int i = 0; i < ARRAYSIZE(bloodCallbacks); i++)
-		{
-			if (bloodCallbacks[i].nColor == data.m_nColor)
-			{
-				QAngle	vecAngles;
-				VectorAngles(-data.m_vNormal, vecAngles);
-				DispatchParticleEffect(bloodCallbacks[i].lpszParticleSystemName, data.m_vOrigin, vecAngles);
-				bFoundBlood = true;
-				break;
-			}
-		}
-	}
-#else
 	// Find which sort of blood we are
 	for (int i = 0; i < ARRAYSIZE(bloodCallbacks); i++)
 	{
@@ -540,7 +514,6 @@ void BloodImpactCallback( const CEffectData & data )
 			break;
 		}
 	}
-#endif
 
 	if ( bFoundBlood == false )
 	{

src/game/client/hl2/hud_locator.cpp

@@ -128,8 +128,10 @@ bool CHudLocator::ShouldDraw( void )
 	if( pPlayer->GetVehicle() )
 		return false;
 
+#ifdef HL2_EPISODIC
 	if( pPlayer->m_HL2Local.m_vecLocatorOrigin == vec3_invalid )
 		return false;
+#endif //HL2_EPISODIC
 
 	return true;
 }

src/game/server/ai_behavior_follow.cpp

@@ -18,6 +18,11 @@
 #include "ndebugoverlay.h"
 #include "ai_senses.h"
 
+//TDT - Episodic Issues: Here we include the hl2mp gamerules so that calls to darkness mode work.
+#ifdef HL2MP
+	#include "hl2mp_gamerules.h"
+#endif
+
 #ifdef HL2_EPISODIC
 	#include "info_darknessmode_lightsource.h"
 #endif

src/game/server/ai_behavior_passenger.cpp

@@ -863,7 +863,10 @@ void CAI_PassengerBehavior::DetachFromVehicle( void )
 	GetOuter()->AddFlag( FL_FLY );
 	GetOuter()->SetGroundEntity( NULL );
 	GetOuter()->SetCollisionGroup( COLLISION_GROUP_NPC );
+//TDT - Episodic Issues: We add in this if def solely for people who DO NOT want episode 2 content.
+#ifdef HL2_EPISODIC
 	m_hVehicle->RemovePhysicsChild( GetOuter() );
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -888,8 +891,11 @@ void CAI_PassengerBehavior::AttachToVehicle( void )
 	// Set our destination target
 	GetEntryTarget( &m_vecTargetPosition, &m_vecTargetAngles );
 
+	//TDT - Episodic Issues: We add in this if def solely for people who DO NOT want episode 2 content.
+#ifdef HL2_EPISODIC
 	// Get physics messages from our attached physics object
 	m_hVehicle->AddPhysicsChild( GetOuter() );
+#endif
 }
 
 //-----------------------------------------------------------------------------

src/game/server/basecombatcharacter.cpp

@@ -39,6 +39,11 @@
 #include "saverestoretypes.h"
 #include "nav_mesh.h"
 
+//TDT - Episodic Issues: Here we include the hl2mp gamerules so that calls to darkness mode work.
+#ifdef HL2MP
+#include "hl2mp_gamerules.h"
+#endif
+
 #ifndef BDSBASE
 #ifdef TF_DLL
 #include "nav_mesh/tf_nav_area.h"

src/game/server/episodic/weapon_striderbuster.cpp

@@ -50,6 +50,7 @@ ConVar striderbuster_dive_force( "striderbuster_dive_force", "-200" ); // How mu
 
 ConVar striderbuster_use_particle_flare( "striderbuster_use_particle_flare", "1" );
 
+#ifdef HL2_EPISODIC //TDT - Episodic Issues: Code can't compile without using an ifdef here.
 #define STRIDERBUSTER_FLAG_KNOCKED_OFF_STRIDER		0x00000001 // We were knocked off of a strider after the player attached me.
 
 #define SF_DONT_WEAPON_MANAGE			0x800000
@@ -1173,3 +1174,4 @@ bool StriderBuster_WasKnockedOffStrider( CBaseEntity *pEntity )
 
 	return false;
 }
+#endif //HL2_EPISODIC

src/game/server/hl2/npc_BaseZombie.cpp

@@ -47,6 +47,11 @@
 #include "weapon_physcannon.h"
 #include "ammodef.h"
 #include "vehicle_base.h"
+
+//TDT - Episodic Issues: Here we include the hl2mp gamerules so that calls to darkness mode work.
+#ifdef HL2MP
+#include "hl2mp_gamerules.h"
+#endif
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"

src/game/server/hl2/npc_alyx_episodic.cpp

@@ -37,6 +37,11 @@
 #include "weapon_flaregun.h"
 #include "env_debughistory.h"
 
+//TDT - Episodic Issues: Here we include the hl2mp gamerules so that calls to darkness mode work.
+#ifdef HL2MP
+	#include "hl2mp_gamerules.h"
+#endif
+
 extern Vector PointOnLineNearestPoint(const Vector& vStartPos, const Vector& vEndPos, const Vector& vPoint);
 
 // memdbgon must be the last include file in a .cpp file!!!

src/game/server/hl2/npc_headcrab.cpp

@@ -33,6 +33,11 @@
 #include "hl2_gamerules.h"
 #include "decals.h"
 
+//TDT - Episodic Issues: Here we include the hl2mp gamerules so that calls to darkness mode work.
+#ifdef HL2MP
+#include "hl2mp_gamerules.h"
+#endif
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 

src/game/server/hl2/npc_zombine.cpp

@@ -35,6 +35,11 @@
 
 #include "ai_interactions.h"
 
+//TDT - Episodic Issues: Here we include the hl2mp gamerules so that calls to darkness mode work.
+#ifdef HL2MP
+	#include "hl2mp_gamerules.h"
+#endif
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"