diff --git a/src/event.cxx b/src/event.cxx index 8300b49..513a55a 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -4314,8 +4314,6 @@ CEvent::BuildMove (Point pos, Uint16 mod, const SDL_Event & event) bool CEvent::StartMovie (const std::string & pFilename) { - Rect rect; - if (!m_pMovie->GetEnable ()) return false; if (!m_bMovie) @@ -4324,15 +4322,11 @@ CEvent::StartMovie (const std::string & pFilename) if (!m_pMovie->IsExist (pFilename)) return false; - rect.left = 1; // mystère: plante avec 0,0,LXIMAGE,LYIMAGE !!! - rect.top = 1; - rect.right = LXIMAGE - 2; - rect.bottom = LYIMAGE - 2; - m_pSound->StopMusic (); - if (!m_pMovie->Play (rect, pFilename)) + if (!m_pMovie->Play (pFilename)) return false; + m_bRunMovie = true; return true; } diff --git a/src/movie.cxx b/src/movie.cxx index d4c7feb..3a8f3d8 100644 --- a/src/movie.cxx +++ b/src/movie.cxx @@ -90,7 +90,7 @@ CMovie::fileCloseMovie () // Sets on success. bool -CMovie::fileOpenMovie (Rect rect, const std::string & pFilename) +CMovie::fileOpenMovie (const std::string & pFilename) { const auto path = GetBaseDir () + pFilename; @@ -207,11 +207,12 @@ CMovie::IsExist (const std::string & pFilename) // Montre un film avi. bool -CMovie::Play (Rect rect, const std::string & pFilename) +CMovie::Play (const std::string & pFilename) { if (!m_bEnable) return false; - if (!fileOpenMovie (rect, pFilename)) + + if (!fileOpenMovie (pFilename)) return false; playMovie (); diff --git a/src/movie.h b/src/movie.h index d10b410..31995b0 100644 --- a/src/movie.h +++ b/src/movie.h @@ -38,7 +38,7 @@ public: bool Create (); bool GetEnable (); bool IsExist (const std::string & pFilename); - bool Play (Rect rect, const std::string & pFilename); + bool Play (const std::string & pFilename); void Stop (); void Pause (); void Resume (); @@ -46,7 +46,7 @@ public: protected: void playMovie (); - bool fileOpenMovie (Rect rect, const std::string & pFilename); + bool fileOpenMovie (const std::string & pFilename); void fileCloseMovie (); void termAVI (); bool initAVI ();