diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 15:28:12 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-10 15:28:12 +0200 |
commit | 697fbdabf10d956e0f13bfbc9414d3db40f0c535 (patch) | |
tree | ab80ba3119d07b11da5478009b905edb702c103f /src/graphics/common/mainmovie.cpp | |
parent | 680af178196217bdd255d2bc851f240983144ac1 (diff) | |
download | colobot-697fbdabf10d956e0f13bfbc9414d3db40f0c535.tar.gz colobot-697fbdabf10d956e0f13bfbc9414d3db40f0c535.tar.bz2 colobot-697fbdabf10d956e0f13bfbc9414d3db40f0c535.zip |
BOOL -> bool; additional fixes in constructors/destructors
Diffstat (limited to 'src/graphics/common/mainmovie.cpp')
-rw-r--r-- | src/graphics/common/mainmovie.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/graphics/common/mainmovie.cpp b/src/graphics/common/mainmovie.cpp index 5618406..23c3652 100644 --- a/src/graphics/common/mainmovie.cpp +++ b/src/graphics/common/mainmovie.cpp @@ -75,7 +75,7 @@ void CMainMovie::Flush() // Start of a film.
-BOOL CMainMovie::Start(MainMovieType type, float time)
+bool CMainMovie::Start(MainMovieType type, float time)
{
D3DMATRIX* mat;
D3DVECTOR pos;
@@ -92,7 +92,7 @@ BOOL CMainMovie::Start(MainMovieType type, float time) if ( pObj == 0 )
{
m_type = MM_NONE; // it's over!
- return TRUE;
+ return true;
}
motion = pObj->RetMotion();
@@ -131,12 +131,12 @@ BOOL CMainMovie::Start(MainMovieType type, float time) m_type = MM_NONE; // it's already over!
}
- return TRUE;
+ return true;
}
// Stop a current movie.
-BOOL CMainMovie::Stop()
+bool CMainMovie::Stop()
{
CObject* pObj;
CMotion* motion;
@@ -155,12 +155,12 @@ BOOL CMainMovie::Stop() }
m_type = MM_NONE;
- return TRUE;
+ return true;
}
// Indicates whether a film is in progress.
-BOOL CMainMovie::IsExist()
+bool CMainMovie::IsExist()
{
return (m_type != MM_NONE);
}
@@ -168,12 +168,12 @@ BOOL CMainMovie::IsExist() // Processing an event.
-BOOL CMainMovie::EventProcess(const Event &event)
+bool CMainMovie::EventProcess(const Event &event)
{
D3DVECTOR initialEye, initialLookat, finalEye, finalLookat, eye, lookat;
float progress;
- if ( m_type == MM_NONE ) return TRUE;
+ if ( m_type == MM_NONE ) return true;
m_progress += event.rTime*m_speed;
@@ -211,7 +211,7 @@ BOOL CMainMovie::EventProcess(const Event &event) {
m_stopType = m_type;
Flush();
- return FALSE;
+ return false;
}
}
@@ -224,11 +224,11 @@ BOOL CMainMovie::EventProcess(const Event &event) {
m_stopType = m_type;
Flush();
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
|