Fix crash when switching weapons when hand grenades are used up. (#551)

weimzh · web-flow · commit da71893396f7 · 2025-11-01T19:29:52.000Z
diff --git a/dlls/handgrenade.cpp b/dlls/handgrenade.cpp
@@ -99,7 +99,8 @@ void CHandGrenade::Holster( int skiplocal /* = 0 */ )
 	{
 		// no more grenades!
 		m_pPlayer->pev->weapons &= ~( 1 << WEAPON_HANDGRENADE );
-		DestroyItem();
+		SetThink( &CHandGrenade::DestroyItem );
+		pev->nextthink = gpGlobals->time + 0.1;
 	}
 
 	if( m_flStartThrow )

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,8 @@ void CHandGrenade::Holster( int skiplocal /* = 0 */ )`
`99`	`99`	`{`
`100`	`100`	`// no more grenades!`
`101`	`101`	`m_pPlayer->pev->weapons &= ~( 1 << WEAPON_HANDGRENADE );`
`102`		`- DestroyItem();`
	`102`	`+ SetThink( &CHandGrenade::DestroyItem );`
	`103`	`+ pev->nextthink = gpGlobals->time + 0.1;`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`if( m_flStartThrow )`