fix displacer crash

wootguy · Dec 7, 2024 · 27adcde · 27adcde
1 parent 3ddfaae
commit 27adcde
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/dlls/weapon/CDisplacerBall.cpp b/dlls/weapon/CDisplacerBall.cpp
@@ -369,30 +369,32 @@ void CDisplacerBall::ArmBeam(int iSide)
 	if (!m_pBeam[m_uiBeams])
 		m_pBeam[m_uiBeams] = CBeam::BeamCreate("sprites/lgtning.spr", 30);
 
-	if (!m_pBeam[m_uiBeams])
+	CBeam* beam = (CBeam*)m_pBeam[m_uiBeams].GetEntity();
+
+	if (!beam)
 		return;
 
 	auto pHit = Instance(tr.pHit);
 
 	if (pHit && pHit->pev->takedamage != DAMAGE_NO)
 	{
 		// Beam hit something, deal radius damage to it.
-		m_pBeam[m_uiBeams]->EntsInit(pHit->entindex(), entindex());
+		beam->EntsInit(pHit->entindex(), entindex());
 
-		m_pBeam[m_uiBeams]->SetColor(255, 255, 255);
+		beam->SetColor(255, 255, 255);
 
-		m_pBeam[m_uiBeams]->SetBrightness(255);
+		beam->SetBrightness(255);
 
 		RadiusDamage(tr.vecEndPos, pev, &pev->owner->v, 25, 15, CLASS_NONE, DMG_ENERGYBEAM);
 	}
 	else
 	{
-		m_pBeam[m_uiBeams]->PointEntInit(tr.vecEndPos, entindex());
-		m_pBeam[m_uiBeams]->SetEndAttachment(iSide < 0 ? 2 : 1);
+		beam->PointEntInit(tr.vecEndPos, entindex());
+		beam->SetEndAttachment(iSide < 0 ? 2 : 1);
 		// m_pBeam[ m_uiBeams ]->SetColor( 180, 255, 96 );
-		m_pBeam[m_uiBeams]->SetColor(96, 128, 16);
-		m_pBeam[m_uiBeams]->SetBrightness(255);
-		m_pBeam[m_uiBeams]->SetNoise(80);
+		beam->SetColor(96, 128, 16);
+		beam->SetBrightness(255);
+		beam->SetNoise(80);
 	}
 
 	++m_uiBeams;

diff --git a/dlls/weapon/CDisplacerBall.h b/dlls/weapon/CDisplacerBall.h
@@ -47,7 +47,7 @@ class CDisplacerBall : public CBaseEntity
 private:
 	int m_iTrail;
 
-	CBeam* m_pBeam[NUM_BEAMS];
+	EHANDLE m_pBeam[NUM_BEAMS];
 
 	size_t m_uiBeams;