openttd-mini: comparison vehicle.c

equal deleted inserted replaced

-:1da147230c79
+:66105d4f6e83
 */
 static void VehiclePoolNewBlock(uint start_item)
 {
 	Vehicle *v;
-	FOR_ALL_VEHICLES_FROM(v, start_item) v->index = start_item++;
+	/* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
+	 * TODO - This is just a temporary stage, this will be removed. */
+	for (v = GetVehicle(start_item); v != NULL; v = (v->index + 1 < GetVehiclePoolSize()) ? GetVehicle(v->index + 1) : NULL) v->index = start_item++;
 }
 /* Initialize the vehicle-pool */
 MemoryPool _vehicle_pool = { "Vehicle", VEHICLES_POOL_MAX_BLOCKS, VEHICLES_POOL_BLOCK_SIZE_BITS, sizeof(Vehicle), &VehiclePoolNewBlock, NULL, 0, 0, NULL };
 		if (v->type == VEH_Train && (IsFrontEngine(v) || IsFreeWagon(v)))
 			TrainConsistChanged(v);
 	}
 	FOR_ALL_VEHICLES(v) {
-		if (v->type != 0) {
+		switch (v->type) {
-			switch (v->type) {
+			case VEH_Train: v->cur_image = GetTrainImage(v, v->direction); break;
-				case VEH_Train: v->cur_image = GetTrainImage(v, v->direction); break;
+			case VEH_Road: v->cur_image = GetRoadVehImage(v, v->direction); break;
-				case VEH_Road: v->cur_image = GetRoadVehImage(v, v->direction); break;
+			case VEH_Ship: v->cur_image = GetShipImage(v, v->direction); break;
-				case VEH_Ship: v->cur_image = GetShipImage(v, v->direction); break;
+			case VEH_Aircraft:
-				case VEH_Aircraft:
+				if (v->subtype == 0 || v->subtype == 2) {
-					if (v->subtype == 0 || v->subtype == 2) {
+					v->cur_image = GetAircraftImage(v, v->direction);
-						v->cur_image = GetAircraftImage(v, v->direction);
+					if (v->next != NULL) v->next->cur_image = v->cur_image;
-						if (v->next != NULL) v->next->cur_image = v->cur_image;
+				}
-					}
+				break;
-					break;
+			default: break;
-				default: break;
+		}
-			}
+		v->left_coord = INVALID_COORD;
-			v->left_coord = INVALID_COORD;
+		VehiclePositionChanged(v);
-			VehiclePositionChanged(v);
-		}
 	}
 }
 static Vehicle *InitializeVehicle(Vehicle *v)
 {
 	 * BLOCKS_FOR_SPECIAL_VEHICLES times block_size vehicles that may only
 	 * be used for special vehicles.. should work nicely :) */
 	Vehicle *v;
-	FOR_ALL_VEHICLES(v) {
+	/* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
+	 * TODO - This is just a temporary stage, this will be removed. */
+	for (v = GetVehicle(0); v != NULL; v = (v->index + 1 < GetVehiclePoolSize()) ? GetVehicle(v->index + 1) : NULL) {
 		/* No more room for the special vehicles, return NULL */
 		if (v->index >= (1 << _vehicle_pool.block_size_bits) * BLOCKS_FOR_SPECIAL_VEHICLES)
 			return NULL;
-		if (v->type == 0)
+		if (!IsValidVehicle(v)) return InitializeVehicle(v);
-			return InitializeVehicle(v);
 	}
 	return NULL;
 }
 	/* See note by ForceAllocateSpecialVehicle() why we skip the
 	 * first blocks */
 	Vehicle *v;
 	const int offset = (1 << VEHICLES_POOL_BLOCK_SIZE_BITS) * BLOCKS_FOR_SPECIAL_VEHICLES;
+	/* We don't use FOR_ALL here, because FOR_ALL skips invalid items.
+	 * TODO - This is just a temporary stage, this will be removed. */
 	if (*skip_vehicles < (_vehicle_pool.total_items - offset)) {	// make sure the offset in the array is not larger than the array itself
-		FOR_ALL_VEHICLES_FROM(v, offset + *skip_vehicles) {
+		for (v = GetVehicle(offset + *skip_vehicles); v != NULL; v = (v->index + 1 < GetVehiclePoolSize()) ? GetVehicle(v->index + 1) : NULL) {
 			(*skip_vehicles)++;
-			if (v->type == 0)
+			if (!IsValidVehicle(v)) return InitializeVehicle(v);
-				return InitializeVehicle(v);
 		}
 	}
 	/* Check if we can add a block to the pool */
 	if (AddBlockToPool(&_vehicle_pool))
 #endif //ENABLE_NETWORK
 	_first_veh_in_depot_list = NULL;	// now we are sure it's initialized at the start of each tick
 	FOR_ALL_VEHICLES(v) {
-		if (v->type != 0) {
+		_vehicle_tick_procs[v->type - 0x10](v);
-			_vehicle_tick_procs[v->type - 0x10](v);
-		}
 	}
 	// now we handle all the vehicles that entered a depot this tick
 	v = _first_veh_in_depot_list;
 	while (v != NULL) {
 	x = (x << vp->zoom) + vp->virtual_left;
 	y = (y << vp->zoom) + vp->virtual_top;
 	FOR_ALL_VEHICLES(v) {
-		if (v->type != 0 && (v->vehstatus & (VS_HIDDEN|VS_UNCLICKABLE)) == 0 &&
+		if ((v->vehstatus & (VS_HIDDEN|VS_UNCLICKABLE)) == 0 &&
 				x >= v->left_coord && x <= v->right_coord &&
 				y >= v->top_coord && y <= v->bottom_coord) {
 			dist = max(
 				myabs( ((v->left_coord + v->right_coord)>>1) - x ),
 	if (serv_int != p2 || !IsVehicleIndex(p1)) return CMD_ERROR;
 	v = GetVehicle(p1);
-	if (v->type == 0 || !CheckOwnership(v->owner)) return CMD_ERROR;
+	if (!IsValidVehicle(v) || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		v->service_interval = serv_int;
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 	}
 static void Save_VEHS(void)
 {
 	Vehicle *v;
 	// Write the vehicles
 	FOR_ALL_VEHICLES(v) {
-		if (v->type != 0) {
+		SlSetArrayIndex(v->index);
-			SlSetArrayIndex(v->index);
+		SlObject(v, _veh_descs[v->type - 0x10]);
-			SlObject(v, _veh_descs[v->type - 0x10]);
-		}
 	}
 }
 // Will be called when vehicles need to be loaded.
 static void Load_VEHS(void)
 	/* Check for shared order-lists (we now use pointers for that) */
 	if (CheckSavegameVersionOldStyle(5, 2)) {
 		FOR_ALL_VEHICLES(v) {
 			Vehicle *u;
-			if (v->type == 0)
-				continue;
 			FOR_ALL_VEHICLES_FROM(u, v->index + 1) {
-				if (u->type == 0)
-					continue;
 				/* If a vehicle has the same orders, add the link to eachother
 				    in both vehicles */
 				if (v->orders == u->orders) {
 					v->next_shared = u;
 					u->prev_shared = v;

changeset 4346	66105d4f6e83
parent 4344	7e123fec5b0b
child 4352	6703cd8d39e0