summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-11-03 13:04:57 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2013-11-03 13:04:57 +0100
commitf1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2 (patch)
treeb9e7e75a2138875ffed59772a2a1c7cf82b7aaa4 /src/object
parentec38c14ee8293b2dc7436e0c06b0c294652c84cc (diff)
parentd8e50e4eeb2dde3e0d228e2bead29d73494f8874 (diff)
downloadcolobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.tar.gz
colobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.tar.bz2
colobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.zip
Colobot Gold 0.1.1-alpha
Diffstat (limited to 'src/object')
-rw-r--r--src/object/auto/auto.cpp2
-rw-r--r--src/object/auto/auto.h2
-rw-r--r--src/object/auto/autobase.cpp5
-rw-r--r--src/object/auto/autoconvert.cpp5
-rw-r--r--src/object/auto/autoderrick.cpp3
-rw-r--r--src/object/auto/autodestroyer.cpp3
-rw-r--r--src/object/auto/autoenergy.cpp5
-rw-r--r--src/object/auto/autofactory.cpp7
-rw-r--r--src/object/auto/autolabo.cpp5
-rw-r--r--src/object/auto/autonuclear.cpp5
-rw-r--r--src/object/auto/autoresearch.cpp7
-rw-r--r--src/object/auto/autotower.cpp3
-rw-r--r--src/object/brain.cpp6
-rw-r--r--src/object/brain.h2
-rw-r--r--src/object/object.cpp7
-rw-r--r--src/object/object.h5
-rw-r--r--src/object/robotmain.cpp22
-rw-r--r--src/object/robotmain.h3
-rw-r--r--src/object/task/task.cpp1
-rw-r--r--src/object/task/task.h4
-rw-r--r--src/object/task/taskbuild.cpp6
-rw-r--r--src/object/task/taskrecover.cpp4
-rw-r--r--src/object/task/tasksearch.cpp8
-rw-r--r--src/object/task/taskshield.cpp1
-rw-r--r--src/object/task/taskterraform.cpp1
-rw-r--r--src/object/task/taskturn.cpp2
26 files changed, 52 insertions, 72 deletions
diff --git a/src/object/auto/auto.cpp b/src/object/auto/auto.cpp
index 8dc1d94..0aeaa0a 100644
--- a/src/object/auto/auto.cpp
+++ b/src/object/auto/auto.cpp
@@ -52,7 +52,6 @@ CAuto::CAuto(CObject* object)
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;
@@ -83,7 +82,6 @@ CAuto::~CAuto()
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 4a430ce..fd25e70 100644
--- a/src/object/auto/auto.h
+++ b/src/object/auto/auto.h
@@ -28,7 +28,6 @@ class CRobotMain;
class CSoundInterface;
namespace Ui {
-class CDisplayText;
class CInterface;
class CWindow;
} /* Ui */
@@ -101,7 +100,6 @@ protected:
Gfx::CLightning* m_lightning;
Gfx::CCamera* m_camera;
Ui::CInterface* m_interface;
- Ui::CDisplayText* m_displayText;
CRobotMain* m_main;
CObject* m_object;
CSoundInterface* m_sound;
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp
index d0bd87b..6d61bc2 100644
--- a/src/object/auto/autobase.cpp
+++ b/src/object/auto/autobase.cpp
@@ -34,7 +34,6 @@
#include "ui/interface.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
@@ -317,14 +316,14 @@ begin:
err = CheckCloseDoor();
if ( err != ERR_OK )
{
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
return false;
}
err = m_main->CheckEndMission(false);
if ( err != ERR_OK )
{
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
return false;
}
diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp
index 7281ed7..ee1e83b 100644
--- a/src/object/auto/autoconvert.cpp
+++ b/src/object/auto/autoconvert.cpp
@@ -26,7 +26,6 @@
#include "ui/interface.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -515,7 +514,7 @@ void CAutoConvert::CreateMetal()
if ( !fret->CreateResource(pos, angle, OBJECT_METAL) )
{
delete fret;
- m_displayText->DisplayError(ERR_TOOMANY, m_object);
+ m_main->DisplayError(ERR_TOOMANY, m_object);
return;
}
@@ -524,6 +523,6 @@ void CAutoConvert::CreateMetal()
fret->SetResetCap(RESET_DELETE);
}
- m_displayText->DisplayError(INFO_CONVERT, m_object);
+ m_main->DisplayError(INFO_CONVERT, m_object);
}
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp
index b613406..5b6cea4 100644
--- a/src/object/auto/autoderrick.cpp
+++ b/src/object/auto/autoderrick.cpp
@@ -28,7 +28,6 @@
#include "ui/interface.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -535,7 +534,7 @@ void CAutoDerrick::CreateFret(Math::Vector pos, float angle, ObjectType type,
if ( !fret->CreateResource(pos, angle, type) )
{
delete fret;
- m_displayText->DisplayError(ERR_TOOMANY, m_object);
+ m_main->DisplayError(ERR_TOOMANY, m_object);
return;
}
fret->SetLock(true); // object not yet usable
diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp
index fdaebc0..dfe8e78 100644
--- a/src/object/auto/autodestroyer.cpp
+++ b/src/object/auto/autodestroyer.cpp
@@ -24,7 +24,6 @@
#include "ui/interface.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -122,7 +121,7 @@ bool CAutoDestroyer::EventProcess(const Event &event)
{
Error err = StartAction(0);
if ( err != ERR_OK )
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
return false;
}
diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp
index 6a8672b..a38caf2 100644
--- a/src/object/auto/autoenergy.cpp
+++ b/src/object/auto/autoenergy.cpp
@@ -29,7 +29,6 @@
#include "ui/interface.h"
#include "ui/gauge.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -325,7 +324,7 @@ bool CAutoEnergy::EventProcess(const Event &event)
fret->SetPosition(0, Math::Vector(0.0f, 3.0f, 0.0f));
m_object->SetPower(fret);
- m_displayText->DisplayError(INFO_ENERGY, m_object);
+ m_main->DisplayError(INFO_ENERGY, m_object);
}
SetBusy(false);
@@ -468,7 +467,7 @@ void CAutoEnergy::CreatePower()
if ( !power->CreateResource(pos, angle, OBJECT_POWER) )
{
delete power;
- m_displayText->DisplayError(ERR_TOOMANY, m_object);
+ m_main->DisplayError(ERR_TOOMANY, m_object);
return;
}
power->SetLock(true); // battery not yet usable
diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp
index a648656..49abad4 100644
--- a/src/object/auto/autofactory.cpp
+++ b/src/object/auto/autofactory.cpp
@@ -32,7 +32,6 @@
#include "ui/interface.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -211,7 +210,7 @@ bool CAutoFactory::EventProcess(const Event &event)
Error err = StartAction(type);
if( err != ERR_OK && err != ERR_GENERIC )
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
if( err != ERR_GENERIC )
return false;
@@ -379,7 +378,7 @@ bool CAutoFactory::EventProcess(const Event &event)
}
else
{
- m_displayText->DisplayError(INFO_FACTORY, m_object);
+ m_main->DisplayError(INFO_FACTORY, m_object);
SoundManip(2.0f, 1.0f, 1.2f);
fret = SearchFret(); // transform metal?
@@ -678,7 +677,7 @@ bool CAutoFactory::CreateVehicle()
if ( !vehicle->CreateVehicle(pos, angle, m_type, -1.0f, false, false) )
{
delete vehicle;
- m_displayText->DisplayError(ERR_TOOMANY, m_object);
+ m_main->DisplayError(ERR_TOOMANY, m_object);
return false;
}
vehicle->UpdateMapping();
diff --git a/src/object/auto/autolabo.cpp b/src/object/auto/autolabo.cpp
index 172a618..07112b7 100644
--- a/src/object/auto/autolabo.cpp
+++ b/src/object/auto/autolabo.cpp
@@ -29,7 +29,6 @@
#include "ui/interface.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -179,7 +178,7 @@ bool CAutoLabo::EventProcess(const Event &event)
if ( event.type == EVENT_OBJECT_RiGUN ) err = StartAction(RESEARCH_iGUN);
if( err != ERR_OK && err != ERR_GENERIC )
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
if( err != ERR_GENERIC )
return false;
@@ -370,7 +369,7 @@ bool CAutoLabo::EventProcess(const Event &event)
delete power;
}
- m_displayText->DisplayError(INFO_LABO, m_object);
+ m_main->DisplayError(INFO_LABO, m_object);
SoundManip(1.5f, 1.0f, 0.5f);
m_phase = ALAP_CLOSE1;
diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp
index 224776d..edab5eb 100644
--- a/src/object/auto/autonuclear.cpp
+++ b/src/object/auto/autonuclear.cpp
@@ -26,7 +26,6 @@
#include "ui/interface.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -274,7 +273,7 @@ bool CAutoNuclear::EventProcess(const Event &event)
SetBusy(false);
UpdateInterface();
- m_displayText->DisplayError(INFO_NUCLEAR, m_object);
+ m_main->DisplayError(INFO_NUCLEAR, m_object);
m_phase = ANUP_WAIT;
m_progress = 0.0f;
@@ -402,7 +401,7 @@ void CAutoNuclear::CreatePower()
if ( !power->CreateResource(pos, angle, OBJECT_ATOMIC) )
{
delete power;
- m_displayText->DisplayError(ERR_TOOMANY, m_object);
+ m_main->DisplayError(ERR_TOOMANY, m_object);
return;
}
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp
index 8308ebe..834a48c 100644
--- a/src/object/auto/autoresearch.cpp
+++ b/src/object/auto/autoresearch.cpp
@@ -29,7 +29,6 @@
#include "ui/interface.h"
#include "ui/gauge.h"
#include "ui/window.h"
-#include "ui/displaytext.h"
#include <stdio.h>
#include <string.h>
@@ -178,7 +177,7 @@ bool CAutoResearch::EventProcess(const Event &event)
if ( event.type == EVENT_OBJECT_RATOMIC ) err = StartAction(RESEARCH_ATOMIC);
if( err != ERR_OK && err != ERR_GENERIC )
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
if( err != ERR_GENERIC )
return false;
@@ -257,7 +256,7 @@ bool CAutoResearch::EventProcess(const Event &event)
m_eventQueue->AddEvent(newEvent);
UpdateInterface();
- m_displayText->DisplayError(INFO_RESEARCH, m_object);
+ m_main->DisplayError(INFO_RESEARCH, m_object);
message = ERR_OK;
if ( m_research == RESEARCH_TANK ) message = INFO_RESEARCHTANK;
@@ -270,7 +269,7 @@ bool CAutoResearch::EventProcess(const Event &event)
if ( m_research == RESEARCH_ATOMIC ) message = INFO_RESEARCHATOMIC;
if ( message != ERR_OK )
{
- m_displayText->DisplayError(message, m_object);
+ m_main->DisplayError(message, m_object);
}
SetBusy(false);
diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp
index 17a41f4..329cab0 100644
--- a/src/object/auto/autotower.cpp
+++ b/src/object/auto/autotower.cpp
@@ -27,7 +27,6 @@
#include "script/cmdtoken.h"
#include "ui/interface.h"
-#include "ui/displaytext.h"
#include "ui/window.h"
#include "ui/gauge.h"
@@ -179,7 +178,7 @@ bool CAutoTower::EventProcess(const Event &event)
target = SearchTarget(m_targetPos);
if ( energy < ENERGY_FIRE )
{
- m_displayText->DisplayError(ERR_TOWER_ENERGY, m_object);
+ m_main->DisplayError(ERR_TOWER_ENERGY, m_object);
}
if ( target == 0 || energy < ENERGY_FIRE )
{
diff --git a/src/object/brain.cpp b/src/object/brain.cpp
index 9e5149e..1b1565a 100644
--- a/src/object/brain.cpp
+++ b/src/object/brain.cpp
@@ -35,7 +35,6 @@
#include "sound/sound.h"
-#include "ui/displaytext.h"
#include "ui/interface.h"
#include "ui/slider.h"
#include "ui/studio.h"
@@ -61,7 +60,6 @@ CBrain::CBrain(CObject* object)
m_terrain = m_main->GetTerrain();
m_camera = m_main->GetCamera();
m_interface = m_main->GetInterface();
- m_displayText = m_main->GetDisplayText();
m_sound = CApplication::GetInstancePointer()->GetSound();
m_physics = nullptr;
m_motion = nullptr;
@@ -733,7 +731,7 @@ bool CBrain::EventProcess(const Event &event)
if ( err != ERR_OK )
{
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
}
return true;
@@ -1201,7 +1199,7 @@ void CBrain::GroundFlat()
err = ERR_FLAG_FLY;
pos = m_object->GetPosition(0);
if ( pos.y < m_water->GetLevel() ) err = ERR_FLAG_WATER;
- m_displayText->DisplayError(err, m_object);
+ m_main->DisplayError(err, m_object);
return;
}
diff --git a/src/object/brain.h b/src/object/brain.h
index dcf07a4..a1f5da7 100644
--- a/src/object/brain.h
+++ b/src/object/brain.h
@@ -43,7 +43,6 @@ namespace Ui {
class CStudio;
class CInterface;
class CWindow;
-class CDisplayText;
}
namespace Gfx {
@@ -177,7 +176,6 @@ protected:
CPhysics* m_physics;
CMotion* m_motion;
Ui::CInterface* m_interface;
- Ui::CDisplayText* m_displayText;
CRobotMain* m_main;
Ui::CStudio* m_studio;
CSoundInterface* m_sound;
diff --git a/src/object/object.cpp b/src/object/object.cpp
index 4cf0688..5a709e6 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -79,8 +79,6 @@
#include "script/cbottoken.h"
#include "script/cmdtoken.h"
-#include "ui/displaytext.h"
-
#define ADJUST_ONBOARD false // true -> adjusts the camera ONBOARD
@@ -228,7 +226,6 @@ CObject::CObject()
m_main = CRobotMain::GetInstancePointer();
m_terrain = m_main->GetTerrain();
m_camera = m_main->GetCamera();
- m_displayText = m_main->GetDisplayText();
m_physics = nullptr;
m_brain = nullptr;
m_motion = nullptr;
@@ -5988,7 +5985,7 @@ bool CObject::EventFrame(const Event &event)
m_sound->Play(SOUND_FINDING);
pyro = new Gfx::CPyro();
pyro->Create(Gfx::PT_FINDING, this, 0.0f);
- m_displayText->DisplayError(INFO_FINDING, this);
+ m_main->DisplayError(INFO_FINDING, this);
}
}
@@ -6639,7 +6636,7 @@ void CObject::SetSelect(bool bMode, bool bDisplayError)
}
if ( err != ERR_OK && bDisplayError )
{
- m_displayText->DisplayError(err, this);
+ m_main->DisplayError(err, this);
}
}
diff --git a/src/object/object.h b/src/object/object.h
index 25ea708..e8b83d9 100644
--- a/src/object/object.h
+++ b/src/object/object.h
@@ -38,10 +38,6 @@ class CRobotMain;
class CBotVar;
class CScript;
-namespace Ui {
-class CDisplayText;
-}
-
/**
* \enum ObjectType
@@ -689,7 +685,6 @@ protected:
CBrain* m_brain;
CMotion* m_motion;
CAuto* m_auto;
- Ui::CDisplayText* m_displayText;
CRobotMain* m_main;
CSoundInterface* m_sound;
CBotVar* m_botVar;
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index b58e5f8..6fe85d3 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -107,7 +107,7 @@ float g_unit; // conversion factor
// Static variables
static CBotClass* m_pClassFILE;
-static CBotProgram* m_pFuncFile;
+//static CBotProgram* m_pFuncFile;
static int m_CompteurFileOpen = 0;
static std::string m_filesDir;
@@ -503,10 +503,10 @@ void InitClassFILE()
m_pClassFILE->AddFunction("readln", rfread, cfread );
m_pClassFILE->AddFunction("eof", rfeof, cfeof );
- m_pFuncFile = new CBotProgram( );
- CBotStringArray ListFonctions;
- m_pFuncFile->Compile( "public file openfile(string name, string mode) {return new file(name, mode);}", ListFonctions);
- m_pFuncFile->SetIdent(-2); // restoreState in special identifier for this function
+ //m_pFuncFile = new CBotProgram( );
+ //CBotStringArray ListFonctions;
+ //m_pFuncFile->Compile( "public file openfile(string name, string mode) {return new file(name, mode);}", ListFonctions);
+ //m_pFuncFile->SetIdent(-2); // restoreState in special identifier for this function
}
@@ -1104,6 +1104,7 @@ void CRobotMain::ChangePhase(Phase phase)
ChangePause(false);
FlushDisplayInfo();
m_engine->SetRankView(0);
+ m_terrain->FlushRelief();
m_engine->DeleteAllObjects();
Gfx::CModelManager::GetInstancePointer()->DeleteAllModelCopies();
m_engine->SetWaterAddColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f));
@@ -3842,9 +3843,9 @@ void CRobotMain::Convert()
void CRobotMain::ScenePerso()
{
DeleteAllObjects(); // removes all the current 3D Scene
+ m_terrain->FlushRelief();
m_engine->DeleteAllObjects();
Gfx::CModelManager::GetInstancePointer()->DeleteAllModelCopies();
- m_terrain->FlushRelief(); // all flat
m_terrain->FlushBuildingLevel();
m_terrain->FlushFlyingLimit();
m_lightMan->FlushLights();
@@ -7520,3 +7521,12 @@ void CRobotMain::RestoreNumericLocale()
setlocale(LC_NUMERIC, m_oldLocale.c_str());
}
+void CRobotMain::DisplayError(Error err, CObject* pObj, float time)
+{
+ m_displayText->DisplayError(err, pObj, time);
+}
+
+void CRobotMain::DisplayError(Error err, Math::Vector goal, float height, float dist, float time)
+{
+ m_displayText->DisplayError(err, goal, height, dist, time);
+}
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index 525e5df..035698c 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -379,6 +379,9 @@ public:
CObject* GetSelect();
+ void DisplayError(Error err, CObject* pObj, float time=10.0f);
+ void DisplayError(Error err, Math::Vector goal, float height=15.0f, float dist=60.0f, float time=10.0f);
+
protected:
bool EventFrame(const Event &event);
bool EventObject(const Event &event);
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.