Mercurial > mm7
diff Game.cpp @ 2356:08c4f1799ca1
Elements of VideoPlayer structure moved
author | Ritor1 |
---|---|
date | Thu, 10 Apr 2014 17:34:50 +0600 |
parents | d57505d3c70c |
children | 23192f5b41d4 |
line wrap: on
line diff
--- a/Game.cpp Tue Apr 08 17:39:59 2014 +0600 +++ b/Game.cpp Thu Apr 10 17:34:50 2014 +0600 @@ -93,7 +93,7 @@ pIndoorCameraD3D->CreateWorldMatrixAndSomeStuff(); pIndoorCameraD3D->_4374E8_ProllyBuildFrustrum(); - if ( pVideoPlayer->AnyMovieLoaded() ) + if ( pMovie ) { /*if ( !pRenderer->pRenderD3D ) { @@ -163,7 +163,7 @@ GameUI_Footer_2(); viewparams->bRedrawGameUI = false; } - if (!pVideoPlayer->pMovie)//!pVideoPlayer->pSmackerMovie) + if (!pMovie)//!pVideoPlayer->pSmackerMovie) { GameUI_DrawMinimap(488, 16, 625, 133, viewparams->uMinimapZoom, true);//redraw = pParty->uFlags & 2); if (v4) @@ -187,7 +187,7 @@ GameUI_DrawCharacterSelectionFrame(); if ( _44100D_should_alter_right_panel() ) GameUI_DrawRightPanel(); - if ( !pVideoPlayer->AnyMovieLoaded() ) + if ( !pMovie ) { pStru6Instance->DrawPlayerBuffAnims(); pOtherOverlayList->DrawTurnBasedIcon(v4); @@ -422,7 +422,7 @@ pNPCStats->pNewNPCData[i].uFlags &= 0xFFFFFF7Fu; } pVideoPlayer->PlayDeathMovie(); - if ( pVideoPlayer->AnyMovieLoaded() ) + if ( pMovie ) pVideoPlayer->Unload(); SaveGame(0, 0); ++pParty->uNumDeaths;