From 479a67a731be5a5e8035ea7acce0344c7c605814 Mon Sep 17 00:00:00 2001
From: Zaba999 <zaba.marcin@gmail.com>
Date: Mon, 10 Sep 2012 23:29:38 +0200
Subject: Merge with changes from Zaba999 fork.

---
 src/object/task/task.h | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'src/object/task/task.h')

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;
 };
 
-- 
cgit v1.2.3-1-g7c22