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/taskadvance.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/taskadvance.cpp')
| -rw-r--r-- | src/object/task/taskadvance.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/object/task/taskadvance.cpp b/src/object/task/taskadvance.cpp index e50cb08..0d159d2 100644 --- a/src/object/task/taskadvance.cpp +++ b/src/object/task/taskadvance.cpp @@ -16,9 +16,6 @@ // taskadvance.cpp - -#include <stdio.h> - #include "object/task/taskadvance.h" #include "math/geometry.h" @@ -45,13 +42,13 @@ CTaskAdvance::~CTaskAdvance() bool CTaskAdvance::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_fixTime += event.rTime; // Momentarily stationary object (ant on the back)? - if ( m_object->RetFixed() ) + if ( m_object->GetFixed() ) { m_physics->SetMotorSpeedX(0.0f); // stops the advance m_physics->SetMotorSpeedZ(0.0f); // stops the rotation @@ -70,12 +67,12 @@ Error CTaskAdvance::Start(float length) { m_direction = (length>=0.0f)?1.0f:-1.0f; m_totalLength = fabs(length); - m_advanceLength = m_physics->RetLinLength(length); - m_startPos = m_object->RetPosition(0); + m_advanceLength = m_physics->GetLinLength(length); + m_startPos = m_object->GetPosition(0); m_lastDist = 0.0f; m_fixTime = 0.0f; - m_timeLimit = m_physics->RetLinTimeLength(m_totalLength, m_direction)*3.0f; + m_timeLimit = m_physics->GetLinTimeLength(m_totalLength, m_direction)*3.0f; if ( m_timeLimit < 2.0f ) m_timeLimit = 2.0f; m_physics->SetMotorSpeedX(m_direction*1.0f); // forward/backward @@ -93,7 +90,7 @@ Error CTaskAdvance::IsEnded() Math::Vector pos; float length; - if ( m_engine->RetPause() ) return ERR_CONTINUE; + if ( m_engine->GetPause() ) return ERR_CONTINUE; if ( m_bError ) { @@ -106,7 +103,7 @@ Error CTaskAdvance::IsEnded() return ERR_MOVE_IMPOSSIBLE; } - pos = m_object->RetPosition(0); + pos = m_object->GetPosition(0); length = Math::DistanceProjected(pos, m_startPos); if ( length > m_lastDist ) // forward? |