Colobot Gold 0.1.0-alpha

29 files changed, 345 insertions, 317 deletions

diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp
index 3d88012..8dc1d94 100644
--- a/src/object/auto/auto.cpp
+++ b/src/object/auto/auto.cpp
@@ -107,6 +107,12 @@ void CAuto::Start(int param)
 {
 }
 
+// Starts an action
+
+Error CAuto::StartAction(int param)
+{
+    return ERR_GENERIC;
+}
 
 // Gete a type.
 
diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h
index 53ccdf9..4a430ce 100644
--- a/src/object/auto/auto.h
+++ b/src/object/auto/auto.h
@@ -31,7 +31,7 @@ namespace Ui {
 class CDisplayText;
 class CInterface;
 class CWindow;
-} /* Ui */ 
+} /* Ui */
 
 namespace Gfx {
 
@@ -44,7 +44,7 @@ class CCloud;
 class CCamera;
 class CPlanet;
 class CLightning;
-} /* Gfx */ 
+} /* Gfx */
 
 
 class CAuto
@@ -61,6 +61,8 @@ public:
     virtual Error   IsEnded();
     virtual bool    Abort();
 
+    virtual Error   StartAction(int param);
+
     virtual bool    SetType(ObjectType type);
     virtual bool    SetValue(int rank, float value);
     virtual bool    SetString(char *string);
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp
index cb7f04c..d0bd87b 100644
--- a/src/object/auto/autobase.cpp
+++ b/src/object/auto/autobase.cpp
@@ -1412,9 +1412,8 @@ void CAutoBase::BeginTransit()
     m_engine->SetDeepView(2000.0f);  // we see very far
     m_engine->ApplyChange();
 
-    Math::Point scale;
     bool full;
-    m_engine->GetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown, full, scale);
+    m_engine->GetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown, full);
     m_engine->DeleteTexture(m_bgName);
 
     m_engine->SetBackground(m_bgBack, Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f),
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp
index 260edcb..b613406 100644
--- a/src/object/auto/autoderrick.cpp
+++ b/src/object/auto/autoderrick.cpp
@@ -589,4 +589,3 @@ Error CAutoDerrick::GetError()
     return ERR_OK;
 }
 
-
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp
index b62a45a..fdaebc0 100644
--- a/src/object/auto/autodestroyer.cpp
+++ b/src/object/auto/autodestroyer.cpp
@@ -24,6 +24,7 @@
 
 #include "ui/interface.h"
 #include "ui/window.h"
+#include "ui/displaytext.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -68,18 +69,65 @@ void CAutoDestroyer::Init()
 }
 
 
+// Starts an action
+Error CAutoDestroyer::StartAction(int param)
+{
+    CObject* scrap;
+
+    if ( m_object->GetVirusMode() )  // contaminated by a virus?
+    {
+        return ERR_BAT_VIRUS;
+    }
+
+    scrap = SearchPlastic();
+    if ( scrap == nullptr )
+        return ERR_DESTROY_NOTFOUND;
+    else
+    {
+        if ( m_phase == ADEP_WAIT )
+        {
+            scrap->SetLock(true);  // usable waste
+//?         scrap->SetTruck(m_object);  // usable waste
+
+            m_sound->Play(SOUND_PSHHH2, m_object->GetPosition(0), 1.0f, 1.0f);
+
+            m_phase    = ADEP_DOWN;
+            m_progress = 0.0f;
+            m_speed    = 1.0f/1.0f;
+            m_bExplo   = false;
+        }
+        else
+            return ERR_GENERIC;
+    }
+    return ERR_OK;
+}
+
 // Management of an event.
 
 bool CAutoDestroyer::EventProcess(const Event &event)
 {
-    CObject*    scrap;
-    Gfx::CPyro*      pyro;
+    CObject*        scrap;
+    Gfx::CPyro*     pyro;
     Math::Vector    pos, speed;
     Math::Point     dim;
+    Ui::CWindow*    pw;
 
     CAuto::EventProcess(event);
 
     if ( m_engine->GetPause() )  return true;
+
+    if (m_main->GetSelect() == m_object)
+    {
+        if ( event.type == EVENT_OBJECT_BDESTROY )
+        {
+            Error err = StartAction(0);
+            if ( err != ERR_OK )
+                m_displayText->DisplayError(err, m_object);
+
+            return false;
+        }
+    }
+
     if ( event.type != EVENT_FRAME )  return true;
 
     m_progress += event.rTime*m_speed;
@@ -94,61 +142,21 @@ bool CAutoDestroyer::EventProcess(const Event &event)
         return true;
     }
 
