dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure that CmdBuildSingleRail failure cannot modify tile rail types

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-11-21 16:49:41 +00:00
parent f5499852b6
commit ffbb4622ad
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rail_cmd.cpp
View File

@@ -37,6 +37,7 @@
#include "spritecache.h" #include "spritecache.h"
#include "core/container_func.hpp" #include "core/container_func.hpp"
#include "news_func.h" #include "news_func.h"
#include "scope.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/railtypes.h" #include "table/railtypes.h"
@@ -586,6 +587,15 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u
if (!IsPlainRail(tile)) return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); // just get appropriate error message if (!IsPlainRail(tile)) return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); // just get appropriate error message
const RailType old_rt = GetRailType(tile);
const RailType old_secondary_rt = GetSecondaryRailType(tile);
auto rt_guard = scope_guard([&]() {
if (flags & DC_EXEC) {
SetRailType(tile, old_rt);
SetSecondaryRailType(tile, old_secondary_rt);
}
});
ret = CheckTrackCombination(tile, trackbit, railtype, disable_dual_rail_type, flags); ret = CheckTrackCombination(tile, trackbit, railtype, disable_dual_rail_type, flags);
if (ret.Succeeded()) { if (ret.Succeeded()) {
cost.AddCost(ret); cost.AddCost(ret);
@@ -600,6 +610,8 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
cost.AddCost(ret); cost.AddCost(ret);
rt_guard.cancel();
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
SetRailGroundType(tile, RAIL_GROUND_BARREN); SetRailGroundType(tile, RAIL_GROUND_BARREN);
TrackBits bits = GetTrackBits(tile); TrackBits bits = GetTrackBits(tile);