openttd-mini: comparison order

equal deleted inserted replaced

-:06f7b463ee52
+:614d996f6be7
 				RebuildVehicleLists();
 			}
 		} break;
 		case CO_UNSHARE: return DecloneOrder(dst, flags);
+		default: return CMD_ERROR;
 	}
 	return 0;
 }
 *
 * Backup a vehicle order-list, so you can replace a vehicle
 *  without loosing the order-list
 *
 */
-void BackupVehicleOrders(Vehicle *v, BackuppedOrders *bak)
+void BackupVehicleOrders(const Vehicle *v, BackuppedOrders *bak)
 {
-	bool shared = IsOrderListShared(v);
 	/* Save general info */
 	bak->orderindex       = v->cur_order_index;
 	bak->service_interval = v->service_interval;
 	/* Safe custom string, if any */
 	} else {
 		GetName(v->string_id & 0x7FF, bak->name);
 	}
 	/* If we have shared orders, store it on a special way */
-	if (shared) {
+	if (IsOrderListShared(v)) {
-		Vehicle *u;
+		const Vehicle *u = (v->next_shared) ? v->next_shared : v->prev_shared;
-		if (v->next_shared)
-			u = v->next_shared;
-		else
-			u = v->prev_shared;
 		bak->clone = u->index;
 	} else {
 		/* Else copy the orders */
 		Order *order, *dest;
-		dest  = bak->order;
+		dest = bak->order;
 		/* We do not have shared orders */
 		bak->clone = INVALID_VEHICLE;
 		/* Copy the orders */
 * Restore vehicle orders that are backupped via BackupVehicleOrders
 *
 */
 void RestoreVehicleOrders(Vehicle *v, BackuppedOrders *bak)
 {
-	int i;
+	uint i;
 	/* If we have a custom name, process that */
 	if (bak->name[0] != 0) {
 		strcpy((char*)_decode_parameters, bak->name);
 		DoCommandP(0, v->index, 0, NULL, CMD_NAME_VEHICLE);
 	}
-	/* Restore vehicle number and service interval */
-	DoCommandP(0, v->index, bak->orderindex | (bak->service_interval << 16) , NULL, CMD_RESTORE_ORDER_INDEX);
 	/* If we had shared orders, recover that */
 	if (bak->clone != INVALID_VEHICLE) {
 		DoCommandP(0, v->index | (bak->clone << 16), 0, NULL, CMD_CLONE_ORDER);
 		return;
 	}
 	/* CMD_NO_TEST_IF_IN_NETWORK is used here, because CMD_INSERT_ORDER checks if the
 	    order number is one more than the current amount of orders, and because
 	    in network the commands are queued before send, the second insert always
 	    fails in test mode. By bypassing the test-mode, that no longer is a problem. */
-	for (i = 0; bak->order[i].type != OT_NOTHING; i++)
+	for (i = 0; bak->order[i].type != OT_NOTHING; i++) {
 		if (!DoCommandP(0, v->index + (i << 16), PackOrder(&bak->order[i]), NULL, CMD_INSERT_ORDER | CMD_NO_TEST_IF_IN_NETWORK))
 			break;
-}
+	}
-/**
+	/* Restore vehicle order-index and service interval */
-*
+	DoCommandP(0, v->index, bak->orderindex | (bak->service_interval << 16) , NULL, CMD_RESTORE_ORDER_INDEX);
-* Restore the current-order-index of a vehicle and sets service-interval
+}
-*
-* @param vehicle_id The ID of the vehicle
+/** Restore the current order-index of a vehicle and sets service-interval.
-* @param data       First 16 bits are the current-order-index
+* @param x,y unused
-*                   The last 16 bits are the service-interval
+* @param p1 the ID of the vehicle
-*
+* @param p2 various bistuffed elements
-*/
+* - p2 = (bit  0-15) - current order-index (p2 & 0xFFFF)
-int32 CmdRestoreOrderIndex(int x, int y, uint32 flags, uint32 vehicle_id, uint32 data)
+* - p2 = (bit 16-31) - service interval (p2 >> 16)
-{
+* @todo Unfortunately you cannot safely restore the unitnumber or the old vehicle
-	Vehicle* v;
+* as far as I can see. We can store it in BackuppedOrders, and restore it, but
+* but we have no way of seeing it has been tampered with or not, as we have no
-	if (!IsVehicleIndex(vehicle_id)) return CMD_ERROR;
+* legit way of knowing what that ID was.@n
-	v = GetVehicle(vehicle_id);
+* If we do want to backup/restore it, just add UnitID uid to BackuppedOrders, and
+* restore it as parameter 'y' (ugly hack I know) for example. "v->unitnumber = y;"
+*/
+int32 CmdRestoreOrderIndex(int x, int y, uint32 flags, uint32 p1, uint32 p2)
+{
+	Vehicle *v;
+	OrderID cur_ord = p2 & 0xFFFF;
+	uint16 serv_int = p2 >> 16;
+	if (!IsVehicleIndex(p1)) return CMD_ERROR;
+	v = GetVehicle(p1);
+	/* Check the vehicle type and ownership, and if the service interval and order are in range */
 	if (v->type == 0 || !CheckOwnership(v->owner)) return CMD_ERROR;
+	if (serv_int != GetServiceIntervalClamped(serv_int) || cur_ord >= v->num_orders) return CMD_ERROR;
 	if (flags & DC_EXEC) {
-		v->service_interval = data >> 16;
+		v->cur_order_index = cur_ord;
-		v->cur_order_index = data & 0xFFFF;
+		v->service_interval = serv_int;
 	}
 	return 0;
 }

changeset 1796	614d996f6be7
parent 1793	b9a37c98b468
child 1820	d03c56850dc2