+    pw = static_cast< Ui::CWindow* >(m_interface->SearchControl(EVENT_WINDOW0));
     if ( m_phase == ADEP_WAIT )
     {
         if ( m_progress >= 1.0f )
         {
-            scrap = SearchPlastic();
-            if ( scrap == 0 )
-            {
-                m_phase    = ADEP_WAIT;  // still waiting ...
-                m_progress = 0.0f;
-                m_speed    = 1.0f/0.5f;
-            }
-            else
+            m_phase    = ADEP_WAIT;  // still waiting ...
+            m_progress = 0.0f;
+            m_speed    = 1.0f/0.5f;
+            if (m_main->GetSelect() == m_object)
             {
-                scrap->SetLock(true);  // usable waste
-//?             scrap->SetTruck(m_object);  // usable waste
-
-                if ( SearchVehicle() )
-                {
-                    if ( m_progress < 20.0f ) {
-                        m_phase    = ADEP_WAIT;  // still waiting ...
-                        //m_progress = 0.0f;
-                        m_speed    = 1.0f/0.5f;
-                    } else {
-                        if ( m_object->GetLock() ) { // If still building...
-                            m_phase    = ADEP_WAIT;  // still waiting ...
-                            m_progress = 0.0f;
-                            m_speed    = 1.0f/0.5f;
-                        } else {
-                            m_sound->Play(SOUND_PSHHH2, m_object->GetPosition(0), 1.0f, 1.0f);
-
-                            m_phase    = ADEP_DOWN;
-                            m_progress = 0.0f;
-                            m_speed    = 1.0f/1.0f;
-                            m_bExplo   = false;
-                        }
-                    }
-                }
-                else
-                {
-                    if ( m_object->GetLock() ) { // If still building...
-                        m_phase    = ADEP_WAIT;  // still waiting ...
-                        m_progress = 0.0f;
-                        m_speed    = 1.0f/0.5f;
-                    } else {
-                        m_sound->Play(SOUND_PSHHH2, m_object->GetPosition(0), 1.0f, 1.0f);
-
-                        m_phase    = ADEP_DOWN;
-                        m_progress = 0.0f;
-                        m_speed    = 1.0f/1.0f;
-                        m_bExplo   = false;
-                    }
-                }
+                scrap = SearchPlastic();
+                if ( pw != 0 ) EnableInterface(pw, EVENT_OBJECT_BDESTROY, (scrap != 0));
             }
         }
-    }
+    } else if ( pw != 0 ) EnableInterface(pw, EVENT_OBJECT_BDESTROY, false);
 
     if ( m_phase == ADEP_DOWN )
     {
@@ -224,6 +232,7 @@ bool CAutoDestroyer::CreateInterface(bool bSelect)
     Ui::CWindow*    pw;
     Math::Point     pos, ddim;
     float       ox, oy, sx, sy;
+    CObject*        scrap;
 
     CAuto::CreateInterface(bSelect);
 
@@ -243,6 +252,15 @@ bool CAutoDestroyer::CreateInterface(bool bSelect)
     ddim.y = 66.0f/480.0f;
     pw->CreateGroup(pos, ddim, 106, EVENT_OBJECT_TYPE);
 
+    pos.x = ox+sx*8.00f;
+    pos.y = oy+sy*0.25f;
+    ddim.x = (33.0f/640.0f)*1.5f;
+    ddim.y = (33.0f/480.0f)*1.5f;
+    pw->CreateButton(pos, ddim, 12, EVENT_OBJECT_BDESTROY);
+
+    scrap = SearchPlastic();
+    EnableInterface(pw, EVENT_OBJECT_BDESTROY, (scrap != 0));
+
     return true;
 }
 
@@ -323,68 +341,6 @@ CObject* CAutoDestroyer::SearchPlastic()
     return nullptr;
 }
 
-// Seeks if one vehicle is too close.
-
-bool CAutoDestroyer::SearchVehicle()
-{
-    CObject*    pObj;
-    Math::Vector    cPos, oPos;
-    ObjectType  type;
-    float       oRadius, dist;
-    int         i;
-
-    cPos = m_object->GetPosition(0);
-
-    for ( i=0 ; i<1000000 ; i++ )
-    {
-        pObj = static_cast< CObject* >(m_iMan->SearchInstance(CLASS_OBJECT, i));
-        if ( pObj == nullptr )  break;
-
-        type = pObj->GetType();
-        if ( type != OBJECT_HUMAN    &&
-             type != OBJECT_MOBILEfa &&
-             type != OBJECT_MOBILEta &&
-             type != OBJECT_MOBILEwa &&
-             type != OBJECT_MOBILEia &&
-             type != OBJECT_MOBILEfc &&
-             type != OBJECT_MOBILEtc &&
-             type != OBJECT_MOBILEwc &&
-             type != OBJECT_MOBILEic &&
-             type != OBJECT_MOBILEfi &&
-             type != OBJECT_MOBILEti &&
-             type != OBJECT_MOBILEwi &&
-             type != OBJECT_MOBILEii &&
-             type != OBJECT_MOBILEfs &&
-             type != OBJECT_MOBILEts &&
-             type != OBJECT_MOBILEws &&
-             type != OBJECT_MOBILEis &&
-             type != OBJECT_MOBILErt &&
-             type != OBJECT_MOBILErc &&
-             type != OBJECT_MOBILErr &&
-             type != OBJECT_MOBILErs &&
-             type != OBJECT_MOBILEsa &&
-             type != OBJECT_MOBILEtg &&
-             type != OBJECT_MOBILEft &&
-             type != OBJECT_MOBILEtt &&
-             type != OBJECT_MOBILEwt &&
-             type != OBJECT_MOBILEit &&
-             type != OBJECT_MOBILEdr &&
-             type != OBJECT_MOTHER   &&
-             type != OBJECT_ANT      &&
-             type != OBJECT_SPIDER   &&
-             type != OBJECT_BEE      &&
-             type != OBJECT_WORM     )  continue;
-
-        if ( !pObj->GetCrashSphere(0, oPos, oRadius) )  continue;
-        dist = Math::Distance(oPos, cPos)-oRadius;
-
-        if ( dist < 20.0f )  return true;
-    }
-
-    return false;
-}
-
-
 // Returns an error due the state of the automation.
 
 Error CAutoDestroyer::GetError()
