dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix viewport order lines/markers for multiplayer clients.

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-12-26 15:25:39 +00:00
parent 0d1e08ed75
commit 509da024cc
6 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/viewport.cpp
View File

@@ -300,7 +300,7 @@ void InitializeWindowViewport(Window *w, int x, int y,
veh = Vehicle::Get(vp->follow_vehicle);
pt = MapXYZToViewport(vp, veh->x_pos, veh->y_pos, veh->z_pos);
MarkAllRoutePathsDirty(veh);
MarkAllRouteStepsDirty(w);
MarkAllRouteStepsDirty(veh);
} else {
uint x = TileX(follow_flags) * TILE_SIZE;
uint y = TileY(follow_flags) * TILE_SIZE;
@@ -2857,9 +2857,8 @@ static void MarkRouteStepDirty(const TileIndex tile, uint order_nr)
}
}
void MarkAllRouteStepsDirty(Window *vehicle_window)
void MarkAllRouteStepsDirty(const Vehicle *veh)
{
const Vehicle * const veh = GetVehicleFromWindow(vehicle_window);
ViewportPrepareVehicleRouteSteps(veh);
for (RouteStepsMap::const_iterator cit = _vp_route_steps.begin(); cit != _vp_route_steps.end(); cit++) {
MarkRouteStepDirty(cit);
@@ -3003,6 +3002,15 @@ void MarkAllRoutePathsDirty(const Vehicle *veh)
_vp_route_paths.clear();
}
void CheckMarkDirtyFocusedRoutePaths(const Vehicle *veh)
{
const Vehicle *focused_veh = GetVehicleFromWindow(_focused_window);
if (focused_veh && veh == focused_veh) {
MarkAllRoutePathsDirty(veh);
MarkAllRouteStepsDirty(veh);
}
}
/**
* Marks the selected tiles as dirty.
*