Escalator is now in line with the floor

diff --git a/buildings/Simple - Escalator.bld b/buildings/Simple - Escalator.bld
index 81e4ff4..620875a 100644 (file)
--- a/buildings/Simple - Escalator.bld
+++ b/buildings/Simple - Escalator.bld
@@ -466,6 +466,6 @@ AddAction FireServiceBypass, Elevator1, Fire1Bypass
 
 #Create an escalator on the first floor
 <Floor 0>
-    AddEscalator Escalator 1, 1, 0.01, , Brick, left, 0, -10, 4, 1, 1, 15, 0, 1, 1
+    AddEscalator Escalator 1, 1, 0.01, , Brick, left, 0, -10, 4, 1, 1, 16, 0, 1, 1
 <EndFloor>
 

diff --git a/src/sbs/escalator.cpp b/src/sbs/escalator.cpp
index 13791e7..35bf84e 100644 (file)
--- a/src/sbs/escalator.cpp
+++ b/src/sbs/escalator.cpp
@@ -196,11 +196,11 @@ void Escalator::CreateSteps(const std::string &texture, const std::string &direc
                        sbs->AddFloorMain(wall, buffer, texture, 0, 0, -(width / 2), treadsize, width / 2, risersize, risersize, false, false, tw, th, true);
 
                        if (i < 3)
-                               Steps[i - 1]->Move(Ogre::Vector3(pos, 0, 0));
+                               Steps[i - 1]->Move(Ogre::Vector3(pos, -risersize, 0));
                        else if (i < num_steps)
-                               Steps[i - 1]->Move(Ogre::Vector3(pos, risersize * (i - 3), 0));
-                       else if (i == num_steps)
                                Steps[i - 1]->Move(Ogre::Vector3(pos, risersize * (i - 4), 0));
+                       else if (i == num_steps)
+                               Steps[i - 1]->Move(Ogre::Vector3(pos, risersize * (i - 5), 0));
 
                        if (i == 1)
                                start = Steps[i - 1]->GetPosition();
@@ -219,11 +219,11 @@ void Escalator::CreateSteps(const std::string &texture, const std::string &direc
                        sbs->AddFloorMain(wall, buffer, texture, 0, -treadsize, -(width / 2), 0, width / 2, risersize, risersize, false, false, tw, th, true);
 
                        if (i < 3)
-                               Steps[i - 1]->Move(Ogre::Vector3(pos, 0, 0));
+                               Steps[i - 1]->Move(Ogre::Vector3(pos, -risersize, 0));
                        else if (i < num_steps)
-                               Steps[i - 1]->Move(Ogre::Vector3(pos, risersize * (i - 3), 0));
-                       else if (i == num_steps)
                                Steps[i - 1]->Move(Ogre::Vector3(pos, risersize * (i - 4), 0));
+                       else if (i == num_steps)
+                               Steps[i - 1]->Move(Ogre::Vector3(pos, risersize * (i - 5), 0));
 
                        if (i == 1)
                                start = Steps[i - 1]->GetPosition();
@@ -242,11 +242,11 @@ void Escalator::CreateSteps(const std::string &texture, const std::string &direc
                        sbs->AddFloorMain(wall, buffer, texture, 0, -(width / 2), 0, width / 2, treadsize, risersize, risersize, false, false, tw, th, true);
 
                        if (i < 3)
-                               Steps[i - 1]->Move(Ogre::Vector3(0, 0, pos));
+                               Steps[i - 1]->Move(Ogre::Vector3(0, -risersize, pos));
                        else if (i < num_steps)
-                               Steps[i - 1]->Move(Ogre::Vector3(0, risersize * (i - 3), pos));
-                       else if (i == num_steps)
                                Steps[i - 1]->Move(Ogre::Vector3(0, risersize * (i - 4), pos));
+                       else if (i == num_steps)
+                               Steps[i - 1]->Move(Ogre::Vector3(0, risersize * (i - 5), pos));
 
                        if (i == 1)
                                start = Steps[i - 1]->GetPosition();
@@ -265,11 +265,11 @@ void Escalator::CreateSteps(const std::string &texture, const std::string &direc
                        sbs->AddFloorMain(wall, buffer, texture, 0, -(width / 2), -treadsize, width / 2, 0, risersize, risersize, false, false, tw, th, true);
 
                        if (i < 3)
-                               Steps[i - 1]->Move(Ogre::Vector3(0, 0, pos));
+                               Steps[i - 1]->Move(Ogre::Vector3(0, -risersize, pos));
                        else if (i < num_steps)
-                               Steps[i - 1]->Move(Ogre::Vector3(0, risersize * (i - 3), pos));
-                       else if (i == num_steps)
                                Steps[i - 1]->Move(Ogre::Vector3(0, risersize * (i - 4), pos));
+                       else if (i == num_steps)
+                               Steps[i - 1]->Move(Ogre::Vector3(0, risersize * (i - 5), pos));
 
                        if (i == 1)
                                start = Steps[i - 1]->GetPosition();