diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
| commit | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (patch) | |
| tree | 4bca38da7bc4983d47192adfcc3cc01407cfb776 /src/object/task/taskwait.cpp | |
| parent | d439f4fa93eb45175dcdfa773af8f68efa1bad9d (diff) | |
| parent | a1400f496bbe9f78f71736dce43863b6833be669 (diff) | |
| download | colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.gz colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.bz2 colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.zip | |
Merge branch 'dev-object' into dev
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
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; } |