summaryrefslogtreecommitdiffstats
path: root/src/object/task/taskspiderexplo.cpp
diff options
context:
space:
mode:
authorZaba999 <zaba.marcin@gmail.com>2012-09-12 22:34:40 +0200
committerZaba999 <zaba.marcin@gmail.com>2012-09-12 22:34:40 +0200
commit8b223eb0965a74693963726efb4e884ef454b97a (patch)
treeffeb2e48e42f2c7c412dfbbec625b8b343c2b80a /src/object/task/taskspiderexplo.cpp
parent44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9 (diff)
downloadcolobot-8b223eb0965a74693963726efb4e884ef454b97a.tar.gz
colobot-8b223eb0965a74693963726efb4e884ef454b97a.tar.bz2
colobot-8b223eb0965a74693963726efb4e884ef454b97a.zip
all tasks compile.
Diffstat (limited to 'src/object/task/taskspiderexplo.cpp')
-rw-r--r--src/object/task/taskspiderexplo.cpp19
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;