cpp/openttd-patchpack/source Changeset - r15456:cc96258f1122

Changeset - r15456:cc96258f1122

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

terkhen - 14 years ago 2010-07-10 20:17:05
terkhen@openttd.org

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

2 files changed with 3 insertions and 2 deletions:

src/lang/english.txt

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -3484,6 +3484,7 @@ STR_ERROR_CAN_T_REMOVE_TRUCK_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_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_BUS_STATION_FIRST                       :{WHITE}Must demolish bus station first

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -1439,7 +1439,7 @@ CommandCost RemoveFromRailBaseStation(Ti @@
+		}
+	}
-	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++) {
 		T *st = *stp;
@@ @@ -1960,7 +1960,7 @@ CommandCost CmdRemoveRoadStop(TileIndex @@
+		}
+	}
-	if (quantity == 0) return CMD_ERROR;
+	if (quantity == 0) return_cmd_error(STR_ERROR_THERE_IS_NO_STATION);
 	return cost;
+}

0 comments (0 inline, 0 general)