mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Code Issues Releases Wiki Activity

Using some more CoordsXY instead of separate xy in Map.cpp

Browse Source
This commit is contained in:
Joshua Moerman
2018-03-08 21:31:33 +01:00
committed by Aaron van Geffen
parent 426c21eb56
commit d6c28b2fa4
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2-ui/windows/Map.cpp
View File

@@ -1553,13 +1553,10 @@ static constexpr const uint8 RideColourKey[] = {
COLOUR_KEY_RIDE, //
};
static uint16 map_window_get_pixel_colour_peep(sint32 x, sint32 y)
static uint16 map_window_get_pixel_colour_peep(CoordsXY c)
{
rct_tile_element *tileElement;
uint16 colour;
tileElement = map_get_surface_element_at(x >> 5, y >> 5);
colour = TerrainColour[tile_element_get_terrain(tileElement)];
rct_tile_element * tileElement = map_get_surface_element_at(c);
uint16 colour = TerrainColour[tile_element_get_terrain(tileElement)];
if (map_get_water_height(tileElement) > 0)
colour = WaterColour;
@@ -1579,14 +1576,14 @@ static uint16 map_window_get_pixel_colour_peep(sint32 x, sint32 y)
return colour;
}
static uint16 map_window_get_pixel_colour_ride(sint32 x, sint32 y)
static uint16 map_window_get_pixel_colour_ride(CoordsXY c)
{
Ride *ride;
uint16 colourA = 0; // highlight colour
uint16 colourB = MAP_COLOUR(PALETTE_INDEX_13); // surface colour (dark grey)
// as an improvement we could use first_element to show underground stuff?
rct_tile_element * tileElement = map_get_surface_element_at(x >> 5, y >> 5);
rct_tile_element * tileElement = map_get_surface_element_at(c);
do {
switch (tile_element_get_type(tileElement)) {
case TILE_ELEMENT_TYPE_SURFACE:
@@ -1660,10 +1657,10 @@ static void map_window_set_pixels(rct_window *w)
) {
switch (w->selected_tab) {
case PAGE_PEEPS:
colour = map_window_get_pixel_colour_peep(x, y);
colour = map_window_get_pixel_colour_peep({x, y});
break;
case PAGE_RIDES:
colour = map_window_get_pixel_colour_ride(x, y);
colour = map_window_get_pixel_colour_ride({x, y});
break;
}
destination[0] = (colour >> 8) & 0xFF;