# HG changeset patch # User a.parshin # Date 1406151109 -10800 # Node ID c10c639f83658ccd040b4518a5f137be9fa7bc71 # Parent f1d8eba1a9aacb011c148067bea64b64a7283bfb * Fixed releasing movie for movie-less transitions. diff -r f1d8eba1a9aa -r c10c639f8365 Game.cpp --- a/Game.cpp Wed Jul 23 22:09:56 2014 +0300 +++ b/Game.cpp Thu Jul 24 00:31:49 2014 +0300 @@ -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 ) diff -r f1d8eba1a9aa -r c10c639f8365 VideoPlayer.cpp --- a/VideoPlayer.cpp Wed Jul 23 22:09:56 2014 +0300 +++ b/VideoPlayer.cpp Thu Jul 24 00:31:49 2014 +0300 @@ -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) --------------------------------------------------------