Skip to content
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

Jump to bottom

revert #34 fix as it caused crashes #36

Merged
merged 2 commits into from
Jun 30, 2024
Merged

revert #34 fix as it caused crashes #36

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
d1549e2
Revert cbase
YoYo178 Jun 30, 2024
0dfa204
Revert fix #34
YoYo178 Jun 30, 2024
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
1 change: 0 additions & 1 deletion mp/src/game/server/baseentity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ enum Class_T
CLASS_TURRET,
CLASS_BACKPACK,
CLASS_INFOSCRIPT,
CLASS_TRIGGER,
CLASS_TRIGGERSCRIPT,
CLASS_TRIGGER_CLIP,
CLASS_TEAMSPAWN,
Expand Down
17 changes: 2 additions & 15 deletions mp/src/game/server/cbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,7 @@ void CBaseEntityOutput::FireOutput(variant_t Value, CBaseEntity *pActivator, CBa
//
// Post the event with the default parameter.
//
if ( ( pCaller->Classify() == CLASS_TRIGGER || pCaller->Classify() == CLASS_TRIGGERSCRIPT || pCaller->Classify() == CLASS_TRIGGER_CLIP )
&& pCaller->GetName() == STRING( ev->m_iTarget ) )
{
g_EventQueue.AddEvent( pCaller, STRING(ev->m_iTargetInput), Value, ev->m_flDelay + fDelay, pActivator, pCaller, ev->m_iIDStamp );
}
else
g_EventQueue.AddEvent( STRING(ev->m_iTarget), STRING(ev->m_iTargetInput), Value, ev->m_flDelay + fDelay, pActivator, pCaller, ev->m_iIDStamp );
g_EventQueue.AddEvent( STRING(ev->m_iTarget), STRING(ev->m_iTargetInput), Value, ev->m_flDelay + fDelay, pActivator, pCaller, ev->m_iIDStamp );
}
else
{
Expand All @@ -300,14 +294,7 @@ void CBaseEntityOutput::FireOutput(variant_t Value, CBaseEntity *pActivator, CBa
//
variant_t ValueOverride;
ValueOverride.SetString( ev->m_iParameter );

if ( ( pCaller->Classify() == CLASS_TRIGGER || pCaller->Classify() == CLASS_TRIGGERSCRIPT || pCaller->Classify() == CLASS_TRIGGER_CLIP )
&& pCaller->GetName() == STRING( ev->m_iTarget ) )
{
g_EventQueue.AddEvent( pCaller, STRING(ev->m_iTargetInput), ValueOverride, ev->m_flDelay, pActivator, pCaller, ev->m_iIDStamp );
}
else
g_EventQueue.AddEvent( STRING(ev->m_iTarget), STRING(ev->m_iTargetInput), ValueOverride, ev->m_flDelay, pActivator, pCaller, ev->m_iIDStamp );
g_EventQueue.AddEvent( STRING(ev->m_iTarget), STRING(ev->m_iTargetInput), ValueOverride, ev->m_flDelay, pActivator, pCaller, ev->m_iIDStamp );
}

if ( ev->m_flDelay )
Expand Down
2 changes: 0 additions & 2 deletions mp/src/game/server/triggers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ class CBaseTrigger : public CBaseToggle
virtual void EndTouchAll() {}
bool IsTouching( CBaseEntity *pOther );

virtual Class_T Classify() { return CLASS_TRIGGER; }

CBaseEntity *GetTouchedEntityOfType( const char *sClassName );

int DrawDebugTextOverlays(void);
Expand Down