Some fixes after merging

This commit is contained in:
Pavel Stupnikov
2022-11-26 22:25:47 +04:00
parent f3ecdf6f7f
commit 4dea7601c0
23 changed files with 520 additions and 265 deletions
+13 -13
View File
@@ -647,19 +647,19 @@ struct BuildRoadToolbarWindow : Window {
VpSelectTilesWithMethod(pt.x, pt.y, select_method);
}
void TryToRemoveExtraRoadBits(TileIndex tile, RoadBits &rb) {
for (DiagDirection dir = DIAGDIR_BEGIN; dir != DIAGDIR_END; dir++) {
RoadBits dir_rb = DiagDirToRoadBits(dir);
if (!(rb & dir_rb)) continue;
if (CanConnectToRoad(tile, _cur_roadtype, dir)) continue;
DoCommandP(tile, tile,
(dir_rb == ROAD_NW || dir_rb == ROAD_NE ? 0 : 3) |
(dir_rb & ROAD_X ? 0 : 4) |
(_cur_roadtype << 3),
CMD_REMOVE_LONG_ROAD);
rb &= ~dir_rb;
}
}
// void TryToRemoveExtraRoadBits(TileIndex tile, RoadBits &rb) {
// for (DiagDirection dir = DIAGDIR_BEGIN; dir != DIAGDIR_END; dir++) {
// RoadBits dir_rb = DiagDirToRoadBits(dir);
// if (!(rb & dir_rb)) continue;
// if (CanConnectToRoad(tile, _cur_roadtype, dir)) continue;
// DoCommandP(tile, tile,
// (dir_rb == ROAD_NW || dir_rb == ROAD_NE ? 0 : 3) |
// (dir_rb & ROAD_X ? 0 : 4) |
// (_cur_roadtype << 3),
// CMD_REMOVE_LONG_ROAD);
// rb &= ~dir_rb;
// }
// }
void OnPlaceMouseUp(ViewportPlaceMethod select_method, ViewportDragDropSelectionProcess select_proc, Point pt, TileIndex start_tile, TileIndex end_tile) override
{