cpp/openttd-patchpack/source Changeset - r9349:9b8b819c5250

Changeset - r9349:9b8b819c5250

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 16 years ago 2008-05-25 16:22:34
peter1138@openttd.org

(svn r13246) -Fix (r13245): incorrect parameters to memcpy

1 file changed with 3 insertions and 3 deletions:

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1313,14 +1313,14 @@ void BuildDepotVehicleList(VehicleType t @@
 	if (engines.Length() > 0) {
 		*engine_list = ReallocT(*engine_list, engines.Length());
-		memcpy(*engine_list, engines[0], sizeof(engines[0]) * engines.Length());
+		memcpy(*engine_list, engines.Begin(), sizeof(engines.Begin()) * engines.Length());
+	}
 	if (engine_count != NULL) *engine_count = engines.Length();
 	if (wagon_list != NULL && wagon_list != engine_list) {
 		if (wagons.Length() > 0) {
 			*wagon_list = ReallocT(*wagon_list, wagons.Length());
-			memcpy(*wagon_list, wagons[0], sizeof(wagons[0]) * wagons.Length());
+			memcpy(*wagon_list, wagons.Begin(), sizeof(wagons.Begin()) * wagons.Length());
+		}
 		if (wagon_count != NULL) *wagon_count = wagons.Length();
+	}
@@ @@ -1392,7 +1392,7 @@ uint GenerateVehicleSortList(const Vehic @@
 	if (list.Length() > 0) {
 		*sort_list = ReallocT(*sort_list, list.Length());
-		memcpy(*sort_list, list[0], sizeof(list[0]) * list.Length());
+		memcpy(*sort_list, list.Begin(), sizeof(list.Begin()) * list.Length());
+	}
 	return list.Length();

0 comments (0 inline, 0 general)