From a937a7b6ec081ab546505e5ab1fcd9b3723a6f4b Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sun, 27 Jan 2013 11:43:53 +0100
Subject: Changed model min/max to LOD levels

---
 src/object/auto/autoportico.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/object/auto')

diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp
index 3b3bf84..c0be784 100644
--- a/src/object/auto/autoportico.cpp
+++ b/src/object/auto/autoportico.cpp
@@ -398,7 +398,6 @@ Error CAutoPortico::GetError()
 void CAutoPortico::UpdateTrackMapping(float left, float right)
 {
     Gfx::Material   mat;
-    float           limit[2];
     int             rank;
 
     memset( &mat, 0, sizeof(Gfx::Material));
@@ -411,15 +410,12 @@ void CAutoPortico::UpdateTrackMapping(float left, float right)
 
     rank = m_object->GetObjectRank(0);
 
-    limit[0] = 0.0f;
-    limit[1] = 1000000.0f;
-
     m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART1, "lemt.png", "",
-                                  limit[0], limit[1], Gfx::ENG_TEX_MAPPING_X,
+                                  Gfx::LOD_Constant, Gfx::ENG_TEX_MAPPING_X,
                                   right, 8.0f, 8.0f, 192.0f, 256.0f);
 
     m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART2, "lemt.png", "",
-                                  limit[0], limit[1], Gfx::ENG_TEX_MAPPING_X,
+                                  Gfx::LOD_Constant, Gfx::ENG_TEX_MAPPING_X,
                                   left, 8.0f, 8.0f, 192.0f, 256.0f);
 }
 
-- 
cgit v1.2.3-1-g7c22


From 8658d6da8060cdb741c668d4be1b571ef064d01d Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Wed, 13 Feb 2013 16:57:59 +0100
Subject: Added Destroyer from Ceebot-Teen. We need a new icon for it.

---
 src/object/auto/autodestroyer.cpp | 90 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 11 deletions(-)

(limited to 'src/object/auto')

diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp
index ecf7c94..644071c 100644
--- a/src/object/auto/autodestroyer.cpp
+++ b/src/object/auto/autodestroyer.cpp
@@ -111,18 +111,39 @@ bool CAutoDestroyer::EventProcess(const Event &event)
 
                 if ( SearchVehicle() )
                 {
-                    m_phase    = ADEP_WAIT;  // still waiting ...
-                    m_progress = 0.0f;
-                    m_speed    = 1.0f/0.5f;
+                    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
                 {
-                    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;
+                    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;
+                    }
                 }
             }
         }
@@ -243,8 +264,55 @@ CObject* CAutoDestroyer::SearchPlastic()
         if ( pObj == nullptr )  break;
 
         type = pObj->GetType();
