Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: source/simulation2/components/CCmpCinemaManager.cpp
- ===================================================================
- --- source/simulation2/components/CCmpCinemaManager.cpp (revision 17597)
- +++ source/simulation2/components/CCmpCinemaManager.cpp (working copy)
- @@ -58,10 +58,7 @@
- virtual void Serialize(ISerializer& serialize)
- {
- if (!g_Game || !g_Game->GetView())
- - {
- - LOGERROR("Trying to serialize cinematics when GameView isn't initialized!");
- return;
- - }
- CinematicSimulationData* p_CinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
- serialize.Bool("MapRevealed", p_CinematicSimulationData->m_MapRevealed);
- serialize.NumberU32_Unbounded("NumberOfPaths", p_CinematicSimulationData->m_Paths.size());
- @@ -116,10 +113,7 @@
- virtual void Deserialize(const CParamNode& UNUSED(paramNode), IDeserializer& deserialize)
- {
- if (!g_Game || !g_Game->GetView())
- - {
- - LOGERROR("Trying to deserialize cinematics when GameView isn't initialized!");
- return;
- - }
- CinematicSimulationData* p_CinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
- deserialize.Bool("MapRevealed", p_CinematicSimulationData->m_MapRevealed);
- uint32_t numberOfPaths = 0;
- @@ -180,6 +174,8 @@
- virtual void HandleMessage(const CMessage& msg, bool UNUSED(global))
- {
- + if (!g_Game || !g_Game->GetView())
- + return;
- switch (msg.GetType())
- {
- case MT_Update:
- @@ -217,10 +213,7 @@
- virtual void AddCinemaPathToQueue(CStrW name)
- {
- if (!g_Game || !g_Game->GetView())
- - {
- - LOGERROR("Trying to add cinema path when GameView isn't initialized!");
- return;
- - }
- g_Game->GetView()->GetCinema()->AddPathToQueue(name);
- CinematicSimulationData* pGetCinematicSimulationData = g_Game->GetView()->GetCinema()->GetCinematicSimulationData();
- pGetCinematicSimulationData->m_TotalTime += pGetCinematicSimulationData->m_Paths[name].GetDuration();
- @@ -229,10 +222,7 @@
- virtual void Play()
- {
- if (!g_Game || !g_Game->GetView())
- - {
- - LOGERROR("Trying to play cinematics when GameView isn't initialized!");
- return;
- - }
- g_Game->GetView()->GetCinema()->Play();
- g_Game->GetView()->GetCinema()->SetEnabled(true);
- }
- @@ -240,10 +230,7 @@
- virtual void Stop()
- {
- if (!g_Game || !g_Game->GetView())
- - {
- - LOGERROR("Trying to stop cinematics when GameView isn't initialized!");
- return;
- - }
- g_Game->GetView()->GetCinema()->Stop();
- g_Game->GetView()->GetCinema()->SetEnabled(false);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement