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

Tracerestrict: Allow referencing competitor infra where allowed by sharing

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-09-06 15:22:20 +01:00
parent 943586016d
commit 8824130b66
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tracerestrict_gui.cpp
View File

@@ -44,6 +44,7 @@
#include "table/sprites.h" #include "table/sprites.h"
#include "toolbar_gui.h" #include "toolbar_gui.h"
#include "core/geometry_func.hpp" #include "core/geometry_func.hpp"
#include "infrastructure_func.h"
#include "safeguards.h" #include "safeguards.h"
@@ -2033,7 +2034,7 @@ public:
return; return;
} }
if (!IsTileOwner(tile, _local_company)) { if (!IsInfraTileUsageAllowed(VEH_TRAIN, _local_company, tile)) {
ShowErrorMessage(error_message, STR_ERROR_AREA_IS_OWNED_BY_ANOTHER, WL_INFO); ShowErrorMessage(error_message, STR_ERROR_AREA_IS_OWNED_BY_ANOTHER, WL_INFO);
return; return;
} }
@@ -2049,7 +2050,7 @@ public:
TraceRestrictItem item = GetSelected(); TraceRestrictItem item = GetSelected();
if (GetTraceRestrictTypeProperties(item).value_type != TRVT_TILE_INDEX) return; if (GetTraceRestrictTypeProperties(item).value_type != TRVT_TILE_INDEX) return;
if (!IsTileOwner(tile, _local_company)) { if (!IsInfraTileUsageAllowed(VEH_TRAIN, _local_company, tile)) {
ShowErrorMessage(error_message, STR_ERROR_AREA_IS_OWNED_BY_ANOTHER, WL_INFO); ShowErrorMessage(error_message, STR_ERROR_AREA_IS_OWNED_BY_ANOTHER, WL_INFO);
return; return;
} }