From 2e429d2e6508164c43190f753789942b7bdede4f Mon Sep 17 00:00:00 2001 From: Reinder Feenstra Date: Thu, 1 Aug 2024 23:14:04 +0200 Subject: [PATCH] fix: addToWorld was called instead of destroyed thanks @gfgit for spotting it! --- server/src/board/tile/misc/switchtile.cpp | 2 +- server/src/board/tile/rail/decouplerrailtile.cpp | 2 +- server/src/board/tile/rail/signal/signalrailtile.cpp | 2 +- server/src/board/tile/rail/turnout/turnoutrailtile.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/board/tile/misc/switchtile.cpp b/server/src/board/tile/misc/switchtile.cpp index a2ff5993..9a1f0873 100644 --- 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 index b8844219..18a309da 100644 --- 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 index 5f789eab..b14fe668 100644 --- 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, 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 index 389b0112..93fc123b 100644 --- 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()