@@ -440,4 +396,15 @@ bool CAutoDestroyer::Read(char *line)
     return true;
 }
 
+// Changes the state of a button interface.
+
+void CAutoDestroyer::EnableInterface(Ui::CWindow *pw, EventType event, bool bState)
+{
+    Ui::CControl*   control;
+
+    control = pw->SearchControl(event);
+    if ( control == 0 )  return;
+
+    control->SetState(Ui::STATE_ENABLE, bState);
+}
 
diff --git a/src/object/auto/autodestroyer.h b/src/object/auto/autodestroyer.h
index 26981c3..ef3d5ae 100644
--- a/src/object/auto/autodestroyer.h
+++ b/src/object/auto/autodestroyer.h
@@ -46,6 +46,8 @@ public:
     bool        EventProcess(const Event &event);
     Error       GetError();
 
+    Error       StartAction(int param);
+
     bool        CreateInterface(bool bSelect);
 
     bool        Write(char *line);
@@ -53,7 +55,7 @@ public:
 
 protected:
     CObject*    SearchPlastic();
-    bool        SearchVehicle();
+    void        EnableInterface(Ui::CWindow *pw, EventType event, bool bState);
 
 protected:
     AutoDestroyerPhase  m_phase;
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp
index a0b4d85..6a8672b 100644
--- a/src/object/auto/autoenergy.cpp
+++ b/src/object/auto/autoenergy.cpp
@@ -649,3 +649,4 @@ bool CAutoEnergy::Read(char *line)
 
     return true;
 }
+
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp
index 82877c6..a648656 100644
--- a/src/object/auto/autofactory.cpp
+++ b/src/object/auto/autofactory.cpp
@@ -24,6 +24,7 @@
 #include "math/geometry.h"
 
 #include "object/robotmain.h"
+#include "object/brain.h"
 
 #include "physics/physics.h"
 
@@ -103,21 +104,74 @@ void CAutoFactory::Init()
 
     m_fretPos = m_object->GetPosition(0);
 
+    m_program = nullptr;
+
     CAuto::Init();
 }
 
 
+// Starts an action
+
+Error CAutoFactory::StartAction(int param)
+{
+    CObject*   fret;
+    ObjectType type = static_cast<ObjectType>(param);
+
+    if ( type != OBJECT_NULL )
+    {
+        if ( m_phase != AFP_WAIT )
+        {
+            return ERR_OK;
+        }
+
+        m_type = type;
+
+        fret = SearchFret();  // transform metal?
+        if ( fret == 0 )
+        {
+            return ERR_FACTORY_NULL;
+        }
+        if ( NearestVehicle() )
+        {
+            return ERR_FACTORY_NEAR;
+        }
+
+        SetBusy(true);
+        InitProgressTotal(3.0f+2.0f+15.0f+2.0f+3.0f);
+        UpdateInterface();
+
+        fret->SetLock(true);  // usable metal
+        SoundManip(3.0f, 1.0f, 0.5f);
+
+        m_phase    = AFP_CLOSE_S;
+        m_progress = 0.0f;
+        m_speed    = 1.0f/3.0f;
+        return ERR_OK;
+    }
+    return ERR_GENERIC;
+}
+
+
+// Sets program for created robot
+
+void CAutoFactory::SetProgram(const char* program)
+{
+    m_program = new char[strlen(program)+1];
+    strcpy(m_program, program);
+}
+
+
 // Management of an event.
 
 bool CAutoFactory::EventProcess(const Event &event)
 {
+    ObjectType  type;
     CObject*    fret;
     CObject*    vehicle;
     Math::Matrix*   mat;
     CPhysics*   physics;
     Math::Vector    pos, speed;
     Math::Point     dim;
-    ObjectType  type;
     float       zoom, angle, prog;
     int         i;
 
@@ -155,39 +209,12 @@ bool CAutoFactory::EventProcess(const Event &event)
         if ( event.type == EVENT_OBJECT_FACTORYrs )  type = OBJECT_MOBILErs;
         if ( event.type == EVENT_OBJECT_FACTORYsa )  type = OBJECT_MOBILEsa;
 
-        if ( type != OBJECT_NULL )
-        {
-            m_type = type;
+        Error err = StartAction(type);
+        if( err != ERR_OK && err != ERR_GENERIC )
+            m_displayText->DisplayError(err, m_object);
 
-            if ( m_phase != AFP_WAIT )
-            {
-                return false;
-            }
-
-            fret = SearchFret();  // transform metal?
-            if ( fret == 0 )
-            {
-                m_displayText->DisplayError(ERR_FACTORY_NULL, m_object);
-                return false;
-            }
-            if ( NearestVehicle() )
-            {
-                m_displayText->DisplayError(ERR_FACTORY_NEAR, m_object);
-                return false;
-            }
-
-            SetBusy(true);
-            InitProgressTotal(3.0f+2.0f+15.0f+2.0f+3.0f);
-            UpdateInterface();
-
-            fret->SetLock(true);  // usable metal
-            SoundManip(3.0f, 1.0f, 0.5f);
-
-            m_phase    = AFP_CLOSE_S;
-            m_progress = 0.0f;
-            m_speed    = 1.0f/3.0f;
-            return true;
-        }
+        if( err != ERR_GENERIC )
+            return false;
     }
 
     if ( event.type != EVENT_FRAME )  return true;
@@ -362,7 +389,7 @@ bool CAutoFactory::EventProcess(const Event &event)
                 delete fret;
             }
 
