Skip to content

Commit 48729e5

Browse files
committed
Revert "Partial support for Remote actors to run AI packages when in-Scene"
This reverts commit f9f57cd.
1 parent 22be126 commit 48729e5

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

Code/client/Games/Animation.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include <Forms/BGSAction.h>
66
#include <Forms/TESIdleForm.h>
7-
#include <Forms/TESQuest.h>
87

98
#include <Structs/ActionEvent.h>
109

@@ -28,14 +27,9 @@ uint8_t TP_MAKE_THISCALL(HookPerformAction, ActorMediator, TESActionData* apActi
2827
{
2928
auto pActor = apAction->actor;
3029
const auto pExtension = pActor->GetExtension();
31-
const auto pScene = pActor->GetCurrentScene();
32-
const bool isPlaying = pScene && pScene->isPlaying;
3330

34-
if (pExtension->IsLocal() || isPlaying || g_forceAnimation)
31+
if (!pExtension->IsRemote() || g_forceAnimation)
3532
{
36-
if (pExtension->IsRemote())
37-
spdlog::warn(__FUNCTION__ ": performing actions for remote Actor formId {:X}, name {}", pActor->formID, pActor->baseForm->GetName());
38-
3933
ActionEvent action;
4034
action.State1 = pActor->actorState.flags1;
4135
action.State2 = pActor->actorState.flags2;

Code/client/Games/Skyrim/Actor.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,16 +1267,11 @@ void Actor::SpeakSound(const char* pFile)
12671267

12681268
char TP_MAKE_THISCALL(HookActorProcess, Actor, float a2)
12691269
{
1270-
// Don't process AI unless we own the actor, or they are playing Scene packages
1271-
const auto pScene = apThis->GetCurrentScene();
1272-
const auto isPlaying = pScene && pScene->isPlaying;
1270+
// Don't process AI if we own the actor
12731271

1274-
if (apThis->GetExtension()->IsRemote() && !isPlaying)
1272+
if (apThis->GetExtension()->IsRemote())
12751273
return 0;
12761274

1277-
if (apThis->GetExtension()->IsRemote() && isPlaying)
1278-
spdlog::warn(__FUNCTION__ ": enabling for remote Actor in Scene formId {:X}, name {}", apThis->formID, apThis->baseForm->GetName());
1279-
12801275
return TiltedPhoques::ThisCall(RealActorProcess, apThis, a2);
12811276
}
12821277

0 commit comments

Comments
 (0)