diff VideoPlayer.cpp @ 1282:8a196c858180

Слияние
author Ritor1
date Sat, 15 Jun 2013 09:55:27 +0600
parents 0aeac0b9ca30
children 8c2f689b5f0b
line wrap: on
line diff
--- a/VideoPlayer.cpp	Sat Jun 15 09:55:07 2013 +0600
+++ b/VideoPlayer.cpp	Sat Jun 15 09:55:27 2013 +0600
@@ -2,10 +2,10 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "OSAPI.h"
 
 #include "Bink_Smacker.h"
 
+#include "mm7_data.h"
 #include "CShow.h"
 #include "Mouse.h"
 
@@ -19,10 +19,8 @@
 #include "Allocator.h"
 #include "Time.h"
 #include "Log.h"
+#include "texts.h"
 #include "UIHouses.h"
-#include "texts.h"
-#include "MM7.h"
-#include "mm7_data.h"
 
 
 VideoPlayer *pVideoPlayer = nullptr;
@@ -1173,4 +1171,17 @@
   bStopBeforeSchedule = 0;
   pResetflag = 0;
   pGame->pCShow->PlayMovie(MOVIE_Death, 1);
-}
\ No newline at end of file
+}
+
+//----- (004BE6F5) --------------------------------------------------------
+VideoPlayer::VideoPlayer() :
+  field_54(0),
+  pBinkMovie(nullptr), pBinkBuffer(nullptr),
+  pSmackerMovie(nullptr), pSmackerBuffer(nullptr), pSmackMovieBlit(nullptr)
+{
+  //RGBTexture::RGBTexture(&pVideoPlayer->pVideoFrame);
+  bStopBeforeSchedule = false;
+  pResetflag = 0;
+  byte_F8BC0C = 0;
+  //pBinkMovie = nullptr;
+}