# HG changeset patch # User Ritor1 # Date 1404444385 -21600 # Node ID 5d866ee283760a3b2b8279068e1e614090ef7174 # Parent 5f395dd759fbfeb37dbe7ecde54a003a7c34445a delete stru176.h for MVS 2010 MMT project diff -r 5f395dd759fb -r 5d866ee28376 Build/Visual Studio 2010/World of Might and Magic.vcxproj --- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj Mon Jun 23 23:45:57 2014 +0600 +++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj Fri Jul 04 09:26:25 2014 +0600 @@ -468,7 +468,6 @@ - diff -r 5f395dd759fb -r 5d866ee28376 Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters --- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters Mon Jun 23 23:45:57 2014 +0600 +++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters Fri Jul 04 09:26:25 2014 +0600 @@ -66,7 +66,6 @@ - diff -r 5f395dd759fb -r 5d866ee28376 Indoor.cpp --- a/Indoor.cpp Mon Jun 23 23:45:57 2014 +0600 +++ b/Indoor.cpp Fri Jul 04 09:26:25 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 { diff -r 5f395dd759fb -r 5d866ee28376 MediaPlayer.cpp --- a/MediaPlayer.cpp Mon Jun 23 23:45:57 2014 +0600 +++ b/MediaPlayer.cpp Fri Jul 04 09:26:25 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; diff -r 5f395dd759fb -r 5d866ee28376 MediaPlayer.h --- a/MediaPlayer.h Mon Jun 23 23:45:57 2014 +0600 +++ b/MediaPlayer.h Fri Jul 04 09:26:25 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