diff --git a/source/Enderal DLL/src/EventListener.cpp b/source/Enderal DLL/src/EventListener.cpp index eb8a3910..0291cf5b 100644 --- a/source/Enderal DLL/src/EventListener.cpp +++ b/source/Enderal DLL/src/EventListener.cpp @@ -126,7 +126,7 @@ auto EventListener::ProcessEvent( const RE::BGSListForm* formList = dataHandler ? dataHandler->LookupForm(0x44EE4, "Skyrim.esm") : nullptr; if (formList && formList->HasForm(spellFormID)) { - SKSE::ModCallbackEvent modEvent{ "Enderal_UnlockSpellHit", "", spellFormID, containerRef }; + SKSE::ModCallbackEvent modEvent{ "Enderal_UnlockSpellHit", "", (float)spellFormID, containerRef }; SKSE::GetModCallbackEventSource()->SendEvent(&modEvent); } } diff --git a/source/Enderal DLL/src/Patches/AchievementFix.h b/source/Enderal DLL/src/Patches/AchievementFix.h index 6ed989a3..b732215e 100644 --- a/source/Enderal DLL/src/Patches/AchievementFix.h +++ b/source/Enderal DLL/src/Patches/AchievementFix.h @@ -9,7 +9,7 @@ namespace AchievementFix if (REL::Module::IsVR()) { target = REL::Offset(0x17FB90); } else if (REL::Module::get().version() >= REL::Version(1, 6, 1130, 0)) { - // Checked: 1.6.1130 + // Checked: 1.6.1130, 1.6.1170, 1.6.1179 target = REL::ID(441528); } else { // Checked: 1.5.97, 1.6.640, 1.6.659 diff --git a/source/Enderal DLL/src/Patches/BinkInterruptPatch.h b/source/Enderal DLL/src/Patches/BinkInterruptPatch.h index 0a6b1ad6..41e91a3b 100644 --- a/source/Enderal DLL/src/Patches/BinkInterruptPatch.h +++ b/source/Enderal DLL/src/Patches/BinkInterruptPatch.h @@ -35,7 +35,7 @@ namespace BinkInterruptPatch void Install() { - // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130 + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation target{ REL::RelocationID(87890, 90259), REL::Relocate(0x22, 0x21) }; SKSE::AllocTrampoline(14); BinkListener::func = SKSE::GetTrampoline().write_call<5>(target.address(), BinkListener::thunk); diff --git a/source/Enderal DLL/src/Patches/DialogueMenuPatch.h b/source/Enderal DLL/src/Patches/DialogueMenuPatch.h index 1a5458c9..4c19fa1f 100644 --- a/source/Enderal DLL/src/Patches/DialogueMenuPatch.h +++ b/source/Enderal DLL/src/Patches/DialogueMenuPatch.h @@ -45,7 +45,7 @@ private: void static OpenJournal(bool a_bool) { using func_t = decltype(&OpenJournal); - // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130 + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation func{ REL::VariantID(52428, 53327, 0x92F0F0) }; func(a_bool); } diff --git a/source/Enderal DLL/src/Patches/FlatMapMarkers.h b/source/Enderal DLL/src/Patches/FlatMapMarkers.h index eb218c41..8e189148 100644 --- a/source/Enderal DLL/src/Patches/FlatMapMarkers.h +++ b/source/Enderal DLL/src/Patches/FlatMapMarkers.h @@ -12,7 +12,7 @@ namespace FlatMapMarkers inline void Install() { - // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130 + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation offset{ REL::RelocationID(52224, 53111), REL::Relocate(0x22F, 0x21F) }; SKSE::AllocTrampoline(14); SKSE::GetTrampoline().write_call<5>(offset.address(), &Hook_WorldPtToScreenPt3); diff --git a/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp b/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp index 2092069e..68433044 100644 --- a/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp +++ b/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp @@ -32,7 +32,7 @@ void HeroMenuPatch::Install() } // Patch the Quick Stats hotkey to open the menu - // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130 + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation target{ REL::RelocationID(51400, 52249), REL::Relocate(0x41E, 0x421) }; REL::safe_fill(target.address(), REL::NOP, 45); diff --git a/source/Enderal DLL/src/Patches/MapMarkerPlacement.h b/source/Enderal DLL/src/Patches/MapMarkerPlacement.h index 100b2589..d2269b8f 100644 --- a/source/Enderal DLL/src/Patches/MapMarkerPlacement.h +++ b/source/Enderal DLL/src/Patches/MapMarkerPlacement.h @@ -21,7 +21,7 @@ namespace MapMarkerPlacement void InstallPlacementDiscoveredFix() { // Place a marker, if a location has been discovered and fast travel is disabled - // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130 + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation target{ REL::RelocationID(52208, 53095), REL::Relocate(0x2C5, 0x328, 0x358) }; SKSE::AllocTrampoline(14); IsFastTravelEnabled::func = SKSE::GetTrampoline().write_call<5>(target.address(), IsFastTravelEnabled::thunk); @@ -32,7 +32,7 @@ namespace MapMarkerPlacement void InstallPlacementUndiscoveredFix() { // Place a marker without asking, if a location isn't discovered yet - // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130 + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation target2{ REL::RelocationID(52208, 53095), REL::Relocate(0x17A, 0x183) }; std::uint8_t code[] = { 0xB0, 0x01, REL::NOP, REL::NOP, REL::NOP }; // mov al,0x1 REL::safe_write(target2.address(), code, sizeof(code)); diff --git a/source/Enderal DLL/src/Patches/TweenMenuPatch.h b/source/Enderal DLL/src/Patches/TweenMenuPatch.h index 63e46582..95c908b6 100644 --- a/source/Enderal DLL/src/Patches/TweenMenuPatch.h +++ b/source/Enderal DLL/src/Patches/TweenMenuPatch.h @@ -11,7 +11,7 @@ private: static void OpenMenu(RE::IMenu* tweenMenu, std::int32_t index) { using func_t = decltype(&OpenMenu); - // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130 + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation func{ REL::VariantID(51845, 52718, 0x8FE7E0) }; return func(tweenMenu, index); } diff --git a/source/Enderal DLL/src/Util.h b/source/Enderal DLL/src/Util.h index 94c24803..da8354dd 100644 --- a/source/Enderal DLL/src/Util.h +++ b/source/Enderal DLL/src/Util.h @@ -180,6 +180,7 @@ inline void CloseTweenMenu() { if (RE::UI::GetSingleton()->IsMenuOpen(RE::TweenMenu::MENU_NAME)) { using func_t = decltype(&CloseTweenMenu); + // Checked: 1.5.97, 1.6.640, 1.6.659, 1.6.1130, 1.6.1170, 1.6.1179 REL::Relocation func{ REL::VariantID(51839, 52711, 0x8FE180) }; func(); }