tweak: disable temp base form spawning system

tiltedphoques · May 6, 2022 · 2907b92 · 2907b92
1 parent 7dc48a1
commit 2907b92
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Code/client/Games/References.cpp b/Code/client/Games/References.cpp
@@ -714,8 +714,10 @@ bool TP_MAKE_THISCALL(HookSpeakSoundFunction, Actor, const char* apName, uint32_
     spdlog::debug("a3: {:X}, a4: {}, a5: {}, a6: {}, a7: {}, a8: {:X}, a9: {:X}, a10: {}, a11: {:X}, a12: {}, a13: {}, a14: {}",
                   (uint64_t)a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14);
 
+    /*
     if (apThis->GetExtension()->IsLocal())
         World::Get().GetRunner().Trigger(DialogueEvent(apThis->formID, apName));
+    */
 
     return ThisCall(RealSpeakSoundFunction, apThis, apName, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14);
 }

diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -1191,7 +1191,7 @@ void CharacterService::RequestServerAssignment(const entt::entity aEntity) const
     message.IsDead = pActor->IsDead();
     message.IsWeaponDrawn = pActor->actorState.IsWeaponFullyDrawn();
 
-    if (isTemporary && !isNpcTemporary)
+    if (isTemporary /* && !isNpcTemporary */)
     {
         if (!m_world.GetModSystem().GetServerModId(pNpc->formID, message.FormId))
         {

diff --git a/Code/client/Services/Generic/MagicService.cpp b/Code/client/Services/Generic/MagicService.cpp
@@ -200,7 +200,6 @@ void MagicService::OnNotifySpellCast(const NotifySpellCast& acMessage) const noe
                 pDesiredTargetForm = TESForm::GetById(formIdComponent.Id);
             }
         }
-
     }
 
     TESObjectREFR* pDesiredTarget = Cast<TESObjectREFR>(pDesiredTargetForm);
@@ -244,6 +243,9 @@ void MagicService::OnInterruptCastEvent(const InterruptCastEvent& acEvent) const
 
     InterruptCastRequest request;
     request.CasterId = localComponent.Id;
+
+    spdlog::debug("Sending out interrupt cast");
+
     m_transport.Send(request);
 #endif
 }