cpp/openttd-patchpack/source File Diff

File diff r7214:b82aad925d0b → r7215:b3433b9d5b54

src/articulated_vehicles.cpp

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ @@
 uint CountArticulatedParts(EngineID engine_type)
+{
 	if (!HASBIT(EngInfo(engine_type)->callbackmask, CBM_ARTIC_ENGINE)) return 0;
 	uint i;
 	for (i = 1; i < 10; i++) {
-		uint16 callback = GetVehicleCallback(CBID_TRAIN_ARTIC_ENGINE, i, 0, engine_type, NULL);
+		uint16 callback = GetVehicleCallback(CBID_VEHICLE_ARTIC_ENGINE, i, 0, engine_type, NULL);
 		if (callback == CALLBACK_FAILED || callback == 0xFF) break;
+	}
 	return i - 1;
+}
@@ @@ -33,13 +33,13 @@ void AddArticulatedParts(Vehicle **vl, V @@
 	const Vehicle *v = vl[0];
 	Vehicle *u = vl[0];
 	if (!HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_ARTIC_ENGINE)) return;
 	for (uint i = 1; i < 10; i++) {
-		uint16 callback = GetVehicleCallback(CBID_TRAIN_ARTIC_ENGINE, i, 0, v->engine_type, v);
+		uint16 callback = GetVehicleCallback(CBID_VEHICLE_ARTIC_ENGINE, i, 0, v->engine_type, v);
 		if (callback == CALLBACK_FAILED || callback == 0xFF) return;
 		/* Attempt to use pre-allocated vehicles until they run out. This can happen
 		 * if the callback returns different values depending on the cargo type. */
 		u->next = vl[i];
 		if (u->next == NULL) u->next = AllocateVehicle();