changeset 256:c5e5c5146957

-novideo command arg
author Nomad
date Mon, 18 Feb 2013 09:16:47 +0200
parents 0a37a56e9f02
children 96f3a1177b37
files CShow.h VideoPlayer.cpp mm7_2.cpp
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/CShow.h	Mon Feb 18 09:14:26 2013 +0200
+++ b/CShow.h	Mon Feb 18 09:16:47 2013 +0200
@@ -41,6 +41,9 @@
   //char v10; // [sp+4h] [bp-8h]@4
   //int a3; // [sp+Bh] [bp-1h]@14
 
+  if (bNoVideo)
+    return;
+
   if (pAsyncMouse)
     pAsyncMouse->Suspend();
   switch ( eVideo )
--- a/VideoPlayer.cpp	Mon Feb 18 09:14:26 2013 +0200
+++ b/VideoPlayer.cpp	Mon Feb 18 09:16:47 2013 +0200
@@ -295,9 +295,8 @@
   pVideoPlayer->bStopBeforeSchedule = false;
   pVideoPlayer->pResetflag = 0;
   bGameoverLoop = 1;
-  if ( !bNoVideo )
+  if (!bNoVideo)
   {
-    bNoVideo = 0;
     pRenderer->PresentBlackScreen();
     pGame->pCShow->PlayMovie(MOVIE_3DOLogo, 1);
     if ( !pVideoPlayer->bStopBeforeSchedule )
--- a/mm7_2.cpp	Mon Feb 18 09:14:26 2013 +0200
+++ b/mm7_2.cpp	Mon Feb 18 09:16:47 2013 +0200
@@ -13411,7 +13411,7 @@
     bWalkSound = ReadWindowsRegistryInt("WalkSound", 1) != 0;
     if (wcsstr(pCmdLine, L"-nowalksound"))
       bWalkSound = false;//dword_6BE364_game_settings_1 |= 0x20;
-    if (wcsstr(pCmdLine, L"-noanim"))
+    if (wcsstr(pCmdLine, L"-novideo"))
     {
       dword_6BE364_game_settings_1 |= 0x40;
       bNoVideo = true;