Mercurial > mm7
diff Render.cpp @ 2450:90349b8048a5
remove VideoPlayer.cpp/.h
author | Ritor1 |
---|---|
date | Fri, 25 Jul 2014 14:17:57 +0600 |
parents | b10125a9c772 |
children | ff7f4995aa25 |
line wrap: on
line diff
--- a/Render.cpp Thu Jul 24 12:50:24 2014 +0600 +++ b/Render.cpp Fri Jul 25 14:17:57 2014 +0600 @@ -9,7 +9,7 @@ #include "Render.h" #include "Outdoor_stuff.h" -#include "VideoPlayer.h" +#include "MediaPlayer.h" #include "Sprites.h" #include "Mouse.h" #include "GammaControl.h" @@ -8246,8 +8246,8 @@ v5->uParticleTrailColor = v5->uParticleTrailColorB | (v4 << 8); } SetUserInterface(pParty->alignment, true); - if ( pVideoPlayer->pVideoFrame.pPixels ) - pVideoPlayer->pVideoFrame.Load(pVideoPlayer->pVideoFrameTextureFilename, 1); + if ( pMediaPlayer->pVideoFrame.pPixels ) + pMediaPlayer->pVideoFrame.Load(pMediaPlayer->pVideoFrameTextureFilename, 1); if ( sCurrentMenuID != MENU_CREATEPARTY ) { if ( sCurrentMenuID == MENU_CREDITSPROC ) @@ -8282,8 +8282,8 @@ ShowWindow(hWnd, SW_SHOWNORMAL); }*/ pMouse->bActive = true; - if ( pVideoPlayer->AnyMovieLoaded() ) - pVideoPlayer->SelectMovieType(); + if ( pMovie_Track ) + pMediaPlayer->SelectMovieType(); if (dword_6BE364_game_settings_1 & GAME_SETTINGS_0800) dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_0800; else