From 697fbdabf10d956e0f13bfbc9414d3db40f0c535 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 10 Jun 2012 15:28:12 +0200 Subject: BOOL -> bool; additional fixes in constructors/destructors --- src/graphics/common/planet.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/graphics/common/planet.cpp') diff --git a/src/graphics/common/planet.cpp b/src/graphics/common/planet.cpp index fae6d4a..68a5a64 100644 --- a/src/graphics/common/planet.cpp +++ b/src/graphics/common/planet.cpp @@ -64,11 +64,11 @@ void CPlanet::Flush() { for ( i=0 ; iRetPause() ) return TRUE; + if ( m_engine->RetPause() ) return true; m_time += event.rTime; @@ -109,7 +109,7 @@ BOOL CPlanet::EventFrame(const Event &event) m_planet[m_mode][i].angle.y = sinf(a)*sinf(m_planet[m_mode][i].dir)+m_planet[m_mode][i].start.y; } - return TRUE; + return true; } @@ -192,7 +192,7 @@ void CPlanet::Draw() // Creates a new planet. -BOOL CPlanet::Create(int mode, FPOINT start, float dim, float speed, +bool CPlanet::Create(int mode, FPOINT start, float dim, float speed, float dir, char *name, FPOINT uv1, FPOINT uv2) { int i; @@ -204,7 +204,7 @@ BOOL CPlanet::Create(int mode, FPOINT start, float dim, float speed, { if ( m_planet[mode][i].bUsed ) continue; - m_planet[mode][i].bUsed = TRUE; + m_planet[mode][i].bUsed = true; m_planet[mode][i].start = start; m_planet[mode][i].angle = start; m_planet[mode][i].dim = dim; @@ -217,16 +217,16 @@ BOOL CPlanet::Create(int mode, FPOINT start, float dim, float speed, m_planet[mode][i].bTGA = ( strstr(m_planet[mode][i].name, "planet") != 0 ); - m_bPlanetExist = TRUE; - return TRUE; + m_bPlanetExist = true; + return true; } - return FALSE; + return false; } // Indicates if there is at least one planet. -BOOL CPlanet::PlanetExist() +bool CPlanet::PlanetExist() { return m_bPlanetExist; } -- cgit v1.2.3-1-g7c22