Mercurial > mm7

changeset 2392:22cbc67a619e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 04 Jul 2014 09:26:50 +0600
parents 5d866ee28376 (diff) c631b1877204 (current diff)
children a29d9609f9b2
files Indoor.cpp
diffstat 5 files changed, 14 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Thu Jul 03 23:27:27 2014 +0100
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Fri Jul 04 09:26:50 2014 +0600
@@ -468,7 +468,6 @@
     <ClInclude Include="..\..\stru123.h" />
     <ClInclude Include="..\..\stru159.h" />
     <ClInclude Include="..\..\stru160.h" />
-    <ClInclude Include="..\..\stru176.h" />
     <ClInclude Include="..\..\stru298.h" />
     <ClInclude Include="..\..\stru314.h" />
     <ClInclude Include="..\..\stru367.h" />
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Thu Jul 03 23:27:27 2014 +0100
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Fri Jul 04 09:26:50 2014 +0600
@@ -66,7 +66,6 @@
     <ClInclude Include="..\..\stru123.h" />
     <ClInclude Include="..\..\stru159.h" />
     <ClInclude Include="..\..\stru160.h" />
-    <ClInclude Include="..\..\stru176.h" />
     <ClInclude Include="..\..\stru298.h" />
     <ClInclude Include="..\..\stru314.h" />
     <ClInclude Include="..\..\stru367.h" />
--- a/Indoor.cpp	Thu Jul 03 23:27:27 2014 +0100
+++ b/Indoor.cpp	Fri Jul 04 09:26:50 2014 +0600
@@ -3817,7 +3817,7 @@
   {
     for (uint i = 0; i < pSector->uNumNonBSPFaces; ++i)
       //Log::Warning(L"Non-BSP face: %X", v3->pFaceIDs[v2]);
-      pBspRenderer->AddFaceToRenderList_d3d(node_id, pSector->pFaceIDs[i]);
+      pBspRenderer->AddFaceToRenderList_d3d(node_id, pSector->pFaceIDs[i]);//\recursion
   }
   /*else
   {
--- a/MediaPlayer.cpp	Thu Jul 03 23:27:27 2014 +0100
+++ b/MediaPlayer.cpp	Fri Jul 04 09:26:50 2014 +0600
@@ -198,10 +198,9 @@
   AVCodecContext  *dec_ctx;
 };
 
-struct AVAudioStream: public AVStreamWrapper
+struct AVAudioStream: public AVStreamWrapper// AVAudioStreem    AVStreemWrapper
 {
-  inline AVAudioStream():
-    AVStreamWrapper()
+  inline AVAudioStream():AVStreamWrapper()
   {
     this->bytes_per_sample = 0;
     this->bytes_per_second = 0;
@@ -213,8 +212,7 @@
 
 struct AVVideoStream: public AVStreamWrapper
 {
-  inline AVVideoStream():
-    AVStreamWrapper()
+  inline AVVideoStream(): AVStreamWrapper()
   {
     this->frames_per_second = 0.0;
   }
@@ -650,10 +648,10 @@
   return true;
 }
 
-class Track: public Media::ITrack
+class Track: public Media::ITrack//    Media::ITrack
 {
   public:
-    inline Track()
+    inline Track()//   
     {
       this->format_ctx = nullptr;
       this->audio_num_samples = 0;
@@ -669,7 +667,7 @@
       audio.Release();
       if (format_ctx)
       {
-        //   
+        //   
         av_close_input_file(format_ctx);
         format_ctx = nullptr;
       }
@@ -755,10 +753,10 @@
     OpenALSoundProvider::TrackBuffer *device_buffer;
 };
 
-class Movie: public Media::IMovie
+class Movie: public Media::IMovie//    Media::IMovie
 {
   public:
-    inline Movie()
+    inline Movie()//   
     {
       this->movie_filename[0] = 0;
       this->width = 0;
--- a/MediaPlayer.h	Thu Jul 03 23:27:27 2014 +0100
+++ b/MediaPlayer.h	Fri Jul 04 09:26:50 2014 +0600
@@ -4,13 +4,15 @@
 {
   class ITrack
   {
-    public: virtual void Play(bool loop = false) = 0;
+    public:
+		virtual void Play(bool loop = false) = 0;
   };
 
   class IMovie
   {
-    public: virtual void Play() = 0;
-            virtual void GetNextFrame(double dt, void *target_surface) = 0;
+    public: 
+		virtual void Play() = 0;
+        virtual void GetNextFrame(double dt, void *target_surface) = 0;
   };
 
   class MPlayer