openttd-mini: comparison train

equal deleted inserted replaced

-:1ae7b7a78602
+:5e446b5b3ec5
 	value = EstimateTrainCost(rvi);
 	if (!(flags & DC_QUERY_COST)) {
 		v = AllocateVehicle();
-		if (v == NULL || _ptr_to_next_order >= endof(_order_array))
+		if (v == NULL || IsOrderPoolFull())
 			return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
 		unit_num = GetFreeUnitNumber(VEH_Train);
 		if (unit_num > _patches.max_trains)
 			return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
 			v->z_pos = GetSlopeZ(x,y);
 			v->z_height = 6;
 			v->u.rail.track = 0x80;
 			v->u.rail.first_engine = 0xffff;
 			v->vehstatus = VS_HIDDEN | VS_STOPPED | VS_DEFPAL;
-//			v->subtype = 0;
 			v->spritenum = rvi->image_index;
 			v->cargo_type = rvi->cargo_type;
 			v->cargo_cap = rvi->capacity;
 			v->max_speed = rvi->max_speed;
-//			v->cargo_count = 0;
 			v->value = value;
-//			v->day_counter = 0;
-//			v->current_order = 0;
-//			v->next_station = 0;
-//			v->load_unload_time_rem = 0;
-//			v->progress = 0;
-//			v->targetairport = 0;
-//			v->crash_anim_pos = 0;
 			v->last_station_visited = 0xFFFF;
 			v->dest_tile = 0;
-//			v->profit_last_year = 0;
-//			v->profit_this_year = 0;
 			v->engine_type = (byte)p1;
 			e = &_engines[p1];
 			v->reliability = e->reliability;
 			v->reliability_spd_dec = e->reliability_spd_dec;
 			v->max_age = e->lifelength * 366;
 			v->string_id = STR_SV_TRAIN_NAME;
-//			v->cur_speed = 0;
-//			v->subspeed = 0;
 			v->u.rail.railtype = e->railtype;
 			_new_train_id = v->index;
-//			v->cur_order_index = 0;
-//			v->num_orders = 0;
-			_ptr_to_next_order->type = OT_NOTHING;
-			_ptr_to_next_order->flags = 0;
-			v->schedule_ptr = _ptr_to_next_order++;
-//			v->next_in_chain = 0xffff;
-//			v->next = NULL;
 			v->service_interval = _patches.servint_trains;
-//			v->breakdown_ctr = 0;
-//			v->breakdowns_since_last_service = 0;
-//			v->unk4D = 0;
 			v->date_of_last_service = _date;
 			v->build_year = _cur_year;
 			v->type = VEH_Train;
 			v->cur_image = 0xAC2;
 		if (dst == NULL) {
 			// move the train to an empty line. for locomotives, we set the type to 0. for wagons, 4.
 			if (is_loco) {
 				if (src->subtype != 0) {
-					// setting the type to 0 also involves setting up the schedule_ptr field.
+					// setting the type to 0 also involves setting up the orders field.
 					src->subtype = 0;
-					assert(src->schedule_ptr == NULL);
+					assert(src->orders == NULL);
-					_ptr_to_next_order->type = OT_NOTHING;
-					_ptr_to_next_order->flags = 0;
-					src->schedule_ptr = _ptr_to_next_order++;
 					src->num_orders = 0;
 				}
 				dst_head = src;
 			} else {
 				src->subtype = 4;
 			}
 			src->u.rail.first_engine = 0xffff;
 		} else {
 			if (src->subtype == 0) {
-				// the vehicle was previously a loco. need to free the schedule list and delete vehicle windows etc.
+				// the vehicle was previously a loco. need to free the order list and delete vehicle windows etc.
 				DeleteWindowById(WC_VEHICLE_VIEW, src->index);
-				DeleteVehicleSchedule(src);
+				DeleteVehicleOrders(src);
 			}
 			src->subtype = 2;
 			src->unitnumber = 0; // doesn't occupy a unitnumber anymore.
 	return reverse_best != 0;
 }
 static bool ProcessTrainOrder(Vehicle *v)
 {
-	Order order;
+	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 schedule interrupt.
+		// Let a depot order in the orderlist interrupt.
 		if (v->current_order.type != OT_GOTO_DEPOT ||
 				!(v->current_order.flags & OF_UNLOAD))
 			return false;
 	}
 	}
 	// Get the current order
 	if (v->cur_order_index >= v->num_orders)
 		v->cur_order_index = 0;
