cpp/openttd-patchpack/source Changeset - r593:4ed1c5a33f13

Changeset - r593:4ed1c5a33f13

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

tron - 19 years ago 2004-12-11 10:17:10
tron@openttd.org

(svn r1015) MFM r789
Replaced the slightly misleading SERVICE_INTERVAL by a function VehicleNeedsService()

6 files changed with 17 insertions and 9 deletions:

aircraft_cmd.c

roadveh_cmd.c

ship_cmd.c

train_cmd.c

vehicle.c

vehicle.h

0 comments (0 inline, 0 general)

aircraft_cmd.c

➞

Show inline comments

@@ @@ -461,7 +461,7 @@ static void CheckIfAircraftNeedsService( @@
 	if (_patches.servint_aircraft == 0)
 		return;
-	if (SERVICE_INTERVAL)
+	if (!VehicleNeedsService(v))
 		return;
 	if (v->vehstatus & VS_STOPPED)
@@ @@ -997,7 +997,7 @@ static void ProcessAircraftOrder(Vehicle @@
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) &&
- 			SERVICE_INTERVAL) {
+ 			!VehicleNeedsService(v)) {
  		v->cur_order_index++;
+ 	}

roadveh_cmd.c

➞

Show inline comments

@@ @@ -569,7 +569,7 @@ static void ProcessRoadVehOrder(Vehicle @@
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) &&
-			SERVICE_INTERVAL ) {
+			!VehicleNeedsService(v)) {
 		v->cur_order_index++;
+	}
@@ @@ -1433,7 +1433,7 @@ static void CheckIfRoadVehNeedsService(V @@
 	if (_patches.servint_roadveh == 0)
 		return;
-	if (SERVICE_INTERVAL)
+	if (!VehicleNeedsService(v))
 		return;
 	if (v->vehstatus & VS_STOPPED)

ship_cmd.c

➞

Show inline comments

@@ @@ -89,7 +89,7 @@ static void CheckIfShipNeedsService(Vehi @@
 	if (_patches.servint_ships == 0)
 		return;
-	if (SERVICE_INTERVAL)
+	if (!VehicleNeedsService(v))
 		return;
 	if (v->vehstatus & VS_STOPPED)
@@ @@ -214,7 +214,7 @@ static void ProcessShipOrder(Vehicle *v) @@
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) == (OF_UNLOAD | OF_FULL_LOAD) &&
-			SERVICE_INTERVAL) {
+			!VehicleNeedsService(v)) {
 		v->cur_order_index++;
+	}

train_cmd.c

➞

Show inline comments

@@ @@ -1589,7 +1589,7 @@ static bool ProcessTrainOrder(Vehicle *v @@
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_UNLOAD | OF_FULL_LOAD)) ==  (OF_UNLOAD | OF_FULL_LOAD) &&
-			SERVICE_INTERVAL) {
+			!VehicleNeedsService(v)) {
 		v->cur_order_index++;
+	}
@@ @@ -2597,7 +2597,7 @@ static void CheckIfTrainNeedsService(Veh @@
 	if (_patches.servint_trains == 0)
 		return;
-	if (SERVICE_INTERVAL)
+	if (!VehicleNeedsService(v))
 		return;
 	if (v->vehstatus & VS_STOPPED)

vehicle.c

➞

Show inline comments

@@ @@ -22,6 +22,13 @@ void VehicleServiceInDepot(Vehicle *v) @@
 	v->reliability = _engines[v->engine_type].reliability;
+}
 bool VehicleNeedsService(const Vehicle *v)
+{
 	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);
+}
 Order UnpackOldOrder(uint16 packed)
+{
 	Order order;

vehicle.h

➞

Show inline comments

@@ @@ -390,6 +390,8 @@ int CheckStoppedInDepot(Vehicle *v); @@
 int ScheduleHasDepotOrders(const Order *schedule);
 int CheckOrders(Vehicle *v);
 bool VehicleNeedsService(const Vehicle *v);
 typedef struct GetNewVehiclePosResult {
 	int x,y;
 	uint old_tile;
@@ @@ -449,7 +451,6 @@ VARDEF BackuppedOrders _backup_orders_da @@
 #define INVALID_VEHICLE 0xffff
 #define SERVICE_INTERVAL (_patches.servint_ispercent ? (v->reliability > _engines[v->engine_type].reliability * (100 - v->service_interval) / 100) : (v->date_of_last_service + v->service_interval > _date))
 #define MIN_SERVINT_PERCENT  5
 #define MAX_SERVINT_PERCENT 90
 #define MIN_SERVINT_DAYS    30

0 comments (0 inline, 0 general)