-            vehicle = SearchVehicle();
+            m_vehicle = vehicle = SearchVehicle();
             if ( vehicle != 0 )
             {
                 physics = vehicle->GetPhysics();
@@ -461,6 +488,17 @@ bool CAutoFactory::EventProcess(const Event &event)
                 m_object->SetZoomZ(10+i, 0.30f);
             }
 
+            if ( m_program != nullptr )
+            {
+                CBrain* brain = m_vehicle->GetBrain();
+                if ( brain != nullptr )
+                {
+                    brain->SendProgram(0, const_cast<const char*>(m_program));
+                    brain->SetScriptRun(0);
+                    brain->RunProgram(0);
+                }
+            }
+
             SetBusy(false);
             UpdateInterface();
 
diff --git a/src/object/auto/autofactory.h b/src/object/auto/autofactory.h
index 7c5013d..d9350e6 100644
--- a/src/object/auto/autofactory.h
+++ b/src/object/auto/autofactory.h
@@ -48,6 +48,9 @@ public:
     void        Init();
     bool        EventProcess(const Event &event);
 
+    Error       StartAction(int param);
+    void        SetProgram(const char* program);
+
     bool        CreateInterface(bool bSelect);
 
     bool        Write(char *line);
@@ -69,7 +72,10 @@ protected:
     float               m_progress;
     float               m_speed;
     float               m_lastParticle;
-    Math::Vector            m_fretPos;
+    Math::Vector        m_fretPos;
     int                 m_channelSound;
+
+    CObject*            m_vehicle;
+    char*               m_program;
 };
 
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp
index 936546d..cc00db0 100644
--- a/src/object/auto/autoflag.cpp
+++ b/src/object/auto/autoflag.cpp
@@ -159,4 +159,3 @@ Error CAutoFlag::GetError()
     return ERR_OK;
 }
 
-
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp
index 56c21d2..6d4a484 100644
--- a/src/object/auto/autoinfo.cpp
+++ b/src/object/auto/autoinfo.cpp
@@ -428,7 +428,7 @@ void CAutoInfo::UpdateList()
         {
             info = m_object->GetInfo(i);
             sprintf(text, "%s = %.2f", info.name, info.value);
-            pl->SetName(i, text);
+            pl->SetItemName(i, text);
         }
     }
 
@@ -466,7 +466,7 @@ void CAutoInfo::UpdateListVirus()
         }
         text[j] = 0;
 
-        pl->SetName(i, text);
+        pl->SetItemName(i, text);
     }
 }
 
@@ -513,4 +513,3 @@ bool CAutoInfo::Read(char *line)
     return true;
 }
 
-
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp
index 11952c2..5ce01c2 100644
--- a/src/object/auto/autojostle.cpp
+++ b/src/object/auto/autojostle.cpp
@@ -77,6 +77,11 @@ void CAutoJostle::Start(int param, float force)
     }
 }
 
+// Should never be called
+void CAutoJostle::Start(int param)
+{
+}
+
 
 // Management of an event.
 
@@ -137,4 +142,3 @@ Error CAutoJostle::IsEnded()
     return m_error;
 }
 
-
diff --git a/src/object/auto/autojostle.h b/src/object/auto/autojostle.h
index 7b700ad..3822421 100644
--- a/src/object/auto/autojostle.h
+++ b/src/object/auto/autojostle.h
@@ -37,7 +37,9 @@ public:
     bool        EventProcess(const Event &event);
     Error       IsEnded();
 
-protected:
+private:
+    // Overriden to avoid warning about hiding virtual function
+    virtual void Start(int param) override;
 
 protected:
     float           m_force;
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp
index a9f86b0..7d61d64 100644
--- a/src/object/auto/autokid.cpp
+++ b/src/object/auto/autokid.cpp
@@ -197,4 +197,3 @@ Error CAutoKid::GetError()
     return ERR_OK;
 }
 
-
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp
index 6984fd6..172a618 100644
--- a/src/object/auto/autolabo.cpp
+++ b/src/object/auto/autolabo.cpp
@@ -42,7 +42,7 @@ const float LABO_DELAY = 20.0f; // duration of the analysis
 
 // Object's constructor.
 
-    CAutoLabo::CAutoLabo(CObject* object) : CAuto(object)
+CAutoLabo::CAutoLabo(CObject* object) : CAuto(object)
 {
     int     i;
 
@@ -111,6 +111,48 @@ void CAutoLabo::Init()
 }
 
 
+// Starts an action
+
+Error CAutoLabo::StartAction(int param)
+{
+    CObject* power;
+
+    if ( m_phase != ALAP_WAIT )
+    {
+        return ERR_GENERIC;
+    }
+
+    m_research = static_cast<ResearchType>(param);
+
+    if ( g_researchDone & m_research )
+    {
+        return ERR_LABO_ALREADY;
+    }
+
+    power = m_object->GetPower();
+    if ( power == 0 )
+    {
+        return ERR_LABO_NULL;
+    }
+    if ( power->GetType() != OBJECT_BULLET )
+    {
+        return ERR_LABO_BAD;
+    }
+
+    SetBusy(true);
+    InitProgressTotal(1.0f+1.5f+1.5f+LABO_DELAY+1.5f+1.5f+1.0f);
+    UpdateInterface();
+
+    power->SetLock(true);  // ball longer usable
+
+    SoundManip(1.0f, 1.0f, 1.0f);
+    m_phase    = ALAP_OPEN1;
+    m_progress = 0.0f;
+    m_speed    = 1.0f/1.0f;
+    return ERR_OK;
+}
+
+
 // Management of an event.
 
 bool CAutoLabo::EventProcess(const Event &event)
