Applied feedback from PR

Signed-off-by: Luis Sempé <[email protected]>
o3de · Dec 8, 2024 · b141d3c · b141d3c
1 parent 097adfb
commit b141d3c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 26 deletions.
diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
@@ -517,7 +517,9 @@ void CGameEngine::SwitchToInGame()
 
     if (movieSystem)
     {
-        movieSystem->Reset(true, false);
+        constexpr bool playOnReset = true;
+        constexpr bool seekToStart = false;
+        movieSystem->Reset(playOnReset, seekToStart);
     }
 
     // Transition to runtime entity context.
@@ -548,7 +550,9 @@ void CGameEngine::SwitchToInEditor()
         {
             movieSystem->GetPlayingSequence(i)->Deactivate();
         }
-        movieSystem->Reset(false, false);
+        constexpr bool playOnReset = false;
+        constexpr bool seekToStart = false;
+        movieSystem->Reset(playOnReset, seekToStart);
     }
 
     CViewport* pGameViewport = GetIEditor()->GetViewManager()->GetGameViewport();

diff --git a/Code/Editor/SelectLightAnimationDialog.cpp b/Code/Editor/SelectLightAnimationDialog.cpp
@@ -37,30 +37,31 @@ void CSelectLightAnimationDialog::GetItems(std::vector<SItem>& outItems)
 {
     IMovieSystem* movieSystem = nullptr;
     Maestro::MovieSystemRequestBus::BroadcastResult(movieSystem, &Maestro::MovieSystemRequestBus::Events::GetMovieSystem);
+    if (!movieSystem)
+    {
+        return;
+    }
 
-    if (movieSystem)
+    for (int i = 0; i < movieSystem->GetNumSequences(); ++i)
     {
-        for (int i = 0; i < movieSystem->GetNumSequences(); ++i)
+        IAnimSequence* pSequence = movieSystem->GetSequence(i);
+        if ((pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet) == 0)
         {
-            IAnimSequence* pSequence = movieSystem->GetSequence(i);
-            if ((pSequence->GetFlags() & IAnimSequence::eSeqFlags_LightAnimationSet) == 0)
-            {
-                continue;
-            }
+            continue;
+        }
 
-            for (int k = 0; k < pSequence->GetNodeCount(); ++k)
+        for (int k = 0; k < pSequence->GetNodeCount(); ++k)
+        {
+            assert(pSequence->GetNode(k)->GetType() == AnimNodeType::Light);
+            if (pSequence->GetNode(k)->GetType() != AnimNodeType::Light)
             {
-                assert(pSequence->GetNode(k)->GetType() == AnimNodeType::Light);
-                if (pSequence->GetNode(k)->GetType() != AnimNodeType::Light)
-                {
-                    continue;
-                }
-                SItem item;
-                item.name = pSequence->GetNode(k)->GetName();
-                outItems.push_back(item);
+                continue;
             }
-            return;
+            SItem item;
+            item.name = pSequence->GetNode(k)->GetName();
+            outItems.push_back(item);
         }
+        return;
     }
 }
 

diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
@@ -541,7 +541,9 @@ ILevel* CLevelSystem::LoadLevelInternal(const char* _levelName)
         if (movieSystem)
         {
             // bSeekAllToStart needs to be false here as it's only of interest in the editor
-            movieSystem->Reset(true, false);
+            constexpr bool playOnReset = true;
+            constexpr bool seekToStart = false;
+            movieSystem->Reset(playOnReset, seekToStart);
         }
 
         gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE);
@@ -781,7 +783,9 @@ void CLevelSystem::UnloadLevel()
 
     if (movieSystem)
     {
-        movieSystem->Reset(false, false);
+        constexpr bool playOnReset = false;
+        constexpr bool seekToStart = false;
+        movieSystem->Reset(playOnReset, seekToStart);
         movieSystem->RemoveAllSequences();
     }
 

diff --git a/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
@@ -342,7 +342,9 @@ namespace LegacyLevelSystem
             if (movieSystem)
             {
                 // bSeekAllToStart needs to be false here as it's only of interest in the editor
-                movieSystem->Reset(true, false);
+                constexpr bool playOnReset = true;
+                constexpr bool seekToStart = false;
+                movieSystem->Reset(playOnReset, seekToStart);
             }
 
             gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PRECACHE);
@@ -587,7 +589,9 @@ namespace LegacyLevelSystem
 
         if (movieSystem)
         {
-            movieSystem->Reset(false, false);
+            constexpr bool playOnReset = false;
+            constexpr bool seekToStart = false;
+            movieSystem->Reset(playOnReset, seekToStart);
             movieSystem->RemoveAllSequences();
         }
 

diff --git a/Gems/Maestro/Code/Source/Components/SequenceComponent.h b/Gems/Maestro/Code/Source/Components/SequenceComponent.h
@@ -6,7 +6,6 @@
  *
  */
 #pragma once
-//#include <IMovieSystem.h>
 
 #include <AzCore/Component/Component.h>
 #include <Maestro/Bus/SequenceComponentBus.h>

diff --git a/Gems/Maestro/Code/Source/MaestroSystemComponent.cpp b/Gems/Maestro/Code/Source/MaestroSystemComponent.cpp
@@ -102,15 +102,13 @@ namespace Maestro
     {
         if (!startupParams.bSkipMovie)
         {
-            // Create the movie System
             m_movieSystem.reset(new CMovieSystem(&system));
         }
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
     void MaestroSystemComponent::OnCrySystemShutdown([[maybe_unused]] ISystem& system)
     {
-        // delete m_movieSystem
         m_movieSystem.reset();
     }
 }