Skip to content

Commit 4919e69

Browse files
committed
Reenable kill moves if any of a whitelist of mods that actually fix them so they don't break STR is loaded.
Right now there is only one in the list for testing.
1 parent 24465cc commit 4919e69

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

Diff for: Code/client/Services/Generic/PlayerService.cpp

+14-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <PlayerCharacter.h>
2727
#include <Forms/TESObjectCELL.h>
2828
#include <Forms/TESGlobal.h>
29+
#include <Games/TES.h>
2930
#include <Games/Overrides.h>
3031
#include <Games/References.h>
3132
#include <AI/AIProcess.h>
@@ -61,9 +62,21 @@ void PlayerService::OnUpdate(const UpdateEvent& acEvent) noexcept
6162

6263
void PlayerService::OnConnected(const ConnectedEvent& acEvent) noexcept
6364
{
65+
// Kill moves disallowed because they are broken. But, if they have been fixed?
66+
bool killMoves = false;
67+
auto& modlist = ModManager::Get()->mods;
68+
const TiltedPhoques::Vector<TiltedPhoques::String> killMoveFixList = {"EVE - KillMove Fixes.esp"};
69+
70+
for (const auto& mod : modlist)
71+
{
72+
if (killMoves = (killMoves || std::find(killMoveFixList.begin(), killMoveFixList.end(), mod->filename) != killMoveFixList.end()))
73+
break;
74+
}
75+
6476
// TODO: SkyrimTogether.esm
6577
TESGlobal* pKillMove = Cast<TESGlobal>(TESForm::GetById(0x100F19));
66-
pKillMove->f = 0.f;
78+
// Possibly reenabled for compatibility testing with new mods.
79+
pKillMove->f = killMoves ? 1.f : 0.f;
6780

6881
TESGlobal* pWorldEncountersEnabled = Cast<TESGlobal>(TESForm::GetById(0xB8EC1));
6982
pWorldEncountersEnabled->f = 0.f;

0 commit comments

Comments
 (0)