some more work on map window
Merge branch 'map-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-map-window
Merge branch 'ddevrien-map-window'