Merge branch 'Toodles2You-func-pushable-crowbar'

CHANGELOG.md

@@ -9,6 +9,7 @@
 * Fixed potential buffer overflows in text localization (Thanks OMAM)
 * Reset frame to 0 when grenade bounces [#238](https://github.com/twhl-community/halflife-updated/issues/238) (thanks FreeSlave)
 * Fix weapon events not treating pushable objects as BSP models [#220](https://github.com/twhl-community/halflife-updated/pull/220) (Thanks Toodles2You)
+* Fixed crowbar applying breakable glass decals to unbreakable pushable objects [#219](https://github.com/twhl-community/halflife-updated/pull/219) (Thanks  Toodles2You)
 
 ## Changes in V1.0.0
 

FULL_UPDATED_CHANGELOG.md

@@ -52,6 +52,7 @@ Fixes for bugs introduced in beta builds are not included in this list.
 * Fixed crowbar not showing in weapon list if there are empty weapon slots with a lower id (halflife [#3181](https://github.com/ValveSoftware/halflife/issues/3181))
 * Fixed the Crowbar damage always being calculated halved (halflife issue [#1600](https://github.com/ValveSoftware/halflife/pull/1600) (Thanks YaLTeR)
 * Fixed Crowbar playing back swing events twice sometimes (halflife issue [#3230](https://github.com/ValveSoftware/halflife/issues/3230))
+* Fixed crowbar applying breakable glass decals to unbreakable pushable objects [#219](https://github.com/twhl-community/halflife-updated/pull/219) (Thanks  Toodles2You)
 
 ### Glock
 

dlls/func_break.cpp

@@ -824,6 +824,8 @@ class CPushable : public CBreakable
 	// breakables use an overridden takedamage
 	bool TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, float flDamage, int bitsDamageType) override;
 
+	int DamageDecal(int bitsDamageType) override;
+
 	static TYPEDESCRIPTION m_SaveData[];
 
 	static const char* m_soundNames[3];
@@ -1029,3 +1031,11 @@ bool CPushable::TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, floa
 
 	return true;
 }
+
+int CPushable::DamageDecal(int bitsDamageType)
+{
+	if (FBitSet(pev->spawnflags, SF_PUSH_BREAKABLE))
+		return CBreakable::DamageDecal(bitsDamageType);
+
+	return CBaseEntity::DamageDecal(bitsDamageType);
+}