-	order = v->schedule_ptr[v->cur_order_index];
+	order = GetVehicleOrder(v, v->cur_order_index);
 	// If no order, do nothing.
-	if (order.type == OT_NOTHING) {
+	if (order == NULL) {
 		v->current_order.type = OT_NOTHING;
 		v->current_order.flags = 0;
 		v->dest_tile = 0;
 		return false;
 	}
 	// If it is unchanged, keep it.
-	if (order.type == v->current_order.type &&
+	if (order->type    == v->current_order.type &&
-			order.flags == v->current_order.flags &&
+			order->flags   == v->current_order.flags &&
-			order.station == v->current_order.station)
+			order->station == v->current_order.station)
 		return false;
 	// Otherwise set it, and determine the destination tile.
-	v->current_order = order;
+	v->current_order = *order;
 	v->dest_tile = 0;
 	result = false;
-	if (order.type == OT_GOTO_STATION) {
+	switch (order->type) {
-		if (order.station == v->last_station_visited)
+		case OT_GOTO_STATION:
-			v->last_station_visited = 0xFFFF;
+			if (order->station == v->last_station_visited)
-		v->dest_tile = GetStation(order.station)->xy;
+				v->last_station_visited = 0xFFFF;
-		result = CheckReverseTrain(v);
+			v->dest_tile = GetStation(order->station)->xy;
-	} else if (order.type == OT_GOTO_DEPOT) {
+			result = CheckReverseTrain(v);
-		v->dest_tile = _depots[order.station].xy;
+			break;
-		result = CheckReverseTrain(v);
-	} else if (order.type == OT_GOTO_WAYPOINT) {
+		case OT_GOTO_DEPOT:
-		v->dest_tile = _waypoints[order.station].xy;
+			v->dest_tile = _depots[order->station].xy;
-		result = CheckReverseTrain(v);
+			result = CheckReverseTrain(v);
-	}
+			break;
-	InvalidateVehicleOrderWidget(v);
+		case OT_GOTO_WAYPOINT:
+			v->dest_tile = _waypoints[order->station].xy;
+			result = CheckReverseTrain(v);
+			break;
+	}
+	InvalidateVehicleOrder(v);
 	return result;
 }
 static void MarkTrainDirty(Vehicle *v)
 		}
 	}
 	v->u.rail.days_since_order_progr = 0;
 	v->cur_order_index++;
-	InvalidateVehicleOrderWidget(v);
+	InvalidateVehicleOrder(v);
 }
 static int UpdateTrainSpeed(Vehicle *v)
 {
 	uint spd;
 		t = v->current_order;
 		v->current_order.type = OT_DUMMY;
 		v->current_order.flags = 0;
-		if (t.flags & OF_UNLOAD) { // Part of the schedule?
+		if (t.flags & OF_UNLOAD) { // Part of the orderlist?
 			v->u.rail.days_since_order_progr = 0;
 			v->cur_order_index++;
 		} else if (t.flags & OF_FULL_LOAD) { // User initiated?
 			v->vehstatus |= VS_STOPPED;
 			if (v->owner == _local_player) {
 		return;
 	if (v->vehstatus & VS_STOPPED)
 		return;
-	if (_patches.gotodepot && ScheduleHasDepotOrders(v->schedule_ptr))
+	if (_patches.gotodepot && VehicleHasDepotOrders(v))
 		return;
 	// Don't interfere with a depot visit scheduled by the user, or a
 	// depot visit by the order list.
 	if (v->current_order.type == OT_GOTO_DEPOT &&
 void InitializeTrains()
 {
 	_age_cargo_skip_counter = 1;
 }
-int ScheduleHasDepotOrders(const Order *schedule)
-{
-	for (; schedule->type != OT_NOTHING; schedule++)
-		if (schedule->type == OT_GOTO_DEPOT)
-			return true;
-	return false;
-}

changeset 1024	5e446b5b3ec5
parent 954	66c89362a778
child 1035	812f837ee03f