@@ -130,46 +172,17 @@ bool CAutoLabo::EventProcess(const Event &event)
         if ( m_object->GetSelect() )  CreateInterface(true);
     }
 
-    if ( m_object->GetSelect() &&  // center selected?
-         (event.type == EVENT_OBJECT_RiPAW ||
-          event.type == EVENT_OBJECT_RiGUN) )
+    if ( m_object->GetSelect() )  // center selected?
     {
-        if ( m_phase != ALAP_WAIT )
-        {
-            return false;
-        }
+        Error err = ERR_GENERIC;
+        if ( event.type == EVENT_OBJECT_RiPAW   ) err = StartAction(RESEARCH_iPAW);
+        if ( event.type == EVENT_OBJECT_RiGUN   ) err = StartAction(RESEARCH_iGUN);
 
-        m_research = event.type;
+        if( err != ERR_OK && err != ERR_GENERIC )
+            m_displayText->DisplayError(err, m_object);
 
-        if ( TestResearch(m_research) )
-        {
-            m_displayText->DisplayError(ERR_LABO_ALREADY, m_object);
+        if( err != ERR_GENERIC )
             return false;
-        }
-
-        power = m_object->GetPower();
-        if ( power == 0 )
-        {
-            m_displayText->DisplayError(ERR_LABO_NULL, m_object);
-            return false;
-        }
-        if ( power->GetType() != OBJECT_BULLET )
-        {
-            m_displayText->DisplayError(ERR_LABO_BAD, m_object);
-            return false;
-        }
-
-        SetBusy(true);
-        InitProgressTotal(1.0f+1.5f+1.5f+LABO_DELAY+1.5f+1.5f+1.0f);
-        UpdateInterface();
-
-        power->SetLock(true);  // ball longer usable
-
-        SoundManip(1.0f, 1.0f, 1.0f);
-        m_phase    = ALAP_OPEN1;
-        m_progress = 0.0f;
-        m_speed    = 1.0f/1.0f;
-        return true;
     }
 
     if ( event.type != EVENT_FRAME )  return true;
@@ -341,7 +354,13 @@ bool CAutoLabo::EventProcess(const Event &event)
         }
         else
         {
-            SetResearch(m_research);  // research done
+            g_researchDone |= m_research;  // research done
+
+            m_main->WriteFreeParam();
+
+            Event newEvent(EVENT_UPDINTERFACE);
+            m_eventQueue->AddEvent(newEvent);
+            UpdateInterface();
 
             power = m_object->GetPower();
             if ( power != 0 )
@@ -606,11 +625,10 @@ bool CAutoLabo::Read(char *line)
     m_phase = static_cast< AutoLaboPhase >(OpInt(line, "aPhase", ALAP_WAIT));
     m_progress = OpFloat(line, "aProgress", 0.0f);
     m_speed = OpFloat(line, "aSpeed", 1.0f);
-    m_research = static_cast< EventType >(OpInt(line, "aResearch", 0));
+    m_research = static_cast< ResearchType >(OpInt(line, "aResearch", 0));
 
     m_lastParticle = 0.0f;
 
     return true;
 }
 
-
diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h
index b61e8e3..b3b08bb 100644
--- a/src/object/auto/autolabo.h
+++ b/src/object/auto/autolabo.h
@@ -47,6 +47,7 @@ public:
     void        DeleteObject(bool bAll=false);
 
     void        Init();
+    Error       StartAction(int param);
     bool        EventProcess(const Event &event);
     Error       GetError();
 
@@ -68,7 +69,7 @@ protected:
     float               m_speed;
     float               m_timeVirus;
     float               m_lastParticle;
-    EventType               m_research;
+    ResearchType        m_research;
     int                 m_partiRank[3];
     int                 m_partiSphere;
     int                 m_soundChannel;
diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp
index e97e2a1..1e4796d 100644
--- a/src/object/auto/automush.cpp
+++ b/src/object/auto/automush.cpp
@@ -342,4 +342,3 @@ bool CAutoMush::Read(char *line)
     return true;
 }
 
-
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp
index 1cf13d6..8a2d644 100644
--- a/src/object/auto/autonest.cpp
+++ b/src/object/auto/autonest.cpp
@@ -273,4 +273,3 @@ bool CAutoNest::Read(char *line)
     return true;
 }
 
-
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp
index 75bfb45..224776d 100644
--- a/src/object/auto/autonuclear.cpp
+++ b/src/object/auto/autonuclear.cpp
@@ -484,4 +484,3 @@ bool CAutoNuclear::Read(char *line)
     return true;
 }
 
-
diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp
index ad6517b..24bc119 100644
--- a/src/object/auto/autopara.cpp
+++ b/src/object/auto/autopara.cpp
@@ -327,4 +327,3 @@ bool CAutoPara::Read(char *line)
     return true;
 }
 
-
diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp
index 1a10aa7..4afd3fe 100644
--- a/src/object/auto/autoradar.cpp
+++ b/src/object/auto/autoradar.cpp
@@ -305,4 +305,3 @@ bool CAutoRadar::SearchEnemy(Math::Vector &pos)
     return true;
 }
 
