1
0
Fork 0

(svn r22181) -Fix (r20574): following a vehicle with a very high VehicleID was impossible

release/1.2
yexo 2011-03-04 12:12:48 +00:00
parent ee1af659a9
commit 1714e5d509
1 changed files with 2 additions and 2 deletions

View File

@ -171,7 +171,7 @@ void DeleteWindowViewport(Window *w)
* @param width Width of the viewport * @param width Width of the viewport
* @param height Height of the viewport * @param height Height of the viewport
* @param follow_flags Flags controlling the viewport. * @param follow_flags Flags controlling the viewport.
* - If bit 31 is set, the lower 16 bits are the vehicle that the viewport should follow. * - If bit 31 is set, the lower 20 bits are the vehicle that the viewport should follow.
* - If bit 31 is clear, it is a #TileIndex. * - If bit 31 is clear, it is a #TileIndex.
* @param zoom Zoomlevel to display * @param zoom Zoomlevel to display
*/ */
@ -197,7 +197,7 @@ void InitializeWindowViewport(Window *w, int x, int y,
if (follow_flags & 0x80000000) { if (follow_flags & 0x80000000) {
const Vehicle *veh; const Vehicle *veh;
vp->follow_vehicle = (VehicleID)(follow_flags & 0xFFFF); vp->follow_vehicle = (VehicleID)(follow_flags & 0xFFFFF);
veh = Vehicle::Get(vp->follow_vehicle); veh = Vehicle::Get(vp->follow_vehicle);
pt = MapXYZToViewport(vp, veh->x_pos, veh->y_pos, veh->z_pos); pt = MapXYZToViewport(vp, veh->x_pos, veh->y_pos, veh->z_pos);
} else { } else {