Skip to content

Commit a6f8125

Browse files
committed
fix(grenade): set weapon creator class before spawn
Spawn depends on the creator class to choose the correct model (grenade launcher's vs hand grenade).
1 parent 8c525ee commit a6f8125

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/game/server/swarm/asw_grenade_cluster.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ CASW_Grenade_Cluster* CASW_Grenade_Cluster::Cluster_Grenade_Create( float flDama
225225
pGrenade->SetAbsAngles( angles );
226226
UTIL_SetOrigin( pGrenade, position );
227227
pGrenade->m_vecInitPos = position;
228+
if ( pCreatorWeapon )
229+
{
230+
pGrenade->m_CreatorWeaponClass = pCreatorWeapon->Classify();
231+
}
228232
pGrenade->Spawn();
229233
pGrenade->m_flDamage = flDamage;
230234
pGrenade->m_DmgRadius = fRadius;
@@ -235,7 +239,6 @@ CASW_Grenade_Cluster* CASW_Grenade_Cluster::Cluster_Grenade_Create( float flDama
235239
pGrenade->m_hCreatorWeapon = pCreatorWeapon;
236240
if ( pCreatorWeapon )
237241
{
238-
pGrenade->m_CreatorWeaponClass = pCreatorWeapon->Classify();
239242
pGrenade->m_ProjectileData.GetForModify().SetFromWeapon( pCreatorWeapon );
240243
}
241244

0 commit comments

Comments
 (0)