-
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp
index 95b6cc8..2f813f8 100644
--- a/src/object/auto/autorepair.cpp
+++ b/src/object/auto/autorepair.cpp
@@ -74,7 +74,7 @@ void CAutoRepair::Init()
 
 bool CAutoRepair::EventProcess(const Event &event)
 {
-    CObject*    vehicule;
+    CObject*    vehicle;
     Math::Vector    pos, speed;
     Math::Point     dim;
     float       angle, shield;
@@ -137,16 +137,16 @@ bool CAutoRepair::EventProcess(const Event &event)
 
     if ( m_phase == ARP_REPAIR )
     {
-        vehicule = SearchVehicle();
+        vehicle = SearchVehicle();
         if ( m_progress < 1.0f ||
-             (vehicule != 0 && vehicule->GetShield() < 1.0f) )
+             (vehicle != 0 && vehicle->GetShield() < 1.0f) )
         {
-            if ( vehicule != 0 )
+            if ( vehicle != 0 )
             {
-                shield = vehicule->GetShield();
+                shield = vehicle->GetShield();
                 shield += event.rTime*0.2f;
                 if ( shield > 1.0f )  shield = 1.0f;
-                vehicule->SetShield(shield);
+                vehicle->SetShield(shield);
             }
 
             if ( m_lastParticle+m_engine->ParticleAdapt(0.05f) <= m_time )
@@ -340,4 +340,3 @@ bool CAutoRepair::Read(char *line)
     return true;
 }
 
-
diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h
index 31a3c65..f522a55 100644
--- a/src/object/auto/autorepair.h
+++ b/src/object/auto/autorepair.h
@@ -63,4 +63,3 @@ protected:
     float           m_lastParticle;
 };
 
-
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp
index 3c32307..8308ebe 100644
--- a/src/object/auto/autoresearch.cpp
+++ b/src/object/auto/autoresearch.cpp
@@ -92,6 +92,60 @@ void CAutoResearch::Init()
 }
 
 
+// Starts an action
+
+Error CAutoResearch::StartAction(int param)
+{
+    CObject* power;
+    float    time;
+
+    if ( m_phase != ALP_WAIT )
+    {
+        return ERR_GENERIC;
+    }
+
+    m_research = static_cast<ResearchType>(param);
+
+    if ( g_researchDone & m_research )
+    {
+        return ERR_RESEARCH_ALREADY;
+    }
+
+    power = m_object->GetPower();
+    if ( power == 0 )
+    {
+        return ERR_RESEARCH_POWER;
+    }
+    if ( power->GetCapacity() > 1.0f )
+    {
+        return ERR_RESEARCH_TYPE;
+    }
+    if ( power->GetEnergy() < 1.0f )
+    {
+        return ERR_RESEARCH_ENERGY;
+    }
+
+    time = SEARCH_TIME;
+    if ( m_research == RESEARCH_TANK   )  time *= 0.3f;
+    if ( m_research == RESEARCH_FLY    )  time *= 0.3f;
+    if ( m_research == RESEARCH_ATOMIC )  time *= 2.0f;
+
+    SetBusy(true);
+    InitProgressTotal(time);
+    UpdateInterface();
+
+    m_channelSound = m_sound->Play(SOUND_RESEARCH, m_object->GetPosition(0), 0.0f, 1.0f, true);
+    m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f,      2.0f, SOPER_CONTINUE);
+    m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f, time-4.0f, SOPER_CONTINUE);
+    m_sound->AddEnvelope(m_channelSound, 0.0f, 1.0f,      2.0f, SOPER_STOP);
+
+    m_phase    = ALP_SEARCH;
+    m_progress = 0.0f;
+    m_speed    = 1.0f/time;
+    return ERR_OK;
+}
+
+
 // Management of an event.
 
 bool CAutoResearch::EventProcess(const Event &event)
@@ -100,7 +154,7 @@ bool CAutoResearch::EventProcess(const Event &event)
     Math::Vector    pos, speed;
     Error       message;
     Math::Point     dim;
-    float       angle, time;
+    float       angle;
 
     CAuto::EventProcess(event);
 
@@ -111,64 +165,23 @@ bool CAutoResearch::EventProcess(const Event &event)
         if ( m_object->GetSelect() )  CreateInterface(true);
     }
 
