Experiment: don't block sending updates when in-scene, just block accepting rewinds

Author: rfortier

Code/client/Services/Generic/QuestService.cpp

@@ -88,11 +88,11 @@ BSTEventResult QuestService::OnEvent(const TESQuestStartStopEvent* apEvent, cons
 
 
     spdlog::info(__FUNCTION__ ":  quest {} formId: {:X}, questStage: {}, questType: {}, name: {}",
-                    pQuest->IsStopped() ? "stopped" : "started", 
-                    pQuest->formID,
-                    pQuest->currentStage, 
-                    static_cast<std::underlying_type_t<TESQuest::Type>>(pQuest->type),
-                    pQuest->fullName.value.AsAscii());
+                 pQuest->IsStopped() ? "stopped" : "started", 
+                 pQuest->formID,
+                 pQuest->currentStage, 
+                 static_cast<std::underlying_type_t<TESQuest::Type>>(pQuest->type),
+                 pQuest->fullName.value.AsAscii());
 
     m_world.GetRunner().Queue([&, formId = pQuest->formID, stageId = pQuest->currentStage,
                                 stopped = pQuest->IsStopped(), type = pQuest->type]()
@@ -137,22 +137,6 @@ BSTEventResult QuestService::OnEvent(const TESQuestStageEvent* apEvent, const Ev
     if (IsNonSyncableQuest(pQuest))
         return BSTEventResult::kOk;
 
-    // Party leaders can always advance quests. Members can only advance quest stages when their controls are enabled
-    // This prevents party members from interfering with cutscenes (which almost always freeze players,
-    // and almost always end with a quest stage advance which can catch things up)
-    const bool canAdvanceQuestStages =
-        m_world.Get().GetPartyService().IsLeader() || PlayerControls::IsMovementControlsEnabled();
-
-    if (!canAdvanceQuestStages)
-    {
-        spdlog::info(__FUNCTION__ ": quest update by member blocked while player controls disabled, "
-                                  "quest gameId {:X} questStage {} questType {} formId {:X}, name {}",
-                                  Id.LogFormat(), pQuest->currentStage,
-                                  static_cast<std::underlying_type_t<TESQuest::Type>>(pQuest->type),
-                                  pQuest->formID, pQuest->fullName.value.AsAscii());
-        return BSTEventResult::kOk;
-    }
-
     if (pQuest->type == TESQuest::Type::None || pQuest->type == TESQuest::Type::Miscellaneous)
     {
         spdlog::info(__FUNCTION__ ": queuing type none/misc quest update gameId {:X} questStage {} "
@@ -162,7 +146,6 @@ BSTEventResult QuestService::OnEvent(const TESQuestStageEvent* apEvent, const Ev
                                   pQuest->fullName.value.AsAscii());
     }
 
-
     spdlog::info(__FUNCTION__ ":  quest updated formId: {:X}, questStage: {}, questType: {}, name: {}",
                     pQuest->formID, pQuest->currentStage, static_cast<std::underlying_type_t<TESQuest::Type>>(pQuest->type), pQuest->fullName.value.AsAscii());
 
@@ -203,8 +186,20 @@ void QuestService::OnQuestUpdate(const NotifyQuestUpdate& aUpdate) noexcept
                      aUpdate.ClientQuestType, formId, pQuest->fullName.value.AsAscii());
     }
 
+    // Don't accept decreases in quest stage while playing a scene. This can abosolutely happen 
+    // as Members & Leader desync while stepping through complex long-running scenes. Disabling 
+    // because we're in a Scene that generate its own quest stage changes, and presumably the 
+    // scene is playing for all members. When they aren't perfectly in sync or due to network
+    // delays you can receive an earlier stage from the leader that just took a while to get here.
     bool bResult = false;
     bool bRunning = pQuest->getState() == TESQuest::State::Running;
+    if (bRunning && aUpdate.Status != NotifyQuestUpdate::Stopped && aUpdate.Stage < pQuest->currentStage && !PlayerControls::IsMovementControlsEnabled())
+    {
+        spdlog::info(__FUNCTION__ ": suppressing quest stage rewind while playing a scene gameId: {:X}, questStage: {}, questStatus: {}, questType: {}, formId: {:X}, name: {}",
+                     aUpdate.Id.LogFormat(), aUpdate.Stage, aUpdate.Status, aUpdate.ClientQuestType, formId, pQuest->fullName.value.AsAscii());
+        return;
+    }
+
     switch (aUpdate.Status)
     {
     case NotifyQuestUpdate::Started: