fix: addToWorld was called instead of destroyed

thanks @gfgit for spotting it!
gfgit · Aug 1, 2024 · 2e429d2 · 2e429d2
1 parent 99a3fb5
commit 2e429d2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/server/src/board/tile/misc/switchtile.cpp b/server/src/board/tile/misc/switchtile.cpp
@@ -92,7 +92,7 @@ SwitchTile::SwitchTile(World& world, std::string_view _id)
 void SwitchTile::destroying()
 {
   outputMap->parentObject.setValueInternal(nullptr);
-  Tile::addToWorld();
+  Tile::destroying();
 }
 
 void SwitchTile::addToWorld()

diff --git a/server/src/board/tile/rail/decouplerrailtile.cpp b/server/src/board/tile/rail/decouplerrailtile.cpp
@@ -77,7 +77,7 @@ DecouplerRailTile::DecouplerRailTile(World& world, std::string_view _id)
 void DecouplerRailTile::destroying()
 {
   outputMap->parentObject.setValueInternal(nullptr);
-  StraightRailTile::addToWorld();
+  StraightRailTile::destroying();
 }
 
 void DecouplerRailTile::addToWorld()

diff --git a/server/src/board/tile/rail/signal/signalrailtile.cpp b/server/src/board/tile/rail/signal/signalrailtile.cpp
@@ -142,7 +142,7 @@ bool SignalRailTile::reserve(const std::shared_ptr<BlockPath>& blockPath, bool d
 void SignalRailTile::destroying()
 {
   outputMap->parentObject.setValueInternal(nullptr);
-  StraightRailTile::addToWorld();
+  StraightRailTile::destroying();
 }
 
 void SignalRailTile::addToWorld()

diff --git a/server/src/board/tile/rail/turnout/turnoutrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutrailtile.cpp
@@ -112,7 +112,7 @@ bool TurnoutRailTile::release(bool dryRun)
 void TurnoutRailTile::destroying()
 {
   outputMap->parentObject.setValueInternal(nullptr);
-  RailTile::addToWorld();
+  RailTile::destroying();
 }
 
 void TurnoutRailTile::addToWorld()