diff options
author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-12 22:34:40 +0200 |
---|---|---|
committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-12 22:34:40 +0200 |
commit | 8b223eb0965a74693963726efb4e884ef454b97a (patch) | |
tree | ffeb2e48e42f2c7c412dfbbec625b8b343c2b80a /src/object/task/taskwait.cpp | |
parent | 44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9 (diff) | |
download | colobot-8b223eb0965a74693963726efb4e884ef454b97a.tar.gz colobot-8b223eb0965a74693963726efb4e884ef454b97a.tar.bz2 colobot-8b223eb0965a74693963726efb4e884ef454b97a.zip |
all tasks compile.
Diffstat (limited to 'src/object/task/taskwait.cpp')
-rw-r--r-- | src/object/task/taskwait.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index 03bddcb..f612c24 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -16,14 +16,9 @@ // taskwait.cpp - -#include <stdio.h> - #include "object/task/taskwait.h" -#include "old/d3dengine.h" - - +#include "graphics/engine/engine.h" // Object's constructor. @@ -43,8 +38,8 @@ CTaskWait::~CTaskWait() bool CTaskWait::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; m_passTime += event.rTime; m_bEnded = (m_passTime >= m_waitTime); @@ -66,7 +61,7 @@ Error CTaskWait::Start(float time) Error CTaskWait::IsEnded() { - if ( m_engine->RetPause() ) return ERR_CONTINUE; + if ( m_engine->GetPause() ) return ERR_CONTINUE; if ( m_bEnded ) return ERR_STOP; return ERR_CONTINUE; } |