Skip to content

Commit d9cf68f

Browse files
committed
Differ triggers.cpp unity change
1 parent e644ed6 commit d9cf68f

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

src/game/server/triggers.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4693,11 +4693,15 @@ void CTriggerVPhysicsMotion::StartTouch( CBaseEntity *pOther )
46934693
}
46944694

46954695
#ifdef NEO // Unity build
4696-
triggerevent_t event = {};
4696+
triggerevent_t event;
4697+
if ( !PhysGetTriggerEvent( &event, this ) )
4698+
{
4699+
event = {};
4700+
}
46974701
#else
46984702
triggerevent_t event;
4699-
#endif
47004703
PhysGetTriggerEvent( &event, this );
4704+
#endif
47014705
if ( event.pObject )
47024706
{
47034707
// these all get done again on save/load, so check
@@ -4735,11 +4739,15 @@ void CTriggerVPhysicsMotion::EndTouch( CBaseEntity *pOther )
47354739
pPlayer->m_Local.m_bSlowMovement = false;
47364740
}
47374741
#ifdef NEO // Unity build
4738-
triggerevent_t event = {};
4742+
triggerevent_t event;
4743+
if ( !PhysGetTriggerEvent( &event, this ) )
4744+
{
4745+
event = {};
4746+
}
47394747
#else
47404748
triggerevent_t event;
4741-
#endif
47424749
PhysGetTriggerEvent( &event, this );
4750+
#endif
47434751
if ( event.pObject && m_pController )
47444752
{
47454753
m_pController->DetachObject( event.pObject );

0 commit comments

Comments
 (0)