Mercurial > mm7

changeset 2441:135b2116db9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Thu, 24 Jul 2014 01:11:36 +0200
parents 2b10278bc7ac (current diff) daf7807d0a86 (diff)
children 702cc7e6eefd
files
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Game.cpp	Thu Jul 24 01:10:50 2014 +0200
+++ b/Game.cpp	Thu Jul 24 01:11:36 2014 +0200
@@ -2614,7 +2614,9 @@
           dword_50CDC8 = 1;
           sub_42FBDD();
           PlayHouseSound(uCurrentHouse_Animation, HouseSound_NotEnoughMoney_TrainingSuccessful);
-          pVideoPlayer->Unload();
+
+          if (pVideoPlayer->AnyMovieLoaded())
+            pVideoPlayer->Unload();
           DialogueEnding();
           viewparams->bRedrawGameUI = true;
           if ( dword_59117C_teleportx | dword_591178_teleporty | dword_591174_teleportz | dword_591170_teleport_directiony | dword_59116C_teleport_directionx | dword_591168_teleport_speedz )
--- a/VideoPlayer.cpp	Thu Jul 24 01:10:50 2014 +0200
+++ b/VideoPlayer.cpp	Thu Jul 24 01:11:36 2014 +0200
@@ -353,10 +353,11 @@
 //----- (004BF3F9) --------------------------------------------------------
 bool VideoPlayer::AnyMovieLoaded()
 {
-  if (pMovie_Track)
+  return pMovie_Track != 0;
+  /*if (pMovie_Track)
 	return pMovie_Track;// pSmackerMovie || pBinkMovie;
   else
-	  return false;
+	  return false;*/
 }
 
 //----- (004BF411) --------------------------------------------------------