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

Prevent soundent loop

Browse Source
This commit is contained in:
mittorn 2018-08-04 20:59:46 +07:00
parent 29bd5d059f
commit 45e13383ff
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/monsters.cpp
View File

@ -219,6 +219,8 @@ void CBaseMonster::Listen( void )
ClearConditions( bits_COND_HEAR_SOUND | bits_COND_SMELL_FOOD | bits_COND_SMELL ); ClearConditions( bits_COND_HEAR_SOUND | bits_COND_SMELL_FOOD | bits_COND_SMELL );
hearingSensitivity = HearingSensitivity(); hearingSensitivity = HearingSensitivity();
int i = 0;
while( iSound != SOUNDLIST_EMPTY ) while( iSound != SOUNDLIST_EMPTY )
{ {
pCurrentSound = CSoundEnt::SoundPointerForIndex( iSound ); pCurrentSound = CSoundEnt::SoundPointerForIndex( iSound );
@ -260,14 +262,16 @@ void CBaseMonster::Listen( void )
m_iAudibleList = iSound; m_iAudibleList = iSound;
} }
else if( iSound == pCurrentSound->m_iNext ) else if( i > 9999 || iSound == pCurrentSound->m_iNext )
{ {
void GGM_CleanSoundEnt( void );
m_iAudibleList = SOUNDLIST_EMPTY; m_iAudibleList = SOUNDLIST_EMPTY;
pCurrentSound->m_iNext = -1;
ALERT( at_error, "Sound list is broken, preventing infinite loop!\n" ); ALERT( at_error, "Sound list is broken, preventing infinite loop!\n" );
GGM_CleanSoundEnt();
return; return;
} }
//iSound = g_pSoundEnt->m_SoundPool[iSound].m_iNext; //iSound = g_pSoundEnt->m_SoundPool[iSound].m_iNext;
iSound = pCurrentSound->m_iNext; iSound = pCurrentSound->m_iNext;
} }

9
dlls/soundent.cpp
View File

@ -376,3 +376,12 @@ int CSoundEnt::ClientSoundIndex( edict_t *pClient )
return iReturn; return iReturn;
} }
void GGM_CleanSoundEnt( void )
{
if( !pSoundEnt )
return;
pSoundEnt->pev->flags |= FL_KILLME;
pSoundEnt = NULL;
}