Mercurial > mm7

changeset 2313:b75a8f15568d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 18 Mar 2014 17:34:33 +0600
parents 4b052671da98 (diff) 9dbfeda280d7 (current diff)
children 8e9be4fa33a8
files
diffstat 3 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Mon Mar 17 22:53:24 2014 +0100
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Tue Mar 18 17:34:33 2014 +0600
@@ -180,6 +180,7 @@
     <ClCompile Include="..\..\Log.cpp" />
     <ClCompile Include="..\..\LuaVM.cpp" />
     <ClCompile Include="..\..\MapInfo.cpp" />
+    <ClCompile Include="..\..\MediaPlayer.cpp" />
     <ClCompile Include="..\..\mm7text_ru.cpp" />
     <ClCompile Include="..\..\mm7_2.cpp" />
     <ClCompile Include="..\..\mm7_3.cpp" />
@@ -424,6 +425,7 @@
     <ClInclude Include="..\..\Log.h" />
     <ClInclude Include="..\..\LuaVM.h" />
     <ClInclude Include="..\..\MapInfo.h" />
+    <ClInclude Include="..\..\MediaPlayer.h" />
     <ClInclude Include="..\..\MM7.h" />
     <ClInclude Include="..\..\mm7_data.h" />
     <ClInclude Include="..\..\mm7_unsorted_subs.h" />
@@ -435,6 +437,7 @@
     <ClInclude Include="..\..\NPC.h" />
     <ClInclude Include="..\..\NZIArray.h" />
     <ClInclude Include="..\..\ObjectList.h" />
+    <ClInclude Include="..\..\OpenALSoundProvider.h" />
     <ClInclude Include="..\..\OSAPI.h" />
     <ClInclude Include="..\..\OSInfo.h" />
     <ClInclude Include="..\..\OSWindow.h" />
@@ -465,6 +468,7 @@
     <ClInclude Include="..\..\stru367.h" />
     <ClInclude Include="..\..\stru6.h" />
     <ClInclude Include="..\..\stru9.h" />
+    <ClInclude Include="..\..\stuff.h" />
     <ClInclude Include="..\..\texts.h" />
     <ClInclude Include="..\..\Texture.h" />
     <ClInclude Include="..\..\TileFrameTable.h" />
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Mon Mar 17 22:53:24 2014 +0100
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Tue Mar 18 17:34:33 2014 +0600
@@ -524,6 +524,9 @@
       <Filter>lib\libpng</Filter>
     </ClInclude>
     <ClInclude Include="..\..\MMT.h" />
+    <ClInclude Include="..\..\MediaPlayer.h" />
+    <ClInclude Include="..\..\stuff.h" />
+    <ClInclude Include="..\..\OpenALSoundProvider.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="lib">
@@ -948,6 +951,7 @@
       <Filter>lib\libpng</Filter>
     </ClCompile>
     <ClCompile Include="..\..\MMT.cpp" />
+    <ClCompile Include="..\..\MediaPlayer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
--- a/MMT.cpp	Mon Mar 17 22:53:24 2014 +0100
+++ b/MMT.cpp	Tue Mar 18 17:34:33 2014 +0600
@@ -12,6 +12,7 @@
 #include "CShow.h"
 #include "GUIFont.h"
 #include "lib/libpng/png.h"
+#include "MediaPlayer.h"
 
 void  ShowLogoVideo()
 {
@@ -181,6 +182,11 @@
 
   pGUIWindow2 = 0;
   pAudioPlayer->StopChannels(-1, -1);/// 
+
+  //Media::Player *p = new Media::Player;// 
+  //Media::ITrack *track = p->LoadTrack(L"Sounds\\New_Sounds/Stronghold_Theme.mp3");
+  //track->Play();
+
   pMouse->RemoveHoldingItem();//   
 
   pIcons_LOD->_inlined_sub2();