Mercurial > mm7

comparison Render.cpp @ 2450:90349b8048a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove VideoPlayer.cpp/.h
author Ritor1
date Fri, 25 Jul 2014 14:17:57 +0600
parents b10125a9c772
children ff7f4995aa25
comparison
equal deleted inserted replaced
2447:45dcf81c5b1c 2450:90349b8048a5
7 #include "ZlibWrapper.h" 7 #include "ZlibWrapper.h"
8 #include "ErrorHandling.h" 8 #include "ErrorHandling.h"
9 9
10 #include "Render.h" 10 #include "Render.h"
11 #include "Outdoor_stuff.h" 11 #include "Outdoor_stuff.h"
12 #include "VideoPlayer.h" 12 #include "MediaPlayer.h"
13 #include "Sprites.h" 13 #include "Sprites.h"
14 #include "Mouse.h" 14 #include "Mouse.h"
15 #include "GammaControl.h" 15 #include "GammaControl.h"
16 #include "stru6.h" 16 #include "stru6.h"
17 #include "GUIWindow.h" 17 #include "GUIWindow.h"
8244 *(short *)((char *)&v4 + 1) = v5->uParticleTrailColorR; 8244 *(short *)((char *)&v4 + 1) = v5->uParticleTrailColorR;
8245 LOBYTE(v4) = v5->uParticleTrailColorG; 8245 LOBYTE(v4) = v5->uParticleTrailColorG;
8246 v5->uParticleTrailColor = v5->uParticleTrailColorB | (v4 << 8); 8246 v5->uParticleTrailColor = v5->uParticleTrailColorB | (v4 << 8);
8247 } 8247 }
8248 SetUserInterface(pParty->alignment, true); 8248 SetUserInterface(pParty->alignment, true);
8249 if ( pVideoPlayer->pVideoFrame.pPixels ) 8249 if ( pMediaPlayer->pVideoFrame.pPixels )
8250 pVideoPlayer->pVideoFrame.Load(pVideoPlayer->pVideoFrameTextureFilename, 1); 8250 pMediaPlayer->pVideoFrame.Load(pMediaPlayer->pVideoFrameTextureFilename, 1);
8251 if ( sCurrentMenuID != MENU_CREATEPARTY ) 8251 if ( sCurrentMenuID != MENU_CREATEPARTY )
8252 { 8252 {
8253 if ( sCurrentMenuID == MENU_CREDITSPROC ) 8253 if ( sCurrentMenuID == MENU_CREDITSPROC )
8254 dword_A74C88 = 1; 8254 dword_A74C88 = 1;
8255 } 8255 }
8280 //MoveWindow(hWnd, uWindowX, uWindowY, uWindowWidth, uWindowHeight, 0); 8280 //MoveWindow(hWnd, uWindowX, uWindowY, uWindowWidth, uWindowHeight, 0);
8281 CenterWindowAndAdjustSize(hWnd, windowed_mode_width, windowed_mode_height); 8281 CenterWindowAndAdjustSize(hWnd, windowed_mode_width, windowed_mode_height);
8282 ShowWindow(hWnd, SW_SHOWNORMAL); 8282 ShowWindow(hWnd, SW_SHOWNORMAL);
8283 }*/ 8283 }*/
8284 pMouse->bActive = true; 8284 pMouse->bActive = true;
8285 if ( pVideoPlayer->AnyMovieLoaded() ) 8285 if ( pMovie_Track )
8286 pVideoPlayer->SelectMovieType(); 8286 pMediaPlayer->SelectMovieType();
8287 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_0800) 8287 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_0800)
8288 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_0800; 8288 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_0800;
8289 else 8289 else
8290 pEventTimer->Resume(); 8290 pEventTimer->Resume();
8291 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_1000) 8291 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_1000)