Merge branch 'stable' of github.com:miki151/keeperrl into stable

miki151 · Apr 4, 2023 · 23a85a7 · 23a85a7
2 parents dbbb31c + 801e7ff
commit 23a85a7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/furniture.cpp b/furniture.cpp
@@ -363,9 +363,10 @@ bool Furniture::isStairs() const {
 optional<Position> Furniture::getSecondPart(Position pos) const {
   if (onBuilt)
     if (auto dir = getStairDirection(*onBuilt)) {
-      int index = *pos.getModel()->getMainLevelDepth(pos.getLevel());
-      index = pos.getModel()->getMainLevelsDepth().clamp(index + *dir);
-      return Position(pos.getCoord(), pos.getModel()->getMainLevel(index));
+      int myIndex = *pos.getModel()->getMainLevelDepth(pos.getLevel());
+      int nextIndex = pos.getModel()->getMainLevelsDepth().clamp(myIndex + *dir);
+      if (nextIndex != myIndex)
+        return Position(pos.getCoord(), pos.getModel()->getMainLevel(nextIndex));
     }
   return none;
 }