summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2007-01-21 01:25:59 +0000
committerbjarni <bjarni@openttd.org>2007-01-21 01:25:59 +0000
commit8ca4a7d8d989ef620137b5ba2ebe97326d3b247e (patch)
tree995d04aac254b7f9c94831b244ce78236fd12f16 /src
parent1995cdf00b603d22414f05f3279904fb7d825ad1 (diff)
downloadopenttd-8ca4a7d8d989ef620137b5ba2ebe97326d3b247e.tar.xz
(svn r8296) -Fix: GenerateVehicleSortList() tried to put a TileIndex into an uint16
-Fix: CmdMassStartStopVehicle() tried to put a TileIndex into an uint16 Those two bugs were unrelated to each other and unrelated to r8295, even though that commit touched the code in question
Diffstat (limited to 'src')
-rw-r--r--src/vehicle.cpp4
-rw-r--r--src/vehicle.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 099901e81..10b68855d 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1621,7 +1621,7 @@ int32 CmdMassStartStopVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
}
if (vehicle_list_window) {
- uint16 id = GB(p1, 0, 16);
+ uint32 id = p1;
uint16 window_type = p2 & VLW_MASK;
engine_count = GenerateVehicleSortList((const Vehicle***)&vl, &engine_list_length, vehicle_type, _current_player, id, window_type);
@@ -2369,7 +2369,7 @@ void BuildDepotVehicleList(byte type, TileIndex tile, Vehicle ***engine_list, ui
* @param window_type tells what kind of window the list is for. Use the VLW flags in vehicle_gui.h
* @return the number of vehicles added to the list
*/
-uint GenerateVehicleSortList(const Vehicle ***sort_list, uint16 *length_of_array, byte type, PlayerID owner, uint16 index, uint16 window_type)
+uint GenerateVehicleSortList(const Vehicle ***sort_list, uint16 *length_of_array, byte type, PlayerID owner, uint32 index, uint16 window_type)
{
const uint subtype = (type != VEH_Aircraft) ? Train_Front : 2;
uint n = 0;
diff --git a/src/vehicle.h b/src/vehicle.h
index 7093fffdb..5db0885df 100644
--- a/src/vehicle.h
+++ b/src/vehicle.h
@@ -333,7 +333,7 @@ int CheckTrainStoppedInDepot(const Vehicle *v);
bool VehicleNeedsService(const Vehicle *v);
-uint GenerateVehicleSortList(const Vehicle*** sort_list, uint16 *length_of_array, byte type, PlayerID owner, uint16 index, uint16 window_type);
+uint GenerateVehicleSortList(const Vehicle*** sort_list, uint16 *length_of_array, byte type, PlayerID owner, uint32 index, uint16 window_type);
void BuildDepotVehicleList(byte type, TileIndex tile, Vehicle ***engine_list, uint16 *engine_list_length, uint16 *engine_count, Vehicle ***wagon_list, uint16 *wagon_list_length, uint16 *wagon_count);
int32 SendAllVehiclesToDepot(byte type, uint32 flags, bool service, PlayerID owner, uint16 vlw_flag, uint32 id);
bool IsVehicleInDepot(const Vehicle *v);