cpp/openttd-patchpack/source Changeset - r9937:14dcbb705e6b

Changeset - r9937:14dcbb705e6b

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 16 years ago 2008-08-17 11:52:06
rubidium@openttd.org

(svn r14092) -Cleanup (r14083): dead code, i.e. unused function.

2 files changed with 0 insertions and 37 deletions:

src/order_cmd.cpp

src/order_func.h

0 comments (0 inline, 0 general)

src/order_cmd.cpp

➞

Show inline comments

@@ @@ -1341,42 +1341,6 @@ void RestoreVehicleOrders(const Vehicle @@
 	DoCommandP(0, bak->group, v->index, NULL, CMD_ADD_VEHICLE_GROUP);
+}
 /** Restores vehicle orders that was previously backed up by BackupVehicleOrders()
  * This will restore to the point where it was at the time of the backup meaning
  * it will presume the same order indexes can be used.
  * This is needed when restoring a backed up vehicle
  * @param v The vehicle that should gain the orders
  * @param bak the backup of the orders
  */
 void RestoreVehicleOrdersBruteForce(Vehicle *v, const BackuppedOrders *bak)
+{
 	if (bak->name != NULL) {
 		/* Restore the name. */
 		v->name = strdup(bak->name);
+	}
 	/* If we had shared orders, recover that */
 	if (bak->clone != INVALID_VEHICLE) {
 		/* We will place it at the same location in the linked list as it previously was. */
 		if (v->prev_shared != NULL) {
 			assert(v->prev_shared->next_shared == v->next_shared);
 			v->prev_shared->next_shared = v;
+		}
 		if (v->next_shared != NULL) {
 			assert(v->next_shared->prev_shared == v->prev_shared);
 			v->next_shared->prev_shared = v;
+		}
 	} else {
 		/* Restore the orders at the indexes they originally were. */
 		for (Order *order = bak->order; order->IsValid(); order++) {
 			Order *dst = GetOrder(order->index);
 			/* Since we are restoring something we removed a moment ago all the orders should be free. */
 			assert(!dst->IsValid());
 			memcpy(dst, order, sizeof(Order));
+		}
+	}
+}
 /** Restore the current order-index of a vehicle and sets service-interval.
  * @param tile unused
  * @param flags operation to perform

src/order_func.h

➞

Show inline comments

@@ @@ -28,7 +28,6 @@ extern BackuppedOrders _backup_orders_da @@
 void BackupVehicleOrders(const Vehicle *v, BackuppedOrders *order = &_backup_orders_data);
 void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *order = &_backup_orders_data);
 void RestoreVehicleOrdersBruteForce(Vehicle *v, const BackuppedOrders *bak);
 /* Functions */
 void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination);

0 comments (0 inline, 0 general)