diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
commit | 7479f486b671acb2a6aea2c84a56b383aaba00ca (patch) | |
tree | 4043545a14234dfaa2d7d08d59c7ee9ee97f0de9 /src/object/task/taskspiderexplo.cpp | |
parent | 901f10b2bac18a2063cd21798f22b3917e8519b5 (diff) | |
parent | 57d33d79ea570773d84ad81d4a61f50e079979ef (diff) | |
download | colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.gz colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.bz2 colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.zip |
Forgotten fix in dev-graphics
Diffstat (limited to 'src/object/task/taskspiderexplo.cpp')
-rw-r--r-- | src/object/task/taskspiderexplo.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/object/task/taskspiderexplo.cpp b/src/object/task/taskspiderexplo.cpp index fa505b1..8110870 100644 --- a/src/object/task/taskspiderexplo.cpp +++ b/src/object/task/taskspiderexplo.cpp @@ -16,12 +16,9 @@ // taskspiderexplo.cpp - -#include <stdio.h> - #include "object/task/taskspiderexplo.h" -#include "old/pyro.h" +#include "graphics/engine/pyro.h" #include "object/motion/motionspider.h" #include "physics/physics.h" @@ -48,11 +45,11 @@ CTaskSpiderExplo::~CTaskSpiderExplo() bool CTaskSpiderExplo::EventProcess(const Event &event) { - if ( m_engine->RetPause() ) return true; - if ( event.event != EVENT_FRAME ) return true; + if ( m_engine->GetPause() ) return true; + if ( event.type != EVENT_FRAME ) return true; // Momentarily stationary object (ant on the back)? - if ( m_object->RetFixed() ) + if ( m_object->GetFixed() ) { m_bError = true; return true; @@ -82,9 +79,9 @@ Error CTaskSpiderExplo::Start() Error CTaskSpiderExplo::IsEnded() { - CPyro* pyro; + Gfx::CPyro* pyro; - if ( m_engine->RetPause() ) return ERR_CONTINUE; + if ( m_engine->GetPause() ) return ERR_CONTINUE; if ( m_bError ) { @@ -94,8 +91,8 @@ Error CTaskSpiderExplo::IsEnded() if ( m_time < 1.0f ) return ERR_CONTINUE; - pyro = new CPyro(m_iMan); - pyro->Create(PT_SPIDER, m_object); // the spider explodes (suicide) + pyro = new Gfx::CPyro(m_iMan); + pyro->Create(Gfx::PT_SPIDER, m_object); // the spider explodes (suicide) Abort(); return ERR_STOP; |