Fix crossbow bolts staying in air and not pushing the func_pushable i…

…n GoldSource
FreeSlave · Dec 28, 2024 · 72928cb · 72928cb
1 parent 881852d
commit 72928cb
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp
@@ -156,7 +156,7 @@ void CCrossbowBolt::BoltTouch( CBaseEntity *pOther )
 			pev->angles.z = RANDOM_LONG( 0, 360 );
 			pev->nextthink = gpGlobals->time + 10.0f;
 		}
-		else if( pOther->pev->movetype == MOVETYPE_PUSH || pOther->pev->movetype == MOVETYPE_PUSHSTEP )
+		else if( g_fIsXash3D && (pOther->pev->movetype == MOVETYPE_PUSH || pOther->pev->movetype == MOVETYPE_PUSHSTEP) )
 		{
 			Vector vecDir = pev->velocity.Normalize();
 			UTIL_SetOrigin( pev, pev->origin - vecDir * 12.0f );
@@ -167,12 +167,9 @@ void CCrossbowBolt::BoltTouch( CBaseEntity *pOther )
 			pev->angles.z = RANDOM_LONG( 0, 360 );
 			pev->nextthink = gpGlobals->time + 10.0f;			
 
-			if( g_fIsXash3D )
-			{
-				// g-cont. Setup movewith feature
-				pev->movetype = MOVETYPE_COMPOUND;	// set movewith type
-				pev->aiment = ENT( pOther->pev );	// set parent
-			}
+			// g-cont. Setup movewith feature
+			pev->movetype = MOVETYPE_COMPOUND;	// set movewith type
+			pev->aiment = ENT( pOther->pev );	// set parent
 		}
 
 		if( UTIL_PointContents( pev->origin ) != CONTENTS_WATER )