From 2a551af37a4bdd2643d5a5f9616d8906d8aa28cc Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Wed, 31 Jan 2024 08:59:16 +0100 Subject: [PATCH] Disabled combat event listener --- scripts/_00E_CombatMusicControl.pex | Bin 6125 -> 6129 bytes source/Enderal DLL/src/EventListener.cpp | 4 +++- source/Enderal DLL/src/EventListener.h | 4 +++- source/scripts/_00E_CombatMusicControl.psc | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/_00E_CombatMusicControl.pex b/scripts/_00E_CombatMusicControl.pex index 97ea8b4323387f26f7bc6fdbcefc8cb18268cf4f..b4e10423d6060b4969f6e42a9477ff73e69fdddc 100644 GIT binary patch literal 6129 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 LGqb3_F0B6m*`gb% literal 6125 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 diff --git a/source/Enderal DLL/src/EventListener.cpp b/source/Enderal DLL/src/EventListener.cpp index 5ca31a7a..eb8a3910 100644 --- a/source/Enderal DLL/src/EventListener.cpp +++ b/source/Enderal DLL/src/EventListener.cpp @@ -12,7 +12,7 @@ void EventListener::Install() //RE::ScriptEventSourceHolder::GetSingleton()->AddEventSink(EventListener::GetSingleton()); RE::UI::GetSingleton()->AddEventSink(EventListener::GetSingleton()); SKSE::GetModCallbackEventSource()->AddEventSink(EventListener::GetSingleton()); - RE::ScriptEventSourceHolder::GetSingleton()->GetEventSource()->AddEventSink(EventListener::GetSingleton()); + //RE::ScriptEventSourceHolder::GetSingleton()->GetEventSource()->AddEventSink(EventListener::GetSingleton()); RE::ScriptEventSourceHolder::GetSingleton()->GetEventSource()->AddEventSink(EventListener::GetSingleton()); } @@ -78,6 +78,7 @@ auto EventListener::ProcessEvent( return RE::BSEventNotifyControl::kContinue; } +/* auto EventListener::ProcessEvent( const RE::TESCombatEvent* a_event, RE::BSTEventSource* a_eventSource) @@ -100,6 +101,7 @@ auto EventListener::ProcessEvent( return RE::BSEventNotifyControl::kContinue; } +*/ auto EventListener::ProcessEvent( const RE::TESHitEvent* a_event, diff --git a/source/Enderal DLL/src/EventListener.h b/source/Enderal DLL/src/EventListener.h index f69c5d0c..6de877d2 100644 --- a/source/Enderal DLL/src/EventListener.h +++ b/source/Enderal DLL/src/EventListener.h @@ -10,7 +10,7 @@ class EventListener : public RE::BSTEventSink, public RE::BSTEventSink, public RE::BSTEventSink, - public RE::BSTEventSink, + //public RE::BSTEventSink, public RE::BSTEventSink { public: @@ -43,10 +43,12 @@ public: RE::BSTEventSource* a_eventSource) -> RE::BSEventNotifyControl override; + /* auto ProcessEvent( const RE::TESCombatEvent* a_event, RE::BSTEventSource* a_eventSource) -> RE::BSEventNotifyControl override; + */ auto ProcessEvent( const RE::TESHitEvent* a_event, diff --git a/source/scripts/_00E_CombatMusicControl.psc b/source/scripts/_00E_CombatMusicControl.psc index e2772269..9d6f561c 100644 --- a/source/scripts/_00E_CombatMusicControl.psc +++ b/source/scripts/_00E_CombatMusicControl.psc @@ -42,6 +42,7 @@ event OnUpdate() endevent Event OnCombatStateChange(string eventName, string bTargetIsPlayer, float fCombatState, Form sender) + return if bTargetIsPlayer ; start combat or searching if fCombatState as int == 1 ; combat if bIsBrawling