cpp/openttd-patchpack/source Changeset - r3005:f513fb8e8842

Changeset - r3005:f513fb8e8842

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

tron - 19 years ago 2006-02-10 06:33:56
tron@openttd.org

(svn r3585) Similar changes to the order handlers of the other vehicle types like r3584

3 files changed with 34 insertions and 39 deletions:

aircraft_cmd.c

ship_cmd.c

train_cmd.c

0 comments (0 inline, 0 general)

aircraft_cmd.c

➞

Show inline comments

@@ @@ -1043,20 +1043,18 @@ static void ProcessAircraftOrder(Vehicle @@
+{
 	const Order *order;
 	// OT_GOTO_DEPOT, OT_LOADING
 	if (v->current_order.type == OT_GOTO_DEPOT ||
 			v->current_order.type == OT_LOADING) {
 		if (v->current_order.type != OT_GOTO_DEPOT ||
 				!(v->current_order.flags & OF_UNLOAD))
 			return;
 	switch (v->current_order.type) {
 		case OT_GOTO_DEPOT:
 			if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return;
 			if (v->current_order.flags & OF_SERVICE_IF_NEEDED &&
 					!VehicleNeedsService(v)) {
 				v->cur_order_index++;
+			}
 			break;
 		case OT_LOADING: return;
+	}
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
  			!VehicleNeedsService(v)) {
 			v->cur_order_index++;
+		}
 	if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0;
 	order = GetVehicleOrder(v, v->cur_order_index);
@@ @@ -1067,8 +1065,7 @@ static void ProcessAircraftOrder(Vehicle @@
 		return;
+	}
 	if (order->type == OT_DUMMY && !CheckForValidOrders(v))
 		CrashAirplane(v);
 	if (order->type == OT_DUMMY && !CheckForValidOrders(v)) CrashAirplane(v);
 	if (order->type    == v->current_order.type   &&
 			order->flags   == v->current_order.flags  &&

ship_cmd.c

➞

Show inline comments

@@ @@ -203,22 +203,21 @@ static void ProcessShipOrder(Vehicle *v) @@
+{
 	const Order *order;
 	if (v->current_order.type >= OT_GOTO_DEPOT &&
 			v->current_order.type <= OT_LEAVESTATION) {
 		if (v->current_order.type != OT_GOTO_DEPOT ||
 				!(v->current_order.flags & OF_UNLOAD))
 	switch (v->current_order.type) {
 		case OT_GOTO_DEPOT:
 			if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return;
 			if (v->current_order.flags & OF_SERVICE_IF_NEEDED &&
 					!VehicleNeedsService(v)) {
 				v->cur_order_index++;
+			}
 			break;
 		case OT_LOADING:
 		case OT_LEAVESTATION:
 			return;
+	}
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
 			!VehicleNeedsService(v)) {
 		v->cur_order_index++;
+	}
 	if (v->cur_order_index >= v->num_orders)
 		v->cur_order_index = 0;
 	if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0;
 	order = GetVehicleOrder(v, v->cur_order_index);

train_cmd.c

➞

Show inline comments

@@ @@ -2274,21 +2274,20 @@ static bool ProcessTrainOrder(Vehicle *v @@
 	const Order *order;
 	bool result;
 	// These are un-interruptible
 	if (v->current_order.type >= OT_GOTO_DEPOT &&
 			v->current_order.type <= OT_LEAVESTATION) {
 		// Let a depot order in the orderlist interrupt.
 		if (v->current_order.type != OT_GOTO_DEPOT ||
 				!(v->current_order.flags & OF_UNLOAD))
 	switch (v->current_order.type) {
 		case OT_GOTO_DEPOT:
 			if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return false;
 			if ((v->current_order.flags & OF_SERVICE_IF_NEEDED) &&
 					!VehicleNeedsService(v)) {
 				v->cur_order_index++;
+			}
 			break;
 		case OT_LOADING:
 		case OT_LEAVESTATION:
 			return false;
+	}
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 			(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) ==  (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
 			!VehicleNeedsService(v)) {
 		v->cur_order_index++;
+	}
 	// check if we've reached the waypoint?
 	if (v->current_order.type == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) {
 		v->cur_order_index++;

0 comments (0 inline, 0 general)