-    if ( m_object->GetSelect() &&  // center selected?
-         (event.type == EVENT_OBJECT_RTANK   ||
-          event.type == EVENT_OBJECT_RFLY    ||
-          event.type == EVENT_OBJECT_RTHUMP  ||
-          event.type == EVENT_OBJECT_RCANON  ||
-          event.type == EVENT_OBJECT_RTOWER  ||
-          event.type == EVENT_OBJECT_RPHAZER ||
-          event.type == EVENT_OBJECT_RSHIELD ||
-          event.type == EVENT_OBJECT_RATOMIC ) )
+    if ( m_object->GetSelect() )  // center selected?
     {
-        if ( m_phase != ALP_WAIT )
-        {
+        Error err = ERR_GENERIC;
+        if ( event.type == EVENT_OBJECT_RTANK   ) err = StartAction(RESEARCH_TANK);
+        if ( event.type == EVENT_OBJECT_RFLY    ) err = StartAction(RESEARCH_FLY);
+        if ( event.type == EVENT_OBJECT_RTHUMP  ) err = StartAction(RESEARCH_THUMP);
+        if ( event.type == EVENT_OBJECT_RCANON  ) err = StartAction(RESEARCH_CANON);
+        if ( event.type == EVENT_OBJECT_RTOWER  ) err = StartAction(RESEARCH_TOWER);
+        if ( event.type == EVENT_OBJECT_RPHAZER ) err = StartAction(RESEARCH_PHAZER);
+        if ( event.type == EVENT_OBJECT_RSHIELD ) err = StartAction(RESEARCH_SHIELD);
+        if ( event.type == EVENT_OBJECT_RATOMIC ) err = StartAction(RESEARCH_ATOMIC);
+
+        if( err != ERR_OK && err != ERR_GENERIC )
+            m_displayText->DisplayError(err, m_object);
+
+        if( err != ERR_GENERIC )
             return false;
-        }
-
-        m_research = event.type;
-
-        if ( TestResearch(m_research) )
-        {
-            m_displayText->DisplayError(ERR_RESEARCH_ALREADY, m_object);
-            return false;
-        }
-
-        power = m_object->GetPower();
-        if ( power == 0 )
-        {
-            m_displayText->DisplayError(ERR_RESEARCH_POWER, m_object);
-            return false;
-        }
-        if ( power->GetCapacity() > 1.0f )
-        {
-            m_displayText->DisplayError(ERR_RESEARCH_TYPE, m_object);
-            return false;
-        }
-        if ( power->GetEnergy() < 1.0f )
-        {
-            m_displayText->DisplayError(ERR_RESEARCH_ENERGY, m_object);
-            return false;
-        }
-
-        time = SEARCH_TIME;
-        if ( event.type == EVENT_OBJECT_RTANK   )  time *= 0.3f;
-        if ( event.type == EVENT_OBJECT_RFLY    )  time *= 0.3f;
-        if ( event.type == EVENT_OBJECT_RATOMIC )  time *= 2.0f;
-
-        SetBusy(true);
-        InitProgressTotal(time);
-        UpdateInterface();
-
-        m_channelSound = m_sound->Play(SOUND_RESEARCH, m_object->GetPosition(0), 0.0f, 1.0f, true);
-        m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f,      2.0f, SOPER_CONTINUE);
-        m_sound->AddEnvelope(m_channelSound, 1.0f, 1.0f, time-4.0f, SOPER_CONTINUE);
-        m_sound->AddEnvelope(m_channelSound, 0.0f, 1.0f,      2.0f, SOPER_STOP);
-
-        m_phase    = ALP_SEARCH;
-        m_progress = 0.0f;
-        m_speed    = 1.0f/time;
-        return true;
     }
 
     if ( event.type != EVENT_FRAME )  return true;
@@ -236,18 +249,25 @@ bool CAutoResearch::EventProcess(const Event &event)
         }
         else
         {
-            SetResearch(m_research);  // research done
+            g_researchDone |= m_research;  // research done
+
+            m_main->WriteFreeParam();
+
+            Event newEvent(EVENT_UPDINTERFACE);
+            m_eventQueue->AddEvent(newEvent);
+            UpdateInterface();
+
             m_displayText->DisplayError(INFO_RESEARCH, m_object);
 
             message = ERR_OK;
-            if ( m_research == EVENT_OBJECT_RTANK   )  message = INFO_RESEARCHTANK;
-            if ( m_research == EVENT_OBJECT_RFLY    )  message = INFO_RESEARCHFLY;
-            if ( m_research == EVENT_OBJECT_RTHUMP  )  message = INFO_RESEARCHTHUMP;
-            if ( m_research == EVENT_OBJECT_RCANON  )  message = INFO_RESEARCHCANON;
-            if ( m_research == EVENT_OBJECT_RTOWER  )  message = INFO_RESEARCHTOWER;
-            if ( m_research == EVENT_OBJECT_RPHAZER )  message = INFO_RESEARCHPHAZER;
-            if ( m_research == EVENT_OBJECT_RSHIELD )  message = INFO_RESEARCHSHIELD;
-            if ( m_research == EVENT_OBJECT_RATOMIC )  message = INFO_RESEARCHATOMIC;
+            if ( m_research == RESEARCH_TANK   )  message = INFO_RESEARCHTANK;
+            if ( m_research == RESEARCH_FLY    )  message = INFO_RESEARCHFLY;
+            if ( m_research == RESEARCH_THUMP  )  message = INFO_RESEARCHTHUMP;
+            if ( m_research == RESEARCH_CANON  )  message = INFO_RESEARCHCANON;
+            if ( m_research == RESEARCH_TOWER  )  message = INFO_RESEARCHTOWER;
+            if ( m_research == RESEARCH_PHAZER )  message = INFO_RESEARCHPHAZER;
+            if ( m_research == RESEARCH_SHIELD )  message = INFO_RESEARCHSHIELD;
+            if ( m_research == RESEARCH_ATOMIC )  message = INFO_RESEARCHATOMIC;
             if ( message != ERR_OK )
             {
                 m_displayText->DisplayError(message, m_object);
@@ -474,27 +494,6 @@ bool CAutoResearch::TestResearch(EventType event)
     return false;
 }
 
-// Indicates a search as made.
-
-void CAutoResearch::SetResearch(EventType event)
-{
-
-    if ( event == EVENT_OBJECT_RTANK   )  g_researchDone |= RESEARCH_TANK;
-    if ( event == EVENT_OBJECT_RFLY    )  g_researchDone |= RESEARCH_FLY;
-    if ( event == EVENT_OBJECT_RTHUMP  )  g_researchDone |= RESEARCH_THUMP;
-    if ( event == EVENT_OBJECT_RCANON  )  g_researchDone |= RESEARCH_CANON;
-    if ( event == EVENT_OBJECT_RTOWER  )  g_researchDone |= RESEARCH_TOWER;
-    if ( event == EVENT_OBJECT_RPHAZER )  g_researchDone |= RESEARCH_PHAZER;
-    if ( event == EVENT_OBJECT_RSHIELD )  g_researchDone |= RESEARCH_SHIELD;
-    if ( event == EVENT_OBJECT_RATOMIC )  g_researchDone |= RESEARCH_ATOMIC;
-
-    m_main->WriteFreeParam();
-
-    Event   newEvent(EVENT_UPDINTERFACE);
-    m_eventQueue->AddEvent(newEvent);
-    UpdateInterface();
-}
-
 
 // Updates the stop lights.
 
@@ -600,7 +599,7 @@ bool CAutoResearch::Read(char *line)
     m_phase = static_cast< AutoResearchPhase >(OpInt(line, "aPhase", ALP_WAIT));
     m_progress = OpFloat(line, "aProgress", 0.0f);
     m_speed = OpFloat(line, "aSpeed", 1.0f);
-    m_research = static_cast< EventType >(OpInt(line, "aResearch", 0));
+    m_research = static_cast< ResearchType >(OpInt(line, "aResearch", 0));
 
     m_lastUpdateTime = 0.0f;
     m_lastParticle = 0.0f;
@@ -608,4 +607,3 @@ bool CAutoResearch::Read(char *line)
     return true;
 }
 
