Reverse movement fixes

diff --git a/src/sbs/escalator.cpp b/src/sbs/escalator.cpp
index 2fd60d6..318ec94 100644 (file)
--- a/src/sbs/escalator.cpp
+++ b/src/sbs/escalator.cpp
@@ -336,7 +336,7 @@ void Escalator::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().x;
                                if (pos > start.x)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x - treadsize, end.y, end.z));
                                else if (pos <= end.x + treadsize || pos >= start.x - (treadsize * 2))
                                        Steps[i]->Move(Ogre::Vector3(-Run, 0, 0), Speed);
                                else if (pos < start.x - treadsize)
@@ -346,7 +346,7 @@ void Escalator::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().x;
                                if (pos < start.x)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x + treadsize, end.y, end.z));
                                else if (pos >= end.x - treadsize || pos <= start.x + (treadsize * 2))
                                        Steps[i]->Move(Ogre::Vector3(Run, 0, 0), Speed);
                                else if (pos > start.x + treadsize)
@@ -356,7 +356,7 @@ void Escalator::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().z;
                                if (pos > start.z)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x, end.y, end.z - treadsize));
                                else if (pos <= end.z + treadsize || pos >= start.z - (treadsize * 2))
                                        Steps[i]->Move(Ogre::Vector3(0, 0, -Run), Speed);
                                else if (pos < start.z - treadsize)
@@ -366,7 +366,7 @@ void Escalator::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().z;
                                if (pos < start.z)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x, end.y, end.z + treadsize));
                                else if (pos >= end.z - treadsize || pos <= start.z + (treadsize * 2))
                                        Steps[i]->Move(Ogre::Vector3(0, 0, Run), Speed);
                                else if (pos > start.z + treadsize)

diff --git a/src/sbs/movingwalkway.cpp b/src/sbs/movingwalkway.cpp
index 2a19488..f97a477 100644 (file)
--- a/src/sbs/movingwalkway.cpp
+++ b/src/sbs/movingwalkway.cpp
@@ -273,7 +273,7 @@ void MovingWalkway::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().x;
                                if (pos > start.x)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x - treadsize, end.y, end.z));
                                else
                                        Steps[i]->Move(Ogre::Vector3(-Run, 0, 0), Speed);
                        }
@@ -281,7 +281,7 @@ void MovingWalkway::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().x;
                                if (pos < start.x)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x + treadsize, end.y, end.z));
                                else
                                        Steps[i]->Move(Ogre::Vector3(Run, 0, 0), Speed);
                        }
@@ -289,7 +289,7 @@ void MovingWalkway::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().z;
                                if (pos > start.z)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x, end.y, end.z - treadsize));
                                else
                                        Steps[i]->Move(Ogre::Vector3(0, 0, -Run), Speed);
                        }
@@ -297,7 +297,7 @@ void MovingWalkway::MoveSteps()
                        {
                                float pos = Steps[i]->GetPosition().z;
                                if (pos < start.z)
-                                       Steps[i]->SetPosition(end);
+                                       Steps[i]->SetPosition(Ogre::Vector3(end.x, end.y, end.z + treadsize));
                                else
                                        Steps[i]->Move(Ogre::Vector3(0, 0, Run), Speed);
                        }