fixes

Author: Bitl

src/game/server/hl2/npc_citizen17.cpp

@@ -16,7 +16,6 @@
 #include "hl2_player.h"
 #include "items.h"
 
-
 #ifdef HL2MP
 #include "hl2mp/weapon_crowbar.h"
 #else

src/game/shared/hl2/hl2_gamerules.cpp

@@ -1781,6 +1781,7 @@ bool CHalfLife2::IsAlyxInDarknessMode()
 }
 #endif
 
+#ifndef BDSBASE
 //-----------------------------------------------------------------------------
 // This takes the long way around to see if a prop should emit a DLIGHT when it
 // ignites, to avoid having Alyx-related code in props.cpp.
@@ -1793,6 +1794,7 @@ bool CHalfLife2::ShouldBurningPropsEmitLight()
 	return false;
 #endif // HL2_EPISODIC
 }
+#endif
 
 
 #endif//CLIENT_DLL

src/game/shared/hl2mp/hl2mp_gamerules.cpp

@@ -2446,9 +2446,6 @@ void CHL2MPRules::InitDefaultAIRelationships(void)
 }
 #endif //BDSBASE
 
-//TDT - Episodic Issues: Here we add darkness mode so that it now works.
-#ifndef CLIENT_DLL
-
 //-----------------------------------------------------------------------------
 // Returns whether or not Alyx cares about light levels in order to see.
 //-----------------------------------------------------------------------------
@@ -2480,6 +2477,4 @@ bool CHL2MPRules::ShouldBurningPropsEmitLight()
 #endif // HL2_EPISODIC
 }
 
-#endif//CLIENT_DLL
-
 #endif

src/game/shared/hl2mp/hl2mp_gamerules.h

@@ -91,11 +91,13 @@ class CHL2MPRules : public CTeamplayRules
 #else
 
 	DECLARE_SERVERCLASS_NOBASE(); // This makes datatables able to access our private vars.
-#endif
 
 	//TDT - Episodic Issues: Here we add darkness mode so that it now works.
 	virtual bool IsAlyxInDarknessMode();
 	virtual bool ShouldBurningPropsEmitLight();
+
+	virtual void InitDefaultAIRelationships(void);
+#endif
 
 	CHL2MPRules();
 	virtual ~CHL2MPRules();
@@ -104,8 +106,6 @@ class CHL2MPRules : public CTeamplayRules
 	virtual bool ShouldCollide( int collisionGroup0, int collisionGroup1 );
 	virtual bool ClientCommand( CBaseEntity *pEdict, const CCommand &args );
 
-	virtual void InitDefaultAIRelationships(void);
-
 	virtual float FlWeaponRespawnTime( CBaseCombatWeapon *pWeapon );
 	virtual float FlWeaponTryRespawn( CBaseCombatWeapon *pWeapon );
 	virtual Vector VecWeaponRespawnSpot( CBaseCombatWeapon *pWeapon );

src/game/shared/hl2mp/weapon_crowbar.cpp

@@ -106,58 +106,6 @@ void CWeaponCrowbar::AddViewKick( void )
 
 
 #ifndef CLIENT_DLL
-#ifdef BDSBASE
-//-----------------------------------------------------------------------------
-// Attempt to lead the target (needed because citizens can't hit manhacks with the crowbar!)
-//-----------------------------------------------------------------------------
-ConVar sk_crowbar_lead_time("sk_crowbar_lead_time", "0.9");
-
-int CWeaponCrowbar::WeaponMeleeAttack1Condition(float flDot, float flDist)
-{
-	// Attempt to lead the target (needed because citizens can't hit manhacks with the crowbar!)
-	CAI_BaseNPC* pNPC = GetOwner()->MyNPCPointer();
-	CBaseEntity* pEnemy = pNPC->GetEnemy();
-	if (!pEnemy)
-		return COND_NONE;
-
-	Vector vecVelocity;
-	vecVelocity = pEnemy->GetSmoothedVelocity();
-
-	// Project where the enemy will be in a little while
-	float dt = sk_crowbar_lead_time.GetFloat();
-	dt += random->RandomFloat(-0.3f, 0.2f);
-	if (dt < 0.0f)
-		dt = 0.0f;
-
-	Vector vecExtrapolatedPos;
-	VectorMA(pEnemy->WorldSpaceCenter(), dt, vecVelocity, vecExtrapolatedPos);
-
-	Vector vecDelta;
-	VectorSubtract(vecExtrapolatedPos, pNPC->WorldSpaceCenter(), vecDelta);
-
-	if (fabs(vecDelta.z) > 70)
-	{
-		return COND_TOO_FAR_TO_ATTACK;
-	}
-
-	Vector vecForward = pNPC->BodyDirection2D();
-	vecDelta.z = 0.0f;
-	float flExtrapolatedDist = Vector2DNormalize(vecDelta.AsVector2D());
-	if ((flDist > 64) && (flExtrapolatedDist > 64))
-	{
-		return COND_TOO_FAR_TO_ATTACK;
-	}
-
-	float flExtrapolatedDot = DotProduct2D(vecDelta.AsVector2D(), vecForward.AsVector2D());
-	if ((flDot < 0.7) && (flExtrapolatedDot < 0.7))
-	{
-		return COND_NOT_FACING_ATTACK;
-	}
-
-	return COND_CAN_MELEE_ATTACK1;
-}
-#endif //BDSBASE
-
 //-----------------------------------------------------------------------------
 // Animation event handlers
 //-----------------------------------------------------------------------------