From 41fa8458c2e28f05a610bfc3119f86b8dc85542a Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Mon, 24 Jun 2013 22:09:39 +0200
Subject: Some Ui refactoring

---
 src/object/task/task.cpp          | 1 -
 src/object/task/task.h            | 4 ----
 src/object/task/taskbuild.cpp     | 6 ++----
 src/object/task/taskrecover.cpp   | 4 ++--
 src/object/task/tasksearch.cpp    | 8 +++-----
 src/object/task/taskshield.cpp    | 1 +
 src/object/task/taskterraform.cpp | 1 +
 src/object/task/taskturn.cpp      | 2 +-
 8 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'src/object/task')

diff --git a/src/object/task/task.cpp b/src/object/task/task.cpp
index 5ec6f8a..3624816 100644
--- a/src/object/task/task.cpp
+++ b/src/object/task/task.cpp
@@ -35,7 +35,6 @@ CTask::CTask(CObject* object)
     m_main        = CRobotMain::GetInstancePointer();
     m_terrain     = m_main->GetTerrain();
     m_camera      = m_main->GetCamera();
-    m_displayText = m_main->GetDisplayText();
 
     m_object      = object;
     m_physics     = m_object->GetPhysics();
diff --git a/src/object/task/task.h b/src/object/task/task.h
index 41b3d3b..800b880 100644
--- a/src/object/task/task.h
+++ b/src/object/task/task.h
@@ -32,9 +32,6 @@ class CObject;
 class CRobotMain;
 class CSoundInterface;
 
-namespace Ui {
-class CDisplayText;
-} /* Ui */
 
 namespace Gfx {
 class CEngine;
@@ -84,7 +81,6 @@ protected:
     CPhysics*           m_physics;
     CObject*            m_object;
     CRobotMain*         m_main;
-    Ui::CDisplayText*   m_displayText;
     CSoundInterface*    m_sound;
 };
 
diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp
index 39479a6..4a62a4a 100644
--- a/src/object/task/taskbuild.cpp
+++ b/src/object/task/taskbuild.cpp
@@ -33,8 +33,6 @@
 
 #include "physics/physics.h"
 
-#include "ui/displaytext.h"
-
 #include <string.h>
 
 // Object's constructor.
@@ -264,7 +262,7 @@ bool CTaskBuild::EventProcess(const Event &event)
             m_camera->FlushEffect();
             Abort();
             m_bError = true;
-            m_displayText->DisplayError(ERR_TOOMANY, m_object->GetPosition(0));
+            m_main->DisplayError(ERR_TOOMANY, m_object->GetPosition(0));
             return false;
         }
         CreateLight();
@@ -486,7 +484,7 @@ Error CTaskBuild::IsEnded()
         m_building->SetCirVibration(Math::Vector(0.0f, 0.0f, 0.0f));
         m_building->SetLock(false);  // building usable
         m_main->CreateShortcuts();
-        m_displayText->DisplayError(INFO_BUILD, m_buildingPos, 10.0f, 50.0f);
+        m_main->DisplayError(INFO_BUILD, m_buildingPos, 10.0f, 50.0f);
 
         automat = m_building->GetAuto();
         if ( automat != 0 )
diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp
index b86e9a5..af84099 100644
--- a/src/object/task/taskrecover.cpp
+++ b/src/object/task/taskrecover.cpp
@@ -27,7 +27,7 @@
 
 #include "physics/physics.h"
 
-#include "ui/displaytext.h"
+#include "object/robotmain.h"
 
 
 const float ENERGY_RECOVER  = 0.25f;        // energy consumed by recovery
@@ -305,7 +305,7 @@ Error CTaskRecover::IsEnded()
             m_metal = 0;
             Abort();
             m_bError = true;
-            m_displayText->DisplayError(ERR_TOOMANY, m_object);
+            m_main->DisplayError(ERR_TOOMANY, m_object);
             return ERR_STOP;
         }
         m_metal->SetLock(true);  // metal not yet usable
diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp
index 974a53d..aa731a0 100644
--- a/src/object/task/tasksearch.cpp
+++ b/src/object/task/tasksearch.cpp
@@ -26,9 +26,7 @@
 
 #include "physics/physics.h"
 
-#include "ui/displaytext.h"
-
-
+#include "object/robotmain.h"
 
 
 // Object's constructor.
@@ -293,11 +291,11 @@ bool CTaskSearch::CreateMark()
     if ( !fret->CreateResource(pos, 0.0f, type) )
     {
         delete fret;
-        m_displayText->DisplayError(ERR_TOOMANY, m_object);
+        m_main->DisplayError(ERR_TOOMANY, m_object);
         return false;
     }
 
-    m_displayText->DisplayError(info, pos, 5.0f, 50.0f);  // displays the message
+    m_main->DisplayError(info, pos, 5.0f, 50.0f);  // displays the message
 
     return true;
 }
diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp
index fe6eaeb..e9ab157 100644
--- a/src/object/task/taskshield.cpp
+++ b/src/object/task/taskshield.cpp
@@ -26,6 +26,7 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
+#include "object/robotmain.h"
 
 #include "physics/physics.h"
 
diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp
index 1f5ef7b..096e5de 100644
--- a/src/object/task/taskterraform.cpp
+++ b/src/object/task/taskterraform.cpp
@@ -28,6 +28,7 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
+#include "object/robotmain.h"
 #include "object/motion/motionant.h"
 #include "object/motion/motionspider.h"
 
diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp
index bf9d593..9c099d2 100644
--- a/src/object/task/taskturn.cpp
+++ b/src/object/task/taskturn.cpp
@@ -20,7 +20,7 @@
 #include "graphics/engine/terrain.h"
 #include "physics/physics.h"
 
-
+#include "object/robotmain.h"
 
 
 // Object's constructor.
-- 
cgit v1.2.3-1-g7c22