celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/asw-response-system

Browse Source 
# Conflicts:
#	sp/src/game/server/server_mapbase.vpc
This commit is contained in:
Blixibon
2021-04-21 16:51:36 -05:00
parent 1a6f1f0cab 62c6c3cb6b
commit e31c45dee3
94 changed files with 6183 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sp/src/game/server/sceneentity.cpp
View File

@@ -3508,7 +3508,10 @@ void CSceneEntity::StartEvent( float currenttime, CChoreoScene *scene, CChoreoEv
if ( IsMultiplayer() )
break;
DispatchStartPermitResponses( scene, pActor, event );
if ( pActor )
{
DispatchStartPermitResponses( scene, pActor, event );
}
}
break;
default:
@@ -3666,7 +3669,10 @@ void CSceneEntity::EndEvent( float currenttime, CChoreoScene *scene, CChoreoEven
if ( IsMultiplayer() )
break;
DispatchEndPermitResponses( scene, pActor, event );
if ( pActor )
{
DispatchEndPermitResponses( scene, pActor, event );
}
}
break;
default: