diff --git a/src/openrct2/interface/colour.h b/src/openrct2/interface/colour.h index 36854e44a4..da1af7f4e6 100644 --- a/src/openrct2/interface/colour.h +++ b/src/openrct2/interface/colour.h @@ -101,6 +101,7 @@ enum { PALETTE_INDEX_162 = 162, // PALETTE_INDEX_171 = 171, // Saturated Red (lightest) Bright Red (middark) PALETTE_INDEX_172 = 172, // Saturated Red (10-11), Bright Red (midlight) + PALETTE_INDEX_183 = 183, // Used to draw rides in the Map window PALETTE_INDEX_186 = 186, // PALETTE_INDEX_194 = 194, // PALETTE_INDEX_195 = 195, // diff --git a/src/openrct2/windows/map.c b/src/openrct2/windows/map.c index 061df3beb9..d33808b313 100644 --- a/src/openrct2/windows/map.c +++ b/src/openrct2/windows/map.c @@ -34,7 +34,7 @@ #define MAP_COLOUR_2(colourA, colourB) ((colourA << 8) | colourB) #define MAP_COLOUR(colour) MAP_COLOUR_2(colour, colour) -#define FALLBACK_COLOUR(colour) ((colour << 24) || colour << 16) +#define FALLBACK_COLOUR(colour) ((colour << 24) | colour << 16) #define MAP_WINDOW_MAP_SIZE (MAXIMUM_MAP_SIZE_TECHNICAL * 2) @@ -1463,7 +1463,7 @@ static const uint16 ElementTypeMaskColour[] = { static const uint16 ElementTypeAddColour[] = { MAP_COLOUR(PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_SURFACE MAP_COLOUR(PALETTE_INDEX_17), // MAP_ELEMENT_TYPE_PATH - MAP_COLOUR_2(PALETTE_INDEX_135, PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_TRACK + MAP_COLOUR_2(PALETTE_INDEX_183, PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_TRACK MAP_COLOUR_2(PALETTE_INDEX_0, PALETTE_INDEX_99), // MAP_ELEMENT_TYPE_SCENERY MAP_COLOUR(PALETTE_INDEX_186), // MAP_ELEMENT_TYPE_ENTRANCE MAP_COLOUR(PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_WALL