# HG changeset patch # User peter1138 # Date 2008-05-25 16:22:34 # Node ID 9b8b819c5250b5292d15d2d3325dd944524b46a8 # Parent 7593490a759a16a50e33962ed618f438bf7a917c (svn r13246) -Fix (r13245): incorrect parameters to memcpy diff --git a/src/vehicle.cpp b/src/vehicle.cpp --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -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();