Fix breakable objects reflecting the Gauss Gun shot that breaks them

twhl-community · Aug 22, 2023 · d0be0d0 · d0be0d0
1 parent 38fff99
commit d0be0d0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/dlls/func_break.cpp b/dlls/func_break.cpp
@@ -796,6 +796,14 @@ int CBreakable::DamageDecal(int bitsDamageType)
 	return CBaseEntity::DamageDecal(bitsDamageType);
 }
 
+bool CBreakable::ReflectGauss()
+{
+	if (IsBreakable())
+		return false;
+
+	return CBaseEntity::ReflectGauss();
+}
+
 
 class CPushable : public CBreakable
 {
@@ -813,6 +821,8 @@ class CPushable : public CBreakable
 	bool Save(CSave& save) override;
 	bool Restore(CRestore& restore) override;
 
+	bool ReflectGauss() override;
+
 	inline float MaxSpeed() { return m_maxSpeed; }
 
 	// breakables use an overridden takedamage
@@ -1023,3 +1033,11 @@ bool CPushable::TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, floa
 
 	return true;
 }
+
+bool CPushable::ReflectGauss()
+{
+	if (!FBitSet(pev->spawnflags, SF_PUSH_BREAKABLE))
+		return true;
+
+	return CBreakable::ReflectGauss();
+}
diff --git a/dlls/func_break.h b/dlls/func_break.h
@@ -63,6 +63,8 @@ class CBreakable : public CBaseDelay
 	bool Save(CSave& save) override;
 	bool Restore(CRestore& restore) override;
 
+	bool ReflectGauss() override;
+
 	inline bool Explodable() { return ExplosionMagnitude() > 0; }
 	inline int ExplosionMagnitude() { return pev->impulse; }
 	inline void ExplosionSetMagnitude(int magnitude) { pev->impulse = magnitude; }