4 files changed, 42 insertions, 38 deletions

diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp
index f910ea2..b310fd5 100644
--- a/src/object/task/task.cpp
+++ b/src/object/task/task.cpp
@@ -17,7 +17,7 @@
 // task.cpp
 
 
-#include <stdio.h>
+// #include <stdio.h>
 
 #include "object/task/task.h"
 
@@ -32,20 +32,20 @@ CTask::CTask(CInstanceManager* iMan, CObject* object)
 {
     m_iMan = iMan;
 
-    m_engine      = (CD3DEngine*)m_iMan->SearchInstance(CLASS_ENGINE);
-    m_light       = (CLight*)m_iMan->SearchInstance(CLASS_LIGHT);
-    m_particule   = (CParticule*)m_iMan->SearchInstance(CLASS_PARTICULE);
-    m_terrain     = (CTerrain*)m_iMan->SearchInstance(CLASS_TERRAIN);
-    m_water       = (CWater*)m_iMan->SearchInstance(CLASS_WATER);
-    m_camera      = (CCamera*)m_iMan->SearchInstance(CLASS_CAMERA);
-    m_main        = (CRobotMain*)m_iMan->SearchInstance(CLASS_MAIN);
-    m_displayText = (CDisplayText*)m_iMan->SearchInstance(CLASS_DISPLAYTEXT);
-    m_sound       = (CSound*)m_iMan->SearchInstance(CLASS_SOUND);
+    m_engine      = static_cast<Gfx::CEngine*>(m_iMan->SearchInstance(CLASS_ENGINE));
+    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_particle    = static_cast<Gfx::CParticle*>(m_iMan->SearchInstance(CLASS_PARTICULE));
+    m_camera      = static_cast<Gfx::CCamera*>(m_iMan->SearchInstance(CLASS_CAMERA));
+    m_displayText = static_cast<Ui::CDisplayText*>(m_iMan->SearchInstance(CLASS_DISPLAYTEXT));
+    m_main        = static_cast<CRobotMain*>(m_iMan->SearchInstance(CLASS_MAIN));
+    m_sound       = static_cast<CSoundInterface*>(m_iMan->SearchInstance(CLASS_SOUND));
 
     m_object      = object;
-    m_physics     = m_object->RetPhysics();
-    m_brain       = m_object->RetBrain();
-    m_motion      = m_object->RetMotion();
+    m_physics     = m_object->GetPhysics();
+    m_brain       = m_object->GetBrain();
+    m_motion      = m_object->GetMotion();
 }
 
 // Object's destructor.
diff --git a/src/object/task/task.h b/src/object/task/task.h
index a3ec62c..a0da9d2 100644
--- a/src/object/task/task.h
+++ b/src/object/task/task.h
@@ -24,19 +24,25 @@
 
 
 class CInstanceManager;
-class CD3DEngine;
-class CLight;
-class CParticule;
-class CTerrain;
-class CWater;
-class CCamera;
 class CBrain;
 class CPhysics;
 class CMotion;
 class CObject;
 class CRobotMain;
+class CSoundInterface;
+
+namespace Ui {
 class CDisplayText;
-class CSound;
+} /* Ui */ 
+
+namespace Gfx {
+class CEngine;
+class CLightManager;
+class CParticle;
+class CTerrain;
+class CWater;
+class CCamera;
+} /* Gfx */ 
 
 
 const float TAKE_DIST       = 6.0f; // distance to an object to pick it
@@ -66,21 +72,19 @@ public:
     virtual bool    Abort();
 
 protected:
-
-protected:
-    CInstanceManager* m_iMan;
-    CD3DEngine*     m_engine;
-    CLight*         m_light;
-    CParticule*     m_particule;
-    CTerrain*       m_terrain;
-    CWater*         m_water;
-    CCamera*        m_camera;
-    CMotion*        m_motion;
-    CBrain*         m_brain;
-    CPhysics*       m_physics;
-    CObject*        m_object;
-    CRobotMain*     m_main;
-    CDisplayText*   m_displayText;
-    CSound*         m_sound;
+    CInstanceManager*   m_iMan;
+    Gfx::CEngine*       m_engine;
+    Gfx::CLightManager* m_lightMan;
+    Gfx::CParticle*     m_particle;
+    Gfx::CTerrain*      m_terrain;
+    Gfx::CWater*        m_water;
+    Gfx::CCamera*       m_camera;
+    CMotion*            m_motion;
+    CBrain*             m_brain;
+    CPhysics*           m_physics;
+    CObject*            m_object;
+    CRobotMain*         m_main;
+    Ui::CDisplayText*   m_displayText;
+    CSoundInterface*    m_sound;
 };
 
diff --git a/src/object/task/taskmanager.cpp b/src/object/task/taskmanager.cpp
index d81fb5b..171be1d 100644
--- a/src/object/task/taskmanager.cpp
+++ b/src/object/task/taskmanager.cpp
@@ -136,7 +136,7 @@ Error CTaskManager::StartTaskSearch()
 
 // Reads an information terminal.
 
-Error CTaskManager::StartTaskInfo(char *name, float value, float power, bool bSend)
+Error CTaskManager::StartTaskInfo(const char *name, float value, float power, bool bSend)
 {
     m_task = new CTaskInfo(m_iMan, m_object);
     return ((CTaskInfo*)m_task)->Start(name, value, power, bSend);
diff --git a/src/object/task/taskmanager.h b/src/object/task/taskmanager.h
index 14fc276..6ce023a 100644
--- a/src/object/task/taskmanager.h
+++ b/src/object/task/taskmanager.h
@@ -43,7 +43,7 @@ public:
     Error   StartTaskFlag(TaskFlagOrder order, int rank);
     Error   StartTaskBuild(ObjectType type);
     Error   StartTaskSearch();
-    Error   StartTaskInfo(char *name, float value, float power, bool bSend);
+    Error   StartTaskInfo(const char *name, float value, float power, bool bSend);
     Error   StartTaskTerraform();
     Error   StartTaskPen(bool bDown, int color);
     Error   StartTaskRecover();