Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx

Browse Source
This commit is contained in:
Jonathan G Rennison 2015-12-02 11:28:15 +00:00
commit d58b0cef43
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/viewport.cpp
View File

@ -188,11 +188,13 @@ struct ViewportDrawer {
};
static void MarkViewportDirty(const ViewPort * const vp, int left, int top, int right, int bottom);
static void MarkRouteStepDirty(const TileIndex tile, uint order_nr);
static DrawPixelInfo _dpi_for_text;
static ViewportDrawer _vd;
RouteStepsMap _vp_route_steps;
RouteStepsMap _vp_route_steps_last_mark_dirty;
uint _vp_route_step_width = 0;
uint _vp_route_step_height_top = 0;
uint _vp_route_step_height_middle = 0;
@ -1837,6 +1839,12 @@ static void ViewportDrawVehicleRouteSteps(const ViewPort * const vp)
{
const Vehicle * const veh = GetVehicleFromWindow(_focused_window);
if (veh && ViewportPrepareVehicleRouteSteps(veh)) {
if (_vp_route_steps != _vp_route_steps_last_mark_dirty) {
for (RouteStepsMap::const_iterator cit = _vp_route_steps.begin(); cit != _vp_route_steps.end(); cit++) {
MarkRouteStepDirty(cit->first, (uint) cit->second.size());
}
_vp_route_steps_last_mark_dirty = _vp_route_steps;
}
for (RouteStepsMap::const_iterator cit = _vp_route_steps.begin(); cit != _vp_route_steps.end(); cit++) {
DrawRouteStep(vp, cit->first, cit->second);
}
@ -2824,6 +2832,7 @@ void MarkAllRouteStepsDirty(Window *vehicle_window)
for (RouteStepsMap::const_iterator cit = _vp_route_steps.begin(); cit != _vp_route_steps.end(); cit++) {
MarkRouteStepDirty(cit->first, (uint) cit->second.size());
}
_vp_route_steps_last_mark_dirty.swap(_vp_route_steps);
_vp_route_steps.clear();
}