YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-02-03 02:24:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix laser spot sound playing again and again without visual changing. Fix removing of laser spot when look at the sky (#17)

Browse Source
This commit is contained in:
Roman Chistokhodov 2018-03-22 19:53:46 +03:00 committed by Andrey Akhmichin
parent 23c4866391
commit 68af4923a1
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/gearbox/eagle.cpp
View File

@ -1,4 +1,4 @@
//========= Copyright © 2004-2008, Raven City Team, All rights reserved. ============//
//========= Copyright (c) 2004-2008, Raven City Team, All rights reserved. ============//
// //
// Purpose: //
// //
@ -100,18 +100,22 @@ void CEagle::Holster( int skiplocal /* = 0 */ )
void CEagle::SecondaryAttack()
{
m_fEagleLaserActive = ! m_fEagleLaserActive;
if (!m_fEagleLaserActive && m_pEagleLaser)
if ((m_pEagleLaser && m_fEagleLaserActive) // don't turn off if it was not created yet
|| !m_fEagleLaserActive)
{
EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/desert_eagle_sight2.wav", 1.0, ATTN_NORM, 0, PITCH_NORM);
m_pEagleLaser->Killed( NULL, GIB_NORMAL );
m_pEagleLaser = NULL;
m_fEagleLaserActive = !m_fEagleLaserActive;
if (!m_fEagleLaserActive && m_pEagleLaser)
{
EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/desert_eagle_sight2.wav", 1.0, ATTN_NORM, 0, PITCH_NORM);
m_pEagleLaser->Killed( NULL, GIB_NORMAL );
m_pEagleLaser = NULL;
}
m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.5;
}
else
{
EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/desert_eagle_sight.wav", 1.0, ATTN_NORM, 0, PITCH_NORM);
m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.1;
}
m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.5;
}
void CEagle::PrimaryAttack()
@ -225,6 +229,7 @@ void CEagle::UpdateSpot( void )
m_pEagleLaser = CLaserSpot::CreateSpot();
m_pEagleLaser->pev->classname = MAKE_STRING("eagle_laser");
m_pEagleLaser->pev->scale = 0.5;
EMIT_SOUND_DYN(ENT(m_pPlayer->pev), CHAN_ITEM, "weapons/desert_eagle_sight.wav", 1.0, ATTN_NORM, 0, PITCH_NORM);
}
UTIL_MakeVectors( m_pPlayer->pev->v_angle );
@ -235,13 +240,6 @@ void CEagle::UpdateSpot( void )
UTIL_TraceLine ( vecSrc, vecSrc + vecAiming * 8192, dont_ignore_monsters, ENT(m_pPlayer->pev), &tr );
UTIL_SetOrigin( m_pEagleLaser->pev, tr.vecEndPos );
if ( UTIL_PointContents(tr.vecEndPos) == CONTENT_SKY )
{
UTIL_Remove( m_pEagleLaser );
m_pEagleLaser = FALSE;
}
}
#endif
}