diff VideoPlayer.cpp @ 1461:845907a747d3

Merge
author Gloval
date Wed, 21 Aug 2013 20:59:16 +0400
parents 2ca62c9e7b3c
children 75fafd8ced59
line wrap: on
line diff
--- a/VideoPlayer.cpp	Wed Aug 21 20:58:36 2013 +0400
+++ b/VideoPlayer.cpp	Wed Aug 21 20:59:16 2013 +0400
@@ -65,6 +65,8 @@
 
 
 
+bool BinkLockBuffer(struct _BINKBUF *_this);
+void BinkUnlockBuffer(struct _BINKBUF *_this);
 
 //----- (004BFE2D) --------------------------------------------------------
 _BINKBUF *VideoPlayer::CreateBinkBuffer(HWND hWindow, unsigned int uWidth, unsigned int uHeight, char a4)
@@ -293,7 +295,7 @@
   }
 }
 //----- (004BF794) --------------------------------------------------------
-void __cdecl ShowIntroVideo_and_LoadingScreen()
+void  ShowIntroVideo_and_LoadingScreen()
 {
   RGBTexture tex; // [sp+Ch] [bp-30h]@1
   unsigned int uTrackStartMS; // [sp+34h] [bp-8h]@8