cpp/openttd-patchpack/source Changeset - r1757:b34f78174975

Changeset - r1757:b34f78174975

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

matthijs - 19 years ago 2005-05-03 19:31:33
matthijs@openttd.org

(svn r2261) - Fix: When crashed vehicles try to find a depot for servicing, openttd asserts.
Crashed vehicles shouldn't find depots anyway...

4 files changed with 14 insertions and 1 deletions:

roadveh_cmd.c

ship_cmd.c

train_cmd.c

vehicle.c

0 comments (0 inline, 0 general)

roadveh_cmd.c

➞

Show inline comments

@@ @@ -353,6 +353,9 @@ int32 CmdSendRoadVehToDepot(int x, int y @@
 	if (v->type != VEH_Road || !CheckOwnership(v->owner))
 		return CMD_ERROR;
 	if (v->vehstatus & VS_CRASHED)
 		return CMD_ERROR;
 	if (v->current_order.type == OT_GOTO_DEPOT) {
 		if (flags & DC_EXEC) {

ship_cmd.c

➞

Show inline comments

@@ @@ -1002,6 +1002,9 @@ int32 CmdSendShipToDepot(int x, int y, u @@
 	if (v->type != VEH_Ship || !CheckOwnership(v->owner))
 		return CMD_ERROR;
 	if (v->vehstatus & VS_CRASHED)
 		return CMD_ERROR;
 	if (v->current_order.type == OT_GOTO_DEPOT) {
 		if (flags & DC_EXEC) {

train_cmd.c

➞

Show inline comments

@@ @@ -1298,7 +1298,8 @@ static bool TrainFindDepotEnumProc(uint @@
 	return length >= tfdd->best_length;
+}
 // returns the tile of a depot to goto to.
 // returns the tile of a depot to goto to. The given vehicle must be on track,
 // so not crashed, in a depot, etc.
 static TrainFindDepotData FindClosestTrainDepot(Vehicle *v)
+{
 	int i;
@@ @@ -1362,6 +1363,9 @@ int32 CmdTrainGotoDepot(int x, int y, ui @@
 	if (v->type != VEH_Train || !CheckOwnership(v->owner))
 		return CMD_ERROR;
 	if (v->vehstatus & VS_CRASHED)
 		return CMD_ERROR;
 	if (v->current_order.type == OT_GOTO_DEPOT) {
 		if (flags & DC_EXEC) {
 			if (HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {

vehicle.c

➞

Show inline comments

@@ @@ -55,6 +55,9 @@ bool VehicleNeedsService(const Vehicle * @@
 	if (_patches.no_servicing_if_no_breakdowns && _opt.diff.vehicle_breakdowns == 0)
 		return false;
 	if (v->vehstatus & VS_CRASHED)
 		return false; /* Crashed vehicles don't need service anymore */
 	return _patches.servint_ispercent ?
 		(v->reliability < _engines[v->engine_type].reliability * (100 - v->service_interval) / 100) :
 		(v->date_of_last_service + v->service_interval < _date);

0 comments (0 inline, 0 general)