Loading

Revision differences

Return to paste
Old revision #ptitz6wfxNew revision #poipfz5h6
  1Index: src/lang/english.txt  
  2===================================================================  
  3--- src/lang/english.txt    (revision 27203)  
  4+++ src/lang/english.txt    (working copy)  
  5@@ -1252,8 +1252,8 @@  
  6 STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :Normal  
  7 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :Allow drive-through road stops on town owned roads: {STRING2}  
  8 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT                   :Allow construction of drive-through road stops on town-owned roads  
  9-STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :Allow drive-through road stops on roads owned by competitors: {STRING2}  
  10-STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :Allow construction of drive-through road stops on roads owned by other companies  
  11+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :Allow certain constructions on roads/canals owned by competitors: {STRING2}  
  12+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :Allow construction of drive-through road stops on roads owned by other companies, and construction of locks on canals owned by other companies.  
  13 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Changing this setting is not possible when there are vehicles  
  14 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Infrastructure maintenance: {STRING2}  
  15 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :When enabled, infrastructure causes maintenance costs. The cost grows over-proportional with the network size, thus affecting bigger companies more than smaller ones  
1Index: src/water_cmd.cpp  16Index: src/water_cmd.cpp  
2===================================================================  17===================================================================  
3--- src/water_cmd.cpp    (revision 27203)  18--- src/water_cmd.cpp    (revision 27203)  
… … 
6     /* lower tile */  21     /* lower tile */  
7     WaterClass wc_lower = IsWaterTile(tile - delta) ? GetWaterClass(tile - delta) : WATER_CLASS_CANAL;  22     WaterClass wc_lower = IsWaterTile(tile - delta) ? GetWaterClass(tile - delta) : WATER_CLASS_CANAL;  
8   23   
9+    if (!_settings_game.construction.road_stop_on_competitor_road && !HasTileWaterGround(tile - delta) && GetTileOwner(tile - delta) != OWNER_NONE) {  9+    if (IsCanal(tile - delta)) {
10+        ret = CheckTileOwnership(tile - delta);  10+        ret = DoCommand(tile - delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
11+        if (ret.Failed()) return ret;  26+        if (ret.Failed()) return ret;  
12+    }  27+    }  
13+  28+  
… … 
18     /* upper tile */  33     /* upper tile */  
19     WaterClass wc_upper = IsWaterTile(tile + delta) ? GetWaterClass(tile + delta) : WATER_CLASS_CANAL;  34     WaterClass wc_upper = IsWaterTile(tile + delta) ? GetWaterClass(tile + delta) : WATER_CLASS_CANAL;  
20   35   
21+    if (!_settings_game.construction.road_stop_on_competitor_road && !HasTileWaterGround(tile + delta) && GetTileOwner(tile + delta) != OWNER_NONE) {  21+    if (IsCanal(tile + delta)) {
22+        ret = CheckTileOwnership(tile + delta);  22+        ret = DoCommand(tile + delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
23+        if (ret.Failed()) return ret;  38+        if (ret.Failed()) return ret;  
24+    }  39+    }  
25+  40+