demonkenny/monstermod-redo-repo-copy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sound replacements crashing the server.

Browse Source
This commit is contained in:
Giegue
2023-06-01 19:46:02 -03:00
parent b87538ff59
commit fbe70a5691
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dlls/globalreplace.cpp
View File

@@ -122,8 +122,20 @@ const char* FindSoundReplacement( edict_t *pMonster, const char *from )
// Individually set sounds takes priority! // Individually set sounds takes priority!
if ( pMonster ) if ( pMonster )
{ {
CMBaseMonster *castMonster = GetClassPtr((CMBaseMonster *)VARS(pMonster)); CMBaseMonster *castMonster = NULL;
if (castMonster->m_isrSounds)
// Check if this is really a monster or not
if (pMonster->v.flags & FL_MONSTER)
castMonster = GetClassPtr((CMBaseMonster *)VARS(pMonster));
else
{
// This is probably a monster-owned projectile of sorts
if (!FNullEnt(pMonster->v.owner))
castMonster = GetClassPtr((CMBaseMonster *)VARS(pMonster->v.owner));
}
// If still no valid BaseMonster pointer, full stop, use GSR.
if (castMonster && castMonster->m_isrSounds)
{ {
for (int sound = 0; sound < castMonster->m_isrSounds; sound++) for (int sound = 0; sound < castMonster->m_isrSounds; sound++)
{ {