From c7b141d67d9bfb443dae23f4a98f0bf68e73967d Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin <15944199+nekonomicon@users.noreply.github.com> Date: Mon, 19 Feb 2024 01:54:43 +0500 Subject: [PATCH] Fix alien slave beams staying forever if they exist during a level change. Same as https://github.com/twhl-community/halflife-updated/commit/ac808a876977f780e3753a520d227172fad866c2. --- dlls/islave.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/islave.cpp b/dlls/islave.cpp index 577eda24..ba194cea 100644 --- a/dlls/islave.cpp +++ b/dlls/islave.cpp @@ -732,6 +732,7 @@ void CISlave::ArmBeam( int side ) m_pBeam[m_iBeams]->SetColor( 96, 128, 16 ); m_pBeam[m_iBeams]->SetBrightness( 64 ); m_pBeam[m_iBeams]->SetNoise( 80 ); + m_pBeam[m_iBeams]->pev->spawnflags |= SF_BEAM_TEMPORARY; // Flag these to be destroyed on save/restore or level transition m_iBeams++; } @@ -776,6 +777,7 @@ void CISlave::WackBeam( int side, CBaseEntity *pEntity ) m_pBeam[m_iBeams]->SetColor( 180, 255, 96 ); m_pBeam[m_iBeams]->SetBrightness( 255 ); m_pBeam[m_iBeams]->SetNoise( 80 ); + m_pBeam[m_iBeams]->pev->spawnflags |= SF_BEAM_TEMPORARY; // Flag these to be destroyed on save/restore or level transition m_iBeams++; } @@ -806,6 +808,7 @@ void CISlave::ZapBeam( int side ) m_pBeam[m_iBeams]->SetColor( 180, 255, 96 ); m_pBeam[m_iBeams]->SetBrightness( 255 ); m_pBeam[m_iBeams]->SetNoise( 20 ); + m_pBeam[m_iBeams]->pev->spawnflags |= SF_BEAM_TEMPORARY; // Flag these to be destroyed on save/restore or level transition m_iBeams++; pEntity = CBaseEntity::Instance( tr.pHit );