Mercurial > mm7

changeset 2522:b71d0e7837ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author a.parshin
date Thu, 09 Oct 2014 19:31:55 +0300
parents 8e2022a843d9 (current diff) 9f7908a4d8e6 (diff)
children c532d5242055
files Engine/MMT.cpp
diffstat 1 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Engine/MMT.cpp	Thu Oct 09 19:30:22 2014 +0300
+++ b/Engine/MMT.cpp	Thu Oct 09 19:31:55 2014 +0300
@@ -43,17 +43,15 @@
       pMediaPlayer->PlayFullscreenMovie(MOVIE_NWCLogo, true);
       if ( !pMediaPlayer->bStopBeforeSchedule )
       {
-
-        if (for_refactoring)
+        if ( !pMediaPlayer->bStopBeforeSchedule )
         {
-          MessageBoxA(nullptr, "Ritor1: MOVIE_JVC crash", "", 0);
-          __debugbreak();
+          pMediaPlayer->PlayFullscreenMovie(MOVIE_JVC, true);
+          if ( !pMediaPlayer->bStopBeforeSchedule )
+          {
+            if (!use_MMT)
+              pMediaPlayer->PlayFullscreenMovie(MOVIE_Intro, true);
+          }
         }
-
-        //pMediaPlayer->PlayFullscreenMovie(MOVIE_JVC, true);
-        //if ( !pMediaPlayer->bStopBeforeSchedule )
-        if (!use_MMT)
-          pMediaPlayer->PlayFullscreenMovie(MOVIE_Intro, true);
       }
     }
   }