-
diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h
index 6c804ef..dcb9f7b 100644
--- a/src/object/auto/autoresearch.h
+++ b/src/object/auto/autoresearch.h
@@ -41,6 +41,7 @@ public:
     void        DeleteObject(bool bAll=false);
 
     void        Init();
+    Error       StartAction(int result);
     bool        EventProcess(const Event &event);
     Error       GetError();
 
@@ -54,7 +55,6 @@ protected:
     void        UpdateInterface(float rTime);
     void        OkayButton(Ui::CWindow *pw, EventType event);
     bool        TestResearch(EventType event);
-    void        SetResearch(EventType event);
     void        FireStopUpdate(float progress, bool bLightOn);
 
 protected:
@@ -64,7 +64,7 @@ protected:
     float               m_timeVirus;
     float               m_lastUpdateTime;
     float               m_lastParticle;
-    EventType            m_research;
+    ResearchType        m_research;
     int                 m_partiStop[6];
     int                 m_channelSound;
 };
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp
index a390e90..7e5c5e7 100644
--- a/src/object/auto/autoroot.cpp
+++ b/src/object/auto/autoroot.cpp
@@ -115,4 +115,3 @@ Error CAutoRoot::GetError()
     return ERR_OK;
 }
 
-
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp
index fc83400..2871a70 100644
--- a/src/object/auto/autosafe.cpp
+++ b/src/object/auto/autosafe.cpp
@@ -400,7 +400,7 @@ int CAutoSafe::CountKeys()
     Math::Vector    cPos, oPos;
     Math::Point     rot;
     ObjectType  oType;
-    float       dist, angle, limit, cAngle, oAngle;
+    float       dist, angle, limit = 0.0f, cAngle, oAngle = 0.0f;
     int         i, index;
 
     cPos   = m_object->GetPosition(0);
@@ -611,5 +611,3 @@ CObject* CAutoSafe::SearchVehicle()
     return 0;
 }
 
-
-
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp
index a2f5b6b..2c0aa02 100644
--- a/src/object/auto/autostation.cpp
+++ b/src/object/auto/autostation.cpp
@@ -82,7 +82,7 @@ bool CAutoStation::EventProcess(const Event &event)
     Math::Matrix*   mat;
     Math::Vector    pos, ppos, speed;
     Math::Point     dim;
-    CObject*    vehicule;
+    CObject*    vehicle;
     CObject*    power;
     Gfx::TerrainRes  res;
     float       big, energy, used, add, freq;
@@ -133,10 +133,10 @@ bool CAutoStation::EventProcess(const Event &event)
     freq = 1.0f;
     if ( big > 0.0f )
     {
-        vehicule = SearchVehicle();
-        if ( vehicule != 0 )
+        vehicle = SearchVehicle();
+        if ( vehicle != 0 )
         {
-            power = vehicule->GetPower();
+            power = vehicle->GetPower();
             if ( power != 0 && power->GetCapacity() == 1.0f )
             {
                 energy = power->GetEnergy();
@@ -149,7 +149,7 @@ bool CAutoStation::EventProcess(const Event &event)
                 big -= add/4.0f;  // discharge the large battery
             }
 
-            power = vehicule->GetFret();
+            power = vehicle->GetFret();
             if ( power != 0 && power->GetType() == OBJECT_POWER )
             {
                 energy = power->GetEnergy();
@@ -368,4 +368,3 @@ void CAutoStation::UpdateInterface(float rTime)
     }
 }
 
-
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp
index e3b06cf..17a41f4 100644
--- a/src/object/auto/autotower.cpp
+++ b/src/object/auto/autotower.cpp
@@ -397,7 +397,7 @@ void CAutoTower::FireStopUpdate(float progress, bool bLightOn)
                 pos.y = 18.0f;
                 pos.z = listpos[i*2+1];
                 pos = Transform(*mat, pos);
-                
+
                 m_partiStop[i] = m_particle->CreateParticle(pos, speed,
                                                               dim, Gfx::PARTISELR,
                                                               1.0f, 0.0f, 0.0f);
@@ -544,4 +544,3 @@ bool CAutoTower::Read(char *line)
     return true;
 }
 
-