mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #5596: Incorrect colours in the Map window

This commit is contained in:
Gymnasiast 2017-06-12 11:59:53 +02:00
parent 993f078a2a
commit a586a6e15d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/interface/colour.h
View File

@ -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, //

4
src/openrct2/windows/map.c
View File

@ -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