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/ui/target.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/ui/target.cpp')
| -rw-r--r-- | src/ui/target.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 1c138e0..4e282b9 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -52,23 +52,23 @@ CTarget::~CTarget() // Creates a new button.
-BOOL CTarget::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CTarget::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
{
if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg();
CControl::Create(pos, dim, icon, eventMsg);
- return TRUE;
+ return true;
}
// Management of an event.
-BOOL CTarget::EventProcess(const Event &event)
+bool CTarget::EventProcess(const Event &event)
{
#if 0
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
@@ -80,7 +80,7 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
@@ -93,22 +93,22 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = EVENT_OBJECT_FIRE;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
#else
CObject* pObj;
- if ( (m_state & STATE_VISIBLE) == 0 ) return TRUE;
- if ( m_state & STATE_DEAD ) return TRUE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return true;
+ if ( m_state & STATE_DEAD ) return true;
CControl::EventProcess(event);
if ( event.event == EVENT_MOUSEMOVE )
{
- m_main->SetFriendAim(FALSE);
+ m_main->SetFriendAim(false);
if ( CControl::Detect(event.pos) )
{
@@ -120,11 +120,11 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = m_eventMsg;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
else
{
- m_main->SetFriendAim(TRUE);
+ m_main->SetFriendAim(true);
m_engine->SetMouseType(D3DMOUSENORM);
}
}
@@ -141,12 +141,12 @@ BOOL CTarget::EventProcess(const Event &event) Event newEvent = event;
newEvent.event = EVENT_OBJECT_FIRE;
m_event->AddEvent(newEvent);
- return FALSE;
+ return false;
}
}
}
- return TRUE;
+ return true;
#endif
}
@@ -161,20 +161,20 @@ void CTarget::Draw() // Returns the tooltip.
-BOOL CTarget::GetTooltip(FPOINT pos, char* name)
+bool CTarget::GetTooltip(FPOINT pos, char* name)
{
#if 0
if ( (m_state&STATE_VISIBLE) && Detect(pos) ) // in the window?
{
strcpy(name, m_tooltip);
- return TRUE; // does not detect objects below!
+ return true; // does not detect objects below!
}
- return FALSE;
+ return false;
#else
//? CObject* pObj;
- if ( (m_state & STATE_VISIBLE) == 0 ) return FALSE;
+ if ( (m_state & STATE_VISIBLE) == 0 ) return false;
if ( (m_state&STATE_VISIBLE) && Detect(pos) ) // in the window?
{
@@ -183,11 +183,11 @@ BOOL CTarget::GetTooltip(FPOINT pos, char* name) if ( !m_main->RetFriendAim() )
{
strcpy(name, m_tooltip);
- return TRUE; // does not detect objects below!
+ return true; // does not detect objects below!
}
}
- return FALSE;
+ return false;
#endif
}
|