diff options
author | erihel <erihel@gmail.com> | 2013-06-24 22:09:39 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2013-06-24 22:09:39 +0200 |
commit | 41fa8458c2e28f05a610bfc3119f86b8dc85542a (patch) | |
tree | 4a653c3f32cb0d524af2669d666fd8385b9a408f /src/graphics/engine/pyro.cpp | |
parent | 5c15855009aaab519718b80808d9e10eeda6b425 (diff) | |
download | colobot-41fa8458c2e28f05a610bfc3119f86b8dc85542a.tar.gz colobot-41fa8458c2e28f05a610bfc3119f86b8dc85542a.tar.bz2 colobot-41fa8458c2e28f05a610bfc3119f86b8dc85542a.zip |
Some Ui refactoring
Diffstat (limited to 'src/graphics/engine/pyro.cpp')
-rw-r--r-- | src/graphics/engine/pyro.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp index 7c51829..231bf51 100644 --- a/src/graphics/engine/pyro.cpp +++ b/src/graphics/engine/pyro.cpp @@ -32,8 +32,6 @@ #include "object/robotmain.h" #include "object/motion/motionhuman.h" -#include "ui/displaytext.h" - // Graphics module namespace namespace Gfx { @@ -49,7 +47,6 @@ CPyro::CPyro() m_camera = m_main->GetCamera(); m_particle = m_engine->GetParticle(); m_lightMan = m_engine->GetLightManager(); - m_displayText = m_main->GetDisplayText(); m_sound = CApplication::GetInstancePointer()->GetSound(); m_object = nullptr; @@ -1301,13 +1298,13 @@ void CPyro::DisplayError(PyroType type, CObject* obj) oType == OBJECT_END ) { err = ERR_DELETEBUILDING; - m_displayText->DisplayError(err, obj->GetPosition(0), 5.0f); + m_main->DisplayError(err, obj->GetPosition(0), 5.0f); return; } if ( err != ERR_OK ) { - m_displayText->DisplayError(err, obj); + m_main->DisplayError(err, obj); } } } |