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

(svn r20115) -Add: Show an specific error message when trying to remove nonexistant stations.

release/1.1
terkhen 2010-07-10 20:17:05 +00:00
parent 191389fa8d
commit bb24713218
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

@ -3484,6 +3484,7 @@ STR_ERROR_CAN_T_REMOVE_TRUCK_STATION :{WHITE}Can't re
STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION :{WHITE}Can't remove passenger tram station... STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION :{WHITE}Can't remove passenger tram station...
STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION :{WHITE}Can't remove freight tram station... STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION :{WHITE}Can't remove freight tram station...
STR_ERROR_MUST_REMOVE_ROAD_STOP_FIRST :{WHITE}Must remove road stop first STR_ERROR_MUST_REMOVE_ROAD_STOP_FIRST :{WHITE}Must remove road stop first
STR_ERROR_THERE_IS_NO_STATION :{WHITE}...there is no station here
STR_ERROR_MUST_DEMOLISH_RAILROAD :{WHITE}Must demolish railway station first STR_ERROR_MUST_DEMOLISH_RAILROAD :{WHITE}Must demolish railway station first
STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST :{WHITE}Must demolish bus station first STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST :{WHITE}Must demolish bus station first

4
src/station_cmd.cpp
View File

@ -1439,7 +1439,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector<T *, 4> &affected
} }
} }
if (quantity == 0) return CMD_ERROR; if (quantity == 0) return_cmd_error(STR_ERROR_THERE_IS_NO_STATION);
for (T **stp = affected_stations.Begin(); stp != affected_stations.End(); stp++) { for (T **stp = affected_stations.Begin(); stp != affected_stations.End(); stp++) {
T *st = *stp; T *st = *stp;
@ -1960,7 +1960,7 @@ CommandCost CmdRemoveRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
} }
} }
if (quantity == 0) return CMD_ERROR; if (quantity == 0) return_cmd_error(STR_ERROR_THERE_IS_NO_STATION);
return cost; return cost;
} }