Advertisement
vladislavbelov

CCmpCinemaManager fix

Jan 20th, 2016
80
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.52 KB | None | 0 0
  1. Index: source/simulation2/components/CCmpCinemaManager.cpp
  2. ===================================================================
  3. --- source/simulation2/components/CCmpCinemaManager.cpp (revision 17597)
  4. +++ source/simulation2/components/CCmpCinemaManager.cpp (working copy)
  5. @@ -58,10 +58,7 @@
  6.     virtual void Serialize(ISerializer& serialize)
  7.     {
  8.         if (!g_Game || !g_Game->GetView())
  9. -       {
  10. -           LOGERROR("Trying to serialize cinematics when GameView isn't initialized!");
  11.             return;
  12. -       }
  13.         CinematicSimulationData* p_CinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
  14.         serialize.Bool("MapRevealed", p_CinematicSimulationData->m_MapRevealed);
  15.         serialize.NumberU32_Unbounded("NumberOfPaths", p_CinematicSimulationData->m_Paths.size());
  16. @@ -116,10 +113,7 @@
  17.     virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
  18.     {
  19.         if (!g_Game || !g_Game->GetView())
  20. -       {
  21. -           LOGERROR("Trying to deserialize cinematics when GameView isn't initialized!");
  22.             return;
  23. -       }
  24.         CinematicSimulationData* p_CinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
  25.         deserialize.Bool("MapRevealed", p_CinematicSimulationData->m_MapRevealed);
  26.         uint32_t numberOfPaths = 0;
  27. @@ -180,6 +174,8 @@
  28.  
  29.     virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
  30.     {
  31. +       if (!g_Game || !g_Game->GetView())
  32. +           return;
  33.         switch (msg.GetType())
  34.         {
  35.         case MT_Update:
  36. @@ -217,10 +213,7 @@
  37.     virtual void AddCinemaPathToQueue(CStrW name)
  38.     {
  39.         if (!g_Game || !g_Game->GetView())
  40. -       {
  41. -           LOGERROR("Trying to add cinema path when GameView isn't initialized!");
  42.             return;
  43. -       }
  44.         g_Game->GetView()->GetCinema()->AddPathToQueue(name);
  45.         CinematicSimulationData* pGetCinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
  46.         pGetCinematicSimulationData->m_TotalTime += pGetCinematicSimulationData->m_Paths[name].GetDuration();
  47. @@ -229,10 +222,7 @@
  48.     virtual void Play()
  49.     {
  50.         if (!g_Game || !g_Game->GetView())
  51. -       {
  52. -           LOGERROR("Trying to play cinematics when GameView isn't initialized!");
  53.             return;
  54. -       }
  55.         g_Game->GetView()->GetCinema()->Play();
  56.         g_Game->GetView()->GetCinema()->SetEnabled(true);
  57.     }
  58. @@ -240,10 +230,7 @@
  59.     virtual void Stop()
  60.     {
  61.         if (!g_Game || !g_Game->GetView())
  62. -       {
  63. -           LOGERROR("Trying to stop cinematics when GameView isn't initialized!");
  64.             return;
  65. -       }
  66.         g_Game->GetView()->GetCinema()->Stop();
  67.         g_Game->GetView()->GetCinema()->SetEnabled(false);
  68.     }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement