From d1549e28b8985eb95c00932c1e20f4adb0abea54 Mon Sep 17 00:00:00 2001 From: YoYo178 Date: Sun, 30 Jun 2024 20:37:18 +0530 Subject: [PATCH 1/2] Revert cbase --- mp/src/game/server/cbase.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mp/src/game/server/cbase.cpp b/mp/src/game/server/cbase.cpp index 4d653987..bf23baca 100644 --- a/mp/src/game/server/cbase.cpp +++ b/mp/src/game/server/cbase.cpp @@ -285,11 +285,8 @@ 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 ) ) - { + if ( pCaller->Classify() == CLASS_TRIGGER && 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 ); } @@ -301,11 +298,8 @@ 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 ) ) - { + if ( pCaller->Classify() == CLASS_TRIGGER && 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 ); } From 0dfa204ccd0b0e01e40b13c55b25e8704beccb6f Mon Sep 17 00:00:00 2001 From: YoYo178 Date: Sun, 30 Jun 2024 20:38:06 +0530 Subject: [PATCH 2/2] Revert fix #34 --- mp/src/game/server/baseentity.h | 1 - mp/src/game/server/cbase.cpp | 11 ++--------- mp/src/game/server/triggers.h | 2 -- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/mp/src/game/server/baseentity.h b/mp/src/game/server/baseentity.h index 9b8de384..e344d78e 100644 --- a/mp/src/game/server/baseentity.h +++ b/mp/src/game/server/baseentity.h @@ -226,7 +226,6 @@ enum Class_T CLASS_TURRET, CLASS_BACKPACK, CLASS_INFOSCRIPT, - CLASS_TRIGGER, CLASS_TRIGGERSCRIPT, CLASS_TRIGGER_CLIP, CLASS_TEAMSPAWN, diff --git a/mp/src/game/server/cbase.cpp b/mp/src/game/server/cbase.cpp index bf23baca..8cfdd83c 100644 --- a/mp/src/game/server/cbase.cpp +++ b/mp/src/game/server/cbase.cpp @@ -285,10 +285,7 @@ void CBaseEntityOutput::FireOutput(variant_t Value, CBaseEntity *pActivator, CBa // // Post the event with the default parameter. // - if ( pCaller->Classify() == CLASS_TRIGGER && 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 { @@ -297,11 +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->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 ) diff --git a/mp/src/game/server/triggers.h b/mp/src/game/server/triggers.h index c8f2fe72..b02f26bd 100644 --- a/mp/src/game/server/triggers.h +++ b/mp/src/game/server/triggers.h @@ -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);