diff --git a/SKSE/Plugins/EnderalSE.dll b/SKSE/Plugins/EnderalSE.dll index b2b89cd1..77d83cb7 100644 --- a/SKSE/Plugins/EnderalSE.dll +++ b/SKSE/Plugins/EnderalSE.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c9deb25824e1a2f8e0ed301d522f5778dcced112a9a5650e1278138b5fda889 +oid sha256:7c3f64719f244c37e335b2029182b51bea05957a1636d1dedf7bf5a854403de6 size 751616 diff --git a/scripts/_00E_AffinityControl.pex b/scripts/_00E_AffinityControl.pex index 0c90c643..d2fb203b 100644 Binary files a/scripts/_00E_AffinityControl.pex and b/scripts/_00E_AffinityControl.pex differ diff --git a/scripts/enderalfunctions.pex b/scripts/enderalfunctions.pex index 105b5ca8..289e1f89 100644 Binary files a/scripts/enderalfunctions.pex and b/scripts/enderalfunctions.pex differ diff --git a/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp b/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp index 990ee0f2..00428ec7 100644 --- a/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp +++ b/source/Enderal DLL/src/Patches/HeroMenuPatch.cpp @@ -100,7 +100,7 @@ void HeroMenuPatch::FillMenuValues() uiMovie->Invoke("heromenu_mc.SetStringValues", nullptr, args, 2); RE::BSTSmartPointer stackCallback{ new ScriptClassNameCallback }; - RE::BSScript::Internal::VirtualMachine::GetSingleton()->DispatchStaticCall("_00E_AffinityControl", "GetPlayerClassNameGlobal", RE::MakeFunctionArguments(), stackCallback); + RE::BSScript::Internal::VirtualMachine::GetSingleton()->DispatchStaticCall("EnderalFunctions", "GetPlayerClassNameGlobal", RE::MakeFunctionArguments(), stackCallback); RE::GFxValue args2[33]; args2[0].SetNumber(playerAV->GetBaseActorValue(RE::ActorValue::kHealth)); diff --git a/source/scripts/_00E_AffinityControl.psc b/source/scripts/_00E_AffinityControl.psc index 82356f97..5f3f1495 100644 --- a/source/scripts/_00E_AffinityControl.psc +++ b/source/scripts/_00E_AffinityControl.psc @@ -464,12 +464,6 @@ String Function GetPlayerClassName() EndIf EndFunction -String Function GetPlayerClassNameGlobal() Global -{Called by EnderalSE.dll} - Quest AffinityQuest = Game.GetFormFromFile(0x1597B, "Enderal - Forgotten Stories.esm") as Quest; - return (AffinityQuest.GetAlias(0) as _00E_AffinityControl).GetPlayerClassName() -endfunction - ;===================================================================================== ; PROPERTIES diff --git a/source/scripts/enderalfunctions.psc b/source/scripts/enderalfunctions.psc index 541fb41d..e10a564c 100644 --- a/source/scripts/enderalfunctions.psc +++ b/source/scripts/enderalfunctions.psc @@ -29,3 +29,9 @@ bool function IsDLLLoaded() global int iVer = SKSE.GetPluginVersion("EnderalSE") return iVer > 0 endfunction + +String Function GetPlayerClassNameGlobal() Global +{Called by EnderalSE.dll} + Quest AffinityQuest = Game.GetFormFromFile(0x1597B, "Enderal - Forgotten Stories.esm") as Quest + return (AffinityQuest.GetAlias(0) as _00E_AffinityControl).GetPlayerClassName() +endfunction