diff CShow.cpp @ 1048:d36681a9e4f8

Слияние
author Ritor1
date Thu, 23 May 2013 11:17:01 +0600
parents 39f42990698f
children 0aeac0b9ca30
line wrap: on
line diff
--- a/CShow.cpp	Thu May 23 11:16:46 2013 +0600
+++ b/CShow.cpp	Thu May 23 11:17:01 2013 +0600
@@ -1,80 +1,27 @@
+#include <assert.h>
+
 #include "CShow.h"
 
 #include "VideoPlayer.h"
 #include "Mouse.h"
 
-void CShow::PlayMovie( MovieType eVideo, bool bShowMouseAfterPlayback )
+void CShow::PlayMovie(MovieType eVideo, bool bShowMouseAfterPlayback)
 {
-    int v3; // edx@5
-    const char *Name; // ecx@5
-    //std::string v5; // [sp-18h] [bp-24h]@4
-    //signed int v6; // [sp-Ch] [bp-18h]@10
-    int ScreenSizeFlag; // [sp-8h] [bp-14h]@4
-    //int v8; // [sp-4h] [bp-10h]@4
-    //char v9; // [sp+0h] [bp-Ch]@14
-    //char v10; // [sp+4h] [bp-8h]@4
-    //int a3; // [sp+Bh] [bp-1h]@14
-
-    if (bNoVideo)
-        return;
+  if (bNoVideo) return;
 
-    if (pAsyncMouse)
-        pAsyncMouse->Suspend();
-    switch ( eVideo )
-    {
-    case MOVIE_Invalid:
-        MessageBoxW(nullptr, L"No movie", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Show.cpp:40", 0);
-        break;
-    case MOVIE_3DOLogo:
-        ScreenSizeFlag = 0;
-        v3 = 0;
-        Name = "3dologo";
-        VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1);
-        break;
-    case MOVIE_NWCLogo:
-        ScreenSizeFlag = 1;
-        v3 = 0;
-        Name = "new world logo";
-        VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1);
-        break;
-    case MOVIE_JVC:
-        ScreenSizeFlag = 1;
-        v3 = 0;
-        Name = "jvc";
-        VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1);
-        break;
-    case MOVIE_Intro:
-        ScreenSizeFlag = 1;
-        v3 = 0;
-        Name = "Intro";
-        VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1);
-        break;
-    case MOVIE_Emerald:
-        ScreenSizeFlag = 1;
-        v3 = 0;
-        Name = "Intro Post";
-        VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1);
-        break;
-    case MOVIE_Death:
-        ScreenSizeFlag = 1;
-        v3 = 2;
-        Name = "losegame";
-        VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1);
-        break;
-    case MOVIE_Outro:
-        ScreenSizeFlag = 1;
-        v3 = 20;
-        Name = "end_seq1";
-        VideoPlayer::MovieLoop(Name, v3, ScreenSizeFlag, 1);
-        break;
+  switch (eVideo)
+  {
+    case MOVIE_3DOLogo: VideoPlayer::MovieLoop("3dologo", 0, 0, 1);        break;
+    case MOVIE_NWCLogo: VideoPlayer::MovieLoop("new world logo", 0, 1, 1); break;
+    case MOVIE_JVC:     VideoPlayer::MovieLoop("jvc", 0, 1, 1);            break;
+    case MOVIE_Intro:   VideoPlayer::MovieLoop("Intro", 0, 1, 1);          break;
+    case MOVIE_Emerald: VideoPlayer::MovieLoop("Intro Post", 0, 1, 1);     break;
+    case MOVIE_Death:   VideoPlayer::MovieLoop("losegame", 2, 1, 1);       break;
+    case MOVIE_Outro:   VideoPlayer::MovieLoop("end_seq1", 20, 1, 1);      break;
+
     default:
-        MessageBoxW(nullptr, L"Invalid movie requested in CShow::Run()", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Show.cpp:72", 0);
-        break;
-    }
-    if ( bShowMouseAfterPlayback )
-    {
-        if (pAsyncMouse)
-            pAsyncMouse->Resume();
-    }
+      assert(false && "Invalid movie requested in " __FUNCTION__);
+      break;
+  }
 }