[planetblupi] 16/61: Remove obsolete argument
Didier Raboud
odyx at moszumanska.debian.org
Thu Nov 2 19:24:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository planetblupi.
commit e39c2eaedd851425a4cba9e1172a62d57ffc7881
Author: Mathieu Schroeter <mathieu at schroetersa.ch>
Date: Sat Oct 21 16:04:26 2017 +0200
Remove obsolete argument
---
src/event.cxx | 10 ++--------
src/movie.cxx | 7 ++++---
src/movie.h | 4 ++--
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/event.cxx b/src/event.cxx
index aeb5e77..3754626 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -4240,8 +4240,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)
@@ -4250,15 +4248,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 <m_fMovieOpen> 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 ();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git
More information about the Pkg-games-commits
mailing list