Skip to content

Commit 04f7e03

Browse files
fix: ft build
1 parent b8a13f6 commit 04f7e03

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

Code/client/Games/References.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -456,15 +456,6 @@ void TESObjectREFR::Enable() const noexcept
456456
s_pEnable(this, true);
457457
}
458458

459-
uint32_t TESObjectREFR::GetAnimationVariableInt(BSFixedString* apVariableName) noexcept
460-
{
461-
using ObjectReference = TESObjectREFR;
462-
463-
PAPYRUS_FUNCTION(uint32_t, ObjectReference, GetAnimationVariableInt, BSFixedString*);
464-
465-
return s_pGetAnimationVariableInt(this, apVariableName);
466-
}
467-
468459
// Skyrim: MoveTo() can fail, causing the object to be deleted
469460
void TESObjectREFR::MoveTo(TESObjectCELL* apCell, const NiPoint3& acPosition) const noexcept
470461
{
@@ -855,12 +846,6 @@ void Actor::StopCombat() noexcept
855846
s_pStopCombat(this);
856847
}
857848

858-
bool Actor::PlayIdle(TESIdleForm* apIdle) noexcept
859-
{
860-
PAPYRUS_FUNCTION(bool, Actor, PlayIdle, TESIdleForm*);
861-
return s_pPlayIdle(this, apIdle);
862-
}
863-
864849
bool Actor::HasPerk(uint32_t aPerkFormId) const noexcept
865850
{
866851
return GetPerkRank(aPerkFormId) != 0;

Code/client/Games/Skyrim/Actor.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,12 @@ void Actor::Reset() noexcept
580580
s_pReset(this, 0, nullptr);
581581
}
582582

583+
bool Actor::PlayIdle(TESIdleForm* apIdle) noexcept
584+
{
585+
PAPYRUS_FUNCTION(bool, Actor, PlayIdle, TESIdleForm*);
586+
return s_pPlayIdle(this, apIdle);
587+
}
588+
583589
void Actor::Respawn() noexcept
584590
{
585591
Resurrect(false);

Code/client/Games/Skyrim/TESObjectREFR.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,15 @@ void TESObjectREFR::EnableImpl() noexcept
536536
TiltedPhoques::ThisCall(s_enable, this, false);
537537
}
538538

539+
uint32_t TESObjectREFR::GetAnimationVariableInt(BSFixedString* apVariableName) noexcept
540+
{
541+
using ObjectReference = TESObjectREFR;
542+
543+
PAPYRUS_FUNCTION(uint32_t, ObjectReference, GetAnimationVariableInt, BSFixedString*);
544+
545+
return s_pGetAnimationVariableInt(this, apVariableName);
546+
}
547+
539548
static thread_local bool s_cancelAnimationWaitEvent = false;
540549

541550
bool TESObjectREFR::PlayAnimationAndWait(BSFixedString* apAnimation, BSFixedString* apEventName) noexcept

Code/client/Services/Generic/CharacterService.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,8 +1529,10 @@ void CharacterService::RunRemoteUpdates() noexcept
15291529
if (pActor->IsDead() != waitingFor3D.SpawnRequest.IsDead)
15301530
waitingFor3D.SpawnRequest.IsDead ? pActor->Kill() : pActor->Respawn();
15311531

1532+
#if TP_SKYRIM64
15321533
if (pActor->IsVampireLord())
15331534
pActor->FixVampireLordModel();
1535+
#endif
15341536

15351537
toRemove.push_back(entity);
15361538

Code/client/Services/Generic/PlayerService.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ void PlayerService::RunLevelUpdates() const noexcept
359359

360360
void PlayerService::RunBeastFormDetection() const noexcept
361361
{
362+
#if TP_SKYRIM64
362363
static uint32_t lastRaceFormID = 0;
363364
static std::chrono::steady_clock::time_point lastSendTimePoint;
364365
constexpr auto cDelayBetweenUpdates = 250ms;
@@ -380,6 +381,7 @@ void PlayerService::RunBeastFormDetection() const noexcept
380381
m_world.GetDispatcher().trigger(BeastFormChangeEvent());
381382

382383
lastRaceFormID = pPlayer->race->formID;
384+
#endif
383385
}
384386

385387
void PlayerService::ToggleDeathSystem(bool aSet) noexcept

0 commit comments

Comments
 (0)