diff --git a/scripts/_00E_CombatMusicControl.pex b/scripts/_00E_CombatMusicControl.pex index 97ea8b43..b4e10423 100644 Binary files a/scripts/_00E_CombatMusicControl.pex and b/scripts/_00E_CombatMusicControl.pex differ 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