Skip to content

Clonecop bossfight linux softlock fix #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
micr0-dev wants to merge 2 commits into
base: ez2/mapbase
Choose a base branch
from
+14 −4
Open

Clonecop bossfight linux softlock fix #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19ad87f
Fix OnServerRagdoll hook leaving 'ragdoll' param undefined on Linux
micr0-dev Jun 26, 2026
14dca8d
Guard TASK_SMALL_FLINCH/TASK_BIG_FLINCH against ACT_INVALID
micr0-dev Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions sp/src/game/server/ai_basenpc_schedule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2800,14 +2800,22 @@ void CAI_BaseNPC::StartTask( const Task_t *pTask )
case TASK_SMALL_FLINCH:
{
Remember(bits_MEMORY_FLINCHED);
SetIdealActivity( GetFlinchActivity( false, false ) );
Activity flinchActivity = GetFlinchActivity( false, false );
if ( HaveSequenceForActivity( flinchActivity ) )
SetIdealActivity( flinchActivity );
else
TaskComplete();
m_flNextFlinchTime = gpGlobals->curtime + random->RandomFloat( 3, 5 );
break;
}
case TASK_BIG_FLINCH:
{
Remember(bits_MEMORY_FLINCHED);
SetIdealActivity( GetFlinchActivity( true, false ) );
Activity flinchActivity = GetFlinchActivity( true, false );
if ( HaveSequenceForActivity( flinchActivity ) )
SetIdealActivity( flinchActivity );
else
TaskComplete();
m_flNextFlinchTime = gpGlobals->curtime + random->RandomFloat( 3, 5 );
break;
}
Expand Down
6 changes: 4 additions & 2 deletions sp/src/game/server/physics_prop_ragdoll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,8 @@ CBaseAnimating *CreateServerRagdollSubmodel( CBaseAnimating *pOwner, const char
if (pOwner && pOwner->m_ScriptScope.IsInitialized() && CBaseAnimating::g_Hook_OnServerRagdoll.CanRunInScope( pOwner->m_ScriptScope ))
{
// ragdoll, submodel
ScriptVariant_t args[] = { ScriptVariant_t( pRagdoll->GetScriptInstance() ), true };
HSCRIPT hRagdoll = pRagdoll ? pRagdoll->GetScriptInstance() : NULL;
ScriptVariant_t args[] = { ScriptVariant_t( hRagdoll ), true };
CBaseAnimating::g_Hook_OnServerRagdoll.Call( pOwner->m_ScriptScope, NULL, args );
}
#endif
Expand Down Expand Up @@ -1690,7 +1691,8 @@ CBaseEntity *CreateServerRagdoll( CBaseAnimating *pAnimating, int forceBone, con
if (pAnimating->m_ScriptScope.IsInitialized() && CBaseAnimating::g_Hook_OnServerRagdoll.CanRunInScope( pAnimating->m_ScriptScope ))
{
// ragdoll, submodel
ScriptVariant_t args[] = { ScriptVariant_t( pRagdoll->GetScriptInstance() ), false };
HSCRIPT hRagdoll = pRagdoll ? pRagdoll->GetScriptInstance() : NULL;
ScriptVariant_t args[] = { ScriptVariant_t( hRagdoll ), false };
CBaseAnimating::g_Hook_OnServerRagdoll.Call( pAnimating->m_ScriptScope, NULL, args );
}
#endif
Expand Down