immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comments translated from French to English.

dev-ui
Programerus 2012-03-15 19:58:58 +01:00
parent cfba346523
commit a1a17c3a19
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/autoresearch.cpp
View File

@ -46,11 +46,11 @@
#define SEARCH_TIME 30.0f // dur<EFBFBD>e d'une recherche #define SEARCH_TIME 30.0f // duration of a research
// Constructeur de l'objet. // Object's constructor.
CAutoResearch::CAutoResearch(CInstanceManager* iMan, CObject* object) CAutoResearch::CAutoResearch(CInstanceManager* iMan, CObject* object)
: CAuto(iMan, object) : CAuto(iMan, object)
@ -68,7 +68,7 @@ CAutoResearch::CAutoResearch(CInstanceManager* iMan, CObject* object)
Init(); Init();
} }
// Destructeur de l'objet. // Object's destructor.
CAutoResearch::~CAutoResearch() CAutoResearch::~CAutoResearch()
{ {
@ -76,7 +76,7 @@ CAutoResearch::~CAutoResearch()
} }
// D<EFBFBD>truit l'objet. // Destroys the object.
void CAutoResearch::DeleteObject(BOOL bAll) void CAutoResearch::DeleteObject(BOOL bAll)
{ {
@ -92,7 +92,7 @@ void CAutoResearch::DeleteObject(BOOL bAll)
} }
// Initialise l'objet. // Initialize the object.
void CAutoResearch::Init() void CAutoResearch::Init()
{ {
@ -107,7 +107,7 @@ void CAutoResearch::Init()
} }
// Gestion d'un <20>v<EFBFBD>nement. // Management of an event.
BOOL CAutoResearch::EventProcess(const Event &event) BOOL CAutoResearch::EventProcess(const Event &event)
{ {
@ -126,7 +126,7 @@ BOOL CAutoResearch::EventProcess(const Event &event)
if ( m_object->RetSelect() ) CreateInterface(TRUE); if ( m_object->RetSelect() ) CreateInterface(TRUE);
} }
if ( m_object->RetSelect() && // centre s<>lectionn<6E> ? if ( m_object->RetSelect() && // center selected?
(event.event == EVENT_OBJECT_RTANK || (event.event == EVENT_OBJECT_RTANK ||
event.event == EVENT_OBJECT_RFLY || event.event == EVENT_OBJECT_RFLY ||
event.event == EVENT_OBJECT_RTHUMP || event.event == EVENT_OBJECT_RTHUMP ||
@ -191,7 +191,7 @@ BOOL CAutoResearch::EventProcess(const Event &event)
m_progress += event.rTime*m_speed; m_progress += event.rTime*m_speed;
m_timeVirus -= event.rTime; m_timeVirus -= event.rTime;
if ( m_object->RetVirusMode() ) // contamin<EFBFBD> par un virus ? if ( m_object->RetVirusMode() ) // contaminated by a virus?
{ {
if ( m_timeVirus <= 0.0f ) if ( m_timeVirus <= 0.0f )
{ {
@ -204,24 +204,24 @@ BOOL CAutoResearch::EventProcess(const Event &event)
EventProgress(event.rTime); EventProgress(event.rTime);
angle = m_time*0.1f; angle = m_time*0.1f;
m_object->SetAngleY(1, angle); // tourne l'antenne m_object->SetAngleY(1, angle); // rotates the antenna
angle = (30.0f+sinf(m_time*0.3f)*20.0f)*PI/180.0f; angle = (30.0f+sinf(m_time*0.3f)*20.0f)*PI/180.0f;
m_object->SetAngleZ(2, angle); // oriente l'antenne m_object->SetAngleZ(2, angle); // directs the antenna
if ( m_phase == ALP_WAIT ) if ( m_phase == ALP_WAIT )
{ {
FireStopUpdate(m_progress, FALSE); // <EFBFBD>teint FireStopUpdate(m_progress, FALSE); // extinguished
return TRUE; return TRUE;
} }
if ( m_phase == ALP_SEARCH ) if ( m_phase == ALP_SEARCH )
{ {
FireStopUpdate(m_progress, TRUE); // clignotte FireStopUpdate(m_progress, TRUE); // flashes
if ( m_progress < 1.0f ) if ( m_progress < 1.0f )
{ {
power = m_object->RetPower(); power = m_object->RetPower();
if ( power == 0 ) // plus de pile ? if ( power == 0 ) // more battery?
{ {
SetBusy(FALSE); SetBusy(FALSE);
UpdateInterface(); UpdateInterface();
@ -251,7 +251,7 @@ BOOL CAutoResearch::EventProcess(const Event &event)
} }
else else
{ {
SetResearch(m_research); // recherche effectu<74>e SetResearch(m_research); // research done
m_displayText->DisplayError(INFO_RESEARCH, m_object); m_displayText->DisplayError(INFO_RESEARCH, m_object);
message = ERR_OK; message = ERR_OK;
@ -281,7 +281,7 @@ BOOL CAutoResearch::EventProcess(const Event &event)
} }
// Retourne une erreur li<6C>e <20> l'<27>tat de l'automate. // Returns an error due the state of the automation.
Error CAutoResearch::RetError() Error CAutoResearch::RetError()
{ {
@ -315,7 +315,7 @@ Error CAutoResearch::RetError()
} }
// Cr<EFBFBD>e toute l'interface lorsque l'objet est s<>lectionn<6E>. // Creates all the interface when the object is selected.
BOOL CAutoResearch::CreateInterface(BOOL bSelect) BOOL CAutoResearch::CreateInterface(BOOL bSelect)
{ {
@ -386,7 +386,7 @@ BOOL CAutoResearch::CreateInterface(BOOL bSelect)
return TRUE; return TRUE;
} }
// Met <20> jour l'<27>tat de tous les boutons de l'interface. // Updates the status of all interface buttons.
void CAutoResearch::UpdateInterface() void CAutoResearch::UpdateInterface()
{ {
@ -427,8 +427,8 @@ void CAutoResearch::UpdateInterface()
VisibleInterface(pw, EVENT_OBJECT_RATOMIC, !m_bBusy); VisibleInterface(pw, EVENT_OBJECT_RATOMIC, !m_bBusy);
} }
// Met <20> jour l'<27>tat de tous les boutons de l'interface, // Updates the state of all buttons on the interface,
// suite au temps qui s'<27>coule ... // following the time that elapses ...
void CAutoResearch::UpdateInterface(float rTime) void CAutoResearch::UpdateInterface(float rTime)
{ {
@ -460,7 +460,7 @@ void CAutoResearch::UpdateInterface(float rTime)
} }
} }
// Indique les recherches d<>j<EFBFBD> effectu<74>es pour un bouton. // Research shows already performed button.
void CAutoResearch::OkayButton(CWindow *pw, EventMsg event) void CAutoResearch::OkayButton(CWindow *pw, EventMsg event)
{ {
@ -473,7 +473,7 @@ void CAutoResearch::OkayButton(CWindow *pw, EventMsg event)
} }
// Teste si une recherche a d<>j<EFBFBD> <20>t<EFBFBD> effectu<74>e. // Test whether a search has already been done.
BOOL CAutoResearch::TestResearch(EventMsg event) BOOL CAutoResearch::TestResearch(EventMsg event)
{ {
@ -489,7 +489,7 @@ BOOL CAutoResearch::TestResearch(EventMsg event)
return FALSE; return FALSE;
} }
// Indique une recherche comme effectu<74>e. // Indicates a search as made.
void CAutoResearch::SetResearch(EventMsg event) void CAutoResearch::SetResearch(EventMsg event)
{ {
@ -512,7 +512,7 @@ void CAutoResearch::SetResearch(EventMsg event)
} }
// Met <20> jour les feux de stop. // Updates the stop lights.
void CAutoResearch::FireStopUpdate(float progress, BOOL bLightOn) void CAutoResearch::FireStopUpdate(float progress, BOOL bLightOn)
{ {
@ -577,7 +577,7 @@ void CAutoResearch::FireStopUpdate(float progress, BOOL bLightOn)
} }
// Sauve tous les param<61>tres de l'automate. // Saves all parameters of the controller.
BOOL CAutoResearch::Write(char *line) BOOL CAutoResearch::Write(char *line)
{ {
@ -605,7 +605,7 @@ BOOL CAutoResearch::Write(char *line)
return TRUE; return TRUE;
} }
// Restitue tous les param<61>tres de l'automate. // Restores all parameters of the controller.
BOOL CAutoResearch::Read(char *line) BOOL CAutoResearch::Read(char *line)
{ {