-        if ( type != OBJECT_SCRAP4 &&
-             type != OBJECT_SCRAP5 )  continue;
+        //if ( type != OBJECT_SCRAP4 &&
+        //     type != OBJECT_SCRAP5 )  continue;
+        if ( type != OBJECT_FRET     &&
+             type != OBJECT_STONE    &&
+             type != OBJECT_URANIUM  &&
+             type != OBJECT_METAL    &&
+             type != OBJECT_POWER    &&
+             type != OBJECT_ATOMIC   &&
+             type != OBJECT_TNT      &&
+             type != OBJECT_SCRAP1   &&
+             type != OBJECT_SCRAP2   &&
+             type != OBJECT_SCRAP3   &&
+             type != OBJECT_SCRAP4   &&
+             type != OBJECT_SCRAP5   &&
+             // Robots:
+             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;
+
 
         oPos = pObj->GetPosition(0);
         dist = Math::Distance(oPos, sPos);
-- 
cgit v1.2.3-1-g7c22


From 001d37b257b126dd6ef1dced70f94ff3d2806d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dziwi=C5=84ski?= <piotr.dziwinski@nsn.com>
Date: Sat, 16 Feb 2013 22:37:43 +0100
Subject: CInstanceManager refactoring

 * removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
---
 src/object/auto/auto.cpp          | 54 ++++++++++++++++++++++++++-------------
 src/object/auto/auto.h            |  7 +++--
 src/object/auto/autobase.cpp      | 14 ++++++----
 src/object/auto/autobase.h        |  2 +-
 src/object/auto/autoconvert.cpp   |  8 +++---
 src/object/auto/autoconvert.h     |  2 +-
 src/object/auto/autoderrick.cpp   |  9 ++++---
 src/object/auto/autoderrick.h     |  2 +-
 src/object/auto/autodestroyer.cpp |  7 ++---
 src/object/auto/autodestroyer.h   |  2 +-
 src/object/auto/autoegg.cpp       | 11 ++++----
 src/object/auto/autoegg.h         |  2 +-
 src/object/auto/autoenergy.cpp    |  9 ++++---
 src/object/auto/autoenergy.h      |  2 +-
 src/object/auto/autofactory.cpp   | 10 +++++---
 src/object/auto/autofactory.h     |  2 +-
 src/object/auto/autoflag.cpp      |  3 +--
 src/object/auto/autoflag.h        |  2 +-
 src/object/auto/autohuston.cpp    |  3 +--
 src/object/auto/autohuston.h      |  2 +-
 src/object/auto/autoinfo.cpp      |  3 +--
 src/object/auto/autoinfo.h        |  2 +-
 src/object/auto/autojostle.cpp    |  3 +--
 src/object/auto/autojostle.h      |  2 +-
 src/object/auto/autokid.cpp       |  3 +--
 src/object/auto/autokid.h         |  2 +-
 src/object/auto/autolabo.cpp      | 11 +++++---
 src/object/auto/autolabo.h        |  2 +-
 src/object/auto/automush.cpp      |  4 +--
 src/object/auto/automush.h        |  2 +-
 src/object/auto/autonest.cpp      |  7 ++---
 src/object/auto/autonest.h        |  2 +-
 src/object/auto/autonuclear.cpp   |  8 +++---
 src/object/auto/autonuclear.h     |  2 +-
 src/object/auto/autopara.cpp      |  6 +++--
 src/object/auto/autopara.h        |  2 +-
 src/object/auto/autoportico.cpp   |  3 +--
 src/object/auto/autoportico.h     |  2 +-
 src/object/auto/autoradar.cpp     |  5 ++--
 src/object/auto/autoradar.h       |  2 +-
 src/object/auto/autorepair.cpp    |  6 +++--
 src/object/auto/autorepair.h      |  2 +-
 src/object/auto/autoresearch.cpp  |  9 ++++---
 src/object/auto/autoresearch.h    |  2 +-
 src/object/auto/autoroot.cpp      |  4 +--
 src/object/auto/autoroot.h        |  2 +-
 src/object/auto/autosafe.cpp      |  7 +++--
 src/object/auto/autosafe.h        |  2 +-
 src/object/auto/autostation.cpp   |  6 +++--
 src/object/auto/autostation.h     |  2 +-
 src/object/auto/autotower.cpp     |  7 +++--
 src/object/auto/autotower.h       |  2 +-
 52 files changed, 164 insertions(+), 113 deletions(-)

(limited to 'src/object/auto')

diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp
index 4003193..3d88012 100644
--- a/src/object/auto/auto.cpp
+++ b/src/object/auto/auto.cpp
@@ -18,8 +18,13 @@
 #include "object/auto/auto.h"
 
 
+#include "app/app.h"
+
+#include "common/event.h"
 #include "common/iman.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/gauge.h"
 #include "ui/window.h"
@@ -30,26 +35,24 @@
 
 // Object's constructor.
 
-CAuto::CAuto(CInstanceManager* iMan, CObject* object)
+CAuto::CAuto(CObject* object)
 {
-    m_iMan = iMan;
-    m_iMan->AddInstance(CLASS_AUTO, this, 100);
+    m_iMan = CInstanceManager::GetInstancePointer();
 
     m_object      = object;
-    m_event       = static_cast< CEventQueue* >(m_iMan->SearchInstance(CLASS_EVENT));
-    m_engine      = static_cast< Gfx::CEngine* >(m_iMan->SearchInstance(CLASS_ENGINE));
-    m_particle    = static_cast< Gfx::CParticle* >(m_iMan->SearchInstance(CLASS_PARTICULE));
-    m_lightMan    = static_cast< Gfx::CLightManager* >(m_iMan->SearchInstance(CLASS_LIGHT));
-    m_terrain     = static_cast< Gfx::CTerrain* >(m_iMan->SearchInstance(CLASS_TERRAIN));
-    m_water       = static_cast< Gfx::CWater* >(m_iMan->SearchInstance(CLASS_WATER));
-    m_cloud       = static_cast< Gfx::CCloud* >(m_iMan->SearchInstance(CLASS_CLOUD));
-    m_planet      = static_cast< Gfx::CPlanet* >(m_iMan->SearchInstance(CLASS_PLANET));
-    m_lightning   = static_cast< Gfx::CLightning* >(m_iMan->SearchInstance(CLASS_BLITZ));
-    m_camera      = static_cast< Gfx::CCamera* >(m_iMan->SearchInstance(CLASS_CAMERA));
-    m_interface   = static_cast< Ui::CInterface* >(m_iMan->SearchInstance(CLASS_INTERFACE));
-    m_main        = static_cast< CRobotMain* >(m_iMan->SearchInstance(CLASS_MAIN));
-    m_displayText = static_cast< Ui::CDisplayText* >(m_iMan->SearchInstance(CLASS_DISPLAYTEXT));
-    m_sound       = static_cast< CSoundInterface* >(m_iMan->SearchInstance(CLASS_SOUND));
+    m_engine      = Gfx::CEngine::GetInstancePointer();
+    m_main        = CRobotMain::GetInstancePointer();
+    m_eventQueue  = CApplication::GetInstancePointer()->GetEventQueue();
+    m_sound       = CApplication::GetInstancePointer()->GetSound();
+    m_particle    = m_engine->GetParticle();
+    m_terrain     = m_engine->GetTerrain();
+    m_water       = m_engine->GetWater();
+    m_cloud       = m_engine->GetCloud();
+    m_planet      = m_engine->GetPlanet();
+    m_lightning   = m_engine->GetLightning();
+    m_camera      = m_main->GetCamera();
+    m_interface   = m_main->GetInterface();
+    m_displayText = m_main->GetDisplayText();
 
     m_type = m_object->GetType();
     m_time = 0.0f;
@@ -65,7 +68,22 @@ CAuto::CAuto(CInstanceManager* iMan, CObject* object)
 
 CAuto::~CAuto()
 {
-    m_iMan->DeleteInstance(CLASS_AUTO, this);
+    m_iMan = nullptr;
+
+    m_object      = nullptr;
+    m_engine      = nullptr;
+    m_main        = nullptr;
+    m_eventQueue  = nullptr;
+    m_sound       = nullptr;
+    m_particle    = nullptr;
+    m_terrain     = nullptr;
+    m_water       = nullptr;
+    m_cloud       = nullptr;
+    m_planet      = nullptr;
+    m_lightning   = nullptr;
+    m_camera      = nullptr;
+    m_interface   = nullptr;
+    m_displayText = nullptr;
 }
 
 
diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h
index 2194924..53ccdf9 100644
--- a/src/object/auto/auto.h
+++ b/src/object/auto/auto.h
@@ -50,7 +50,7 @@ class CLightning;
 class CAuto
 {
 public:
-    CAuto(CInstanceManager* iMan, CObject* object);
+    CAuto(CObject* object);
     virtual ~CAuto();
 
     virtual void    DeleteObject(bool bAll=false);
@@ -88,11 +88,10 @@ protected:
     void        UpdateInterface(float rTime);
 
 protected:
-    CInstanceManager*   m_iMan;
-    CEventQueue*        m_event;
+    CInstanceManager*   m_iMan; // TODO: to be removed
+    CEventQueue*        m_eventQueue;
     Gfx::CEngine*       m_engine;
     Gfx::CParticle*     m_particle;
-    Gfx::CLightManager* m_lightMan;
     Gfx::CTerrain*      m_terrain;
     Gfx::CWater*        m_water;
     Gfx::CCloud*        m_cloud;
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp
index 8370517..cb7f04c 100644
--- a/src/object/auto/autobase.cpp
+++ b/src/object/auto/autobase.cpp
@@ -20,13 +20,18 @@
 #include "object/auto/autobase.h"
 
 #include "common/iman.h"
+
 #include "graphics/engine/terrain.h"
 #include "graphics/engine/cloud.h"
 #include "graphics/engine/planet.h"
 #include "graphics/engine/lightning.h"
+
 #include "math/geometry.h"
+
 #include "object/robotmain.h"
+
 #include "physics/physics.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 #include "ui/displaytext.h"
@@ -47,8 +52,7 @@ const float BASE_TRANSIT_TIME       = 15.0f;    // transit duration
 
 // Object's constructor.
 
-CAutoBase::CAutoBase(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+CAutoBase::CAutoBase(CObject* object) : CAuto(object)
 {
     m_fogStart = m_engine->GetFogStart();
     m_deepView = m_engine->GetDeepView();
@@ -329,7 +333,7 @@ begin:
         m_main->DeselectAll();
 
         newEvent.type = EVENT_UPDINTERFACE;
-        m_event->AddEvent(newEvent);
+        m_eventQueue->AddEvent(newEvent);
 
         m_camera->SetType(Gfx::CAM_TYPE_SCRIPT);
 
@@ -843,7 +847,7 @@ begin:
         {
             m_soundChannel = -1;
             newEvent.type = EVENT_WIN;
-            m_event->AddEvent(newEvent);
+            m_eventQueue->AddEvent(newEvent);
 
             m_phase    = ABP_WAIT;
             m_progress = 0.0f;
@@ -1176,7 +1180,7 @@ bool CAutoBase::Abort()
              m_phase == ABP_TAKEOFF )  // off?
         {
             newEvent.type = EVENT_WIN;
-            m_event->AddEvent(newEvent);
+            m_eventQueue->AddEvent(newEvent);
         }
     }
 
diff --git a/src/object/auto/autobase.h b/src/object/auto/autobase.h
index 439d414..422f340 100644
--- a/src/object/auto/autobase.h
+++ b/src/object/auto/autobase.h
@@ -65,7 +65,7 @@ enum AutoBasePhase
 class CAutoBase : public CAuto
 {
 public:
-    CAutoBase(CInstanceManager* iMan, CObject* object);
+    CAutoBase(CObject* object);
     ~CAutoBase();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp
index a550697..7281ed7 100644
--- a/src/object/auto/autoconvert.cpp
+++ b/src/object/auto/autoconvert.cpp
@@ -19,8 +19,11 @@
 #include "object/auto/autoconvert.h"
 
 #include "common/iman.h"
+
 #include "math/geometry.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 #include "ui/displaytext.h"
@@ -31,8 +34,7 @@
 
 // Object's constructor.
 
-CAutoConvert::CAutoConvert(CInstanceManager* iMan, CObject* object)
-                           : CAuto(iMan, object)
+CAutoConvert::CAutoConvert(CObject* object) : CAuto(object)
 {
     Init();
     m_phase = ACP_STOP;
@@ -509,7 +511,7 @@ void CAutoConvert::CreateMetal()
     pos = m_object->GetPosition(0);
     angle = m_object->GetAngleY(0);
 
-    fret = new CObject(m_iMan);
+    fret = new CObject();
     if ( !fret->CreateResource(pos, angle, OBJECT_METAL) )
     {
         delete fret;
diff --git a/src/object/auto/autoconvert.h b/src/object/auto/autoconvert.h
index b21690f..56591f7 100644
--- a/src/object/auto/autoconvert.h
+++ b/src/object/auto/autoconvert.h
@@ -38,7 +38,7 @@ enum AutoConvertPhase
 class CAutoConvert : public CAuto
 {
 public:
-    CAutoConvert(CInstanceManager* iMan, CObject* object);
+    CAutoConvert(CObject* object);
     ~CAutoConvert();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp
index 3578c0d..260edcb 100644
--- a/src/object/auto/autoderrick.cpp
+++ b/src/object/auto/autoderrick.cpp
@@ -19,9 +19,13 @@
 #include "object/auto/autoderrick.h"
 
 #include "common/iman.h"
+
 #include "graphics/engine/terrain.h"
+
 #include "math/geometry.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 #include "ui/displaytext.h"
@@ -38,8 +42,7 @@ const float DERRICK_DELAYu  = 30.0f;    // same, but for uranium
 
 // Object's constructor.
 
-CAutoDerrick::CAutoDerrick(CInstanceManager* iMan, CObject* object)
-                           : CAuto(iMan, object)
+CAutoDerrick::CAutoDerrick(CObject* object) : CAuto(object)
 {
     Init();
     m_phase = ADP_WAIT;  // paused until the first Init ()
@@ -528,7 +531,7 @@ void CAutoDerrick::CreateFret(Math::Vector pos, float angle, ObjectType type,
 {
     CObject*        fret;
 
-    fret = new CObject(m_iMan);
+    fret = new CObject();
     if ( !fret->CreateResource(pos, angle, type) )
     {
         delete fret;
diff --git a/src/object/auto/autoderrick.h b/src/object/auto/autoderrick.h
index b52f93b..81ed8b4 100644
--- a/src/object/auto/autoderrick.h
+++ b/src/object/auto/autoderrick.h
@@ -38,7 +38,7 @@ enum AutoDerrickPhase
 class CAutoDerrick : public CAuto
 {
 public:
-    CAutoDerrick(CInstanceManager* iMan, CObject* object);
+    CAutoDerrick(CObject* object);
     ~CAutoDerrick();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp
index 644071c..b62a45a 100644
--- a/src/object/auto/autodestroyer.cpp
+++ b/src/object/auto/autodestroyer.cpp
@@ -19,7 +19,9 @@
 #include "object/auto/autodestroyer.h"
 
 #include "common/iman.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 
@@ -29,8 +31,7 @@
 
 // Object's constructor.
 
-CAutoDestroyer::CAutoDestroyer(CInstanceManager* iMan, CObject* object)
-                         : CAuto(iMan, object)
+CAutoDestroyer::CAutoDestroyer(CObject* object) : CAuto(object)
 {
     Init();
     m_phase = ADEP_WAIT;  // paused until the first Init ()
@@ -156,7 +157,7 @@ bool CAutoDestroyer::EventProcess(const Event &event)
             scrap = SearchPlastic();
             if ( scrap != nullptr )
             {
-                pyro = new Gfx::CPyro(m_iMan);
+                pyro = new Gfx::CPyro();
                 pyro->Create(Gfx::PT_FRAGT, scrap);
             }
             m_bExplo = true;
diff --git a/src/object/auto/autodestroyer.h b/src/object/auto/autodestroyer.h
index 50858d3..26981c3 100644
--- a/src/object/auto/autodestroyer.h
+++ b/src/object/auto/autodestroyer.h
@@ -37,7 +37,7 @@ enum AutoDestroyerPhase
 class CAutoDestroyer : public CAuto
 {
 public:
-    CAutoDestroyer(CInstanceManager* iMan, CObject* object);
+    CAutoDestroyer(CObject* object);
     ~CAutoDestroyer();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp
index 5b90ef9..e510ca6 100644
--- a/src/object/auto/autoegg.cpp
+++ b/src/object/auto/autoegg.cpp
@@ -18,8 +18,10 @@
 
 #include "object/auto/autoegg.h"
 
-#include "math/geometry.h"
 #include "common/iman.h"
+
+#include "math/geometry.h"
+
 #include "script/cmdtoken.h"
 
 #include <stdio.h>
@@ -28,8 +30,7 @@
 
 // Object's constructor.
 
-CAutoEgg::CAutoEgg(CInstanceManager* iMan, CObject* object)
-                   : CAuto(iMan, object)
+CAutoEgg::CAutoEgg(CObject* object) : CAuto(object)
 {
     m_type = OBJECT_NULL;
     m_value = 0.0f;
@@ -174,7 +175,7 @@ bool CAutoEgg::EventProcess(const Event &event)
         m_progress += event.rTime*m_speed;
         if ( m_progress < 1.0f )  return true;
 
-        alien = new CObject(m_iMan);
+        alien = new CObject();
         if ( !alien->CreateInsect(m_object->GetPosition(0), m_object->GetAngleY(0), m_type) )
         {
             delete alien;
@@ -236,7 +237,7 @@ Error CAutoEgg::IsEnded()
     {
         if ( m_progress < 1.0f )  return ERR_CONTINUE;
 
-        pyro = new Gfx::CPyro(m_iMan);
+        pyro = new Gfx::CPyro();
         pyro->Create(Gfx::PT_EGG, m_object);  // exploding egg
 
         alien->SetZoom(0, 1.0f);  // this is a big boy now
diff --git a/src/object/auto/autoegg.h b/src/object/auto/autoegg.h
index fec07a6..00725db 100644
--- a/src/object/auto/autoegg.h
+++ b/src/object/auto/autoegg.h
@@ -37,7 +37,7 @@ enum AutoEggPhase
 class CAutoEgg : public CAuto
 {
 public:
-    CAutoEgg(CInstanceManager* iMan, CObject* object);
+    CAutoEgg(CObject* object);
     ~CAutoEgg();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp
index c63dede..a0b4d85 100644
--- a/src/object/auto/autoenergy.cpp
+++ b/src/object/auto/autoenergy.cpp
@@ -19,9 +19,13 @@
 #include "object/auto/autoenergy.h"
 
 #include "common/iman.h"
+
 #include "graphics/engine/terrain.h"
+
 #include "math/geometry.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/gauge.h"
 #include "ui/window.h"
@@ -39,8 +43,7 @@ const float ENERGY_DELAY    = 12.0f;    // processing time
 
 // Object's constructor.
 
-CAutoEnergy::CAutoEnergy(CInstanceManager* iMan, CObject* object)
-                         : CAuto(iMan, object)
+CAutoEnergy::CAutoEnergy(CObject* object) : CAuto(object)
 {
     m_partiSphere = -1;
     Init();
@@ -461,7 +464,7 @@ void CAutoEnergy::CreatePower()
     pos = m_object->GetPosition(0);
     angle = m_object->GetAngleY(0);
 
-    power = new CObject(m_iMan);
+    power = new CObject();
     if ( !power->CreateResource(pos, angle, OBJECT_POWER) )
     {
         delete power;
diff --git a/src/object/auto/autoenergy.h b/src/object/auto/autoenergy.h
index 53d47b6..d3ed5fe 100644
--- a/src/object/auto/autoenergy.h
+++ b/src/object/auto/autoenergy.h
@@ -38,7 +38,7 @@ enum AutoEnergyPhase
 class CAutoEnergy : public CAuto
 {
 public:
-    CAutoEnergy(CInstanceManager* iMan, CObject* object);
+    CAutoEnergy(CObject* object);
     ~CAutoEnergy();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp
index 0789443..82877c6 100644
--- a/src/object/auto/autofactory.cpp
+++ b/src/object/auto/autofactory.cpp
@@ -20,10 +20,15 @@
 
 #include "common/global.h"
 #include "common/iman.h"
+
 #include "math/geometry.h"
+
 #include "object/robotmain.h"
+
 #include "physics/physics.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 #include "ui/displaytext.h"
@@ -35,8 +40,7 @@
 
 // Object's constructor.
 
-CAutoFactory::CAutoFactory(CInstanceManager* iMan, CObject* object)
-                           : CAuto(iMan, object)
+CAutoFactory::CAutoFactory(CObject* object) : CAuto(object)
 {
     Init();
     m_type  = OBJECT_MOBILEws;
@@ -632,7 +636,7 @@ bool CAutoFactory::CreateVehicle()
     }
     pos = Transform(*mat, pos);
 
-    vehicle = new CObject(m_iMan);
+    vehicle = new CObject();
     if ( !vehicle->CreateVehicle(pos, angle, m_type, -1.0f, false, false) )
     {
         delete vehicle;
diff --git a/src/object/auto/autofactory.h b/src/object/auto/autofactory.h
index f62080d..7c5013d 100644
--- a/src/object/auto/autofactory.h
+++ b/src/object/auto/autofactory.h
@@ -40,7 +40,7 @@ enum AutoFactoryPhase
 class CAutoFactory : public CAuto
 {
 public:
-    CAutoFactory(CInstanceManager* iMan, CObject* object);
+    CAutoFactory(CObject* object);
     ~CAutoFactory();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp
index c2dec5c..936546d 100644
--- a/src/object/auto/autoflag.cpp
+++ b/src/object/auto/autoflag.cpp
@@ -37,8 +37,7 @@ static float g_flag3 = 2.00f;
 
 // Object's constructor.
 
-CAutoFlag::CAutoFlag(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+CAutoFlag::CAutoFlag(CObject* object) : CAuto(object)
 {
     Init();
 }
diff --git a/src/object/auto/autoflag.h b/src/object/auto/autoflag.h
index 3c6cf99..c3fd35a 100644
--- a/src/object/auto/autoflag.h
+++ b/src/object/auto/autoflag.h
@@ -27,7 +27,7 @@
 class CAutoFlag : public CAuto
 {
 public:
-    CAutoFlag(CInstanceManager* iMan, CObject* object);
+    CAutoFlag(CObject* object);
     ~CAutoFlag();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autohuston.cpp b/src/object/auto/autohuston.cpp
index 1b6778d..80f9185 100644
--- a/src/object/auto/autohuston.cpp
+++ b/src/object/auto/autohuston.cpp
@@ -26,8 +26,7 @@
 
 // Object's constructor.
 
-CAutoHuston::CAutoHuston(CInstanceManager* iMan, CObject* object)
-                         : CAuto(iMan, object)
+CAutoHuston::CAutoHuston(CObject* object) : CAuto(object)
 {
     Math::Vector    pos;
     int         i;
diff --git a/src/object/auto/autohuston.h b/src/object/auto/autohuston.h
index 27b016b..f99876a 100644
--- a/src/object/auto/autohuston.h
+++ b/src/object/auto/autohuston.h
@@ -42,7 +42,7 @@ const int HUSTONMAXLENS = 20;
 class CAutoHuston : public CAuto
 {
 public:
-    CAutoHuston(CInstanceManager* iMan, CObject* object);
+    CAutoHuston(CObject* object);
     ~CAutoHuston();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoinfo.cpp b/src/object/auto/autoinfo.cpp
index 1245034..56c21d2 100644
--- a/src/object/auto/autoinfo.cpp
+++ b/src/object/auto/autoinfo.cpp
@@ -30,8 +30,7 @@
 
 // Object's constructor.
 
-CAutoInfo::CAutoInfo(CInstanceManager* iMan, CObject* object)
-                           : CAuto(iMan, object)
+CAutoInfo::CAutoInfo(CObject* object) : CAuto(object)
 {
     Init();
 }
diff --git a/src/object/auto/autoinfo.h b/src/object/auto/autoinfo.h
index 30481bb..41b74d3 100644
--- a/src/object/auto/autoinfo.h
+++ b/src/object/auto/autoinfo.h
@@ -37,7 +37,7 @@ enum AutoInfoPhase
 class CAutoInfo : public CAuto
 {
 public:
-    CAutoInfo(CInstanceManager* iMan, CObject* object);
+    CAutoInfo(CObject* object);
     ~CAutoInfo();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp
index 788b562..11952c2 100644
--- a/src/object/auto/autojostle.cpp
+++ b/src/object/auto/autojostle.cpp
@@ -23,8 +23,7 @@
 
 // Object's constructor.
 
-CAutoJostle::CAutoJostle(CInstanceManager* iMan, CObject* object)
-                           : CAuto(iMan, object)
+CAutoJostle::CAutoJostle(CObject* object) : CAuto(object)
 {
     Init();
 }
diff --git a/src/object/auto/autojostle.h b/src/object/auto/autojostle.h
index c156893..7b700ad 100644
--- a/src/object/auto/autojostle.h
+++ b/src/object/auto/autojostle.h
@@ -27,7 +27,7 @@
 class CAutoJostle : public CAuto
 {
 public:
-    CAutoJostle(CInstanceManager* iMan, CObject* object);
+    CAutoJostle(CObject* object);
     ~CAutoJostle();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autokid.cpp b/src/object/auto/autokid.cpp
index 64cd39a..a9f86b0 100644
--- a/src/object/auto/autokid.cpp
+++ b/src/object/auto/autokid.cpp
@@ -26,8 +26,7 @@
 
 // Object's constructor.
 
-CAutoKid::CAutoKid(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+CAutoKid::CAutoKid(CObject* object) : CAuto(object)
 {
     m_soundChannel = -1;
     Init();
diff --git a/src/object/auto/autokid.h b/src/object/auto/autokid.h
index 3e2fba7..19836a7 100644
--- a/src/object/auto/autokid.h
+++ b/src/object/auto/autokid.h
@@ -27,7 +27,7 @@
 class CAutoKid : public CAuto
 {
 public:
-    CAutoKid(CInstanceManager* iMan, CObject* object);
+    CAutoKid(CObject* object);
     ~CAutoKid();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp
index 70bcc5e..6984fd6 100644
--- a/src/object/auto/autolabo.cpp
+++ b/src/object/auto/autolabo.cpp
@@ -20,9 +20,13 @@
 
 #include "common/global.h"
 #include "common/misc.h"
+
 #include "math/geometry.h"
+
 #include "object/robotmain.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 #include "ui/displaytext.h"
@@ -38,8 +42,7 @@ const float LABO_DELAY = 20.0f; // duration of the analysis
 
 // Object's constructor.
 
-CAutoLabo::CAutoLabo(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+    CAutoLabo::CAutoLabo(CObject* object) : CAuto(object)
 {
     int     i;
 
@@ -543,8 +546,8 @@ void CAutoLabo::SetResearch(EventType event)
     m_main->WriteFreeParam();
 
     Event   newEvent(EVENT_UPDINTERFACE);
-//    m_event->MakeEvent(newEvent, EVENT_UPDINTERFACE);
-    m_event->AddEvent(newEvent);
+//    m_eventQueue->MakeEvent(newEvent, EVENT_UPDINTERFACE);
+    m_eventQueue->AddEvent(newEvent);
     UpdateInterface();
 }
 
diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h
index 8225462..b61e8e3 100644
--- a/src/object/auto/autolabo.h
+++ b/src/object/auto/autolabo.h
@@ -41,7 +41,7 @@ enum AutoLaboPhase
 class CAutoLabo : public CAuto
 {
 public:
-    CAutoLabo(CInstanceManager* iMan, CObject* object);
+    CAutoLabo(CObject* object);
     ~CAutoLabo();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp
index cb94590..e97e2a1 100644
--- a/src/object/auto/automush.cpp
+++ b/src/object/auto/automush.cpp
@@ -19,6 +19,7 @@
 #include "object/auto/automush.h"
 
 #include "common/iman.h"
+
 #include "script/cmdtoken.h"
 
 
@@ -28,8 +29,7 @@
 
 // Object's constructor.
 
-CAutoMush::CAutoMush(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+    CAutoMush::CAutoMush(CObject* object) : CAuto(object)
 {
     Init();
 }
diff --git a/src/object/auto/automush.h b/src/object/auto/automush.h
index 245393a..1697c5a 100644
--- a/src/object/auto/automush.h
+++ b/src/object/auto/automush.h
@@ -38,7 +38,7 @@ enum AutoMushPhase
 class CAutoMush : public CAuto
 {
 public:
-    CAutoMush(CInstanceManager* iMan, CObject* object);
+    CAutoMush(CObject* object);
     ~CAutoMush();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp
index 99927bd..1cf13d6 100644
--- a/src/object/auto/autonest.cpp
+++ b/src/object/auto/autonest.cpp
@@ -19,7 +19,9 @@
 #include "object/auto/autonest.h"
 
 #include "common/iman.h"
+
 #include "graphics/engine/terrain.h"
+
 #include "script/cmdtoken.h"
 
 #include <stdio.h>
@@ -28,8 +30,7 @@
 
 // Object's constructor.
 
-CAutoNest::CAutoNest(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+    CAutoNest::CAutoNest(CObject* object) : CAuto(object)
 {
     Init();
 }
@@ -178,7 +179,7 @@ void CAutoNest::CreateFret(Math::Vector pos, float angle, ObjectType type)
 {
     CObject*    fret;
 
-    fret = new CObject(m_iMan);
+    fret = new CObject();
     if ( !fret->CreateResource(pos, angle, type) )
     {
         delete fret;
diff --git a/src/object/auto/autonest.h b/src/object/auto/autonest.h
index 1009457..4d734a8 100644
--- a/src/object/auto/autonest.h
+++ b/src/object/auto/autonest.h
@@ -35,7 +35,7 @@ enum AutoNestPhase
 class CAutoNest : public CAuto
 {
 public:
-    CAutoNest(CInstanceManager* iMan, CObject* object);
+    CAutoNest(CObject* object);
     ~CAutoNest();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp
index 375acf0..75bfb45 100644
--- a/src/object/auto/autonuclear.cpp
+++ b/src/object/auto/autonuclear.cpp
@@ -19,8 +19,11 @@
 #include "object/auto/autonuclear.h"
 
 #include "common/iman.h"
+
 #include "math/geometry.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 #include "ui/displaytext.h"
@@ -36,8 +39,7 @@ const float NUCLEAR_DELAY = 30.0f;  // duration of the generation
 
 // Object's constructor.
 
-CAutoNuclear::CAutoNuclear(CInstanceManager* iMan, CObject* object)
-                          : CAuto(iMan, object)
+CAutoNuclear::CAutoNuclear(CObject* object) : CAuto(object)
 {
     m_channelSound = -1;
     Init();
@@ -396,7 +398,7 @@ void CAutoNuclear::CreatePower()
     pos = m_object->GetPosition(0);
     angle = m_object->GetAngleY(0);
 
-    power = new CObject(m_iMan);
+    power = new CObject();
     if ( !power->CreateResource(pos, angle, OBJECT_ATOMIC) )
     {
         delete power;
diff --git a/src/object/auto/autonuclear.h b/src/object/auto/autonuclear.h
index 06a99af..5b01bba 100644
--- a/src/object/auto/autonuclear.h
+++ b/src/object/auto/autonuclear.h
@@ -38,7 +38,7 @@ enum AutoNuclearPhase
 class CAutoNuclear : public CAuto
 {
 public:
-    CAutoNuclear(CInstanceManager* iMan, CObject* object);
+    CAutoNuclear(CObject* object);
     ~CAutoNuclear();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp
index a3082f5..ad6517b 100644
--- a/src/object/auto/autopara.cpp
+++ b/src/object/auto/autopara.cpp
@@ -20,8 +20,11 @@
 
 
 #include "common/iman.h"
+
 #include "math/geometry.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 
@@ -32,8 +35,7 @@
 
 // Object's constructor.
 
-CAutoPara::CAutoPara(CInstanceManager* iMan, CObject* object)
-                          : CAuto(iMan, object)
+CAutoPara::CAutoPara(CObject* object) : CAuto(object)
 {
     m_channelSound = -1;
     Init();
diff --git a/src/object/auto/autopara.h b/src/object/auto/autopara.h
index 10a33a8..1f0b805 100644
--- a/src/object/auto/autopara.h
+++ b/src/object/auto/autopara.h
@@ -36,7 +36,7 @@ enum AutoParaPhase
 class CAutoPara : public CAuto
 {
 public:
-    CAutoPara(CInstanceManager* iMan, CObject* object);
+    CAutoPara(CObject* object);
     ~CAutoPara();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp
index c0be784..1646874 100644
--- a/src/object/auto/autoportico.cpp
+++ b/src/object/auto/autoportico.cpp
@@ -55,8 +55,7 @@ float Progress(float a, float b, float progress)
 
 // Object's constructor.
 
-CAutoPortico::CAutoPortico(CInstanceManager* iMan, CObject* object)
-                         : CAuto(iMan, object)
+CAutoPortico::CAutoPortico(CObject* object) : CAuto(object)
 {
     Init();
     m_phase = APOP_WAIT;
diff --git a/src/object/auto/autoportico.h b/src/object/auto/autoportico.h
index c211d37..0aa580f 100644
--- a/src/object/auto/autoportico.h
+++ b/src/object/auto/autoportico.h
@@ -40,7 +40,7 @@ enum AutoPorticoPhase
 class CAutoPortico : public CAuto
 {
 public:
-    CAutoPortico(CInstanceManager* iMan, CObject* object);
+    CAutoPortico(CObject* object);
     ~CAutoPortico();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp
index 4214d17..1a10aa7 100644
--- a/src/object/auto/autoradar.cpp
+++ b/src/object/auto/autoradar.cpp
@@ -19,7 +19,9 @@
 #include "object/auto/autoradar.h"
 
 #include "common/iman.h"
+
 #include "math/geometry.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 #include "ui/gauge.h"
@@ -29,8 +31,7 @@
 
 // Object's constructor.
 
-CAutoRadar::CAutoRadar(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+CAutoRadar::CAutoRadar(CObject* object) : CAuto(object)
 {
     Init();
     m_phase = ARAP_WAIT;
diff --git a/src/object/auto/autoradar.h b/src/object/auto/autoradar.h
index e2c9df5..86833f9 100644
--- a/src/object/auto/autoradar.h
+++ b/src/object/auto/autoradar.h
@@ -37,7 +37,7 @@ enum AutoRadarPhase
 class CAutoRadar : public CAuto
 {
 public:
-    CAutoRadar(CInstanceManager* iMan, CObject* object);
+    CAutoRadar(CObject* object);
     ~CAutoRadar();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp
index cf4f33e..95b6cc8 100644
--- a/src/object/auto/autorepair.cpp
+++ b/src/object/auto/autorepair.cpp
@@ -19,8 +19,11 @@
 #include "object/auto/autorepair.h"
 
 #include "common/iman.h"
+
 #include "physics/physics.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 
@@ -30,8 +33,7 @@
 
 // Object's constructor.
 
-CAutoRepair::CAutoRepair(CInstanceManager* iMan, CObject* object)
-                         : CAuto(iMan, object)
+CAutoRepair::CAutoRepair(CObject* object) : CAuto(object)
 {
     Init();
     m_phase = ARP_WAIT;  // paused until the first Init ()
diff --git a/src/object/auto/autorepair.h b/src/object/auto/autorepair.h
index e8bb0b1..31a3c65 100644
--- a/src/object/auto/autorepair.h
+++ b/src/object/auto/autorepair.h
@@ -38,7 +38,7 @@ enum AutoRepairPhase
 class CAutoRepair : public CAuto
 {
 public:
-    CAutoRepair(CInstanceManager* iMan, CObject* object);
+    CAutoRepair(CObject* object);
     ~CAutoRepair();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp
index 9f423ec..3c32307 100644
--- a/src/object/auto/autoresearch.cpp
+++ b/src/object/auto/autoresearch.cpp
@@ -19,9 +19,13 @@
 #include "object/auto/autoresearch.h"
 
 #include "common/global.h"
+
 #include "math/geometry.h"
+
 #include "object/robotmain.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/gauge.h"
 #include "ui/window.h"
@@ -37,8 +41,7 @@ const float SEARCH_TIME = 30.0f;        // duration of a research
 
 // Object's constructor.
 
-CAutoResearch::CAutoResearch(CInstanceManager* iMan, CObject* object)
-                             : CAuto(iMan, object)
+CAutoResearch::CAutoResearch(CObject* object) : CAuto(object)
 {
     int     i;
 
@@ -488,7 +491,7 @@ void CAutoResearch::SetResearch(EventType event)
     m_main->WriteFreeParam();
 
     Event   newEvent(EVENT_UPDINTERFACE);
-    m_event->AddEvent(newEvent);
+    m_eventQueue->AddEvent(newEvent);
     UpdateInterface();
 }
 
diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h
index a838e64..6c804ef 100644
--- a/src/object/auto/autoresearch.h
+++ b/src/object/auto/autoresearch.h
@@ -35,7 +35,7 @@ enum AutoResearchPhase
 class CAutoResearch : public CAuto
 {
 public:
-    CAutoResearch(CInstanceManager* iMan, CObject* object);
+    CAutoResearch(CObject* object);
     ~CAutoResearch();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autoroot.cpp b/src/object/auto/autoroot.cpp
index 196ed5d..a390e90 100644
--- a/src/object/auto/autoroot.cpp
+++ b/src/object/auto/autoroot.cpp
@@ -19,6 +19,7 @@
 
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
+
 #include "math/geometry.h"
 
 #include <stdio.h>
@@ -26,8 +27,7 @@
 
 // Object's constructor.
 
-CAutoRoot::CAutoRoot(CInstanceManager* iMan, CObject* object)
-                     : CAuto(iMan, object)
+CAutoRoot::CAutoRoot(CObject* object) : CAuto(object)
 {
     Init();
 }
diff --git a/src/object/auto/autoroot.h b/src/object/auto/autoroot.h
index d80abe8..3eb906c 100644
--- a/src/object/auto/autoroot.h
+++ b/src/object/auto/autoroot.h
@@ -27,7 +27,7 @@
 class CAutoRoot : public CAuto
 {
 public:
-    CAutoRoot(CInstanceManager* iMan, CObject* object);
+    CAutoRoot(CObject* object);
     ~CAutoRoot();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp
index e89acea..fc83400 100644
--- a/src/object/auto/autosafe.cpp
+++ b/src/object/auto/autosafe.cpp
@@ -19,9 +19,13 @@
 #include "object/auto/autosafe.h"
 
 #include "common/iman.h"
+
 #include "math/geometry.h"
+
 #include "object/robotmain.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/window.h"
 
@@ -34,8 +38,7 @@ const float OPEN_DELAY  = 8.0f; // duration of opening
 
 // Object's constructor.
 
-CAutoSafe::CAutoSafe(CInstanceManager* iMan, CObject* object)
-                          : CAuto(iMan, object)
+CAutoSafe::CAutoSafe(CObject* object) : CAuto(object)
 {
     int     i;
 
diff --git a/src/object/auto/autosafe.h b/src/object/auto/autosafe.h
index 3c0bcce..b575b4e 100644
--- a/src/object/auto/autosafe.h
+++ b/src/object/auto/autosafe.h
@@ -36,7 +36,7 @@ enum AutoSafePhase
 class CAutoSafe : public CAuto
 {
 public:
-    CAutoSafe(CInstanceManager* iMan, CObject* object);
+    CAutoSafe(CObject* object);
     ~CAutoSafe();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp
index e99ae4b..a2f5b6b 100644
--- a/src/object/auto/autostation.cpp
+++ b/src/object/auto/autostation.cpp
@@ -19,9 +19,12 @@
 #include "object/auto/autostation.h"
 
 #include "common/iman.h"
+
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
+
 #include "math/geometry.h"
+
 #include "ui/interface.h"
 #include "ui/gauge.h"
 #include "ui/window.h"
@@ -31,8 +34,7 @@
 
 // Object's constructor.
 
-CAutoStation::CAutoStation(CInstanceManager* iMan, CObject* object)
-                           : CAuto(iMan, object)
+CAutoStation::CAutoStation(CObject* object) : CAuto(object)
 {
     Init();
 }
diff --git a/src/object/auto/autostation.h b/src/object/auto/autostation.h
index cb8be2b..d8a37b4 100644
--- a/src/object/auto/autostation.h
+++ b/src/object/auto/autostation.h
@@ -27,7 +27,7 @@
 class CAutoStation : public CAuto
 {
 public:
-    CAutoStation(CInstanceManager* iMan, CObject* object);
+    CAutoStation(CObject* object);
     ~CAutoStation();
 
     void        DeleteObject(bool bAll=false);
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp
index 84dcd85..e3b06cf 100644
--- a/src/object/auto/autotower.cpp
+++ b/src/object/auto/autotower.cpp
@@ -19,9 +19,13 @@
 #include "object/auto/autotower.h"
 
 #include "common/iman.h"
+
 #include "math/geometry.h"
+
 #include "physics/physics.h"
+
 #include "script/cmdtoken.h"
+
 #include "ui/interface.h"
 #include "ui/displaytext.h"
 #include "ui/window.h"
@@ -37,8 +41,7 @@ const float ENERGY_FIRE     = 0.125f;   // energy consumed by fire
 
 // Object's constructor.
 
-CAutoTower::CAutoTower(CInstanceManager* iMan, CObject* object)
-                       : CAuto(iMan, object)
+CAutoTower::CAutoTower(CObject* object) : CAuto(object)
 {
     int     i;
 
diff --git a/src/object/auto/autotower.h b/src/object/auto/autotower.h
index b29ba85..d219fb5 100644
--- a/src/object/auto/autotower.h
+++ b/src/object/auto/autotower.h
@@ -38,7 +38,7 @@ enum AutoTowerPhase
 class CAutoTower : public CAuto
 {
 public:
-    CAutoTower(CInstanceManager* iMan, CObject* object);
+    CAutoTower(CObject* object);
     ~CAutoTower();
 
     void        DeleteObject(bool bAll=false);
-- 
cgit v1.2.3-1-g7c22