mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20113) -Add [FS#3895]: Show an specific error message when trying to remove nonexistant roads (Krille).

release/1.1
terkhen 2010-07-10 20:12:32 +00:00
parent 5eb5ddbf31
commit 40e58f78ba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english.txt
View File

@ -3559,6 +3559,8 @@ STR_ERROR_CAN_T_BUILD_ROAD_HERE :{WHITE}Can't bu
STR_ERROR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here... STR_ERROR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Can't build tramway here...
STR_ERROR_CAN_T_REMOVE_ROAD_FROM :{WHITE}Can't remove road from here... STR_ERROR_CAN_T_REMOVE_ROAD_FROM :{WHITE}Can't remove road from here...
STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here... STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Can't remove tramway from here...
STR_ERROR_THERE_IS_NO_ROAD :{WHITE}...there is no road
STR_ERROR_THERE_IS_NO_TRAMWAY :{WHITE}...there is no tramway
# Waterway construction errors # Waterway construction errors
STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Can't build canals here... STR_ERROR_CAN_T_BUILD_CANALS :{WHITE}Can't build canals here...

4
src/road_cmd.cpp
View File

@ -180,7 +180,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec
{ {
RoadTypes rts = GetRoadTypes(tile); RoadTypes rts = GetRoadTypes(tile);
/* The tile doesn't have the given road type */ /* The tile doesn't have the given road type */
if (!HasBit(rts, rt)) return CMD_ERROR; if (!HasBit(rts, rt)) return_cmd_error(rt == ROADTYPE_TRAM ? STR_ERROR_THERE_IS_NO_TRAMWAY : STR_ERROR_THERE_IS_NO_ROAD);
switch (GetTileType(tile)) { switch (GetTileType(tile)) {
case MP_ROAD: { case MP_ROAD: {
@ -271,7 +271,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec
/* limit the bits to delete to the existing bits. */ /* limit the bits to delete to the existing bits. */
pieces &= present; pieces &= present;
if (pieces == ROAD_NONE) return CMD_ERROR; if (pieces == ROAD_NONE) return_cmd_error(rt == ROADTYPE_TRAM ? STR_ERROR_THERE_IS_NO_TRAMWAY : STR_ERROR_THERE_IS_NO_ROAD);
/* Now set present what it will be after the remove */ /* Now set present what it will be after the remove */
present ^= pieces; present ^= pieces;