backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Remove obsolete argument

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-10-21 16:04:26 +02:00
parent 29ad6c30f4
commit e39c2eaedd
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/event.cxx
View File

@ -4240,8 +4240,6 @@ CEvent::BuildMove (Point pos, Uint16 mod, const SDL_Event & event)
bool bool
CEvent::StartMovie (const std::string & pFilename) CEvent::StartMovie (const std::string & pFilename)
{ {
Rect rect;
if (!m_pMovie->GetEnable ()) if (!m_pMovie->GetEnable ())
return false; return false;
if (!m_bMovie) if (!m_bMovie)
@ -4250,15 +4248,11 @@ CEvent::StartMovie (const std::string & pFilename)
if (!m_pMovie->IsExist (pFilename)) if (!m_pMovie->IsExist (pFilename))
return false; 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 (); m_pSound->StopMusic ();
if (!m_pMovie->Play (rect, pFilename)) if (!m_pMovie->Play (pFilename))
return false; return false;
m_bRunMovie = true; m_bRunMovie = true;
return true; return true;
} }

7
src/movie.cxx
View File

@ -90,7 +90,7 @@ CMovie::fileCloseMovie ()
// Sets <m_fMovieOpen> on success. // Sets <m_fMovieOpen> on success.
bool bool
CMovie::fileOpenMovie (Rect rect, const std::string & pFilename) CMovie::fileOpenMovie (const std::string & pFilename)
{ {
const auto path = GetBaseDir () + pFilename; const auto path = GetBaseDir () + pFilename;
@ -207,11 +207,12 @@ CMovie::IsExist (const std::string & pFilename)
// Montre un film avi. // Montre un film avi.
bool bool
CMovie::Play (Rect rect, const std::string & pFilename) CMovie::Play (const std::string & pFilename)
{ {
if (!m_bEnable) if (!m_bEnable)
return false; return false;
if (!fileOpenMovie (rect, pFilename))
if (!fileOpenMovie (pFilename))
return false; return false;
playMovie (); playMovie ();

4
src/movie.h
View File

@ -38,7 +38,7 @@ public:
bool Create (); bool Create ();
bool GetEnable (); bool GetEnable ();
bool IsExist (const std::string & pFilename); bool IsExist (const std::string & pFilename);
bool Play (Rect rect, const std::string & pFilename); bool Play (const std::string & pFilename);
void Stop (); void Stop ();
void Pause (); void Pause ();
void Resume (); void Resume ();
@ -46,7 +46,7 @@ public:
protected: protected:
void playMovie (); void playMovie ();
bool fileOpenMovie (Rect rect, const std::string & pFilename); bool fileOpenMovie (const std::string & pFilename);
void fileCloseMovie (); void fileCloseMovie ();
void termAVI (); void termAVI ();
bool initAVI (); bool initAVI ();