From 479a67a731be5a5e8035ea7acce0344c7c605814 Mon Sep 17 00:00:00 2001
From: Zaba999 <zaba.marcin@gmail.com>
Date: Mon, 10 Sep 2012 23:29:38 +0200
Subject: Merge with changes from Zaba999 fork.

---
 src/object/motion/motion.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/object/motion/motion.cpp')

diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp
index 6278627..6b22471 100644
--- a/src/object/motion/motion.cpp
+++ b/src/object/motion/motion.cpp
@@ -95,16 +95,16 @@ bool CMotion::EventProcess(const Event &event)
     Math::Vector    pos, dir;
     float       time;
 
-    if ( m_object->RetType() != OBJECT_TOTO &&
-         m_engine->RetPause() )  return true;
+    if ( m_object->GetType() != OBJECT_TOTO &&
+         m_engine->GetPause() )  return true;
 
     if ( event.event != EVENT_FRAME )  return true;
 
     m_progress += event.rTime*m_actionTime;
     if ( m_progress > 1.0f )  m_progress = 1.0f;  // (*)
 
-    pos = m_object->RetPosition(0);
-    if ( pos.y < m_water->RetLevel(m_object) )  // underwater?
+    pos = m_object->GetPosition(0);
+    if ( pos.y < m_water->GetLevel(m_object) )  // underwater?
     {
         time = event.rTime*3.0f;  // everything is slower
     }
@@ -113,19 +113,19 @@ bool CMotion::EventProcess(const Event &event)
         time = event.rTime*10.0f;
     }
 
-    dir = m_object->RetLinVibration();
+    dir = m_object->GetLinVibration();
     dir.x = Math::Smooth(dir.x, m_linVibration.x, time);
     dir.y = Math::Smooth(dir.y, m_linVibration.y, time);
     dir.z = Math::Smooth(dir.z, m_linVibration.z, time);
     m_object->SetLinVibration(dir);
 
-    dir = m_object->RetCirVibration();
+    dir = m_object->GetCirVibration();
     dir.x = Math::Smooth(dir.x, m_cirVibration.x, time);
     dir.y = Math::Smooth(dir.y, m_cirVibration.y, time);
     dir.z = Math::Smooth(dir.z, m_cirVibration.z, time);
     m_object->SetCirVibration(dir);
 
-    dir = m_object->RetInclinaison();
+    dir = m_object->GetInclinaison();
     dir.x = Math::Smooth(dir.x, m_inclinaison.x, time);
     dir.y = Math::Smooth(dir.y, m_inclinaison.y, time);
     dir.z = Math::Smooth(dir.z, m_inclinaison.z, time);
@@ -148,9 +148,9 @@ Error CMotion::SetAction(int action, float time)
     return ERR_OK;
 }
 
-// Returns the current action.
+// Geturns the current action.
 
-int CMotion::RetAction()
+int CMotion::GetAction()
 {
     return m_actionType;
 }
@@ -163,7 +163,7 @@ bool CMotion::SetParam(int rank, float value)
     return false;
 }
 
-float CMotion::RetParam(int rank)
+float CMotion::GetParam(int rank)
 {
     return 0.0f;
 }
@@ -208,7 +208,7 @@ void CMotion::SetLinVibration(Math::Vector dir)
     m_linVibration = dir;
 }
 
-Math::Vector CMotion::RetLinVibration()
+Math::Vector CMotion::GetLinVibration()
 {
     return m_linVibration;
 }
@@ -220,7 +220,7 @@ void CMotion::SetCirVibration(Math::Vector dir)
     m_cirVibration = dir;
 }
 
-Math::Vector CMotion::RetCirVibration()
+Math::Vector CMotion::GetCirVibration()
 {
     return m_cirVibration;
 }
@@ -232,7 +232,7 @@ void CMotion::SetInclinaison(Math::Vector dir)
     m_inclinaison = dir;
 }
 
-Math::Vector CMotion::RetInclinaison()
+Math::Vector CMotion::GetInclinaison()
 {
     return m_inclinaison;
 }
-- 
cgit v1.2.3-1-g7c22