From 8b223eb0965a74693963726efb4e884ef454b97a Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Wed, 12 Sep 2012 22:34:40 +0200 Subject: all tasks compile. --- src/object/task/taskturn.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/object/task/taskturn.cpp') 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 - #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 ) { -- cgit v1.2.3-1-g7c22