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/taskturn.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/taskturn.cpp')
-rw-r--r-- | src/object/task/taskturn.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index f8bf26c..8f4bbd2 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -16,12 +16,9 @@ // taskturn.cpp - -#include <stdio.h> - #include "object/task/taskturn.h" -#include "old/terrain.h" +#include "graphics/engine/terrain.h" #include "physics/physics.h" @@ -45,11 +42,11 @@ CTaskTurn::~CTaskTurn() bool CTaskTurn::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_physics->SetMotorSpeedX(0.0f); // stops the advance m_physics->SetMotorSpeedZ(0.0f); // stops the rotation @@ -66,18 +63,18 @@ bool CTaskTurn::EventProcess(const Event &event) Error CTaskTurn::Start(float angle) { - m_startAngle = m_object->RetAngleY(0); + m_startAngle = m_object->GetAngleY(0); m_finalAngle = m_startAngle+angle; if ( angle < 0.0f ) { - m_angle = angle+m_physics->RetCirStopLength(); + m_angle = angle+m_physics->GetCirStopLength(); m_physics->SetMotorSpeedZ(-1.0f); // turns left m_bLeft = true; } else { - m_angle = angle-m_physics->RetCirStopLength(); + m_angle = angle-m_physics->GetCirStopLength(); m_physics->SetMotorSpeedZ(1.0f); // turns right m_bLeft = false; } @@ -94,14 +91,14 @@ Error CTaskTurn::IsEnded() { float angle; - if ( m_engine->RetPause() ) return ERR_CONTINUE; + if ( m_engine->GetPause() ) return ERR_CONTINUE; if ( m_bError ) { return ERR_STOP; } - angle = m_object->RetAngleY(0); + angle = m_object->GetAngleY(0); if ( m_bLeft ) { |